1478 files changed, 50893 insertions, 53578 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-usb b/Documentation/ABI/testing/sysfs-bus-usb
index e647378e9e88..b4f548792e32 100644
--- a/Documentation/ABI/testing/sysfs-bus-usb
+++ b/Documentation/ABI/testing/sysfs-bus-usb
@@ -119,6 +119,31 @@ Description:
                 Write a 1 to force the device to disconnect
                 (equivalent to unplugging a wired USB device).
 
+What:           /sys/bus/usb/drivers/.../new_id
+Date:           October 2011
+Contact:        linux-usb@vger.kernel.org
+Description:
+                Writing a device ID to this file will attempt to
+                dynamically add a new device ID to a USB device driver.
+                This may allow the driver to support more hardware than
+                was included in the driver's static device ID support
+                table at compile time. The format for the device ID is:
+                idVendor idProduct bInterfaceClass.
+                The vendor ID and device ID fields are required, the
+                interface class is optional.
+                Upon successfully adding an ID, the driver will probe
+                for the device and attempt to bind to it.  For example:
+                # echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id
+
+What:           /sys/bus/usb-serial/drivers/.../new_id
+Date:           October 2011
+Contact:        linux-usb@vger.kernel.org
+Description:
+                For serial USB drivers, this attribute appears under the
+                extra bus folder "usb-serial" in sysfs; apart from that
+                difference, all descriptions from the entry
+                "/sys/bus/usb/drivers/.../new_id" apply.
+
 What:           /sys/bus/usb/drivers/.../remove_id
 Date:           November 2009
 Contact:        CHENG Renquan <rqcheng@smu.edu.sg>
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index 9c452ef2328c..a7c96ae5557c 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -594,53 +594,44 @@ rmdir() will fail with it. From this behavior, pre_destroy() can be
 called multiple times against a cgroup.
 
 int can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
-               struct task_struct *task)
+               struct cgroup_taskset *tset)
 (cgroup_mutex held by caller)
 
-Called prior to moving a task into a cgroup; if the subsystem
-returns an error, this will abort the attach operation.  If a NULL
-task is passed, then a successful result indicates that *any*
-unspecified task can be moved into the cgroup. Note that this isn't
-called on a fork. If this method returns 0 (success) then this should
-remain valid while the caller holds cgroup_mutex and it is ensured that either
+Called prior to moving one or more tasks into a cgroup; if the
+subsystem returns an error, this will abort the attach operation.
+@tset contains the tasks to be attached and is guaranteed to have at
+least one task in it.
+
+If there are multiple tasks in the taskset, then:
+  - it's guaranteed that all are from the same thread group
+  - @tset contains all tasks from the thread group whether or not
+    they're switching cgroups
+  - the first task is the leader
+
+Each @tset entry also contains the task's old cgroup and tasks which
+aren't switching cgroup can be skipped easily using the
+cgroup_taskset_for_each() iterator. Note that this isn't called on a
+fork. If this method returns 0 (success) then this should remain valid
+while the caller holds cgroup_mutex and it is ensured that either
 attach() or cancel_attach() will be called in future.
 
-int can_attach_task(struct cgroup *cgrp, struct task_struct *tsk);
-(cgroup_mutex held by caller)
-
-As can_attach, but for operations that must be run once per task to be
-attached (possibly many when using cgroup_attach_proc). Called after
-can_attach.
-
 void cancel_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
-               struct task_struct *task, bool threadgroup)
+                   struct cgroup_taskset *tset)
 (cgroup_mutex held by caller)
 
 Called when a task attach operation has failed after can_attach() has succeeded.
 A subsystem whose can_attach() has some side-effects should provide this
 function, so that the subsystem can implement a rollback. If not, not necessary.
 This will be called only about subsystems whose can_attach() operation have
-succeeded.
-
-void pre_attach(struct cgroup *cgrp);
-(cgroup_mutex held by caller)
-
-For any non-per-thread attachment work that needs to happen before
-attach_task. Needed by cpuset.
+succeeded. The parameters are identical to can_attach().
 
 void attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
-            struct cgroup *old_cgrp, struct task_struct *task)
+            struct cgroup_taskset *tset)
 (cgroup_mutex held by caller)
 
 Called after the task has been attached to the cgroup, to allow any
 post-attachment activity that requires memory allocations or blocking.
-
-void attach_task(struct cgroup *cgrp, struct task_struct *tsk);
-(cgroup_mutex held by caller)
-
-As attach, but for operations that must be run once per task to be attached,
-like can_attach_task. Called before attach. Currently does not support any
-subsystem that might need the old_cgrp for every thread in the group.
+The parameters are identical to can_attach().
 
 void fork(struct cgroup_subsy *ss, struct task_struct *task)
 
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index c9848ad0e2e3..54bdddadf1cf 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -21,6 +21,10 @@ i.MX53 Smart Mobile Reference Design Board
 Required root node properties:
     - compatible = "fsl,imx53-smd", "fsl,imx53";
 
-i.MX6 Quad SABRE Automotive Board
+i.MX6 Quad Armadillo2 Board
 Required root node properties:
-    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
+    - compatible = "fsl,imx6q-arm2", "fsl,imx6q";
+
+i.MX6 Quad SABRE Lite Board
+Required root node properties:
+    - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
diff --git a/Documentation/devicetree/bindings/arm/insignal-boards.txt b/Documentation/devicetree/bindings/arm/insignal-boards.txt
new file mode 100644
index 000000000000..524c3dc5d808
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/insignal-boards.txt
@@ -0,0 +1,8 @@
+* Insignal's Exynos4210 based Origen evaluation board
+
+Origen low-cost evaluation board is based on Samsung's Exynos4210 SoC.
+
+Required root node properties:
+    - compatible = should be one or more of the following.
+        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
+        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.
diff --git a/Documentation/devicetree/bindings/arm/samsung-boards.txt b/Documentation/devicetree/bindings/arm/samsung-boards.txt
new file mode 100644
index 000000000000..0bf68be56fd1
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/samsung-boards.txt
@@ -0,0 +1,8 @@
+* Samsung's Exynos4210 based SMDKV310 evaluation board
+
+SMDKV310 evaluation board is based on Samsung's Exynos4210 SoC.
+
+Required root node properties:
+    - compatible = should be one or more of the following.
+        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
+        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt
new file mode 100644
index 000000000000..6e69d2e5e766
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/tegra.txt
@@ -0,0 +1,14 @@
+NVIDIA Tegra device tree bindings
+-------------------------------------------
+
+Boards with the tegra20 SoC shall have the following properties:
+
+Required root node property:
+
+compatible = "nvidia,tegra20";
+
+Boards with the tegra30 SoC shall have the following properties:
+
+Required root node property:
+
+compatible = "nvidia,tegra30";
diff --git a/Documentation/devicetree/bindings/dma/arm-pl330.txt b/Documentation/devicetree/bindings/dma/arm-pl330.txt
new file mode 100644
index 000000000000..a4cd273b2a67
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/arm-pl330.txt
@@ -0,0 +1,30 @@
+* ARM PrimeCell PL330 DMA Controller
+
+The ARM PrimeCell PL330 DMA controller can move blocks of memory contents
+between memory and peripherals or memory to memory.
+
+Required properties:
+  - compatible: should include both "arm,pl330" and "arm,primecell".
+  - reg: physical base address of the controller and length of memory mapped
+    region.
+  - interrupts: interrupt number to the cpu.
+
+Example:
+
+        pdma0: pdma@12680000 {
+                compatible = "arm,pl330", "arm,primecell";
+                reg = <0x12680000 0x1000>;
+                interrupts = <99>;
+        };
+
+Client drivers (device nodes requiring dma transfers from dev-to-mem or
+mem-to-dev) should specify the DMA channel numbers using a two-value pair
+as shown below.
+
+  [property name]  = <[phandle of the dma controller] [dma request id]>;
+
+      where 'dma request id' is the dma request number which is connected
+      to the client controller. The 'property name' is recommended to be
+      of the form <name>-dma-channel.
+
+  Example:  tx-dma-channel = <&pdma0 12>;
diff --git a/Documentation/devicetree/bindings/gpio/gpio-samsung.txt b/Documentation/devicetree/bindings/gpio/gpio-samsung.txt
new file mode 100644
index 000000000000..8f50fe5e6c42
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-samsung.txt
@@ -0,0 +1,40 @@
+Samsung Exynos4 GPIO Controller
+
+Required properties:
+- compatible: Compatible property value should be "samsung,exynos4-gpio>".
+
+- reg: Physical base address of the controller and length of memory mapped
+  region.
+
+- #gpio-cells: Should be 4. The syntax of the gpio specifier used by client nodes
+  should be the following with values derived from the SoC user manual.
+     <[phandle of the gpio controller node]
+      [pin number within the gpio controller]
+      [mux function]
+      [pull up/down]
+      [drive strength]>
+
+  Values for gpio specifier:
+  - Pin number: is a value between 0 to 7.
+  - Pull Up/Down: 0 - Pull Up/Down Disabled.
+                  1 - Pull Down Enabled.
+                  3 - Pull Up Enabled.
+  - Drive Strength: 0 - 1x,
+                    1 - 3x,
+                    2 - 2x,
+                    3 - 4x
+
+- gpio-controller: Specifies that the node is a gpio controller.
+- #address-cells: should be 1.
+- #size-cells: should be 1.
+
+Example:
+
+        gpa0: gpio-controller@11400000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "samsung,exynos4-gpio";
+                reg = <0x11400000 0x20>;
+                #gpio-cells = <4>;
+                gpio-controller;
+        };
diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt
new file mode 100644
index 000000000000..ce3e394c0e64
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/samsung-keypad.txt
@@ -0,0 +1,88 @@
+* Samsung's Keypad Controller device tree bindings
+
+Samsung's Keypad controller is used to interface a SoC with a matrix-type
+keypad device. The keypad controller supports multiple row and column lines.
+A key can be placed at each intersection of a unique row and a unique column.
+The keypad controller can sense a key-press and key-release and report the
+event using a interrupt to the cpu.
+
+Required SoC Specific Properties:
+- compatible: should be one of the following
+  - "samsung,s3c6410-keypad": For controllers compatible with s3c6410 keypad
+    controller.
+  - "samsung,s5pv210-keypad": For controllers compatible with s5pv210 keypad
+    controller.
+
+- reg: physical base address of the controller and length of memory mapped
+  region.
+
+- interrupts: The interrupt number to the cpu.
+
+Required Board Specific Properties:
+- samsung,keypad-num-rows: Number of row lines connected to the keypad
+  controller.
+
+- samsung,keypad-num-columns: Number of column lines connected to the
+  keypad controller.
+
+- row-gpios: List of gpios used as row lines. The gpio specifier for
+  this property depends on the gpio controller to which these row lines
+  are connected.
+
+- col-gpios: List of gpios used as column lines. The gpio specifier for
+  this property depends on the gpio controller to which these column
+  lines are connected.
+
+- Keys represented as child nodes: Each key connected to the keypad
+  controller is represented as a child node to the keypad controller
+  device node and should include the following properties.
+  - keypad,row: the row number to which the key is connected.
+  - keypad,column: the column number to which the key is connected.
+  - linux,code: the key-code to be reported when the key is pressed
+    and released.
+
+Optional Properties specific to linux:
+- linux,keypad-no-autorepeat: do no enable autorepeat feature.
+- linux,keypad-wakeup: use any event on keypad as wakeup event.
+
+
+Example:
+        keypad@100A0000 {
+                compatible = "samsung,s5pv210-keypad";
+                reg = <0x100A0000 0x100>;
+                interrupts = <173>;
+                samsung,keypad-num-rows = <2>;
+                samsung,keypad-num-columns = <8>;
+                linux,input-no-autorepeat;
+                linux,input-wakeup;
+
+                row-gpios = <&gpx2 0 3 3 0
+                             &gpx2 1 3 3 0>;
+
+                col-gpios = <&gpx1 0 3 0 0
+                             &gpx1 1 3 0 0
+                             &gpx1 2 3 0 0
+                             &gpx1 3 3 0 0
+                             &gpx1 4 3 0 0
+                             &gpx1 5 3 0 0
+                             &gpx1 6 3 0 0
+                             &gpx1 7 3 0 0>;
+
+                key_1 {
+                        keypad,row = <0>;
+                        keypad,column = <3>;
+                        linux,code = <2>;
+                };
+
+                key_2 {
+                        keypad,row = <0>;
+                        keypad,column = <4>;
+                        linux,code = <3>;
+                };
+
+                key_3 {
+                        keypad,row = <0>;
+                        keypad,column = <5>;
+                        linux,code = <4>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
new file mode 100644
index 000000000000..44afa0e5057d
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -0,0 +1,25 @@
+* Cadence MACB/GEM Ethernet controller
+
+Required properties:
+- compatible: Should be "cdns,[<chip>-]{macb|gem}"
+  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.
+  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
+  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on
+  the Cadence GEM, or the generic form: "cdns,gem".
+- reg: Address and length of the register set for the device
+- interrupts: Should contain macb interrupt
+- phy-mode: String, operation mode of the PHY interface.
+  Supported values are: "mii", "rmii", "gmii", "rgmii".
+
+Optional properties:
+- local-mac-address: 6 bytes, mac address
+
+Examples:
+
+        macb0: ethernet@fffc4000 {
+                compatible = "cdns,at32ap7000-macb";
+                reg = <0xfffc4000 0x4000>;
+                interrupts = <21>;
+                phy-mode = "rmii";
+                local-mac-address = [3a 0e 03 04 05 06];
+        };
diff --git a/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
new file mode 100644
index 000000000000..5aeee53ff9f4
--- /dev/null
+++ b/Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
@@ -0,0 +1,9 @@
+NVIDIA compliant embedded controller
+
+Required properties:
+- compatible : should be "nvidia,nvec".
+- reg : the iomem of the i2c slave controller
+- interrupts : the interrupt line of the i2c slave controller
+- clock-frequency : the frequency of the i2c bus
+- gpios : the gpio used for ec request
+- slave-addr: the i2c address of the slave controller
diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
new file mode 100644
index 000000000000..90ec45fd33ec
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
@@ -0,0 +1,20 @@
+* Samsung's S3C Real Time Clock controller
+
+Required properties:
+- compatible: should be one of the following.
+    * "samsung,s3c2410-rtc" - for controllers compatible with s3c2410 rtc.
+    * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: Two interrupt numbers to the cpu should be specified. First
+  interrupt number is the rtc alarm interupt and second interrupt number
+  is the rtc tick interrupt. The number of cells representing a interrupt
+  depends on the parent interrupt controller.
+
+Example:
+
+        rtc@10070000 {
+                compatible = "samsung,s3c6410-rtc";
+                reg = <0x10070000 0x100>;
+                interrupts = <44 0 45 0>;
+        };
diff --git a/Documentation/devicetree/bindings/serial/omap_serial.txt b/Documentation/devicetree/bindings/serial/omap_serial.txt
new file mode 100644
index 000000000000..342eedd10050
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/omap_serial.txt
@@ -0,0 +1,10 @@
+OMAP UART controller
+
+Required properties:
+- compatible : should be "ti,omap2-uart" for OMAP2 controllers
+- compatible : should be "ti,omap3-uart" for OMAP3 controllers
+- compatible : should be "ti,omap4-uart" for OMAP4 controllers
+- ti,hwmods : Must be "uart<n>", n being the instance number (1-based)
+
+Optional properties:
+- clock-frequency : frequency of the clock input to the UART
diff --git a/Documentation/devicetree/bindings/serial/samsung_uart.txt b/Documentation/devicetree/bindings/serial/samsung_uart.txt
new file mode 100644
index 000000000000..2c8a17cf5cb5
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/samsung_uart.txt
@@ -0,0 +1,14 @@
+* Samsung's UART Controller
+
+The Samsung's UART controller is used for interfacing SoC with serial communicaion
+devices.
+
+Required properties:
+- compatible: should be
+  - "samsung,exynos4210-uart", for UART's compatible with Exynos4210 uart ports.
+
+- reg: base physical address of the controller and length of memory mapped
+  region.
+
+- interrupts: interrupt number to the cpu. The interrupt specifier format depends
+  on the interrupt controller parent.
diff --git a/Documentation/devicetree/bindings/usb/tegra-usb.txt b/Documentation/devicetree/bindings/usb/tegra-usb.txt
new file mode 100644
index 000000000000..035d63d5646d
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/tegra-usb.txt
@@ -0,0 +1,13 @@
+Tegra SOC USB controllers
+
+The device node for a USB controller that is part of a Tegra
+SOC is as described in the document "Open Firmware Recommended
+Practice : Universal Serial Bus" with the following modifications
+and additions :
+
+Required properties :
+ - compatible : Should be "nvidia,tegra20-ehci" for USB controllers
+   used in host mode.
+ - phy_type : Should be one of "ulpi" or "utmi".
+ - nvidia,vbus-gpio : If present, specifies a gpio that needs to be
+   activated for the bus to be powered.
diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index dfa6fc6e4b28..0c083c5c2faa 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -66,7 +66,6 @@ GRTAGS
 GSYMS
 GTAGS
 Image
-Kerntypes
 Module.markers
 Module.symvers
 PENDING
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a1e7f3eec98f..284b44259750 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -523,6 +523,20 @@ Why:    In 3.0, we can now autodetect internal 3G device and already have
         information log when acer-wmi initial.
 Who:    Lee, Chun-Yi <jlee@novell.com>
 
+---------------------------
+
+What:   /sys/devices/platform/_UDC_/udc/_UDC_/is_dualspeed file and
+        is_dualspeed line in /sys/devices/platform/ci13xxx_*/udc/device file.
+When:   3.8
+Why:    The is_dualspeed file is superseded by maximum_speed in the same
+        directory and is_dualspeed line in device file is superseded by
+        max_speed line in the same file.
+
+        The maximum_speed/max_speed specifies maximum speed supported by UDC.
+        To check if dualspeeed is supported, check if the value is >= 3.
+        Various possible speeds are defined in <linux/usb/ch9.h>.
+Who:    Michal Nazarewicz <mina86@mina86.com>
+
 ----------------------------
 
 What:   The XFS nodelaylog mount option
diff --git a/Documentation/kdump/kdump.txt b/Documentation/kdump/kdump.txt
index 7a9e0b4b2903..506c7390c2b9 100644
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
@@ -17,8 +17,8 @@ You can use common commands, such as cp and scp, to copy the
 memory image to a dump file on the local disk, or across the network to
 a remote system.
 
-Kdump and kexec are currently supported on the x86, x86_64, ppc64 and ia64
-architectures.
+Kdump and kexec are currently supported on the x86, x86_64, ppc64, ia64,
+and s390x architectures.
 
 When the system kernel boots, it reserves a small section of memory for
 the dump-capture kernel. This ensures that ongoing Direct Memory Access
@@ -34,11 +34,18 @@ Similarly on PPC64 machines first 32KB of physical memory is needed for
 booting regardless of where the kernel is loaded and to support 64K page
 size kexec backs up the first 64KB memory.
 
+For s390x, when kdump is triggered, the crashkernel region is exchanged
+with the region [0, crashkernel region size] and then the kdump kernel
+runs in [0, crashkernel region size]. Therefore no relocatable kernel is
+needed for s390x.
+
 All of the necessary information about the system kernel's core image is
 encoded in the ELF format, and stored in a reserved area of memory
 before a crash. The physical address of the start of the ELF header is
 passed to the dump-capture kernel through the elfcorehdr= boot
-parameter.
+parameter. Optionally the size of the ELF header can also be passed
+when using the elfcorehdr=[size[KMG]@]offset[KMG] syntax.
+
 
 With the dump-capture kernel, you can access the memory image, or "old
 memory," in two ways:
@@ -291,6 +298,10 @@ Boot into System Kernel
    The region may be automatically placed on ia64, see the
    dump-capture kernel config option notes above.
 
+   On s390x, typically use "crashkernel=xxM". The value of xx is dependent
+   on the memory consumption of the kdump system. In general this is not
+   dependent on the memory size of the production system.
+
 Load the Dump-capture Kernel
 ============================
 
@@ -308,6 +319,8 @@ For ppc64:
         - Use vmlinux
 For ia64:
         - Use vmlinux or vmlinuz.gz
+For s390x:
+        - Use image or bzImage
 
 
 If you are using a uncompressed vmlinux image then use following command
@@ -337,6 +350,8 @@ For i386, x86_64 and ia64:
 For ppc64:
         "1 maxcpus=1 noirqdistrib reset_devices"
 
+For s390x:
+        "1 maxcpus=1 cgroup_disable=memory"
 
 Notes on loading the dump-capture kernel:
 
@@ -362,6 +377,20 @@ Notes on loading the dump-capture kernel:
   dump. Hence generally it is useful either to build a UP dump-capture
   kernel or specify maxcpus=1 option while loading dump-capture kernel.
 
+* For s390x there are two kdump modes: If a ELF header is specified with
+  the elfcorehdr= kernel parameter, it is used by the kdump kernel as it
+  is done on all other architectures. If no elfcorehdr= kernel parameter is
+  specified, the s390x kdump kernel dynamically creates the header. The
+  second mode has the advantage that for CPU and memory hotplug, kdump has
+  not to be reloaded with kexec_load().
+
+* For s390x systems with many attached devices the "cio_ignore" kernel
+  parameter should be used for the kdump kernel in order to prevent allocation
+  of kernel memory for devices that are not relevant for kdump. The same
+  applies to systems that use SCSI/FCP devices. In that case the
+  "allow_lun_scan" zfcp module parameter should be set to zero before
+  setting FCP devices online.
+
 Kernel Panic
 ============
 
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e229769606f2..7b2e5c5eefa6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2637,6 +2637,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         [USB] Start with the old device initialization
                         scheme (default 0 = off).
 
+        usbcore.usbfs_memory_mb=
+                        [USB] Memory limit (in MB) for buffers allocated by
+                        usbfs (default = 16, 0 = max = 2047).
+
         usbcore.use_both_schemes=
                         [USB] Try the other device initialization scheme
                         if the first one fails (default 1 = enabled).
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt
index efe998becc5b..462321c1aeea 100644
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
@@ -41,7 +41,6 @@ ldd
 Debugging modules
 The proc file system
 Starting points for debugging scripting languages etc.
-Dumptool & Lcrash
 SysRq
 References
 Special Thanks
@@ -2455,39 +2454,6 @@ jdb <filename> another fully interactive gdb style debugger.
 
 
 
-Dumptool & Lcrash ( lkcd )
-==========================
-Michael Holzheu & others here at IBM have a fairly mature port of 
-SGI's lcrash tool which allows one to look at kernel structures in a
-running kernel.
-
-It also complements a tool called dumptool which dumps all the kernel's
-memory pages & registers to either a tape or a disk.
-This can be used by tech support or an ambitious end user do
-post mortem debugging of a machine like gdb core dumps.
-
-Going into how to use this tool in detail will be explained
-in other documentation supplied by IBM with the patches & the 
-lcrash homepage http://oss.sgi.com/projects/lkcd/ & the lcrash manpage.
-
-How they work
--------------
-Lcrash is a perfectly normal program,however, it requires 2 
-additional files, Kerntypes which is built using a patch to the 
-linux kernel sources in the linux root directory & the System.map.
-
-Kerntypes is an objectfile whose sole purpose in life
-is to provide stabs debug info to lcrash, to do this
-Kerntypes is built from kerntypes.c which just includes the most commonly
-referenced header files used when debugging, lcrash can then read the
-.stabs section of this file.
-
-Debugging a live system it uses /dev/mem
-alternatively for post mortem debugging it uses the data 
-collected by dumptool.
-
-
-
 SysRq
 =====
 This is now supported by linux for s/390 & z/Architecture.
diff --git a/Documentation/serial/driver b/Documentation/serial/driver
index 77ba0afbe4db..0a25a9191864 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -101,7 +101,7 @@ hardware.
         Returns the current state of modem control inputs.  The state
         of the outputs should not be returned, since the core keeps
         track of their state.  The state information should include:
-                - TIOCM_DCD     state of DCD signal
+                - TIOCM_CAR     state of DCD signal
                 - TIOCM_CTS     state of CTS signal
                 - TIOCM_DSR     state of DSR signal
                 - TIOCM_RI      state of RI signal
diff --git a/Documentation/usb/usbmon.txt b/Documentation/usb/usbmon.txt
index a4efa0462f05..5335fa8b06eb 100644
--- a/Documentation/usb/usbmon.txt
+++ b/Documentation/usb/usbmon.txt
@@ -47,10 +47,11 @@ This allows to filter away annoying devices that talk continuously.
 
 2. Find which bus connects to the desired device
 
-Run "cat /proc/bus/usb/devices", and find the T-line which corresponds to
-the device. Usually you do it by looking for the vendor string. If you have
-many similar devices, unplug one and compare two /proc/bus/usb/devices outputs.
-The T-line will have a bus number. Example:
+Run "cat /sys/kernel/debug/usb/devices", and find the T-line which corresponds
+to the device. Usually you do it by looking for the vendor string. If you have
+many similar devices, unplug one and compare the two
+/sys/kernel/debug/usb/devices outputs. The T-line will have a bus number.
+Example:
 
 T:  Bus=03 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  2 Spd=12  MxCh= 0
 D:  Ver= 1.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs=  1
@@ -58,7 +59,10 @@ P:  Vendor=0557 ProdID=2004 Rev= 1.00
 S:  Manufacturer=ATEN
 S:  Product=UC100KM V2.00
 
-Bus=03 means it's bus 3.
+"Bus=03" means it's bus 3. Alternatively, you can look at the output from
+"lsusb" and get the bus number from the appropriate line. Example:
+
+Bus 003 Device 002: ID 0557:2004 ATEN UC100KM V2.00
 
 3. Start 'cat'
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 1e7d90442651..0ae41c9a6c13 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -184,11 +184,6 @@ S:	Maintained
 F:      Documentation/filesystems/9p.txt
 F:      fs/9p/
 
-A2232 SERIAL BOARD DRIVER
-L:      linux-m68k@lists.linux-m68k.org
-S:      Orphan
-F:      drivers/staging/generic_serial/ser_a2232*
-
 AACRAID SCSI RAID DRIVER
 M:      Adaptec OEM Raid Solutions <aacraid@adaptec.com>
 L:      linux-scsi@vger.kernel.org
@@ -1587,7 +1582,7 @@ M:	Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:      Kan Yan <kanyan@broadcom.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
-F:      drivers/staging/brcm80211/
+F:      drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 M:      Bhanu Prakash Gollapudi <bprakash@broadcom.com>
@@ -1891,12 +1886,6 @@ L:	platform-driver-x86@vger.kernel.org
 S:      Maintained
 F:      drivers/platform/x86/compal-laptop.c
 
-COMPUTONE INTELLIPORT MULTIPORT CARD
-W:      http://www.wittsend.com/computone.html
-S:      Orphan
-F:      Documentation/serial/computone.txt
-F:      drivers/staging/tty/ip2/
-
 CONEXANT ACCESSRUNNER USB DRIVER
 M:      Simon Arlott <cxacru@fire.lp0.eu>
 L:      accessrunner-general@lists.sourceforge.net
@@ -2200,15 +2189,6 @@ F:	drivers/md/dm*
 F:      include/linux/device-mapper.h
 F:      include/linux/dm-*.h
 
-DIGI INTL. EPCA DRIVER
-M:      "Digi International, Inc" <Eng.Linux@digi.com>
-L:      Eng.Linux@digi.com
-W:      http://www.digi.com
-S:      Orphan
-F:      Documentation/serial/digiepca.txt
-F:      drivers/staging/tty/epca*
-F:      drivers/staging/tty/digi*
-
 DIOLAN U2C-12 I2C DRIVER
 M:      Guenter Roeck <guenter.roeck@ericsson.com>
 L:      linux-i2c@vger.kernel.org
@@ -5131,6 +5111,15 @@ L:	linux-mtd@lists.infradead.org
 S:      Maintained
 F:      drivers/mtd/devices/phram.c
 
+PICOXCELL SUPPORT
+M:      Jamie Iles <jamie@jamieiles.com>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://github.com/jamieiles/linux-2.6-ji.git
+S:      Supported
+F:      arch/arm/mach-picoxcell
+F:      drivers/*/picoxcell*
+F:      drivers/*/*/picoxcell*
+
 PIN CONTROL SUBSYSTEM
 M:      Linus Walleij <linus.walleij@linaro.org>
 S:      Maintained
@@ -5317,7 +5306,10 @@ F:	drivers/media/video/pvrusb2/
 PXA2xx/PXA3xx SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
 M:      Russell King <linux@arm.linux.org.uk>
+M:      Haojian Zhuang <haojian.zhuang@marvell.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://github.com/hzhuang1/linux.git
+T:      git git://git.linaro.org/people/ycmiao/pxa-linux.git
 S:      Maintained
 F:      arch/arm/mach-pxa/
 F:      drivers/pcmcia/pxa2xx*
@@ -5327,25 +5319,14 @@ F:	include/sound/pxa2xx-lib.h
 F:      sound/arm/pxa*
 F:      sound/soc/pxa
 
-PXA168 SUPPORT
+MMP SUPPORT
 M:      Eric Miao <eric.y.miao@gmail.com>
-M:      Jason Chagas <jason.chagas@marvell.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:      Maintained
-
-PXA910 SUPPORT
-M:      Eric Miao <eric.y.miao@gmail.com>
-L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
-S:      Maintained
-
-MMP2 SUPPORT (aka ARMADA610)
 M:      Haojian Zhuang <haojian.zhuang@marvell.com>
-M:      Eric Miao <eric.y.miao@gmail.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+T:      git git://github.com/hzhuang1/linux.git
+T:      git git://git.linaro.org/people/ycmiao/pxa-linux.git
 S:      Maintained
+F:      arch/arm/mach-mmp/
 
 PXA MMCI DRIVER
 S:      Orphan
@@ -5555,11 +5536,6 @@ M:	Maxim Levitsky <maximlevitsky@gmail.com>
 S:      Maintained
 F:      drivers/memstick/host/r592.*
 
-RISCOM8 DRIVER
-S:      Orphan
-F:      Documentation/serial/riscom8.txt
-F:      drivers/staging/tty/riscom8*
-
 ROCKETPORT DRIVER
 P:      Comtrol Corp.
 W:      http://www.comtrol.com
@@ -6222,11 +6198,6 @@ F:	arch/arm/mach-spear3xx/spear3*0_evb.c
 F:      arch/arm/mach-spear6xx/spear600.c
 F:      arch/arm/mach-spear6xx/spear600_evb.c
 
-SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
-S:      Orphan
-F:      Documentation/serial/specialix.txt
-F:      drivers/staging/tty/specialix*
-
 SPI SUBSYSTEM
 M:      Grant Likely <grant.likely@secretlab.ca>
 L:      spi-devel-general@lists.sourceforge.net
@@ -6304,11 +6275,6 @@ M:	Manu Abraham <abraham.manu@gmail.com>
 S:      Odd Fixes
 F:      drivers/staging/crystalhd/
 
-STAGING - CYPRESS WESTBRIDGE SUPPORT
-M:      David Cross <david.cross@cypress.com>
-S:      Odd Fixes
-F:      drivers/staging/westbridge/
-
 STAGING - ECHO CANCELLER
 M:      Steve Underwood <steveu@coppice.org>
 M:      David Rowe <david@rowetel.com>
@@ -6414,7 +6380,7 @@ S:	Odd Fixes
 F:      drivers/staging/winbond/
 
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
-M:      Arnaud Patard <apatard@mandriva.com>
+M:      Arnaud Patard <arnaud.patard@rtp-net.org>
 S:      Odd Fixes
 F:      drivers/staging/xgifb/
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f72e1707d463..9d66dfc33a5a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -447,6 +447,7 @@ config ARCH_MXS
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
+        select HAVE_CLK_PREPARE
         help
           Support for Freescale MXS-based family of processors
 
@@ -597,6 +598,7 @@ config ARCH_MMP
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
         select GENERIC_CLOCKEVENTS
+        select GPIO_PXA
         select HAVE_SCHED_CLOCK
         select TICK_ONESHOT
         select PLAT_PXA
@@ -658,6 +660,7 @@ config ARCH_PICOXCELL
         select HAVE_SCHED_CLOCK
         select HAVE_TCM
         select NO_IOPORT
+        select SPARSE_IRQ
         select USE_OF
         help
           This enables support for systems based on the Picochip picoXcell
@@ -681,6 +684,7 @@ config ARCH_PXA
         select CLKSRC_MMIO
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
+        select GPIO_PXA
         select HAVE_SCHED_CLOCK
         select TICK_ONESHOT
         select PLAT_PXA
@@ -748,7 +752,7 @@ config ARCH_SA1100
         select ARCH_HAS_CPUFREQ
         select CPU_FREQ
         select GENERIC_CLOCKEVENTS
-        select HAVE_CLK
+        select CLKDEV_LOOKUP
         select HAVE_SCHED_CLOCK
         select TICK_ONESHOT
         select ARCH_REQUIRE_GPIOLIB
@@ -892,7 +896,6 @@ config ARCH_U300
         select HAVE_MACH_CLKDEV
         select GENERIC_GPIO
         select ARCH_REQUIRE_GPIOLIB
-        select NEED_MACH_MEMORY_H
         help
           Support for ST-Ericsson U300 series mobile platforms.
 
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index c5213e78606b..e0d236d7ff73 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -100,6 +100,14 @@ choice
                   Note that the system will appear to hang during boot if there
                   is nothing connected to read from the DCC.
 
+        config AT91_DEBUG_LL_DBGU0
+                bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
+                depends on HAVE_AT91_DBGU0
+
+        config AT91_DEBUG_LL_DBGU1
+                bool "Kernel low-level debugging on 9263, 9g45 and cap9"
+                depends on HAVE_AT91_DBGU1
+
         config DEBUG_FOOTBRIDGE_COM1
                 bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
                 depends on FOOTBRIDGE
@@ -247,6 +255,43 @@ choice
                   their output to the standard serial port on the RealView
                   PB1176 platform.
 
+        config DEBUG_MSM_UART1
+                bool "Kernel low-level debugging messages via MSM UART1"
+                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the first serial port on MSM devices.
+
+        config DEBUG_MSM_UART2
+                bool "Kernel low-level debugging messages via MSM UART2"
+                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the second serial port on MSM devices.
+
+        config DEBUG_MSM_UART3
+                bool "Kernel low-level debugging messages via MSM UART3"
+                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the third serial port on MSM devices.
+
+        config DEBUG_MSM8660_UART
+                bool "Kernel low-level debugging messages via MSM 8660 UART"
+                depends on ARCH_MSM8X60
+                select MSM_HAS_DEBUG_UART_HS
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the serial port on MSM 8660 devices.
+
+        config DEBUG_MSM8960_UART
+                bool "Kernel low-level debugging messages via MSM 8960 UART"
+                depends on ARCH_MSM8960
+                select MSM_HAS_DEBUG_UART_HS
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the serial port on MSM 8960 devices.
+
 endchoice
 
 config EARLY_PRINTK
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index aeef04269cf8..07603b8c9503 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -114,6 +114,13 @@
                                 atmel,use-dma-tx;
                                 status = "disabled";
                         };
+
+                        macb0: ethernet@fffc4000 {
+                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
+                                reg = <0xfffc4000 0x100>;
+                                interrupts = <21>;
+                                status = "disabled";
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index db6a45202f26..fffa005300a4 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -101,6 +101,13 @@
                                 atmel,use-dma-tx;
                                 status = "disabled";
                         };
+
+                        macb0: ethernet@fffbc000 {
+                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
+                                reg = <0xfffbc000 0x100>;
+                                interrupts = <25>;
+                                status = "disabled";
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 85b34f59cd82..a387e7704ce1 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -30,6 +30,11 @@
                         usart1: serial@fff90000 {
                                 status = "okay";
                         };
+
+                        macb0: ethernet@fffbc000 {
+                                phy-mode = "rmii";
+                                status = "okay";
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
new file mode 100644
index 000000000000..b8c476384eef
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -0,0 +1,137 @@
+/*
+ * Samsung's Exynos4210 based Origen board device tree source
+ *
+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ * Copyright (c) 2010-2011 Linaro Ltd.
+ *              www.linaro.org
+ *
+ * Device tree source file for Insignal's Origen board which is based on
+ * Samsung's Exynos4210 SoC.
+ *
+ * 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.
+*/
+
+/dts-v1/;
+/include/ "exynos4210.dtsi"
+
+/ {
+        model = "Insignal Origen evaluation board based on Exynos4210";
+        compatible = "insignal,origen", "samsung,exynos4210";
+
+        memory {
+                reg = <0x40000000 0x40000000>;
+        };
+
+        chosen {
+                bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
+        };
+
+        sdhci@12530000 {
+                samsung,sdhci-bus-width = <4>;
+                linux,mmc_cap_4_bit_data;
+                samsung,sdhci-cd-internal;
+                gpio-cd = <&gpk2 2 2 3 3>;
+                gpios = <&gpk2 0 2 0 3>,
+                        <&gpk2 1 2 0 3>,
+                        <&gpk2 3 2 3 3>,
+                        <&gpk2 4 2 3 3>,
+                        <&gpk2 5 2 3 3>,
+                        <&gpk2 6 2 3 3>;
+        };
+
+        sdhci@12510000 {
+                samsung,sdhci-bus-width = <4>;
+                linux,mmc_cap_4_bit_data;
+                samsung,sdhci-cd-internal;
+                gpio-cd = <&gpk0 2 2 3 3>;
+                gpios = <&gpk0 0 2 0 3>,
+                        <&gpk0 1 2 0 3>,
+                        <&gpk0 3 2 3 3>,
+                        <&gpk0 4 2 3 3>,
+                        <&gpk0 5 2 3 3>,
+                        <&gpk0 6 2 3 3>;
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                up {
+                        label = "Up";
+                        gpios = <&gpx2 0 0 0 2>;
+                        linux,code = <103>;
+                };
+
+                down {
+                        label = "Down";
+                        gpios = <&gpx2 1 0 0 2>;
+                        linux,code = <108>;
+                };
+
+                back {
+                        label = "Back";
+                        gpios = <&gpx1 7 0 0 2>;
+                        linux,code = <158>;
+                };
+
+                home {
+                        label = "Home";
+                        gpios = <&gpx1 6 0 0 2>;
+                        linux,code = <102>;
+                };
+
+                menu {
+                        label = "Menu";
+                        gpios = <&gpx1 5 0 0 2>;
+                        linux,code = <139>;
+                };
+        };
+
+        keypad@100A0000 {
+                status = "disabled";
+        };
+
+        sdhci@12520000 {
+                status = "disabled";
+        };
+
+        sdhci@12540000 {
+                status = "disabled";
+        };
+
+        i2c@13860000 {
+                status = "disabled";
+        };
+
+        i2c@13870000 {
+                status = "disabled";
+        };
+
+        i2c@13880000 {
+                status = "disabled";
+        };
+
+        i2c@13890000 {
+                status = "disabled";
+        };
+
+        i2c@138A0000 {
+                status = "disabled";
+        };
+
+        i2c@138B0000 {
+                status = "disabled";
+        };
+
+        i2c@138C0000 {
+                status = "disabled";
+        };
+
+        i2c@138D0000 {
+                status = "disabled";
+        };
+};
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
new file mode 100644
index 000000000000..27afc8e535ca
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -0,0 +1,182 @@
+/*
+ * Samsung's Exynos4210 based SMDKV310 board device tree source
+ *
+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ * Copyright (c) 2010-2011 Linaro Ltd.
+ *              www.linaro.org
+ *
+ * Device tree source file for Samsung's SMDKV310 board which is based on
+ * Samsung's Exynos4210 SoC.
+ *
+ * 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.
+*/
+
+/dts-v1/;
+/include/ "exynos4210.dtsi"
+
+/ {
+        model = "Samsung smdkv310 evaluation board based on Exynos4210";
+        compatible = "samsung,smdkv310", "samsung,exynos4210";
+
+        memory {
+                reg = <0x40000000 0x80000000>;
+        };
+
+        chosen {
+                bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc";
+        };
+
+        sdhci@12530000 {
+                samsung,sdhci-bus-width = <4>;
+                linux,mmc_cap_4_bit_data;
+                samsung,sdhci-cd-internal;
+                gpio-cd = <&gpk2 2 2 3 3>;
+                gpios = <&gpk2 0 2 0 3>,
+                        <&gpk2 1 2 0 3>,
+                        <&gpk2 3 2 3 3>,
+                        <&gpk2 4 2 3 3>,
+                        <&gpk2 5 2 3 3>,
+                        <&gpk2 6 2 3 3>;
+        };
+
+        keypad@100A0000 {
+                samsung,keypad-num-rows = <2>;
+                samsung,keypad-num-columns = <8>;
+                linux,keypad-no-autorepeat;
+                linux,keypad-wakeup;
+
+                row-gpios = <&gpx2 0 3 3 0>,
+                            <&gpx2 1 3 3 0>;
+
+                col-gpios = <&gpx1 0 3 0 0>,
+                            <&gpx1 1 3 0 0>,
+                            <&gpx1 2 3 0 0>,
+                            <&gpx1 3 3 0 0>,
+                            <&gpx1 4 3 0 0>,
+                            <&gpx1 5 3 0 0>,
+                            <&gpx1 6 3 0 0>,
+                            <&gpx1 7 3 0 0>;
+
+                key_1 {
+                        keypad,row = <0>;
+                        keypad,column = <3>;
+                        linux,code = <2>;
+                };
+
+                key_2 {
+                        keypad,row = <0>;
+                        keypad,column = <4>;
+                        linux,code = <3>;
+                };
+
+                key_3 {
+                        keypad,row = <0>;
+                        keypad,column = <5>;
+                        linux,code = <4>;
+                };
+
+                key_4 {
+                        keypad,row = <0>;
+                        keypad,column = <6>;
+                        linux,code = <5>;
+                };
+
+                key_5 {
+                        keypad,row = <0>;
+                        keypad,column = <7>;
+                        linux,code = <6>;
+                };
+
+                key_a {
+                        keypad,row = <1>;
+                        keypad,column = <3>;
+                        linux,code = <30>;
+                };
+
+                key_b {
+                        keypad,row = <1>;
+                        keypad,column = <4>;
+                        linux,code = <48>;
+                };
+
+                key_c {
+                        keypad,row = <1>;
+                        keypad,column = <5>;
+                        linux,code = <46>;
+                };
+
+                key_d {
+                        keypad,row = <1>;
+                        keypad,column = <6>;
+                        linux,code = <32>;
+                };
+
+                key_e {
+                        keypad,row = <1>;
+                        keypad,column = <7>;
+                        linux,code = <18>;
+                };
+        };
+
+        i2c@13860000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                samsung,i2c-sda-delay = <100>;
+                samsung,i2c-max-bus-freq = <20000>;
+                gpios = <&gpd1 0 2 3 0>,
+                        <&gpd1 1 2 3 0>;
+
+                eeprom@50 {
+                        compatible = "samsung,24ad0xd1";
+                        reg = <0x50>;
+                };
+
+                eeprom@52 {
+                        compatible = "samsung,24ad0xd1";
+                        reg = <0x52>;
+                };
+        };
+
+        sdhci@12510000 {
+                status = "disabled";
+        };
+
+        sdhci@12520000 {
+                status = "disabled";
+        };
+
+        sdhci@12540000 {
+                status = "disabled";
+        };
+
+        i2c@13870000 {
+                status = "disabled";
+        };
+
+        i2c@13880000 {
+                status = "disabled";
+        };
+
+        i2c@13890000 {
+                status = "disabled";
+        };
+
+        i2c@138A0000 {
+                status = "disabled";
+        };
+
+        i2c@138B0000 {
+                status = "disabled";
+        };
+
+        i2c@138C0000 {
+                status = "disabled";
+        };
+
+        i2c@138D0000 {
+                status = "disabled";
+        };
+};
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
new file mode 100644
index 000000000000..63d7578856c1
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -0,0 +1,397 @@
+/*
+ * Samsung's Exynos4210 SoC device tree source
+ *
+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ * Copyright (c) 2010-2011 Linaro Ltd.
+ *              www.linaro.org
+ *
+ * Samsung's Exynos4210 SoC device nodes are listed in this file. Exynos4210
+ * based board files can include this file and provide values for board specfic
+ * bindings.
+ *
+ * Note: This file does not include device nodes for all the controllers in
+ * Exynos4210 SoC. As device tree coverage for Exynos4210 increases, additional
+ * nodes can be added to this file.
+ *
+ * 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.
+*/
+
+/include/ "skeleton.dtsi"
+
+/ {
+        compatible = "samsung,exynos4210";
+        interrupt-parent = <&gic>;
+
+        gic:interrupt-controller@10490000 {
+                compatible = "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                interrupt-controller;
+                reg = <0x10490000 0x1000>, <0x10480000 0x100>;
+        };
+
+        watchdog@10060000 {
+                compatible = "samsung,s3c2410-wdt";
+                reg = <0x10060000 0x100>;
+                interrupts = <0 43 0>;
+        };
+
+        rtc@10070000 {
+                compatible = "samsung,s3c6410-rtc";
+                reg = <0x10070000 0x100>;
+                interrupts = <0 44 0>, <0 45 0>;
+        };
+
+        keypad@100A0000 {
+                compatible = "samsung,s5pv210-keypad";
+                reg = <0x100A0000 0x100>;
+                interrupts = <0 109 0>;
+        };
+
+        sdhci@12510000 {
+                compatible = "samsung,exynos4210-sdhci";
+                reg = <0x12510000 0x100>;
+                interrupts = <0 73 0>;
+        };
+
+        sdhci@12520000 {
+                compatible = "samsung,exynos4210-sdhci";
+                reg = <0x12520000 0x100>;
+                interrupts = <0 74 0>;
+        };
+
+        sdhci@12530000 {
+                compatible = "samsung,exynos4210-sdhci";
+                reg = <0x12530000 0x100>;
+                interrupts = <0 75 0>;
+        };
+
+        sdhci@12540000 {
+                compatible = "samsung,exynos4210-sdhci";
+                reg = <0x12540000 0x100>;
+                interrupts = <0 76 0>;
+        };
+
+        serial@13800000 {
+                compatible = "samsung,exynos4210-uart";
+                reg = <0x13800000 0x100>;
+                interrupts = <0 52 0>;
+        };
+
+        serial@13810000 {
+                compatible = "samsung,exynos4210-uart";
+                reg = <0x13810000 0x100>;
+                interrupts = <0 53 0>;
+        };
+
+        serial@13820000 {
+                compatible = "samsung,exynos4210-uart";
+                reg = <0x13820000 0x100>;
+                interrupts = <0 54 0>;
+        };
+
+        serial@13830000 {
+                compatible = "samsung,exynos4210-uart";
+                reg = <0x13830000 0x100>;
+                interrupts = <0 55 0>;
+        };
+
+        i2c@13860000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x13860000 0x100>;
+                interrupts = <0 58 0>;
+        };
+
+        i2c@13870000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x13870000 0x100>;
+                interrupts = <0 59 0>;
+        };
+
+        i2c@13880000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x13880000 0x100>;
+                interrupts = <0 60 0>;
+        };
+
+        i2c@13890000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x13890000 0x100>;
+                interrupts = <0 61 0>;
+        };
+
+        i2c@138A0000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x138A0000 0x100>;
+                interrupts = <0 62 0>;
+        };
+
+        i2c@138B0000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x138B0000 0x100>;
+                interrupts = <0 63 0>;
+        };
+
+        i2c@138C0000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x138C0000 0x100>;
+                interrupts = <0 64 0>;
+        };
+
+        i2c@138D0000 {
+                compatible = "samsung,s3c2440-i2c";
+                reg = <0x138D0000 0x100>;
+                interrupts = <0 65 0>;
+        };
+
+        amba {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "arm,amba-bus";
+                interrupt-parent = <&gic>;
+                ranges;
+
+                pdma0: pdma@12680000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0x12680000 0x1000>;
+                        interrupts = <0 35 0>;
+                };
+
+                pdma1: pdma@12690000 {
+                        compatible = "arm,pl330", "arm,primecell";
+                        reg = <0x12690000 0x1000>;
+                        interrupts = <0 36 0>;
+                };
+        };
+
+        gpio-controllers {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                gpio-controller;
+                ranges;
+
+                gpa0: gpio-controller@11400000 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400000 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpa1: gpio-controller@11400020 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400020 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpb: gpio-controller@11400040 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400040 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpc0: gpio-controller@11400060 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400060 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpc1: gpio-controller@11400080 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400080 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpd0: gpio-controller@114000A0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114000A0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpd1: gpio-controller@114000C0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114000C0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpe0: gpio-controller@114000E0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114000E0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpe1: gpio-controller@11400100 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400100 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpe2: gpio-controller@11400120 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400120 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpe3: gpio-controller@11400140 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400140 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpe4: gpio-controller@11400160 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400160 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpf0: gpio-controller@11400180 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11400180 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpf1: gpio-controller@114001A0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114001A0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpf2: gpio-controller@114001C0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114001C0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpf3: gpio-controller@114001E0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x114001E0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpj0: gpio-controller@11000000 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000000 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpj1: gpio-controller@11000020 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000020 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpk0: gpio-controller@11000040 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000040 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpk1: gpio-controller@11000060 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000060 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpk2: gpio-controller@11000080 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000080 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpk3: gpio-controller@110000A0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x110000A0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpl0: gpio-controller@110000C0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x110000C0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpl1: gpio-controller@110000E0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x110000E0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpl2: gpio-controller@11000100 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000100 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy0: gpio-controller@11000120 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000120 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy1: gpio-controller@11000140 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000140 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy2: gpio-controller@11000160 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000160 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy3: gpio-controller@11000180 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000180 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy4: gpio-controller@110001A0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x110001A0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy5: gpio-controller@110001C0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x110001C0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpy6: gpio-controller@110001E0 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x110001E0 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpx0: gpio-controller@11000C00 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000C00 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpx1: gpio-controller@11000C20 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000C20 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpx2: gpio-controller@11000C40 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000C40 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpx3: gpio-controller@11000C60 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x11000C60 0x20>;
+                        #gpio-cells = <4>;
+                };
+
+                gpz: gpio-controller@03860000 {
+                        compatible = "samsung,exynos4-gpio";
+                        reg = <0x03860000 0x20>;
+                        #gpio-cells = <4>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index aeb1a7578fad..305635bd45c0 100644
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -194,5 +194,17 @@
                         reg = <0xfff3d000 0x1000>;
                         interrupts = <0 92 4>;
                 };
+
+                ethernet@fff50000 {
+                        compatible = "calxeda,hb-xgmac";
+                        reg = <0xfff50000 0x1000>;
+                        interrupts = <0 77 4  0 78 4  0 79 4>;
+                };
+
+                ethernet@fff51000 {
+                        compatible = "calxeda,hb-xgmac";
+                        reg = <0xfff51000 0x1000>;
+                        interrupts = <0 80 4  0 81 4  0 82 4>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index f8766af11215..564cb8c19f15 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -35,20 +35,19 @@
                                 };
 
                                 esdhc@70008000 { /* ESDHC2 */
-                                        cd-gpios = <&gpio0 6 0>; /* GPIO1_6 */
-                                        wp-gpios = <&gpio0 5 0>; /* GPIO1_5 */
+                                        cd-gpios = <&gpio1 6 0>;
+                                        wp-gpios = <&gpio1 5 0>;
                                         status = "okay";
                                 };
 
-                                uart2: uart@7000c000 { /* UART3 */
+                                uart3: uart@7000c000 {
                                         fsl,uart-has-rtscts;
                                         status = "okay";
                                 };
 
                                 ecspi@70010000 { /* ECSPI1 */
                                         fsl,spi-num-chipselects = <2>;
-                                        cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */
-                                                   <&gpio3 25 0>; /* GPIO4_25 */
+                                        cs-gpios = <&gpio4 24 0>, <&gpio4 25 0>;
                                         status = "okay";
 
                                         pmic: mc13892@0 {
@@ -57,7 +56,7 @@
                                                 compatible = "fsl,mc13892";
                                                 spi-max-frequency = <6000000>;
                                                 reg = <0>;
-                                                mc13xxx-irq-gpios = <&gpio0 8 0>; /* GPIO1_8 */
+                                                mc13xxx-irq-gpios = <&gpio1 8 0>;
                                                 fsl,mc13xxx-uses-regulator;
                                         };
 
@@ -91,12 +90,12 @@
                                 reg = <0x73fa8000 0x4000>;
                         };
 
-                        uart0: uart@73fbc000 {
+                        uart1: uart@73fbc000 {
                                 fsl,uart-has-rtscts;
                                 status = "okay";
                         };
 
-                        uart1: uart@73fc0000 {
+                        uart2: uart@73fc0000 {
                                 status = "okay";
                         };
                 };
@@ -127,7 +126,7 @@
 
                 power {
                         label = "Power Button";
-                        gpios = <&gpio1 21 0>;
+                        gpios = <&gpio2 21 0>;
                         linux,code = <116>; /* KEY_POWER */
                         gpio-key,wakeup;
                 };
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 327ab8e3a4c8..6663986fe1c8 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -14,9 +14,9 @@
 
 / {
         aliases {
-                serial0 = &uart0;
-                serial1 = &uart1;
-                serial2 = &uart2;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
         };
 
         tzic: tz-interrupt-controller@e0000000 {
@@ -86,7 +86,7 @@
                                         status = "disabled";
                                 };
 
-                                uart2: uart@7000c000 { /* UART3 */
+                                uart3: uart@7000c000 {
                                         compatible = "fsl,imx51-uart", "fsl,imx21-uart";
                                         reg = <0x7000c000 0x4000>;
                                         interrupts = <33>;
@@ -117,7 +117,7 @@
                                 };
                         };
 
-                        gpio0: gpio@73f84000 { /* GPIO1 */
+                        gpio1: gpio@73f84000 {
                                 compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
                                 reg = <0x73f84000 0x4000>;
                                 interrupts = <50 51>;
@@ -127,7 +127,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio1: gpio@73f88000 { /* GPIO2 */
+                        gpio2: gpio@73f88000 {
                                 compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
                                 reg = <0x73f88000 0x4000>;
                                 interrupts = <52 53>;
@@ -137,7 +137,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio2: gpio@73f8c000 { /* GPIO3 */
+                        gpio3: gpio@73f8c000 {
                                 compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
                                 reg = <0x73f8c000 0x4000>;
                                 interrupts = <54 55>;
@@ -147,7 +147,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio3: gpio@73f90000 { /* GPIO4 */
+                        gpio4: gpio@73f90000 {
                                 compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
                                 reg = <0x73f90000 0x4000>;
                                 interrupts = <56 57>;
@@ -171,14 +171,14 @@
                                 status = "disabled";
                         };
 
-                        uart0: uart@73fbc000 {
+                        uart1: uart@73fbc000 {
                                 compatible = "fsl,imx51-uart", "fsl,imx21-uart";
                                 reg = <0x73fbc000 0x4000>;
                                 interrupts = <31>;
                                 status = "disabled";
                         };
 
-                        uart1: uart@73fc0000 {
+                        uart2: uart@73fc0000 {
                                 compatible = "fsl,imx51-uart", "fsl,imx21-uart";
                                 reg = <0x73fc0000 0x4000>;
                                 interrupts = <32>;
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts
index 2ab7f80a0a35..2dccce46ed81 100644
--- a/arch/arm/boot/dts/imx53-ard.dts
+++ b/arch/arm/boot/dts/imx53-ard.dts
@@ -29,8 +29,8 @@
                 aips@50000000 { /* AIPS1 */
                         spba@50000000 {
                                 esdhc@50004000 { /* ESDHC1 */
-                                        cd-gpios = <&gpio0 1 0>; /* GPIO1_1 */
-                                        wp-gpios = <&gpio0 9 0>; /* GPIO1_9 */
+                                        cd-gpios = <&gpio1 1 0>;
+                                        wp-gpios = <&gpio1 9 0>;
                                         status = "okay";
                                 };
                         };
@@ -44,7 +44,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart0: uart@53fbc000 { /* UART1 */
+                        uart1: uart@53fbc000 {
                                 status = "okay";
                         };
                 };
@@ -67,7 +67,7 @@
                         compatible = "smsc,lan9220", "smsc,lan9115";
                         reg = <0xf4000000 0x2000000>;
                         phy-mode = "mii";
-                        interrupt-parent = <&gpio1>;
+                        interrupt-parent = <&gpio2>;
                         interrupts = <31>;
                         reg-io-width = <4>;
                         smsc,irq-push-pull;
@@ -79,34 +79,34 @@
 
                 home {
                         label = "Home";
-                        gpios = <&gpio4 10 0>; /* GPIO5_10 */
+                        gpios = <&gpio5 10 0>;
                         linux,code = <102>; /* KEY_HOME */
                         gpio-key,wakeup;
                 };
 
                 back {
                         label = "Back";
-                        gpios = <&gpio4 11 0>; /* GPIO5_11 */
+                        gpios = <&gpio5 11 0>;
                         linux,code = <158>; /* KEY_BACK */
                         gpio-key,wakeup;
                 };
 
                 program {
                         label = "Program";
-                        gpios = <&gpio4 12 0>; /* GPIO5_12 */
+                        gpios = <&gpio5 12 0>;
                         linux,code = <362>; /* KEY_PROGRAM */
                         gpio-key,wakeup;
                 };
 
                 volume-up {
                         label = "Volume Up";
-                        gpios = <&gpio4 13 0>; /* GPIO5_13 */
+                        gpios = <&gpio5 13 0>;
                         linux,code = <115>; /* KEY_VOLUMEUP */
                 };
 
                 volume-down {
                         label = "Volume Down";
-                        gpios = <&gpio3 0 0>; /* GPIO4_0 */
+                        gpios = <&gpio4 0 0>;
                         linux,code = <114>; /* KEY_VOLUMEDOWN */
                 };
         };
diff --git a/arch/arm/boot/dts/imx53-evk.dts b/arch/arm/boot/dts/imx53-evk.dts
index 3f3a88185ff8..5bac4aa4800b 100644
--- a/arch/arm/boot/dts/imx53-evk.dts
+++ b/arch/arm/boot/dts/imx53-evk.dts
@@ -29,15 +29,14 @@
                 aips@50000000 { /* AIPS1 */
                         spba@50000000 {
                                 esdhc@50004000 { /* ESDHC1 */
-                                        cd-gpios = <&gpio2 13 0>; /* GPIO3_13 */
-                                        wp-gpios = <&gpio2 14 0>; /* GPIO3_14 */
+                                        cd-gpios = <&gpio3 13 0>;
+                                        wp-gpios = <&gpio3 14 0>;
                                         status = "okay";
                                 };
 
                                 ecspi@50010000 { /* ECSPI1 */
                                         fsl,spi-num-chipselects = <2>;
-                                        cs-gpios = <&gpio1 30 0>, /* GPIO2_30 */
-                                                   <&gpio2 19 0>; /* GPIO3_19 */
+                                        cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>;
                                         status = "okay";
 
                                         flash: at45db321d@1 {
@@ -61,8 +60,8 @@
                                 };
 
                                 esdhc@50020000 { /* ESDHC3 */
-                                        cd-gpios = <&gpio2 11 0>; /* GPIO3_11 */
-                                        wp-gpios = <&gpio2 12 0>; /* GPIO3_12 */
+                                        cd-gpios = <&gpio3 11 0>;
+                                        wp-gpios = <&gpio3 12 0>;
                                         status = "okay";
                                 };
                         };
@@ -76,7 +75,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart0: uart@53fbc000 { /* UART1 */
+                        uart1: uart@53fbc000 {
                                 status = "okay";
                         };
                 };
@@ -102,7 +101,7 @@
 
                         fec@63fec000 {
                                 phy-mode = "rmii";
-                                phy-reset-gpios = <&gpio6 6 0>; /* GPIO7_6 */
+                                phy-reset-gpios = <&gpio7 6 0>;
                                 status = "okay";
                         };
                 };
@@ -113,7 +112,7 @@
 
                 green {
                         label = "Heartbeat";
-                        gpios = <&gpio6 7 0>; /* GPIO7_7 */
+                        gpios = <&gpio7 7 0>;
                         linux,default-trigger = "heartbeat";
                 };
         };
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index ae6de6d0c3f1..5c57c8672c36 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -29,13 +29,13 @@
                 aips@50000000 { /* AIPS1 */
                         spba@50000000 {
                                 esdhc@50004000 { /* ESDHC1 */
-                                        cd-gpios = <&gpio2 13 0>; /* GPIO3_13 */
+                                        cd-gpios = <&gpio3 13 0>;
                                         status = "okay";
                                 };
 
                                 esdhc@50020000 { /* ESDHC3 */
-                                        cd-gpios = <&gpio2 11 0>; /* GPIO3_11 */
-                                        wp-gpios = <&gpio2 12 0>; /* GPIO3_12 */
+                                        cd-gpios = <&gpio3 11 0>;
+                                        wp-gpios = <&gpio3 12 0>;
                                         status = "okay";
                                 };
                         };
@@ -49,7 +49,7 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart0: uart@53fbc000 { /* UART1 */
+                        uart1: uart@53fbc000 {
                                 status = "okay";
                         };
                 };
@@ -84,7 +84,7 @@
 
                         fec@63fec000 {
                                 phy-mode = "rmii";
-                                phy-reset-gpios = <&gpio6 6 0>; /* GPIO7_6 */
+                                phy-reset-gpios = <&gpio7 6 0>;
                                 status = "okay";
                         };
                 };
@@ -95,20 +95,20 @@
 
                 power {
                         label = "Power Button";
-                        gpios = <&gpio0 8 0>; /* GPIO1_8 */
+                        gpios = <&gpio1 8 0>;
                         linux,code = <116>; /* KEY_POWER */
                         gpio-key,wakeup;
                 };
 
                 volume-up {
                         label = "Volume Up";
-                        gpios = <&gpio1 14 0>; /* GPIO2_14 */
+                        gpios = <&gpio2 14 0>;
                         linux,code = <115>; /* KEY_VOLUMEUP */
                 };
 
                 volume-down {
                         label = "Volume Down";
-                        gpios = <&gpio1 15 0>; /* GPIO2_15 */
+                        gpios = <&gpio2 15 0>;
                         linux,code = <114>; /* KEY_VOLUMEDOWN */
                 };
         };
@@ -118,7 +118,7 @@
 
                 user {
                         label = "Heartbeat";
-                        gpios = <&gpio6 7 0>; /* GPIO7_7 */
+                        gpios = <&gpio7 7 0>;
                         linux,default-trigger = "heartbeat";
                 };
         };
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts
index b1c062eea715..c7ee86c2dfb5 100644
--- a/arch/arm/boot/dts/imx53-smd.dts
+++ b/arch/arm/boot/dts/imx53-smd.dts
@@ -29,8 +29,8 @@
                 aips@50000000 { /* AIPS1 */
                         spba@50000000 {
                                 esdhc@50004000 { /* ESDHC1 */
-                                        cd-gpios = <&gpio2 13 0>; /* GPIO3_13 */
-                                        wp-gpios = <&gpio3 11 0>; /* GPIO4_11 */
+                                        cd-gpios = <&gpio3 13 0>;
+                                        wp-gpios = <&gpio4 11 0>;
                                         status = "okay";
                                 };
 
@@ -39,15 +39,14 @@
                                         status = "okay";
                                 };
 
-                                uart2: uart@5000c000 { /* UART3 */
+                                uart3: uart@5000c000 {
                                         fsl,uart-has-rtscts;
                                         status = "okay";
                                 };
 
                                 ecspi@50010000 { /* ECSPI1 */
                                         fsl,spi-num-chipselects = <2>;
-                                        cs-gpios = <&gpio1 30 0>, /* GPIO2_30 */
-                                                   <&gpio2 19 0>; /* GPIO3_19 */
+                                        cs-gpios = <&gpio2 30 0>, <&gpio3 19 0>;
                                         status = "okay";
 
                                         zigbee: mc1323@0 {
@@ -91,11 +90,11 @@
                                 reg = <0x53fa8000 0x4000>;
                         };
 
-                        uart0: uart@53fbc000 { /* UART1 */
+                        uart1: uart@53fbc000 {
                                 status = "okay";
                         };
 
-                        uart1: uart@53fc0000 { /* UART2 */
+                        uart2: uart@53fc0000 {
                                 status = "okay";
                         };
                 };
@@ -145,7 +144,7 @@
 
                         fec@63fec000 {
                                 phy-mode = "rmii";
-                                phy-reset-gpios = <&gpio6 6 0>; /* GPIO7_6 */
+                                phy-reset-gpios = <&gpio7 6 0>;
                                 status = "okay";
                         };
                 };
@@ -156,13 +155,13 @@
 
                 volume-up {
                         label = "Volume Up";
-                        gpios = <&gpio1 14 0>; /* GPIO2_14 */
+                        gpios = <&gpio2 14 0>;
                         linux,code = <115>; /* KEY_VOLUMEUP */
                 };
 
                 volume-down {
                         label = "Volume Down";
-                        gpios = <&gpio1 15 0>; /* GPIO2_15 */
+                        gpios = <&gpio2 15 0>;
                         linux,code = <114>; /* KEY_VOLUMEDOWN */
                 };
         };
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 099cd84ee372..5dd91b942c91 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -14,11 +14,11 @@
 
 / {
         aliases {
-                serial0 = &uart0;
-                serial1 = &uart1;
-                serial2 = &uart2;
-                serial3 = &uart3;
-                serial4 = &uart4;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+                serial4 = &uart5;
         };
 
         tzic: tz-interrupt-controller@0fffc000 {
@@ -88,7 +88,7 @@
                                         status = "disabled";
                                 };
 
-                                uart2: uart@5000c000 { /* UART3 */
+                                uart3: uart@5000c000 {
                                         compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                         reg = <0x5000c000 0x4000>;
                                         interrupts = <33>;
@@ -119,7 +119,7 @@
                                 };
                         };
 
-                        gpio0: gpio@53f84000 { /* GPIO1 */
+                        gpio1: gpio@53f84000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53f84000 0x4000>;
                                 interrupts = <50 51>;
@@ -129,7 +129,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio1: gpio@53f88000 { /* GPIO2 */
+                        gpio2: gpio@53f88000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53f88000 0x4000>;
                                 interrupts = <52 53>;
@@ -139,7 +139,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio2: gpio@53f8c000 { /* GPIO3 */
+                        gpio3: gpio@53f8c000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53f8c000 0x4000>;
                                 interrupts = <54 55>;
@@ -149,7 +149,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio3: gpio@53f90000 { /* GPIO4 */
+                        gpio4: gpio@53f90000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53f90000 0x4000>;
                                 interrupts = <56 57>;
@@ -173,21 +173,21 @@
                                 status = "disabled";
                         };
 
-                        uart0: uart@53fbc000 { /* UART1 */
+                        uart1: uart@53fbc000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x53fbc000 0x4000>;
                                 interrupts = <31>;
                                 status = "disabled";
                         };
 
-                        uart1: uart@53fc0000 { /* UART2 */
+                        uart2: uart@53fc0000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x53fc0000 0x4000>;
                                 interrupts = <32>;
                                 status = "disabled";
                         };
 
-                        gpio4: gpio@53fdc000 { /* GPIO5 */
+                        gpio5: gpio@53fdc000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53fdc000 0x4000>;
                                 interrupts = <103 104>;
@@ -197,7 +197,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio5: gpio@53fe0000 { /* GPIO6 */
+                        gpio6: gpio@53fe0000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53fe0000 0x4000>;
                                 interrupts = <105 106>;
@@ -207,7 +207,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio6: gpio@53fe4000 { /* GPIO7 */
+                        gpio7: gpio@53fe4000 {
                                 compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                 reg = <0x53fe4000 0x4000>;
                                 interrupts = <107 108>;
@@ -226,7 +226,7 @@
                                 status = "disabled";
                         };
 
-                        uart3: uart@53ff0000 { /* UART4 */
+                        uart4: uart@53ff0000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x53ff0000 0x4000>;
                                 interrupts = <13>;
@@ -241,7 +241,7 @@
                         reg = <0x60000000 0x10000000>;
                         ranges;
 
-                        uart4: uart@63f90000 { /* UART5 */
+                        uart5: uart@63f90000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x63f90000 0x4000>;
                                 interrupts = <86>;
diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 072974e443f2..c3977e0478b9 100644
--- a/arch/arm/boot/dts/imx6q-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -14,8 +14,8 @@
 /include/ "imx6q.dtsi"
 
 / {
-        model = "Freescale i.MX6 Quad SABRE Automotive Board";
-        compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
+        model = "Freescale i.MX6 Quad Armadillo2 Board";
+        compatible = "fsl,imx6q-arm2", "fsl,imx6q";
 
         chosen {
                 bootargs = "console=ttymxc0,115200 root=/dev/mmcblk3p3 rootwait";
@@ -34,8 +34,8 @@
                         };
 
                         usdhc@02198000 { /* uSDHC3 */
-                                cd-gpios = <&gpio5 11 0>; /* GPIO6_11 */
-                                wp-gpios = <&gpio5 14 0>; /* GPIO6_14 */
+                                cd-gpios = <&gpio6 11 0>;
+                                wp-gpios = <&gpio6 14 0>;
                                 status = "okay";
                         };
 
@@ -44,7 +44,7 @@
                                 status = "okay";
                         };
 
-                        uart3: uart@021f0000 { /* UART4 */
+                        uart4: uart@021f0000 {
                                 status = "okay";
                         };
                 };
@@ -55,7 +55,7 @@
 
                 debug-led {
                         label = "Heartbeat";
-                        gpios = <&gpio2 25 0>; /* GPIO3_25 */
+                        gpios = <&gpio3 25 0>;
                         linux,default-trigger = "heartbeat";
                 };
         };
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
new file mode 100644
index 000000000000..08d920de7286
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * 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
+ */
+
+/dts-v1/;
+/include/ "imx6q.dtsi"
+
+/ {
+        model = "Freescale i.MX6 Quad SABRE Lite Board";
+        compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
+
+        memory {
+                reg = <0x10000000 0x40000000>;
+        };
+
+        soc {
+                aips-bus@02100000 { /* AIPS2 */
+                        enet@02188000 {
+                                phy-mode = "rgmii";
+                                phy-reset-gpios = <&gpio3 23 0>;
+                                status = "okay";
+                        };
+
+                        usdhc@02198000 { /* uSDHC3 */
+                                cd-gpios = <&gpio7 0 0>;
+                                wp-gpios = <&gpio7 1 0>;
+                                status = "okay";
+                        };
+
+                        usdhc@0219c000 { /* uSDHC4 */
+                                cd-gpios = <&gpio2 6 0>;
+                                wp-gpios = <&gpio2 7 0>;
+                                status = "okay";
+                        };
+
+                        uart2: uart@021e8000 {
+                                status = "okay";
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 7dda599558cc..263e8f3664b5 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -14,11 +14,11 @@
 
 / {
         aliases {
-                serial0 = &uart0;
-                serial1 = &uart1;
-                serial2 = &uart2;
-                serial3 = &uart3;
-                serial4 = &uart4;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+                serial4 = &uart5;
         };
 
         cpus {
@@ -165,7 +165,7 @@
                                         status = "disabled";
                                 };
 
-                                uart0: uart@02020000 { /* UART1 */
+                                uart1: uart@02020000 {
                                         compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02020000 0x4000>;
                                         interrupts = <0 26 0x04>;
@@ -247,7 +247,7 @@
                                 interrupts = <0 55 0x04>;
                         };
 
-                        gpio0: gpio@0209c000 { /* GPIO1 */
+                        gpio1: gpio@0209c000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x0209c000 0x4000>;
                                 interrupts = <0 66 0x04 0 67 0x04>;
@@ -257,7 +257,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio1: gpio@020a0000 { /* GPIO2 */
+                        gpio2: gpio@020a0000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x020a0000 0x4000>;
                                 interrupts = <0 68 0x04 0 69 0x04>;
@@ -267,7 +267,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio2: gpio@020a4000 { /* GPIO3 */
+                        gpio3: gpio@020a4000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x020a4000 0x4000>;
                                 interrupts = <0 70 0x04 0 71 0x04>;
@@ -277,7 +277,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio3: gpio@020a8000 { /* GPIO4 */
+                        gpio4: gpio@020a8000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x020a8000 0x4000>;
                                 interrupts = <0 72 0x04 0 73 0x04>;
@@ -287,7 +287,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio4: gpio@020ac000 { /* GPIO5 */
+                        gpio5: gpio@020ac000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x020ac000 0x4000>;
                                 interrupts = <0 74 0x04 0 75 0x04>;
@@ -297,7 +297,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio5: gpio@020b0000 { /* GPIO6 */
+                        gpio6: gpio@020b0000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x020b0000 0x4000>;
                                 interrupts = <0 76 0x04 0 77 0x04>;
@@ -307,7 +307,7 @@
                                 #interrupt-cells = <1>;
                         };
 
-                        gpio6: gpio@020b4000 { /* GPIO7 */
+                        gpio7: gpio@020b4000 {
                                 compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                 reg = <0x020b4000 0x4000>;
                                 interrupts = <0 78 0x04 0 79 0x04>;
@@ -543,28 +543,28 @@
                                 interrupts = <0 18 0x04>;
                         };
 
-                        uart1: uart@021e8000 { /* UART2 */
+                        uart2: uart@021e8000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021e8000 0x4000>;
                                 interrupts = <0 27 0x04>;
                                 status = "disabled";
                         };
 
-                        uart2: uart@021ec000 { /* UART3 */
+                        uart3: uart@021ec000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021ec000 0x4000>;
                                 interrupts = <0 28 0x04>;
                                 status = "disabled";
                         };
 
-                        uart3: uart@021f0000 { /* UART4 */
+                        uart4: uart@021f0000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021f0000 0x4000>;
                                 interrupts = <0 29 0x04>;
                                 status = "disabled";
                         };
 
-                        uart4: uart@021f4000 { /* UART5 */
+                        uart5: uart@021f4000 {
                                 compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                 reg = <0x021f4000 0x4000>;
                                 interrupts = <0 30 0x04>;
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
new file mode 100644
index 000000000000..f2ab4ea7cc0e
--- /dev/null
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -0,0 +1,67 @@
+/*
+ * Device Tree Source for OMAP2 SoC
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
+
+        aliases {
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+        };
+
+        cpus {
+                cpu@0 {
+                        compatible = "arm,arm1136jf-s";
+                };
+        };
+
+        soc {
+                compatible = "ti,omap-infra";
+                mpu {
+                        compatible = "ti,omap2-mpu";
+                        ti,hwmods = "mpu";
+                };
+        };
+
+        ocp {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                ti,hwmods = "l3_main";
+
+                intc: interrupt-controller@1 {
+                        compatible = "ti,omap2-intc";
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                };
+
+                uart1: serial@4806a000 {
+                        compatible = "ti,omap2-uart";
+                        ti,hwmods = "uart1";
+                        clock-frequency = <48000000>;
+                };
+
+                uart2: serial@4806c000 {
+                        compatible = "ti,omap2-uart";
+                        ti,hwmods = "uart2";
+                        clock-frequency = <48000000>;
+                };
+
+                uart3: serial@4806e000 {
+                        compatible = "ti,omap2-uart";
+                        ti,hwmods = "uart3";
+                        clock-frequency = <48000000>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index d202bb5ec7ef..216c3317461d 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -13,6 +13,13 @@
 / {
         compatible = "ti,omap3430", "ti,omap3";
 
+        aliases {
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+        };
+
         cpus {
                 cpu@0 {
                         compatible = "arm,cortex-a8";
@@ -59,5 +66,29 @@
                         interrupt-controller;
                         #interrupt-cells = <1>;
                 };
+
+                uart1: serial@0x4806a000 {
+                        compatible = "ti,omap3-uart";
+                        ti,hwmods = "uart1";
+                        clock-frequency = <48000000>;
+                };
+
+                uart2: serial@0x4806c000 {
+                        compatible = "ti,omap3-uart";
+                        ti,hwmods = "uart2";
+                        clock-frequency = <48000000>;
+                };
+
+                uart3: serial@0x49020000 {
+                        compatible = "ti,omap3-uart";
+                        ti,hwmods = "uart3";
+                        clock-frequency = <48000000>;
+                };
+
+                uart4: serial@0x49042000 {
+                        compatible = "ti,omap3-uart";
+                        ti,hwmods = "uart4";
+                        clock-frequency = <48000000>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 4c61c829043a..e8fe75fac7c5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -21,6 +21,10 @@
         interrupt-parent = <&gic>;
 
         aliases {
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
         };
 
         cpus {
@@ -99,5 +103,29 @@
                         reg = <0x48241000 0x1000>,
                               <0x48240100 0x0100>;
                 };
+
+                uart1: serial@0x4806a000 {
+                        compatible = "ti,omap4-uart";
+                        ti,hwmods = "uart1";
+                        clock-frequency = <48000000>;
+                };
+
+                uart2: serial@0x4806c000 {
+                        compatible = "ti,omap4-uart";
+                        ti,hwmods = "uart2";
+                        clock-frequency = <48000000>;
+                };
+
+                uart3: serial@0x48020000 {
+                        compatible = "ti,omap4-uart";
+                        ti,hwmods = "uart3";
+                        clock-frequency = <48000000>;
+                };
+
+                uart4: serial@0x4806e000 {
+                        compatible = "ti,omap4-uart";
+                        ti,hwmods = "uart4";
+                        clock-frequency = <48000000>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts
new file mode 100644
index 000000000000..70c41fc897d7
--- /dev/null
+++ b/arch/arm/boot/dts/tegra-cardhu.dts
@@ -0,0 +1,36 @@
+/dts-v1/;
+
+/include/ "tegra30.dtsi"
+
+/ {
+        model = "NVIDIA Tegra30 Cardhu evaluation board";
+        compatible = "nvidia,cardhu", "nvidia,tegra30";
+
+        memory {
+                reg = < 0x80000000 0x40000000 >;
+        };
+
+        serial@70006000 {
+                clock-frequency = < 408000000 >;
+        };
+
+        i2c@7000c000 {
+                clock-frequency = <100000>;
+        };
+
+        i2c@7000c400 {
+                clock-frequency = <100000>;
+        };
+
+        i2c@7000c500 {
+                clock-frequency = <100000>;
+        };
+
+        i2c@7000c700 {
+                clock-frequency = <100000>;
+        };
+
+        i2c@7000d000 {
+                clock-frequency = <100000>;
+        };
+};
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts
index 0e225b86b652..80afa1b70b80 100644
--- a/arch/arm/boot/dts/tegra-harmony.dts
+++ b/arch/arm/boot/dts/tegra-harmony.dts
@@ -1,16 +1,11 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
         model = "NVIDIA Tegra2 Harmony evaluation board";
         compatible = "nvidia,harmony", "nvidia,tegra20";
 
-        chosen {
-                bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait";
-        };
-
         memory@0 {
                 reg = < 0x00000000 0x40000000 >;
         };
@@ -52,16 +47,40 @@
                 ext-mic-en-gpios = <&gpio 185 0>;
         };
 
+        serial@70006000 {
+                status = "disable";
+        };
+
+        serial@70006040 {
+                status = "disable";
+        };
+
+        serial@70006200 {
+                status = "disable";
+        };
+
         serial@70006300 {
                 clock-frequency = < 216000000 >;
         };
 
+        serial@70006400 {
+                status = "disable";
+        };
+
+        sdhci@c8000000 {
+                status = "disable";
+        };
+
         sdhci@c8000200 {
                 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
                 power-gpios = <&gpio 155 0>; /* gpio PT3 */
         };
 
+        sdhci@c8000400 {
+                status = "disable";
+        };
+
         sdhci@c8000600 {
                 cd-gpios = <&gpio 58 0>; /* gpio PH2 */
                 wp-gpios = <&gpio 59 0>; /* gpio PH3 */
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
new file mode 100644
index 000000000000..1a1d7023b69b
--- /dev/null
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -0,0 +1,77 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+        model = "Toshiba AC100 / Dynabook AZ";
+        compatible = "compal,paz00", "nvidia,tegra20";
+
+        memory@0 {
+                reg = <0x00000000 0x20000000>;
+        };
+
+        i2c@7000c000 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c400 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c500 {
+                status = "disable";
+        };
+
+        nvec@7000c500 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "nvidia,nvec";
+                reg = <0x7000C500 0x100>;
+                interrupts = <0 92 0x04>;
+                clock-frequency = <80000>;
+                request-gpios = <&gpio 170 0>;
+                slave-addr = <138>;
+        };
+
+        i2c@7000d000 {
+                clock-frequency = <400000>;
+        };
+
+        serial@70006000 {
+                clock-frequency = <216000000>;
+        };
+
+        serial@70006040 {
+                status = "disable";
+        };
+
+        serial@70006200 {
+                status = "disable";
+        };
+
+        serial@70006300 {
+                clock-frequency = <216000000>;
+        };
+
+        serial@70006400 {
+                status = "disable";
+        };
+
+        sdhci@c8000000 {
+                cd-gpios = <&gpio 173 0>; /* gpio PV5 */
+                wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
+                power-gpios = <&gpio 155 0>; /* gpio PT3 */
+        };
+
+        sdhci@c8000200 {
+                status = "disable";
+        };
+
+        sdhci@c8000400 {
+                status = "disable";
+        };
+
+        sdhci@c8000600 {
+                support-8bit;
+        };
+};
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index a72299b8e668..b55a02e34ba7 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -1,25 +1,65 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
         model = "NVIDIA Seaboard";
         compatible = "nvidia,seaboard", "nvidia,tegra20";
 
-        chosen {
-                bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait";
-        };
-
         memory {
                 device_type = "memory";
                 reg = < 0x00000000 0x40000000 >;
         };
 
+        i2c@7000c000 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c400 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c500 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000d000 {
+                clock-frequency = <400000>;
+
+                adt7461@4c {
+                        compatible = "adt7461";
+                        reg = <0x4c>;
+                };
+        };
+
+        serial@70006000 {
+                status = "disable";
+        };
+
+        serial@70006040 {
+                status = "disable";
+        };
+
+        serial@70006200 {
+                status = "disable";
+        };
+
         serial@70006300 {
                 clock-frequency = < 216000000 >;
         };
 
+        serial@70006400 {
+                status = "disable";
+        };
+
+        sdhci@c8000000 {
+                status = "disable";
+        };
+
+        sdhci@c8000200 {
+                status = "disable";
+        };
+
         sdhci@c8000400 {
                 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
@@ -29,4 +69,28 @@
         sdhci@c8000600 {
                 support-8bit;
         };
+
+        usb@c5000000 {
+                nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                power {
+                        label = "Power";
+                        gpios = <&gpio 170 1>; /* gpio PV2, active low */
+                        linux,code = <116>; /* KEY_POWER */
+                        gpio-key,wakeup;
+                };
+
+                lid {
+                        label = "Lid";
+                        gpios = <&gpio 23 0>; /* gpio PC7 */
+                        linux,input-type = <5>; /* EV_SW */
+                        linux,code = <0>; /* SW_LID */
+                        debounce-interval = <1>;
+                        gpio-key,wakeup;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts
new file mode 100644
index 000000000000..3b3ee7db99f3
--- /dev/null
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -0,0 +1,65 @@
+/dts-v1/;
+
+/include/ "tegra20.dtsi"
+
+/ {
+        model = "Compulab TrimSlice board";
+        compatible = "compulab,trimslice", "nvidia,tegra20";
+
+        memory@0 {
+                reg = < 0x00000000 0x40000000 >;
+        };
+
+        i2c@7000c000 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c400 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c500 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000d000 {
+                status = "disable";
+        };
+
+        serial@70006000 {
+                clock-frequency = < 216000000 >;
+        };
+
+        serial@70006040 {
+                status = "disable";
+        };
+
+        serial@70006200 {
+                status = "disable";
+        };
+
+        serial@70006300 {
+                status = "disable";
+        };
+
+        serial@70006400 {
+                status = "disable";
+        };
+
+        sdhci@c8000000 {
+                status = "disable";
+        };
+
+        sdhci@c8000200 {
+                status = "disable";
+        };
+
+        sdhci@c8000400 {
+                status = "disable";
+        };
+
+        sdhci@c8000600 {
+                cd-gpios = <&gpio 121 0>;
+                wp-gpios = <&gpio 122 0>;
+        };
+};
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts
index 3f9abd6b6964..c7d3b87f29df 100644
--- a/arch/arm/boot/dts/tegra-ventana.dts
+++ b/arch/arm/boot/dts/tegra-ventana.dts
@@ -1,24 +1,59 @@
 /dts-v1/;
 
-/memreserve/ 0x1c000000 0x04000000;
 /include/ "tegra20.dtsi"
 
 / {
         model = "NVIDIA Tegra2 Ventana evaluation board";
         compatible = "nvidia,ventana", "nvidia,tegra20";
 
-        chosen {
-                bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init";
-        };
-
         memory {
                 reg = < 0x00000000 0x40000000 >;
         };
 
+        i2c@7000c000 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c400 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000c500 {
+                clock-frequency = <400000>;
+        };
+
+        i2c@7000d000 {
+                clock-frequency = <400000>;
+        };
+
+        serial@70006000 {
+                status = "disable";
+        };
+
+        serial@70006040 {
+                status = "disable";
+        };
+
+        serial@70006200 {
+                status = "disable";
+        };
+
         serial@70006300 {
                 clock-frequency = < 216000000 >;
         };
 
+        serial@70006400 {
+                status = "disable";
+        };
+
+        sdhci@c8000000 {
+                status = "disable";
+        };
+
+        sdhci@c8000200 {
+                status = "disable";
+        };
+
         sdhci@c8000400 {
                 cd-gpios = <&gpio 69 0>; /* gpio PI5 */
                 wp-gpios = <&gpio 57 0>; /* gpio PH1 */
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 65d7e6a333eb..3da7afd45322 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -5,9 +5,9 @@
         interrupt-parent = <&intc>;
 
         intc: interrupt-controller@50041000 {
-                compatible = "nvidia,tegra20-gic";
+                compatible = "arm,cortex-a9-gic";
                 interrupt-controller;
-                #interrupt-cells = <1>;
+                #interrupt-cells = <3>;
                 reg = < 0x50041000 0x1000 >,
                       < 0x50040100 0x0100 >;
         };
@@ -17,7 +17,7 @@
                 #size-cells = <0>;
                 compatible = "nvidia,tegra20-i2c";
                 reg = <0x7000C000 0x100>;
-                interrupts = < 70 >;
+                interrupts = < 0 38 0x04 >;
         };
 
         i2c@7000c400 {
@@ -25,7 +25,7 @@
                 #size-cells = <0>;
                 compatible = "nvidia,tegra20-i2c";
                 reg = <0x7000C400 0x100>;
-                interrupts = < 116 >;
+                interrupts = < 0 84 0x04 >;
         };
 
         i2c@7000c500 {
@@ -33,38 +33,32 @@
                 #size-cells = <0>;
                 compatible = "nvidia,tegra20-i2c";
                 reg = <0x7000C500 0x100>;
-                interrupts = < 124 >;
+                interrupts = < 0 92 0x04 >;
         };
 
         i2c@7000d000 {
                 #address-cells = <1>;
                 #size-cells = <0>;
-                compatible = "nvidia,tegra20-i2c";
+                compatible = "nvidia,tegra20-i2c-dvc";
                 reg = <0x7000D000 0x200>;
-                interrupts = < 85 >;
+                interrupts = < 0 53 0x04 >;
         };
 
         i2s@70002800 {
-                #address-cells = <1>;
-                #size-cells = <0>;
                 compatible = "nvidia,tegra20-i2s";
                 reg = <0x70002800 0x200>;
-                interrupts = < 45 >;
+                interrupts = < 0 13 0x04 >;
                 dma-channel = < 2 >;
         };
 
         i2s@70002a00 {
-                #address-cells = <1>;
-                #size-cells = <0>;
                 compatible = "nvidia,tegra20-i2s";
                 reg = <0x70002a00 0x200>;
-                interrupts = < 35 >;
+                interrupts = < 0 3 0x04 >;
                 dma-channel = < 1 >;
         };
 
         das@70000c00 {
-                #address-cells = <1>;
-                #size-cells = <0>;
                 compatible = "nvidia,tegra20-das";
                 reg = <0x70000c00 0x80>;
         };
@@ -72,7 +66,13 @@
         gpio: gpio@6000d000 {
                 compatible = "nvidia,tegra20-gpio";
                 reg = < 0x6000d000 0x1000 >;
-                interrupts = < 64 65 66 67 87 119 121 >;
+                interrupts = < 0 32 0x04
+                               0 33 0x04
+                               0 34 0x04
+                               0 35 0x04
+                               0 55 0x04
+                               0 87 0x04
+                               0 89 0x04 >;
                 #gpio-cells = <2>;
                 gpio-controller;
         };
@@ -89,59 +89,80 @@
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006000 0x40>;
                 reg-shift = <2>;
-                interrupts = < 68 >;
+                interrupts = < 0 36 0x04 >;
         };
 
         serial@70006040 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006040 0x40>;
                 reg-shift = <2>;
-                interrupts = < 69 >;
+                interrupts = < 0 37 0x04 >;
         };
 
         serial@70006200 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006200 0x100>;
                 reg-shift = <2>;
-                interrupts = < 78 >;
+                interrupts = < 0 46 0x04 >;
         };
 
         serial@70006300 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006300 0x100>;
                 reg-shift = <2>;
-                interrupts = < 122 >;
+                interrupts = < 0 90 0x04 >;
         };
 
         serial@70006400 {
                 compatible = "nvidia,tegra20-uart";
                 reg = <0x70006400 0x100>;
                 reg-shift = <2>;
-                interrupts = < 123 >;
+                interrupts = < 0 91 0x04 >;
         };
 
         sdhci@c8000000 {
                 compatible = "nvidia,tegra20-sdhci";
                 reg = <0xc8000000 0x200>;
-                interrupts = < 46 >;
+                interrupts = < 0 14 0x04 >;
         };
 
         sdhci@c8000200 {
                 compatible = "nvidia,tegra20-sdhci";
                 reg = <0xc8000200 0x200>;
-                interrupts = < 47 >;
+                interrupts = < 0 15 0x04 >;
         };
 
         sdhci@c8000400 {
                 compatible = "nvidia,tegra20-sdhci";
                 reg = <0xc8000400 0x200>;
-                interrupts = < 51 >;
+                interrupts = < 0 19 0x04 >;
         };
 
         sdhci@c8000600 {
                 compatible = "nvidia,tegra20-sdhci";
                 reg = <0xc8000600 0x200>;
-                interrupts = < 63 >;
+                interrupts = < 0 31 0x04 >;
+        };
+
+        usb@c5000000 {
+                compatible = "nvidia,tegra20-ehci", "usb-ehci";
+                reg = <0xc5000000 0x4000>;
+                interrupts = < 0 20 0x04 >;
+                phy_type = "utmi";
+        };
+
+        usb@c5004000 {
+                compatible = "nvidia,tegra20-ehci", "usb-ehci";
+                reg = <0xc5004000 0x4000>;
+                interrupts = < 0 21 0x04 >;
+                phy_type = "ulpi";
+        };
+
+        usb@c5008000 {
+                compatible = "nvidia,tegra20-ehci", "usb-ehci";
+                reg = <0xc5008000 0x4000>;
+                interrupts = < 0 97 0x04 >;
+                phy_type = "utmi";
         };
 };
 
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
new file mode 100644
index 000000000000..ee7db9892e02
--- /dev/null
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -0,0 +1,127 @@
+/include/ "skeleton.dtsi"
+
+/ {
+        compatible = "nvidia,tegra30";
+        interrupt-parent = <&intc>;
+
+        intc: interrupt-controller@50041000 {
+                compatible = "arm,cortex-a9-gic";
+                interrupt-controller;
+                #interrupt-cells = <3>;
+                reg = < 0x50041000 0x1000 >,
+                      < 0x50040100 0x0100 >;
+        };
+
+        i2c@7000c000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible =  "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000C000 0x100>;
+                interrupts = < 0 38 0x04 >;
+        };
+
+        i2c@7000c400 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000C400 0x100>;
+                interrupts = < 0 84 0x04 >;
+        };
+
+        i2c@7000c500 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000C500 0x100>;
+                interrupts = < 0 92 0x04 >;
+        };
+
+        i2c@7000c700 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000c700 0x100>;
+                interrupts = < 0 120 0x04 >;
+        };
+
+        i2c@7000d000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c";
+                reg = <0x7000D000 0x100>;
+                interrupts = < 0 53 0x04 >;
+        };
+
+        gpio: gpio@6000d000 {
+                compatible = "nvidia,tegra30-gpio", "nvidia,tegra20-gpio";
+                reg = < 0x6000d000 0x1000 >;
+                interrupts = < 0 32 0x04 0 33 0x04 0 34 0x04 0 35 0x04 0 55 0x04 0 87 0x04 0 89 0x04 >;
+                #gpio-cells = <2>;
+                gpio-controller;
+        };
+
+        serial@70006000 {
+                compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
+                reg = <0x70006000 0x40>;
+                reg-shift = <2>;
+                interrupts = < 0 36 0x04 >;
+        };
+
+        serial@70006040 {
+                compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
+                reg = <0x70006040 0x40>;
+                reg-shift = <2>;
+                interrupts = < 0 37 0x04 >;
+        };
+
+        serial@70006200 {
+                compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
+                reg = <0x70006200 0x100>;
+                reg-shift = <2>;
+                interrupts = < 0 46 0x04 >;
+        };
+
+        serial@70006300 {
+                compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
+                reg = <0x70006300 0x100>;
+                reg-shift = <2>;
+                interrupts = < 0 90 0x04 >;
+        };
+
+        serial@70006400 {
+                compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart";
+                reg = <0x70006400 0x100>;
+                reg-shift = <2>;
+                interrupts = < 0 91 0x04 >;
+        };
+
+        sdhci@78000000 {
+                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+                reg = <0x78000000 0x200>;
+                interrupts = < 0 14 0x04 >;
+        };
+
+        sdhci@78000200 {
+                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+                reg = <0x78000200 0x200>;
+                interrupts = < 0 15 0x04 >;
+        };
+
+        sdhci@78000400 {
+                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+                reg = <0x78000400 0x200>;
+                interrupts = < 0 19 0x04 >;
+        };
+
+        sdhci@78000600 {
+                compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci";
+                reg = <0x78000600 0x200>;
+                interrupts = < 0 31 0x04 >;
+        };
+
+        pinmux: pinmux@70000000 {
+                compatible = "nvidia,tegra30-pinmux";
+                reg = < 0x70000868 0xd0     /* Pad control registers */
+                        0x70003000 0x3e0 >; /* Mux registers */
+        };
+};
diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts
index d66e2c00ac35..f04b535477f5 100644
--- a/arch/arm/boot/dts/usb_a9g20.dts
+++ b/arch/arm/boot/dts/usb_a9g20.dts
@@ -25,6 +25,11 @@
                         dbgu: serial@fffff200 {
                                 status = "okay";
                         };
+
+                        macb0: ethernet@fffc4000 {
+                                phy-mode = "rmii";
+                                status = "okay";
+                        };
                 };
         };
 };
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index cf497ce41dfe..a22e93079063 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -68,7 +68,6 @@ CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_GEOMETRY=y
 # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
 # CONFIG_MTD_CFI_I2 is not set
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_PHYSMAP=y
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 945a34f2a34d..dde2a1af7b39 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -48,7 +48,6 @@ CONFIG_MACH_SX1=y
 CONFIG_MACH_NOKIA770=y
 CONFIG_MACH_AMS_DELTA=y
 CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_OMAP_ARM_182MHZ=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_PCCARD=y
 CONFIG_OMAP_CF=y
diff --git a/arch/arm/configs/pcontrol_g20_defconfig b/arch/arm/configs/pcontrol_g20_defconfig
deleted file mode 100644
index c75c9fcede58..000000000000
--- a/arch/arm/configs/pcontrol_g20_defconfig
+++ /dev/null
@@ -1,175 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_CROSS_COMPILE="/opt/arm-2010q1/bin/arm-none-linux-gnueabi-"
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_TREE_PREEMPT_RCU=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_NAMESPACES=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_DEFAULT_DEADLINE=y
-CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT91SAM9G20=y
-CONFIG_MACH_PCONTROL_G20=y
-CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS0,115200 mem=128M mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) root=/dev/mmcblk0p1 rootwait rw"
-CONFIG_VFP=y
-CONFIG_BINFMT_MISC=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=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_IPV6 is not set
-CONFIG_VLAN_8021Q=y
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FW_LOADER is not set
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHRAM=m
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_ATMEL_TCLIB=y
-CONFIG_EEPROM_AT24=m
-CONFIG_SCSI=m
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_NETDEVICES=y
-CONFIG_MACVLAN=m
-CONFIG_TUN=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MACB=y
-CONFIG_SMSC911X=m
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-CONFIG_PPP=m
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_MPPE=m
-CONFIG_INPUT_POLLDEV=y
-CONFIG_INPUT_SPARSEKMAP=y
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-CONFIG_SERIAL_MAX3100=m
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_R3964=m
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_GPIO=m
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=m
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_W1=m
-CONFIG_W1_MASTER_GPIO=m
-CONFIG_W1_SLAVE_DS2431=m
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT91SAM9X_WATCHDOG=y
-# CONFIG_MFD_SUPPORT is not set
-# CONFIG_HID_SUPPORT is not set
-CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=m
-CONFIG_USB_LIBUSUAL=y
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_G_HID=m
-CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT91SAM9=y
-CONFIG_AUXDISPLAY=y
-CONFIG_UIO=y
-CONFIG_UIO_PDRV=y
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_IIO=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ANSI_CPRNG=y
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 195729760aeb..fd5d3041d717 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -9,9 +9,8 @@ CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
-# CONFIG_SYSCTL_SYSCALL is not set
 # CONFIG_ELF_CORE is not set
+CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
@@ -20,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_TEGRA_2x_SOC=y
+CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_MACH_HARMONY=y
 CONFIG_MACH_KAEN=y
 CONFIG_MACH_PAZ00=y
@@ -78,14 +79,12 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
-CONFIG_NET_ETHERNET=y
 CONFIG_R8169=y
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
 CONFIG_USB_PEGASUS=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC75XX=y
 CONFIG_USB_NET_SMSC95XX=y
+# CONFIG_WLAN is not set
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index d111c3e99249..4f991f295284 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -3,6 +3,12 @@ if ARCH_AT91
 config HAVE_AT91_DATAFLASH_CARD
         bool
 
+config HAVE_AT91_DBGU0
+        bool
+
+config HAVE_AT91_DBGU1
+        bool
+
 config HAVE_AT91_USART3
         bool
 
@@ -21,12 +27,14 @@ config ARCH_AT91RM9200
         bool "AT91RM9200"
         select CPU_ARM920T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_AT91_USART3
 
 config ARCH_AT91SAM9260
         bool "AT91SAM9260 or AT91SAM9XE"
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_AT91_USART3
         select HAVE_AT91_USART4
         select HAVE_AT91_USART5
@@ -37,11 +45,13 @@ config ARCH_AT91SAM9261
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
+        select HAVE_AT91_DBGU0
 
 config ARCH_AT91SAM9G10
         bool "AT91SAM9G10"
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_FB_ATMEL
 
 config ARCH_AT91SAM9263
@@ -50,6 +60,7 @@ config ARCH_AT91SAM9263
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select HAVE_AT91_DBGU1
 
 config ARCH_AT91SAM9RL
         bool "AT91SAM9RL"
@@ -57,11 +68,13 @@ config ARCH_AT91SAM9RL
         select GENERIC_CLOCKEVENTS
         select HAVE_AT91_USART3
         select HAVE_FB_ATMEL
+        select HAVE_AT91_DBGU0
 
 config ARCH_AT91SAM9G20
         bool "AT91SAM9G20"
         select CPU_ARM926T
         select GENERIC_CLOCKEVENTS
+        select HAVE_AT91_DBGU0
         select HAVE_AT91_USART3
         select HAVE_AT91_USART4
         select HAVE_AT91_USART5
@@ -74,6 +87,7 @@ config ARCH_AT91SAM9G45
         select HAVE_AT91_USART3
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select HAVE_AT91_DBGU1
 
 config ARCH_AT91CAP9
         bool "AT91CAP9"
@@ -81,6 +95,7 @@ config ARCH_AT91CAP9
         select GENERIC_CLOCKEVENTS
         select HAVE_FB_ATMEL
         select HAVE_NET_MACB
+        select HAVE_AT91_DBGU1
 
 config ARCH_AT91X40
         bool "AT91x40"
@@ -510,8 +525,13 @@ config AT91_TIMER_HZ
 choice
         prompt "Select a UART for early kernel messages"
 
-config AT91_EARLY_DBGU
-        bool "DBGU"
+config AT91_EARLY_DBGU0
+        bool "DBGU on rm9200, 9260/9g20, 9261/9g10 and 9rl"
+        depends on HAVE_AT91_DBGU0
+
+config AT91_EARLY_DBGU1
+        bool "DBGU on 9263, 9g45 and cap9"
+        depends on HAVE_AT91_DBGU1
 
 config AT91_EARLY_USART0
         bool "USART0"
diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c
index 29373397d2df..edb879ac04c8 100644
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@ -13,7 +13,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/pm.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -23,11 +22,11 @@
 #include <mach/at91cap9.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
 
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 /* --------------------------------------------------------------------
  *  Clocks
@@ -137,7 +136,7 @@ static struct clk pwm_clk = {
         .type           = CLK_TYPE_PERIPHERAL,
 };
 static struct clk macb_clk = {
-        .name           = "macb_clk",
+        .name           = "pclk",
         .pmc_mask       = 1 << AT91CAP9_ID_EMAC,
         .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -210,6 +209,8 @@ static struct clk *periph_clocks[] __initdata = {
 };
 
 static struct clk_lookup periph_clocks_lookups[] = {
+        /* One additional fake clock for macb_hclk */
+        CLKDEV_CON_ID("hclk", &macb_clk),
         CLKDEV_CON_DEV_ID("hclk", "atmel_usba_udc", &utmi_clk),
         CLKDEV_CON_DEV_ID("pclk", "atmel_usba_udc", &udphs_clk),
         CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),
@@ -221,6 +222,10 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
+        CLKDEV_CON_ID("pioA", &pioABCD_clk),
+        CLKDEV_CON_ID("pioB", &pioABCD_clk),
+        CLKDEV_CON_ID("pioC", &pioABCD_clk),
+        CLKDEV_CON_ID("pioD", &pioABCD_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -293,23 +298,19 @@ void __init at91cap9_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91cap9_gpio[] = {
+static struct at91_gpio_bank at91cap9_gpio[] __initdata = {
         {
                 .id             = AT91CAP9_ID_PIOABCD,
-                .offset         = AT91_PIOA,
-                .clock          = &pioABCD_clk,
+                .regbase        = AT91CAP9_BASE_PIOA,
         }, {
                 .id             = AT91CAP9_ID_PIOABCD,
-                .offset         = AT91_PIOB,
-                .clock          = &pioABCD_clk,
+                .regbase        = AT91CAP9_BASE_PIOB,
         }, {
                 .id             = AT91CAP9_ID_PIOABCD,
-                .offset         = AT91_PIOC,
-                .clock          = &pioABCD_clk,
+                .regbase        = AT91CAP9_BASE_PIOC,
         }, {
                 .id             = AT91CAP9_ID_PIOABCD,
-                .offset         = AT91_PIOD,
-                .clock          = &pioABCD_clk,
+                .regbase        = AT91CAP9_BASE_PIOD,
         }
 };
 
@@ -318,12 +319,6 @@ static void at91cap9_restart(char mode, const char *cmd)
         at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 }
 
-static void at91cap9_poweroff(void)
-{
-        at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-
 /* --------------------------------------------------------------------
  *  AT91CAP9 processor initialization
  * -------------------------------------------------------------------- */
@@ -333,10 +328,16 @@ static void __init at91cap9_map_io(void)
         at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);
 }
 
+static void __init at91cap9_ioremap_registers(void)
+{
+        at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+        at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
+        at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
+}
+
 static void __init at91cap9_initialize(void)
 {
         arm_pm_restart = at91cap9_restart;
-        pm_power_off = at91cap9_poweroff;
         at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
 
         /* Register GPIO subsystem */
@@ -394,6 +395,7 @@ static unsigned int at91cap9_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91cap9_soc = {
         .map_io = at91cap9_map_io,
         .default_irq_priority = at91cap9_default_irq_priority,
+        .ioremap_registers = at91cap9_ioremap_registers,
         .register_clocks = at91cap9_register_clocks,
         .init = at91cap9_initialize,
 };
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index adad70db70eb..d298fb7cb210 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -76,7 +76,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
         /* Enable VBus control for UHP ports */
         for (i = 0; i < data->ports; i++) {
-                if (data->vbus_pin[i])
+                if (gpio_is_valid(data->vbus_pin[i]))
                         at91_set_gpio_output(data->vbus_pin[i], 0);
         }
 
@@ -179,7 +179,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
         usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
         memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
-        if (data && data->vbus_pin > 0) {
+        if (data && gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
                 usba_udc_data.pdata.vbus_pin = data->vbus_pin;
@@ -200,7 +200,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) {}
 
 #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
 static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
+static struct macb_platform_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -227,12 +227,12 @@ static struct platform_device at91cap9_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct at91_eth_data *data)
+void __init at91_add_device_eth(struct macb_platform_data *data)
 {
         if (!data)
                 return;
 
-        if (data->phy_irq_pin) {
+        if (gpio_is_valid(data->phy_irq_pin)) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -264,7 +264,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)
         platform_device_register(&at91cap9_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
+void __init at91_add_device_eth(struct macb_platform_data *data) {}
 #endif
 
 
@@ -332,13 +332,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         if (mmc_id == 0) {              /* MCI0 */
@@ -398,8 +398,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91_BASE_SYS + AT91_ECC,
-                .end    = AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
+                .start  = AT91CAP9_BASE_ECC,
+                .end    = AT91CAP9_BASE_ECC + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -425,15 +425,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         nand_data = *data;
@@ -670,8 +670,8 @@ static void __init at91_add_device_tc(void) { }
 
 static struct resource rtt_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT,
-                .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
+                .start  = AT91CAP9_BASE_RTT,
+                .end    = AT91CAP9_BASE_RTT + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -694,10 +694,19 @@ static void __init at91_add_device_rtt(void)
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91CAP9_BASE_WDT,
+                .end    = AT91CAP9_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91cap9_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -807,7 +816,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)
         at91_set_A_periph(AT91_PIN_PA9, 0);     /* AC97RX */
 
         /* reset */
-        if (data->reset_pin)
+        if (gpio_is_valid(data->reset_pin))
                 at91_set_gpio_output(data->reset_pin, 0);
 
         ac97_data = *data;
@@ -1021,8 +1030,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91CAP9_BASE_DBGU,
+                .end    = AT91CAP9_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 430a9fdc3dbf..99c3174e24a2 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -23,6 +23,7 @@
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 static struct map_desc at91rm9200_io_desc[] __initdata = {
         {
@@ -195,6 +196,10 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
+        CLKDEV_CON_ID("pioA", &pioA_clk),
+        CLKDEV_CON_ID("pioB", &pioB_clk),
+        CLKDEV_CON_ID("pioC", &pioC_clk),
+        CLKDEV_CON_ID("pioD", &pioD_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -268,23 +273,19 @@ void __init at91rm9200_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91rm9200_gpio[] = {
+static struct at91_gpio_bank at91rm9200_gpio[] __initdata = {
         {
                 .id             = AT91RM9200_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
+                .regbase        = AT91RM9200_BASE_PIOA,
         }, {
                 .id             = AT91RM9200_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
+                .regbase        = AT91RM9200_BASE_PIOB,
         }, {
                 .id             = AT91RM9200_ID_PIOC,
-                .offset         = AT91_PIOC,
-                .clock          = &pioC_clk,
+                .regbase        = AT91RM9200_BASE_PIOC,
         }, {
                 .id             = AT91RM9200_ID_PIOD,
-                .offset         = AT91_PIOD,
-                .clock          = &pioD_clk,
+                .regbase        = AT91RM9200_BASE_PIOD,
         }
 };
 
@@ -307,6 +308,10 @@ static void __init at91rm9200_map_io(void)
         iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));
 }
 
+static void __init at91rm9200_ioremap_registers(void)
+{
+}
+
 static void __init at91rm9200_initialize(void)
 {
         arm_pm_restart = at91rm9200_restart;
@@ -366,6 +371,7 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91rm9200_soc = {
         .map_io = at91rm9200_map_io,
         .default_irq_priority = at91rm9200_default_irq_priority,
+        .ioremap_registers = at91rm9200_ioremap_registers,
         .register_clocks = at91rm9200_register_clocks,
         .init = at91rm9200_initialize,
 };
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index ad930688358c..18bacec2b094 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -114,11 +114,11 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
         if (!data)
                 return;
 
-        if (data->vbus_pin) {
+        if (gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
         }
-        if (data->pullup_pin)
+        if (gpio_is_valid(data->pullup_pin))
                 at91_set_gpio_output(data->pullup_pin, 0);
 
         udc_data = *data;
@@ -135,7 +135,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
 
 #if defined(CONFIG_ARM_AT91_ETHER) || defined(CONFIG_ARM_AT91_ETHER_MODULE)
 static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
+static struct macb_platform_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -162,12 +162,12 @@ static struct platform_device at91rm9200_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct at91_eth_data *data)
+void __init at91_add_device_eth(struct macb_platform_data *data)
 {
         if (!data)
                 return;
 
-        if (data->phy_irq_pin) {
+        if (gpio_is_valid(data->phy_irq_pin)) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -199,7 +199,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)
         platform_device_register(&at91rm9200_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
+void __init at91_add_device_eth(struct macb_platform_data *data) {}
 #endif
 
 
@@ -260,7 +260,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         );
 
         /* input/irq */
-        if (data->irq_pin) {
+        if (gpio_is_valid(data->irq_pin)) {
                 at91_set_gpio_input(data->irq_pin, 1);
                 at91_set_deglitch(data->irq_pin, 1);
         }
@@ -268,7 +268,7 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         at91_set_deglitch(data->det_pin, 1);
 
         /* outputs, initially off */
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
         at91_set_gpio_output(data->rst_pin, 0);
 
@@ -328,13 +328,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         /* CLK */
@@ -419,15 +419,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         );
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         at91_set_A_periph(AT91_PIN_PC1, 0);             /* SMOE */
@@ -665,10 +665,24 @@ static void __init at91_add_device_tc(void) { }
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_RTC_DRV_AT91RM9200) || defined(CONFIG_RTC_DRV_AT91RM9200_MODULE)
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = AT91RM9200_BASE_RTC,
+                .end    = AT91RM9200_BASE_RTC + SZ_256 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91_ID_SYS,
+                .end    = AT91_ID_SYS,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
 static struct platform_device at91rm9200_rtc_device = {
         .name           = "at91_rtc",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = rtc_resources,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
 };
 
 static void __init at91_add_device_rtc(void)
@@ -877,8 +891,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91RM9200_BASE_DBGU,
+                .end    = AT91RM9200_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c
index 1dd69c85dfec..a028cdf8f974 100644
--- a/arch/arm/mach-at91/at91rm9200_time.c
+++ b/arch/arm/mach-at91/at91rm9200_time.c
@@ -32,6 +32,8 @@ static unsigned long last_crtr;
 static u32 irqmask;
 static struct clock_event_device clkevt;
 
+#define RM9200_TIMER_LATCH      ((AT91_SLOW_CLOCK + HZ/2) / HZ)
+
 /*
  * The ST_CRTR is updated asynchronously to the master clock ... but
  * the updates as seen by the CPU don't seem to be strictly monotonic.
@@ -74,8 +76,8 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id)
         if (sr & AT91_ST_PITS) {
                 u32     crtr = read_CRTR();
 
-                while (((crtr - last_crtr) & AT91_ST_CRTV) >= LATCH) {
-                        last_crtr += LATCH;
+                while (((crtr - last_crtr) & AT91_ST_CRTV) >= RM9200_TIMER_LATCH) {
+                        last_crtr += RM9200_TIMER_LATCH;
                         clkevt.event_handler(&clkevt);
                 }
                 return IRQ_HANDLED;
@@ -116,7 +118,7 @@ clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev)
         case CLOCK_EVT_MODE_PERIODIC:
                 /* PIT for periodic irqs; fixed rate of 1/HZ */
                 irqmask = AT91_ST_PITS;
-                at91_sys_write(AT91_ST_PIMR, LATCH);
+                at91_sys_write(AT91_ST_PIMR, RM9200_TIMER_LATCH);
                 break;
         case CLOCK_EVT_MODE_ONESHOT:
                 /* ALM for oneshot irqs, set by next_event()
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index e76cd49ebc9e..5e46e4a96430 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/pm.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -21,11 +20,11 @@
 #include <mach/at91sam9260.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
 
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 /* --------------------------------------------------------------------
  *  Clocks
@@ -120,7 +119,7 @@ static struct clk ohci_clk = {
         .type           = CLK_TYPE_PERIPHERAL,
 };
 static struct clk macb_clk = {
-        .name           = "macb_clk",
+        .name           = "pclk",
         .pmc_mask       = 1 << AT91SAM9260_ID_EMAC,
         .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -190,6 +189,8 @@ static struct clk *periph_clocks[] __initdata = {
 };
 
 static struct clk_lookup periph_clocks_lookups[] = {
+        /* One additional fake clock for macb_hclk */
+        CLKDEV_CON_ID("hclk", &macb_clk),
         CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),
         CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),
         CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),
@@ -209,6 +210,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
+        CLKDEV_CON_ID("pioA", &pioA_clk),
+        CLKDEV_CON_ID("pioB", &pioB_clk),
+        CLKDEV_CON_ID("pioC", &pioC_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -270,28 +274,19 @@ void __init at91sam9260_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91sam9260_gpio[] = {
+static struct at91_gpio_bank at91sam9260_gpio[] __initdata = {
         {
                 .id             = AT91SAM9260_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
+                .regbase        = AT91SAM9260_BASE_PIOA,
         }, {
                 .id             = AT91SAM9260_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
+                .regbase        = AT91SAM9260_BASE_PIOB,
         }, {
                 .id             = AT91SAM9260_ID_PIOC,
-                .offset         = AT91_PIOC,
-                .clock          = &pioC_clk,
+                .regbase        = AT91SAM9260_BASE_PIOC,
         }
 };
 
-static void at91sam9260_poweroff(void)
-{
-        at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-
 /* --------------------------------------------------------------------
  *  AT91SAM9260 processor initialization
  * -------------------------------------------------------------------- */
@@ -325,10 +320,16 @@ static void __init at91sam9260_map_io(void)
         }
 }
 
+static void __init at91sam9260_ioremap_registers(void)
+{
+        at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+        at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
+        at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
+}
+
 static void __init at91sam9260_initialize(void)
 {
         arm_pm_restart = at91sam9_alt_restart;
-        pm_power_off = at91sam9260_poweroff;
         at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
                         | (1 << AT91SAM9260_ID_IRQ2);
 
@@ -381,6 +382,7 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91sam9260_soc = {
         .map_io = at91sam9260_map_io,
         .default_irq_priority = at91sam9260_default_irq_priority,
+        .ioremap_registers = at91sam9260_ioremap_registers,
         .register_clocks = at91sam9260_register_clocks,
         .init = at91sam9260_initialize,
 };
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 629fa9774972..642ccb6d26b2 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -115,7 +115,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
         if (!data)
                 return;
 
-        if (data->vbus_pin) {
+        if (gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
         }
@@ -136,7 +136,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
 
 #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
 static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
+static struct macb_platform_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -163,12 +163,12 @@ static struct platform_device at91sam9260_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct at91_eth_data *data)
+void __init at91_add_device_eth(struct macb_platform_data *data)
 {
         if (!data)
                 return;
 
-        if (data->phy_irq_pin) {
+        if (gpio_is_valid(data->phy_irq_pin)) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -200,7 +200,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)
         platform_device_register(&at91sam9260_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
+void __init at91_add_device_eth(struct macb_platform_data *data) {}
 #endif
 
 
@@ -243,13 +243,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         /* CLK */
@@ -330,11 +330,11 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
         for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
                 if (data->slot[i].bus_width) {
                         /* input/irq */
-                        if (data->slot[i].detect_pin) {
+                        if (gpio_is_valid(data->slot[i].detect_pin)) {
                                 at91_set_gpio_input(data->slot[i].detect_pin, 1);
                                 at91_set_deglitch(data->slot[i].detect_pin, 1);
                         }
-                        if (data->slot[i].wp_pin)
+                        if (gpio_is_valid(data->slot[i].wp_pin))
                                 at91_set_gpio_input(data->slot[i].wp_pin, 1);
 
                         switch (i) {
@@ -399,8 +399,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91_BASE_SYS + AT91_ECC,
-                .end    = AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
+                .start  = AT91SAM9260_BASE_ECC,
+                .end    = AT91SAM9260_BASE_ECC + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -426,15 +426,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         nand_data = *data;
@@ -714,8 +714,8 @@ static void __init at91_add_device_tc(void) { }
 
 static struct resource rtt_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT,
-                .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
+                .start  = AT91SAM9260_BASE_RTT,
+                .end    = AT91SAM9260_BASE_RTT + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -738,10 +738,19 @@ static void __init at91_add_device_rtt(void)
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91SAM9260_BASE_WDT,
+                .end    = AT91SAM9260_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91sam9260_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -837,8 +846,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91SAM9260_BASE_DBGU,
+                .end    = AT91SAM9260_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -1281,17 +1290,17 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
 
         at91_sys_write(AT91_MATRIX_EBICSA, csa);
 
-        if (data->rst_pin) {
+        if (gpio_is_valid(data->rst_pin)) {
                 at91_set_multi_drive(data->rst_pin, 0);
                 at91_set_gpio_output(data->rst_pin, 1);
         }
 
-        if (data->irq_pin) {
+        if (gpio_is_valid(data->irq_pin)) {
                 at91_set_gpio_input(data->irq_pin, 0);
                 at91_set_deglitch(data->irq_pin, 1);
         }
 
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 0);
                 at91_set_deglitch(data->det_pin, 1);
         }
diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 19ac7c0729a0..b85b9ea60170 100644
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/pm.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -20,11 +19,11 @@
 #include <mach/at91sam9261.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
 
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 /* --------------------------------------------------------------------
  *  Clocks
@@ -176,6 +175,9 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
         CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk),
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0),
+        CLKDEV_CON_ID("pioA", &pioA_clk),
+        CLKDEV_CON_ID("pioB", &pioB_clk),
+        CLKDEV_CON_ID("pioC", &pioC_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -251,28 +253,19 @@ void __init at91sam9261_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91sam9261_gpio[] = {
+static struct at91_gpio_bank at91sam9261_gpio[] __initdata = {
         {
                 .id             = AT91SAM9261_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
+                .regbase        = AT91SAM9261_BASE_PIOA,
         }, {
                 .id             = AT91SAM9261_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
+                .regbase        = AT91SAM9261_BASE_PIOB,
         }, {
                 .id             = AT91SAM9261_ID_PIOC,
-                .offset         = AT91_PIOC,
-                .clock          = &pioC_clk,
+                .regbase        = AT91SAM9261_BASE_PIOC,
         }
 };
 
-static void at91sam9261_poweroff(void)
-{
-        at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-
 /* --------------------------------------------------------------------
  *  AT91SAM9261 processor initialization
  * -------------------------------------------------------------------- */
@@ -285,10 +278,16 @@ static void __init at91sam9261_map_io(void)
                 at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
 }
 
+static void __init at91sam9261_ioremap_registers(void)
+{
+        at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+        at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
+        at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
+}
+
 static void __init at91sam9261_initialize(void)
 {
         arm_pm_restart = at91sam9_alt_restart;
-        pm_power_off = at91sam9261_poweroff;
         at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
                         | (1 << AT91SAM9261_ID_IRQ2);
 
@@ -341,6 +340,7 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91sam9261_soc = {
         .map_io = at91sam9261_map_io,
         .default_irq_priority = at91sam9261_default_irq_priority,
+        .ioremap_registers = at91sam9261_ioremap_registers,
         .register_clocks = at91sam9261_register_clocks,
         .init = at91sam9261_initialize,
 };
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index a178b58b0b9c..fc59cbdb0e3c 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -118,7 +118,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
         if (!data)
                 return;
 
-        if (data->vbus_pin) {
+        if (gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
         }
@@ -171,13 +171,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         /* CLK */
@@ -240,15 +240,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         at91_set_A_periph(AT91_PIN_PC0, 0);             /* NANDOE */
@@ -600,8 +600,8 @@ static void __init at91_add_device_tc(void) { }
 
 static struct resource rtt_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT,
-                .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
+                .start  = AT91SAM9261_BASE_RTT,
+                .end    = AT91SAM9261_BASE_RTT + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -624,10 +624,19 @@ static void __init at91_add_device_rtt(void)
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91SAM9261_BASE_WDT,
+                .end    = AT91SAM9261_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91sam9261_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -816,8 +825,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91SAM9261_BASE_DBGU,
+                .end    = AT91SAM9261_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 50d016310031..79e3669b1117 100644
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/pm.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -19,11 +18,11 @@
 #include <mach/at91sam9263.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
 
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 /* --------------------------------------------------------------------
  *  Clocks
@@ -118,7 +117,7 @@ static struct clk pwm_clk = {
         .type           = CLK_TYPE_PERIPHERAL,
 };
 static struct clk macb_clk = {
-        .name           = "macb_clk",
+        .name           = "pclk",
         .pmc_mask       = 1 << AT91SAM9263_ID_EMAC,
         .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -182,6 +181,8 @@ static struct clk *periph_clocks[] __initdata = {
 };
 
 static struct clk_lookup periph_clocks_lookups[] = {
+        /* One additional fake clock for macb_hclk */
+        CLKDEV_CON_ID("hclk", &macb_clk),
         CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
         CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
         CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),
@@ -191,6 +192,11 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
+        CLKDEV_CON_ID("pioA", &pioA_clk),
+        CLKDEV_CON_ID("pioB", &pioB_clk),
+        CLKDEV_CON_ID("pioC", &pioCDE_clk),
+        CLKDEV_CON_ID("pioD", &pioCDE_clk),
+        CLKDEV_CON_ID("pioE", &pioCDE_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -263,36 +269,25 @@ void __init at91sam9263_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91sam9263_gpio[] = {
+static struct at91_gpio_bank at91sam9263_gpio[] __initdata = {
         {
                 .id             = AT91SAM9263_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
+                .regbase        = AT91SAM9263_BASE_PIOA,
         }, {
                 .id             = AT91SAM9263_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
+                .regbase        = AT91SAM9263_BASE_PIOB,
         }, {
                 .id             = AT91SAM9263_ID_PIOCDE,
-                .offset         = AT91_PIOC,
-                .clock          = &pioCDE_clk,
+                .regbase        = AT91SAM9263_BASE_PIOC,
         }, {
                 .id             = AT91SAM9263_ID_PIOCDE,
-                .offset         = AT91_PIOD,
-                .clock          = &pioCDE_clk,
+                .regbase        = AT91SAM9263_BASE_PIOD,
         }, {
                 .id             = AT91SAM9263_ID_PIOCDE,
-                .offset         = AT91_PIOE,
-                .clock          = &pioCDE_clk,
+                .regbase        = AT91SAM9263_BASE_PIOE,
         }
 };
 
-static void at91sam9263_poweroff(void)
-{
-        at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-
 /* --------------------------------------------------------------------
  *  AT91SAM9263 processor initialization
  * -------------------------------------------------------------------- */
@@ -303,10 +298,17 @@ static void __init at91sam9263_map_io(void)
         at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
 }
 
+static void __init at91sam9263_ioremap_registers(void)
+{
+        at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+        at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
+        at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
+        at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
+}
+
 static void __init at91sam9263_initialize(void)
 {
         arm_pm_restart = at91sam9_alt_restart;
-        pm_power_off = at91sam9263_poweroff;
         at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
 
         /* Register GPIO subsystem */
@@ -358,6 +360,7 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91sam9263_soc = {
         .map_io = at91sam9263_map_io,
         .default_irq_priority = at91sam9263_default_irq_priority,
+        .ioremap_registers = at91sam9263_ioremap_registers,
         .register_clocks = at91sam9263_register_clocks,
         .init = at91sam9263_initialize,
 };
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index d5fbac9ff4fa..7b46b2787022 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -70,7 +70,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data)
 
         /* Enable VBus control for UHP ports */
         for (i = 0; i < data->ports; i++) {
-                if (data->vbus_pin[i])
+                if (gpio_is_valid(data->vbus_pin[i]))
                         at91_set_gpio_output(data->vbus_pin[i], 0);
         }
 
@@ -123,7 +123,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data)
         if (!data)
                 return;
 
-        if (data->vbus_pin) {
+        if (gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
         }
@@ -144,7 +144,7 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {}
 
 #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
 static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
+static struct macb_platform_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -171,12 +171,12 @@ static struct platform_device at91sam9263_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct at91_eth_data *data)
+void __init at91_add_device_eth(struct macb_platform_data *data)
 {
         if (!data)
                 return;
 
-        if (data->phy_irq_pin) {
+        if (gpio_is_valid(data->phy_irq_pin)) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -208,7 +208,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)
         platform_device_register(&at91sam9263_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
+void __init at91_add_device_eth(struct macb_platform_data *data) {}
 #endif
 
 
@@ -276,13 +276,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         if (mmc_id == 0) {              /* MCI0 */
@@ -430,17 +430,17 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
         }
         at91_sys_write(AT91_MATRIX_EBI0CSA, ebi0_csa);
 
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
 
-        if (data->irq_pin) {
+        if (gpio_is_valid(data->irq_pin)) {
                 at91_set_gpio_input(data->irq_pin, 1);
                 at91_set_deglitch(data->irq_pin, 1);
         }
 
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 /* initially off */
                 at91_set_gpio_output(data->vcc_pin, 0);
 
@@ -473,8 +473,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91_BASE_SYS + AT91_ECC0,
-                .end    = AT91_BASE_SYS + AT91_ECC0 + SZ_512 - 1,
+                .start  = AT91SAM9263_BASE_ECC0,
+                .end    = AT91SAM9263_BASE_ECC0 + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -500,15 +500,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         nand_data = *data;
@@ -749,7 +749,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)
         at91_set_A_periph(AT91_PIN_PB3, 0);     /* AC97RX */
 
         /* reset */
-        if (data->reset_pin)
+        if (gpio_is_valid(data->reset_pin))
                 at91_set_gpio_output(data->reset_pin, 0);
 
         ac97_data = *data;
@@ -956,8 +956,8 @@ static void __init at91_add_device_tc(void) { }
 
 static struct resource rtt0_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT0,
-                .end    = AT91_BASE_SYS + AT91_RTT0 + SZ_16 - 1,
+                .start  = AT91SAM9263_BASE_RTT0,
+                .end    = AT91SAM9263_BASE_RTT0 + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -971,8 +971,8 @@ static struct platform_device at91sam9263_rtt0_device = {
 
 static struct resource rtt1_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT1,
-                .end    = AT91_BASE_SYS + AT91_RTT1 + SZ_16 - 1,
+                .start  = AT91SAM9263_BASE_RTT1,
+                .end    = AT91SAM9263_BASE_RTT1 + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -996,10 +996,19 @@ static void __init at91_add_device_rtt(void)
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91SAM9263_BASE_WDT,
+                .end    = AT91SAM9263_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91sam9263_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -1196,8 +1205,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91SAM9263_BASE_DBGU,
+                .end    = AT91SAM9263_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c
index 4ba85499fa97..d89ead740a99 100644
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
@@ -25,7 +25,17 @@
 
 static u32 pit_cycle;           /* write-once */
 static u32 pit_cnt;             /* access only w/system irq blocked */
+static void __iomem *pit_base_addr __read_mostly;
 
+static inline unsigned int pit_read(unsigned int reg_offset)
+{
+        return __raw_readl(pit_base_addr + reg_offset);
+}
+
+static inline void pit_write(unsigned int reg_offset, unsigned long value)
+{
+        __raw_writel(value, pit_base_addr + reg_offset);
+}
 
 /*
  * Clocksource:  just a monotonic counter of MCK/16 cycles.
@@ -39,7 +49,7 @@ static cycle_t read_pit_clk(struct clocksource *cs)
 
         raw_local_irq_save(flags);
         elapsed = pit_cnt;
-        t = at91_sys_read(AT91_PIT_PIIR);
+        t = pit_read(AT91_PIT_PIIR);
         raw_local_irq_restore(flags);
 
         elapsed += PIT_PICNT(t) * pit_cycle;
@@ -64,8 +74,8 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
         switch (mode) {
         case CLOCK_EVT_MODE_PERIODIC:
                 /* update clocksource counter */
-                pit_cnt += pit_cycle * PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));
-                at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN
+                pit_cnt += pit_cycle * PIT_PICNT(pit_read(AT91_PIT_PIVR));
+                pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN
                                 | AT91_PIT_PITIEN);
                 break;
         case CLOCK_EVT_MODE_ONESHOT:
@@ -74,7 +84,7 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev)
         case CLOCK_EVT_MODE_SHUTDOWN:
         case CLOCK_EVT_MODE_UNUSED:
                 /* disable irq, leaving the clocksource active */
-                at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);
+                pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);
                 break;
         case CLOCK_EVT_MODE_RESUME:
                 break;
@@ -103,11 +113,11 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id)
 
         /* The PIT interrupt may be disabled, and is shared */
         if ((pit_clkevt.mode == CLOCK_EVT_MODE_PERIODIC)
-                        && (at91_sys_read(AT91_PIT_SR) & AT91_PIT_PITS)) {
+                        && (pit_read(AT91_PIT_SR) & AT91_PIT_PITS)) {
                 unsigned nr_ticks;
 
                 /* Get number of ticks performed before irq, and ack it */
-                nr_ticks = PIT_PICNT(at91_sys_read(AT91_PIT_PIVR));
+                nr_ticks = PIT_PICNT(pit_read(AT91_PIT_PIVR));
                 do {
                         pit_cnt += pit_cycle;
                         pit_clkevt.event_handler(&pit_clkevt);
@@ -129,14 +139,14 @@ static struct irqaction at91sam926x_pit_irq = {
 static void at91sam926x_pit_reset(void)
 {
         /* Disable timer and irqs */
-        at91_sys_write(AT91_PIT_MR, 0);
+        pit_write(AT91_PIT_MR, 0);
 
         /* Clear any pending interrupts, wait for PIT to stop counting */
-        while (PIT_CPIV(at91_sys_read(AT91_PIT_PIVR)) != 0)
+        while (PIT_CPIV(pit_read(AT91_PIT_PIVR)) != 0)
                 cpu_relax();
 
         /* Start PIT but don't enable IRQ */
-        at91_sys_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);
+        pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);
 }
 
 /*
@@ -178,7 +188,15 @@ static void __init at91sam926x_pit_init(void)
 static void at91sam926x_pit_suspend(void)
 {
         /* Disable timer */
-        at91_sys_write(AT91_PIT_MR, 0);
+        pit_write(AT91_PIT_MR, 0);
+}
+
+void __init at91sam926x_ioremap_pit(u32 addr)
+{
+        pit_base_addr = ioremap(addr, 16);
+
+        if (!pit_base_addr)
+                panic("Impossible to ioremap PIT\n");
 }
 
 struct sys_timer at91sam926x_timer = {
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index ff21f7a60c63..7032dd32cdf0 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/pm.h>
 #include <linux/dma-mapping.h>
 
 #include <asm/irq.h>
@@ -20,12 +19,12 @@
 #include <mach/at91sam9g45.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
 #include <mach/cpu.h>
 
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 /* --------------------------------------------------------------------
  *  Clocks
@@ -150,7 +149,7 @@ static struct clk ac97_clk = {
         .type           = CLK_TYPE_PERIPHERAL,
 };
 static struct clk macb_clk = {
-        .name           = "macb_clk",
+        .name           = "pclk",
         .pmc_mask       = 1 << AT91SAM9G45_ID_EMAC,
         .type           = CLK_TYPE_PERIPHERAL,
 };
@@ -209,6 +208,8 @@ static struct clk *periph_clocks[] __initdata = {
 };
 
 static struct clk_lookup periph_clocks_lookups[] = {
+        /* One additional fake clock for macb_hclk */
+        CLKDEV_CON_ID("hclk", &macb_clk),
         /* One additional fake clock for ohci */
         CLKDEV_CON_ID("ohci_clk", &uhphs_clk),
         CLKDEV_CON_DEV_ID("ehci_clk", "atmel-ehci", &uhphs_clk),
@@ -231,6 +232,11 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("usart", "fff98000.serial", &usart3_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
+        CLKDEV_CON_ID("pioA", &pioA_clk),
+        CLKDEV_CON_ID("pioB", &pioB_clk),
+        CLKDEV_CON_ID("pioC", &pioC_clk),
+        CLKDEV_CON_ID("pioD", &pioDE_clk),
+        CLKDEV_CON_ID("pioE", &pioDE_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -293,27 +299,22 @@ void __init at91sam9g45_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91sam9g45_gpio[] = {
+static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {
         {
                 .id             = AT91SAM9G45_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
+                .regbase        = AT91SAM9G45_BASE_PIOA,
         }, {
                 .id             = AT91SAM9G45_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
+                .regbase        = AT91SAM9G45_BASE_PIOB,
         }, {
                 .id             = AT91SAM9G45_ID_PIOC,
-                .offset         = AT91_PIOC,
-                .clock          = &pioC_clk,
+                .regbase        = AT91SAM9G45_BASE_PIOC,
         }, {
                 .id             = AT91SAM9G45_ID_PIODE,
-                .offset         = AT91_PIOD,
-                .clock          = &pioDE_clk,
+                .regbase        = AT91SAM9G45_BASE_PIOD,
         }, {
                 .id             = AT91SAM9G45_ID_PIODE,
-                .offset         = AT91_PIOE,
-                .clock          = &pioDE_clk,
+                .regbase        = AT91SAM9G45_BASE_PIOE,
         }
 };
 
@@ -322,12 +323,6 @@ static void at91sam9g45_restart(char mode, const char *cmd)
         at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
 }
 
-static void at91sam9g45_poweroff(void)
-{
-        at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-
 /* --------------------------------------------------------------------
  *  AT91SAM9G45 processor initialization
  * -------------------------------------------------------------------- */
@@ -338,10 +333,16 @@ static void __init at91sam9g45_map_io(void)
         init_consistent_dma_size(SZ_4M);
 }
 
+static void __init at91sam9g45_ioremap_registers(void)
+{
+        at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+        at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
+        at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
+}
+
 static void __init at91sam9g45_initialize(void)
 {
         arm_pm_restart = at91sam9g45_restart;
-        pm_power_off = at91sam9g45_poweroff;
         at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
 
         /* Register GPIO subsystem */
@@ -393,6 +394,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91sam9g45_soc = {
         .map_io = at91sam9g45_map_io,
         .default_irq_priority = at91sam9g45_default_irq_priority,
+        .ioremap_registers = at91sam9g45_ioremap_registers,
         .register_clocks = at91sam9g45_register_clocks,
         .init = at91sam9g45_initialize,
 };
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 09a16d6bd5cd..b7582dd10dc3 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -44,8 +44,8 @@ static struct at_dma_platform_data atdma_pdata = {
 
 static struct resource hdmac_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DMA,
-                .end    = AT91_BASE_SYS + AT91_DMA + SZ_512 - 1,
+                .start  = AT91SAM9G45_BASE_DMA,
+                .end    = AT91SAM9G45_BASE_DMA + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -120,7 +120,7 @@ void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data)
 
         /* Enable VBus control for UHP ports */
         for (i = 0; i < data->ports; i++) {
-                if (data->vbus_pin[i])
+                if (gpio_is_valid(data->vbus_pin[i]))
                         at91_set_gpio_output(data->vbus_pin[i], 0);
         }
 
@@ -181,7 +181,7 @@ void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data)
 
         /* Enable VBus control for UHP ports */
         for (i = 0; i < data->ports; i++) {
-                if (data->vbus_pin[i])
+                if (gpio_is_valid(data->vbus_pin[i]))
                         at91_set_gpio_output(data->vbus_pin[i], 0);
         }
 
@@ -263,7 +263,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
         usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
         memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
-        if (data && data->vbus_pin > 0) {
+        if (data && gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
                 usba_udc_data.pdata.vbus_pin = data->vbus_pin;
@@ -284,7 +284,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data) {}
 
 #if defined(CONFIG_MACB) || defined(CONFIG_MACB_MODULE)
 static u64 eth_dmamask = DMA_BIT_MASK(32);
-static struct at91_eth_data eth_data;
+static struct macb_platform_data eth_data;
 
 static struct resource eth_resources[] = {
         [0] = {
@@ -311,12 +311,12 @@ static struct platform_device at91sam9g45_eth_device = {
         .num_resources  = ARRAY_SIZE(eth_resources),
 };
 
-void __init at91_add_device_eth(struct at91_eth_data *data)
+void __init at91_add_device_eth(struct macb_platform_data *data)
 {
         if (!data)
                 return;
 
-        if (data->phy_irq_pin) {
+        if (gpio_is_valid(data->phy_irq_pin)) {
                 at91_set_gpio_input(data->phy_irq_pin, 0);
                 at91_set_deglitch(data->phy_irq_pin, 1);
         }
@@ -348,7 +348,7 @@ void __init at91_add_device_eth(struct at91_eth_data *data)
         platform_device_register(&at91sam9g45_eth_device);
 }
 #else
-void __init at91_add_device_eth(struct at91_eth_data *data) {}
+void __init at91_add_device_eth(struct macb_platform_data *data) {}
 #endif
 
 
@@ -449,11 +449,11 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
 
 
         /* input/irq */
-        if (data->slot[0].detect_pin) {
+        if (gpio_is_valid(data->slot[0].detect_pin)) {
                 at91_set_gpio_input(data->slot[0].detect_pin, 1);
                 at91_set_deglitch(data->slot[0].detect_pin, 1);
         }
-        if (data->slot[0].wp_pin)
+        if (gpio_is_valid(data->slot[0].wp_pin))
                 at91_set_gpio_input(data->slot[0].wp_pin, 1);
 
         if (mmc_id == 0) {              /* MCI0 */
@@ -529,8 +529,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91_BASE_SYS + AT91_ECC,
-                .end    = AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
+                .start  = AT91SAM9G45_BASE_ECC,
+                .end    = AT91SAM9G45_BASE_ECC + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -556,15 +556,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         nand_data = *data;
@@ -859,7 +859,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)
         at91_set_A_periph(AT91_PIN_PD6, 0);     /* AC97RX */
 
         /* reset */
-        if (data->reset_pin)
+        if (gpio_is_valid(data->reset_pin))
                 at91_set_gpio_output(data->reset_pin, 0);
 
         ac97_data = *data;
@@ -1009,10 +1009,24 @@ static void __init at91_add_device_tc(void) { }
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_RTC_DRV_AT91RM9200) || defined(CONFIG_RTC_DRV_AT91RM9200_MODULE)
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = AT91SAM9G45_BASE_RTC,
+                .end    = AT91SAM9G45_BASE_RTC + SZ_256 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = AT91_ID_SYS,
+                .end    = AT91_ID_SYS,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
 static struct platform_device at91sam9g45_rtc_device = {
         .name           = "at91_rtc",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = rtc_resources,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
 };
 
 static void __init at91_add_device_rtc(void)
@@ -1081,8 +1095,8 @@ void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}
 
 static struct resource rtt_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT,
-                .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
+                .start  = AT91SAM9G45_BASE_RTT,
+                .end    = AT91SAM9G45_BASE_RTT + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -1133,10 +1147,19 @@ static void __init at91_add_device_trng(void) {}
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91SAM9G45_BASE_WDT,
+                .end    = AT91SAM9G45_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91sam9g45_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -1332,8 +1355,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91SAM9G45_BASE_DBGU,
+                .end    = AT91SAM9G45_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index 61cbb46f5b0e..d6bcb1da11df 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/pm.h>
 
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -20,11 +19,11 @@
 #include <mach/at91sam9rl.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
 
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"
+#include "sam9_smc.h"
 
 /* --------------------------------------------------------------------
  *  Clocks
@@ -184,6 +183,10 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),
         CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
         CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
+        CLKDEV_CON_ID("pioA", &pioA_clk),
+        CLKDEV_CON_ID("pioB", &pioB_clk),
+        CLKDEV_CON_ID("pioC", &pioC_clk),
+        CLKDEV_CON_ID("pioD", &pioD_clk),
 };
 
 static struct clk_lookup usart_clocks_lookups[] = {
@@ -243,32 +246,22 @@ void __init at91sam9rl_set_console_clock(int id)
  *  GPIO
  * -------------------------------------------------------------------- */
 
-static struct at91_gpio_bank at91sam9rl_gpio[] = {
+static struct at91_gpio_bank at91sam9rl_gpio[] __initdata = {
         {
                 .id             = AT91SAM9RL_ID_PIOA,
-                .offset         = AT91_PIOA,
-                .clock          = &pioA_clk,
+                .regbase        = AT91SAM9RL_BASE_PIOA,
         }, {
                 .id             = AT91SAM9RL_ID_PIOB,
-                .offset         = AT91_PIOB,
-                .clock          = &pioB_clk,
+                .regbase        = AT91SAM9RL_BASE_PIOB,
         }, {
                 .id             = AT91SAM9RL_ID_PIOC,
-                .offset         = AT91_PIOC,
-                .clock          = &pioC_clk,
+                .regbase        = AT91SAM9RL_BASE_PIOC,
         }, {
                 .id             = AT91SAM9RL_ID_PIOD,
-                .offset         = AT91_PIOD,
-                .clock          = &pioD_clk,
+                .regbase        = AT91SAM9RL_BASE_PIOD,
         }
 };
 
-static void at91sam9rl_poweroff(void)
-{
-        at91_sys_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
-}
-
-
 /* --------------------------------------------------------------------
  *  AT91SAM9RL processor initialization
  * -------------------------------------------------------------------- */
@@ -290,10 +283,16 @@ static void __init at91sam9rl_map_io(void)
         at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
 }
 
+static void __init at91sam9rl_ioremap_registers(void)
+{
+        at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+        at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
+        at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
+}
+
 static void __init at91sam9rl_initialize(void)
 {
         arm_pm_restart = at91sam9_alt_restart;
-        pm_power_off = at91sam9rl_poweroff;
         at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
 
         /* Register GPIO subsystem */
@@ -345,6 +344,7 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {
 struct at91_init_soc __initdata at91sam9rl_soc = {
         .map_io = at91sam9rl_map_io,
         .default_irq_priority = at91sam9rl_default_irq_priority,
+        .ioremap_registers = at91sam9rl_ioremap_registers,
         .register_clocks = at91sam9rl_register_clocks,
         .init = at91sam9rl_initialize,
 };
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 628eb566d60c..61908dce9784 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -39,8 +39,8 @@ static struct at_dma_platform_data atdma_pdata = {
 
 static struct resource hdmac_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DMA,
-                .end    = AT91_BASE_SYS + AT91_DMA + SZ_512 - 1,
+                .start  = AT91SAM9RL_BASE_DMA,
+                .end    = AT91SAM9RL_BASE_DMA + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [2] = {
@@ -147,7 +147,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
         usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
         memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
-        if (data && data->vbus_pin > 0) {
+        if (data && gpio_is_valid(data->vbus_pin)) {
                 at91_set_gpio_input(data->vbus_pin, 0);
                 at91_set_deglitch(data->vbus_pin, 1);
                 usba_udc_data.pdata.vbus_pin = data->vbus_pin;
@@ -201,13 +201,13 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 return;
 
         /* input/irq */
-        if (data->det_pin) {
+        if (gpio_is_valid(data->det_pin)) {
                 at91_set_gpio_input(data->det_pin, 1);
                 at91_set_deglitch(data->det_pin, 1);
         }
-        if (data->wp_pin)
+        if (gpio_is_valid(data->wp_pin))
                 at91_set_gpio_input(data->wp_pin, 1);
-        if (data->vcc_pin)
+        if (gpio_is_valid(data->vcc_pin))
                 at91_set_gpio_output(data->vcc_pin, 0);
 
         /* CLK */
@@ -248,8 +248,8 @@ static struct resource nand_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = AT91_BASE_SYS + AT91_ECC,
-                .end    = AT91_BASE_SYS + AT91_ECC + SZ_512 - 1,
+                .start  = AT91SAM9RL_BASE_ECC,
+                .end    = AT91SAM9RL_BASE_ECC + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -275,15 +275,15 @@ void __init at91_add_device_nand(struct atmel_nand_data *data)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
 
         /* enable pin */
-        if (data->enable_pin)
+        if (gpio_is_valid(data->enable_pin))
                 at91_set_gpio_output(data->enable_pin, 1);
 
         /* ready/busy pin */
-        if (data->rdy_pin)
+        if (gpio_is_valid(data->rdy_pin))
                 at91_set_gpio_input(data->rdy_pin, 1);
 
         /* card detect pin */
-        if (data->det_pin)
+        if (gpio_is_valid(data->det_pin))
                 at91_set_gpio_input(data->det_pin, 1);
 
         at91_set_A_periph(AT91_PIN_PB4, 0);             /* NANDOE */
@@ -483,7 +483,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data)
         at91_set_A_periph(AT91_PIN_PD4, 0);     /* AC97RX */
 
         /* reset */
-        if (data->reset_pin)
+        if (gpio_is_valid(data->reset_pin))
                 at91_set_gpio_output(data->reset_pin, 0);
 
         ac97_data = *data;
@@ -685,8 +685,8 @@ static void __init at91_add_device_rtc(void) {}
 
 static struct resource rtt_resources[] = {
         {
-                .start  = AT91_BASE_SYS + AT91_RTT,
-                .end    = AT91_BASE_SYS + AT91_RTT + SZ_16 - 1,
+                .start  = AT91SAM9RL_BASE_RTT,
+                .end    = AT91SAM9RL_BASE_RTT + SZ_16 - 1,
                 .flags  = IORESOURCE_MEM,
         }
 };
@@ -709,10 +709,19 @@ static void __init at91_add_device_rtt(void)
  * -------------------------------------------------------------------- */
 
 #if defined(CONFIG_AT91SAM9X_WATCHDOG) || defined(CONFIG_AT91SAM9X_WATCHDOG_MODULE)
+static struct resource wdt_resources[] = {
+        {
+                .start  = AT91SAM9RL_BASE_WDT,
+                .end    = AT91SAM9RL_BASE_WDT + SZ_16 - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
 static struct platform_device at91sam9rl_wdt_device = {
         .name           = "at91_wdt",
         .id             = -1,
-        .num_resources  = 0,
+        .resource       = wdt_resources,
+        .num_resources  = ARRAY_SIZE(wdt_resources),
 };
 
 static void __init at91_add_device_watchdog(void)
@@ -908,8 +917,8 @@ void __init at91_add_device_ssc(unsigned id, unsigned pins) {}
 #if defined(CONFIG_SERIAL_ATMEL)
 static struct resource dbgu_resources[] = {
         [0] = {
-                .start  = AT91_BASE_SYS + AT91_DBGU,
-                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
+                .start  = AT91SAM9RL_BASE_DBGU,
+                .end    = AT91SAM9RL_BASE_DBGU + SZ_512 - 1,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c
index 367d5cd5e362..2628384aaae1 100644
--- a/arch/arm/mach-at91/board-1arm.c
+++ b/arch/arm/mach-at91/board-1arm.c
@@ -63,13 +63,15 @@ static void __init onearm_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata onearm_eth_data = {
+static struct macb_platform_data __initdata onearm_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata onearm_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata onearm_udc_data = {
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index 4282d96dffa8..3bb40694b02d 100644
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -75,6 +75,8 @@ static void __init afeb9260_init_early(void)
  */
 static struct at91_usbh_data __initdata afeb9260_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -82,7 +84,7 @@ static struct at91_usbh_data __initdata afeb9260_usbh_data = {
  */
 static struct at91_udc_data __initdata afeb9260_udc_data = {
         .vbus_pin       = AT91_PIN_PC5,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -103,7 +105,7 @@ static struct spi_board_info afeb9260_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata afeb9260_macb_data = {
+static struct macb_platform_data __initdata afeb9260_macb_data = {
         .phy_irq_pin    = AT91_PIN_PA9,
         .is_rmii        = 0,
 };
@@ -138,6 +140,7 @@ static struct atmel_nand_data __initdata afeb9260_nand_data = {
         .bus_width_16   = 0,
         .parts          = afeb9260_nand_partition,
         .num_parts      = ARRAY_SIZE(afeb9260_nand_partition),
+        .det_pin        = -EINVAL,
 };
 
 
@@ -149,6 +152,7 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = {
         .wp_pin         = AT91_PIN_PC4,
         .slot_b         = 1,
         .wire4          = 1,
+        .vcc_pin        = -EINVAL,
 };
 
 
@@ -169,6 +173,8 @@ static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {
 static struct at91_cf_data afeb9260_cf_data = {
         .chipselect = 4,
         .irq_pin    = AT91_PIN_PA6,
+        .det_pin        = -EINVAL,
+        .vcc_pin        = -EINVAL,
         .rst_pin    = AT91_PIN_PA7,
         .flags      = AT91_CF_TRUE_IDE,
 };
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index f90cfb32bad2..8510e9e54988 100644
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -62,6 +62,8 @@ static void __init cam60_init_early(void)
  */
 static struct at91_usbh_data __initdata cam60_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 
@@ -115,7 +117,7 @@ static struct spi_board_info cam60_spi_devices[] __initdata = {
 /*
  * MACB Ethernet device
  */
-static struct __initdata at91_eth_data cam60_macb_data = {
+static struct __initdata macb_platform_data cam60_macb_data = {
         .phy_irq_pin    = AT91_PIN_PB5,
         .is_rmii        = 0,
 };
@@ -135,7 +137,7 @@ static struct mtd_partition __initdata cam60_nand_partition[] = {
 static struct atmel_nand_data __initdata cam60_nand_data = {
         .ale            = 21,
         .cle            = 22,
-        // .det_pin     = ... not there
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PA9,
         .enable_pin     = AT91_PIN_PA7,
         .parts          = cam60_nand_partition,
@@ -163,7 +165,7 @@ static struct sam9_smc_config __initdata cam60_nand_smc_config = {
 static void __init cam60_add_device_nand(void)
 {
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &cam60_nand_smc_config);
+        sam9_smc_configure(0, 3, &cam60_nand_smc_config);
 
         at91_add_device_nand(&cam60_nand_data);
 }
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index 5dffd3be62d2..ac3de4f7c31d 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -70,6 +70,8 @@ static void __init cap9adk_init_early(void)
  */
 static struct at91_usbh_data __initdata cap9adk_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -144,16 +146,17 @@ static struct spi_board_info cap9adk_spi_devices[] = {
  */
 static struct at91_mmc_data __initdata cap9adk_mmc_data = {
         .wire4          = 1,
-//      .det_pin        = ... not connected
-//      .wp_pin         = ... not connected
-//      .vcc_pin        = ... not connected
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata cap9adk_macb_data = {
+static struct macb_platform_data __initdata cap9adk_macb_data = {
+        .phy_irq_pin    = -EINVAL,
         .is_rmii        = 1,
 };
 
@@ -172,8 +175,8 @@ static struct mtd_partition __initdata cap9adk_nand_partitions[] = {
 static struct atmel_nand_data __initdata cap9adk_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
-//      .rdy_pin        = ... not connected
+        .det_pin        = -EINVAL,
+        .rdy_pin        = -EINVAL,
         .enable_pin     = AT91_PIN_PD15,
         .parts          = cap9adk_nand_partitions,
         .num_parts      = ARRAY_SIZE(cap9adk_nand_partitions),
@@ -212,7 +215,7 @@ static void __init cap9adk_add_device_nand(void)
                 cap9adk_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &cap9adk_nand_smc_config);
+        sam9_smc_configure(0, 3, &cap9adk_nand_smc_config);
 
         at91_add_device_nand(&cap9adk_nand_data);
 }
@@ -282,7 +285,7 @@ static __init void cap9adk_add_device_nor(void)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);
 
         /* configure chip-select 0 (NOR) */
-        sam9_smc_configure(0, &cap9adk_nor_smc_config);
+        sam9_smc_configure(0, 0, &cap9adk_nor_smc_config);
 
         platform_device_register(&cap9adk_nor_flash);
 }
@@ -351,7 +354,7 @@ static struct atmel_lcdfb_info __initdata cap9adk_lcdc_data;
  * AC97
  */
 static struct ac97c_platform_data cap9adk_ac97_data = {
-//      .reset_pin      = ... not connected
+        .reset_pin      = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index 774c87fcbd5b..59d9cf997537 100644
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -57,13 +57,15 @@ static void __init carmeva_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata carmeva_eth_data = {
+static struct macb_platform_data __initdata carmeva_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata carmeva_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata carmeva_udc_data = {
@@ -75,8 +77,8 @@ static struct at91_udc_data __initdata carmeva_udc_data = {
 // static struct at91_cf_data __initdata carmeva_cf_data = {
 //      .det_pin        = AT91_PIN_PB0,
 //      .rst_pin        = AT91_PIN_PC5,
-        // .irq_pin     = ... not connected
-        // .vcc_pin     = ... always powered
+        // .irq_pin     = -EINVAL,
+        // .vcc_pin     = -EINVAL,
 // };
 
 static struct at91_mmc_data __initdata carmeva_mmc_data = {
@@ -84,6 +86,7 @@ static struct at91_mmc_data __initdata carmeva_mmc_data = {
         .wire4          = 1,
         .det_pin        = AT91_PIN_PB10,
         .wp_pin         = AT91_PIN_PC14,
+        .vcc_pin        = -EINVAL,
 };
 
 static struct spi_board_info carmeva_spi_devices[] = {
diff --git a/arch/arm/mach-at91/board-cpu9krea.c b/arch/arm/mach-at91/board-cpu9krea.c
index fc885a4ce243..9ab3d1ea326d 100644
--- a/arch/arm/mach-at91/board-cpu9krea.c
+++ b/arch/arm/mach-at91/board-cpu9krea.c
@@ -86,6 +86,8 @@ static void __init cpu9krea_init_early(void)
  */
 static struct at91_usbh_data __initdata cpu9krea_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -93,13 +95,14 @@ static struct at91_usbh_data __initdata cpu9krea_usbh_data = {
  */
 static struct at91_udc_data __initdata cpu9krea_udc_data = {
         .vbus_pin       = AT91_PIN_PC8,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata cpu9krea_macb_data = {
+static struct macb_platform_data __initdata cpu9krea_macb_data = {
+        .phy_irq_pin    = -EINVAL,
         .is_rmii        = 1,
 };
 
@@ -112,6 +115,7 @@ static struct atmel_nand_data __initdata cpu9krea_nand_data = {
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .bus_width_16   = 0,
+        .det_pin        = -EINVAL,
 };
 
 #ifdef CONFIG_MACH_CPU9260
@@ -156,7 +160,7 @@ static struct sam9_smc_config __initdata cpu9krea_nand_smc_config = {
 
 static void __init cpu9krea_add_device_nand(void)
 {
-        sam9_smc_configure(3, &cpu9krea_nand_smc_config);
+        sam9_smc_configure(0, 3, &cpu9krea_nand_smc_config);
         at91_add_device_nand(&cpu9krea_nand_data);
 }
 
@@ -238,7 +242,7 @@ static __init void cpu9krea_add_device_nor(void)
         at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_VDDIOMSEL_3_3V);
 
         /* configure chip-select 0 (NOR) */
-        sam9_smc_configure(0, &cpu9krea_nor_smc_config);
+        sam9_smc_configure(0, 0, &cpu9krea_nor_smc_config);
 
         platform_device_register(&cpu9krea_nor_flash);
 }
@@ -337,6 +341,8 @@ static struct at91_mmc_data __initdata cpu9krea_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
         .det_pin        = AT91_PIN_PA29,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 static void __init cpu9krea_board_init(void)
diff --git a/arch/arm/mach-at91/board-cpuat91.c b/arch/arm/mach-at91/board-cpuat91.c
index d35e65b08ccd..368e1427ad99 100644
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
@@ -82,12 +82,15 @@ static void __init cpuat91_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata cpuat91_eth_data = {
+static struct macb_platform_data __initdata cpuat91_eth_data = {
+        .phy_irq_pin    = -EINVAL,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata cpuat91_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata cpuat91_udc_data = {
@@ -98,6 +101,8 @@ static struct at91_udc_data __initdata cpuat91_udc_data = {
 static struct at91_mmc_data __initdata cpuat91_mmc_data = {
         .det_pin        = AT91_PIN_PC2,
         .wire4          = 1,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 static struct physmap_flash_data cpuat91_flash_data = {
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index c3936665e645..1a1547b1ce4e 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -58,18 +58,20 @@ static void __init csb337_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata csb337_eth_data = {
+static struct macb_platform_data __initdata csb337_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC2,
         .is_rmii        = 0,
 };
 
 static struct at91_usbh_data __initdata csb337_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata csb337_udc_data = {
-        // this has no VBUS sensing pin
         .pullup_pin     = AT91_PIN_PA24,
+        .vbus_pin       = -EINVAL,
 };
 
 static struct i2c_board_info __initdata csb337_i2c_devices[] = {
@@ -98,6 +100,7 @@ static struct at91_mmc_data __initdata csb337_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
         .wp_pin         = AT91_PIN_PD6,
+        .vcc_pin        = -EINVAL,
 };
 
 static struct spi_board_info csb337_spi_devices[] = {
diff --git a/arch/arm/mach-at91/board-csb637.c b/arch/arm/mach-at91/board-csb637.c
index 586100e2acbb..f650bf39455d 100644
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
@@ -52,13 +52,15 @@ static void __init csb637_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata csb637_eth_data = {
+static struct macb_platform_data __initdata csb637_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC0,
         .is_rmii        = 0,
 };
 
 static struct at91_usbh_data __initdata csb637_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata csb637_udc_data = {
diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt.c
index 0b7d32778210..bb6b434ec0c1 100644
--- a/arch/arm/mach-at91/board-dt.c
+++ b/arch/arm/mach-at91/board-dt.c
@@ -50,6 +50,7 @@ static void __init ek_init_early(void)
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC8,
         .enable_pin     = AT91_PIN_PC14,
 };
@@ -82,7 +83,7 @@ static void __init ek_add_device_nand(void)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c
index 45db7a3dbef0..d302ca3eeb64 100644
--- a/arch/arm/mach-at91/board-eb9200.c
+++ b/arch/arm/mach-at91/board-eb9200.c
@@ -60,13 +60,15 @@ static void __init eb9200_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata eb9200_eth_data = {
+static struct macb_platform_data __initdata eb9200_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata eb9200_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata eb9200_udc_data = {
@@ -75,15 +77,18 @@ static struct at91_udc_data __initdata eb9200_udc_data = {
 };
 
 static struct at91_cf_data __initdata eb9200_cf_data = {
+        .irq_pin        = -EINVAL,
         .det_pin        = AT91_PIN_PB0,
+        .vcc_pin        = -EINVAL,
         .rst_pin        = AT91_PIN_PC5,
-        // .irq_pin     = ... not connected
-        // .vcc_pin     = ... always powered
 };
 
 static struct at91_mmc_data __initdata eb9200_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 static struct i2c_board_info __initdata eb9200_i2c_devices[] = {
diff --git a/arch/arm/mach-at91/board-ecbat91.c b/arch/arm/mach-at91/board-ecbat91.c
index 2f9c16d29212..69966ce4d776 100644
--- a/arch/arm/mach-at91/board-ecbat91.c
+++ b/arch/arm/mach-at91/board-ecbat91.c
@@ -64,18 +64,23 @@ static void __init ecb_at91init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata ecb_at91eth_data = {
+static struct macb_platform_data __initdata ecb_at91eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 0,
 };
 
 static struct at91_usbh_data __initdata ecb_at91usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_mmc_data __initdata ecb_at91mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-eco920.c b/arch/arm/mach-at91/board-eco920.c
index 8252c722607b..07ef35b0ec2c 100644
--- a/arch/arm/mach-at91/board-eco920.c
+++ b/arch/arm/mach-at91/board-eco920.c
@@ -47,13 +47,15 @@ static void __init eco920_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata eco920_eth_data = {
+static struct macb_platform_data __initdata eco920_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC2,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata eco920_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata eco920_udc_data = {
@@ -64,6 +66,9 @@ static struct at91_udc_data __initdata eco920_udc_data = {
 static struct at91_mmc_data __initdata eco920_mmc_data = {
         .slot_b         = 0,
         .wire4          = 0,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 static struct physmap_flash_data eco920_flash_data = {
diff --git a/arch/arm/mach-at91/board-flexibity.c b/arch/arm/mach-at91/board-flexibity.c
index 4c3f65d9c59b..eec02cd57ced 100644
--- a/arch/arm/mach-at91/board-flexibity.c
+++ b/arch/arm/mach-at91/board-flexibity.c
@@ -52,12 +52,14 @@ static void __init flexibity_init_early(void)
 /* USB Host port */
 static struct at91_usbh_data __initdata flexibity_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /* USB Device port */
 static struct at91_udc_data __initdata flexibity_udc_data = {
         .vbus_pin       = AT91_PIN_PC5,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 /* SPI devices */
@@ -76,6 +78,7 @@ static struct at91_mmc_data __initdata flexibity_mmc_data = {
         .wire4          = 1,
         .det_pin        = AT91_PIN_PC9,
         .wp_pin         = AT91_PIN_PC4,
+        .vcc_pin        = -EINVAL,
 };
 
 /* LEDs */
diff --git a/arch/arm/mach-at91/board-foxg20.c b/arch/arm/mach-at91/board-foxg20.c
index f27d1a780cfa..caf017f0f4ee 100644
--- a/arch/arm/mach-at91/board-foxg20.c
+++ b/arch/arm/mach-at91/board-foxg20.c
@@ -106,6 +106,8 @@ static void __init foxg20_init_early(void)
  */
 static struct at91_usbh_data __initdata foxg20_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -113,7 +115,7 @@ static struct at91_usbh_data __initdata foxg20_usbh_data = {
  */
 static struct at91_udc_data __initdata foxg20_udc_data = {
         .vbus_pin       = AT91_PIN_PC6,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -135,7 +137,7 @@ static struct spi_board_info foxg20_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata foxg20_macb_data = {
+static struct macb_platform_data __initdata foxg20_macb_data = {
         .phy_irq_pin    = AT91_PIN_PA7,
         .is_rmii        = 1,
 };
@@ -147,6 +149,9 @@ static struct at91_eth_data __initdata foxg20_macb_data = {
 static struct at91_mmc_data __initdata foxg20_mmc_data = {
         .slot_b         = 1,
         .wire4          = 1,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-gsia18s.c b/arch/arm/mach-at91/board-gsia18s.c
index 2e95949737e6..230e71969fb7 100644
--- a/arch/arm/mach-at91/board-gsia18s.c
+++ b/arch/arm/mach-at91/board-gsia18s.c
@@ -80,6 +80,8 @@ static void __init gsia18s_init_early(void)
  */
 static struct at91_usbh_data __initdata usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -87,13 +89,13 @@ static struct at91_usbh_data __initdata usbh_data = {
  */
 static struct at91_udc_data __initdata udc_data = {
         .vbus_pin       = AT91_PIN_PA22,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata macb_data = {
+static struct macb_platform_data __initdata macb_data = {
         .phy_irq_pin    = AT91_PIN_PA28,
         .is_rmii        = 1,
 };
@@ -530,6 +532,7 @@ static struct i2c_board_info __initdata gsia18s_i2c_devices[] = {
 static struct at91_cf_data __initdata gsia18s_cf1_data = {
         .irq_pin        = AT91_PIN_PA27,
         .det_pin        = AT91_PIN_PB30,
+        .vcc_pin        = -EINVAL,
         .rst_pin        = AT91_PIN_PB31,
         .chipselect     = 5,
         .flags          = AT91_CF_TRUE_IDE,
diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c
index 3bae73e63633..efde1b2327c8 100644
--- a/arch/arm/mach-at91/board-kafa.c
+++ b/arch/arm/mach-at91/board-kafa.c
@@ -61,13 +61,15 @@ static void __init kafa_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata kafa_eth_data = {
+static struct macb_platform_data __initdata kafa_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 0,
 };
 
 static struct at91_usbh_data __initdata kafa_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata kafa_udc_data = {
diff --git a/arch/arm/mach-at91/board-kb9202.c b/arch/arm/mach-at91/board-kb9202.c
index e61351ffad50..d75a4a2ad9c2 100644
--- a/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@ -69,13 +69,15 @@ static void __init kb9202_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata kb9202_eth_data = {
+static struct macb_platform_data __initdata kb9202_eth_data = {
         .phy_irq_pin    = AT91_PIN_PB29,
         .is_rmii        = 0,
 };
 
 static struct at91_usbh_data __initdata kb9202_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata kb9202_udc_data = {
@@ -87,6 +89,8 @@ static struct at91_mmc_data __initdata kb9202_mmc_data = {
         .det_pin        = AT91_PIN_PB2,
         .slot_b         = 0,
         .wire4          = 1,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 static struct mtd_partition __initdata kb9202_nand_partition[] = {
@@ -100,7 +104,7 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = {
 static struct atmel_nand_data __initdata kb9202_nand_data = {
         .ale            = 22,
         .cle            = 21,
-        // .det_pin     = ... not there
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC29,
         .enable_pin     = AT91_PIN_PC28,
         .parts          = kb9202_nand_partition,
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
index ef816c17dc61..3f8617c0e04e 100644
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@ -72,6 +72,7 @@ static void __init neocore926_init_early(void)
 static struct at91_usbh_data __initdata neocore926_usbh_data = {
         .ports          = 2,
         .vbus_pin       = { AT91_PIN_PA24, AT91_PIN_PA21 },
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -79,7 +80,7 @@ static struct at91_usbh_data __initdata neocore926_usbh_data = {
  */
 static struct at91_udc_data __initdata neocore926_udc_data = {
         .vbus_pin       = AT91_PIN_PA25,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -149,13 +150,14 @@ static struct at91_mmc_data __initdata neocore926_mmc_data = {
         .wire4          = 1,
         .det_pin        = AT91_PIN_PE18,
         .wp_pin         = AT91_PIN_PE19,
+        .vcc_pin        = -EINVAL,
 };
 
 
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata neocore926_macb_data = {
+static struct macb_platform_data __initdata neocore926_macb_data = {
         .phy_irq_pin    = AT91_PIN_PE31,
         .is_rmii        = 1,
 };
@@ -190,6 +192,7 @@ static struct atmel_nand_data __initdata neocore926_nand_data = {
         .enable_pin             = AT91_PIN_PD15,
         .parts                  = neocore926_nand_partition,
         .num_parts              = ARRAY_SIZE(neocore926_nand_partition),
+        .det_pin                = -EINVAL,
 };
 
 static struct sam9_smc_config __initdata neocore926_nand_smc_config = {
@@ -213,7 +216,7 @@ static struct sam9_smc_config __initdata neocore926_nand_smc_config = {
 static void __init neocore926_add_device_nand(void)
 {
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &neocore926_nand_smc_config);
+        sam9_smc_configure(0, 3, &neocore926_nand_smc_config);
 
         at91_add_device_nand(&neocore926_nand_data);
 }
diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c
index 49e3f699b48e..b4a12fc184c8 100644
--- a/arch/arm/mach-at91/board-pcontrol-g20.c
+++ b/arch/arm/mach-at91/board-pcontrol-g20.c
@@ -96,9 +96,9 @@ static struct sam9_smc_config __initdata pcontrol_smc_config[2] = { {
 static void __init add_device_pcontrol(void)
 {
         /* configure chip-select 4 (IO compatible to 8051  X4 ) */
-        sam9_smc_configure(4, &pcontrol_smc_config[0]);
+        sam9_smc_configure(0, 4, &pcontrol_smc_config[0]);
         /* configure chip-select 7 (FerroRAM 256KiBx16bit MR2A16A  D4 ) */
-        sam9_smc_configure(7, &pcontrol_smc_config[1]);
+        sam9_smc_configure(0, 7, &pcontrol_smc_config[1]);
 }
 
 
@@ -107,6 +107,8 @@ static void __init add_device_pcontrol(void)
  */
 static struct at91_usbh_data __initdata usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 
@@ -122,7 +124,7 @@ static struct at91_udc_data __initdata pcontrol_g20_udc_data = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata macb_data = {
+static struct macb_platform_data __initdata macb_data = {
         .phy_irq_pin    = AT91_PIN_PA28,
         .is_rmii        = 1,
 };
diff --git a/arch/arm/mach-at91/board-picotux200.c b/arch/arm/mach-at91/board-picotux200.c
index 0a8fe6a1b7c8..ab024fa11d5c 100644
--- a/arch/arm/mach-at91/board-picotux200.c
+++ b/arch/arm/mach-at91/board-picotux200.c
@@ -60,13 +60,15 @@ static void __init picotux200_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata picotux200_eth_data = {
+static struct macb_platform_data __initdata picotux200_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata picotux200_usbh_data = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_mmc_data __initdata picotux200_mmc_data = {
@@ -74,6 +76,7 @@ static struct at91_mmc_data __initdata picotux200_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
         .wp_pin         = AT91_PIN_PA17,
+        .vcc_pin        = -EINVAL,
 };
 
 #define PICOTUX200_FLASH_BASE   AT91_CHIPSELECT_0
diff --git a/arch/arm/mach-at91/board-qil-a9260.c b/arch/arm/mach-at91/board-qil-a9260.c
index 07421bdb88ea..e029d220cb84 100644
--- a/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@ -77,6 +77,8 @@ static void __init ek_init_early(void)
  */
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -84,7 +86,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PC5,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 /*
@@ -104,7 +106,7 @@ static struct spi_board_info ek_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PA31,
         .is_rmii        = 1,
 };
@@ -133,7 +135,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .parts          = ek_nand_partition,
@@ -161,7 +163,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 static void __init ek_add_device_nand(void)
 {
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -172,9 +174,9 @@ static void __init ek_add_device_nand(void)
 static struct at91_mmc_data __initdata ek_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
-//      .det_pin        = ... not connected
-//      .wp_pin         = ... not connected
-//      .vcc_pin        = ... not connected
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 /*
@@ -251,7 +253,7 @@ static void __init ek_board_init(void)
         /* LEDs */
         at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
         /* shutdown controller, wakeup button (5 msec low) */
-        at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
+        at91_shdwc_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10) | AT91_SHDW_WKMODE0_LOW
                                 | AT91_SHDW_RTTWKEN);
 }
 
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
index 80a8c9c6e922..782f37946af5 100644
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@ -65,13 +65,15 @@ static void __init dk_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata dk_eth_data = {
+static struct macb_platform_data __initdata dk_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata dk_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata dk_udc_data = {
@@ -80,16 +82,19 @@ static struct at91_udc_data __initdata dk_udc_data = {
 };
 
 static struct at91_cf_data __initdata dk_cf_data = {
+        .irq_pin        = -EINVAL,
         .det_pin        = AT91_PIN_PB0,
+        .vcc_pin        = -EINVAL,
         .rst_pin        = AT91_PIN_PC5,
-        // .irq_pin     = ... not connected
-        // .vcc_pin     = ... always powered
 };
 
 #ifndef CONFIG_MTD_AT91_DATAFLASH_CARD
 static struct at91_mmc_data __initdata dk_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 #endif
 
@@ -143,7 +148,7 @@ static struct atmel_nand_data __initdata dk_nand_data = {
         .cle            = 21,
         .det_pin        = AT91_PIN_PB1,
         .rdy_pin        = AT91_PIN_PC2,
-        // .enable_pin  = ... not there
+        .enable_pin     = -EINVAL,
         .parts          = dk_nand_partition,
         .num_parts      = ARRAY_SIZE(dk_nand_partition),
 };
diff --git a/arch/arm/mach-at91/board-rm9200ek.c b/arch/arm/mach-at91/board-rm9200ek.c
index 99fd7f8aee0e..ef7c12a92246 100644
--- a/arch/arm/mach-at91/board-rm9200ek.c
+++ b/arch/arm/mach-at91/board-rm9200ek.c
@@ -65,13 +65,15 @@ static void __init ek_init_early(void)
         at91_set_serial_console(0);
 }
 
-static struct at91_eth_data __initdata ek_eth_data = {
+static struct macb_platform_data __initdata ek_eth_data = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
 
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata ek_udc_data = {
@@ -85,6 +87,7 @@ static struct at91_mmc_data __initdata ek_mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
         .wp_pin         = AT91_PIN_PA17,
+        .vcc_pin        = -EINVAL,
 };
 #endif
 
diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c
index e927df0175df..af0750fafa29 100644
--- a/arch/arm/mach-at91/board-rsi-ews.c
+++ b/arch/arm/mach-at91/board-rsi-ews.c
@@ -60,7 +60,7 @@ static void __init rsi_ews_init_early(void)
 /*
  * Ethernet
  */
-static struct at91_eth_data rsi_ews_eth_data __initdata = {
+static struct macb_platform_data rsi_ews_eth_data __initdata = {
         .phy_irq_pin    = AT91_PIN_PC4,
         .is_rmii        = 1,
 };
@@ -70,6 +70,8 @@ static struct at91_eth_data rsi_ews_eth_data __initdata = {
  */
 static struct at91_usbh_data rsi_ews_usbh_data __initdata = {
         .ports          = 1,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index 072d53af98d9..84bce587735f 100644
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -72,6 +72,8 @@ static void __init ek_init_early(void)
  */
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -79,7 +81,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PC5,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -109,7 +111,7 @@ static struct spi_board_info ek_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PA7,
         .is_rmii        = 0,
 };
@@ -134,7 +136,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .parts          = ek_nand_partition,
@@ -162,7 +164,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 static void __init ek_add_device_nand(void)
 {
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -176,7 +178,7 @@ static struct at91_mmc_data __initdata ek_mmc_data = {
         .wire4          = 1,
         .det_pin        = AT91_PIN_PC8,
         .wp_pin         = AT91_PIN_PC4,
-//      .vcc_pin        = ... not connected
+        .vcc_pin        = -EINVAL,
 };
 
 static void __init ek_board_init(void)
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index 4f10181a0782..be8233bcabdc 100644
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -75,6 +75,8 @@ static void __init ek_init_early(void)
  */
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -82,7 +84,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PC5,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -151,7 +153,7 @@ static struct spi_board_info ek_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PA7,
         .is_rmii        = 1,
 };
@@ -176,7 +178,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .parts          = ek_nand_partition,
@@ -211,7 +213,7 @@ static void __init ek_add_device_nand(void)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -223,9 +225,9 @@ static void __init ek_add_device_nand(void)
 static struct at91_mmc_data __initdata ek_mmc_data = {
         .slot_b         = 1,
         .wire4          = 1,
-//      .det_pin        = ... not connected
-//      .wp_pin         = ... not connected
-//      .vcc_pin        = ... not connected
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index b005b738e8ff..40895072a1a7 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -131,7 +131,7 @@ static struct sam9_smc_config __initdata dm9000_smc_config = {
 static void __init ek_add_device_dm9000(void)
 {
         /* Configure chip-select 2 (DM9000) */
-        sam9_smc_configure(2, &dm9000_smc_config);
+        sam9_smc_configure(0, 2, &dm9000_smc_config);
 
         /* Configure Reset signal as output */
         at91_set_gpio_output(AT91_PIN_PC10, 0);
@@ -151,6 +151,8 @@ static void __init ek_add_device_dm9000(void) {}
  */
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 
@@ -159,7 +161,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PB29,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -182,7 +184,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 22,
         .cle            = 21,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC15,
         .enable_pin     = AT91_PIN_PC14,
         .parts          = ek_nand_partition,
@@ -217,7 +219,7 @@ static void __init ek_add_device_nand(void)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -345,6 +347,9 @@ static struct spi_board_info ek_spi_devices[] = {
  */
 static struct at91_mmc_data __initdata ek_mmc_data = {
         .wire4          = 1,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 #endif /* CONFIG_SPI_ATMEL_* */
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index bccdcf23caa1..29f66052fe63 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -74,6 +74,7 @@ static void __init ek_init_early(void)
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
         .vbus_pin       = { AT91_PIN_PA24, AT91_PIN_PA21 },
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -81,7 +82,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PA25,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -151,14 +152,14 @@ static struct at91_mmc_data __initdata ek_mmc_data = {
         .wire4          = 1,
         .det_pin        = AT91_PIN_PE18,
         .wp_pin         = AT91_PIN_PE19,
-//      .vcc_pin        = ... not connected
+        .vcc_pin        = -EINVAL,
 };
 
 
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PE31,
         .is_rmii        = 1,
 };
@@ -183,7 +184,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PA22,
         .enable_pin     = AT91_PIN_PD15,
         .parts          = ek_nand_partition,
@@ -218,7 +219,7 @@ static void __init ek_add_device_nand(void)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -353,6 +354,7 @@ static void __init ek_add_device_buttons(void) {}
  * reset_pin is not connected: NRST
  */
 static struct ac97c_platform_data ek_ac97_data = {
+        .reset_pin      = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 64fc75c9d0ac..843d6286c6f4 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -86,6 +86,8 @@ static void __init ek_init_early(void)
  */
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -93,7 +95,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PC5,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
@@ -123,7 +125,7 @@ static struct spi_board_info ek_spi_devices[] = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PA7,
         .is_rmii        = 1,
 };
@@ -163,6 +165,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .cle            = 22,
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
+        .det_pin        = -EINVAL,
         .parts          = ek_nand_partition,
         .num_parts      = ARRAY_SIZE(ek_nand_partition),
 };
@@ -195,7 +198,7 @@ static void __init ek_add_device_nand(void)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -210,6 +213,7 @@ static struct mci_platform_data __initdata ek_mmc_data = {
         .slot[1] = {
                 .bus_width      = 4,
                 .detect_pin     = AT91_PIN_PC9,
+                .wp_pin         = -EINVAL,
         },
 
 };
@@ -218,6 +222,8 @@ static struct at91_mmc_data __initdata ek_mmc_data = {
         .slot_b         = 1,    /* Only one slot so use slot B */
         .wire4          = 1,
         .det_pin        = AT91_PIN_PC9,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 #endif
 
@@ -227,6 +233,7 @@ static void __init ek_add_device_mmc(void)
         if (ek_have_2mmc()) {
                 ek_mmc_data.slot[0].bus_width = 4;
                 ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2;
+                ek_mmc_data.slot[0].wp_pin = -1;
         }
         at91_add_device_mci(0, &ek_mmc_data);
 #else
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 92de9127923a..ea0d1b9c2b7b 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -69,6 +69,7 @@ static void __init ek_init_early(void)
 static struct at91_usbh_data __initdata ek_usbh_hs_data = {
         .ports          = 2,
         .vbus_pin       = {AT91_PIN_PD1, AT91_PIN_PD3},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 
@@ -100,6 +101,7 @@ static struct mci_platform_data __initdata mci0_data = {
         .slot[0] = {
                 .bus_width      = 4,
                 .detect_pin     = AT91_PIN_PD10,
+                .wp_pin         = -EINVAL,
         },
 };
 
@@ -115,7 +117,7 @@ static struct mci_platform_data __initdata mci1_data = {
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PD5,
         .is_rmii        = 1,
 };
@@ -143,6 +145,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
         .cle            = 22,
         .rdy_pin        = AT91_PIN_PC8,
         .enable_pin     = AT91_PIN_PC14,
+        .det_pin        = -EINVAL,
         .parts          = ek_nand_partition,
         .num_parts      = ARRAY_SIZE(ek_nand_partition),
 };
@@ -175,7 +178,7 @@ static void __init ek_add_device_nand(void)
                 ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
 
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -330,6 +333,7 @@ static void __init ek_add_device_buttons(void) {}
  * reset_pin is not connected: NRST
  */
 static struct ac97c_platform_data ek_ac97_data = {
+        .reset_pin      = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index b2b748239f36..c1366d0032bf 100644
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -67,8 +67,8 @@ static struct usba_platform_data __initdata ek_usba_udc_data = {
 static struct at91_mmc_data __initdata ek_mmc_data = {
         .wire4          = 1,
         .det_pin        = AT91_PIN_PA15,
-//      .wp_pin         = ... not connected
-//      .vcc_pin        = ... not connected
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 
@@ -91,7 +91,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PD17,
         .enable_pin     = AT91_PIN_PB6,
         .parts          = ek_nand_partition,
@@ -119,7 +119,7 @@ static struct sam9_smc_config __initdata ek_nand_smc_config = {
 static void __init ek_add_device_nand(void)
 {
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &ek_nand_smc_config);
+        sam9_smc_configure(0, 3, &ek_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -204,6 +204,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data;
  * reset_pin is not connected: NRST
  */
 static struct ac97c_platform_data ek_ac97_data = {
+        .reset_pin      = -EINVAL,
 };
 
 
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index 0df01c6e2d0c..4770db08e5a6 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -57,15 +57,19 @@ static void __init snapper9260_init_early(void)
 
 static struct at91_usbh_data __initdata snapper9260_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 static struct at91_udc_data __initdata snapper9260_udc_data = {
         .vbus_pin               = SNAPPER9260_IO_EXP_GPIO(5),
         .vbus_active_low        = 1,
         .vbus_polled            = 1,
+        .pullup_pin             = -EINVAL,
 };
 
-static struct at91_eth_data snapper9260_macb_data = {
+static struct macb_platform_data snapper9260_macb_data = {
+        .phy_irq_pin    = -EINVAL,
         .is_rmii        = 1,
 };
 
@@ -104,6 +108,8 @@ static struct atmel_nand_data __initdata snapper9260_nand_data = {
         .parts          = snapper9260_nand_partitions,
         .num_parts      = ARRAY_SIZE(snapper9260_nand_partitions),
         .bus_width_16   = 0,
+        .enable_pin     = -EINVAL,
+        .det_pin        = -EINVAL,
 };
 
 static struct sam9_smc_config __initdata snapper9260_nand_smc_config = {
@@ -149,7 +155,7 @@ static struct i2c_board_info __initdata snapper9260_i2c_devices[] = {
 static void __init snapper9260_add_device_nand(void)
 {
         at91_set_A_periph(AT91_PIN_PC14, 0);
-        sam9_smc_configure(3, &snapper9260_nand_smc_config);
+        sam9_smc_configure(0, 3, &snapper9260_nand_smc_config);
         at91_add_device_nand(&snapper9260_nand_data);
 }
 
diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index 936e5fd7f406..72eb3b4d9ab6 100644
--- a/arch/arm/mach-at91/board-stamp9g20.c
+++ b/arch/arm/mach-at91/board-stamp9g20.c
@@ -85,6 +85,7 @@ static struct atmel_nand_data __initdata nand_data = {
         .rdy_pin        = AT91_PIN_PC13,
         .enable_pin     = AT91_PIN_PC14,
         .bus_width_16   = 0,
+        .det_pin        = -EINVAL,
 };
 
 static struct sam9_smc_config __initdata nand_smc_config = {
@@ -108,7 +109,7 @@ static struct sam9_smc_config __initdata nand_smc_config = {
 static void __init add_device_nand(void)
 {
         /* configure chip-select 3 (NAND) */
-        sam9_smc_configure(3, &nand_smc_config);
+        sam9_smc_configure(0, 3, &nand_smc_config);
 
         at91_add_device_nand(&nand_data);
 }
@@ -122,12 +123,17 @@ static void __init add_device_nand(void)
 static struct mci_platform_data __initdata mmc_data = {
         .slot[0] = {
                 .bus_width      = 4,
+                .detect_pin     = -1,
+                .wp_pin         = -1,
         },
 };
 #else
 static struct at91_mmc_data __initdata mmc_data = {
         .slot_b         = 0,
         .wire4          = 1,
+        .det_pin        = -EINVAL,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 #endif
 
@@ -137,6 +143,8 @@ static struct at91_mmc_data __initdata mmc_data = {
  */
 static struct at91_usbh_data __initdata usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 
@@ -145,19 +153,19 @@ static struct at91_usbh_data __initdata usbh_data = {
  */
 static struct at91_udc_data __initdata portuxg20_udc_data = {
         .vbus_pin       = AT91_PIN_PC7,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 static struct at91_udc_data __initdata stamp9g20evb_udc_data = {
         .vbus_pin       = AT91_PIN_PA22,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata macb_data = {
+static struct macb_platform_data __initdata macb_data = {
         .phy_irq_pin    = AT91_PIN_PA28,
         .is_rmii        = 1,
 };
diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c
index 0a20bab21f99..26c36fc2d1e5 100644
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@ -66,6 +66,8 @@ static void __init ek_init_early(void)
  */
 static struct at91_usbh_data __initdata ek_usbh_data = {
         .ports          = 2,
+        .vbus_pin       = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -73,7 +75,7 @@ static struct at91_usbh_data __initdata ek_usbh_data = {
  */
 static struct at91_udc_data __initdata ek_udc_data = {
         .vbus_pin       = AT91_PIN_PB11,
-        .pullup_pin     = 0,            /* pull-up driven by UDC */
+        .pullup_pin     = -EINVAL,              /* pull-up driven by UDC */
 };
 
 static void __init ek_add_device_udc(void)
@@ -146,7 +148,7 @@ static void __init ek_add_device_spi(void)
 /*
  * MACB Ethernet device
  */
-static struct at91_eth_data __initdata ek_macb_data = {
+static struct macb_platform_data __initdata ek_macb_data = {
         .phy_irq_pin    = AT91_PIN_PE31,
         .is_rmii        = 1,
 };
@@ -193,7 +195,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
 static struct atmel_nand_data __initdata ek_nand_data = {
         .ale            = 21,
         .cle            = 22,
-//      .det_pin        = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PA22,
         .enable_pin     = AT91_PIN_PD15,
         .parts          = ek_nand_partition,
@@ -245,9 +247,9 @@ static void __init ek_add_device_nand(void)
 
         /* configure chip-select 3 (NAND) */
         if (machine_is_usb_a9g20())
-                sam9_smc_configure(3, &usb_a9g20_nand_smc_config);
+                sam9_smc_configure(0, 3, &usb_a9g20_nand_smc_config);
         else
-                sam9_smc_configure(3, &usb_a9260_nand_smc_config);
+                sam9_smc_configure(0, 3, &usb_a9260_nand_smc_config);
 
         at91_add_device_nand(&ek_nand_data);
 }
@@ -344,7 +346,7 @@ static void __init ek_board_init(void)
                 /* I2C */
                 at91_add_device_i2c(NULL, 0);
                 /* shutdown controller, wakeup button (5 msec low) */
-                at91_sys_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10)
+                at91_shdwc_write(AT91_SHDW_MR, AT91_SHDW_CPTWK0_(10)
                                 | AT91_SHDW_WKMODE0_LOW
                                 | AT91_SHDW_RTTWKEN);
         }
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c
index 12a3f955162b..bbd553e1cd93 100644
--- a/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@ -110,7 +110,7 @@ static struct gpio_led yl9200_leds[] = {
 /*
  * Ethernet
  */
-static struct at91_eth_data __initdata yl9200_eth_data = {
+static struct macb_platform_data __initdata yl9200_eth_data = {
         .phy_irq_pin            = AT91_PIN_PB28,
         .is_rmii                = 1,
 };
@@ -120,6 +120,8 @@ static struct at91_eth_data __initdata yl9200_eth_data = {
  */
 static struct at91_usbh_data __initdata yl9200_usbh_data = {
         .ports                  = 1,    /* PQFP version of AT91RM9200 */
+        .vbus_pin               = {-EINVAL, -EINVAL},
+        .overcurrent_pin= {-EINVAL, -EINVAL},
 };
 
 /*
@@ -137,8 +139,9 @@ static struct at91_udc_data __initdata yl9200_udc_data = {
  */
 static struct at91_mmc_data __initdata yl9200_mmc_data = {
         .det_pin        = AT91_PIN_PB9,
-        // .wp_pin      = ... not connected
         .wire4          = 1,
+        .wp_pin         = -EINVAL,
+        .vcc_pin        = -EINVAL,
 };
 
 /*
@@ -175,7 +178,7 @@ static struct mtd_partition __initdata yl9200_nand_partition[] = {
 static struct atmel_nand_data __initdata yl9200_nand_data = {
         .ale            = 6,
         .cle            = 7,
-        // .det_pin     = ... not connected
+        .det_pin        = -EINVAL,
         .rdy_pin        = AT91_PIN_PC14,        /* R/!B (Sheet10) */
         .enable_pin     = AT91_PIN_PC15,        /* !CE  (Sheet10) */
         .parts          = yl9200_nand_partition,
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 7f4503bc4cbb..4866b8180d66 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -29,6 +29,7 @@ extern void __init at91_aic_init(unsigned int priority[]);
  /* Timer */
 struct sys_timer;
 extern struct sys_timer at91rm9200_timer;
+extern void at91sam926x_ioremap_pit(u32 addr);
 extern struct sys_timer at91sam926x_timer;
 extern struct sys_timer at91x40_timer;
 
@@ -59,14 +60,16 @@ extern void at91_irq_resume(void);
 /* reset */
 extern void at91sam9_alt_restart(char, const char *);
 
+/* shutdown */
+extern void at91_ioremap_shdwc(u32 base_addr);
+
  /* GPIO */
 #define AT91RM9200_PQFP         3       /* AT91RM9200 PQFP package has 3 banks */
 #define AT91RM9200_BGA          4       /* AT91RM9200 BGA package has 4 banks */
 
 struct at91_gpio_bank {
         unsigned short id;              /* peripheral ID */
-        unsigned long offset;           /* offset from system peripheral base */
-        struct clk *clock;              /* associated clock */
+        unsigned long regbase;          /* offset from system peripheral base */
 };
 extern void __init at91_gpio_init(struct at91_gpio_bank *, int nr_banks);
 extern void __init at91_gpio_irq_setup(void);
diff --git a/arch/arm/mach-at91/gpio.c b/arch/arm/mach-at91/gpio.c
index 224e9e2f8674..74d6783eeabb 100644
--- a/arch/arm/mach-at91/gpio.c
+++ b/arch/arm/mach-at91/gpio.c
@@ -29,8 +29,9 @@
 struct at91_gpio_chip {
         struct gpio_chip        chip;
         struct at91_gpio_chip   *next;          /* Bank sharing same clock */
-        struct at91_gpio_bank   *bank;          /* Bank definition */
+        int                     id;             /* ID of register bank */
         void __iomem            *regbase;       /* Base of register bank */
+        struct clk              *clock;         /* associated clock */
 };
 
 #define to_at91_gpio_chip(c) container_of(c, struct at91_gpio_chip, chip)
@@ -58,18 +59,17 @@ static int at91_gpiolib_direction_input(struct gpio_chip *chip,
         }
 
 static struct at91_gpio_chip gpio_chip[] = {
-        AT91_GPIO_CHIP("A", 0x00 + PIN_BASE, 32),
-        AT91_GPIO_CHIP("B", 0x20 + PIN_BASE, 32),
-        AT91_GPIO_CHIP("C", 0x40 + PIN_BASE, 32),
-        AT91_GPIO_CHIP("D", 0x60 + PIN_BASE, 32),
-        AT91_GPIO_CHIP("E", 0x80 + PIN_BASE, 32),
+        AT91_GPIO_CHIP("pioA", 0x00, 32),
+        AT91_GPIO_CHIP("pioB", 0x20, 32),
+        AT91_GPIO_CHIP("pioC", 0x40, 32),
+        AT91_GPIO_CHIP("pioD", 0x60, 32),
+        AT91_GPIO_CHIP("pioE", 0x80, 32),
 };
 
 static int gpio_banks;
 
 static inline void __iomem *pin_to_controller(unsigned pin)
 {
-        pin -= PIN_BASE;
         pin /= 32;
         if (likely(pin < gpio_banks))
                 return gpio_chip[pin].regbase;
@@ -79,7 +79,6 @@ static inline void __iomem *pin_to_controller(unsigned pin)
 
 static inline unsigned pin_to_mask(unsigned pin)
 {
-        pin -= PIN_BASE;
         return 1 << (pin % 32);
 }
 
@@ -274,8 +273,9 @@ static u32 backups[MAX_GPIO_BANKS];
 
 static int gpio_irq_set_wake(struct irq_data *d, unsigned state)
 {
-        unsigned        mask = pin_to_mask(d->irq);
-        unsigned        bank = (d->irq - PIN_BASE) / 32;
+        unsigned        pin = irq_to_gpio(d->irq);
+        unsigned        mask = pin_to_mask(pin);
+        unsigned        bank = pin / 32;
 
         if (unlikely(bank >= MAX_GPIO_BANKS))
                 return -EINVAL;
@@ -285,7 +285,7 @@ static int gpio_irq_set_wake(struct irq_data *d, unsigned state)
         else
                 wakeups[bank] &= ~mask;
 
-        irq_set_irq_wake(gpio_chip[bank].bank->id, state);
+        irq_set_irq_wake(gpio_chip[bank].id, state);
 
         return 0;
 }
@@ -302,7 +302,7 @@ void at91_gpio_suspend(void)
                 __raw_writel(wakeups[i], pio + PIO_IER);
 
                 if (!wakeups[i])
-                        clk_disable(gpio_chip[i].bank->clock);
+                        clk_disable(gpio_chip[i].clock);
                 else {
 #ifdef CONFIG_PM_DEBUG
                         printk(KERN_DEBUG "GPIO-%c may wake for %08x\n", 'A'+i, wakeups[i]);
@@ -319,7 +319,7 @@ void at91_gpio_resume(void)
                 void __iomem    *pio = gpio_chip[i].regbase;
 
                 if (!wakeups[i])
-                        clk_enable(gpio_chip[i].bank->clock);
+                        clk_enable(gpio_chip[i].clock);
 
                 __raw_writel(wakeups[i], pio + PIO_IDR);
                 __raw_writel(backups[i], pio + PIO_IER);
@@ -344,8 +344,9 @@ void at91_gpio_resume(void)
 
 static void gpio_irq_mask(struct irq_data *d)
 {
-        void __iomem    *pio = pin_to_controller(d->irq);
-        unsigned        mask = pin_to_mask(d->irq);
+        unsigned        pin = irq_to_gpio(d->irq);
+        void __iomem    *pio = pin_to_controller(pin);
+        unsigned        mask = pin_to_mask(pin);
 
         if (pio)
                 __raw_writel(mask, pio + PIO_IDR);
@@ -353,8 +354,9 @@ static void gpio_irq_mask(struct irq_data *d)
 
 static void gpio_irq_unmask(struct irq_data *d)
 {
-        void __iomem    *pio = pin_to_controller(d->irq);
-        unsigned        mask = pin_to_mask(d->irq);
+        unsigned        pin = irq_to_gpio(d->irq);
+        void __iomem    *pio = pin_to_controller(pin);
+        unsigned        mask = pin_to_mask(pin);
 
         if (pio)
                 __raw_writel(mask, pio + PIO_IER);
@@ -382,7 +384,7 @@ static struct irq_chip gpio_irqchip = {
 
 static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
 {
-        unsigned        pin;
+        unsigned        irq_pin;
         struct irq_data *idata = irq_desc_get_irq_data(desc);
         struct irq_chip *chip = irq_data_get_irq_chip(idata);
         struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(idata);
@@ -405,12 +407,12 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
                         continue;
                 }
 
-                pin = at91_gpio->chip.base;
+                irq_pin = gpio_to_irq(at91_gpio->chip.base);
 
                 while (isr) {
                         if (isr & 1)
-                                generic_handle_irq(pin);
-                        pin++;
+                                generic_handle_irq(irq_pin);
+                        irq_pin++;
                         isr >>= 1;
                 }
         }
@@ -438,7 +440,7 @@ static int at91_gpio_show(struct seq_file *s, void *unused)
                 seq_printf(s, "%i:\t", j);
 
                 for (bank = 0; bank < gpio_banks; bank++) {
-                        unsigned        pin  = PIN_BASE + (32 * bank) + j;
+                        unsigned        pin  = (32 * bank) + j;
                         void __iomem    *pio = pin_to_controller(pin);
                         unsigned        mask = pin_to_mask(pin);
 
@@ -491,27 +493,28 @@ static struct lock_class_key gpio_lock_class;
  */
 void __init at91_gpio_irq_setup(void)
 {
-        unsigned                pioc, pin;
+        unsigned                pioc, irq = gpio_to_irq(0);
         struct at91_gpio_chip   *this, *prev;
 
-        for (pioc = 0, pin = PIN_BASE, this = gpio_chip, prev = NULL;
+        for (pioc = 0, this = gpio_chip, prev = NULL;
                         pioc++ < gpio_banks;
                         prev = this, this++) {
-                unsigned        id = this->bank->id;
+                unsigned        id = this->id;
                 unsigned        i;
 
                 __raw_writel(~0, this->regbase + PIO_IDR);
 
-                for (i = 0, pin = this->chip.base; i < 32; i++, pin++) {
-                        irq_set_lockdep_class(pin, &gpio_lock_class);
+                for (i = 0, irq = gpio_to_irq(this->chip.base); i < 32;
+                     i++, irq++) {
+                        irq_set_lockdep_class(irq, &gpio_lock_class);
 
                         /*
                          * Can use the "simple" and not "edge" handler since it's
                          * shorter, and the AIC handles interrupts sanely.
                          */
-                        irq_set_chip_and_handler(pin, &gpio_irqchip,
+                        irq_set_chip_and_handler(irq, &gpio_irqchip,
                                                  handle_simple_irq);
-                        set_irq_flags(pin, IRQF_VALID);
+                        set_irq_flags(irq, IRQF_VALID);
                 }
 
                 /* The toplevel handler handles one bank of GPIOs, except
@@ -524,7 +527,7 @@ void __init at91_gpio_irq_setup(void)
                 irq_set_chip_data(id, this);
                 irq_set_chained_handler(id, gpio_irq_handler);
         }
-        pr_info("AT91: %d gpio irqs in %d banks\n", pin - PIN_BASE, gpio_banks);
+        pr_info("AT91: %d gpio irqs in %d banks\n", irq - gpio_to_irq(0), gpio_banks);
 }
 
 /* gpiolib support */
@@ -612,16 +615,26 @@ void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks)
         for (i = 0; i < nr_banks; i++) {
                 at91_gpio = &gpio_chip[i];
 
-                at91_gpio->bank = &data[i];
-                at91_gpio->chip.base = PIN_BASE + i * 32;
-                at91_gpio->regbase = at91_gpio->bank->offset +
-                        (void __iomem *)AT91_VA_BASE_SYS;
+                at91_gpio->id = data[i].id;
+                at91_gpio->chip.base = i * 32;
+
+                at91_gpio->regbase = ioremap(data[i].regbase, 512);
+                if (!at91_gpio->regbase) {
+                        pr_err("at91_gpio.%d, failed to map registers, ignoring.\n", i);
+                        continue;
+                }
+
+                at91_gpio->clock = clk_get_sys(NULL, at91_gpio->chip.label);
+                if (!at91_gpio->clock) {
+                        pr_err("at91_gpio.%d, failed to get clock, ignoring.\n", i);
+                        continue;
+                }
 
                 /* enable PIO controller's clock */
-                clk_enable(at91_gpio->bank->clock);
+                clk_enable(at91_gpio->clock);
 
                 /* AT91SAM9263_ID_PIOCDE groups PIOC, PIOD, PIOE */
-                if (last && last->bank->id == at91_gpio->bank->id)
+                if (last && last->id == at91_gpio->id)
                         last->next = at91_gpio;
                 last = at91_gpio;
 
diff --git a/arch/arm/mach-at91/include/mach/at91_aic.h b/arch/arm/mach-at91/include/mach/at91_aic.h
index 03566799d3be..3045781c473f 100644
--- a/arch/arm/mach-at91/include/mach/at91_aic.h
+++ b/arch/arm/mach-at91/include/mach/at91_aic.h
@@ -16,7 +16,19 @@
 #ifndef AT91_AIC_H
 #define AT91_AIC_H
 
-#define AT91_AIC_SMR(n)         (AT91_AIC + ((n) * 4))  /* Source Mode Registers 0-31 */
+#ifndef __ASSEMBLY__
+extern void __iomem *at91_aic_base;
+
+#define at91_aic_read(field) \
+        __raw_readl(at91_aic_base + field)
+
+#define at91_aic_write(field, value) \
+        __raw_writel(value, at91_aic_base + field);
+#else
+.extern at91_aic_base
+#endif
+
+#define AT91_AIC_SMR(n)         ((n) * 4)               /* Source Mode Registers 0-31 */
 #define         AT91_AIC_PRIOR          (7 << 0)                /* Priority Level */
 #define         AT91_AIC_SRCTYPE        (3 << 5)                /* Interrupt Source Type */
 #define                 AT91_AIC_SRCTYPE_LOW            (0 << 5)
@@ -24,30 +36,30 @@
 #define                 AT91_AIC_SRCTYPE_HIGH           (2 << 5)
 #define                 AT91_AIC_SRCTYPE_RISING         (3 << 5)
 
-#define AT91_AIC_SVR(n)         (AT91_AIC + 0x80 + ((n) * 4))   /* Source Vector Registers 0-31 */
-#define AT91_AIC_IVR            (AT91_AIC + 0x100)      /* Interrupt Vector Register */
-#define AT91_AIC_FVR            (AT91_AIC + 0x104)      /* Fast Interrupt Vector Register */
-#define AT91_AIC_ISR            (AT91_AIC + 0x108)      /* Interrupt Status Register */
+#define AT91_AIC_SVR(n)         (0x80 + ((n) * 4))      /* Source Vector Registers 0-31 */
+#define AT91_AIC_IVR            0x100                   /* Interrupt Vector Register */
+#define AT91_AIC_FVR            0x104                   /* Fast Interrupt Vector Register */
+#define AT91_AIC_ISR            0x108                   /* Interrupt Status Register */
 #define         AT91_AIC_IRQID          (0x1f << 0)             /* Current Interrupt Identifier */
 
-#define AT91_AIC_IPR            (AT91_AIC + 0x10c)      /* Interrupt Pending Register */
-#define AT91_AIC_IMR            (AT91_AIC + 0x110)      /* Interrupt Mask Register */
-#define AT91_AIC_CISR           (AT91_AIC + 0x114)      /* Core Interrupt Status Register */
+#define AT91_AIC_IPR            0x10c                   /* Interrupt Pending Register */
+#define AT91_AIC_IMR            0x110                   /* Interrupt Mask Register */
+#define AT91_AIC_CISR           0x114                   /* Core Interrupt Status Register */
 #define         AT91_AIC_NFIQ           (1 << 0)                /* nFIQ Status */
 #define         AT91_AIC_NIRQ           (1 << 1)                /* nIRQ Status */
 
-#define AT91_AIC_IECR           (AT91_AIC + 0x120)      /* Interrupt Enable Command Register */
-#define AT91_AIC_IDCR           (AT91_AIC + 0x124)      /* Interrupt Disable Command Register */
-#define AT91_AIC_ICCR           (AT91_AIC + 0x128)      /* Interrupt Clear Command Register */
-#define AT91_AIC_ISCR           (AT91_AIC + 0x12c)      /* Interrupt Set Command Register */
-#define AT91_AIC_EOICR          (AT91_AIC + 0x130)      /* End of Interrupt Command Register */
-#define AT91_AIC_SPU            (AT91_AIC + 0x134)      /* Spurious Interrupt Vector Register */
-#define AT91_AIC_DCR            (AT91_AIC + 0x138)      /* Debug Control Register */
+#define AT91_AIC_IECR           0x120                   /* Interrupt Enable Command Register */
+#define AT91_AIC_IDCR           0x124                   /* Interrupt Disable Command Register */
+#define AT91_AIC_ICCR           0x128                   /* Interrupt Clear Command Register */
+#define AT91_AIC_ISCR           0x12c                   /* Interrupt Set Command Register */
+#define AT91_AIC_EOICR          0x130                   /* End of Interrupt Command Register */
+#define AT91_AIC_SPU            0x134                   /* Spurious Interrupt Vector Register */
+#define AT91_AIC_DCR            0x138                   /* Debug Control Register */
 #define         AT91_AIC_DCR_PROT       (1 << 0)                /* Protection Mode */
 #define         AT91_AIC_DCR_GMSK       (1 << 1)                /* General Mask */
 
-#define AT91_AIC_FFER           (AT91_AIC + 0x140)      /* Fast Forcing Enable Register [SAM9 only] */
-#define AT91_AIC_FFDR           (AT91_AIC + 0x144)      /* Fast Forcing Disable Register [SAM9 only] */
-#define AT91_AIC_FFSR           (AT91_AIC + 0x148)      /* Fast Forcing Status Register [SAM9 only] */
+#define AT91_AIC_FFER           0x140                   /* Fast Forcing Enable Register [SAM9 only] */
+#define AT91_AIC_FFDR           0x144                   /* Fast Forcing Disable Register [SAM9 only] */
+#define AT91_AIC_FFSR           0x148                   /* Fast Forcing Status Register [SAM9 only] */
 
 #endif
diff --git a/arch/arm/mach-at91/include/mach/at91_dbgu.h b/arch/arm/mach-at91/include/mach/at91_dbgu.h
index dbfe455a4c41..2aa0c5e13495 100644
--- a/arch/arm/mach-at91/include/mach/at91_dbgu.h
+++ b/arch/arm/mach-at91/include/mach/at91_dbgu.h
@@ -19,7 +19,7 @@
 #define dbgu_readl(dbgu, field) \
         __raw_readl(AT91_VA_BASE_SYS + dbgu + AT91_DBGU_ ## field)
 
-#ifdef AT91_DBGU
+#if !defined(CONFIG_ARCH_AT91X40)
 #define AT91_DBGU_CR            (0x00)  /* Control Register */
 #define AT91_DBGU_MR            (0x04)  /* Mode Register */
 #define AT91_DBGU_IER           (0x08)  /* Interrupt Enable Register */
diff --git a/arch/arm/mach-at91/include/mach/at91_pit.h b/arch/arm/mach-at91/include/mach/at91_pit.h
index 974d0bd05b5b..d1f80ad7f4d4 100644
--- a/arch/arm/mach-at91/include/mach/at91_pit.h
+++ b/arch/arm/mach-at91/include/mach/at91_pit.h
@@ -16,16 +16,16 @@
 #ifndef AT91_PIT_H
 #define AT91_PIT_H
 
-#define AT91_PIT_MR             (AT91_PIT + 0x00)       /* Mode Register */
+#define AT91_PIT_MR             0x00                    /* Mode Register */
 #define         AT91_PIT_PITIEN         (1 << 25)               /* Timer Interrupt Enable */
 #define         AT91_PIT_PITEN          (1 << 24)               /* Timer Enabled */
 #define         AT91_PIT_PIV            (0xfffff)               /* Periodic Interval Value */
 
-#define AT91_PIT_SR             (AT91_PIT + 0x04)       /* Status Register */
+#define AT91_PIT_SR             0x04                    /* Status Register */
 #define         AT91_PIT_PITS           (1 << 0)                /* Timer Status */
 
-#define AT91_PIT_PIVR           (AT91_PIT + 0x08)       /* Periodic Interval Value Register */
-#define AT91_PIT_PIIR           (AT91_PIT + 0x0c)       /* Periodic Interval Image Register */
+#define AT91_PIT_PIVR           0x08                    /* Periodic Interval Value Register */
+#define AT91_PIT_PIIR           0x0c                    /* Periodic Interval Image Register */
 #define         AT91_PIT_PICNT          (0xfff << 20)           /* Interval Counter */
 #define         AT91_PIT_CPIV           (0xfffff)               /* Inverval Value */
 
diff --git a/arch/arm/mach-at91/include/mach/at91_rtc.h b/arch/arm/mach-at91/include/mach/at91_rtc.h
index e56f4701a3e5..da1945e5f714 100644
--- a/arch/arm/mach-at91/include/mach/at91_rtc.h
+++ b/arch/arm/mach-at91/include/mach/at91_rtc.h
@@ -16,7 +16,7 @@
 #ifndef AT91_RTC_H
 #define AT91_RTC_H
 
-#define AT91_RTC_CR             (AT91_RTC + 0x00)       /* Control Register */
+#define AT91_RTC_CR             0x00                    /* Control Register */
 #define         AT91_RTC_UPDTIM         (1 <<  0)               /* Update Request Time Register */
 #define         AT91_RTC_UPDCAL         (1 <<  1)               /* Update Request Calendar Register */
 #define         AT91_RTC_TIMEVSEL       (3 <<  8)               /* Time Event Selection */
@@ -29,44 +29,44 @@
 #define                 AT91_RTC_CALEVSEL_MONTH         (1 << 16)
 #define                 AT91_RTC_CALEVSEL_YEAR          (2 << 16)
 
-#define AT91_RTC_MR             (AT91_RTC + 0x04)       /* Mode Register */
+#define AT91_RTC_MR             0x04                    /* Mode Register */
 #define                 AT91_RTC_HRMOD          (1 <<  0)               /* 12/24 Hour Mode */
 
-#define AT91_RTC_TIMR           (AT91_RTC + 0x08)       /* Time Register */
+#define AT91_RTC_TIMR           0x08                    /* Time Register */
 #define         AT91_RTC_SEC            (0x7f <<  0)            /* Current Second */
 #define         AT91_RTC_MIN            (0x7f <<  8)            /* Current Minute */
 #define         AT91_RTC_HOUR           (0x3f << 16)            /* Current Hour */
 #define         AT91_RTC_AMPM           (1    << 22)            /* Ante Meridiem Post Meridiem Indicator */
 
-#define AT91_RTC_CALR           (AT91_RTC + 0x0c)       /* Calendar Register */
+#define AT91_RTC_CALR           0x0c                    /* Calendar Register */
 #define         AT91_RTC_CENT           (0x7f <<  0)            /* Current Century */
 #define         AT91_RTC_YEAR           (0xff <<  8)            /* Current Year */
 #define         AT91_RTC_MONTH          (0x1f << 16)            /* Current Month */
 #define         AT91_RTC_DAY            (7    << 21)            /* Current Day */
 #define         AT91_RTC_DATE           (0x3f << 24)            /* Current Date */
 
-#define AT91_RTC_TIMALR         (AT91_RTC + 0x10)       /* Time Alarm Register */
+#define AT91_RTC_TIMALR         0x10                    /* Time Alarm Register */
 #define         AT91_RTC_SECEN          (1 <<  7)               /* Second Alarm Enable */
 #define         AT91_RTC_MINEN          (1 << 15)               /* Minute Alarm Enable */
 #define         AT91_RTC_HOUREN         (1 << 23)               /* Hour Alarm Enable */
 
-#define AT91_RTC_CALALR         (AT91_RTC + 0x14)       /* Calendar Alarm Register */
+#define AT91_RTC_CALALR         0x14                    /* Calendar Alarm Register */
 #define         AT91_RTC_MTHEN          (1 << 23)               /* Month Alarm Enable */
 #define         AT91_RTC_DATEEN         (1 << 31)               /* Date Alarm Enable */
 
-#define AT91_RTC_SR             (AT91_RTC + 0x18)       /* Status Register */
+#define AT91_RTC_SR             0x18                    /* Status Register */
 #define         AT91_RTC_ACKUPD         (1 <<  0)               /* Acknowledge for Update */
 #define         AT91_RTC_ALARM          (1 <<  1)               /* Alarm Flag */
 #define         AT91_RTC_SECEV          (1 <<  2)               /* Second Event */
 #define         AT91_RTC_TIMEV          (1 <<  3)               /* Time Event */
 #define         AT91_RTC_CALEV          (1 <<  4)               /* Calendar Event */
 
-#define AT91_RTC_SCCR           (AT91_RTC + 0x1c)       /* Status Clear Command Register */
-#define AT91_RTC_IER            (AT91_RTC + 0x20)       /* Interrupt Enable Register */
-#define AT91_RTC_IDR            (AT91_RTC + 0x24)       /* Interrupt Disable Register */
-#define AT91_RTC_IMR            (AT91_RTC + 0x28)       /* Interrupt Mask Register */
+#define AT91_RTC_SCCR           0x1c                    /* Status Clear Command Register */
+#define AT91_RTC_IER            0x20                    /* Interrupt Enable Register */
+#define AT91_RTC_IDR            0x24                    /* Interrupt Disable Register */
+#define AT91_RTC_IMR            0x28                    /* Interrupt Mask Register */
 
-#define AT91_RTC_VER            (AT91_RTC + 0x2c)       /* Valid Entry Register */
+#define AT91_RTC_VER            0x2c                    /* Valid Entry Register */
 #define         AT91_RTC_NVTIM          (1 <<  0)               /* Non valid Time */
 #define         AT91_RTC_NVCAL          (1 <<  1)               /* Non valid Calendar */
 #define         AT91_RTC_NVTIMALR       (1 <<  2)               /* Non valid Time Alarm */
diff --git a/arch/arm/mach-at91/include/mach/at91_shdwc.h b/arch/arm/mach-at91/include/mach/at91_shdwc.h
index c4ce07e8a8fa..1d4fe822c77a 100644
--- a/arch/arm/mach-at91/include/mach/at91_shdwc.h
+++ b/arch/arm/mach-at91/include/mach/at91_shdwc.h
@@ -16,11 +16,21 @@
 #ifndef AT91_SHDWC_H
 #define AT91_SHDWC_H
 
-#define AT91_SHDW_CR            (AT91_SHDWC + 0x00)     /* Shut Down Control Register */
+#ifndef __ASSEMBLY__
+extern void __iomem *at91_shdwc_base;
+
+#define at91_shdwc_read(field) \
+        __raw_readl(at91_shdwc_base + field)
+
+#define at91_shdwc_write(field, value) \
+        __raw_writel(value, at91_shdwc_base + field);
+#endif
+
+#define AT91_SHDW_CR            0x00                    /* Shut Down Control Register */
 #define         AT91_SHDW_SHDW          (1    << 0)             /* Shut Down command */
 #define         AT91_SHDW_KEY           (0xa5 << 24)            /* KEY Password */
 
-#define AT91_SHDW_MR            (AT91_SHDWC + 0x04)     /* Shut Down Mode Register */
+#define AT91_SHDW_MR            0x04                    /* Shut Down Mode Register */
 #define         AT91_SHDW_WKMODE0       (3 << 0)                /* Wake-up 0 Mode Selection */
 #define                 AT91_SHDW_WKMODE0_NONE          0
 #define                 AT91_SHDW_WKMODE0_HIGH          1
@@ -30,7 +40,7 @@
 #define                 AT91_SHDW_CPTWK0_(x)    ((x) << 4)
 #define         AT91_SHDW_RTTWKEN       (1   << 16)             /* Real Time Timer Wake-up Enable */
 
-#define AT91_SHDW_SR            (AT91_SHDWC + 0x08)     /* Shut Down Status Register */
+#define AT91_SHDW_SR            0x08                    /* Shut Down Status Register */
 #define         AT91_SHDW_WAKEUP0       (1 <<  0)               /* Wake-up 0 Status */
 #define         AT91_SHDW_RTTWK         (1 << 16)               /* Real-time Timer Wake-up */
 #define         AT91_SHDW_RTCWK         (1 << 17)               /* Real-time Clock Wake-up [SAM9RL] */
diff --git a/arch/arm/mach-at91/include/mach/at91cap9.h b/arch/arm/mach-at91/include/mach/at91cap9.h
index c5df1e8f1955..4c0e2f6011d7 100644
--- a/arch/arm/mach-at91/include/mach/at91cap9.h
+++ b/arch/arm/mach-at91/include/mach/at91cap9.h
@@ -79,29 +79,28 @@
 /*
  * System Peripherals (offset from AT91_BASE_SYS)
  */
-#define AT91_ECC        (0xffffe200 - AT91_BASE_SYS)
 #define AT91_BCRAMC     (0xffffe400 - AT91_BASE_SYS)
 #define AT91_DDRSDRC0   (0xffffe600 - AT91_BASE_SYS)
-#define AT91_SMC        (0xffffe800 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffea00 - AT91_BASE_SYS)
-#define AT91_CCFG       (0xffffeb10 - AT91_BASE_SYS)
-#define AT91_DMA        (0xffffec00 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xffffee00 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOD       (0xfffff800 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
 #define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_SHDWC      (0xfffffd10 - AT91_BASE_SYS)
-#define AT91_RTT        (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
 #define AT91_GPBR       (cpu_is_at91cap9_revB() ?       \
                         (0xfffffd50 - AT91_BASE_SYS) :  \
                         (0xfffffd60 - AT91_BASE_SYS))
 
+#define AT91CAP9_BASE_ECC       0xffffe200
+#define AT91CAP9_BASE_DMA       0xffffec00
+#define AT91CAP9_BASE_SMC       0xffffe800
+#define AT91CAP9_BASE_DBGU      AT91_BASE_DBGU1
+#define AT91CAP9_BASE_PIOA      0xfffff200
+#define AT91CAP9_BASE_PIOB      0xfffff400
+#define AT91CAP9_BASE_PIOC      0xfffff600
+#define AT91CAP9_BASE_PIOD      0xfffff800
+#define AT91CAP9_BASE_SHDWC     0xfffffd10
+#define AT91CAP9_BASE_RTT       0xfffffd20
+#define AT91CAP9_BASE_PIT       0xfffffd30
+#define AT91CAP9_BASE_WDT       0xfffffd40
+
 #define AT91_USART0     AT91CAP9_BASE_US0
 #define AT91_USART1     AT91CAP9_BASE_US1
 #define AT91_USART2     AT91CAP9_BASE_US2
diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h
index e4037b500302..bacb51141819 100644
--- a/arch/arm/mach-at91/include/mach/at91rm9200.h
+++ b/arch/arm/mach-at91/include/mach/at91rm9200.h
@@ -79,17 +79,17 @@
 /*
  * System Peripherals (offset from AT91_BASE_SYS)
  */
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)    /* Advanced Interrupt Controller */
-#define AT91_DBGU       (0xfffff200 - AT91_BASE_SYS)    /* Debug Unit */
-#define AT91_PIOA       (0xfffff400 - AT91_BASE_SYS)    /* PIO Controller A */
-#define AT91_PIOB       (0xfffff600 - AT91_BASE_SYS)    /* PIO Controller B */
-#define AT91_PIOC       (0xfffff800 - AT91_BASE_SYS)    /* PIO Controller C */
-#define AT91_PIOD       (0xfffffa00 - AT91_BASE_SYS)    /* PIO Controller D */
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)    /* Power Management Controller */
 #define AT91_ST         (0xfffffd00 - AT91_BASE_SYS)    /* System Timer */
-#define AT91_RTC        (0xfffffe00 - AT91_BASE_SYS)    /* Real-Time Clock */
 #define AT91_MC         (0xffffff00 - AT91_BASE_SYS)    /* Memory Controllers */
 
+#define AT91RM9200_BASE_DBGU    AT91_BASE_DBGU0 /* Debug Unit */
+#define AT91RM9200_BASE_PIOA    0xfffff400      /* PIO Controller A */
+#define AT91RM9200_BASE_PIOB    0xfffff600      /* PIO Controller B */
+#define AT91RM9200_BASE_PIOC    0xfffff800      /* PIO Controller C */
+#define AT91RM9200_BASE_PIOD    0xfffffa00      /* PIO Controller D */
+#define AT91RM9200_BASE_RTC     0xfffffe00      /* Real-Time Clock */
+
 #define AT91_USART0     AT91RM9200_BASE_US0
 #define AT91_USART1     AT91RM9200_BASE_US1
 #define AT91_USART2     AT91RM9200_BASE_US2
diff --git a/arch/arm/mach-at91/include/mach/at91sam9260.h b/arch/arm/mach-at91/include/mach/at91sam9260.h
index 9a791165913f..f937c476bb67 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9260.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9260.h
@@ -80,24 +80,23 @@
 /*
  * System Peripherals (offset from AT91_BASE_SYS)
  */
-#define AT91_ECC        (0xffffe800 - AT91_BASE_SYS)
 #define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
-#define AT91_SMC        (0xffffec00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
-#define AT91_CCFG       (0xffffef10 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff800 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
 #define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_SHDWC      (0xfffffd10 - AT91_BASE_SYS)
-#define AT91_RTT        (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd50 - AT91_BASE_SYS)
 
+#define AT91SAM9260_BASE_ECC    0xffffe800
+#define AT91SAM9260_BASE_SMC    0xffffec00
+#define AT91SAM9260_BASE_DBGU   AT91_BASE_DBGU0
+#define AT91SAM9260_BASE_PIOA   0xfffff400
+#define AT91SAM9260_BASE_PIOB   0xfffff600
+#define AT91SAM9260_BASE_PIOC   0xfffff800
+#define AT91SAM9260_BASE_SHDWC  0xfffffd10
+#define AT91SAM9260_BASE_RTT    0xfffffd20
+#define AT91SAM9260_BASE_PIT    0xfffffd30
+#define AT91SAM9260_BASE_WDT    0xfffffd40
+
 #define AT91_USART0     AT91SAM9260_BASE_US0
 #define AT91_USART1     AT91SAM9260_BASE_US1
 #define AT91_USART2     AT91SAM9260_BASE_US2
diff --git a/arch/arm/mach-at91/include/mach/at91sam9261.h b/arch/arm/mach-at91/include/mach/at91sam9261.h
index ce596204cefa..175604e261be 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9261.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9261.h
@@ -66,21 +66,21 @@
  * System Peripherals (offset from AT91_BASE_SYS)
  */
 #define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
-#define AT91_SMC        (0xffffec00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff800 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
 #define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_SHDWC      (0xfffffd10 - AT91_BASE_SYS)
-#define AT91_RTT        (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd50 - AT91_BASE_SYS)
 
+#define AT91SAM9261_BASE_SMC    0xffffec00
+#define AT91SAM9261_BASE_DBGU   AT91_BASE_DBGU0
+#define AT91SAM9261_BASE_PIOA   0xfffff400
+#define AT91SAM9261_BASE_PIOB   0xfffff600
+#define AT91SAM9261_BASE_PIOC   0xfffff800
+#define AT91SAM9261_BASE_SHDWC  0xfffffd10
+#define AT91SAM9261_BASE_RTT    0xfffffd20
+#define AT91SAM9261_BASE_PIT    0xfffffd30
+#define AT91SAM9261_BASE_WDT    0xfffffd40
+
 #define AT91_USART0     AT91SAM9261_BASE_US0
 #define AT91_USART1     AT91SAM9261_BASE_US1
 #define AT91_USART2     AT91SAM9261_BASE_US2
diff --git a/arch/arm/mach-at91/include/mach/at91sam9263.h b/arch/arm/mach-at91/include/mach/at91sam9263.h
index f1b92961a2b1..80c915002d83 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9263.h
@@ -74,30 +74,29 @@
 /*
  * System Peripherals (offset from AT91_BASE_SYS)
  */
-#define AT91_ECC0       (0xffffe000 - AT91_BASE_SYS)
 #define AT91_SDRAMC0    (0xffffe200 - AT91_BASE_SYS)
-#define AT91_SMC0       (0xffffe400 - AT91_BASE_SYS)
-#define AT91_ECC1       (0xffffe600 - AT91_BASE_SYS)
 #define AT91_SDRAMC1    (0xffffe800 - AT91_BASE_SYS)
-#define AT91_SMC1       (0xffffea00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffec00 - AT91_BASE_SYS)
-#define AT91_CCFG       (0xffffed10 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xffffee00 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOD       (0xfffff800 - AT91_BASE_SYS)
-#define AT91_PIOE       (0xfffffa00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
 #define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_SHDWC      (0xfffffd10 - AT91_BASE_SYS)
-#define AT91_RTT0       (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
-#define AT91_RTT1       (0xfffffd50 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd60 - AT91_BASE_SYS)
 
+#define AT91SAM9263_BASE_ECC0   0xffffe000
+#define AT91SAM9263_BASE_SMC0   0xffffe400
+#define AT91SAM9263_BASE_ECC1   0xffffe600
+#define AT91SAM9263_BASE_SMC1   0xffffea00
+#define AT91SAM9263_BASE_DBGU   AT91_BASE_DBGU1
+#define AT91SAM9263_BASE_PIOA   0xfffff200
+#define AT91SAM9263_BASE_PIOB   0xfffff400
+#define AT91SAM9263_BASE_PIOC   0xfffff600
+#define AT91SAM9263_BASE_PIOD   0xfffff800
+#define AT91SAM9263_BASE_PIOE   0xfffffa00
+#define AT91SAM9263_BASE_SHDWC  0xfffffd10
+#define AT91SAM9263_BASE_RTT0   0xfffffd20
+#define AT91SAM9263_BASE_PIT    0xfffffd30
+#define AT91SAM9263_BASE_WDT    0xfffffd40
+#define AT91SAM9263_BASE_RTT1   0xfffffd50
+
 #define AT91_USART0     AT91SAM9263_BASE_US0
 #define AT91_USART1     AT91SAM9263_BASE_US1
 #define AT91_USART2     AT91SAM9263_BASE_US2
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
index 57de6207e57e..eb18a70fa647 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9_smc.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h
@@ -16,7 +16,9 @@
 #ifndef AT91SAM9_SMC_H
 #define AT91SAM9_SMC_H
 
-#define AT91_SMC_SETUP(n)       (AT91_SMC + 0x00 + ((n)*0x10))  /* Setup Register for CS n */
+#include <mach/cpu.h>
+
+#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)
 #define         AT91_SMC_NCS_WRSETUP    (0x3f << 8)                     /* NCS Setup Length in Write Access */
@@ -26,7 +28,7 @@
 #define         AT91_SMC_NCS_RDSETUP    (0x3f << 24)                    /* NCS Setup Length in Read Access */
 #define                 AT91_SMC_NCS_RDSETUP_(x)        ((x) << 24)
 
-#define AT91_SMC_PULSE(n)       (AT91_SMC + 0x04 + ((n)*0x10))  /* Pulse Register for CS n */
+#define AT91_SMC_PULSE          0x04                            /* Pulse Register for CS n */
 #define         AT91_SMC_NWEPULSE       (0x7f <<  0)                    /* NWE Pulse Length */
 #define                 AT91_SMC_NWEPULSE_(x)   ((x) << 0)
 #define         AT91_SMC_NCS_WRPULSE    (0x7f <<  8)                    /* NCS Pulse Length in Write Access */
@@ -36,13 +38,13 @@
 #define         AT91_SMC_NCS_RDPULSE    (0x7f << 24)                    /* NCS Pulse Length in Read Access */
 #define                 AT91_SMC_NCS_RDPULSE_(x)((x) << 24)
 
-#define AT91_SMC_CYCLE(n)       (AT91_SMC + 0x08 + ((n)*0x10))  /* Cycle Register for CS n */
+#define AT91_SMC_CYCLE          0x08                            /* Cycle Register for CS n */
 #define         AT91_SMC_NWECYCLE       (0x1ff << 0 )                   /* Total Write Cycle Length */
 #define                 AT91_SMC_NWECYCLE_(x)   ((x) << 0)
 #define         AT91_SMC_NRDCYCLE       (0x1ff << 16)                   /* Total Read Cycle Length */
 #define                 AT91_SMC_NRDCYCLE_(x)   ((x) << 16)
 
-#define AT91_SMC_MODE(n)        (AT91_SMC + 0x0c + ((n)*0x10))  /* Mode Register for CS n */
+#define AT91_SMC_MODE           0x0c                            /* Mode Register for CS n */
 #define         AT91_SMC_READMODE       (1 <<  0)                       /* Read Mode */
 #define         AT91_SMC_WRITEMODE      (1 <<  1)                       /* Write Mode */
 #define         AT91_SMC_EXNWMODE       (3 <<  4)                       /* NWAIT Mode */
@@ -66,11 +68,4 @@
 #define                 AT91_SMC_PS_16                  (2 << 28)
 #define                 AT91_SMC_PS_32                  (3 << 28)
 
-#if defined(AT91_SMC1)          /* The AT91SAM9263 has 2 Static Memory contollers */
-#define AT91_SMC1_SETUP(n)      (AT91_SMC1 + 0x00 + ((n)*0x10)) /* Setup Register for CS n */
-#define AT91_SMC1_PULSE(n)      (AT91_SMC1 + 0x04 + ((n)*0x10)) /* Pulse Register for CS n */
-#define AT91_SMC1_CYCLE(n)      (AT91_SMC1 + 0x08 + ((n)*0x10)) /* Cycle Register for CS n */
-#define AT91_SMC1_MODE(n)       (AT91_SMC1 + 0x0c + ((n)*0x10)) /* Mode Register for CS n */
-#endif
-
 #endif
diff --git a/arch/arm/mach-at91/include/mach/at91sam9g45.h b/arch/arm/mach-at91/include/mach/at91sam9g45.h
index 406bb6496805..f0c23c960dec 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9g45.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9g45.h
@@ -86,27 +86,27 @@
 /*
  * System Peripherals (offset from AT91_BASE_SYS)
  */
-#define AT91_ECC        (0xffffe200 - AT91_BASE_SYS)
 #define AT91_DDRSDRC1   (0xffffe400 - AT91_BASE_SYS)
 #define AT91_DDRSDRC0   (0xffffe600 - AT91_BASE_SYS)
-#define AT91_SMC        (0xffffe800 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffea00 - AT91_BASE_SYS)
-#define AT91_DMA        (0xffffec00 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xffffee00 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOD       (0xfffff800 - AT91_BASE_SYS)
-#define AT91_PIOE       (0xfffffa00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
 #define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_SHDWC      (0xfffffd10 - AT91_BASE_SYS)
-#define AT91_RTT        (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd60 - AT91_BASE_SYS)
-#define AT91_RTC        (0xfffffdb0 - AT91_BASE_SYS)
+
+#define AT91SAM9G45_BASE_ECC    0xffffe200
+#define AT91SAM9G45_BASE_DMA    0xffffec00
+#define AT91SAM9G45_BASE_SMC    0xffffe800
+#define AT91SAM9G45_BASE_DBGU   AT91_BASE_DBGU1
+#define AT91SAM9G45_BASE_PIOA   0xfffff200
+#define AT91SAM9G45_BASE_PIOB   0xfffff400
+#define AT91SAM9G45_BASE_PIOC   0xfffff600
+#define AT91SAM9G45_BASE_PIOD   0xfffff800
+#define AT91SAM9G45_BASE_PIOE   0xfffffa00
+#define AT91SAM9G45_BASE_SHDWC  0xfffffd10
+#define AT91SAM9G45_BASE_RTT    0xfffffd20
+#define AT91SAM9G45_BASE_PIT    0xfffffd30
+#define AT91SAM9G45_BASE_WDT    0xfffffd40
+#define AT91SAM9G45_BASE_RTC    0xfffffdb0
 
 #define AT91_USART0     AT91SAM9G45_BASE_US0
 #define AT91_USART1     AT91SAM9G45_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91sam9rl.h b/arch/arm/mach-at91/include/mach/at91sam9rl.h
index 1aabacd315d4..2bb359e60b97 100644
--- a/arch/arm/mach-at91/include/mach/at91sam9rl.h
+++ b/arch/arm/mach-at91/include/mach/at91sam9rl.h
@@ -69,27 +69,26 @@
 /*
  * System Peripherals (offset from AT91_BASE_SYS)
  */
-#define AT91_DMA        (0xffffe600 - AT91_BASE_SYS)
-#define AT91_ECC        (0xffffe800 - AT91_BASE_SYS)
 #define AT91_SDRAMC0    (0xffffea00 - AT91_BASE_SYS)
-#define AT91_SMC        (0xffffec00 - AT91_BASE_SYS)
 #define AT91_MATRIX     (0xffffee00 - AT91_BASE_SYS)
-#define AT91_CCFG       (0xffffef10 - AT91_BASE_SYS)
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)
-#define AT91_DBGU       (0xfffff200 - AT91_BASE_SYS)
-#define AT91_PIOA       (0xfffff400 - AT91_BASE_SYS)
-#define AT91_PIOB       (0xfffff600 - AT91_BASE_SYS)
-#define AT91_PIOC       (0xfffff800 - AT91_BASE_SYS)
-#define AT91_PIOD       (0xfffffa00 - AT91_BASE_SYS)
 #define AT91_PMC        (0xfffffc00 - AT91_BASE_SYS)
 #define AT91_RSTC       (0xfffffd00 - AT91_BASE_SYS)
-#define AT91_SHDWC      (0xfffffd10 - AT91_BASE_SYS)
-#define AT91_RTT        (0xfffffd20 - AT91_BASE_SYS)
-#define AT91_PIT        (0xfffffd30 - AT91_BASE_SYS)
-#define AT91_WDT        (0xfffffd40 - AT91_BASE_SYS)
 #define AT91_SCKCR      (0xfffffd50 - AT91_BASE_SYS)
 #define AT91_GPBR       (0xfffffd60 - AT91_BASE_SYS)
-#define AT91_RTC        (0xfffffe00 - AT91_BASE_SYS)
+
+#define AT91SAM9RL_BASE_DMA     0xffffe600
+#define AT91SAM9RL_BASE_ECC     0xffffe800
+#define AT91SAM9RL_BASE_SMC     0xffffec00
+#define AT91SAM9RL_BASE_DBGU    AT91_BASE_DBGU0
+#define AT91SAM9RL_BASE_PIOA    0xfffff400
+#define AT91SAM9RL_BASE_PIOB    0xfffff600
+#define AT91SAM9RL_BASE_PIOC    0xfffff800
+#define AT91SAM9RL_BASE_PIOD    0xfffffa00
+#define AT91SAM9RL_BASE_SHDWC   0xfffffd10
+#define AT91SAM9RL_BASE_RTT     0xfffffd20
+#define AT91SAM9RL_BASE_PIT     0xfffffd30
+#define AT91SAM9RL_BASE_WDT     0xfffffd40
+#define AT91SAM9RL_BASE_RTC     0xfffffe00
 
 #define AT91_USART0     AT91SAM9RL_BASE_US0
 #define AT91_USART1     AT91SAM9RL_BASE_US1
diff --git a/arch/arm/mach-at91/include/mach/at91x40.h b/arch/arm/mach-at91/include/mach/at91x40.h
index a152ff87e688..a57829f4fd18 100644
--- a/arch/arm/mach-at91/include/mach/at91x40.h
+++ b/arch/arm/mach-at91/include/mach/at91x40.h
@@ -40,7 +40,6 @@
 #define AT91_PIOA       (0xffff0000 - AT91_BASE_SYS)    /* PIO Controller A */
 #define AT91_PS         (0xffff4000 - AT91_BASE_SYS)    /* Power Save */
 #define AT91_WD         (0xffff8000 - AT91_BASE_SYS)    /* Watchdog Timer */
-#define AT91_AIC        (0xfffff000 - AT91_BASE_SYS)    /* Advanced Interrupt Controller */
 
 /*
  * The AT91x40 series doesn't have a debug unit like the other AT91 parts.
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index eac92e995bb5..d0b377b21bd7 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -40,13 +40,14 @@
 #include <linux/atmel-mci.h>
 #include <sound/atmel-ac97c.h>
 #include <linux/serial.h>
+#include <linux/platform_data/macb.h>
 
  /* USB Device */
 struct at91_udc_data {
-        u8      vbus_pin;               /* high == host powering us */
+        int     vbus_pin;               /* high == host powering us */
         u8      vbus_active_low;        /* vbus polarity */
         u8      vbus_polled;            /* Use polling, not interrupt */
-        u8      pullup_pin;             /* active == D+ pulled up */
+        int     pullup_pin;             /* active == D+ pulled up */
         u8      pullup_active_low;      /* true == pullup_pin is active low */
 };
 extern void __init at91_add_device_udc(struct at91_udc_data *data);
@@ -56,10 +57,10 @@ extern void __init at91_add_device_usba(struct usba_platform_data *data);
 
  /* Compact Flash */
 struct at91_cf_data {
-        u8      irq_pin;                /* I/O IRQ */
-        u8      det_pin;                /* Card detect */
-        u8      vcc_pin;                /* power switching */
-        u8      rst_pin;                /* card reset */
+        int     irq_pin;                /* I/O IRQ */
+        int     det_pin;                /* Card detect */
+        int     vcc_pin;                /* power switching */
+        int     rst_pin;                /* card reset */
         u8      chipselect;             /* EBI Chip Select number */
         u8      flags;
 #define AT91_CF_TRUE_IDE        0x01
@@ -70,37 +71,26 @@ extern void __init at91_add_device_cf(struct at91_cf_data *data);
  /* MMC / SD */
   /* at91_mci platform config */
 struct at91_mmc_data {
-        u8              det_pin;        /* card detect IRQ */
+        int             det_pin;        /* card detect IRQ */
         unsigned        slot_b:1;       /* uses Slot B */
         unsigned        wire4:1;        /* (SD) supports DAT0..DAT3 */
-        u8              wp_pin;         /* (SD) writeprotect detect */
-        u8              vcc_pin;        /* power switching (high == on) */
+        int             wp_pin;         /* (SD) writeprotect detect */
+        int             vcc_pin;        /* power switching (high == on) */
 };
 extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);
 
   /* atmel-mci platform config */
 extern void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data);
 
- /* Ethernet (EMAC & MACB) */
-struct at91_eth_data {
-        u32             phy_mask;
-        u8              phy_irq_pin;    /* PHY IRQ */
-        u8              is_rmii;        /* using RMII interface? */
-};
-extern void __init at91_add_device_eth(struct at91_eth_data *data);
-
-#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9263) || defined(CONFIG_ARCH_AT91SAM9G20) || defined(CONFIG_ARCH_AT91CAP9) \
-        || defined(CONFIG_ARCH_AT91SAM9G45)
-#define eth_platform_data       at91_eth_data
-#endif
+extern void __init at91_add_device_eth(struct macb_platform_data *data);
 
  /* USB Host */
 struct at91_usbh_data {
         u8              ports;          /* number of ports on root hub */
-        u8              vbus_pin[2];    /* port power-control pin */
+        int             vbus_pin[2];    /* port power-control pin */
         u8              vbus_pin_inverted;
         u8              overcurrent_supported;
-        u8              overcurrent_pin[2];
+        int             overcurrent_pin[2];
         u8              overcurrent_status[2];
         u8              overcurrent_changed[2];
 };
@@ -110,9 +100,9 @@ extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data);
 
  /* NAND / SmartMedia */
 struct atmel_nand_data {
-        u8              enable_pin;     /* chip enable */
-        u8              det_pin;        /* card detect */
-        u8              rdy_pin;        /* ready/busy */
+        int             enable_pin;     /* chip enable */
+        int             det_pin;        /* card detect */
+        int             rdy_pin;        /* ready/busy */
         u8              rdy_pin_active_low;     /* rdy_pin value is inverted */
         u8              ale;            /* address line number connected to ALE */
         u8              cle;            /* address line number connected to CLE */
diff --git a/arch/arm/mach-at91/include/mach/debug-macro.S b/arch/arm/mach-at91/include/mach/debug-macro.S
index 0ed8648c6452..c6bb9e2d9baa 100644
--- a/arch/arm/mach-at91/include/mach/debug-macro.S
+++ b/arch/arm/mach-at91/include/mach/debug-macro.S
@@ -14,9 +14,15 @@
 #include <mach/hardware.h>
 #include <mach/at91_dbgu.h>
 
+#if defined(CONFIG_AT91_DEBUG_LL_DBGU0)
+#define AT91_DBGU AT91_BASE_DBGU0
+#else
+#define AT91_DBGU AT91_BASE_DBGU1
+#endif
+
         .macro  addruart, rp, rv, tmp
-        ldr     \rp, =(AT91_BASE_SYS + AT91_DBGU)       @ System peripherals (phys address)
-        ldr     \rv, =(AT91_VA_BASE_SYS + AT91_DBGU)    @ System peripherals (virt address)
+        ldr     \rp, =AT91_DBGU                         @ System peripherals (phys address)
+        ldr     \rv, =AT91_IO_P2V(AT91_DBGU)            @ System peripherals (virt address)
         .endm
 
         .macro  senduart,rd,rx
diff --git a/arch/arm/mach-at91/include/mach/entry-macro.S b/arch/arm/mach-at91/include/mach/entry-macro.S
index 7ab68f972227..423eea0ed74c 100644
--- a/arch/arm/mach-at91/include/mach/entry-macro.S
+++ b/arch/arm/mach-at91/include/mach/entry-macro.S
@@ -17,16 +17,17 @@
         .endm
 
         .macro  get_irqnr_preamble, base, tmp
-        ldr     \base, =(AT91_VA_BASE_SYS + AT91_AIC)           @ base virtual address of AIC peripheral
+        ldr     \base, =at91_aic_base           @ base virtual address of AIC peripheral
+        ldr     \base, [\base]
         .endm
 
         .macro  arch_ret_to_user, tmp1, tmp2
         .endm
 
         .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-        ldr     \irqnr, [\base, #(AT91_AIC_IVR - AT91_AIC)]     @ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)
-        ldr     \irqstat, [\base, #(AT91_AIC_ISR - AT91_AIC)]   @ read interrupt source number
-        teq     \irqstat, #0                                    @ ISR is 0 when no current interrupt, or spurious interrupt
-        streq   \tmp, [\base, #(AT91_AIC_EOICR - AT91_AIC)]     @ not going to be handled further, then ACK it now.
+        ldr     \irqnr, [\base, #AT91_AIC_IVR]          @ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt)
+        ldr     \irqstat, [\base, #AT91_AIC_ISR]        @ read interrupt source number
+        teq     \irqstat, #0                            @ ISR is 0 when no current interrupt, or spurious interrupt
+        streq   \tmp, [\base, #AT91_AIC_EOICR]          @ not going to be handled further, then ACK it now.
         .endm
 
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 2b9a1f51210f..e3fd225121c7 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -16,177 +16,175 @@
 #include <linux/kernel.h>
 #include <asm/irq.h>
 
-#define PIN_BASE                NR_AIC_IRQS
-
 #define MAX_GPIO_BANKS          5
-#define NR_BUILTIN_GPIO         (PIN_BASE + (MAX_GPIO_BANKS * 32))
+#define NR_BUILTIN_GPIO         (MAX_GPIO_BANKS * 32)
 
 /* these pin numbers double as IRQ numbers, like AT91xxx_ID_* values */
 
-#define AT91_PIN_PA0    (PIN_BASE + 0x00 + 0)
-#define AT91_PIN_PA1    (PIN_BASE + 0x00 + 1)
-#define AT91_PIN_PA2    (PIN_BASE + 0x00 + 2)
-#define AT91_PIN_PA3    (PIN_BASE + 0x00 + 3)
-#define AT91_PIN_PA4    (PIN_BASE + 0x00 + 4)
-#define AT91_PIN_PA5    (PIN_BASE + 0x00 + 5)
-#define AT91_PIN_PA6    (PIN_BASE + 0x00 + 6)
-#define AT91_PIN_PA7    (PIN_BASE + 0x00 + 7)
-#define AT91_PIN_PA8    (PIN_BASE + 0x00 + 8)
-#define AT91_PIN_PA9    (PIN_BASE + 0x00 + 9)
-#define AT91_PIN_PA10   (PIN_BASE + 0x00 + 10)
-#define AT91_PIN_PA11   (PIN_BASE + 0x00 + 11)
-#define AT91_PIN_PA12   (PIN_BASE + 0x00 + 12)
-#define AT91_PIN_PA13   (PIN_BASE + 0x00 + 13)
-#define AT91_PIN_PA14   (PIN_BASE + 0x00 + 14)
-#define AT91_PIN_PA15   (PIN_BASE + 0x00 + 15)
-#define AT91_PIN_PA16   (PIN_BASE + 0x00 + 16)
-#define AT91_PIN_PA17   (PIN_BASE + 0x00 + 17)
-#define AT91_PIN_PA18   (PIN_BASE + 0x00 + 18)
-#define AT91_PIN_PA19   (PIN_BASE + 0x00 + 19)
-#define AT91_PIN_PA20   (PIN_BASE + 0x00 + 20)
-#define AT91_PIN_PA21   (PIN_BASE + 0x00 + 21)
-#define AT91_PIN_PA22   (PIN_BASE + 0x00 + 22)
-#define AT91_PIN_PA23   (PIN_BASE + 0x00 + 23)
-#define AT91_PIN_PA24   (PIN_BASE + 0x00 + 24)
-#define AT91_PIN_PA25   (PIN_BASE + 0x00 + 25)
-#define AT91_PIN_PA26   (PIN_BASE + 0x00 + 26)
-#define AT91_PIN_PA27   (PIN_BASE + 0x00 + 27)
-#define AT91_PIN_PA28   (PIN_BASE + 0x00 + 28)
-#define AT91_PIN_PA29   (PIN_BASE + 0x00 + 29)
-#define AT91_PIN_PA30   (PIN_BASE + 0x00 + 30)
-#define AT91_PIN_PA31   (PIN_BASE + 0x00 + 31)
-
-#define AT91_PIN_PB0    (PIN_BASE + 0x20 + 0)
-#define AT91_PIN_PB1    (PIN_BASE + 0x20 + 1)
-#define AT91_PIN_PB2    (PIN_BASE + 0x20 + 2)
-#define AT91_PIN_PB3    (PIN_BASE + 0x20 + 3)
-#define AT91_PIN_PB4    (PIN_BASE + 0x20 + 4)
-#define AT91_PIN_PB5    (PIN_BASE + 0x20 + 5)
-#define AT91_PIN_PB6    (PIN_BASE + 0x20 + 6)
-#define AT91_PIN_PB7    (PIN_BASE + 0x20 + 7)
-#define AT91_PIN_PB8    (PIN_BASE + 0x20 + 8)
-#define AT91_PIN_PB9    (PIN_BASE + 0x20 + 9)
-#define AT91_PIN_PB10   (PIN_BASE + 0x20 + 10)
-#define AT91_PIN_PB11   (PIN_BASE + 0x20 + 11)
-#define AT91_PIN_PB12   (PIN_BASE + 0x20 + 12)
-#define AT91_PIN_PB13   (PIN_BASE + 0x20 + 13)
-#define AT91_PIN_PB14   (PIN_BASE + 0x20 + 14)
-#define AT91_PIN_PB15   (PIN_BASE + 0x20 + 15)
-#define AT91_PIN_PB16   (PIN_BASE + 0x20 + 16)
-#define AT91_PIN_PB17   (PIN_BASE + 0x20 + 17)
-#define AT91_PIN_PB18   (PIN_BASE + 0x20 + 18)
-#define AT91_PIN_PB19   (PIN_BASE + 0x20 + 19)
-#define AT91_PIN_PB20   (PIN_BASE + 0x20 + 20)
-#define AT91_PIN_PB21   (PIN_BASE + 0x20 + 21)
-#define AT91_PIN_PB22   (PIN_BASE + 0x20 + 22)
-#define AT91_PIN_PB23   (PIN_BASE + 0x20 + 23)
-#define AT91_PIN_PB24   (PIN_BASE + 0x20 + 24)
-#define AT91_PIN_PB25   (PIN_BASE + 0x20 + 25)
-#define AT91_PIN_PB26   (PIN_BASE + 0x20 + 26)
-#define AT91_PIN_PB27   (PIN_BASE + 0x20 + 27)
-#define AT91_PIN_PB28   (PIN_BASE + 0x20 + 28)
-#define AT91_PIN_PB29   (PIN_BASE + 0x20 + 29)
-#define AT91_PIN_PB30   (PIN_BASE + 0x20 + 30)
-#define AT91_PIN_PB31   (PIN_BASE + 0x20 + 31)
-
-#define AT91_PIN_PC0    (PIN_BASE + 0x40 + 0)
-#define AT91_PIN_PC1    (PIN_BASE + 0x40 + 1)
-#define AT91_PIN_PC2    (PIN_BASE + 0x40 + 2)
-#define AT91_PIN_PC3    (PIN_BASE + 0x40 + 3)
-#define AT91_PIN_PC4    (PIN_BASE + 0x40 + 4)
-#define AT91_PIN_PC5    (PIN_BASE + 0x40 + 5)
-#define AT91_PIN_PC6    (PIN_BASE + 0x40 + 6)
-#define AT91_PIN_PC7    (PIN_BASE + 0x40 + 7)
-#define AT91_PIN_PC8    (PIN_BASE + 0x40 + 8)
-#define AT91_PIN_PC9    (PIN_BASE + 0x40 + 9)
-#define AT91_PIN_PC10   (PIN_BASE + 0x40 + 10)
-#define AT91_PIN_PC11   (PIN_BASE + 0x40 + 11)
-#define AT91_PIN_PC12   (PIN_BASE + 0x40 + 12)
-#define AT91_PIN_PC13   (PIN_BASE + 0x40 + 13)
-#define AT91_PIN_PC14   (PIN_BASE + 0x40 + 14)
-#define AT91_PIN_PC15   (PIN_BASE + 0x40 + 15)
-#define AT91_PIN_PC16   (PIN_BASE + 0x40 + 16)
-#define AT91_PIN_PC17   (PIN_BASE + 0x40 + 17)
-#define AT91_PIN_PC18   (PIN_BASE + 0x40 + 18)
-#define AT91_PIN_PC19   (PIN_BASE + 0x40 + 19)
-#define AT91_PIN_PC20   (PIN_BASE + 0x40 + 20)
-#define AT91_PIN_PC21   (PIN_BASE + 0x40 + 21)
-#define AT91_PIN_PC22   (PIN_BASE + 0x40 + 22)
-#define AT91_PIN_PC23   (PIN_BASE + 0x40 + 23)
-#define AT91_PIN_PC24   (PIN_BASE + 0x40 + 24)
-#define AT91_PIN_PC25   (PIN_BASE + 0x40 + 25)
-#define AT91_PIN_PC26   (PIN_BASE + 0x40 + 26)
-#define AT91_PIN_PC27   (PIN_BASE + 0x40 + 27)
-#define AT91_PIN_PC28   (PIN_BASE + 0x40 + 28)
-#define AT91_PIN_PC29   (PIN_BASE + 0x40 + 29)
-#define AT91_PIN_PC30   (PIN_BASE + 0x40 + 30)
-#define AT91_PIN_PC31   (PIN_BASE + 0x40 + 31)
-
-#define AT91_PIN_PD0    (PIN_BASE + 0x60 + 0)
-#define AT91_PIN_PD1    (PIN_BASE + 0x60 + 1)
-#define AT91_PIN_PD2    (PIN_BASE + 0x60 + 2)
-#define AT91_PIN_PD3    (PIN_BASE + 0x60 + 3)
-#define AT91_PIN_PD4    (PIN_BASE + 0x60 + 4)
-#define AT91_PIN_PD5    (PIN_BASE + 0x60 + 5)
-#define AT91_PIN_PD6    (PIN_BASE + 0x60 + 6)
-#define AT91_PIN_PD7    (PIN_BASE + 0x60 + 7)
-#define AT91_PIN_PD8    (PIN_BASE + 0x60 + 8)
-#define AT91_PIN_PD9    (PIN_BASE + 0x60 + 9)
-#define AT91_PIN_PD10   (PIN_BASE + 0x60 + 10)
-#define AT91_PIN_PD11   (PIN_BASE + 0x60 + 11)
-#define AT91_PIN_PD12   (PIN_BASE + 0x60 + 12)
-#define AT91_PIN_PD13   (PIN_BASE + 0x60 + 13)
-#define AT91_PIN_PD14   (PIN_BASE + 0x60 + 14)
-#define AT91_PIN_PD15   (PIN_BASE + 0x60 + 15)
-#define AT91_PIN_PD16   (PIN_BASE + 0x60 + 16)
-#define AT91_PIN_PD17   (PIN_BASE + 0x60 + 17)
-#define AT91_PIN_PD18   (PIN_BASE + 0x60 + 18)
-#define AT91_PIN_PD19   (PIN_BASE + 0x60 + 19)
-#define AT91_PIN_PD20   (PIN_BASE + 0x60 + 20)
-#define AT91_PIN_PD21   (PIN_BASE + 0x60 + 21)
-#define AT91_PIN_PD22   (PIN_BASE + 0x60 + 22)
-#define AT91_PIN_PD23   (PIN_BASE + 0x60 + 23)
-#define AT91_PIN_PD24   (PIN_BASE + 0x60 + 24)
-#define AT91_PIN_PD25   (PIN_BASE + 0x60 + 25)
-#define AT91_PIN_PD26   (PIN_BASE + 0x60 + 26)
-#define AT91_PIN_PD27   (PIN_BASE + 0x60 + 27)
-#define AT91_PIN_PD28   (PIN_BASE + 0x60 + 28)
-#define AT91_PIN_PD29   (PIN_BASE + 0x60 + 29)
-#define AT91_PIN_PD30   (PIN_BASE + 0x60 + 30)
-#define AT91_PIN_PD31   (PIN_BASE + 0x60 + 31)
-
-#define AT91_PIN_PE0    (PIN_BASE + 0x80 + 0)
-#define AT91_PIN_PE1    (PIN_BASE + 0x80 + 1)
-#define AT91_PIN_PE2    (PIN_BASE + 0x80 + 2)
-#define AT91_PIN_PE3    (PIN_BASE + 0x80 + 3)
-#define AT91_PIN_PE4    (PIN_BASE + 0x80 + 4)
-#define AT91_PIN_PE5    (PIN_BASE + 0x80 + 5)
-#define AT91_PIN_PE6    (PIN_BASE + 0x80 + 6)
-#define AT91_PIN_PE7    (PIN_BASE + 0x80 + 7)
-#define AT91_PIN_PE8    (PIN_BASE + 0x80 + 8)
-#define AT91_PIN_PE9    (PIN_BASE + 0x80 + 9)
-#define AT91_PIN_PE10   (PIN_BASE + 0x80 + 10)
-#define AT91_PIN_PE11   (PIN_BASE + 0x80 + 11)
-#define AT91_PIN_PE12   (PIN_BASE + 0x80 + 12)
-#define AT91_PIN_PE13   (PIN_BASE + 0x80 + 13)
-#define AT91_PIN_PE14   (PIN_BASE + 0x80 + 14)
-#define AT91_PIN_PE15   (PIN_BASE + 0x80 + 15)
-#define AT91_PIN_PE16   (PIN_BASE + 0x80 + 16)
-#define AT91_PIN_PE17   (PIN_BASE + 0x80 + 17)
-#define AT91_PIN_PE18   (PIN_BASE + 0x80 + 18)
-#define AT91_PIN_PE19   (PIN_BASE + 0x80 + 19)
-#define AT91_PIN_PE20   (PIN_BASE + 0x80 + 20)
-#define AT91_PIN_PE21   (PIN_BASE + 0x80 + 21)
-#define AT91_PIN_PE22   (PIN_BASE + 0x80 + 22)
-#define AT91_PIN_PE23   (PIN_BASE + 0x80 + 23)
-#define AT91_PIN_PE24   (PIN_BASE + 0x80 + 24)
-#define AT91_PIN_PE25   (PIN_BASE + 0x80 + 25)
-#define AT91_PIN_PE26   (PIN_BASE + 0x80 + 26)
-#define AT91_PIN_PE27   (PIN_BASE + 0x80 + 27)
-#define AT91_PIN_PE28   (PIN_BASE + 0x80 + 28)
-#define AT91_PIN_PE29   (PIN_BASE + 0x80 + 29)
-#define AT91_PIN_PE30   (PIN_BASE + 0x80 + 30)
-#define AT91_PIN_PE31   (PIN_BASE + 0x80 + 31)
+#define AT91_PIN_PA0    (0x00 + 0)
+#define AT91_PIN_PA1    (0x00 + 1)
+#define AT91_PIN_PA2    (0x00 + 2)
+#define AT91_PIN_PA3    (0x00 + 3)
+#define AT91_PIN_PA4    (0x00 + 4)
+#define AT91_PIN_PA5    (0x00 + 5)
+#define AT91_PIN_PA6    (0x00 + 6)
+#define AT91_PIN_PA7    (0x00 + 7)
+#define AT91_PIN_PA8    (0x00 + 8)
+#define AT91_PIN_PA9    (0x00 + 9)
+#define AT91_PIN_PA10   (0x00 + 10)
+#define AT91_PIN_PA11   (0x00 + 11)
+#define AT91_PIN_PA12   (0x00 + 12)
+#define AT91_PIN_PA13   (0x00 + 13)
+#define AT91_PIN_PA14   (0x00 + 14)
+#define AT91_PIN_PA15   (0x00 + 15)
+#define AT91_PIN_PA16   (0x00 + 16)
+#define AT91_PIN_PA17   (0x00 + 17)
+#define AT91_PIN_PA18   (0x00 + 18)
+#define AT91_PIN_PA19   (0x00 + 19)
+#define AT91_PIN_PA20   (0x00 + 20)
+#define AT91_PIN_PA21   (0x00 + 21)
+#define AT91_PIN_PA22   (0x00 + 22)
+#define AT91_PIN_PA23   (0x00 + 23)
+#define AT91_PIN_PA24   (0x00 + 24)
+#define AT91_PIN_PA25   (0x00 + 25)
+#define AT91_PIN_PA26   (0x00 + 26)
+#define AT91_PIN_PA27   (0x00 + 27)
+#define AT91_PIN_PA28   (0x00 + 28)
+#define AT91_PIN_PA29   (0x00 + 29)
+#define AT91_PIN_PA30   (0x00 + 30)
+#define AT91_PIN_PA31   (0x00 + 31)
+
+#define AT91_PIN_PB0    (0x20 + 0)
+#define AT91_PIN_PB1    (0x20 + 1)
+#define AT91_PIN_PB2    (0x20 + 2)
+#define AT91_PIN_PB3    (0x20 + 3)
+#define AT91_PIN_PB4    (0x20 + 4)
+#define AT91_PIN_PB5    (0x20 + 5)
+#define AT91_PIN_PB6    (0x20 + 6)
+#define AT91_PIN_PB7    (0x20 + 7)
+#define AT91_PIN_PB8    (0x20 + 8)
+#define AT91_PIN_PB9    (0x20 + 9)
+#define AT91_PIN_PB10   (0x20 + 10)
+#define AT91_PIN_PB11   (0x20 + 11)
+#define AT91_PIN_PB12   (0x20 + 12)
+#define AT91_PIN_PB13   (0x20 + 13)
+#define AT91_PIN_PB14   (0x20 + 14)
+#define AT91_PIN_PB15   (0x20 + 15)
+#define AT91_PIN_PB16   (0x20 + 16)
+#define AT91_PIN_PB17   (0x20 + 17)
+#define AT91_PIN_PB18   (0x20 + 18)
+#define AT91_PIN_PB19   (0x20 + 19)
+#define AT91_PIN_PB20   (0x20 + 20)
+#define AT91_PIN_PB21   (0x20 + 21)
+#define AT91_PIN_PB22   (0x20 + 22)
+#define AT91_PIN_PB23   (0x20 + 23)
+#define AT91_PIN_PB24   (0x20 + 24)
+#define AT91_PIN_PB25   (0x20 + 25)
+#define AT91_PIN_PB26   (0x20 + 26)
+#define AT91_PIN_PB27   (0x20 + 27)
+#define AT91_PIN_PB28   (0x20 + 28)
+#define AT91_PIN_PB29   (0x20 + 29)
+#define AT91_PIN_PB30   (0x20 + 30)
+#define AT91_PIN_PB31   (0x20 + 31)
+
+#define AT91_PIN_PC0    (0x40 + 0)
+#define AT91_PIN_PC1    (0x40 + 1)
+#define AT91_PIN_PC2    (0x40 + 2)
+#define AT91_PIN_PC3    (0x40 + 3)
+#define AT91_PIN_PC4    (0x40 + 4)
+#define AT91_PIN_PC5    (0x40 + 5)
+#define AT91_PIN_PC6    (0x40 + 6)
+#define AT91_PIN_PC7    (0x40 + 7)
+#define AT91_PIN_PC8    (0x40 + 8)
+#define AT91_PIN_PC9    (0x40 + 9)
+#define AT91_PIN_PC10   (0x40 + 10)
+#define AT91_PIN_PC11   (0x40 + 11)
+#define AT91_PIN_PC12   (0x40 + 12)
+#define AT91_PIN_PC13   (0x40 + 13)
+#define AT91_PIN_PC14   (0x40 + 14)
+#define AT91_PIN_PC15   (0x40 + 15)
+#define AT91_PIN_PC16   (0x40 + 16)
+#define AT91_PIN_PC17   (0x40 + 17)
+#define AT91_PIN_PC18   (0x40 + 18)
+#define AT91_PIN_PC19   (0x40 + 19)
+#define AT91_PIN_PC20   (0x40 + 20)
+#define AT91_PIN_PC21   (0x40 + 21)
+#define AT91_PIN_PC22   (0x40 + 22)
+#define AT91_PIN_PC23   (0x40 + 23)
+#define AT91_PIN_PC24   (0x40 + 24)
+#define AT91_PIN_PC25   (0x40 + 25)
+#define AT91_PIN_PC26   (0x40 + 26)
+#define AT91_PIN_PC27   (0x40 + 27)
+#define AT91_PIN_PC28   (0x40 + 28)
+#define AT91_PIN_PC29   (0x40 + 29)
+#define AT91_PIN_PC30   (0x40 + 30)
+#define AT91_PIN_PC31   (0x40 + 31)
+
+#define AT91_PIN_PD0    (0x60 + 0)
+#define AT91_PIN_PD1    (0x60 + 1)
+#define AT91_PIN_PD2    (0x60 + 2)
+#define AT91_PIN_PD3    (0x60 + 3)
+#define AT91_PIN_PD4    (0x60 + 4)
+#define AT91_PIN_PD5    (0x60 + 5)
+#define AT91_PIN_PD6    (0x60 + 6)
+#define AT91_PIN_PD7    (0x60 + 7)
+#define AT91_PIN_PD8    (0x60 + 8)
+#define AT91_PIN_PD9    (0x60 + 9)
+#define AT91_PIN_PD10   (0x60 + 10)
+#define AT91_PIN_PD11   (0x60 + 11)
+#define AT91_PIN_PD12   (0x60 + 12)
+#define AT91_PIN_PD13   (0x60 + 13)
+#define AT91_PIN_PD14   (0x60 + 14)
+#define AT91_PIN_PD15   (0x60 + 15)
+#define AT91_PIN_PD16   (0x60 + 16)
+#define AT91_PIN_PD17   (0x60 + 17)
+#define AT91_PIN_PD18   (0x60 + 18)
+#define AT91_PIN_PD19   (0x60 + 19)
+#define AT91_PIN_PD20   (0x60 + 20)
+#define AT91_PIN_PD21   (0x60 + 21)
+#define AT91_PIN_PD22   (0x60 + 22)
+#define AT91_PIN_PD23   (0x60 + 23)
+#define AT91_PIN_PD24   (0x60 + 24)
+#define AT91_PIN_PD25   (0x60 + 25)
+#define AT91_PIN_PD26   (0x60 + 26)
+#define AT91_PIN_PD27   (0x60 + 27)
+#define AT91_PIN_PD28   (0x60 + 28)
+#define AT91_PIN_PD29   (0x60 + 29)
+#define AT91_PIN_PD30   (0x60 + 30)
+#define AT91_PIN_PD31   (0x60 + 31)
+
+#define AT91_PIN_PE0    (0x80 + 0)
+#define AT91_PIN_PE1    (0x80 + 1)
+#define AT91_PIN_PE2    (0x80 + 2)
+#define AT91_PIN_PE3    (0x80 + 3)
+#define AT91_PIN_PE4    (0x80 + 4)
+#define AT91_PIN_PE5    (0x80 + 5)
+#define AT91_PIN_PE6    (0x80 + 6)
+#define AT91_PIN_PE7    (0x80 + 7)
+#define AT91_PIN_PE8    (0x80 + 8)
+#define AT91_PIN_PE9    (0x80 + 9)
+#define AT91_PIN_PE10   (0x80 + 10)
+#define AT91_PIN_PE11   (0x80 + 11)
+#define AT91_PIN_PE12   (0x80 + 12)
+#define AT91_PIN_PE13   (0x80 + 13)
+#define AT91_PIN_PE14   (0x80 + 14)
+#define AT91_PIN_PE15   (0x80 + 15)
+#define AT91_PIN_PE16   (0x80 + 16)
+#define AT91_PIN_PE17   (0x80 + 17)
+#define AT91_PIN_PE18   (0x80 + 18)
+#define AT91_PIN_PE19   (0x80 + 19)
+#define AT91_PIN_PE20   (0x80 + 20)
+#define AT91_PIN_PE21   (0x80 + 21)
+#define AT91_PIN_PE22   (0x80 + 22)
+#define AT91_PIN_PE23   (0x80 + 23)
+#define AT91_PIN_PE24   (0x80 + 24)
+#define AT91_PIN_PE25   (0x80 + 25)
+#define AT91_PIN_PE26   (0x80 + 26)
+#define AT91_PIN_PE27   (0x80 + 27)
+#define AT91_PIN_PE28   (0x80 + 28)
+#define AT91_PIN_PE29   (0x80 + 29)
+#define AT91_PIN_PE30   (0x80 + 30)
+#define AT91_PIN_PE31   (0x80 + 31)
 
 #ifndef __ASSEMBLY__
 /* setup setup routines, called from board init or driver probe() */
@@ -215,8 +213,8 @@ extern void at91_gpio_resume(void);
 
 #include <asm/errno.h>
 
-#define gpio_to_irq(gpio) (gpio)
-#define irq_to_gpio(irq)  (irq)
+#define gpio_to_irq(gpio) (gpio + NR_AIC_IRQS)
+#define irq_to_gpio(irq)  (irq - NR_AIC_IRQS)
 
 #endif  /* __ASSEMBLY__ */
 
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 483478d8be6b..2d0e4e998566 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -16,6 +16,12 @@
 
 #include <asm/sizes.h>
 
+/* DBGU base */
+/* rm9200, 9260/9g20, 9261/9g10, 9rl */
+#define AT91_BASE_DBGU0 0xfffff200
+/* 9263, 9g45, cap9 */
+#define AT91_BASE_DBGU1 0xffffee00
+
 #if defined(CONFIG_ARCH_AT91RM9200)
 #include <mach/at91rm9200.h>
 #elif defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20)
@@ -52,6 +58,12 @@
 #endif
 
 /*
+ * On all at91 have the Advanced Interrupt Controller starts at address
+ * 0xfffff000
+ */
+#define AT91_AIC        0xfffff000
+
+/*
  * Peripheral identifiers/interrupts.
  */
 #define AT91_ID_FIQ             0       /* Advanced Interrupt Controller (FIQ) */
diff --git a/arch/arm/mach-at91/include/mach/irqs.h b/arch/arm/mach-at91/include/mach/irqs.h
index 36bd55f3fc6e..ac8b7dfc85ef 100644
--- a/arch/arm/mach-at91/include/mach/irqs.h
+++ b/arch/arm/mach-at91/include/mach/irqs.h
@@ -31,7 +31,7 @@
  * Acknowledge interrupt with AIC after interrupt has been handled.
  *   (by kernel/irq.c)
  */
-#define irq_finish(irq) do { at91_sys_write(AT91_AIC_EOICR, 0); } while (0)
+#define irq_finish(irq) do { at91_aic_write(AT91_AIC_EOICR, 0); } while (0)
 
 
 /*
diff --git a/arch/arm/mach-at91/include/mach/timex.h b/arch/arm/mach-at91/include/mach/timex.h
index 85820ad801cc..5e917a66edd7 100644
--- a/arch/arm/mach-at91/include/mach/timex.h
+++ b/arch/arm/mach-at91/include/mach/timex.h
@@ -23,70 +23,15 @@
 
 #include <mach/hardware.h>
 
-#if defined(CONFIG_ARCH_AT91RM9200)
+#ifdef CONFIG_ARCH_AT91X40
 
-#define CLOCK_TICK_RATE         (AT91_SLOW_CLOCK)
-
-#elif defined(CONFIG_ARCH_AT91SAM9260)
-
-#if defined(CONFIG_MACH_USB_A9260) || defined(CONFIG_MACH_QIL_A9260)
-#define AT91SAM9_MASTER_CLOCK   90000000
-#else
-#define AT91SAM9_MASTER_CLOCK   99300000
-#endif
-
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91SAM9261)
-
-#define AT91SAM9_MASTER_CLOCK   99300000
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91SAM9G10)
-
-#define AT91SAM9_MASTER_CLOCK   133000000
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91SAM9263)
-
-#if defined(CONFIG_MACH_USB_A9263)
-#define AT91SAM9_MASTER_CLOCK   90000000
-#else
-#define AT91SAM9_MASTER_CLOCK   99959500
-#endif
-
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91SAM9RL)
-
-#define AT91SAM9_MASTER_CLOCK   100000000
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91SAM9G20)
+#define AT91X40_MASTER_CLOCK    40000000
+#define CLOCK_TICK_RATE         (AT91X40_MASTER_CLOCK)
 
-#if defined(CONFIG_MACH_USB_A9G20)
-#define AT91SAM9_MASTER_CLOCK   133000000
 #else
-#define AT91SAM9_MASTER_CLOCK   132096000
-#endif
-
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91SAM9G45)
 
-#define AT91SAM9_MASTER_CLOCK   133333333
-#define CLOCK_TICK_RATE         (AT91SAM9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91CAP9)
-
-#define AT91CAP9_MASTER_CLOCK   100000000
-#define CLOCK_TICK_RATE         (AT91CAP9_MASTER_CLOCK/16)
-
-#elif defined(CONFIG_ARCH_AT91X40)
-
-#define AT91X40_MASTER_CLOCK    40000000
-#define CLOCK_TICK_RATE         (AT91X40_MASTER_CLOCK)
+#define CLOCK_TICK_RATE         12345678
 
 #endif
 
-#endif
+#endif /* __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h
index 18bdcdeb474f..0234fd9d20d6 100644
--- a/arch/arm/mach-at91/include/mach/uncompress.h
+++ b/arch/arm/mach-at91/include/mach/uncompress.h
@@ -24,8 +24,10 @@
 #include <linux/io.h>
 #include <linux/atmel_serial.h>
 
-#if defined(CONFIG_AT91_EARLY_DBGU)
-#define UART_OFFSET (AT91_DBGU + AT91_BASE_SYS)
+#if defined(CONFIG_AT91_EARLY_DBGU0)
+#define UART_OFFSET AT91_BASE_DBGU0
+#elif defined(CONFIG_AT91_EARLY_DBGU1)
+#define UART_OFFSET AT91_BASE_DBGU1
 #elif defined(CONFIG_AT91_EARLY_USART0)
 #define UART_OFFSET AT91_USART0
 #elif defined(CONFIG_AT91_EARLY_USART1)
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c
index 9665265ec757..be6b639ecd7b 100644
--- a/arch/arm/mach-at91/irq.c
+++ b/arch/arm/mach-at91/irq.c
@@ -33,17 +33,18 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
+void __iomem *at91_aic_base;
 
 static void at91_aic_mask_irq(struct irq_data *d)
 {
         /* Disable interrupt on AIC */
-        at91_sys_write(AT91_AIC_IDCR, 1 << d->irq);
+        at91_aic_write(AT91_AIC_IDCR, 1 << d->irq);
 }
 
 static void at91_aic_unmask_irq(struct irq_data *d)
 {
         /* Enable interrupt on AIC */
-        at91_sys_write(AT91_AIC_IECR, 1 << d->irq);
+        at91_aic_write(AT91_AIC_IECR, 1 << d->irq);
 }
 
 unsigned int at91_extern_irq;
@@ -77,8 +78,8 @@ static int at91_aic_set_type(struct irq_data *d, unsigned type)
                 return -EINVAL;
         }
 
-        smr = at91_sys_read(AT91_AIC_SMR(d->irq)) & ~AT91_AIC_SRCTYPE;
-        at91_sys_write(AT91_AIC_SMR(d->irq), smr | srctype);
+        smr = at91_aic_read(AT91_AIC_SMR(d->irq)) & ~AT91_AIC_SRCTYPE;
+        at91_aic_write(AT91_AIC_SMR(d->irq), smr | srctype);
         return 0;
 }
 
@@ -102,15 +103,15 @@ static int at91_aic_set_wake(struct irq_data *d, unsigned value)
 
 void at91_irq_suspend(void)
 {
-        backups = at91_sys_read(AT91_AIC_IMR);
-        at91_sys_write(AT91_AIC_IDCR, backups);
-        at91_sys_write(AT91_AIC_IECR, wakeups);
+        backups = at91_aic_read(AT91_AIC_IMR);
+        at91_aic_write(AT91_AIC_IDCR, backups);
+        at91_aic_write(AT91_AIC_IECR, wakeups);
 }
 
 void at91_irq_resume(void)
 {
-        at91_sys_write(AT91_AIC_IDCR, wakeups);
-        at91_sys_write(AT91_AIC_IECR, backups);
+        at91_aic_write(AT91_AIC_IDCR, wakeups);
+        at91_aic_write(AT91_AIC_IECR, backups);
 }
 
 #else
@@ -133,34 +134,39 @@ void __init at91_aic_init(unsigned int priority[NR_AIC_IRQS])
 {
         unsigned int i;
 
+        at91_aic_base = ioremap(AT91_AIC, 512);
+
+        if (!at91_aic_base)
+                panic("Impossible to ioremap AT91_AIC\n");
+
         /*
          * The IVR is used by macro get_irqnr_and_base to read and verify.
          * The irq number is NR_AIC_IRQS when a spurious interrupt has occurred.
          */
         for (i = 0; i < NR_AIC_IRQS; i++) {
                 /* Put irq number in Source Vector Register: */
-                at91_sys_write(AT91_AIC_SVR(i), i);
+                at91_aic_write(AT91_AIC_SVR(i), i);
                 /* Active Low interrupt, with the specified priority */
-                at91_sys_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);
+                at91_aic_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);
 
                 irq_set_chip_and_handler(i, &at91_aic_chip, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
 
                 /* Perform 8 End Of Interrupt Command to make sure AIC will not Lock out nIRQ */
                 if (i < 8)
-                        at91_sys_write(AT91_AIC_EOICR, 0);
+                        at91_aic_write(AT91_AIC_EOICR, 0);
         }
 
         /*
          * Spurious Interrupt ID in Spurious Vector Register is NR_AIC_IRQS
          * When there is no current interrupt, the IRQ Vector Register reads the value stored in AIC_SPU
          */
-        at91_sys_write(AT91_AIC_SPU, NR_AIC_IRQS);
+        at91_aic_write(AT91_AIC_SPU, NR_AIC_IRQS);
 
         /* No debugging in AIC: Debug (Protect) Control Register */
-        at91_sys_write(AT91_AIC_DCR, 0);
+        at91_aic_write(AT91_AIC_DCR, 0);
 
         /* Disable and clear all interrupts initially */
-        at91_sys_write(AT91_AIC_IDCR, 0xFFFFFFFF);
-        at91_sys_write(AT91_AIC_ICCR, 0xFFFFFFFF);
+        at91_aic_write(AT91_AIC_IDCR, 0xFFFFFFFF);
+        at91_aic_write(AT91_AIC_ICCR, 0xFFFFFFFF);
 }
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 7046158109d7..62ad95556c36 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -34,7 +34,7 @@
 /*
  * Show the reason for the previous system reset.
  */
-#if defined(AT91_SHDWC)
+#if defined(AT91_RSTC)
 
 #include <mach/at91_rstc.h>
 #include <mach/at91_shdwc.h>
@@ -58,8 +58,11 @@ static void __init show_reset_status(void)
         char *reason, *r2 = reset;
         u32 reset_type, wake_type;
 
+        if (!at91_shdwc_base)
+                return;
+
         reset_type = at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_RSTTYP;
-        wake_type = at91_sys_read(AT91_SHDW_SR);
+        wake_type = at91_shdwc_read(AT91_SHDW_SR);
 
         switch (reset_type) {
         case AT91_RSTC_RSTTYP_GENERAL:
@@ -215,7 +218,7 @@ static int at91_pm_enter(suspend_state_t state)
                                         | (1 << AT91_ID_FIQ)
                                         | (1 << AT91_ID_SYS)
                                         | (at91_extern_irq))
-                                & at91_sys_read(AT91_AIC_IMR),
+                                & at91_aic_read(AT91_AIC_IMR),
                         state);
 
         switch (state) {
@@ -283,7 +286,7 @@ static int at91_pm_enter(suspend_state_t state)
         }
 
         pr_debug("AT91: PM - wakeup %08x\n",
-                        at91_sys_read(AT91_AIC_IPR) & at91_sys_read(AT91_AIC_IMR));
+                        at91_aic_read(AT91_AIC_IPR) & at91_aic_read(AT91_AIC_IMR));
 
 error:
         target_state = PM_SUSPEND_ON;
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c
index 5eab6aa621d0..8294783b679d 100644
--- a/arch/arm/mach-at91/sam9_smc.c
+++ b/arch/arm/mach-at91/sam9_smc.c
@@ -10,38 +10,58 @@
 
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 
 #include <mach/at91sam9_smc.h>
 
 #include "sam9_smc.h"
 
-void __init sam9_smc_configure(int cs, struct sam9_smc_config* config)
+
+#define AT91_SMC_CS(id, n)      (smc_base_addr[id] + ((n) * 0x10))
+
+static void __iomem *smc_base_addr[2];
+
+static void __init sam9_smc_cs_configure(void __iomem *base, struct sam9_smc_config* config)
 {
+
         /* Setup register */
-        at91_sys_write(AT91_SMC_SETUP(cs),
-                  AT91_SMC_NWESETUP_(config->nwe_setup)
-                | AT91_SMC_NCS_WRSETUP_(config->ncs_write_setup)
-                | AT91_SMC_NRDSETUP_(config->nrd_setup)
-                | AT91_SMC_NCS_RDSETUP_(config->ncs_read_setup)
-        );
+        __raw_writel(AT91_SMC_NWESETUP_(config->nwe_setup)
+                   | AT91_SMC_NCS_WRSETUP_(config->ncs_write_setup)
+                   | AT91_SMC_NRDSETUP_(config->nrd_setup)
+                   | AT91_SMC_NCS_RDSETUP_(config->ncs_read_setup),
+                   base + AT91_SMC_SETUP);
 
         /* Pulse register */
-        at91_sys_write(AT91_SMC_PULSE(cs),
-                  AT91_SMC_NWEPULSE_(config->nwe_pulse)
-                | AT91_SMC_NCS_WRPULSE_(config->ncs_write_pulse)
-                | AT91_SMC_NRDPULSE_(config->nrd_pulse)
-                | AT91_SMC_NCS_RDPULSE_(config->ncs_read_pulse)
-        );
+        __raw_writel(AT91_SMC_NWEPULSE_(config->nwe_pulse)
+                   | AT91_SMC_NCS_WRPULSE_(config->ncs_write_pulse)
+                   | AT91_SMC_NRDPULSE_(config->nrd_pulse)
+                   | AT91_SMC_NCS_RDPULSE_(config->ncs_read_pulse),
+                   base + AT91_SMC_PULSE);
 
         /* Cycle register */
-        at91_sys_write(AT91_SMC_CYCLE(cs),
-                  AT91_SMC_NWECYCLE_(config->write_cycle)
-                | AT91_SMC_NRDCYCLE_(config->read_cycle)
-        );
+        __raw_writel(AT91_SMC_NWECYCLE_(config->write_cycle)
+                   | AT91_SMC_NRDCYCLE_(config->read_cycle),
+                   base + AT91_SMC_CYCLE);
 
         /* Mode register */
-        at91_sys_write(AT91_SMC_MODE(cs),
-                  config->mode
-                | AT91_SMC_TDF_(config->tdf_cycles)
-        );
+        __raw_writel(config->mode
+                   | AT91_SMC_TDF_(config->tdf_cycles),
+                   base + AT91_SMC_MODE);
+}
+
+void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config)
+{
+        sam9_smc_cs_configure(AT91_SMC_CS(id, cs), config);
+}
+
+void __init at91sam9_ioremap_smc(int id, u32 addr)
+{
+        if (id > 1) {
+                pr_warn("%s: id > 2\n", __func__);
+                return;
+        }
+        smc_base_addr[id] = ioremap(addr, 512);
+        if (!smc_base_addr[id])
+                pr_warn("Impossible to ioremap smc.%d 0x%x\n", id, addr);
 }
diff --git a/arch/arm/mach-at91/sam9_smc.h b/arch/arm/mach-at91/sam9_smc.h
index bf72cfb3455b..039c5ce17aec 100644
--- a/arch/arm/mach-at91/sam9_smc.h
+++ b/arch/arm/mach-at91/sam9_smc.h
@@ -30,4 +30,5 @@ struct sam9_smc_config {
         u8 tdf_cycles:4;
 };
 
-extern void __init sam9_smc_configure(int cs, struct sam9_smc_config* config);
+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 cf98a8f94dc5..8bdcc3cb6012 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/mm.h>
+#include <linux/pm.h>
 
 #include <asm/mach/map.h>
 
@@ -15,6 +16,7 @@
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 #include <mach/at91_pmc.h>
+#include <mach/at91_shdwc.h>
 
 #include "soc.h"
 #include "generic.h"
@@ -73,9 +75,6 @@ static struct map_desc at91_io_desc __initdata = {
         .type           = MT_DEVICE,
 };
 
-#define AT91_DBGU0      0xfffff200
-#define AT91_DBGU1      0xffffee00
-
 static void __init soc_detect(u32 dbgu_base)
 {
         u32 cidr, socid;
@@ -248,9 +247,9 @@ void __init at91_map_io(void)
         at91_soc_initdata.type = AT91_SOC_NONE;
         at91_soc_initdata.subtype = AT91_SOC_SUBTYPE_NONE;
 
-        soc_detect(AT91_DBGU0);
+        soc_detect(AT91_BASE_DBGU0);
         if (!at91_soc_is_detected())
-                soc_detect(AT91_DBGU1);
+                soc_detect(AT91_BASE_DBGU1);
 
         if (!at91_soc_is_detected())
                 panic("AT91: Impossible to detect the SOC type");
@@ -267,8 +266,25 @@ void __init at91_map_io(void)
                 at91_boot_soc.map_io();
 }
 
+void __iomem *at91_shdwc_base = NULL;
+
+static void at91sam9_poweroff(void)
+{
+        at91_shdwc_write(AT91_SHDW_CR, AT91_SHDW_KEY | AT91_SHDW_SHDW);
+}
+
+void __init at91_ioremap_shdwc(u32 base_addr)
+{
+        at91_shdwc_base = ioremap(base_addr, 16);
+        if (!at91_shdwc_base)
+                panic("Impossible to ioremap at91_shdwc_base\n");
+        pm_power_off = at91sam9_poweroff;
+}
+
 void __init at91_initialize(unsigned long main_clock)
 {
+        at91_boot_soc.ioremap_registers();
+
         /* Init clock subsystem */
         at91_clock_init(main_clock);
 
diff --git a/arch/arm/mach-at91/soc.h b/arch/arm/mach-at91/soc.h
index 21ed8816e6f7..4588ae6f7acd 100644
--- a/arch/arm/mach-at91/soc.h
+++ b/arch/arm/mach-at91/soc.h
@@ -7,6 +7,7 @@
 struct at91_init_soc {
         unsigned int *default_irq_priority;
         void (*map_io)(void);
+        void (*ioremap_registers)(void);
         void (*register_clocks)(void);
         void (*init)(void);
 };
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index 00861139101d..008772e3b843 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -31,19 +31,12 @@ static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
 static DEFINE_SPINLOCK(clockfw_lock);
 
-static unsigned psc_domain(struct clk *clk)
-{
-        return (clk->flags & PSC_DSP)
-                ? DAVINCI_GPSC_DSPDOMAIN
-                : DAVINCI_GPSC_ARMDOMAIN;
-}
-
 static void __clk_enable(struct clk *clk)
 {
         if (clk->parent)
                 __clk_enable(clk->parent);
         if (clk->usecount++ == 0 && (clk->flags & CLK_PSC))
-                davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc,
+                davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
                                 true, clk->flags);
 }
 
@@ -53,7 +46,7 @@ static void __clk_disable(struct clk *clk)
                 return;
         if (--clk->usecount == 0 && !(clk->flags & CLK_PLL) &&
             (clk->flags & CLK_PSC))
-                davinci_psc_config(psc_domain(clk), clk->gpsc, clk->lpsc,
+                davinci_psc_config(clk->domain, clk->gpsc, clk->lpsc,
                                 false, clk->flags);
         if (clk->parent)
                 __clk_disable(clk->parent);
@@ -237,7 +230,7 @@ static int __init clk_disable_unused(void)
 
                 pr_debug("Clocks: disable unused %s\n", ck->name);
 
-                davinci_psc_config(psc_domain(ck), ck->gpsc, ck->lpsc,
+                davinci_psc_config(ck->domain, ck->gpsc, ck->lpsc,
                                 false, ck->flags);
         }
         spin_unlock_irq(&clockfw_lock);
diff --git a/arch/arm/mach-davinci/clock.h b/arch/arm/mach-davinci/clock.h
index a705f367a84d..46f0f1bf1a4c 100644
--- a/arch/arm/mach-davinci/clock.h
+++ b/arch/arm/mach-davinci/clock.h
@@ -93,6 +93,7 @@ struct clk {
         u8                      usecount;
         u8                      lpsc;
         u8                      gpsc;
+        u8                      domain;
         u32                     flags;
         struct clk              *parent;
         struct list_head        children;       /* list of children */
@@ -107,11 +108,10 @@ struct clk {
 /* Clock flags: SoC-specific flags start at BIT(16) */
 #define ALWAYS_ENABLED          BIT(1)
 #define CLK_PSC                 BIT(2)
-#define PSC_DSP                 BIT(3) /* PSC uses DSP domain, not ARM */
-#define CLK_PLL                 BIT(4) /* PLL-derived clock */
-#define PRE_PLL                 BIT(5) /* source is before PLL mult/div */
-#define PSC_SWRSTDISABLE        BIT(6) /* Disable state is SwRstDisable */
-#define PSC_FORCE               BIT(7) /* Force module state transtition */
+#define CLK_PLL                 BIT(3) /* PLL-derived clock */
+#define PRE_PLL                 BIT(4) /* source is before PLL mult/div */
+#define PSC_SWRSTDISABLE        BIT(5) /* Disable state is SwRstDisable */
+#define PSC_FORCE               BIT(6) /* Force module state transtition */
 
 #define CLK(dev, con, ck)       \
         {                       \
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 0800f9cf33bb..43a48ee1917b 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -130,7 +130,7 @@ static struct clk dsp_clk = {
         .name = "dsp",
         .parent = &pll1_sysclk1,
         .lpsc = DAVINCI_LPSC_GEM,
-        .flags = PSC_DSP,
+        .domain = DAVINCI_GPSC_DSPDOMAIN,
         .usecount = 1,                  /* REVISIT how to disable? */
 };
 
@@ -145,7 +145,7 @@ static struct clk vicp_clk = {
         .name = "vicp",
         .parent = &pll1_sysclk2,
         .lpsc = DAVINCI_LPSC_IMCOP,
-        .flags = PSC_DSP,
+        .domain = DAVINCI_GPSC_DSPDOMAIN,
         .usecount = 1,                  /* REVISIT how to disable? */
 };
 
diff --git a/arch/arm/mach-davinci/include/mach/dm646x.h b/arch/arm/mach-davinci/include/mach/dm646x.h
index 2a00fe5ac253..a8ee6c9f0bb0 100644
--- a/arch/arm/mach-davinci/include/mach/dm646x.h
+++ b/arch/arm/mach-davinci/include/mach/dm646x.h
@@ -16,6 +16,7 @@
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <linux/davinci_emac.h>
+#include <media/davinci/vpif_types.h>
 
 #define DM646X_EMAC_BASE                (0x01C80000)
 #define DM646X_EMAC_MDIO_BASE           (DM646X_EMAC_BASE + 0x4000)
@@ -34,58 +35,6 @@ int __init dm646x_init_edma(struct edma_rsv_info *rsv);
 
 void dm646x_video_init(void);
 
-enum vpif_if_type {
-        VPIF_IF_BT656,
-        VPIF_IF_BT1120,
-        VPIF_IF_RAW_BAYER
-};
-
-struct vpif_interface {
-        enum vpif_if_type if_type;
-        unsigned hd_pol:1;
-        unsigned vd_pol:1;
-        unsigned fid_pol:1;
-};
-
-struct vpif_subdev_info {
-        const char *name;
-        struct i2c_board_info board_info;
-        u32 input;
-        u32 output;
-        unsigned can_route:1;
-        struct vpif_interface vpif_if;
-};
-
-struct vpif_display_config {
-        int (*set_clock)(int, int);
-        struct vpif_subdev_info *subdevinfo;
-        int subdev_count;
-        const char **output;
-        int output_count;
-        const char *card_name;
-};
-
-struct vpif_input {
-        struct v4l2_input input;
-        const char *subdev_name;
-};
-
-#define VPIF_CAPTURE_MAX_CHANNELS       2
-
-struct vpif_capture_chan_config {
-        const struct vpif_input *inputs;
-        int input_count;
-};
-
-struct vpif_capture_config {
-        int (*setup_input_channel_mode)(int);
-        int (*setup_input_path)(int, const char *);
-        struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
-        struct vpif_subdev_info *subdev_info;
-        int subdev_count;
-        const char *card_name;
-};
-
 void dm646x_setup_vpif(struct vpif_display_config *,
                        struct vpif_capture_config *);
 
diff --git a/arch/arm/mach-dove/addr-map.c b/arch/arm/mach-dove/addr-map.c
index 00be4fc26dd7..98b8c83b09ab 100644
--- a/arch/arm/mach-dove/addr-map.c
+++ b/arch/arm/mach-dove/addr-map.c
@@ -14,6 +14,7 @@
 #include <linux/io.h>
 #include <asm/mach/arch.h>
 #include <asm/setup.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*
@@ -34,98 +35,72 @@
 #define ATTR_PCIE_MEM           0xe8
 #define ATTR_SCRATCHPAD         0x0
 
-/*
- * CPU Address Decode Windows registers
- */
-#define WIN_CTRL(n)     (BRIDGE_VIRT_BASE + ((n) << 4) + 0x0)
-#define WIN_BASE(n)     (BRIDGE_VIRT_BASE + ((n) << 4) + 0x4)
-#define WIN_REMAP_LO(n) (BRIDGE_VIRT_BASE + ((n) << 4) + 0x8)
-#define WIN_REMAP_HI(n) (BRIDGE_VIRT_BASE + ((n) << 4) + 0xc)
-
-struct mbus_dram_target_info dove_mbus_dram_info;
-
 static inline void __iomem *ddr_map_sc(int i)
 {
         return (void __iomem *)(DOVE_MC_VIRT_BASE + 0x100 + ((i) << 4));
 }
 
-static int cpu_win_can_remap(int win)
-{
-        if (win < 4)
-                return 1;
-
-        return 0;
-}
-
-static void __init setup_cpu_win(int win, u32 base, u32 size,
-                                 u8 target, u8 attr, int remap)
-{
-        u32 ctrl;
-
-        base &= 0xffff0000;
-        ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1;
-
-        writel(base, WIN_BASE(win));
-        writel(ctrl, WIN_CTRL(win));
-        if (cpu_win_can_remap(win)) {
-                if (remap < 0)
-                        remap = base;
-                writel(remap & 0xffff0000, WIN_REMAP_LO(win));
-                writel(0, WIN_REMAP_HI(win));
-        }
-}
-
-void __init dove_setup_cpu_mbus(void)
-{
-        int i;
-        int cs;
+/*
+ * Description of the windows needed by the platform code
+ */
+static struct __initdata orion_addr_map_cfg addr_map_cfg = {
+        .num_wins = 8,
+        .remappable_wins = 4,
+        .bridge_virt_base = BRIDGE_VIRT_BASE,
+};
 
+static const struct __initdata orion_addr_map_info addr_map_info[] = {
         /*
-         * First, disable and clear windows.
+         * Windows for PCIe IO+MEM space.
          */
-        for (i = 0; i < 8; i++) {
-                writel(0, WIN_BASE(i));
-                writel(0, WIN_CTRL(i));
-                if (cpu_win_can_remap(i)) {
-                        writel(0, WIN_REMAP_LO(i));
-                        writel(0, WIN_REMAP_HI(i));
-                }
-        }
-
+        { 0, DOVE_PCIE0_IO_PHYS_BASE, DOVE_PCIE0_IO_SIZE,
+          TARGET_PCIE0, ATTR_PCIE_IO, DOVE_PCIE0_IO_BUS_BASE
+        },
+        { 1, DOVE_PCIE1_IO_PHYS_BASE, DOVE_PCIE1_IO_SIZE,
+          TARGET_PCIE1, ATTR_PCIE_IO, DOVE_PCIE1_IO_BUS_BASE
+        },
+        { 2, DOVE_PCIE0_MEM_PHYS_BASE, DOVE_PCIE0_MEM_SIZE,
+          TARGET_PCIE0, ATTR_PCIE_MEM, -1
+        },
+        { 3, DOVE_PCIE1_MEM_PHYS_BASE, DOVE_PCIE1_MEM_SIZE,
+          TARGET_PCIE1, ATTR_PCIE_MEM, -1
+        },
         /*
-         * Setup windows for PCIe IO+MEM space.
+         * Window for CESA engine.
          */
-        setup_cpu_win(0, DOVE_PCIE0_IO_PHYS_BASE, DOVE_PCIE0_IO_SIZE,
-                      TARGET_PCIE0, ATTR_PCIE_IO, DOVE_PCIE0_IO_BUS_BASE);
-        setup_cpu_win(1, DOVE_PCIE1_IO_PHYS_BASE, DOVE_PCIE1_IO_SIZE,
-                      TARGET_PCIE1, ATTR_PCIE_IO, DOVE_PCIE1_IO_BUS_BASE);
-        setup_cpu_win(2, DOVE_PCIE0_MEM_PHYS_BASE, DOVE_PCIE0_MEM_SIZE,
-                      TARGET_PCIE0, ATTR_PCIE_MEM, -1);
-        setup_cpu_win(3, DOVE_PCIE1_MEM_PHYS_BASE, DOVE_PCIE1_MEM_SIZE,
-                      TARGET_PCIE1, ATTR_PCIE_MEM, -1);
-
+        { 4, DOVE_CESA_PHYS_BASE, DOVE_CESA_SIZE,
+          TARGET_CESA, ATTR_CESA, -1
+        },
         /*
-         * Setup window for CESA engine.
+         * Window to the BootROM for Standby and Sleep Resume
          */
-        setup_cpu_win(4, DOVE_CESA_PHYS_BASE, DOVE_CESA_SIZE,
-                      TARGET_CESA, ATTR_CESA, -1);
-
+        { 5, DOVE_BOOTROM_PHYS_BASE, DOVE_BOOTROM_SIZE,
+          TARGET_BOOTROM, ATTR_BOOTROM, -1
+        },
         /*
-         * Setup the Window to the BootROM for Standby and Sleep Resume
+         * Window to the PMU Scratch Pad space
          */
-        setup_cpu_win(5, DOVE_BOOTROM_PHYS_BASE, DOVE_BOOTROM_SIZE,
-                      TARGET_BOOTROM, ATTR_BOOTROM, -1);
+        { 6, DOVE_SCRATCHPAD_PHYS_BASE, DOVE_SCRATCHPAD_SIZE,
+          TARGET_SCRATCHPAD, ATTR_SCRATCHPAD, -1
+        },
+        /* End marker */
+        { -1, 0, 0, 0, 0, 0 }
+};
+
+void __init dove_setup_cpu_mbus(void)
+{
+        int i;
+        int cs;
 
         /*
-         * Setup the Window to the PMU Scratch Pad space
+         * Disable, clear and configure windows.
          */
-        setup_cpu_win(6, DOVE_SCRATCHPAD_PHYS_BASE, DOVE_SCRATCHPAD_SIZE,
-                      TARGET_SCRATCHPAD, ATTR_SCRATCHPAD, -1);
+        orion_config_wins(&addr_map_cfg, addr_map_info);
 
         /*
          * Setup MBUS dram target info.
          */
-        dove_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
+        orion_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
 
         for (i = 0, cs = 0; i < 2; i++) {
                 u32 map = readl(ddr_map_sc(i));
@@ -136,7 +111,7 @@ void __init dove_setup_cpu_mbus(void)
                 if (map & 1) {
                         struct mbus_dram_window *w;
 
-                        w = &dove_mbus_dram_info.cs[cs++];
+                        w = &orion_mbus_dram_info.cs[cs++];
                         w->cs_index = i;
                         w->mbus_attr = 0; /* CS address decoding done inside */
                                           /* the DDR controller, no need to  */
@@ -145,5 +120,5 @@ void __init dove_setup_cpu_mbus(void)
                         w->size = 0x100000 << (((map & 0x000f0000) >> 16) - 4);
                 }
         }
-        dove_mbus_dram_info.num_cs = cs;
+        orion_mbus_dram_info.num_cs = cs;
 }
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 13bb236cd0cd..dd1429ae6405 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -14,7 +14,6 @@
 #include <linux/platform_device.h>
 #include <linux/pci.h>
 #include <linux/clk.h>
-#include <linux/mbus.h>
 #include <linux/ata_platform.h>
 #include <linux/gpio.h>
 #include <asm/page.h>
@@ -30,6 +29,7 @@
 #include <linux/irq.h>
 #include <plat/time.h>
 #include <plat/common.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 static int get_tclk(void);
@@ -71,8 +71,7 @@ void __init dove_map_io(void)
  ****************************************************************************/
 void __init dove_ehci0_init(void)
 {
-        orion_ehci_init(&dove_mbus_dram_info,
-                        DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);
+        orion_ehci_init(DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);
 }
 
 /*****************************************************************************
@@ -80,8 +79,7 @@ void __init dove_ehci0_init(void)
  ****************************************************************************/
 void __init dove_ehci1_init(void)
 {
-        orion_ehci_1_init(&dove_mbus_dram_info,
-                          DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1);
+        orion_ehci_1_init(DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1);
 }
 
 /*****************************************************************************
@@ -89,7 +87,7 @@ void __init dove_ehci1_init(void)
  ****************************************************************************/
 void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        orion_ge00_init(eth_data, &dove_mbus_dram_info,
+        orion_ge00_init(eth_data,
                         DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM,
                         0, get_tclk());
 }
@@ -107,8 +105,7 @@ void __init dove_rtc_init(void)
  ****************************************************************************/
 void __init dove_sata_init(struct mv_sata_platform_data *sata_data)
 {
-        orion_sata_init(sata_data, &dove_mbus_dram_info,
-                        DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA);
+        orion_sata_init(sata_data, DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA);
 
 }
 
@@ -198,8 +195,7 @@ struct sys_timer dove_timer = {
  ****************************************************************************/
 void __init dove_xor0_init(void)
 {
-        orion_xor0_init(&dove_mbus_dram_info,
-                        DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE,
+        orion_xor0_init(DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE,
                         IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01);
 }
 
diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-dove/common.h
index 42027305c107..6432a3ba864b 100644
--- a/arch/arm/mach-dove/common.h
+++ b/arch/arm/mach-dove/common.h
@@ -15,7 +15,6 @@ struct mv643xx_eth_platform_data;
 struct mv_sata_platform_data;
 
 extern struct sys_timer dove_timer;
-extern struct mbus_dram_target_info dove_mbus_dram_info;
 
 /*
  * Basic Dove init functions used early by machine-setup.
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index aa2b3a09a51d..6c11a4df7178 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/pcie.c
@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/mbus.h>
 #include <video/vga.h>
 #include <asm/mach/pci.h>
 #include <asm/mach/arch.h>
@@ -19,6 +18,7 @@
 #include <plat/pcie.h>
 #include <mach/irqs.h>
 #include <mach/bridge-regs.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 struct pcie_port {
@@ -50,7 +50,7 @@ static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys)
          */
         orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 
-        orion_pcie_setup(pp->base, &dove_mbus_dram_info);
+        orion_pcie_setup(pp->base);
 
         /*
          * IORESOURCE_IO
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e1efbca2a539..5d602f68a0e8 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -59,6 +59,11 @@ config EXYNOS4_MCT
         help
           Use MCT (Multi Core Timer) as kernel timers
 
+config EXYNOS4_DEV_DMA
+        bool
+        help
+          Compile in amba device definitions for DMA controller
+
 config EXYNOS4_DEV_AHCI
         bool
         help
@@ -84,6 +89,11 @@ config EXYNOS4_DEV_DWMCI
         help
           Compile in platform device definitions for DWMCI
 
+config EXYNOS4_DEV_USB_OHCI
+        bool
+        help
+          Compile in platform device definition for USB OHCI
+
 config EXYNOS4_SETUP_I2C1
         bool
         help
@@ -145,6 +155,11 @@ config EXYNOS4_SETUP_USB_PHY
         help
           Common setup code for USB PHY controller
 
+config EXYNOS4_SETUP_SPI
+        bool
+        help
+          Common setup code for SPI GPIO configurations.
+
 # machine support
 
 if ARCH_EXYNOS4
@@ -179,8 +194,10 @@ config MACH_SMDKV310
         select SAMSUNG_DEV_BACKLIGHT
         select EXYNOS4_DEV_AHCI
         select SAMSUNG_DEV_KEYPAD
+        select EXYNOS4_DEV_DMA
         select EXYNOS4_DEV_PD
         select SAMSUNG_DEV_PWM
+        select EXYNOS4_DEV_USB_OHCI
         select EXYNOS4_DEV_SYSMMU
         select EXYNOS4_SETUP_FIMD0
         select EXYNOS4_SETUP_I2C1
@@ -199,6 +216,7 @@ config MACH_ARMLEX4210
         select S3C_DEV_HSMMC2
         select S3C_DEV_HSMMC3
         select EXYNOS4_DEV_AHCI
+        select EXYNOS4_DEV_DMA
         select EXYNOS4_DEV_SYSMMU
         select EXYNOS4_SETUP_SDHCI
         help
@@ -224,6 +242,7 @@ config MACH_UNIVERSAL_C210
         select S5P_DEV_MFC
         select S5P_DEV_ONENAND
         select S5P_DEV_TV
+        select EXYNOS4_DEV_DMA
         select EXYNOS4_DEV_PD
         select EXYNOS4_SETUP_FIMD0
         select EXYNOS4_SETUP_I2C1
@@ -257,6 +276,7 @@ config MACH_NURI
         select S5P_DEV_MFC
         select S5P_DEV_USB_EHCI
         select S5P_SETUP_MIPIPHY
+        select EXYNOS4_DEV_DMA
         select EXYNOS4_DEV_PD
         select EXYNOS4_SETUP_FIMC
         select EXYNOS4_SETUP_FIMD0
@@ -289,7 +309,9 @@ config MACH_ORIGEN
         select S5P_DEV_USB_EHCI
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_PWM
+        select EXYNOS4_DEV_DMA
         select EXYNOS4_DEV_PD
+        select EXYNOS4_DEV_USB_OHCI
         select EXYNOS4_SETUP_FIMD0
         select EXYNOS4_SETUP_SDHCI
         select EXYNOS4_SETUP_USB_PHY
@@ -329,6 +351,20 @@ config MACH_SMDK4412
           Machine support for Samsung SMDK4412
 endif
 
+comment "Flattened Device Tree based board for Exynos4 based SoC"
+
+config MACH_EXYNOS4_DT
+        bool "Samsung Exynos4 Machine using device tree"
+        select CPU_EXYNOS4210
+        select USE_OF
+        select ARM_AMBA
+        select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
+        help
+          Machine support for Samsung Exynos4 machine with device tree enabled.
+          Select this if a fdt blob is available for the Exynos4 SoC based board.
+          Note: This is under development and not all peripherals can be supported
+          with this machine file.
+
 if ARCH_EXYNOS4
 
 comment "Configuration for HSMMC 8-bit bus width"
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index bcb9efc576e9..5fc202cdfdb6 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -19,7 +19,7 @@ obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o
 obj-$(CONFIG_PM)                += pm.o
 obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
 
-obj-$(CONFIG_ARCH_EXYNOS4)      += dma.o pmu.o
+obj-$(CONFIG_ARCH_EXYNOS4)      += pmu.o
 
 obj-$(CONFIG_SMP)               += platsmp.o headsmp.o
 
@@ -39,6 +39,8 @@ obj-$(CONFIG_MACH_ORIGEN)		+= mach-origen.o
 obj-$(CONFIG_MACH_SMDK4212)             += mach-smdk4x12.o
 obj-$(CONFIG_MACH_SMDK4412)             += mach-smdk4x12.o
 
+obj-$(CONFIG_MACH_EXYNOS4_DT)           += mach-exynos4-dt.o
+
 # device support
 
 obj-$(CONFIG_ARCH_EXYNOS4)              += dev-audio.o
@@ -46,6 +48,8 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
 obj-$(CONFIG_EXYNOS4_DEV_PD)            += dev-pd.o
 obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)        += dev-sysmmu.o
 obj-$(CONFIG_EXYNOS4_DEV_DWMCI)         += dev-dwmci.o
+obj-$(CONFIG_EXYNOS4_DEV_DMA)           += dma.o
+obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)      += dev-ohci.o
 
 obj-$(CONFIG_ARCH_EXYNOS4)              += setup-i2c0.o
 obj-$(CONFIG_EXYNOS4_SETUP_FIMC)        += setup-fimc.o
@@ -58,6 +62,6 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C5)	+= setup-i2c5.o
 obj-$(CONFIG_EXYNOS4_SETUP_I2C6)        += setup-i2c6.o
 obj-$(CONFIG_EXYNOS4_SETUP_I2C7)        += setup-i2c7.o
 obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)      += setup-keypad.o
-obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)       += setup-sdhci.o
 obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
 obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)     += setup-usb-phy.o
+obj-$(CONFIG_EXYNOS4_SETUP_SPI)         += setup-spi.o
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 83616a039b15..5a8c42e90005 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -554,16 +554,6 @@ static struct clk init_clocks_off[] = {
                 .enable         = exynos4_clk_dac_ctrl,
                 .ctrlbit        = (1 << 0),
         }, {
-                .name           = "dma",
-                .devname        = "dma-pl330.0",
-                .enable         = exynos4_clk_ip_fsys_ctrl,
-                .ctrlbit        = (1 << 0),
-        }, {
-                .name           = "dma",
-                .devname        = "dma-pl330.1",
-                .enable         = exynos4_clk_ip_fsys_ctrl,
-                .ctrlbit        = (1 << 1),
-        }, {
                 .name           = "adc",
                 .enable         = exynos4_clk_ip_peril_ctrl,
                 .ctrlbit        = (1 << 15),
@@ -779,6 +769,20 @@ static struct clk init_clocks[] = {
         }
 };
 
+static struct clk clk_pdma0 = {
+        .name           = "dma",
+        .devname        = "dma-pl330.0",
+        .enable         = exynos4_clk_ip_fsys_ctrl,
+        .ctrlbit        = (1 << 0),
+};
+
+static struct clk clk_pdma1 = {
+        .name           = "dma",
+        .devname        = "dma-pl330.1",
+        .enable         = exynos4_clk_ip_fsys_ctrl,
+        .ctrlbit        = (1 << 1),
+};
+
 struct clk *clkset_group_list[] = {
         [0] = &clk_ext_xtal_mux,
         [1] = &clk_xusbxti,
@@ -1010,46 +1014,6 @@ static struct clksrc_clk clk_dout_mmc4 = {
 
 static struct clksrc_clk clksrcs[] = {
         {
-                .clk    = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.0",
-                        .enable         = exynos4_clksrc_mask_peril0_ctrl,
-                        .ctrlbit        = (1 << 0),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 0, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 0, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.1",
-                        .enable         = exynos4_clksrc_mask_peril0_ctrl,
-                        .ctrlbit        = (1 << 4),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 4, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 4, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.2",
-                        .enable         = exynos4_clksrc_mask_peril0_ctrl,
-                        .ctrlbit        = (1 << 8),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 8, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 8, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.3",
-                        .enable         = exynos4_clksrc_mask_peril0_ctrl,
-                        .ctrlbit        = (1 << 12),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 12, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 12, .size = 4 },
-        }, {
                 .clk            = {
                         .name           = "sclk_pwm",
                         .enable         = exynos4_clksrc_mask_peril0_ctrl,
@@ -1148,36 +1112,6 @@ static struct clksrc_clk clksrcs[] = {
                 .reg_div = { .reg = S5P_CLKDIV_LCD0, .shift = 0, .size = 4 },
         }, {
                 .clk            = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.0",
-                        .enable         = exynos4_clksrc_mask_peril1_ctrl,
-                        .ctrlbit        = (1 << 16),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 16, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 0, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.1",
-                        .enable         = exynos4_clksrc_mask_peril1_ctrl,
-                        .ctrlbit        = (1 << 20),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 20, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 16, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.2",
-                        .enable         = exynos4_clksrc_mask_peril1_ctrl,
-                        .ctrlbit        = (1 << 24),
-                },
-                .sources = &clkset_group,
-                .reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 24, .size = 4 },
-                .reg_div = { .reg = S5P_CLKDIV_PERIL2, .shift = 0, .size = 4 },
-        }, {
-                .clk            = {
                         .name           = "sclk_fimg2d",
                 },
                 .sources = &clkset_mout_g2d,
@@ -1193,42 +1127,6 @@ static struct clksrc_clk clksrcs[] = {
                 .reg_div = { .reg = S5P_CLKDIV_MFC, .shift = 0, .size = 4 },
         }, {
                 .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.0",
-                        .parent         = &clk_dout_mmc0.clk,
-                        .enable         = exynos4_clksrc_mask_fsys_ctrl,
-                        .ctrlbit        = (1 << 0),
-                },
-                .reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 8, .size = 8 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.1",
-                        .parent         = &clk_dout_mmc1.clk,
-                        .enable         = exynos4_clksrc_mask_fsys_ctrl,
-                        .ctrlbit        = (1 << 4),
-                },
-                .reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 24, .size = 8 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.2",
-                        .parent         = &clk_dout_mmc2.clk,
-                        .enable         = exynos4_clksrc_mask_fsys_ctrl,
-                        .ctrlbit        = (1 << 8),
-                },
-                .reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 8, .size = 8 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.3",
-                        .parent         = &clk_dout_mmc3.clk,
-                        .enable         = exynos4_clksrc_mask_fsys_ctrl,
-                        .ctrlbit        = (1 << 12),
-                },
-                .reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 24, .size = 8 },
-        }, {
-                .clk            = {
                         .name           = "sclk_dwmmc",
                         .parent         = &clk_dout_mmc4.clk,
                         .enable         = exynos4_clksrc_mask_fsys_ctrl,
@@ -1238,6 +1136,134 @@ static struct clksrc_clk clksrcs[] = {
         }
 };
 
+static struct clksrc_clk clk_sclk_uart0 = {
+        .clk    = {
+                .name           = "uclk1",
+                .devname        = "exynos4210-uart.0",
+                .enable         = exynos4_clksrc_mask_peril0_ctrl,
+                .ctrlbit        = (1 << 0),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 0, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uart1 = {
+        .clk            = {
+                .name           = "uclk1",
+                .devname        = "exynos4210-uart.1",
+                .enable         = exynos4_clksrc_mask_peril0_ctrl,
+                .ctrlbit        = (1 << 4),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 4, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uart2 = {
+        .clk            = {
+                .name           = "uclk1",
+                .devname        = "exynos4210-uart.2",
+                .enable         = exynos4_clksrc_mask_peril0_ctrl,
+                .ctrlbit        = (1 << 8),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 8, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 8, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uart3 = {
+        .clk            = {
+                .name           = "uclk1",
+                .devname        = "exynos4210-uart.3",
+                .enable         = exynos4_clksrc_mask_peril0_ctrl,
+                .ctrlbit        = (1 << 12),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL0, .shift = 12, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 12, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc0 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.0",
+                .parent         = &clk_dout_mmc0.clk,
+                .enable         = exynos4_clksrc_mask_fsys_ctrl,
+                .ctrlbit        = (1 << 0),
+        },
+        .reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 8, .size = 8 },
+};
+
+static struct clksrc_clk clk_sclk_mmc1 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.1",
+                .parent         = &clk_dout_mmc1.clk,
+                .enable         = exynos4_clksrc_mask_fsys_ctrl,
+                .ctrlbit        = (1 << 4),
+        },
+        .reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 24, .size = 8 },
+};
+
+static struct clksrc_clk clk_sclk_mmc2 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.2",
+                .parent         = &clk_dout_mmc2.clk,
+                .enable         = exynos4_clksrc_mask_fsys_ctrl,
+                .ctrlbit        = (1 << 8),
+        },
+        .reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 8, .size = 8 },
+};
+
+static struct clksrc_clk clk_sclk_mmc3 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.3",
+                .parent         = &clk_dout_mmc3.clk,
+                .enable         = exynos4_clksrc_mask_fsys_ctrl,
+                .ctrlbit        = (1 << 12),
+        },
+        .reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 24, .size = 8 },
+};
+
+static struct clksrc_clk clk_sclk_spi0 = {
+        .clk            = {
+                .name           = "sclk_spi",
+                .devname                = "s3c64xx-spi.0",
+                .enable         = exynos4_clksrc_mask_peril1_ctrl,
+                .ctrlbit                = (1 << 16),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 16, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi1 = {
+        .clk            = {
+                .name           = "sclk_spi",
+                .devname                = "s3c64xx-spi.1",
+                .enable         = exynos4_clksrc_mask_peril1_ctrl,
+                .ctrlbit                = (1 << 20),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 20, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL1, .shift = 16, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi2 = {
+        .clk            = {
+                .name           = "sclk_spi",
+                .devname                = "s3c64xx-spi.2",
+                .enable         = exynos4_clksrc_mask_peril1_ctrl,
+                .ctrlbit                = (1 << 24),
+        },
+        .sources = &clkset_group,
+        .reg_src = { .reg = S5P_CLKSRC_PERIL1, .shift = 24, .size = 4 },
+        .reg_div = { .reg = S5P_CLKDIV_PERIL2, .shift = 0, .size = 4 },
+};
+
 /* Clock initialization code */
 static struct clksrc_clk *sysclks[] = {
         &clk_mout_apll,
@@ -1272,6 +1298,42 @@ static struct clksrc_clk *sysclks[] = {
         &clk_mout_mfc1,
 };
 
+static struct clk *clk_cdev[] = {
+        &clk_pdma0,
+        &clk_pdma1,
+};
+
+static struct clksrc_clk *clksrc_cdev[] = {
+        &clk_sclk_uart0,
+        &clk_sclk_uart1,
+        &clk_sclk_uart2,
+        &clk_sclk_uart3,
+        &clk_sclk_mmc0,
+        &clk_sclk_mmc1,
+        &clk_sclk_mmc2,
+        &clk_sclk_mmc3,
+        &clk_sclk_spi0,
+        &clk_sclk_spi1,
+        &clk_sclk_spi2,
+
+};
+
+static struct clk_lookup exynos4_clk_lookup[] = {
+        CLKDEV_INIT("exynos4210-uart.0", "clk_uart_baud0", &clk_sclk_uart0.clk),
+        CLKDEV_INIT("exynos4210-uart.1", "clk_uart_baud0", &clk_sclk_uart1.clk),
+        CLKDEV_INIT("exynos4210-uart.2", "clk_uart_baud0", &clk_sclk_uart2.clk),
+        CLKDEV_INIT("exynos4210-uart.3", "clk_uart_baud0", &clk_sclk_uart3.clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
+        CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
+        CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),
+        CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk0", &clk_sclk_spi0.clk),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk0", &clk_sclk_spi1.clk),
+        CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk0", &clk_sclk_spi2.clk),
+};
+
 static int xtal_rate;
 
 static unsigned long exynos4_fout_apll_get_rate(struct clk *clk)
@@ -1479,11 +1541,19 @@ void __init exynos4_register_clocks(void)
         for (ptr = 0; ptr < ARRAY_SIZE(sclk_tv); ptr++)
                 s3c_register_clksrc(sclk_tv[ptr], 1);
 
+        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
+                s3c_register_clksrc(clksrc_cdev[ptr], 1);
+
         s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
         s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
 
+        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
+        for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
+                s3c_disable_clocks(clk_cdev[ptr], 1);
+
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+        clkdev_add_table(exynos4_clk_lookup, ARRAY_SIZE(exynos4_clk_lookup));
 
         register_syscore_ops(&exynos4_clock_syscore_ops);
         s3c24xx_register_clock(&dummy_apb_pclk);
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index b6ac6ee658c0..c59e18871006 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -17,8 +17,11 @@
 #include <linux/gpio.h>
 #include <linux/sched.h>
 #include <linux/serial_core.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
 
 #include <asm/proc-fns.h>
+#include <asm/exception.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/hardware/gic.h>
 #include <asm/mach/map.h>
@@ -43,8 +46,6 @@
 
 #include "common.h"
 
-unsigned int gic_bank_offset __read_mostly;
-
 static const char name_exynos4210[] = "EXYNOS4210";
 static const char name_exynos4212[] = "EXYNOS4212";
 static const char name_exynos4412[] = "EXYNOS4412";
@@ -386,27 +387,26 @@ static void __init combiner_init(unsigned int combiner_nr, void __iomem *base,
         }
 }
 
-static void exynos4_gic_irq_fix_base(struct irq_data *d)
-{
-        struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);
-
-        gic_data->cpu_base = S5P_VA_GIC_CPU +
-                            (gic_bank_offset * smp_processor_id());
-
-        gic_data->dist_base = S5P_VA_GIC_DIST +
-                            (gic_bank_offset * smp_processor_id());
-}
+#ifdef CONFIG_OF
+static const struct of_device_id exynos4_dt_irq_match[] = {
+        { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
+        {},
+};
+#endif
 
 void __init exynos4_init_irq(void)
 {
         int irq;
+        unsigned int gic_bank_offset;
 
         gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
 
-        gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
-        gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
-        gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
-        gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
+        if (!of_have_populated_dt())
+                gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+#ifdef CONFIG_OF
+        else
+                of_irq_init(exynos4_dt_irq_match);
+#endif
 
         for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
 
@@ -474,15 +474,6 @@ int __init exynos_init(void)
         return device_register(&exynos4_dev);
 }
 
-static struct s3c24xx_uart_clksrc exynos4_serial_clocks[] = {
-        [0] = {
-                .name           = "uclk1",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-};
-
 /* uart registration process */
 
 void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no)
@@ -490,16 +481,10 @@ void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no)
         struct s3c2410_uartcfg *tcfg = cfg;
         u32 ucnt;
 
-        for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
-                if (!tcfg->clocks) {
-                        tcfg->has_fracval = 1;
-                        tcfg->clocks = exynos4_serial_clocks;
-                        tcfg->clocks_size = ARRAY_SIZE(exynos4_serial_clocks);
-                }
-                tcfg->flags |= NO_NEED_CHECK_CLKSRC;
-        }
+        for (ucnt = 0; ucnt < no; ucnt++, tcfg++)
+                tcfg->has_fracval = 1;
 
-        s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
+        s3c24xx_init_uartdevs("exynos4210-uart", s5p_uart_resources, cfg, no);
 }
 
 static DEFINE_SPINLOCK(eint_lock);
diff --git a/arch/arm/mach-exynos/dev-ohci.c b/arch/arm/mach-exynos/dev-ohci.c
new file mode 100644
index 000000000000..b8e75300c77d
--- /dev/null
+++ b/arch/arm/mach-exynos/dev-ohci.c
@@ -0,0 +1,52 @@
+/* linux/arch/arm/mach-exynos/dev-ohci.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * EXYNOS - OHCI support
+ *
+ * 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.
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/platform_device.h>
+
+#include <mach/irqs.h>
+#include <mach/map.h>
+#include <mach/ohci.h>
+
+#include <plat/devs.h>
+#include <plat/usb-phy.h>
+
+static struct resource exynos4_ohci_resource[] = {
+        [0] = DEFINE_RES_MEM(EXYNOS4_PA_OHCI, SZ_256),
+        [1] = DEFINE_RES_IRQ(IRQ_USB_HOST),
+};
+
+static u64 exynos4_ohci_dma_mask = DMA_BIT_MASK(32);
+
+struct platform_device exynos4_device_ohci = {
+        .name           = "exynos-ohci",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(exynos4_ohci_resource),
+        .resource       = exynos4_ohci_resource,
+        .dev            = {
+                .dma_mask               = &exynos4_ohci_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        }
+};
+
+void __init exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd)
+{
+        struct exynos4_ohci_platdata *npd;
+
+        npd = s3c_set_platdata(pd, sizeof(struct exynos4_ohci_platdata),
+                        &exynos4_device_ohci);
+
+        if (!npd->phy_init)
+                npd->phy_init = s5p_usb_phy_init;
+        if (!npd->phy_exit)
+                npd->phy_exit = s5p_usb_phy_exit;
+}
diff --git a/arch/arm/mach-exynos/dma.c b/arch/arm/mach-exynos/dma.c
index 9667c61e64fb..b10fcd270f07 100644
--- a/arch/arm/mach-exynos/dma.c
+++ b/arch/arm/mach-exynos/dma.c
@@ -24,6 +24,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/pl330.h>
+#include <linux/of.h>
 
 #include <asm/irq.h>
 #include <plat/devs.h>
@@ -35,95 +36,42 @@
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
-struct dma_pl330_peri pdma0_peri[28] = {
-        {
-                .peri_id = (u8)DMACH_PCM0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ0,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ2,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0S_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART4_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART4_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS4_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS4_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_AC97_MICIN,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_AC97_PCMIN,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_AC97_PCMOUT,
-                .rqtype = MEMTODEV,
-        },
+u8 pdma0_peri[] = {
+        DMACH_PCM0_RX,
+        DMACH_PCM0_TX,
+        DMACH_PCM2_RX,
+        DMACH_PCM2_TX,
+        DMACH_MSM_REQ0,
+        DMACH_MSM_REQ2,
+        DMACH_SPI0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI2_RX,
+        DMACH_SPI2_TX,
+        DMACH_I2S0S_TX,
+        DMACH_I2S0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S2_RX,
+        DMACH_I2S2_TX,
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART4_RX,
+        DMACH_UART4_TX,
+        DMACH_SLIMBUS0_RX,
+        DMACH_SLIMBUS0_TX,
+        DMACH_SLIMBUS2_RX,
+        DMACH_SLIMBUS2_TX,
+        DMACH_SLIMBUS4_RX,
+        DMACH_SLIMBUS4_TX,
+        DMACH_AC97_MICIN,
+        DMACH_AC97_PCMIN,
+        DMACH_AC97_PCMOUT,
 };
 
 struct dma_pl330_platdata exynos4_pdma0_pdata = {
         .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-        .peri = pdma0_peri,
+        .peri_id = pdma0_peri,
 };
 
 struct amba_device exynos4_device_pdma0 = {
@@ -142,86 +90,37 @@ struct amba_device exynos4_device_pdma0 = {
         .periphid = 0x00041330,
 };
 
-struct dma_pl330_peri pdma1_peri[25] = {
-        {
-                .peri_id = (u8)DMACH_PCM0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ1,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ3,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0S_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS5_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SLIMBUS5_TX,
-                .rqtype = MEMTODEV,
-        },
+u8 pdma1_peri[] = {
+        DMACH_PCM0_RX,
+        DMACH_PCM0_TX,
+        DMACH_PCM1_RX,
+        DMACH_PCM1_TX,
+        DMACH_MSM_REQ1,
+        DMACH_MSM_REQ3,
+        DMACH_SPI1_RX,
+        DMACH_SPI1_TX,
+        DMACH_I2S0S_TX,
+        DMACH_I2S0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S1_RX,
+        DMACH_I2S1_TX,
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_SLIMBUS1_RX,
+        DMACH_SLIMBUS1_TX,
+        DMACH_SLIMBUS3_RX,
+        DMACH_SLIMBUS3_TX,
+        DMACH_SLIMBUS5_RX,
+        DMACH_SLIMBUS5_TX,
 };
 
 struct dma_pl330_platdata exynos4_pdma1_pdata = {
         .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
-        .peri = pdma1_peri,
+        .peri_id = pdma1_peri,
 };
 
 struct amba_device exynos4_device_pdma1 = {
@@ -242,7 +141,15 @@ struct amba_device exynos4_device_pdma1 = {
 
 static int __init exynos4_dma_init(void)
 {
+        if (of_have_populated_dt())
+                return 0;
+
+        dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask);
+        dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask);
         amba_device_register(&exynos4_device_pdma0, &iomem_resource);
+
+        dma_cap_set(DMA_SLAVE, exynos4_pdma1_pdata.cap_mask);
+        dma_cap_set(DMA_CYCLIC, exynos4_pdma1_pdata.cap_mask);
         amba_device_register(&exynos4_device_pdma1, &iomem_resource);
 
         return 0;
diff --git a/arch/arm/mach-exynos/include/mach/irqs.h b/arch/arm/mach-exynos/include/mach/irqs.h
index dfd4b7eecb90..f77bce04789a 100644
--- a/arch/arm/mach-exynos/include/mach/irqs.h
+++ b/arch/arm/mach-exynos/include/mach/irqs.h
@@ -17,13 +17,13 @@
 
 /* PPI: Private Peripheral Interrupt */
 
-#define IRQ_PPI(x)              S5P_IRQ(x+16)
+#define IRQ_PPI(x)              (x+16)
 
 #define IRQ_MCT_LOCALTIMER      IRQ_PPI(12)
 
 /* SPI: Shared Peripheral Interrupt */
 
-#define IRQ_SPI(x)              S5P_IRQ(x+32)
+#define IRQ_SPI(x)              (x+32)
 
 #define IRQ_EINT0               IRQ_SPI(16)
 #define IRQ_EINT1               IRQ_SPI(17)
@@ -72,6 +72,9 @@
 #define IRQ_IIC5                IRQ_SPI(63)
 #define IRQ_IIC6                IRQ_SPI(64)
 #define IRQ_IIC7                IRQ_SPI(65)
+#define IRQ_SPI0                IRQ_SPI(66)
+#define IRQ_SPI1                IRQ_SPI(67)
+#define IRQ_SPI2                IRQ_SPI(68)
 
 #define IRQ_USB_HOST            IRQ_SPI(70)
 #define IRQ_USB_HSOTG           IRQ_SPI(71)
@@ -163,7 +166,9 @@
 #define IRQ_GPIO2_NR_GROUPS     9
 #define IRQ_GPIO_END            (S5P_GPIOINT_BASE + S5P_GPIOINT_COUNT)
 
+#define IRQ_TIMER_BASE          (IRQ_GPIO_END + 64)
+
 /* Set the default NR_IRQS */
-#define NR_IRQS                 (IRQ_GPIO_END + 64)
+#define NR_IRQS                 (IRQ_TIMER_BASE + IRQ_TIMER_COUNT)
 
 #endif /* __ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index d1829860a0ec..c754a22a2bb3 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -87,6 +87,10 @@
 #define EXYNOS4_PA_SYSMMU_TV            0x12E20000
 #define EXYNOS4_PA_SYSMMU_MFC_L         0x13620000
 #define EXYNOS4_PA_SYSMMU_MFC_R         0x13630000
+#define EXYNOS4_PA_SPI0                 0x13920000
+#define EXYNOS4_PA_SPI1                 0x13930000
+#define EXYNOS4_PA_SPI2                 0x13940000
+
 
 #define EXYNOS4_PA_GPIO1                0x11400000
 #define EXYNOS4_PA_GPIO2                0x11000000
@@ -107,6 +111,7 @@
 #define EXYNOS4_PA_SROMC                0x12570000
 
 #define EXYNOS4_PA_EHCI                 0x12580000
+#define EXYNOS4_PA_OHCI                 0x12590000
 #define EXYNOS4_PA_HSPHY                0x125B0000
 #define EXYNOS4_PA_MFC                  0x13400000
 
@@ -148,6 +153,9 @@
 #define S3C_PA_RTC                      EXYNOS4_PA_RTC
 #define S3C_PA_WDT                      EXYNOS4_PA_WATCHDOG
 #define S3C_PA_UART                     EXYNOS4_PA_UART
+#define S3C_PA_SPI0                     EXYNOS4_PA_SPI0
+#define S3C_PA_SPI1                     EXYNOS4_PA_SPI1
+#define S3C_PA_SPI2                     EXYNOS4_PA_SPI2
 
 #define S5P_PA_EHCI                     EXYNOS4_PA_EHCI
 #define S5P_PA_FIMC0                    EXYNOS4_PA_FIMC0
diff --git a/arch/arm/mach-exynos/include/mach/ohci.h b/arch/arm/mach-exynos/include/mach/ohci.h
new file mode 100644
index 000000000000..c256c595be5e
--- /dev/null
+++ b/arch/arm/mach-exynos/include/mach/ohci.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ *              http://www.samsung.com/
+ *
+ * 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 __MACH_EXYNOS_OHCI_H
+#define __MACH_EXYNOS_OHCI_H
+
+struct exynos4_ohci_platdata {
+        int (*phy_init)(struct platform_device *pdev, int type);
+        int (*phy_exit)(struct platform_device *pdev, int type);
+};
+
+extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
+
+#endif /* __MACH_EXYNOS_OHCI_H */
diff --git a/arch/arm/mach-exynos/include/mach/spi-clocks.h b/arch/arm/mach-exynos/include/mach/spi-clocks.h
new file mode 100644
index 000000000000..576efdf6d091
--- /dev/null
+++ b/arch/arm/mach-exynos/include/mach/spi-clocks.h
@@ -0,0 +1,16 @@
+/* linux/arch/arm/mach-exynos4/include/mach/spi-clocks.h
+ *
+ * Copyright (C) 2011 Samsung Electronics Co. Ltd.
+ *
+ * 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.
+ */
+
+#ifndef __ASM_ARCH_SPI_CLKS_H
+#define __ASM_ARCH_SPI_CLKS_H __FILE__
+
+/* Must source from SCLK_SPI */
+#define EXYNOS4_SPI_SRCCLK_SCLK         0
+
+#endif /* __ASM_ARCH_SPI_CLKS_H */
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
new file mode 100644
index 000000000000..85fa02767d67
--- /dev/null
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -0,0 +1,85 @@
+/*
+ * Samsung's Exynos4210 flattened device tree enabled machine
+ *
+ * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ * Copyright (c) 2010-2011 Linaro Ltd.
+ *              www.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.
+*/
+
+#include <linux/of_platform.h>
+#include <linux/serial_core.h>
+
+#include <asm/mach/arch.h>
+#include <mach/map.h>
+
+#include <plat/cpu.h>
+#include <plat/regs-serial.h>
+#include <plat/exynos4.h>
+
+/*
+ * The following lookup table is used to override device names when devices
+ * are registered from device tree. This is temporarily added to enable
+ * device tree support addition for the Exynos4 architecture.
+ *
+ * For drivers that require platform data to be provided from the machine
+ * file, a platform data pointer can also be supplied along with the
+ * devices names. Usually, the platform data elements that cannot be parsed
+ * from the device tree by the drivers (example: function pointers) are
+ * supplied. But it should be noted that this is a temporary mechanism and
+ * at some point, the drivers should be capable of parsing all the platform
+ * data from the device tree.
+ */
+static const struct of_dev_auxdata exynos4210_auxdata_lookup[] __initconst = {
+        OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART0,
+                                "exynos4210-uart.0", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART1,
+                                "exynos4210-uart.1", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART2,
+                                "exynos4210-uart.2", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-uart", S5P_PA_UART3,
+                                "exynos4210-uart.3", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0),
+                                "exynos4-sdhci.0", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(1),
+                                "exynos4-sdhci.1", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(2),
+                                "exynos4-sdhci.2", NULL),
+        OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(3),
+                                "exynos4-sdhci.3", NULL),
+        OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(0),
+                                "s3c2440-i2c.0", NULL),
+        OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),
+        OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),
+        {},
+};
+
+static void __init exynos4210_dt_map_io(void)
+{
+        s5p_init_io(NULL, 0, S5P_VA_CHIPID);
+        s3c24xx_init_clocks(24000000);
+}
+
+static void __init exynos4210_dt_machine_init(void)
+{
+        of_platform_populate(NULL, of_default_bus_match_table,
+                                exynos4210_auxdata_lookup, NULL);
+}
+
+static char const *exynos4210_dt_compat[] __initdata = {
+        "samsung,exynos4210",
+        NULL
+};
+
+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,
+        .init_machine   = exynos4210_dt_machine_init,
+        .timer          = &exynos4_timer,
+        .dt_compat      = exynos4210_dt_compat,
+MACHINE_END
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c
index 635fb97e31ab..b895ec031105 100644
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@ -249,13 +249,8 @@ static void nuri_lcd_power_on(struct plat_lcd_data *pd, unsigned int power)
 
 static int nuri_bl_init(struct device *dev)
 {
-        int ret, gpio = EXYNOS4_GPE2(3);
-
-        ret = gpio_request(gpio, "LCD_LDO_EN");
-        if (!ret)
-                gpio_direction_output(gpio, 0);
-
-        return ret;
+        return gpio_request_one(EXYNOS4_GPE2(3), GPIOF_OUT_INIT_LOW,
+                                "LCD_LD0_EN");
 }
 
 static int nuri_bl_notify(struct device *dev, int brightness)
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c
index 586eb995aa96..2b11e046d391 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -41,6 +41,7 @@
 #include <plat/fb.h>
 #include <plat/mfc.h>
 
+#include <mach/ohci.h>
 #include <mach/map.h>
 
 #include "common.h"
@@ -485,6 +486,16 @@ static void __init origen_ehci_init(void)
         s5p_ehci_set_platdata(pdata);
 }
 
+/* USB OHCI */
+static struct exynos4_ohci_platdata origen_ohci_pdata;
+
+static void __init origen_ohci_init(void)
+{
+        struct exynos4_ohci_platdata *pdata = &origen_ohci_pdata;
+
+        exynos4_ohci_set_platdata(pdata);
+}
+
 static struct gpio_keys_button origen_gpio_keys_table[] = {
         {
                 .code                   = KEY_MENU,
@@ -608,6 +619,7 @@ static struct platform_device *origen_devices[] __initdata = {
         &s5p_device_mfc_l,
         &s5p_device_mfc_r,
         &s5p_device_mixer,
+        &exynos4_device_ohci,
         &exynos4_device_pd[PD_LCD0],
         &exynos4_device_pd[PD_TV],
         &exynos4_device_pd[PD_G3D],
@@ -672,6 +684,7 @@ static void __init origen_machine_init(void)
         s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata);
 
         origen_ehci_init();
+        origen_ohci_init();
         clk_xusbxti.rate = 24000000;
 
         s5p_tv_setup();
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 5b365613b470..b2c5557f50e4 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -42,6 +42,7 @@
 #include <plat/clock.h>
 
 #include <mach/map.h>
+#include <mach/ohci.h>
 
 #include "common.h"
 
@@ -131,9 +132,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd,
                 gpio_free(EXYNOS4_GPD0(1));
 #endif
                 /* fire nRESET on power up */
-                gpio_request(EXYNOS4_GPX0(6), "GPX0");
-
-                gpio_direction_output(EXYNOS4_GPX0(6), 1);
+                gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0");
                 mdelay(100);
 
                 gpio_set_value(EXYNOS4_GPX0(6), 0);
@@ -247,6 +246,16 @@ static void __init smdkv310_ehci_init(void)
         s5p_ehci_set_platdata(pdata);
 }
 
+/* USB OHCI */
+static struct exynos4_ohci_platdata smdkv310_ohci_pdata;
+
+static void __init smdkv310_ohci_init(void)
+{
+        struct exynos4_ohci_platdata *pdata = &smdkv310_ohci_pdata;
+
+        exynos4_ohci_set_platdata(pdata);
+}
+
 static struct platform_device *smdkv310_devices[] __initdata = {
         &s3c_device_hsmmc0,
         &s3c_device_hsmmc1,
@@ -263,6 +272,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
         &s5p_device_fimc3,
         &exynos4_device_ac97,
         &exynos4_device_i2s0,
+        &exynos4_device_ohci,
         &samsung_device_keypad,
         &s5p_device_mfc,
         &s5p_device_mfc_l,
@@ -365,6 +375,7 @@ static void __init smdkv310_machine_init(void)
         s5p_fimd0_set_platdata(&smdkv310_lcd0_pdata);
 
         smdkv310_ehci_init();
+        smdkv310_ohci_init();
         clk_xusbxti.rate = 24000000;
 
         platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 52aea972746a..37ac93e8d6d9 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -610,8 +610,7 @@ static void __init universal_tsp_init(void)
 
         /* TSP_LDO_ON: XMDMADDR_11 */
         gpio = EXYNOS4_GPE2(3);
-        gpio_request(gpio, "TSP_LDO_ON");
-        gpio_direction_output(gpio, 1);
+        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");
         gpio_export(gpio, 0);
 
         /* TSP_INT: XMDMADDR_7 */
@@ -671,8 +670,7 @@ static void __init universal_touchkey_init(void)
         i2c_gpio12_devs[0].irq = gpio_to_irq(gpio);
 
         gpio = EXYNOS4_GPE3(3);                 /* XMDMDATA_3 */
-        gpio_request(gpio, "3_TOUCH_EN");
-        gpio_direction_output(gpio, 1);
+        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "3_TOUCH_EN");
 }
 
 static struct s3c2410_platform_i2c universal_i2c0_platdata __initdata = {
@@ -1002,9 +1000,7 @@ static void __init universal_map_io(void)
 void s5p_tv_setup(void)
 {
         /* direct HPD to HDMI chip */
-        gpio_request(EXYNOS4_GPX3(7), "hpd-plug");
-
-        gpio_direction_input(EXYNOS4_GPX3(7));
+        gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug");
         s3c_gpio_cfgpin(EXYNOS4_GPX3(7), S3C_GPIO_SFN(0x3));
         s3c_gpio_setpull(EXYNOS4_GPX3(7), S3C_GPIO_PULL_NONE);
 
diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c
index c4f792dcad19..a4f61a43c7ba 100644
--- a/arch/arm/mach-exynos/pm.c
+++ b/arch/arm/mach-exynos/pm.c
@@ -23,6 +23,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
+#include <asm/smp_scu.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
@@ -213,27 +214,6 @@ static int exynos4_pm_add(struct device *dev)
         return 0;
 }
 
-/* This function copy from linux/arch/arm/kernel/smp_scu.c */
-
-void exynos4_scu_enable(void __iomem *scu_base)
-{
-        u32 scu_ctrl;
-
-        scu_ctrl = __raw_readl(scu_base);
-        /* already enabled? */
-        if (scu_ctrl & 1)
-                return;
-
-        scu_ctrl |= 1;
-        __raw_writel(scu_ctrl, scu_base);
-
-        /*
-         * Ensure that the data accessed by CPU0 before the SCU was
-         * initialised is visible to the other CPUs.
-         */
-        flush_cache_all();
-}
-
 static unsigned long pll_base_rate;
 
 static void exynos4_restore_pll(void)
@@ -404,7 +384,7 @@ static void exynos4_pm_resume(void)
 
         exynos4_restore_pll();
 
-        exynos4_scu_enable(S5P_VA_SCU);
+        scu_enable(S5P_VA_SCU);
 
 #ifdef CONFIG_CACHE_L2X0
         s3c_pm_do_restore_core(exynos4_l2cc_save, ARRAY_SIZE(exynos4_l2cc_save));
diff --git a/arch/arm/mach-exynos/setup-sdhci.c b/arch/arm/mach-exynos/setup-sdhci.c
deleted file mode 100644
index 92937b410906..000000000000
--- a/arch/arm/mach-exynos/setup-sdhci.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* linux/arch/arm/mach-exynos4/setup-sdhci.c
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * EXYNOS4 - Helper functions for settign up SDHCI device(s) (HSMMC)
- *
- * 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.
-*/
-
-#include <linux/types.h>
-
-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
-
-char *exynos4_hsmmc_clksrcs[4] = {
-        [0] = NULL,
-        [1] = NULL,
-        [2] = "sclk_mmc",       /* mmc_bus */
-        [3] = NULL,
-};
diff --git a/arch/arm/mach-exynos/setup-spi.c b/arch/arm/mach-exynos/setup-spi.c
new file mode 100644
index 000000000000..833ff40ee0e8
--- /dev/null
+++ b/arch/arm/mach-exynos/setup-spi.c
@@ -0,0 +1,72 @@
+/* linux/arch/arm/mach-exynos4/setup-spi.c
+ *
+ * Copyright (C) 2011 Samsung Electronics Ltd.
+ *             http://www.samsung.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.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <plat/gpio-cfg.h>
+#include <plat/s3c64xx-spi.h>
+
+#ifdef CONFIG_S3C64XX_DEV_SPI0
+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {
+        .fifo_lvl_mask  = 0x1ff,
+        .rx_lvl_offset  = 15,
+        .high_speed     = 1,
+        .clk_from_cmu   = true,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgpin(EXYNOS4_GPB(0), S3C_GPIO_SFN(2));
+        s3c_gpio_setpull(EXYNOS4_GPB(0), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(EXYNOS4_GPB(2), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI1
+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 15,
+        .high_speed     = 1,
+        .clk_from_cmu   = true,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgpin(EXYNOS4_GPB(4), S3C_GPIO_SFN(2));
+        s3c_gpio_setpull(EXYNOS4_GPB(4), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(EXYNOS4_GPB(6), 2,
+                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI2
+struct s3c64xx_spi_info s3c64xx_spi2_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 15,
+        .high_speed     = 1,
+        .clk_from_cmu   = true,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi2_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgpin(EXYNOS4_GPC1(1), S3C_GPIO_SFN(5));
+        s3c_gpio_setpull(EXYNOS4_GPC1(1), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(EXYNOS4_GPC1(3), 2,
+                              S3C_GPIO_SFN(5), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c
index 39aca045f660..41743d21e8c6 100644
--- a/arch/arm/mach-exynos/setup-usb-phy.c
+++ b/arch/arm/mach-exynos/setup-usb-phy.c
@@ -19,6 +19,13 @@
 #include <plat/cpu.h>
 #include <plat/usb-phy.h>
 
+static atomic_t host_usage;
+
+static int exynos4_usb_host_phy_is_on(void)
+{
+        return (readl(EXYNOS4_PHYPWR) & PHY1_STD_ANALOG_POWERDOWN) ? 0 : 1;
+}
+
 static int exynos4_usb_phy1_init(struct platform_device *pdev)
 {
         struct clk *otg_clk;
@@ -27,6 +34,8 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev)
         u32 rstcon;
         int err;
 
+        atomic_inc(&host_usage);
+
         otg_clk = clk_get(&pdev->dev, "otg");
         if (IS_ERR(otg_clk)) {
                 dev_err(&pdev->dev, "Failed to get otg clock\n");
@@ -39,6 +48,9 @@ static int exynos4_usb_phy1_init(struct platform_device *pdev)
                 return err;
         }
 
+        if (exynos4_usb_host_phy_is_on())
+                return 0;
+
         writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
                         S5P_USBHOST_PHY_CONTROL);
 
@@ -95,6 +107,9 @@ static int exynos4_usb_phy1_exit(struct platform_device *pdev)
         struct clk *otg_clk;
         int err;
 
+        if (atomic_dec_return(&host_usage) > 0)
+                return 0;
+
         otg_clk = clk_get(&pdev->dev, "otg");
         if (IS_ERR(otg_clk)) {
                 dev_err(&pdev->dev, "Failed to get otg clock\n");
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 35a218cb5c7e..0e6de366c648 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -98,6 +98,7 @@ config MACH_SCB9328
 config MACH_APF9328
         bool "APF9328"
         select SOC_IMX1
+        select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
         help
           Say Yes here if you are using the Armadeus APF9328 development board
@@ -595,6 +596,7 @@ comment "i.MX6 family:"
 
 config SOC_IMX6Q
         bool "i.MX6 Quad support"
+        select ARM_CPU_SUSPEND if PM
         select ARM_GIC
         select CPU_V7
         select HAVE_ARM_SCU
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index d97f409ce98b..f5920c24f7d7 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -70,4 +70,8 @@ AFLAGS_head-v7.o :=-Wa,-march=armv7-a
 obj-$(CONFIG_SMP) += platsmp.o
 obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
 obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
-obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o pm-imx6q.o
+obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o
+
+ifeq ($(CONFIG_PM),y)
+obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o
+endif
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index cfede5768aa0..5f4d06af4912 100644
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -25,3 +25,6 @@ initrd_phys-$(CONFIG_SOC_IMX35)	:= 0x80800000
 zreladdr-$(CONFIG_SOC_IMX6Q)    += 0x10008000
 params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
 initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000
+
+dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \
+                           imx6q-sabrelite.dtb
diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S
index 6229efbc70cb..7e49deb128a4 100644
--- a/arch/arm/mach-imx/head-v7.S
+++ b/arch/arm/mach-imx/head-v7.S
@@ -16,7 +16,6 @@
 #include <asm/hardware/cache-l2x0.h>
 
         .section ".text.head", "ax"
-        __CPUINIT
 
 /*
  * The secondary kernel init calls v7_flush_dcache_all before it enables
@@ -33,6 +32,7 @@
  */
 ENTRY(v7_invalidate_l1)
         mov     r0, #0
+        mcr     p15, 0, r0, c7, c5, 0   @ invalidate I cache
         mcr     p15, 2, r0, c0, c0, 0
         mrc     p15, 1, r0, c0, c0, 0
 
@@ -71,6 +71,7 @@ ENTRY(v7_secondary_startup)
 ENDPROC(v7_secondary_startup)
 #endif
 
+#ifdef CONFIG_PM
 /*
  * The following code is located into the .data section.  This is to
  * allow phys_l2x0_saved_regs to be accessed with a relative load
@@ -79,6 +80,7 @@ ENDPROC(v7_secondary_startup)
         .data
         .align
 
+#ifdef CONFIG_CACHE_L2X0
         .macro  pl310_resume
         ldr     r2, phys_l2x0_saved_regs
         ldr     r0, [r2, #L2X0_R_PHY_BASE]      @ get physical base of l2x0
@@ -88,12 +90,17 @@ ENDPROC(v7_secondary_startup)
         str     r1, [r0, #L2X0_CTRL]            @ re-enable L2
         .endm
 
+        .globl  phys_l2x0_saved_regs
+phys_l2x0_saved_regs:
+        .long   0
+#else
+        .macro  pl310_resume
+        .endm
+#endif
+
 ENTRY(v7_cpu_resume)
         bl      v7_invalidate_l1
         pl310_resume
         b       cpu_resume
 ENDPROC(v7_cpu_resume)
-
-        .globl  phys_l2x0_saved_regs
-phys_l2x0_saved_regs:
-        .long   0
+#endif
diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c
index 146a4f073464..f4a63ee9e217 100644
--- a/arch/arm/mach-imx/mach-apf9328.c
+++ b/arch/arm/mach-imx/mach-apf9328.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/dm9000.h>
+#include <linux/i2c.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -41,6 +42,9 @@ static const int apf9328_pins[] __initconst = {
         PB29_PF_UART2_RTS,
         PB30_PF_UART2_TXD,
         PB31_PF_UART2_RXD,
+        /* I2C */
+        PA15_PF_I2C_SDA,
+        PA16_PF_I2C_SCL,
 };
 
 /*
@@ -103,6 +107,10 @@ static const struct imxuart_platform_data uart1_pdata __initconst = {
         .flags = IMXUART_HAVE_RTSCTS,
 };
 
+static const struct imxi2c_platform_data apf9328_i2c_data __initconst = {
+        .bitrate = 100000,
+};
+
 static struct platform_device *devices[] __initdata = {
         &apf9328_flash_device,
         &dm9000x_device,
@@ -119,6 +127,8 @@ static void __init apf9328_init(void)
         imx1_add_imx_uart0(NULL);
         imx1_add_imx_uart1(&uart1_pdata);
 
+        imx1_add_imx_i2c(&apf9328_i2c_data);
+
         platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 05b49bb5d677..c25728106917 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -19,6 +19,8 @@
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/phy.h>
+#include <linux/micrel_phy.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/hardware/gic.h>
 #include <asm/mach/arch.h>
@@ -56,8 +58,27 @@ soft:
         soft_restart(0);
 }
 
+/* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */
+static int ksz9021rn_phy_fixup(struct phy_device *phydev)
+{
+        /* min rx data delay */
+        phy_write(phydev, 0x0b, 0x8105);
+        phy_write(phydev, 0x0c, 0x0000);
+
+        /* max rx/tx clock delay, min rx/tx control delay */
+        phy_write(phydev, 0x0b, 0x8104);
+        phy_write(phydev, 0x0c, 0xf0f0);
+        phy_write(phydev, 0x0b, 0x104);
+
+        return 0;
+}
+
 static void __init imx6q_init_machine(void)
 {
+        if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
+                phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
+                                           ksz9021rn_phy_fixup);
+
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         imx6q_pm_init();
@@ -105,7 +126,8 @@ static struct sys_timer imx6q_timer = {
 };
 
 static const char *imx6q_dt_compat[] __initdata = {
-        "fsl,imx6q-sabreauto",
+        "fsl,imx6q-arm2",
+        "fsl,imx6q-sabrelite",
         NULL,
 };
 
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 2b565c381347..89c33258639f 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -492,7 +492,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {
                 .regulators = mx31_3ds_regulators,
                 .num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
         },
-        .flags  = MC13XXX_USE_TOUCHSCREEN,
+        .flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
 };
 
 /* SPI */
diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c
index f20f191d7cca..f7b0c2b1b905 100644
--- a/arch/arm/mach-imx/pm-imx6q.c
+++ b/arch/arm/mach-imx/pm-imx6q.c
@@ -64,7 +64,9 @@ void __init imx6q_pm_init(void)
          * address of the data structure used by l2x0 core to save registers,
          * and later restore the necessary ones in imx6q resume entry.
          */
+#ifdef CONFIG_CACHE_L2X0
         phys_l2x0_saved_regs = __pa(&l2x0_saved_regs);
+#endif
 
         suspend_set_ops(&imx6q_pm_ops);
 }
diff --git a/arch/arm/mach-kirkwood/addr-map.c b/arch/arm/mach-kirkwood/addr-map.c
index 8d03bcef5182..e9a7180863d9 100644
--- a/arch/arm/mach-kirkwood/addr-map.c
+++ b/arch/arm/mach-kirkwood/addr-map.c
@@ -13,12 +13,12 @@
 #include <linux/mbus.h>
 #include <linux/io.h>
 #include <mach/hardware.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*
  * Generic Address Decode Windows bit settings
  */
-#define TARGET_DDR              0
 #define TARGET_DEV_BUS          1
 #define TARGET_SRAM             3
 #define TARGET_PCIE             4
@@ -36,118 +36,55 @@
 #define ATTR_SRAM               0x01
 
 /*
- * Helpers to get DDR bank info
+ * Description of the windows needed by the platform code
  */
-#define DDR_BASE_CS_OFF(n)      (0x0000 + ((n) << 3))
-#define DDR_SIZE_CS_OFF(n)      (0x0004 + ((n) << 3))
-
-/*
- * CPU Address Decode Windows registers
- */
-#define WIN_OFF(n)              (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4))
-#define WIN_CTRL_OFF            0x0000
-#define WIN_BASE_OFF            0x0004
-#define WIN_REMAP_LO_OFF        0x0008
-#define WIN_REMAP_HI_OFF        0x000c
-
-
-struct mbus_dram_target_info kirkwood_mbus_dram_info;
-
-static int __init cpu_win_can_remap(int win)
-{
-        if (win < 4)
-                return 1;
-
-        return 0;
-}
-
-static void __init setup_cpu_win(int win, u32 base, u32 size,
-                                 u8 target, u8 attr, int remap)
-{
-        void __iomem *addr = (void __iomem *)WIN_OFF(win);
-        u32 ctrl;
-
-        base &= 0xffff0000;
-        ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1;
-
-        writel(base, addr + WIN_BASE_OFF);
-        writel(ctrl, addr + WIN_CTRL_OFF);
-        if (cpu_win_can_remap(win)) {
-                if (remap < 0)
-                        remap = base;
-
-                writel(remap & 0xffff0000, addr + WIN_REMAP_LO_OFF);
-                writel(0, addr + WIN_REMAP_HI_OFF);
-        }
-}
-
-void __init kirkwood_setup_cpu_mbus(void)
-{
-        void __iomem *addr;
-        int i;
-        int cs;
+static struct __initdata orion_addr_map_cfg addr_map_cfg = {
+        .num_wins = 8,
+        .remappable_wins = 4,
+        .bridge_virt_base = BRIDGE_VIRT_BASE,
+};
 
+static const struct __initdata orion_addr_map_info addr_map_info[] = {
         /*
-         * First, disable and clear windows.
+         * Windows for PCIe IO+MEM space.
          */
-        for (i = 0; i < 8; i++) {
-                addr = (void __iomem *)WIN_OFF(i);
-
-                writel(0, addr + WIN_BASE_OFF);
-                writel(0, addr + WIN_CTRL_OFF);
-                if (cpu_win_can_remap(i)) {
-                        writel(0, addr + WIN_REMAP_LO_OFF);
-                        writel(0, addr + WIN_REMAP_HI_OFF);
-                }
-        }
-
+        { 0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE,
+          TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE
+        },
+        { 1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE,
+          TARGET_PCIE, ATTR_PCIE_MEM, KIRKWOOD_PCIE_MEM_BUS_BASE
+        },
+        { 2, KIRKWOOD_PCIE1_IO_PHYS_BASE, KIRKWOOD_PCIE1_IO_SIZE,
+          TARGET_PCIE, ATTR_PCIE1_IO, KIRKWOOD_PCIE1_IO_BUS_BASE
+        },
+        { 3, KIRKWOOD_PCIE1_MEM_PHYS_BASE, KIRKWOOD_PCIE1_MEM_SIZE,
+          TARGET_PCIE, ATTR_PCIE1_MEM, KIRKWOOD_PCIE1_MEM_BUS_BASE
+        },
         /*
-         * Setup windows for PCIe IO+MEM space.
+         * Window for NAND controller.
          */
-        setup_cpu_win(0, KIRKWOOD_PCIE_IO_PHYS_BASE, KIRKWOOD_PCIE_IO_SIZE,
-                      TARGET_PCIE, ATTR_PCIE_IO, KIRKWOOD_PCIE_IO_BUS_BASE);
-        setup_cpu_win(1, KIRKWOOD_PCIE_MEM_PHYS_BASE, KIRKWOOD_PCIE_MEM_SIZE,
-                      TARGET_PCIE, ATTR_PCIE_MEM, KIRKWOOD_PCIE_MEM_BUS_BASE);
-        setup_cpu_win(2, KIRKWOOD_PCIE1_IO_PHYS_BASE, KIRKWOOD_PCIE1_IO_SIZE,
-                      TARGET_PCIE, ATTR_PCIE1_IO, KIRKWOOD_PCIE1_IO_BUS_BASE);
-        setup_cpu_win(3, KIRKWOOD_PCIE1_MEM_PHYS_BASE, KIRKWOOD_PCIE1_MEM_SIZE,
-                      TARGET_PCIE, ATTR_PCIE1_MEM, KIRKWOOD_PCIE1_MEM_BUS_BASE);
-
+        { 4, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE,
+          TARGET_DEV_BUS, ATTR_DEV_NAND, -1
+        },
         /*
-         * Setup window for NAND controller.
+         * Window for SRAM.
          */
-        setup_cpu_win(4, KIRKWOOD_NAND_MEM_PHYS_BASE, KIRKWOOD_NAND_MEM_SIZE,
-                      TARGET_DEV_BUS, ATTR_DEV_NAND, -1);
+        { 5, KIRKWOOD_SRAM_PHYS_BASE, KIRKWOOD_SRAM_SIZE,
+          TARGET_SRAM, ATTR_SRAM, -1
+        },
+        /* End marker */
+        { -1, 0, 0, 0, 0, 0 }
+};
 
+void __init kirkwood_setup_cpu_mbus(void)
+{
         /*
-         * Setup window for SRAM.
+         * Disable, clear and configure windows.
          */
-        setup_cpu_win(5, KIRKWOOD_SRAM_PHYS_BASE, KIRKWOOD_SRAM_SIZE,
-                      TARGET_SRAM, ATTR_SRAM, -1);
+        orion_config_wins(&addr_map_cfg, addr_map_info);
 
         /*
          * Setup MBUS dram target info.
          */
-        kirkwood_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
-
-        addr = (void __iomem *)DDR_WINDOW_CPU_BASE;
-
-        for (i = 0, cs = 0; i < 4; i++) {
-                u32 base = readl(addr + DDR_BASE_CS_OFF(i));
-                u32 size = readl(addr + DDR_SIZE_CS_OFF(i));
-
-                /*
-                 * Chip select enabled?
-                 */
-                if (size & 1) {
-                        struct mbus_dram_window *w;
-
-                        w = &kirkwood_mbus_dram_info.cs[cs++];
-                        w->cs_index = i;
-                        w->mbus_attr = 0xf & ~(1 << i);
-                        w->base = base & 0xffff0000;
-                        w->size = (size | 0x0000ffff) + 1;
-                }
-        }
-        kirkwood_mbus_dram_info.num_cs = cs;
+        orion_setup_cpu_mbus_target(&addr_map_cfg, DDR_WINDOW_CPU_BASE);
 }
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 0bff4a916231..cc15426787b1 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
-#include <linux/mbus.h>
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
 #include <linux/dma-mapping.h>
@@ -30,6 +29,7 @@
 #include <plat/orion_nand.h>
 #include <plat/common.h>
 #include <plat/time.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*****************************************************************************
@@ -73,8 +73,7 @@ unsigned int kirkwood_clk_ctrl = CGC_DUNIT | CGC_RESERVED;
 void __init kirkwood_ehci_init(void)
 {
         kirkwood_clk_ctrl |= CGC_USB0;
-        orion_ehci_init(&kirkwood_mbus_dram_info,
-                        USB_PHYS_BASE, IRQ_KIRKWOOD_USB);
+        orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB);
 }
 
 
@@ -85,7 +84,7 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
         kirkwood_clk_ctrl |= CGC_GE0;
 
-        orion_ge00_init(eth_data, &kirkwood_mbus_dram_info,
+        orion_ge00_init(eth_data,
                         GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,
                         IRQ_KIRKWOOD_GE00_ERR, kirkwood_tclk);
 }
@@ -99,7 +98,7 @@ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
 
         kirkwood_clk_ctrl |= CGC_GE1;
 
-        orion_ge01_init(eth_data, &kirkwood_mbus_dram_info,
+        orion_ge01_init(eth_data,
                         GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
                         IRQ_KIRKWOOD_GE01_ERR, kirkwood_tclk);
 }
@@ -178,8 +177,7 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)
         if (sata_data->n_ports > 1)
                 kirkwood_clk_ctrl |= CGC_SATA1;
 
-        orion_sata_init(sata_data, &kirkwood_mbus_dram_info,
-                        SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);
+        orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);
 }
 
 
@@ -221,7 +219,6 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data)
                 mvsdio_data->clock = 100000000;
         else
                 mvsdio_data->clock = 200000000;
-        mvsdio_data->dram = &kirkwood_mbus_dram_info;
         kirkwood_clk_ctrl |= CGC_SDIO;
         kirkwood_sdio.dev.platform_data = mvsdio_data;
         platform_device_register(&kirkwood_sdio);
@@ -285,8 +282,7 @@ static void __init kirkwood_xor0_init(void)
 {
         kirkwood_clk_ctrl |= CGC_XOR0;
 
-        orion_xor0_init(&kirkwood_mbus_dram_info,
-                        XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,
+        orion_xor0_init(XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,
                         IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01);
 }
 
@@ -364,7 +360,6 @@ static struct resource kirkwood_i2s_resources[] = {
 };
 
 static struct kirkwood_asoc_platform_data kirkwood_i2s_data = {
-        .dram        = &kirkwood_mbus_dram_info,
         .burst       = 128,
 };
 
@@ -430,6 +425,8 @@ static char * __init kirkwood_id(void)
         } else if (dev == MV88F6282_DEV_ID) {
                 if (rev == MV88F6282_REV_A0)
                         return "MV88F6282-Rev-A0";
+                else if (rev == MV88F6282_REV_A1)
+                        return "MV88F6282-Rev-A1";
                 else
                         return "MV88F6282-Rev-Unsupported";
         } else {
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 1529280246d6..9071a397136d 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -30,7 +30,6 @@ void kirkwood_init(void);
 void kirkwood_init_early(void);
 void kirkwood_init_irq(void);
 
-extern struct mbus_dram_target_info kirkwood_mbus_dram_info;
 void kirkwood_setup_cpu_mbus(void);
 
 void kirkwood_enable_pcie(void);
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
index 010bdeb4ac5f..fede3d503efa 100644
--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
@@ -135,4 +135,5 @@
 
 #define MV88F6282_DEV_ID        0x6282
 #define MV88F6282_REV_A0        0
+#define MV88F6282_REV_A1        1
 #endif
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
index cc431fa22ccb..0c6ad63f10c7 100644
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
@@ -10,7 +10,6 @@
 #include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mbus.h>
 #include <linux/io.h>
 #include <mach/hardware.h>
 #include <plat/mpp.h>
diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
index ac787957e2d9..e8fda45c0736 100644
--- a/arch/arm/mach-kirkwood/mpp.h
+++ b/arch/arm/mach-kirkwood/mpp.h
@@ -102,6 +102,7 @@
 #define MPP11_SATA0_ACTn        MPP( 11, 0x5, 0, 1, 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 )
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index 74b992d810ea..fb451bfe478b 100644
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -11,12 +11,12 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/mbus.h>
 #include <video/vga.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
 #include <plat/pcie.h>
 #include <mach/bridge-regs.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 void kirkwood_enable_pcie(void)
@@ -208,7 +208,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
          */
         orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 
-        orion_pcie_setup(pp->base, &kirkwood_mbus_dram_info);
+        orion_pcie_setup(pp->base);
 
         return 1;
 }
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 3e6dfab59ef6..17cb76060125 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -120,8 +120,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(27),
-                .end    = gpio_to_irq(27),
+                .start  = MMP_GPIO_TO_IRQ(27),
+                .end    = MMP_GPIO_TO_IRQ(27),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
@@ -232,6 +232,7 @@ static void __init common_init(void)
         pxa168_add_nand(&aspenite_nand_info);
         pxa168_add_fb(&aspenite_lcd_info);
         pxa168_add_keypad(&aspenite_keypad_info);
+        platform_device_register(&pxa168_device_gpio);
 
         /* off-chip devices */
         platform_device_register(&smc91x_device);
diff --git a/arch/arm/mach-mmp/avengers_lite.c b/arch/arm/mach-mmp/avengers_lite.c
index 8de3dc6131a4..b148a9dc5a44 100644
--- a/arch/arm/mach-mmp/avengers_lite.c
+++ b/arch/arm/mach-mmp/avengers_lite.c
@@ -38,6 +38,7 @@ static void __init avengers_lite_init(void)
 
         /* on-chip devices */
         pxa168_add_uart(2);
+        platform_device_register(&pxa168_device_gpio);
 }
 
 MACHINE_START(AVENGERS_LITE, "PXA168 Avengers lite Development Platform")
diff --git a/arch/arm/mach-mmp/brownstone.c b/arch/arm/mach-mmp/brownstone.c
index e16f04b39b15..d839fe6421e6 100644
--- a/arch/arm/mach-mmp/brownstone.c
+++ b/arch/arm/mach-mmp/brownstone.c
@@ -202,6 +202,7 @@ static void __init brownstone_init(void)
         /* on-chip devices */
         mmp2_add_uart(1);
         mmp2_add_uart(3);
+        platform_device_register(&mmp2_device_gpio);
         mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info));
         mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */
         mmp2_add_sdhost(2, &mmp2_sdh_platdata_mmc2); /* eMMC */
diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c
index 5a6a27a6cfd0..2ee8cd7829dd 100644
--- a/arch/arm/mach-mmp/flint.c
+++ b/arch/arm/mach-mmp/flint.c
@@ -87,8 +87,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(155),
-                .end    = gpio_to_irq(155),
+                .start  = MMP_GPIO_TO_IRQ(155),
+                .end    = MMP_GPIO_TO_IRQ(155),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
@@ -110,6 +110,7 @@ static void __init flint_init(void)
         /* on-chip devices */
         mmp2_add_uart(1);
         mmp2_add_uart(2);
+        platform_device_register(&mmp2_device_gpio);
 
         /* off-chip devices */
         platform_device_register(&smc91x_device);
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c
index 1e3abbe37cac..87765467de63 100644
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@ -184,6 +184,7 @@ static void __init gplugd_init(void)
         pxa168_add_uart(3);
         pxa168_add_ssp(1);
         pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));
+        platform_device_register(&pxa168_device_gpio);
 
         pxa168_add_eth(&gplugd_eth_platform_data);
 }
diff --git a/arch/arm/mach-mmp/include/mach/gpio-pxa.h b/arch/arm/mach-mmp/include/mach/gpio-pxa.h
index 99b4ce1b6562..0e135a599f3e 100644
--- a/arch/arm/mach-mmp/include/mach/gpio-pxa.h
+++ b/arch/arm/mach-mmp/include/mach/gpio-pxa.h
@@ -2,6 +2,7 @@
 #define __ASM_MACH_GPIO_PXA_H
 
 #include <mach/addr-map.h>
+#include <mach/cputype.h>
 #include <mach/irqs.h>
 
 #define GPIO_REGS_VIRT  (APB_VIRT_BASE + 0x19000)
@@ -9,8 +10,6 @@
 #define BANK_OFF(n)     (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
 #define GPIO_REG(x)     (*(volatile u32 *)(GPIO_REGS_VIRT + (x)))
 
-#define NR_BUILTIN_GPIO         IRQ_GPIO_NUM
-
 #define gpio_to_bank(gpio)      ((gpio) >> 5)
 
 /* NOTE: these macros are defined here to make optimization of
diff --git a/arch/arm/mach-mmp/include/mach/gpio.h b/arch/arm/mach-mmp/include/mach/gpio.h
index 681262359d1c..13219ebf5128 100644
--- a/arch/arm/mach-mmp/include/mach/gpio.h
+++ b/arch/arm/mach-mmp/include/mach/gpio.h
@@ -3,11 +3,6 @@
 
 #include <asm-generic/gpio.h>
 
-#define gpio_to_irq(gpio)       (IRQ_GPIO_START + (gpio))
-#define irq_to_gpio(irq)        ((irq) - IRQ_GPIO_START)
+#include <mach/cputype.h>
 
-#define __gpio_is_inverted(gpio)        (0)
-#define __gpio_is_occupied(gpio)        (0)
-
-#include <plat/gpio.h>
 #endif /* __ASM_MACH_GPIO_H */
diff --git a/arch/arm/mach-mmp/include/mach/irqs.h b/arch/arm/mach-mmp/include/mach/irqs.h
index a09d328e2ddd..34635a0bbb59 100644
--- a/arch/arm/mach-mmp/include/mach/irqs.h
+++ b/arch/arm/mach-mmp/include/mach/irqs.h
@@ -219,10 +219,10 @@
 #define IRQ_MMP2_MUX_END                (IRQ_MMP2_SSP_BASE + 2)
 
 #define IRQ_GPIO_START                  128
-#define IRQ_GPIO_NUM                    192
-#define IRQ_GPIO(x)                     (IRQ_GPIO_START + (x))
+#define MMP_NR_BUILTIN_GPIO             192
+#define MMP_GPIO_TO_IRQ(gpio)           (IRQ_GPIO_START + (gpio))
 
-#define IRQ_BOARD_START                 (IRQ_GPIO_START + IRQ_GPIO_NUM)
+#define IRQ_BOARD_START                 (IRQ_GPIO_START + MMP_NR_BUILTIN_GPIO)
 
 #define NR_IRQS                         (IRQ_BOARD_START)
 
diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h
index 2f7b2d3c2b18..cba22fed2265 100644
--- a/arch/arm/mach-mmp/include/mach/mmp2.h
+++ b/arch/arm/mach-mmp/include/mach/mmp2.h
@@ -32,6 +32,8 @@ extern struct pxa_device_desc mmp2_device_sdh3;
 extern struct pxa_device_desc mmp2_device_asram;
 extern struct pxa_device_desc mmp2_device_isram;
 
+extern struct platform_device mmp2_device_gpio;
+
 static inline int mmp2_add_uart(int id)
 {
         struct pxa_device_desc *d = NULL;
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h
index a677aa732c26..dc03d580a06d 100644
--- a/arch/arm/mach-mmp/include/mach/pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/pxa168.h
@@ -43,6 +43,8 @@ struct pxa168_usb_pdata {
 /* pdata can be NULL */
 int __init pxa168_add_usb_host(struct pxa168_usb_pdata *pdata);
 
+extern struct platform_device pxa168_device_gpio;
+
 static inline int pxa168_add_uart(int id)
 {
         struct pxa_device_desc *d = NULL;
diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h
index 91be75591398..4de13abef7bb 100644
--- a/arch/arm/mach-mmp/include/mach/pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/pxa910.h
@@ -21,6 +21,8 @@ extern struct pxa_device_desc pxa910_device_pwm3;
 extern struct pxa_device_desc pxa910_device_pwm4;
 extern struct pxa_device_desc pxa910_device_nand;
 
+extern struct platform_device pxa910_device_gpio;
+
 static inline int pxa910_add_uart(int id)
 {
         struct pxa_device_desc *d = NULL;
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index 5dd1d4a6aeb9..617c60a170a4 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
 
 #include <asm/hardware/cache-tauros2.h>
 
@@ -24,7 +25,6 @@
 #include <mach/irqs.h>
 #include <mach/dma.h>
 #include <mach/mfp.h>
-#include <mach/gpio-pxa.h>
 #include <mach/devices.h>
 #include <mach/mmp2.h>
 
@@ -33,8 +33,6 @@
 
 #define MFPR_VIRT_BASE  (APB_VIRT_BASE + 0x1e000)
 
-#define APMASK(i)       (GPIO_REGS_VIRT + BANK_OFF(i) + 0x9c)
-
 static struct mfp_addr_map mmp2_addr_map[] __initdata = {
 
         MFP_ADDR_X(GPIO0, GPIO58, 0x54),
@@ -95,24 +93,9 @@ void mmp2_clear_pmic_int(void)
         __raw_writel(data, mfpr_pmic);
 }
 
-static void __init mmp2_init_gpio(void)
-{
-        int i;
-
-        /* enable GPIO clock */
-        __raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_MMP2_GPIO);
-
-        /* unmask GPIO edge detection for all 6 banks -- APMASKx */
-        for (i = 0; i < 6; i++)
-                __raw_writel(0xffffffff, APMASK(i));
-
-        pxa_init_gpio(IRQ_MMP2_GPIO, 0, 167, NULL);
-}
-
 void __init mmp2_init_irq(void)
 {
         mmp2_init_icu();
-        mmp2_init_gpio();
 }
 
 static void sdhc_clk_enable(struct clk *clk)
@@ -149,6 +132,7 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000);
 static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);
 static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);
 static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);
+static APBC_CLK(gpio, MMP2_GPIO, 0, 26000000);
 
 static APMU_CLK(nand, NAND, 0xbf, 100000000);
 static APMU_CLK_OPS(sdh0, SDH0, 0x1b, 200000000, &sdhc_clk_ops);
@@ -168,6 +152,7 @@ static struct clk_lookup mmp2_clkregs[] = {
         INIT_CLKREG(&clk_twsi5, "pxa2xx-i2c.4", NULL),
         INIT_CLKREG(&clk_twsi6, "pxa2xx-i2c.5", NULL),
         INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
+        INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
         INIT_CLKREG(&clk_sdh0, "sdhci-pxav3.0", "PXA-SDHCLK"),
         INIT_CLKREG(&clk_sdh1, "sdhci-pxav3.1", "PXA-SDHCLK"),
         INIT_CLKREG(&clk_sdh2, "sdhci-pxav3.2", "PXA-SDHCLK"),
@@ -230,3 +215,21 @@ MMP2_DEVICE(asram, "asram", -1, NONE, 0xe0000000, 0x4000);
 /* 0xd1000000 ~ 0xd101ffff is reserved for secure processor */
 MMP2_DEVICE(isram, "isram", -1, NONE, 0xd1020000, 0x18000);
 
+struct resource mmp2_resource_gpio[] = {
+        {
+                .start  = 0xd4019000,
+                .end    = 0xd4019fff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_MMP2_GPIO,
+                .end    = IRQ_MMP2_GPIO,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device mmp2_device_gpio = {
+        .name           = "pxa-gpio",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(mmp2_resource_gpio),
+        .resource       = mmp2_resource_gpio,
+};
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index 13f23867a86a..7bc17eaa12eb 100644
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/platform_device.h>
 
 #include <asm/mach/time.h>
 #include <mach/addr-map.h>
@@ -20,7 +21,6 @@
 #include <mach/regs-apbc.h>
 #include <mach/regs-apmu.h>
 #include <mach/irqs.h>
-#include <mach/gpio-pxa.h>
 #include <mach/dma.h>
 #include <mach/devices.h>
 #include <mach/mfp.h>
@@ -43,26 +43,9 @@ static struct mfp_addr_map pxa168_mfp_addr_map[] __initdata =
         MFP_ADDR_END,
 };
 
-#define APMASK(i)       (GPIO_REGS_VIRT + BANK_OFF(i) + 0x09c)
-
-static void __init pxa168_init_gpio(void)
-{
-        int i;
-
-        /* enable GPIO clock */
-        __raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_PXA168_GPIO);
-
-        /* unmask GPIO edge detection for all 4 banks - APMASKx */
-        for (i = 0; i < 4; i++)
-                __raw_writel(0xffffffff, APMASK(i));
-
-        pxa_init_gpio(IRQ_PXA168_GPIOX, 0, 127, NULL);
-}
-
 void __init pxa168_init_irq(void)
 {
         icu_init_irq();
-        pxa168_init_gpio();
 }
 
 /* APB peripheral clocks */
@@ -80,6 +63,7 @@ static APBC_CLK(ssp2, PXA168_SSP2, 4, 0);
 static APBC_CLK(ssp3, PXA168_SSP3, 4, 0);
 static APBC_CLK(ssp4, PXA168_SSP4, 4, 0);
 static APBC_CLK(ssp5, PXA168_SSP5, 4, 0);
+static APBC_CLK(gpio, PXA168_GPIO, 0, 13000000);
 static APBC_CLK(keypad, PXA168_KPC, 0, 32000);
 
 static APMU_CLK(nand, NAND, 0x19b, 156000000);
@@ -105,6 +89,7 @@ static struct clk_lookup pxa168_clkregs[] = {
         INIT_CLKREG(&clk_ssp5, "pxa168-ssp.4", NULL),
         INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
         INIT_CLKREG(&clk_lcd, "pxa168-fb", NULL),
+        INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
         INIT_CLKREG(&clk_keypad, "pxa27x-keypad", NULL),
         INIT_CLKREG(&clk_eth, "pxa168-eth", "MFUCLK"),
         INIT_CLKREG(&clk_usb, "pxa168-ehci", "PXA168-USBCLK"),
@@ -174,6 +159,25 @@ PXA168_DEVICE(fb, "pxa168-fb", -1, LCD, 0xd420b000, 0x1c8);
 PXA168_DEVICE(keypad, "pxa27x-keypad", -1, KEYPAD, 0xd4012000, 0x4c);
 PXA168_DEVICE(eth, "pxa168-eth", -1, MFU, 0xc0800000, 0x0fff);
 
+struct resource pxa168_resource_gpio[] = {
+        {
+                .start  = 0xd4019000,
+                .end    = 0xd4019fff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_PXA168_GPIOX,
+                .end    = IRQ_PXA168_GPIOX,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device pxa168_device_gpio = {
+        .name           = "pxa-gpio",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(pxa168_resource_gpio),
+        .resource       = pxa168_resource_gpio,
+};
+
 struct resource pxa168_usb_host_resources[] = {
         /* USB Host conroller register base */
         [0] = {
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c
index 4ebbfbba39fc..3241a25784d0 100644
--- a/arch/arm/mach-mmp/pxa910.c
+++ b/arch/arm/mach-mmp/pxa910.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
 
 #include <asm/mach/time.h>
 #include <mach/addr-map.h>
@@ -19,7 +20,6 @@
 #include <mach/regs-apmu.h>
 #include <mach/cputype.h>
 #include <mach/irqs.h>
-#include <mach/gpio-pxa.h>
 #include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/devices.h>
@@ -77,26 +77,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata =
         MFP_ADDR_END,
 };
 
-#define APMASK(i)       (GPIO_REGS_VIRT + BANK_OFF(i) + 0x09c)
-
-static void __init pxa910_init_gpio(void)
-{
-        int i;
-
-        /* enable GPIO clock */
-        __raw_writel(APBC_APBCLK | APBC_FNCLK, APBC_PXA910_GPIO);
-
-        /* unmask GPIO edge detection for all 4 banks - APMASKx */
-        for (i = 0; i < 4; i++)
-                __raw_writel(0xffffffff, APMASK(i));
-
-        pxa_init_gpio(IRQ_PXA910_AP_GPIO, 0, 127, NULL);
-}
-
 void __init pxa910_init_irq(void)
 {
         icu_init_irq();
-        pxa910_init_gpio();
 }
 
 /* APB peripheral clocks */
@@ -108,6 +91,7 @@ static APBC_CLK(pwm1, PXA910_PWM1, 1, 13000000);
 static APBC_CLK(pwm2, PXA910_PWM2, 1, 13000000);
 static APBC_CLK(pwm3, PXA910_PWM3, 1, 13000000);
 static APBC_CLK(pwm4, PXA910_PWM4, 1, 13000000);
+static APBC_CLK(gpio, PXA910_GPIO, 0, 13000000);
 
 static APMU_CLK(nand, NAND, 0x19b, 156000000);
 static APMU_CLK(u2o, USB, 0x1b, 480000000);
@@ -123,6 +107,7 @@ static struct clk_lookup pxa910_clkregs[] = {
         INIT_CLKREG(&clk_pwm3, "pxa910-pwm.2", NULL),
         INIT_CLKREG(&clk_pwm4, "pxa910-pwm.3", NULL),
         INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
+        INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
         INIT_CLKREG(&clk_u2o, "pxa-u2o", "U2OCLK"),
 };
 
@@ -179,3 +164,22 @@ PXA910_DEVICE(pwm2, "pxa910-pwm", 1, NONE, 0xd401a400, 0x10);
 PXA910_DEVICE(pwm3, "pxa910-pwm", 2, NONE, 0xd401a800, 0x10);
 PXA910_DEVICE(pwm4, "pxa910-pwm", 3, NONE, 0xd401ac00, 0x10);
 PXA910_DEVICE(nand, "pxa3xx-nand", -1, NAND, 0xd4283000, 0x80, 97, 99);
+
+struct resource pxa910_resource_gpio[] = {
+        {
+                .start  = 0xd4019000,
+                .end    = 0xd4019fff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_PXA910_AP_GPIO,
+                .end    = IRQ_PXA910_AP_GPIO,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device pxa910_device_gpio = {
+        .name           = "pxa-gpio",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(pxa910_resource_gpio),
+        .resource       = pxa910_resource_gpio,
+};
diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c
index 257a21283ec1..8e3b5af04a57 100644
--- a/arch/arm/mach-mmp/tavorevb.c
+++ b/arch/arm/mach-mmp/tavorevb.c
@@ -19,6 +19,7 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa910.h>
 #include <mach/pxa910.h>
+#include <mach/irqs.h>
 
 #include "common.h"
 
@@ -71,8 +72,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(80),
-                .end    = gpio_to_irq(80),
+                .start  = MMP_GPIO_TO_IRQ(80),
+                .end    = MMP_GPIO_TO_IRQ(80),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
@@ -93,6 +94,7 @@ static void __init tavorevb_init(void)
 
         /* on-chip devices */
         pxa910_add_uart(1);
+        platform_device_register(&pxa910_device_gpio);
 
         /* off-chip devices */
         platform_device_register(&smc91x_device);
diff --git a/arch/arm/mach-mmp/teton_bga.c b/arch/arm/mach-mmp/teton_bga.c
index 8ac22a62bf1a..0523e422990e 100644
--- a/arch/arm/mach-mmp/teton_bga.c
+++ b/arch/arm/mach-mmp/teton_bga.c
@@ -66,7 +66,7 @@ static struct pxa27x_keypad_platform_data teton_bga_keypad_info __initdata = {
 static struct i2c_board_info teton_bga_i2c_info[] __initdata = {
         {
                 I2C_BOARD_INFO("ds1337", 0x68),
-                .irq = gpio_to_irq(RTC_INT_GPIO)
+                .irq = MMP_GPIO_TO_IRQ(RTC_INT_GPIO)
         },
 };
 
@@ -78,6 +78,7 @@ static void __init teton_bga_init(void)
         pxa168_add_uart(1);
         pxa168_add_keypad(&teton_bga_keypad_info);
         pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(teton_bga_i2c_info));
+        platform_device_register(&pxa168_device_gpio);
 }
 
 MACHINE_START(TETON_BGA, "PXA168-based Teton BGA Development Platform")
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index f02658825576..5ac5d5832e45 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -24,12 +24,13 @@
 #include <mach/addr-map.h>
 #include <mach/mfp-pxa910.h>
 #include <mach/pxa910.h>
+#include <mach/irqs.h>
 
 #include "common.h"
 
-#define TTCDKB_GPIO_EXT0(x)     (NR_BUILTIN_GPIO + ((x < 0) ? 0 :       \
+#define TTCDKB_GPIO_EXT0(x)     (MMP_NR_BUILTIN_GPIO + ((x < 0) ? 0 :   \
                                 ((x < 16) ? x : 15)))
-#define TTCDKB_GPIO_EXT1(x)     (NR_BUILTIN_GPIO + 16 + ((x < 0) ? 0 :  \
+#define TTCDKB_GPIO_EXT1(x)     (MMP_NR_BUILTIN_GPIO + 16 + ((x < 0) ? 0 : \
                                 ((x < 16) ? x : 15)))
 
 /*
@@ -122,6 +123,7 @@ static struct platform_device ttc_dkb_device_onenand = {
 };
 
 static struct platform_device *ttc_dkb_devices[] = {
+        &pxa910_device_gpio,
         &ttc_dkb_device_onenand,
 };
 
@@ -136,7 +138,7 @@ static struct i2c_board_info ttc_dkb_i2c_info[] = {
         {
                 .type           = "max7312",
                 .addr           = 0x23,
-                .irq            = IRQ_GPIO(80),
+                .irq            = MMP_GPIO_TO_IRQ(80),
                 .platform_data  = &max7312_data,
         },
 };
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index e6beaff7621e..1cd40ad301d3 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -13,7 +13,6 @@ config ARCH_MSM7X00A
         select CPU_V6
         select GPIO_MSM_V1
         select MSM_PROC_COMM
-        select HAS_MSM_DEBUG_UART_PHYS
 
 config ARCH_MSM7X30
         bool "MSM7x30"
@@ -25,7 +24,6 @@ config ARCH_MSM7X30
         select MSM_GPIOMUX
         select GPIO_MSM_V1
         select MSM_PROC_COMM
-        select HAS_MSM_DEBUG_UART_PHYS
 
 config ARCH_QSD8X50
         bool "QSD8X50"
@@ -37,7 +35,6 @@ config ARCH_QSD8X50
         select MSM_GPIOMUX
         select GPIO_MSM_V1
         select MSM_PROC_COMM
-        select HAS_MSM_DEBUG_UART_PHYS
 
 config ARCH_MSM8X60
         bool "MSM8X60"
@@ -63,6 +60,9 @@ config ARCH_MSM8960
 
 endchoice
 
+config MSM_HAS_DEBUG_UART_HS
+        bool
+
 config MSM_SOC_REV_A
         bool
 config  ARCH_MSM_SCORPIONMP
@@ -74,9 +74,6 @@ config  ARCH_MSM_ARM11
 config  ARCH_MSM_SCORPION
         bool
 
-config HAS_MSM_DEBUG_UART_PHYS
-        bool
-
 config  MSM_VIC
         bool
 
@@ -153,32 +150,6 @@ config MACH_MSM8960_RUMI3
 
 endmenu
 
-config MSM_DEBUG_UART
-        int
-        default 1 if MSM_DEBUG_UART1
-        default 2 if MSM_DEBUG_UART2
-        default 3 if MSM_DEBUG_UART3
-
-if HAS_MSM_DEBUG_UART_PHYS
-choice
-        prompt "Debug UART"
-
-        default MSM_DEBUG_UART_NONE
-
-        config MSM_DEBUG_UART_NONE
-                bool "None"
-
-        config MSM_DEBUG_UART1
-                bool "UART1"
-
-        config MSM_DEBUG_UART2
-                bool "UART2"
-
-        config MSM_DEBUG_UART3
-                bool "UART3"
-endchoice
-endif
-
 config MSM_SMD_PKG3
         bool
 
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 2dc73ccddb11..3ffd8668c9a5 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -1,6 +1,7 @@
-/* arch/arm/mach-msm7200/include/mach/debug-macro.S
+/*
  *
  * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -14,40 +15,52 @@
  *
  */
 
-
-
 #include <mach/hardware.h>
 #include <mach/msm_iomap.h>
 
-#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE)
         .macro  addruart, rp, rv, tmp
+#ifdef MSM_DEBUG_UART_PHYS
         ldr     \rp, =MSM_DEBUG_UART_PHYS
         ldr     \rv, =MSM_DEBUG_UART_BASE
+#endif
         .endm
 
-        .macro  senduart,rd,rx
+        .macro  senduart, rd, rx
+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
+        @ Write the 1 character to UARTDM_TF
+        str     \rd, [\rx, #0x70]
+#else
         teq     \rx, #0
         strne   \rd, [\rx, #0x0C]
+#endif
         .endm
 
-        .macro  waituart,rd,rx
+        .macro  waituart, rd, rx
+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
+        @ check for TX_EMT in UARTDM_SR
+        ldr     \rd, [\rx, #0x08]
+        tst     \rd, #0x08
+        bne     1002f
+        @ wait for TXREADY in UARTDM_ISR
+1001:   ldr     \rd, [\rx, #0x14]
+        tst     \rd, #0x80
+        beq     1001b
+1002:
+        @ Clear TX_READY by writing to the UARTDM_CR register
+        mov     \rd, #0x300
+        str     \rd, [\rx, #0x10]
+        @ Write 0x1 to NCF register
+        mov     \rd, #0x1
+        str     \rd, [\rx, #0x40]
+        @ UARTDM reg. Read to induce delay
+        ldr     \rd, [\rx, #0x08]
+#else
         @ wait for TX_READY
 1001:   ldr     \rd, [\rx, #0x08]
         tst     \rd, #0x04
         beq     1001b
-        .endm
-#else
-        .macro  addruart, rp, rv, tmp
-        mov     \rv, #0xff000000
-        orr     \rv, \rv, #0x00f00000
-        .endm
-
-        .macro  senduart,rd,rx
-        .endm
-
-        .macro  waituart,rd,rx
-        .endm
 #endif
+        .endm
 
-        .macro  busyuart,rd,rx
+        .macro  busyuart, rd, rx
         .endm
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
index 94fe9fe6feb3..8af46123dab6 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
@@ -78,18 +78,6 @@
 #define MSM_UART3_PHYS        0xA9C00000
 #define MSM_UART3_SIZE        SZ_4K
 
-#ifdef CONFIG_MSM_DEBUG_UART
-#define MSM_DEBUG_UART_BASE   0xE1000000
-#if CONFIG_MSM_DEBUG_UART == 1
-#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 2
-#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 3
-#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS
-#endif
-#define MSM_DEBUG_UART_SIZE   SZ_4K
-#endif
-
 #define MSM_SDC1_PHYS         0xA0400000
 #define MSM_SDC1_SIZE         SZ_4K
 
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
index 37694442d1bd..198202c267c8 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
@@ -89,18 +89,6 @@
 #define MSM_UART3_PHYS        0xACC00000
 #define MSM_UART3_SIZE        SZ_4K
 
-#ifdef CONFIG_MSM_DEBUG_UART
-#define MSM_DEBUG_UART_BASE   0xE1000000
-#if CONFIG_MSM_DEBUG_UART == 1
-#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 2
-#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 3
-#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS
-#endif
-#define MSM_DEBUG_UART_SIZE   SZ_4K
-#endif
-
 #define MSM_MDC_BASE          IOMEM(0xE0200000)
 #define MSM_MDC_PHYS          0xAA500000
 #define MSM_MDC_SIZE          SZ_1M
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
index 3c9d9602a318..800b55767e6b 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
@@ -45,4 +45,9 @@
 #define MSM8960_TMR0_PHYS       0x0208A000
 #define MSM8960_TMR0_SIZE       SZ_4K
 
+#ifdef CONFIG_DEBUG_MSM8960_UART
+#define MSM_DEBUG_UART_BASE     0xE1040000
+#define MSM_DEBUG_UART_PHYS     0x16440000
+#endif
+
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
index d67cd73316f4..0faa894729b7 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
@@ -83,18 +83,6 @@
 #define MSM_UART3_PHYS        0xA9C00000
 #define MSM_UART3_SIZE        SZ_4K
 
-#ifdef CONFIG_MSM_DEBUG_UART
-#define MSM_DEBUG_UART_BASE   0xE1000000
-#if CONFIG_MSM_DEBUG_UART == 1
-#define MSM_DEBUG_UART_PHYS   MSM_UART1_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 2
-#define MSM_DEBUG_UART_PHYS   MSM_UART2_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 3
-#define MSM_DEBUG_UART_PHYS   MSM_UART3_PHYS
-#endif
-#define MSM_DEBUG_UART_SIZE   SZ_4K
-#endif
-
 #define MSM_MDC_BASE          IOMEM(0xE0200000)
 #define MSM_MDC_PHYS          0xAA500000
 #define MSM_MDC_SIZE          SZ_1M
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 3b19b8f244b8..54e12caa8d86 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -62,4 +62,9 @@
 #define MSM8X60_TMR0_PHYS       0x02040000
 #define MSM8X60_TMR0_SIZE       SZ_4K
 
+#ifdef CONFIG_DEBUG_MSM8660_UART
+#define MSM_DEBUG_UART_BASE     0xE1040000
+#define MSM_DEBUG_UART_PHYS     0x19C40000
+#endif
+
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 4ded15238b60..90682f4599d3 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -55,6 +55,18 @@
 
 #include "msm_iomap-8960.h"
 
+#define MSM_DEBUG_UART_SIZE     SZ_4K
+#if defined(CONFIG_DEBUG_MSM_UART1)
+#define MSM_DEBUG_UART_BASE     0xE1000000
+#define MSM_DEBUG_UART_PHYS     MSM_UART1_PHYS
+#elif defined(CONFIG_DEBUG_MSM_UART2)
+#define MSM_DEBUG_UART_BASE     0xE1000000
+#define MSM_DEBUG_UART_PHYS     MSM_UART2_PHYS
+#elif defined(CONFIG_DEBUG_MSM_UART3)
+#define MSM_DEBUG_UART_BASE     0xE1000000
+#define MSM_DEBUG_UART_PHYS     MSM_UART3_PHYS
+#endif
+
 /* Virtual addresses shared across all MSM targets. */
 #define MSM_CSR_BASE            IOMEM(0xE0001000)
 #define MSM_QGIC_DIST_BASE      IOMEM(0xF0000000)
diff --git a/arch/arm/mach-msm/include/mach/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h
index d94292c29d8e..169a84007456 100644
--- a/arch/arm/mach-msm/include/mach/uncompress.h
+++ b/arch/arm/mach-msm/include/mach/uncompress.h
@@ -1,6 +1,6 @@
-/* arch/arm/mach-msm/include/mach/uncompress.h
- *
+/*
  * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -14,17 +14,40 @@
  */
 
 #ifndef __ASM_ARCH_MSM_UNCOMPRESS_H
+#define __ASM_ARCH_MSM_UNCOMPRESS_H
+
+#include <asm/processor.h>
+#include <mach/msm_iomap.h>
+
+#define UART_CSR      (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08))
+#define UART_TF       (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x0c))
 
-#include "hardware.h"
-#include "linux/io.h"
-#include "mach/msm_iomap.h"
+#define UART_DM_SR    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08)))
+#define UART_DM_CR    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x10)))
+#define UART_DM_ISR   (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x14)))
+#define UART_DM_NCHAR (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x40)))
+#define UART_DM_TF    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x70)))
 
 static void putc(int c)
 {
 #if defined(MSM_DEBUG_UART_PHYS)
-        unsigned base = MSM_DEBUG_UART_PHYS;
-        while (!(readl(base + 0x08) & 0x04)) ;
-        writel(c, base + 0x0c);
+#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
+        /*
+         * Wait for TX_READY to be set; but skip it if we have a
+         * TX underrun.
+         */
+        if (UART_DM_SR & 0x08)
+                while (!(UART_DM_ISR & 0x80))
+                        cpu_relax();
+
+        UART_DM_CR = 0x300;
+        UART_DM_NCHAR = 0x1;
+        UART_DM_TF = c;
+#else
+        while (!(UART_CSR & 0x04))
+                cpu_relax();
+        UART_TF = c;
+#endif
 #endif
 }
 
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 8759ecf7454f..578b04e42deb 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -47,7 +47,8 @@ static struct map_desc msm_io_desc[] __initdata = {
         MSM_CHIP_DEVICE(GPIO1, MSM7X00),
         MSM_CHIP_DEVICE(GPIO2, MSM7X00),
         MSM_DEVICE(CLK_CTL),
-#ifdef CONFIG_MSM_DEBUG_UART
+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
+        defined(CONFIG_DEBUG_MSM_UART3)
         MSM_DEVICE(DEBUG_UART),
 #endif
 #ifdef CONFIG_ARCH_MSM7X30
@@ -84,7 +85,8 @@ static struct map_desc qsd8x50_io_desc[] __initdata = {
         MSM_DEVICE(SCPLL),
         MSM_DEVICE(AD5),
         MSM_DEVICE(MDC),
-#ifdef CONFIG_MSM_DEBUG_UART
+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
+        defined(CONFIG_DEBUG_MSM_UART3)
         MSM_DEVICE(DEBUG_UART),
 #endif
         {
@@ -109,6 +111,9 @@ static struct map_desc msm8x60_io_desc[] __initdata = {
         MSM_CHIP_DEVICE(TMR0, MSM8X60),
         MSM_DEVICE(ACC),
         MSM_DEVICE(GCC),
+#ifdef CONFIG_DEBUG_MSM8660_UART
+        MSM_DEVICE(DEBUG_UART),
+#endif
 };
 
 void __init msm_map_msm8x60_io(void)
@@ -123,6 +128,9 @@ static struct map_desc msm8960_io_desc[] __initdata = {
         MSM_CHIP_DEVICE(QGIC_CPU, MSM8960),
         MSM_CHIP_DEVICE(TMR, MSM8960),
         MSM_CHIP_DEVICE(TMR0, MSM8960),
+#ifdef CONFIG_DEBUG_MSM8960_UART
+        MSM_DEVICE(DEBUG_UART),
+#endif
 };
 
 void __init msm_map_msm8960_io(void)
@@ -146,7 +154,8 @@ static struct map_desc msm7x30_io_desc[] __initdata = {
         MSM_DEVICE(SAW),
         MSM_DEVICE(GCC),
         MSM_DEVICE(TCSR),
-#ifdef CONFIG_MSM_DEBUG_UART
+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
+        defined(CONFIG_DEBUG_MSM_UART3)
         MSM_DEVICE(DEBUG_UART),
 #endif
         {
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index fdec58aaa35c..0b3e357c4c8c 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -79,7 +79,7 @@ static __cpuinit void prepare_cold_cpu(unsigned int cpu)
         ret = scm_set_boot_addr(virt_to_phys(msm_secondary_startup),
                                 SCM_FLAG_COLDBOOT_CPU1);
         if (ret == 0) {
-                void *sc1_base_ptr;
+                void __iomem *sc1_base_ptr;
                 sc1_base_ptr = ioremap_nocache(0x00902000, SZ_4K*2);
                 if (sc1_base_ptr) {
                         writel(0, sc1_base_ptr + VDD_SC1_ARRAY_CLAMP_GFS_CTL);
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index afeeca52fc66..11d0d8f2656c 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -1,6 +1,7 @@
-/* linux/arch/arm/mach-msm/timer.c
+/*
  *
  * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -13,306 +14,207 @@
  *
  */
 
+#include <linux/clocksource.h>
+#include <linux/clockchips.h>
 #include <linux/init.h>
-#include <linux/time.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/clk.h>
-#include <linux/clockchips.h>
-#include <linux/delay.h>
 #include <linux/io.h>
 
 #include <asm/mach/time.h>
 #include <asm/hardware/gic.h>
+#include <asm/localtimer.h>
 
 #include <mach/msm_iomap.h>
 #include <mach/cpu.h>
+#include <mach/board.h>
 
 #define TIMER_MATCH_VAL         0x0000
 #define TIMER_COUNT_VAL         0x0004
 #define TIMER_ENABLE            0x0008
-#define TIMER_ENABLE_CLR_ON_MATCH_EN    2
-#define TIMER_ENABLE_EN                 1
+#define TIMER_ENABLE_CLR_ON_MATCH_EN    BIT(1)
+#define TIMER_ENABLE_EN                 BIT(0)
 #define TIMER_CLEAR             0x000C
 #define DGT_CLK_CTL             0x0034
-enum {
-        DGT_CLK_CTL_DIV_1 = 0,
-        DGT_CLK_CTL_DIV_2 = 1,
-        DGT_CLK_CTL_DIV_3 = 2,
-        DGT_CLK_CTL_DIV_4 = 3,
-};
-#define CSR_PROTECTION          0x0020
-#define CSR_PROTECTION_EN               1
+#define DGT_CLK_CTL_DIV_4       0x3
 
 #define GPT_HZ 32768
 
-enum timer_location {
-        LOCAL_TIMER = 0,
-        GLOBAL_TIMER = 1,
-};
-
-#define MSM_GLOBAL_TIMER MSM_CLOCK_DGT
-
-/* TODO: Remove these ifdefs */
-#if defined(CONFIG_ARCH_QSD8X50)
-#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */
-#define MSM_DGT_SHIFT (0)
-#elif defined(CONFIG_ARCH_MSM7X30)
-#define DGT_HZ (24576000 / 4) /* 24.576 MHz (LPXO) / 4 by default */
-#define MSM_DGT_SHIFT (0)
-#elif defined(CONFIG_ARCH_MSM8X60) || defined(CONFIG_ARCH_MSM8960)
-#define DGT_HZ (27000000 / 4) /* 27 MHz (PXO) / 4 by default */
-#define MSM_DGT_SHIFT (0)
-#else
-#define DGT_HZ 19200000 /* 19.2 MHz or 600 KHz after shift */
-#define MSM_DGT_SHIFT (5)
-#endif
+#define MSM_DGT_SHIFT 5
 
-struct msm_clock {
-        struct clock_event_device   clockevent;
-        struct clocksource          clocksource;
-        unsigned int                irq;
-        void __iomem                *regbase;
-        uint32_t                    freq;
-        uint32_t                    shift;
-        void __iomem                *global_counter;
-        void __iomem                *local_counter;
-        union {
-                struct clock_event_device               *evt;
-                struct clock_event_device __percpu      **percpu_evt;
-        };              
-};
-
-enum {
-        MSM_CLOCK_GPT,
-        MSM_CLOCK_DGT,
-        NR_TIMERS,
-};
-
-
-static struct msm_clock msm_clocks[];
+static void __iomem *event_base;
 
 static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
 {
         struct clock_event_device *evt = *(struct clock_event_device **)dev_id;
-        if (evt->event_handler == NULL)
-                return IRQ_HANDLED;
+        /* Stop the timer tick */
+        if (evt->mode == CLOCK_EVT_MODE_ONESHOT) {
+                u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
+                ctrl &= ~TIMER_ENABLE_EN;
+                writel_relaxed(ctrl, event_base + TIMER_ENABLE);
+        }
         evt->event_handler(evt);
         return IRQ_HANDLED;
 }
 
-static cycle_t msm_read_timer_count(struct clocksource *cs)
-{
-        struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);
-
-        /*
-         * Shift timer count down by a constant due to unreliable lower bits
-         * on some targets.
-         */
-        return readl(clk->global_counter) >> clk->shift;
-}
-
-static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)
-{
-#ifdef CONFIG_SMP
-        int i;
-        for (i = 0; i < NR_TIMERS; i++)
-                if (evt == &(msm_clocks[i].clockevent))
-                        return &msm_clocks[i];
-        return &msm_clocks[MSM_GLOBAL_TIMER];
-#else
-        return container_of(evt, struct msm_clock, clockevent);
-#endif
-}
-
 static int msm_timer_set_next_event(unsigned long cycles,
                                     struct clock_event_device *evt)
 {
-        struct msm_clock *clock = clockevent_to_clock(evt);
-        uint32_t now = readl(clock->local_counter);
-        uint32_t alarm = now + (cycles << clock->shift);
+        u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
 
-        writel(alarm, clock->regbase + TIMER_MATCH_VAL);
+        writel_relaxed(0, event_base + TIMER_CLEAR);
+        writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
+        writel_relaxed(ctrl | TIMER_ENABLE_EN, event_base + TIMER_ENABLE);
         return 0;
 }
 
 static void msm_timer_set_mode(enum clock_event_mode mode,
                               struct clock_event_device *evt)
 {
-        struct msm_clock *clock = clockevent_to_clock(evt);
+        u32 ctrl;
+
+        ctrl = readl_relaxed(event_base + TIMER_ENABLE);
+        ctrl &= ~(TIMER_ENABLE_EN | TIMER_ENABLE_CLR_ON_MATCH_EN);
 
         switch (mode) {
         case CLOCK_EVT_MODE_RESUME:
         case CLOCK_EVT_MODE_PERIODIC:
                 break;
         case CLOCK_EVT_MODE_ONESHOT:
-                writel(TIMER_ENABLE_EN, clock->regbase + TIMER_ENABLE);
+                /* Timer is enabled in set_next_event */
                 break;
         case CLOCK_EVT_MODE_UNUSED:
         case CLOCK_EVT_MODE_SHUTDOWN:
-                writel(0, clock->regbase + TIMER_ENABLE);
                 break;
         }
+        writel_relaxed(ctrl, event_base + TIMER_ENABLE);
 }
 
-static struct msm_clock msm_clocks[] = {
-        [MSM_CLOCK_GPT] = {
-                .clockevent = {
-                        .name           = "gp_timer",
-                        .features       = CLOCK_EVT_FEAT_ONESHOT,
-                        .shift          = 32,
-                        .rating         = 200,
-                        .set_next_event = msm_timer_set_next_event,
-                        .set_mode       = msm_timer_set_mode,
-                },
-                .clocksource = {
-                        .name           = "gp_timer",
-                        .rating         = 200,
-                        .read           = msm_read_timer_count,
-                        .mask           = CLOCKSOURCE_MASK(32),
-                        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-                },
-                .irq = INT_GP_TIMER_EXP,
-                .freq = GPT_HZ,
-        },
-        [MSM_CLOCK_DGT] = {
-                .clockevent = {
-                        .name           = "dg_timer",
-                        .features       = CLOCK_EVT_FEAT_ONESHOT,
-                        .shift          = 32 + MSM_DGT_SHIFT,
-                        .rating         = 300,
-                        .set_next_event = msm_timer_set_next_event,
-                        .set_mode       = msm_timer_set_mode,
-                },
-                .clocksource = {
-                        .name           = "dg_timer",
-                        .rating         = 300,
-                        .read           = msm_read_timer_count,
-                        .mask           = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT)),
-                        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-                },
-                .irq = INT_DEBUG_TIMER_EXP,
-                .freq = DGT_HZ >> MSM_DGT_SHIFT,
-                .shift = MSM_DGT_SHIFT,
-        }
+static struct clock_event_device msm_clockevent = {
+        .name           = "gp_timer",
+        .features       = CLOCK_EVT_FEAT_ONESHOT,
+        .rating         = 200,
+        .set_next_event = msm_timer_set_next_event,
+        .set_mode       = msm_timer_set_mode,
+};
+
+static union {
+        struct clock_event_device *evt;
+        struct clock_event_device __percpu **percpu_evt;
+} msm_evt;
+
+static void __iomem *source_base;
+
+static cycle_t msm_read_timer_count(struct clocksource *cs)
+{
+        return readl_relaxed(source_base + TIMER_COUNT_VAL);
+}
+
+static cycle_t msm_read_timer_count_shift(struct clocksource *cs)
+{
+        /*
+         * Shift timer count down by a constant due to unreliable lower bits
+         * on some targets.
+         */
+        return msm_read_timer_count(cs) >> MSM_DGT_SHIFT;
+}
+
+static struct clocksource msm_clocksource = {
+        .name   = "dg_timer",
+        .rating = 300,
+        .read   = msm_read_timer_count,
+        .mask   = CLOCKSOURCE_MASK(32),
+        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static void __init msm_timer_init(void)
 {
-        int i;
+        struct clock_event_device *ce = &msm_clockevent;
+        struct clocksource *cs = &msm_clocksource;
         int res;
-        int global_offset = 0;
+        u32 dgt_hz;
 
         if (cpu_is_msm7x01()) {
-                msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE;
-                msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x10;
+                event_base = MSM_CSR_BASE;
+                source_base = MSM_CSR_BASE + 0x10;
+                dgt_hz = 19200000 >> MSM_DGT_SHIFT; /* 600 KHz */
+                cs->read = msm_read_timer_count_shift;
+                cs->mask = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT));
         } else if (cpu_is_msm7x30()) {
-                msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE + 0x04;
-                msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x24;
+                event_base = MSM_CSR_BASE + 0x04;
+                source_base = MSM_CSR_BASE + 0x24;
+                dgt_hz = 24576000 / 4;
         } else if (cpu_is_qsd8x50()) {
-                msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE;
-                msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x10;
+                event_base = MSM_CSR_BASE;
+                source_base = MSM_CSR_BASE + 0x10;
+                dgt_hz = 19200000 / 4;
         } else if (cpu_is_msm8x60() || cpu_is_msm8960()) {
-                msm_clocks[MSM_CLOCK_GPT].regbase = MSM_TMR_BASE + 0x04;
-                msm_clocks[MSM_CLOCK_DGT].regbase = MSM_TMR_BASE + 0x24;
-
-                /* Use CPU0's timer as the global timer. */
-                global_offset = MSM_TMR0_BASE - MSM_TMR_BASE;
+                event_base = MSM_TMR_BASE + 0x04;
+                /* Use CPU0's timer as the global clock source. */
+                source_base = MSM_TMR0_BASE + 0x24;
+                dgt_hz = 27000000 / 4;
+                writel_relaxed(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
         } else
                 BUG();
 
-#ifdef CONFIG_ARCH_MSM_SCORPIONMP
-        writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
-#endif
-
-        for (i = 0; i < ARRAY_SIZE(msm_clocks); i++) {
-                struct msm_clock *clock = &msm_clocks[i];
-                struct clock_event_device *ce = &clock->clockevent;
-                struct clocksource *cs = &clock->clocksource;
-
-                clock->local_counter = clock->regbase + TIMER_COUNT_VAL;
-                clock->global_counter = clock->local_counter + global_offset;
-
-                writel(0, clock->regbase + TIMER_ENABLE);
-                writel(0, clock->regbase + TIMER_CLEAR);
-                writel(~0, clock->regbase + TIMER_MATCH_VAL);
-
-                ce->mult = div_sc(clock->freq, NSEC_PER_SEC, ce->shift);
-                /* allow at least 10 seconds to notice that the timer wrapped */
-                ce->max_delta_ns =
-                        clockevent_delta2ns(0xf0000000 >> clock->shift, ce);
-                /* 4 gets rounded down to 3 */
-                ce->min_delta_ns = clockevent_delta2ns(4, ce);
-                ce->cpumask = cpumask_of(0);
-
-                res = clocksource_register_hz(cs, clock->freq);
-                if (res)
-                        printk(KERN_ERR "msm_timer_init: clocksource_register "
-                               "failed for %s\n", cs->name);
-
-                ce->irq = clock->irq;
-                if (cpu_is_msm8x60() || cpu_is_msm8960()) {
-                        clock->percpu_evt = alloc_percpu(struct clock_event_device *);
-                        if (!clock->percpu_evt) {
-                                pr_err("msm_timer_init: memory allocation "
-                                       "failed for %s\n", ce->name);
-                                continue;
-                        }
-
-                        *__this_cpu_ptr(clock->percpu_evt) = ce;
-                        res = request_percpu_irq(ce->irq, msm_timer_interrupt,
-                                                 ce->name, clock->percpu_evt);
-                        if (!res)
-                                enable_percpu_irq(ce->irq, 0);
-                } else {
-                        clock->evt = ce;
-                        res = request_irq(ce->irq, msm_timer_interrupt,
-                                          IRQF_TIMER | IRQF_NOBALANCING | IRQF_TRIGGER_RISING,
-                                          ce->name, &clock->evt);
+        writel_relaxed(0, event_base + TIMER_ENABLE);
+        writel_relaxed(0, event_base + TIMER_CLEAR);
+        writel_relaxed(~0, event_base + TIMER_MATCH_VAL);
+        ce->cpumask = cpumask_of(0);
+
+        ce->irq = INT_GP_TIMER_EXP;
+        clockevents_config_and_register(ce, GPT_HZ, 4, 0xffffffff);
+        if (cpu_is_msm8x60() || cpu_is_msm8960()) {
+                msm_evt.percpu_evt = alloc_percpu(struct clock_event_device *);
+                if (!msm_evt.percpu_evt) {
+                        pr_err("memory allocation failed for %s\n", ce->name);
+                        goto err;
                 }
-
-                if (res)
-                        pr_err("msm_timer_init: request_irq failed for %s\n",
-                               ce->name);
-
-                clockevents_register_device(ce);
+                *__this_cpu_ptr(msm_evt.percpu_evt) = ce;
+                res = request_percpu_irq(ce->irq, msm_timer_interrupt,
+                                         ce->name, msm_evt.percpu_evt);
+                if (!res)
+                        enable_percpu_irq(ce->irq, 0);
+        } else {
+                msm_evt.evt = ce;
+                res = request_irq(ce->irq, msm_timer_interrupt,
+                                  IRQF_TIMER | IRQF_NOBALANCING |
+                                  IRQF_TRIGGER_RISING, ce->name, &msm_evt.evt);
         }
+
+        if (res)
+                pr_err("request_irq failed for %s\n", ce->name);
+err:
+        writel_relaxed(TIMER_ENABLE_EN, source_base + TIMER_ENABLE);
+        res = clocksource_register_hz(cs, dgt_hz);
+        if (res)
+                pr_err("clocksource_register failed\n");
 }
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_LOCAL_TIMERS
 int __cpuinit local_timer_setup(struct clock_event_device *evt)
 {
-        static bool local_timer_inited;
-        struct msm_clock *clock = &msm_clocks[MSM_GLOBAL_TIMER];
-
         /* Use existing clock_event for cpu 0 */
         if (!smp_processor_id())
                 return 0;
 
-        writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
-
-        if (!local_timer_inited) {
-                writel(0, clock->regbase  + TIMER_ENABLE);
-                writel(0, clock->regbase + TIMER_CLEAR);
-                writel(~0, clock->regbase + TIMER_MATCH_VAL);
-                local_timer_inited = true;
-        }
-        evt->irq = clock->irq;
+        writel_relaxed(0, event_base + TIMER_ENABLE);
+        writel_relaxed(0, event_base + TIMER_CLEAR);
+        writel_relaxed(~0, event_base + TIMER_MATCH_VAL);
+        evt->irq = msm_clockevent.irq;
         evt->name = "local_timer";
-        evt->features = CLOCK_EVT_FEAT_ONESHOT;
-        evt->rating = clock->clockevent.rating;
+        evt->features = msm_clockevent.features;
+        evt->rating = msm_clockevent.rating;
         evt->set_mode = msm_timer_set_mode;
         evt->set_next_event = msm_timer_set_next_event;
-        evt->shift = clock->clockevent.shift;
-        evt->mult = div_sc(clock->freq, NSEC_PER_SEC, evt->shift);
-        evt->max_delta_ns =
-                clockevent_delta2ns(0xf0000000 >> clock->shift, evt);
+        evt->shift = msm_clockevent.shift;
+        evt->mult = div_sc(GPT_HZ, NSEC_PER_SEC, evt->shift);
+        evt->max_delta_ns = clockevent_delta2ns(0xf0000000, evt);
         evt->min_delta_ns = clockevent_delta2ns(4, evt);
 
-        *__this_cpu_ptr(clock->percpu_evt) = evt;
-        enable_percpu_irq(evt->irq, 0);
-
+        *__this_cpu_ptr(msm_evt.percpu_evt) = evt;
         clockevents_register_device(evt);
+        enable_percpu_irq(evt->irq, 0);
         return 0;
 }
 
@@ -321,8 +223,7 @@ void local_timer_stop(struct clock_event_device *evt)
         evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
         disable_percpu_irq(evt->irq);
 }
-
-#endif
+#endif /* CONFIG_LOCAL_TIMERS */
 
 struct sys_timer msm_timer = {
         .init = msm_timer_init
diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c
index 311d5b0e9bc7..62b53d710efd 100644
--- a/arch/arm/mach-mv78xx0/addr-map.c
+++ b/arch/arm/mach-mv78xx0/addr-map.c
@@ -12,12 +12,12 @@
 #include <linux/init.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*
  * Generic Address Decode Windows bit settings
  */
-#define TARGET_DDR              0
 #define TARGET_DEV_BUS          1
 #define TARGET_PCIE0            4
 #define TARGET_PCIE1            8
@@ -32,23 +32,10 @@
 #define ATTR_PCIE_MEM(l)        (0xf8 & ~(0x10 << (l)))
 
 /*
- * Helpers to get DDR bank info
- */
-#define DDR_BASE_CS_OFF(n)      (0x0000 + ((n) << 3))
-#define DDR_SIZE_CS_OFF(n)      (0x0004 + ((n) << 3))
-
-/*
  * CPU Address Decode Windows registers
  */
 #define WIN0_OFF(n)             (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4))
 #define WIN8_OFF(n)             (BRIDGE_VIRT_BASE + 0x0900 + (((n) - 8) << 4))
-#define WIN_CTRL_OFF            0x0000
-#define WIN_BASE_OFF            0x0004
-#define WIN_REMAP_LO_OFF        0x0008
-#define WIN_REMAP_HI_OFF        0x000c
-
-
-struct mbus_dram_target_info mv78xx0_mbus_dram_info;
 
 static void __init __iomem *win_cfg_base(int win)
 {
@@ -63,94 +50,43 @@ static void __init __iomem *win_cfg_base(int win)
         return (void __iomem *)((win < 8) ? WIN0_OFF(win) : WIN8_OFF(win));
 }
 
-static int __init cpu_win_can_remap(int win)
-{
-        if (win < 8)
-                return 1;
-
-        return 0;
-}
-
-static void __init setup_cpu_win(int win, u32 base, u32 size,
-                                 u8 target, u8 attr, int remap)
-{
-        void __iomem *addr = win_cfg_base(win);
-        u32 ctrl;
-
-        base &= 0xffff0000;
-        ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1;
-
-        writel(base, addr + WIN_BASE_OFF);
-        writel(ctrl, addr + WIN_CTRL_OFF);
-        if (cpu_win_can_remap(win)) {
-                if (remap < 0)
-                        remap = base;
-
-                writel(remap & 0xffff0000, addr + WIN_REMAP_LO_OFF);
-                writel(0, addr + WIN_REMAP_HI_OFF);
-        }
-}
+/*
+ * Description of the windows needed by the platform code
+ */
+static struct __initdata orion_addr_map_cfg addr_map_cfg = {
+        .num_wins = 14,
+        .remappable_wins = 8,
+        .win_cfg_base = win_cfg_base,
+};
 
 void __init mv78xx0_setup_cpu_mbus(void)
 {
-        void __iomem *addr;
-        int i;
-        int cs;
-
         /*
-         * First, disable and clear windows.
+         * Disable, clear and configure windows.
          */
-        for (i = 0; i < 14; i++) {
-                addr = win_cfg_base(i);
-
-                writel(0, addr + WIN_BASE_OFF);
-                writel(0, addr + WIN_CTRL_OFF);
-                if (cpu_win_can_remap(i)) {
-                        writel(0, addr + WIN_REMAP_LO_OFF);
-                        writel(0, addr + WIN_REMAP_HI_OFF);
-                }
-        }
+        orion_config_wins(&addr_map_cfg, NULL);
 
         /*
          * Setup MBUS dram target info.
          */
-        mv78xx0_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
-
         if (mv78xx0_core_index() == 0)
-                addr = (void __iomem *)DDR_WINDOW_CPU0_BASE;
+                orion_setup_cpu_mbus_target(&addr_map_cfg,
+                                            DDR_WINDOW_CPU0_BASE);
         else
-                addr = (void __iomem *)DDR_WINDOW_CPU1_BASE;
-
-        for (i = 0, cs = 0; i < 4; i++) {
-                u32 base = readl(addr + DDR_BASE_CS_OFF(i));
-                u32 size = readl(addr + DDR_SIZE_CS_OFF(i));
-
-                /*
-                 * Chip select enabled?
-                 */
-                if (size & 1) {
-                        struct mbus_dram_window *w;
-
-                        w = &mv78xx0_mbus_dram_info.cs[cs++];
-                        w->cs_index = i;
-                        w->mbus_attr = 0xf & ~(1 << i);
-                        w->base = base & 0xffff0000;
-                        w->size = (size | 0x0000ffff) + 1;
-                }
-        }
-        mv78xx0_mbus_dram_info.num_cs = cs;
+                orion_setup_cpu_mbus_target(&addr_map_cfg,
+                                            DDR_WINDOW_CPU1_BASE);
 }
 
 void __init mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size,
                                       int maj, int min)
 {
-        setup_cpu_win(window, base, size, TARGET_PCIE(maj),
-                      ATTR_PCIE_IO(min), -1);
+        orion_setup_cpu_win(&addr_map_cfg, window, base, size,
+                            TARGET_PCIE(maj), ATTR_PCIE_IO(min), -1);
 }
 
 void __init mv78xx0_setup_pcie_mem_win(int window, u32 base, u32 size,
                                        int maj, int min)
 {
-        setup_cpu_win(window, base, size, TARGET_PCIE(maj),
-                      ATTR_PCIE_MEM(min), -1);
+        orion_setup_cpu_win(&addr_map_cfg, window, base, size,
+                            TARGET_PCIE(maj), ATTR_PCIE_MEM(min), -1);
 }
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 5b9632b01169..0cdd41004ad0 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
-#include <linux/mbus.h>
 #include <linux/ata_platform.h>
 #include <linux/ethtool.h>
 #include <asm/mach/map.h>
@@ -23,6 +22,7 @@
 #include <plat/orion_nand.h>
 #include <plat/time.h>
 #include <plat/common.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 static int get_tclk(void);
@@ -169,8 +169,7 @@ void __init mv78xx0_map_io(void)
  ****************************************************************************/
 void __init mv78xx0_ehci0_init(void)
 {
-        orion_ehci_init(&mv78xx0_mbus_dram_info,
-                        USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
+        orion_ehci_init(USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
 }
 
 
@@ -179,8 +178,7 @@ void __init mv78xx0_ehci0_init(void)
  ****************************************************************************/
 void __init mv78xx0_ehci1_init(void)
 {
-        orion_ehci_1_init(&mv78xx0_mbus_dram_info,
-                          USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);
+        orion_ehci_1_init(USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);
 }
 
 
@@ -189,8 +187,7 @@ void __init mv78xx0_ehci1_init(void)
  ****************************************************************************/
 void __init mv78xx0_ehci2_init(void)
 {
-        orion_ehci_2_init(&mv78xx0_mbus_dram_info,
-                          USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);
+        orion_ehci_2_init(USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);
 }
 
 
@@ -199,7 +196,7 @@ void __init mv78xx0_ehci2_init(void)
  ****************************************************************************/
 void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        orion_ge00_init(eth_data, &mv78xx0_mbus_dram_info,
+        orion_ge00_init(eth_data,
                         GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,
                         IRQ_MV78XX0_GE_ERR, get_tclk());
 }
@@ -210,7 +207,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
  ****************************************************************************/
 void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        orion_ge01_init(eth_data, &mv78xx0_mbus_dram_info,
+        orion_ge01_init(eth_data,
                         GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,
                         NO_IRQ, get_tclk());
 }
@@ -234,7 +231,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
                 eth_data->duplex = DUPLEX_FULL;
         }
 
-        orion_ge10_init(eth_data, &mv78xx0_mbus_dram_info,
+        orion_ge10_init(eth_data,
                         GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,
                         NO_IRQ, get_tclk());
 }
@@ -258,7 +255,7 @@ void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
                 eth_data->duplex = DUPLEX_FULL;
         }
 
-        orion_ge11_init(eth_data, &mv78xx0_mbus_dram_info,
+        orion_ge11_init(eth_data,
                         GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,
                         NO_IRQ, get_tclk());
 }
@@ -277,8 +274,7 @@ void __init mv78xx0_i2c_init(void)
  ****************************************************************************/
 void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)
 {
-        orion_sata_init(sata_data, &mv78xx0_mbus_dram_info,
-                        SATA_PHYS_BASE, IRQ_MV78XX0_SATA);
+        orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_MV78XX0_SATA);
 }
 
 
diff --git a/arch/arm/mach-mv78xx0/common.h b/arch/arm/mach-mv78xx0/common.h
index 07d5f8f6be7d..507c767d49e0 100644
--- a/arch/arm/mach-mv78xx0/common.h
+++ b/arch/arm/mach-mv78xx0/common.h
@@ -23,7 +23,6 @@ void mv78xx0_init(void);
 void mv78xx0_init_early(void);
 void mv78xx0_init_irq(void);
 
-extern struct mbus_dram_target_info mv78xx0_mbus_dram_info;
 void mv78xx0_setup_cpu_mbus(void);
 void mv78xx0_setup_pcie_io_win(int window, u32 base, u32 size,
                                int maj, int min);
diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c
index cf4e494d44bf..df50342179e2 100644
--- a/arch/arm/mach-mv78xx0/mpp.c
+++ b/arch/arm/mach-mv78xx0/mpp.c
@@ -10,7 +10,6 @@
 #include <linux/gpio.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mbus.h>
 #include <linux/io.h>
 #include <plat/mpp.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index c51af1cac300..12fcb108b0e1 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -10,11 +10,11 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/mbus.h>
 #include <video/vga.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
 #include <plat/pcie.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 struct pcie_port {
@@ -153,7 +153,7 @@ static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys)
          * Generic PCIe unit setup.
          */
         orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
-        orion_pcie_setup(pp->base, &mv78xx0_mbus_dram_info);
+        orion_pcie_setup(pp->base);
 
         sys->resource[0] = &pp->res[0];
         sys->resource[1] = &pp->res[1];
diff --git a/arch/arm/mach-mx5/mm.c b/arch/arm/mach-mx5/mm.c
index df4a508f240a..bc17dfea3817 100644
--- a/arch/arm/mach-mx5/mm.c
+++ b/arch/arm/mach-mx5/mm.c
@@ -13,6 +13,7 @@
 
 #include <linux/mm.h>
 #include <linux/init.h>
+#include <linux/clk.h>
 
 #include <asm/mach/map.h>
 
@@ -21,10 +22,26 @@
 #include <mach/devices-common.h>
 #include <mach/iomux-v3.h>
 
+static struct clk *gpc_dvfs_clk;
+
 static void imx5_idle(void)
 {
-        if (!need_resched())
+        if (!need_resched()) {
+                /* gpc clock is needed for SRPG */
+                if (gpc_dvfs_clk == NULL) {
+                        gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
+                        if (IS_ERR(gpc_dvfs_clk))
+                                goto err0;
+                }
+                clk_enable(gpc_dvfs_clk);
                 mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
+                if (tzic_enable_wake())
+                        goto err1;
+                cpu_do_idle();
+err1:
+                clk_disable(gpc_dvfs_clk);
+        }
+err0:
         local_irq_enable();
 }
 
diff --git a/arch/arm/mach-mx5/system.c b/arch/arm/mach-mx5/system.c
index 144ebebc4a61..5eebfaad1226 100644
--- a/arch/arm/mach-mx5/system.c
+++ b/arch/arm/mach-mx5/system.c
@@ -55,9 +55,6 @@ void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode)
                         stop_mode = 1;
                 }
                 arm_srpgcr |= MXC_SRPGCR_PCR;
-
-                if (tzic_enable_wake(1) != 0)
-                        return;
                 break;
         case STOP_POWER_ON:
                 ccm_clpcr |= 0x2 << MXC_CCM_CLPCR_LPM_OFFSET;
diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c
index 0163b6d83773..e12e11231dc7 100644
--- a/arch/arm/mach-mxs/clock-mx23.c
+++ b/arch/arm/mach-mxs/clock-mx23.c
@@ -545,11 +545,11 @@ int __init mx23_clocks_init(void)
          */
         clk_set_parent(&ssp_clk, &ref_io_clk);
 
-        clk_enable(&cpu_clk);
-        clk_enable(&hbus_clk);
-        clk_enable(&xbus_clk);
-        clk_enable(&emi_clk);
-        clk_enable(&uart_clk);
+        clk_prepare_enable(&cpu_clk);
+        clk_prepare_enable(&hbus_clk);
+        clk_prepare_enable(&xbus_clk);
+        clk_prepare_enable(&emi_clk);
+        clk_prepare_enable(&uart_clk);
 
         clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index da6e4aad177c..5d68e4152220 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/clkdev.h>
+#include <linux/spinlock.h>
 
 #include <asm/clkdev.h>
 #include <asm/div64.h>
@@ -29,6 +30,7 @@
 #include <mach/mx28.h>
 #include <mach/common.h>
 #include <mach/clock.h>
+#include <mach/digctl.h>
 
 #include "regs-clkctrl-mx28.h"
 
@@ -43,6 +45,33 @@ static struct clk emi_clk;
 static struct clk saif0_clk;
 static struct clk saif1_clk;
 static struct clk clk32k_clk;
+static DEFINE_SPINLOCK(clkmux_lock);
+
+/*
+ * HW_SAIF_CLKMUX_SEL:
+ *  DIRECT(0x0): SAIF0 clock pins selected for SAIF0 input clocks, and SAIF1
+ *              clock pins selected for SAIF1 input clocks.
+ *  CROSSINPUT(0x1): SAIF1 clock inputs selected for SAIF0 input clocks, and
+ *              SAIF0 clock inputs selected for SAIF1 input clocks.
+ *  EXTMSTR0(0x2): SAIF0 clock pin selected for both SAIF0 and SAIF1 input
+ *              clocks.
+ *  EXTMSTR1(0x3): SAIF1 clock pin selected for both SAIF0 and SAIF1 input
+ *              clocks.
+ */
+int mxs_saif_clkmux_select(unsigned int clkmux)
+{
+        if (clkmux > 0x3)
+                return -EINVAL;
+
+        spin_lock(&clkmux_lock);
+        __raw_writel(BM_DIGCTL_CTRL_SAIF_CLKMUX,
+                        DIGCTRL_BASE_ADDR + HW_DIGCTL_CTRL + MXS_CLR_ADDR);
+        __raw_writel(clkmux << BP_DIGCTL_CTRL_SAIF_CLKMUX,
+                        DIGCTRL_BASE_ADDR + HW_DIGCTL_CTRL + MXS_SET_ADDR);
+        spin_unlock(&clkmux_lock);
+
+        return 0;
+}
 
 static int _raw_clk_enable(struct clk *clk)
 {
@@ -775,16 +804,25 @@ int __init mx28_clocks_init(void)
         clk_set_parent(&ssp0_clk, &ref_io0_clk);
         clk_set_parent(&ssp1_clk, &ref_io0_clk);
 
-        clk_enable(&cpu_clk);
-        clk_enable(&hbus_clk);
-        clk_enable(&xbus_clk);
-        clk_enable(&emi_clk);
-        clk_enable(&uart_clk);
+        clk_prepare_enable(&cpu_clk);
+        clk_prepare_enable(&hbus_clk);
+        clk_prepare_enable(&xbus_clk);
+        clk_prepare_enable(&emi_clk);
+        clk_prepare_enable(&uart_clk);
 
         clk_set_parent(&lcdif_clk, &ref_pix_clk);
         clk_set_parent(&saif0_clk, &pll0_clk);
         clk_set_parent(&saif1_clk, &pll0_clk);
 
+        /*
+         * Set an initial clock rate for the saif internal logic to work
+         * properly. This is important when working in EXTMASTER mode that
+         * uses the other saif's BITCLK&LRCLK but it still needs a basic
+         * clock which should be fast enough for the internal logic.
+         */
+        clk_set_rate(&saif0_clk, 24000000);
+        clk_set_rate(&saif1_clk, 24000000);
+
         clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
         mxs_timer_init(&clk32k_clk, MX28_INT_TIMER0);
diff --git a/arch/arm/mach-mxs/clock.c b/arch/arm/mach-mxs/clock.c
index a7093c88e6a6..97a6f4acc6cc 100644
--- a/arch/arm/mach-mxs/clock.c
+++ b/arch/arm/mach-mxs/clock.c
@@ -74,10 +74,15 @@ static int __clk_enable(struct clk *clk)
         return 0;
 }
 
-/* This function increments the reference count on the clock and enables the
- * clock if not already enabled. The parent clock tree is recursively enabled
+/*
+ * The clk_enable/clk_disable could be called by drivers in atomic context,
+ * so they should not really hold mutex.  Instead, clk_prepare/clk_unprepare
+ * can hold a mutex, as the pair will only be called in non-atomic context.
+ * Before migrating to common clk framework, we can have __clk_enable and
+ * __clk_disable called in clk_prepare/clk_unprepare with mutex held and
+ * leave clk_enable/clk_disable as the dummy functions.
  */
-int clk_enable(struct clk *clk)
+int clk_prepare(struct clk *clk)
 {
         int ret = 0;
 
@@ -90,13 +95,9 @@ int clk_enable(struct clk *clk)
 
         return ret;
 }
-EXPORT_SYMBOL(clk_enable);
+EXPORT_SYMBOL(clk_prepare);
 
-/* This function decrements the reference count on the clock and disables
- * the clock when reference count is 0. The parent clock tree is
- * recursively disabled
- */
-void clk_disable(struct clk *clk)
+void clk_unprepare(struct clk *clk)
 {
         if (clk == NULL || IS_ERR(clk))
                 return;
@@ -105,6 +106,18 @@ void clk_disable(struct clk *clk)
         __clk_disable(clk);
         mutex_unlock(&clocks_mutex);
 }
+EXPORT_SYMBOL(clk_unprepare);
+
+int clk_enable(struct clk *clk)
+{
+        return 0;
+}
+EXPORT_SYMBOL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+        /* nothing to do */
+}
 EXPORT_SYMBOL(clk_disable);
 
 /* Retrieve the *current* clock rate. If the clock itself
@@ -166,7 +179,7 @@ int clk_set_parent(struct clk *clk, struct clk *parent)
                 return ret;
 
         if (clk->usecount)
-                clk_enable(parent);
+                clk_prepare_enable(parent);
 
         mutex_lock(&clocks_mutex);
         ret = clk->set_parent(clk, parent);
diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
index c8887103f0e3..4f50094e293d 100644
--- a/arch/arm/mach-mxs/devices-mx28.h
+++ b/arch/arm/mach-mxs/devices-mx28.h
@@ -47,6 +47,7 @@ struct platform_device *__init mx28_add_mxsfb(
                 const struct mxsfb_platform_data *pdata);
 
 extern const struct mxs_saif_data mx28_saif_data[] __initconst;
-#define mx28_add_saif(id)              mxs_add_saif(&mx28_saif_data[id])
+#define mx28_add_saif(id, pdata) \
+        mxs_add_saif(&mx28_saif_data[id], pdata)
 
 struct platform_device *__init mx28_add_rtc_stmp3xxx(void);
diff --git a/arch/arm/mach-mxs/devices/platform-mxs-saif.c b/arch/arm/mach-mxs/devices/platform-mxs-saif.c
index 1ec965e9fe92..f6e3a60b4201 100644
--- a/arch/arm/mach-mxs/devices/platform-mxs-saif.c
+++ b/arch/arm/mach-mxs/devices/platform-mxs-saif.c
@@ -32,7 +32,8 @@ const struct mxs_saif_data mx28_saif_data[] __initconst = {
 };
 #endif
 
-struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data)
+struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data,
+                                const struct mxs_saif_platform_data *pdata)
 {
         struct resource res[] = {
                 {
@@ -56,5 +57,5 @@ struct platform_device *__init mxs_add_saif(const struct mxs_saif_data *data)
         };
 
         return mxs_add_platform_device("mxs-saif", data->id, res,
-                                        ARRAY_SIZE(res), NULL, 0);
+                                ARRAY_SIZE(res), pdata, sizeof(*pdata));
 }
diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h
index 1388485414c9..e1237ab25862 100644
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@ -17,6 +17,7 @@ extern const u32 *mxs_get_ocotp(void);
 extern int mxs_reset_block(void __iomem *);
 extern void mxs_timer_init(struct clk *, int);
 extern void mxs_restart(char, const char *);
+extern int mxs_saif_clkmux_select(unsigned int clkmux);
 
 extern int mx23_register_gpios(void);
 extern int mx23_clocks_init(void);
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index a8080f44c03d..dc369c1239fc 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -94,6 +94,7 @@ struct platform_device *__init mxs_add_mxs_pwm(
                 resource_size_t iobase, int id);
 
 /* saif */
+#include <sound/saif.h>
 struct mxs_saif_data {
         int id;
         resource_size_t iobase;
@@ -103,4 +104,5 @@ struct mxs_saif_data {
 };
 
 struct platform_device *__init mxs_add_saif(
-                const struct mxs_saif_data *data);
+                const struct mxs_saif_data *data,
+                const struct mxs_saif_platform_data *pdata);
diff --git a/arch/arm/mach-mxs/include/mach/digctl.h b/arch/arm/mach-mxs/include/mach/digctl.h
new file mode 100644
index 000000000000..49a888c65d6d
--- /dev/null
+++ b/arch/arm/mach-mxs/include/mach/digctl.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc. 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 version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __MACH_DIGCTL_H__
+#define __MACH_DIGCTL_H__
+
+/* MXS DIGCTL SAIF CLKMUX */
+#define MXS_DIGCTL_SAIF_CLKMUX_DIRECT           0x0
+#define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT       0x1
+#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0         0x2
+#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR1         0x3
+
+#define HW_DIGCTL_CTRL                  0x0
+#define  BP_DIGCTL_CTRL_SAIF_CLKMUX     10
+#define  BM_DIGCTL_CTRL_SAIF_CLKMUX     (0x3 << 10)
+#endif
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index d0cc37fd23a4..fdb0a5664dd6 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -27,6 +27,7 @@
 
 #include <mach/common.h>
 #include <mach/iomux-mx28.h>
+#include <mach/digctl.h>
 
 #include "devices-mx28.h"
 
@@ -228,7 +229,7 @@ static void __init mx28evk_fec_reset(void)
         /* Enable fec phy clock */
         clk = clk_get_sys("pll2", NULL);
         if (!IS_ERR(clk))
-                clk_enable(clk);
+                clk_prepare_enable(clk);
 
         /* Power up fec phy */
         ret = gpio_request(MX28EVK_FEC_PHY_POWER, "fec-phy-power");
@@ -421,6 +422,18 @@ static struct gpio mx28evk_lcd_gpios[] = {
         { MX28EVK_BL_ENABLE, GPIOF_OUT_INIT_HIGH, "bl-enable" },
 };
 
+static const struct mxs_saif_platform_data
+                        mx28evk_mxs_saif_pdata[] __initconst = {
+        /* working on EXTMSTR0 mode (saif0 master, saif1 slave) */
+        {
+                .master_mode = 1,
+                .master_id = 0,
+        }, {
+                .master_mode = 0,
+                .master_id = 0,
+        },
+};
+
 static void __init mx28evk_init(void)
 {
         int ret;
@@ -454,8 +467,9 @@ static void __init mx28evk_init(void)
         else
                 mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
 
-        mx28_add_saif(0);
-        mx28_add_saif(1);
+        mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
+        mx28_add_saif(0, &mx28evk_mxs_saif_pdata[0]);
+        mx28_add_saif(1, &mx28evk_mxs_saif_pdata[1]);
 
         mx28_add_mxs_i2c(0);
         i2c_register_board_info(0, mxs_i2c0_board_info,
diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
index b936633b7682..54f91ad1c965 100644
--- a/arch/arm/mach-mxs/system.c
+++ b/arch/arm/mach-mxs/system.c
@@ -66,7 +66,7 @@ static int __init mxs_arch_reset_init(void)
 
         clk = clk_get_sys("rtc", NULL);
         if (!IS_ERR(clk))
-                clk_enable(clk);
+                clk_prepare_enable(clk);
 
         return 0;
 }
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
index cace0d2e5a55..564a63279f18 100644
--- a/arch/arm/mach-mxs/timer.c
+++ b/arch/arm/mach-mxs/timer.c
@@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
 
 void __init mxs_timer_init(struct clk *timer_clk, int irq)
 {
-        clk_enable(timer_clk);
+        clk_prepare_enable(timer_clk);
 
         /*
          * Initialize timers to a known state
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 73f287d6429b..4f8d66f044e7 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -168,70 +168,6 @@ config MACH_OMAP_GENERIC
           custom OMAP boards. Say Y here if you have a custom
           board.
 
-comment "OMAP CPU Speed"
-        depends on ARCH_OMAP1
-
-config OMAP_ARM_216MHZ
-        bool "OMAP ARM 216 MHz CPU (1710 only)"
-        depends on ARCH_OMAP1 && ARCH_OMAP16XX
-        help
-          Enable 216 MHz clock for OMAP1710 CPU. If unsure, say N.
-
-config OMAP_ARM_195MHZ
-        bool "OMAP ARM 195 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP730 || ARCH_OMAP850)
-        help
-          Enable 195MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_192MHZ
-        bool "OMAP ARM 192 MHz CPU"
-        depends on ARCH_OMAP1 && ARCH_OMAP16XX
-        help
-          Enable 192MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_182MHZ
-        bool "OMAP ARM 182 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP730 || ARCH_OMAP850)
-        help
-          Enable 182MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_168MHZ
-        bool "OMAP ARM 168 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)
-        help
-          Enable 168MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_150MHZ
-        bool "OMAP ARM 150 MHz CPU"
-        depends on ARCH_OMAP1 && ARCH_OMAP15XX
-        help
-          Enable 150MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_120MHZ
-        bool "OMAP ARM 120 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)
-        help
-          Enable 120MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_96MHZ
-        bool "OMAP ARM 96 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)
-        help
-          Enable 96MHz clock for OMAP CPU. If unsure, say N.
-
-config OMAP_ARM_60MHZ
-        bool "OMAP ARM 60 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)
-        default y
-        help
-          Enable 60MHz clock for OMAP CPU. If unsure, say Y.
-
-config OMAP_ARM_30MHZ
-        bool "OMAP ARM 30 MHz CPU"
-        depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_OMAP850)
-        help
-          Enable 30MHz clock for OMAP CPU. If unsure, say N.
-
 endmenu
 
 endif
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 84ef70476b51..0c50df05d135 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -197,11 +197,10 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)
         ref_rate = ck_ref_p->rate;
 
         for (ptr = omap1_rate_table; ptr->rate; ptr++) {
-                if (ptr->xtal != ref_rate)
+                if (!(ptr->flags & cpu_mask))
                         continue;
 
-                /* DPLL1 cannot be reprogrammed without risking system crash */
-                if (likely(dpll1_rate != 0) && ptr->pll_rate != dpll1_rate)
+                if (ptr->xtal != ref_rate)
                         continue;
 
                 /* Can check only after xtal frequency check */
@@ -215,12 +214,8 @@ int omap1_select_table_rate(struct clk *clk, unsigned long rate)
         /*
          * In most cases we should not need to reprogram DPLL.
          * Reprogramming the DPLL is tricky, it must be done from SRAM.
-         * (on 730, bit 13 must always be 1)
          */
-        if (cpu_is_omap7xx())
-                omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val | 0x2000);
-        else
-                omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val);
+        omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val);
 
         /* XXX Do we need to recalculate the tree below DPLL1 at this point? */
         ck_dpll1_p->rate = ptr->pll_rate;
@@ -290,6 +285,9 @@ long omap1_round_to_table_rate(struct clk *clk, unsigned long rate)
         highest_rate = -EINVAL;
 
         for (ptr = omap1_rate_table; ptr->rate; ptr++) {
+                if (!(ptr->flags & cpu_mask))
+                        continue;
+
                 if (ptr->xtal != ref_rate)
                         continue;
 
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h
index 16b1423b454a..3d04f4f67676 100644
--- a/arch/arm/mach-omap1/clock.h
+++ b/arch/arm/mach-omap1/clock.h
@@ -111,4 +111,7 @@ extern const struct clkops clkops_dummy;
 extern const struct clkops clkops_uart_16xx;
 extern const struct clkops clkops_generic;
 
+/* used for passing SoC type to omap1_{select,round_to}_table_rate() */
+extern u32 cpu_mask;
+
 #endif
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index 9ff90a744a21..94699a82a734 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -25,6 +25,7 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/clkdev_omap.h>
+#include <plat/sram.h>  /* for omap_sram_reprogram_clock() */
 #include <plat/usb.h>   /* for OTG_BASE */
 
 #include "clock.h"
@@ -778,12 +779,14 @@ static void __init omap1_show_rates(void)
                 arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
 }
 
+u32 cpu_mask;
+
 int __init omap1_clk_init(void)
 {
         struct omap_clk *c;
         const struct omap_clock_config *info;
         int crystal_type = 0; /* Default 12 MHz */
-        u32 reg, cpu_mask;
+        u32 reg;
 
 #ifdef CONFIG_DEBUG_LL
         /*
@@ -808,6 +811,8 @@ int __init omap1_clk_init(void)
                 clk_preinit(c->lk.clk);
 
         cpu_mask = 0;
+        if (cpu_is_omap1710())
+                cpu_mask |= CK_1710;
         if (cpu_is_omap16xx())
                 cpu_mask |= CK_16XX;
         if (cpu_is_omap1510())
@@ -931,17 +936,13 @@ void __init omap1_clk_late_init(void)
 {
         unsigned long rate = ck_dpll1.rate;
 
-        if (rate >= OMAP1_DPLL1_SANE_VALUE)
-                return;
-
-        /* System booting at unusable rate, force reprogramming of DPLL1 */
-        ck_dpll1_p->rate = 0;
-
         /* Find the highest supported frequency and enable it */
         if (omap1_select_table_rate(&virtual_ck_mpu, ~0)) {
                 pr_err("System frequencies not set, using default. Check your config.\n");
-                omap_writew(0x2290, DPLL_CTL);
-                omap_writew(cpu_is_omap7xx() ? 0x2005 : 0x0005, ARM_CKCTL);
+                /*
+                 * Reprogramming the DPLL is tricky, it must be done from SRAM.
+                 */
+                omap_sram_reprogram_clock(0x2290, 0x0005);
                 ck_dpll1.rate = OMAP1_DPLL1_SANE_VALUE;
         }
         propagate_rate(&ck_dpll1);
diff --git a/arch/arm/mach-omap1/opp.h b/arch/arm/mach-omap1/opp.h
index 07074d79adce..79a683864a5c 100644
--- a/arch/arm/mach-omap1/opp.h
+++ b/arch/arm/mach-omap1/opp.h
@@ -21,6 +21,7 @@ struct mpu_rate {
         unsigned long           pll_rate;
         __u16                   ckctl_val;
         __u16                   dpllctl_val;
+        u32                     flags;
 };
 
 extern struct mpu_rate omap1_rate_table[];
diff --git a/arch/arm/mach-omap1/opp_data.c b/arch/arm/mach-omap1/opp_data.c
index 75a546514994..9cd4ddb51397 100644
--- a/arch/arm/mach-omap1/opp_data.c
+++ b/arch/arm/mach-omap1/opp_data.c
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <plat/clkdev_omap.h>
 #include "opp.h"
 
 /*-------------------------------------------------------------------------
@@ -20,40 +21,34 @@ struct mpu_rate omap1_rate_table[] = {
          * NOTE: Comment order here is different from bits in CKCTL value:
          * armdiv, dspdiv, dspmmu, tcdiv, perdiv, lcddiv
          */
-#if defined(CONFIG_OMAP_ARM_216MHZ)
-        { 216000000, 12000000, 216000000, 0x050d, 0x2910 }, /* 1/1/2/2/2/8 */
-#endif
-#if defined(CONFIG_OMAP_ARM_195MHZ)
-        { 195000000, 13000000, 195000000, 0x050e, 0x2790 }, /* 1/1/2/2/4/8 */
-#endif
-#if defined(CONFIG_OMAP_ARM_192MHZ)
-        { 192000000, 19200000, 192000000, 0x050f, 0x2510 }, /* 1/1/2/2/8/8 */
-        { 192000000, 12000000, 192000000, 0x050f, 0x2810 }, /* 1/1/2/2/8/8 */
-        {  96000000, 12000000, 192000000, 0x055f, 0x2810 }, /* 2/2/2/2/8/8 */
-        {  48000000, 12000000, 192000000, 0x0baf, 0x2810 }, /* 4/4/4/8/8/8 */
-        {  24000000, 12000000, 192000000, 0x0fff, 0x2810 }, /* 8/8/8/8/8/8 */
-#endif
-#if defined(CONFIG_OMAP_ARM_182MHZ)
-        { 182000000, 13000000, 182000000, 0x050e, 0x2710 }, /* 1/1/2/2/4/8 */
-#endif
-#if defined(CONFIG_OMAP_ARM_168MHZ)
-        { 168000000, 12000000, 168000000, 0x010f, 0x2710 }, /* 1/1/1/2/8/8 */
-#endif
-#if defined(CONFIG_OMAP_ARM_150MHZ)
-        { 150000000, 12000000, 150000000, 0x010a, 0x2cb0 }, /* 1/1/1/2/4/4 */
-#endif
-#if defined(CONFIG_OMAP_ARM_120MHZ)
-        { 120000000, 12000000, 120000000, 0x010a, 0x2510 }, /* 1/1/1/2/4/4 */
-#endif
-#if defined(CONFIG_OMAP_ARM_96MHZ)
-        {  96000000, 12000000,  96000000, 0x0005, 0x2410 }, /* 1/1/1/1/2/2 */
-#endif
-#if defined(CONFIG_OMAP_ARM_60MHZ)
-        {  60000000, 12000000,  60000000, 0x0005, 0x2290 }, /* 1/1/1/1/2/2 */
-#endif
-#if defined(CONFIG_OMAP_ARM_30MHZ)
-        {  30000000, 12000000,  60000000, 0x0555, 0x2290 }, /* 2/2/2/2/2/2 */
-#endif
+        { 216000000, 12000000, 216000000, 0x050d, 0x2910, /* 1/1/2/2/2/8 */
+                        CK_1710 },
+        { 195000000, 13000000, 195000000, 0x050e, 0x2790, /* 1/1/2/2/4/8 */
+                        CK_7XX },
+        { 192000000, 19200000, 192000000, 0x050f, 0x2510, /* 1/1/2/2/8/8 */
+                        CK_16XX },
+        { 192000000, 12000000, 192000000, 0x050f, 0x2810, /* 1/1/2/2/8/8 */
+                        CK_16XX },
+        {  96000000, 12000000, 192000000, 0x055f, 0x2810, /* 2/2/2/2/8/8 */
+                        CK_16XX },
+        {  48000000, 12000000, 192000000, 0x0baf, 0x2810, /* 4/4/4/8/8/8 */
+                        CK_16XX },
+        {  24000000, 12000000, 192000000, 0x0fff, 0x2810, /* 8/8/8/8/8/8 */
+                        CK_16XX },
+        { 182000000, 13000000, 182000000, 0x050e, 0x2710, /* 1/1/2/2/4/8 */
+                        CK_7XX },
+        { 168000000, 12000000, 168000000, 0x010f, 0x2710, /* 1/1/1/2/8/8 */
+                        CK_16XX|CK_7XX },
+        { 150000000, 12000000, 150000000, 0x010a, 0x2cb0, /* 1/1/1/2/4/4 */
+                        CK_1510 },
+        { 120000000, 12000000, 120000000, 0x010a, 0x2510, /* 1/1/1/2/4/4 */
+                        CK_16XX|CK_1510|CK_310|CK_7XX },
+        {  96000000, 12000000,  96000000, 0x0005, 0x2410, /* 1/1/1/1/2/2 */
+                        CK_16XX|CK_1510|CK_310|CK_7XX },
+        {  60000000, 12000000,  60000000, 0x0005, 0x2290, /* 1/1/1/1/2/2 */
+                        CK_16XX|CK_1510|CK_310|CK_7XX },
+        {  30000000, 12000000,  60000000, 0x0555, 0x2290, /* 2/2/2/2/2/2 */
+                        CK_16XX|CK_1510|CK_310|CK_7XX },
         { 0, 0, 0, 0, 0 },
 };
 
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 4f01533083cc..904bd1dfcd2e 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -78,8 +78,13 @@ config SOC_OMAP3430
         default y
         select ARCH_OMAP_OTG
 
-config SOC_OMAPTI816X
-        bool "TI816X support"
+config SOC_OMAPTI81XX
+        bool "TI81XX support"
+        depends on ARCH_OMAP3
+        default y
+
+config SOC_OMAPAM33XX
+        bool "AM33XX support"
         depends on ARCH_OMAP3
         default y
 
@@ -316,7 +321,12 @@ config MACH_OMAP_3630SDP
 
 config MACH_TI8168EVM
         bool "TI8168 Evaluation Module"
-        depends on SOC_OMAPTI816X
+        depends on SOC_OMAPTI81XX
+        default y
+
+config MACH_TI8148EVM
+        bool "TI8148 Evaluation Module"
+        depends on SOC_OMAPTI81XX
         default y
 
 config MACH_OMAP_4430SDP
@@ -355,6 +365,27 @@ config OMAP3_SDRC_AC_TIMING
           wish to say no.  Selecting yes without understanding what is
           going on could result in system crashes;
 
+config OMAP4_ERRATA_I688
+        bool "OMAP4 errata: Async Bridge Corruption"
+        depends on ARCH_OMAP4
+        select ARCH_HAS_BARRIERS
+        help
+          If a data is stalled inside asynchronous bridge because of back
+          pressure, it may be accepted multiple times, creating pointer
+          misalignment that will corrupt next transfers on that data path
+          until next reset of the system (No recovery procedure once the
+          issue is hit, the path remains consistently broken). Async bridge
+          can be found on path between MPU to EMIF and MPU to L3 interconnect.
+          This situation can happen only when the idle is initiated by a
+          Master Request Disconnection (which is trigged by software when
+          executing WFI on CPU).
+          The work-around for this errata needs all the initiators connected
+          through async bridge must ensure that data path is properly drained
+          before issuing WFI. This condition will be met if one Strongly ordered
+          access is performed to the target right before executing the WFI.
+          In MPU case, L3 T2ASYNC FIFO and DDR T2ASYNC FIFO needs to be drained.
+          IO barrier ensure that there is no synchronisation loss on initiators
+          operating on both interconnect port simultaneously.
 endmenu
 
 endif
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index b009f17dee56..fc9b238cbc19 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -11,10 +11,11 @@ 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
 
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
+obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
+obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
@@ -24,11 +25,13 @@ obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
 obj-$(CONFIG_SMP)                       += omap-smp.o omap-headsmp.o
 obj-$(CONFIG_LOCAL_TIMERS)              += timer-mpu.o
 obj-$(CONFIG_HOTPLUG_CPU)               += omap-hotplug.o
-obj-$(CONFIG_ARCH_OMAP4)                += omap44xx-smc.o omap4-common.o
+obj-$(CONFIG_ARCH_OMAP4)                += omap4-common.o omap-wakeupgen.o \
+                                           sleep44xx.o
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_omap-headsmp.o                   :=-Wa,-march=armv7-a$(plus_sec)
-AFLAGS_omap44xx-smc.o                   :=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_omap-smc.o                       :=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_sleep44xx.o                      :=-Wa,-march=armv7-a$(plus_sec)
 
 # Functions loaded to SRAM
 obj-$(CONFIG_SOC_OMAP2420)              += sram242x.o
@@ -62,7 +65,8 @@ obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o
 obj-$(CONFIG_ARCH_OMAP2)                += sleep24xx.o
 obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o \
                                            cpuidle34xx.o
-obj-$(CONFIG_ARCH_OMAP4)                += pm44xx.o
+obj-$(CONFIG_ARCH_OMAP4)                += pm44xx.o omap-mpuss-lowpower.o \
+                                           cpuidle44xx.o
 obj-$(CONFIG_PM_DEBUG)                  += pm-debug.o
 obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
 obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)   += smartreflex-class3.o
@@ -77,6 +81,7 @@ endif
 endif
 
 # PRCM
+obj-y                                   += prm_common.o
 obj-$(CONFIG_ARCH_OMAP2)                += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
 obj-$(CONFIG_ARCH_OMAP3)                += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \
                                            vc3xxx_data.o vp3xxx_data.o
@@ -86,7 +91,7 @@ obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \
 obj-$(CONFIG_ARCH_OMAP4)                += prcm.o cm2xxx_3xxx.o cminst44xx.o \
                                            cm44xx.o prcm_mpu44xx.o \
                                            prminst44xx.o vc44xx_data.o \
-                                           vp44xx_data.o
+                                           vp44xx_data.o prm44xx.o
 
 # OMAP voltage domains
 voltagedomain-common                    := voltage.o vc.o vp.o
@@ -232,6 +237,7 @@ obj-$(CONFIG_MACH_CRANEBOARD)		+= board-am3517crane.o
 
 obj-$(CONFIG_MACH_SBC3530)              += board-omap3stalker.o
 obj-$(CONFIG_MACH_TI8168EVM)            += board-ti8168evm.o
+obj-$(CONFIG_MACH_TI8148EVM)            += board-ti8168evm.o
 
 # Platform specific device init code
 
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 9996334cb687..383717ba63b9 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -475,106 +475,8 @@ static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
 static struct omap_board_mux board_mux[] __initdata = {
         { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-
-static struct omap_device_pad serial1_pads[] __initdata = {
-        /*
-         * Note that off output enable is an active low
-         * signal. So setting this means pin is a
-         * input enabled in off mode
-         */
-        OMAP_MUX_STATIC("uart1_cts.uart1_cts",
-                         OMAP_PIN_INPUT |
-                         OMAP_PIN_OFF_INPUT_PULLDOWN |
-                         OMAP_OFFOUT_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart1_rts.uart1_rts",
-                         OMAP_PIN_OUTPUT |
-                         OMAP_OFF_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart1_rx.uart1_rx",
-                         OMAP_PIN_INPUT |
-                         OMAP_PIN_OFF_INPUT_PULLDOWN |
-                         OMAP_OFFOUT_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart1_tx.uart1_tx",
-                         OMAP_PIN_OUTPUT |
-                         OMAP_OFF_EN |
-                         OMAP_MUX_MODE0),
-};
-
-static struct omap_device_pad serial2_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart2_cts.uart2_cts",
-                         OMAP_PIN_INPUT_PULLUP |
-                         OMAP_PIN_OFF_INPUT_PULLDOWN |
-                         OMAP_OFFOUT_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_rts.uart2_rts",
-                         OMAP_PIN_OUTPUT |
-                         OMAP_OFF_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_rx.uart2_rx",
-                         OMAP_PIN_INPUT |
-                         OMAP_PIN_OFF_INPUT_PULLDOWN |
-                         OMAP_OFFOUT_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_tx.uart2_tx",
-                         OMAP_PIN_OUTPUT |
-                         OMAP_OFF_EN |
-                         OMAP_MUX_MODE0),
-};
-
-static struct omap_device_pad serial3_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",
-                         OMAP_PIN_INPUT_PULLDOWN |
-                         OMAP_PIN_OFF_INPUT_PULLDOWN |
-                         OMAP_OFFOUT_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",
-                         OMAP_PIN_OUTPUT |
-                         OMAP_OFF_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",
-                         OMAP_PIN_INPUT |
-                         OMAP_PIN_OFF_INPUT_PULLDOWN |
-                         OMAP_OFFOUT_EN |
-                         OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",
-                         OMAP_PIN_OUTPUT |
-                         OMAP_OFF_EN |
-                         OMAP_MUX_MODE0),
-};
-
-static struct omap_board_data serial1_data __initdata = {
-        .id             = 0,
-        .pads           = serial1_pads,
-        .pads_cnt       = ARRAY_SIZE(serial1_pads),
-};
-
-static struct omap_board_data serial2_data __initdata = {
-        .id             = 1,
-        .pads           = serial2_pads,
-        .pads_cnt       = ARRAY_SIZE(serial2_pads),
-};
-
-static struct omap_board_data serial3_data __initdata = {
-        .id             = 2,
-        .pads           = serial3_pads,
-        .pads_cnt       = ARRAY_SIZE(serial3_pads),
-};
-
-static inline void board_serial_init(void)
-{
-        omap_serial_init_port(&serial1_data);
-        omap_serial_init_port(&serial2_data);
-        omap_serial_init_port(&serial3_data);
-}
 #else
 #define board_mux       NULL
-
-static inline void board_serial_init(void)
-{
-        omap_serial_init();
-}
 #endif
 
 /*
@@ -711,7 +613,7 @@ static void __init omap_3430sdp_init(void)
         else
                 gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV1;
         omap_ads7846_init(1, gpio_pendown, 310, NULL);
-        board_serial_init();
+        omap_serial_init();
         omap_sdrc_init(hyb18m512160af6_sdrc_params, NULL);
         usb_musb_init(NULL);
         board_smc91x_init();
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index bad5d5a5ef79..2ceb75d21eb2 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -372,11 +372,17 @@ static struct platform_device sdp4430_vbat = {
         },
 };
 
+static struct platform_device sdp4430_dmic_codec = {
+        .name   = "dmic-codec",
+        .id     = -1,
+};
+
 static struct platform_device *sdp4430_devices[] __initdata = {
         &sdp4430_gpio_keys_device,
         &sdp4430_leds_gpio,
         &sdp4430_leds_pwm,
         &sdp4430_vbat,
+        &sdp4430_dmic_codec,
 };
 
 static struct omap_musb_board_data musb_board_data = {
@@ -404,6 +410,7 @@ static struct omap2_hsmmc_info mmc[] = {
         {
                 .mmc            = 5,
                 .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD,
+                .pm_caps        = MMC_PM_KEEP_POWER,
                 .gpio_cd        = -EINVAL,
                 .gpio_wp        = -EINVAL,
                 .ocr_mask       = MMC_VDD_165_195,
@@ -837,74 +844,8 @@ static struct omap_board_mux board_mux[] __initdata = {
         { .reg_offset = OMAP_MUX_TERMINATOR },
 };
 
-static struct omap_device_pad serial2_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart2_cts.uart2_cts",
-                         OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_rts.uart2_rts",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_rx.uart2_rx",
-                         OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_tx.uart2_tx",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-};
-
-static struct omap_device_pad serial3_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",
-                         OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",
-                         OMAP_PIN_INPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-};
-
-static struct omap_device_pad serial4_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart4_rx.uart4_rx",
-                         OMAP_PIN_INPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart4_tx.uart4_tx",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-};
-
-static struct omap_board_data serial2_data __initdata = {
-        .id             = 1,
-        .pads           = serial2_pads,
-        .pads_cnt       = ARRAY_SIZE(serial2_pads),
-};
-
-static struct omap_board_data serial3_data __initdata = {
-        .id             = 2,
-        .pads           = serial3_pads,
-        .pads_cnt       = ARRAY_SIZE(serial3_pads),
-};
-
-static struct omap_board_data serial4_data __initdata = {
-        .id             = 3,
-        .pads           = serial4_pads,
-        .pads_cnt       = ARRAY_SIZE(serial4_pads),
-};
-
-static inline void board_serial_init(void)
-{
-        struct omap_board_data bdata;
-        bdata.flags     = 0;
-        bdata.pads      = NULL;
-        bdata.pads_cnt  = 0;
-        bdata.id        = 0;
-        /* pass dummy data for UART1 */
-        omap_serial_init_port(&bdata);
-
-        omap_serial_init_port(&serial2_data);
-        omap_serial_init_port(&serial3_data);
-        omap_serial_init_port(&serial4_data);
-}
 #else
 #define board_mux       NULL
-
-static inline void board_serial_init(void)
-{
-        omap_serial_init();
-}
  #endif
 
 static void omap4_sdp4430_wifi_mux_init(void)
@@ -954,7 +895,7 @@ static void __init omap_4430sdp_init(void)
         omap4_i2c_init();
         omap_sfh7741prox_init();
         platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices));
-        board_serial_init();
+        omap_serial_init();
         omap_sdrc_init(NULL, NULL);
         omap4_sdp4430_wifi_init();
         omap4_twl6030_hsmmc_init(mmc);
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index f5a3a3f11739..4b1cfe32e6ba 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -24,6 +24,7 @@
 #include <linux/i2c/pca953x.h>
 #include <linux/can/platform/ti_hecc.h>
 #include <linux/davinci_emac.h>
+#include <linux/mmc/host.h>
 
 #include <mach/hardware.h>
 #include <mach/am35xx.h>
@@ -40,6 +41,7 @@
 
 #include "mux.h"
 #include "control.h"
+#include "hsmmc.h"
 
 #define AM35XX_EVM_MDIO_FREQUENCY       (1000000)
 
@@ -455,6 +457,23 @@ static void am3517_evm_hecc_init(struct ti_hecc_platform_data *pdata)
 static struct omap_board_config_kernel am3517_evm_config[] __initdata = {
 };
 
+static struct omap2_hsmmc_info mmc[] = {
+        {
+                .mmc            = 1,
+                .caps           = MMC_CAP_4_BIT_DATA,
+                .gpio_cd        = 127,
+                .gpio_wp        = 126,
+        },
+        {
+                .mmc            = 2,
+                .caps           = MMC_CAP_4_BIT_DATA,
+                .gpio_cd        = 128,
+                .gpio_wp        = 129,
+        },
+        {}      /* Terminator */
+};
+
+
 static void __init am3517_evm_init(void)
 {
         omap_board_config = am3517_evm_config;
@@ -483,6 +502,9 @@ static void __init am3517_evm_init(void)
 
         /* MUSB */
         am3517_evm_musb_init();
+
+        /* MMC init function */
+        omap2_hsmmc_init(mmc);
 }
 
 MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 1545102d1f9b..e921e3be24a4 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -53,7 +53,8 @@
 #include "hsmmc.h"
 #include "common-board-devices.h"
 
-#define CM_T35_GPIO_PENDOWN     57
+#define CM_T35_GPIO_PENDOWN             57
+#define SB_T35_USB_HUB_RESET_GPIO       167
 
 #define CM_T35_SMSC911X_CS      5
 #define CM_T35_SMSC911X_GPIO    163
@@ -339,8 +340,10 @@ static struct regulator_consumer_supply cm_t35_vsim_supply[] = {
         REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),
 };
 
-static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
-        REGULATOR_SUPPLY("vdvi", "omapdss"),
+static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
+        REGULATOR_SUPPLY("vcc", "spi1.0"),
+        REGULATOR_SUPPLY("vdds_dsi", "omapdss"),
+        REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),
 };
 
 /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
@@ -373,6 +376,19 @@ static struct regulator_init_data cm_t35_vsim = {
         .consumer_supplies      = cm_t35_vsim_supply,
 };
 
+static struct regulator_init_data cm_t35_vio = {
+        .constraints = {
+                .min_uV                 = 1800000,
+                .max_uV                 = 1800000,
+                .apply_uV               = true,
+                .valid_modes_mask       = REGULATOR_MODE_NORMAL
+                                        | REGULATOR_MODE_STANDBY,
+                .valid_ops_mask         = REGULATOR_CHANGE_MODE,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(cm_t35_vio_supplies),
+        .consumer_supplies      = cm_t35_vio_supplies,
+};
+
 static uint32_t cm_t35_keymap[] = {
         KEY(0, 0, KEY_A),       KEY(0, 1, KEY_B),       KEY(0, 2, KEY_LEFT),
         KEY(1, 0, KEY_UP),      KEY(1, 1, KEY_ENTER),   KEY(1, 2, KEY_DOWN),
@@ -421,6 +437,23 @@ static struct usbhs_omap_board_data usbhs_bdata __initdata = {
         .reset_gpio_port[2]  = -EINVAL
 };
 
+static void cm_t35_init_usbh(void)
+{
+        int err;
+
+        err = gpio_request_one(SB_T35_USB_HUB_RESET_GPIO,
+                               GPIOF_OUT_INIT_LOW, "usb hub rst");
+        if (err) {
+                pr_err("SB-T35: usb hub rst gpio request failed: %d\n", err);
+        } else {
+                udelay(10);
+                gpio_set_value(SB_T35_USB_HUB_RESET_GPIO, 1);
+                msleep(1);
+        }
+
+        usbhs_init(&usbhs_bdata);
+}
+
 static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio,
                                  unsigned ngpio)
 {
@@ -456,17 +489,14 @@ static struct twl4030_platform_data cm_t35_twldata = {
         .gpio           = &cm_t35_gpio_data,
         .vmmc1          = &cm_t35_vmmc1,
         .vsim           = &cm_t35_vsim,
+        .vio            = &cm_t35_vio,
 };
 
 static void __init cm_t35_init_i2c(void)
 {
         omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
-                        TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
-
-        cm_t35_twldata.vpll2->constraints.name = "VDVI";
-        cm_t35_twldata.vpll2->num_consumer_supplies =
-                                                ARRAY_SIZE(cm_t35_vdvi_supply);
-        cm_t35_twldata.vpll2->consumer_supplies = cm_t35_vdvi_supply;
+                              TWL_COMMON_REGULATOR_VDAC |
+                              TWL_COMMON_PDATA_AUDIO);
 
         omap3_pmic_init("tps65930", &cm_t35_twldata);
 }
@@ -570,24 +600,28 @@ static void __init cm_t3x_common_dss_mux_init(int mux_mode)
 
 static void __init cm_t35_init_mux(void)
 {
-        omap_mux_init_signal("gpio_70", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("gpio_71", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("gpio_72", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("gpio_73", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("gpio_74", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("gpio_75", OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
-        cm_t3x_common_dss_mux_init(OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT);
+        int mux_mode = OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT;
+
+        omap_mux_init_signal("dss_data0.dss_data0", mux_mode);
+        omap_mux_init_signal("dss_data1.dss_data1", mux_mode);
+        omap_mux_init_signal("dss_data2.dss_data2", mux_mode);
+        omap_mux_init_signal("dss_data3.dss_data3", mux_mode);
+        omap_mux_init_signal("dss_data4.dss_data4", mux_mode);
+        omap_mux_init_signal("dss_data5.dss_data5", mux_mode);
+        cm_t3x_common_dss_mux_init(mux_mode);
 }
 
 static void __init cm_t3730_init_mux(void)
 {
-        omap_mux_init_signal("sys_boot0", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("sys_boot1", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("sys_boot3", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("sys_boot4", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("sys_boot5", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
-        omap_mux_init_signal("sys_boot6", OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
-        cm_t3x_common_dss_mux_init(OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT);
+        int mux_mode = OMAP_MUX_MODE3 | OMAP_PIN_OUTPUT;
+
+        omap_mux_init_signal("sys_boot0", mux_mode);
+        omap_mux_init_signal("sys_boot1", mux_mode);
+        omap_mux_init_signal("sys_boot3", mux_mode);
+        omap_mux_init_signal("sys_boot4", mux_mode);
+        omap_mux_init_signal("sys_boot5", mux_mode);
+        omap_mux_init_signal("sys_boot6", mux_mode);
+        cm_t3x_common_dss_mux_init(mux_mode);
 }
 #else
 static inline void cm_t35_init_mux(void) {}
@@ -612,7 +646,7 @@ static void __init cm_t3x_common_init(void)
         cm_t35_init_display();
 
         usb_musb_init(NULL);
-        usbhs_init(&usbhs_bdata);
+        cm_t35_init_usbh();
 }
 
 static void __init cm_t35_init(void)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index f8c5b2cc7c9c..d58756060483 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -69,7 +69,6 @@ static void __init omap_generic_init(void)
         if (node)
                 irq_domain_add_simple(node, 0);
 
-        omap_serial_init();
         omap_sdrc_init(NULL, NULL);
 
         of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index cef2cf1c0b8d..42a4d11fad23 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -46,7 +46,7 @@ static struct device *mmc_device;
 #define TUSB6010_GPIO_ENABLE    0
 #define TUSB6010_DMACHAN        0x3f
 
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
 /*
  * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
  * 1.5 V voltage regulators of PM companion chip. Companion chip will then
@@ -644,15 +644,15 @@ static inline void board_serial_init(void)
         bdata.pads_cnt = 0;
 
         bdata.id = 0;
-        omap_serial_init_port(&bdata);
+        omap_serial_init_port(&bdata, NULL);
 
         bdata.id = 1;
-        omap_serial_init_port(&bdata);
+        omap_serial_init_port(&bdata, NULL);
 
         bdata.id = 2;
         bdata.pads = serial2_pads;
         bdata.pads_cnt = ARRAY_SIZE(serial2_pads);
-        omap_serial_init_port(&bdata);
+        omap_serial_init_port(&bdata, NULL);
 }
 
 #else
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 8b06c6a60d02..e96a2e7ad36f 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -364,74 +364,8 @@ static struct omap_board_mux board_mux[] __initdata = {
         { .reg_offset = OMAP_MUX_TERMINATOR },
 };
 
-static struct omap_device_pad serial2_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart2_cts.uart2_cts",
-                         OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_rts.uart2_rts",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_rx.uart2_rx",
-                         OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart2_tx.uart2_tx",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-};
-
-static struct omap_device_pad serial3_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart3_cts_rctx.uart3_cts_rctx",
-                         OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_rts_sd.uart3_rts_sd",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_rx_irrx.uart3_rx_irrx",
-                         OMAP_PIN_INPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart3_tx_irtx.uart3_tx_irtx",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-};
-
-static struct omap_device_pad serial4_pads[] __initdata = {
-        OMAP_MUX_STATIC("uart4_rx.uart4_rx",
-                         OMAP_PIN_INPUT | OMAP_MUX_MODE0),
-        OMAP_MUX_STATIC("uart4_tx.uart4_tx",
-                         OMAP_PIN_OUTPUT | OMAP_MUX_MODE0),
-};
-
-static struct omap_board_data serial2_data __initdata = {
-        .id             = 1,
-        .pads           = serial2_pads,
-        .pads_cnt       = ARRAY_SIZE(serial2_pads),
-};
-
-static struct omap_board_data serial3_data __initdata = {
-        .id             = 2,
-        .pads           = serial3_pads,
-        .pads_cnt       = ARRAY_SIZE(serial3_pads),
-};
-
-static struct omap_board_data serial4_data __initdata = {
-        .id             = 3,
-        .pads           = serial4_pads,
-        .pads_cnt       = ARRAY_SIZE(serial4_pads),
-};
-
-static inline void board_serial_init(void)
-{
-        struct omap_board_data bdata;
-        bdata.flags     = 0;
-        bdata.pads      = NULL;
-        bdata.pads_cnt  = 0;
-        bdata.id        = 0;
-        /* pass dummy data for UART1 */
-        omap_serial_init_port(&bdata);
-
-        omap_serial_init_port(&serial2_data);
-        omap_serial_init_port(&serial3_data);
-        omap_serial_init_port(&serial4_data);
-}
 #else
 #define board_mux       NULL
-
-static inline void board_serial_init(void)
-{
-        omap_serial_init();
-}
 #endif
 
 /* Display DVI */
@@ -562,7 +496,7 @@ static void __init omap4_panda_init(void)
         omap4_panda_i2c_init();
         platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));
         platform_device_register(&omap_vwlan_device);
-        board_serial_init();
+        omap_serial_init();
         omap_sdrc_init(NULL, NULL);
         omap4_twl6030_hsmmc_init(mmc);
         omap4_ehci_init();
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 108fee6146fc..d67bcdf724d7 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -15,6 +15,7 @@
 #include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 #include <linux/wl12xx.h>
+#include <linux/spi/tsc2005.h>
 #include <linux/i2c.h>
 #include <linux/i2c/twl.h>
 #include <linux/clk.h>
@@ -58,6 +59,9 @@
 
 #define RX51_USB_TRANSCEIVER_RST_GPIO   67
 
+#define RX51_TSC2005_RESET_GPIO         104
+#define RX51_TSC2005_IRQ_GPIO           100
+
 /* list all spi devices here */
 enum {
         RX51_SPI_WL1251,
@@ -66,6 +70,7 @@ enum {
 };
 
 static struct wl12xx_platform_data wl1251_pdata;
+static struct tsc2005_platform_data tsc2005_pdata;
 
 #if defined(CONFIG_SENSORS_TSL2563) || defined(CONFIG_SENSORS_TSL2563_MODULE)
 static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
@@ -167,10 +172,10 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
                 .modalias               = "tsc2005",
                 .bus_num                = 1,
                 .chip_select            = 0,
-                /* .irq = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),*/
+                .irq                    = OMAP_GPIO_IRQ(RX51_TSC2005_IRQ_GPIO),
                 .max_speed_hz           = 6000000,
                 .controller_data        = &tsc2005_mcspi_config,
-                /* .platform_data = &tsc2005_config,*/
+                .platform_data          = &tsc2005_pdata,
         },
 };
 
@@ -1086,6 +1091,42 @@ error:
          */
 }
 
+static struct tsc2005_platform_data tsc2005_pdata = {
+        .ts_pressure_max        = 2048,
+        .ts_pressure_fudge      = 2,
+        .ts_x_max               = 4096,
+        .ts_x_fudge             = 4,
+        .ts_y_max               = 4096,
+        .ts_y_fudge             = 7,
+        .ts_x_plate_ohm         = 280,
+        .esd_timeout_ms         = 8000,
+};
+
+static void rx51_tsc2005_set_reset(bool enable)
+{
+        gpio_set_value(RX51_TSC2005_RESET_GPIO, enable);
+}
+
+static void __init rx51_init_tsc2005(void)
+{
+        int r;
+
+        r = gpio_request_one(RX51_TSC2005_IRQ_GPIO, GPIOF_IN, "tsc2005 IRQ");
+        if (r < 0) {
+                printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 IRQ");
+                rx51_peripherals_spi_board_info[RX51_SPI_TSC2005].irq = 0;
+        }
+
+        r = gpio_request_one(RX51_TSC2005_RESET_GPIO, GPIOF_OUT_INIT_HIGH,
+                "tsc2005 reset");
+        if (r >= 0) {
+                tsc2005_pdata.set_reset = rx51_tsc2005_set_reset;
+        } else {
+                printk(KERN_ERR "unable to get %s GPIO\n", "tsc2005 reset");
+                tsc2005_pdata.esd_timeout_ms = 0;
+        }
+}
+
 void __init rx51_peripherals_init(void)
 {
         rx51_i2c_init();
@@ -1094,6 +1135,7 @@ void __init rx51_peripherals_init(void)
         board_smc91x_init();
         rx51_add_gpio_keys();
         rx51_init_wl1251();
+        rx51_init_tsc2005();
         rx51_init_si4713();
         spi_register_board_info(rx51_peripherals_spi_board_info,
                                 ARRAY_SIZE(rx51_peripherals_spi_board_info));
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c
index 74713e3993e5..ab9a7a9e9d64 100644
--- a/arch/arm/mach-omap2/board-ti8168evm.c
+++ b/arch/arm/mach-omap2/board-ti8168evm.c
@@ -1,5 +1,5 @@
 /*
- * Code for TI8168 EVM.
+ * Code for TI8168/TI8148 EVM.
  *
  * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/
  *
@@ -23,30 +23,45 @@
 #include <plat/irqs.h>
 #include <plat/board.h>
 #include "common.h"
+#include <plat/usb.h>
 
-static struct omap_board_config_kernel ti8168_evm_config[] __initdata = {
+static struct omap_musb_board_data musb_board_data = {
+        .set_phy_power  = ti81xx_musb_phy_power,
+        .interface_type = MUSB_INTERFACE_ULPI,
+        .mode           = MUSB_OTG,
+        .power          = 500,
 };
 
-static void __init ti8168_evm_init(void)
+static struct omap_board_config_kernel ti81xx_evm_config[] __initdata = {
+};
+
+static void __init ti81xx_evm_init(void)
 {
         omap_serial_init();
         omap_sdrc_init(NULL, NULL);
-        omap_board_config = ti8168_evm_config;
-        omap_board_config_size = ARRAY_SIZE(ti8168_evm_config);
-}
-
-static void __init ti8168_evm_map_io(void)
-{
-        omapti816x_map_common_io();
+        omap_board_config = ti81xx_evm_config;
+        omap_board_config_size = ARRAY_SIZE(ti81xx_evm_config);
+        usb_musb_init(&musb_board_data);
 }
 
 MACHINE_START(TI8168EVM, "ti8168evm")
         /* Maintainer: Texas Instruments */
         .atag_offset    = 0x100,
-        .map_io         = ti8168_evm_map_io,
-        .init_early     = ti816x_init_early,
-        .init_irq       = ti816x_init_irq,
+        .map_io         = ti81xx_map_io,
+        .init_early     = ti81xx_init_early,
+        .init_irq       = ti81xx_init_irq,
+        .timer          = &omap3_timer,
+        .init_machine   = ti81xx_evm_init,
+        .restart        = omap_prcm_restart,
+MACHINE_END
+
+MACHINE_START(TI8148EVM, "ti8148evm")
+        /* Maintainer: Texas Instruments */
+        .atag_offset    = 0x100,
+        .map_io         = ti81xx_map_io,
+        .init_early     = ti81xx_init_early,
+        .init_irq       = ti81xx_init_irq,
         .timer          = &omap3_timer,
-        .init_machine   = ti8168_evm_init,
+        .init_machine   = ti81xx_evm_init,
         .restart        = omap_prcm_restart,
 MACHINE_END
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 1f3481f8d695..f57ed5baeccf 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -35,7 +35,7 @@
 #include "cm-regbits-24xx.h"
 #include "cm-regbits-34xx.h"
 
-u8 cpu_mask;
+u16 cpu_mask;
 
 /*
  * clkdm_control: if true, then when a clock is enabled in the
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 2311bc217226..b8c2a686481c 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -132,7 +132,7 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name,
                                const char *core_ck_name,
                                const char *mpu_ck_name);
 
-extern u8 cpu_mask;
+extern u16 cpu_mask;
 
 extern const struct clkops clkops_omap2_dflt_wait;
 extern const struct clkops clkops_dummy;
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 5d0064a4fb5a..d75e5f6b8a01 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -2480,6 +2480,16 @@ static struct clk uart4_fck = {
         .recalc         = &followparent_recalc,
 };
 
+static struct clk uart4_fck_am35xx = {
+        .name           = "uart4_fck",
+        .ops            = &clkops_omap2_dflt_wait,
+        .parent         = &per_48m_fck,
+        .enable_reg     = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1),
+        .enable_bit     = OMAP3430_EN_UART4_SHIFT,
+        .clkdm_name     = "core_l4_clkdm",
+        .recalc         = &followparent_recalc,
+};
+
 static struct clk gpt2_fck = {
         .name           = "gpt2_fck",
         .ops            = &clkops_omap2_dflt_wait,
@@ -3287,7 +3297,7 @@ static struct omap_clk omap3xxx_clks[] = {
         CLK(NULL,       "cpefuse_fck",  &cpefuse_fck,   CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK(NULL,       "ts_fck",       &ts_fck,        CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK(NULL,       "usbtll_fck",   &usbtll_fck,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-        CLK("usbhs-omap.0",     "usbtll_fck",   &usbtll_fck,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+        CLK("usbhs_omap",       "usbtll_fck",   &usbtll_fck,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK("omap-mcbsp.1",     "prcm_fck",     &core_96m_fck,  CK_3XXX),
         CLK("omap-mcbsp.5",     "prcm_fck",     &core_96m_fck,  CK_3XXX),
         CLK(NULL,       "core_96m_fck", &core_96m_fck,  CK_3XXX),
@@ -3323,7 +3333,7 @@ static struct omap_clk omap3xxx_clks[] = {
         CLK(NULL,       "pka_ick",      &pka_ick,       CK_34XX | CK_36XX),
         CLK(NULL,       "core_l4_ick",  &core_l4_ick,   CK_3XXX),
         CLK(NULL,       "usbtll_ick",   &usbtll_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-        CLK("usbhs-omap.0",     "usbtll_ick",   &usbtll_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+        CLK("usbhs_omap",       "usbtll_ick",   &usbtll_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK("omap_hsmmc.2",     "ick",  &mmchs3_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK(NULL,       "icr_ick",      &icr_ick,       CK_34XX | CK_36XX),
         CLK("omap-aes", "ick",  &aes2_ick,      CK_34XX | CK_36XX),
@@ -3369,20 +3379,18 @@ static struct omap_clk omap3xxx_clks[] = {
         CLK(NULL,       "cam_ick",      &cam_ick,       CK_34XX | CK_36XX),
         CLK(NULL,       "csi2_96m_fck", &csi2_96m_fck,  CK_34XX | CK_36XX),
         CLK(NULL,       "usbhost_120m_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-        CLK("usbhs-omap.0",     "hs_fck", &usbhost_120m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK(NULL,       "usbhost_48m_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-        CLK("usbhs-omap.0",     "fs_fck", &usbhost_48m_fck, CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
         CLK(NULL,       "usbhost_ick",  &usbhost_ick,   CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-        CLK("usbhs-omap.0",     "usbhost_ick",  &usbhost_ick,   CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
-        CLK("usbhs-omap.0",     "utmi_p1_gfclk",        &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "utmi_p2_gfclk",        &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "xclk60mhsp1_ck",       &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "xclk60mhsp2_ck",       &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "usb_host_hs_utmi_p1_clk",      &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "usb_host_hs_utmi_p2_clk",      &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "usb_tll_hs_usb_ch0_clk",       &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "usb_tll_hs_usb_ch1_clk",       &dummy_ck,      CK_3XXX),
-        CLK("usbhs-omap.0",     "init_60m_fclk",        &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "usbhost_ick",  &usbhost_ick,   CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+        CLK("usbhs_omap",       "utmi_p1_gfclk",        &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "utmi_p2_gfclk",        &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "xclk60mhsp1_ck",       &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "xclk60mhsp2_ck",       &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "usb_host_hs_utmi_p1_clk",      &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "usb_host_hs_utmi_p2_clk",      &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "usb_tll_hs_usb_ch0_clk",       &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "usb_tll_hs_usb_ch1_clk",       &dummy_ck,      CK_3XXX),
+        CLK("usbhs_omap",       "init_60m_fclk",        &dummy_ck,      CK_3XXX),
         CLK(NULL,       "usim_fck",     &usim_fck,      CK_3430ES2PLUS | CK_36XX),
         CLK(NULL,       "gpt1_fck",     &gpt1_fck,      CK_3XXX),
         CLK(NULL,       "wkup_32k_fck", &wkup_32k_fck,  CK_3XXX),
@@ -3403,6 +3411,7 @@ static struct omap_clk omap3xxx_clks[] = {
         CLK(NULL,       "per_48m_fck",  &per_48m_fck,   CK_3XXX),
         CLK(NULL,       "uart3_fck",    &uart3_fck,     CK_3XXX),
         CLK(NULL,       "uart4_fck",    &uart4_fck,     CK_36XX),
+        CLK(NULL,       "uart4_fck",    &uart4_fck_am35xx, CK_3505 | CK_3517),
         CLK(NULL,       "gpt2_fck",     &gpt2_fck,      CK_3XXX),
         CLK(NULL,       "gpt3_fck",     &gpt3_fck,      CK_3XXX),
         CLK(NULL,       "gpt4_fck",     &gpt4_fck,      CK_3XXX),
@@ -3517,6 +3526,10 @@ int __init omap3xxx_clk_init(void)
         } else if (cpu_is_ti816x()) {
                 cpu_mask = RATE_IN_TI816X;
                 cpu_clkflg = CK_TI816X;
+        } else if (cpu_is_am33xx()) {
+                cpu_mask = RATE_IN_AM33XX;
+        } else if (cpu_is_ti814x()) {
+                cpu_mask = RATE_IN_TI814X;
         } else if (cpu_is_omap34xx()) {
                 if (omap_rev() == OMAP3430_REV_ES1_0) {
                         cpu_mask = RATE_IN_3430ES1;
@@ -3600,7 +3613,7 @@ int __init omap3xxx_clk_init(void)
          * Lock DPLL5 -- here only until other device init code can
          * handle this
          */
-        if (!cpu_is_ti816x() && (omap_rev() >= OMAP3430_REV_ES2_0))
+        if (!cpu_is_ti81xx() && (omap_rev() >= OMAP3430_REV_ES2_0))
                 omap3_clk_lock_dpll5();
 
         /* Avoid sleeping during omap3_core_dpll_m2_set_rate() */
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index 0798a802497a..08e86d793a1f 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -1206,6 +1206,14 @@ static const struct clksel ocp_abe_iclk_div[] = {
         { .parent = NULL },
 };
 
+static struct clk mpu_periphclk = {
+        .name           = "mpu_periphclk",
+        .parent         = &dpll_mpu_ck,
+        .ops            = &clkops_null,
+        .fixed_div      = 2,
+        .recalc         = &omap_fixed_divisor_recalc,
+};
+
 static struct clk ocp_abe_iclk = {
         .name           = "ocp_abe_iclk",
         .parent         = &aess_fclk,
@@ -3189,6 +3197,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "l4_div_ck",                    &l4_div_ck,     CK_443X),
         CLK(NULL,       "lp_clk_div_ck",                &lp_clk_div_ck, CK_443X),
         CLK(NULL,       "l4_wkup_clk_mux_ck",           &l4_wkup_clk_mux_ck,    CK_443X),
+        CLK("smp_twd",  NULL,                           &mpu_periphclk, CK_443X),
         CLK(NULL,       "ocp_abe_iclk",                 &ocp_abe_iclk,  CK_443X),
         CLK(NULL,       "per_abe_24m_fclk",             &per_abe_24m_fclk,      CK_443X),
         CLK(NULL,       "per_abe_nc_fclk",              &per_abe_nc_fclk,       CK_443X),
@@ -3295,7 +3304,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "uart2_fck",                    &uart2_fck,     CK_443X),
         CLK(NULL,       "uart3_fck",                    &uart3_fck,     CK_443X),
         CLK(NULL,       "uart4_fck",                    &uart4_fck,     CK_443X),
-        CLK("usbhs-omap.0",     "fs_fck",               &usb_host_fs_fck,       CK_443X),
+        CLK("usbhs_omap",       "fs_fck",               &usb_host_fs_fck,       CK_443X),
         CLK(NULL,       "utmi_p1_gfclk",                &utmi_p1_gfclk, CK_443X),
         CLK(NULL,       "usb_host_hs_utmi_p1_clk",      &usb_host_hs_utmi_p1_clk,       CK_443X),
         CLK(NULL,       "utmi_p2_gfclk",                &utmi_p2_gfclk, CK_443X),
@@ -3306,7 +3315,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "usb_host_hs_hsic60m_p2_clk",   &usb_host_hs_hsic60m_p2_clk,    CK_443X),
         CLK(NULL,       "usb_host_hs_hsic480m_p2_clk",  &usb_host_hs_hsic480m_p2_clk,   CK_443X),
         CLK(NULL,       "usb_host_hs_func48mclk",       &usb_host_hs_func48mclk,        CK_443X),
-        CLK("usbhs-omap.0",     "hs_fck",               &usb_host_hs_fck,       CK_443X),
+        CLK("usbhs_omap",       "hs_fck",               &usb_host_hs_fck,       CK_443X),
         CLK(NULL,       "otg_60m_gfclk",                &otg_60m_gfclk, CK_443X),
         CLK(NULL,       "usb_otg_hs_xclk",              &usb_otg_hs_xclk,       CK_443X),
         CLK("musb-omap2430",    "ick",                          &usb_otg_hs_ick,        CK_443X),
@@ -3314,7 +3323,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "usb_tll_hs_usb_ch2_clk",       &usb_tll_hs_usb_ch2_clk,        CK_443X),
         CLK(NULL,       "usb_tll_hs_usb_ch0_clk",       &usb_tll_hs_usb_ch0_clk,        CK_443X),
         CLK(NULL,       "usb_tll_hs_usb_ch1_clk",       &usb_tll_hs_usb_ch1_clk,        CK_443X),
-        CLK("usbhs-omap.0",     "usbtll_ick",           &usb_tll_hs_ick,        CK_443X),
+        CLK("usbhs_omap",       "usbtll_ick",           &usb_tll_hs_ick,        CK_443X),
         CLK(NULL,       "usim_ck",                      &usim_ck,       CK_443X),
         CLK(NULL,       "usim_fclk",                    &usim_fclk,     CK_443X),
         CLK(NULL,       "usim_fck",                     &usim_fck,      CK_443X),
@@ -3374,8 +3383,8 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "uart2_ick",                    &dummy_ck,      CK_443X),
         CLK(NULL,       "uart3_ick",                    &dummy_ck,      CK_443X),
         CLK(NULL,       "uart4_ick",                    &dummy_ck,      CK_443X),
-        CLK("usbhs-omap.0",     "usbhost_ick",          &dummy_ck,              CK_443X),
-        CLK("usbhs-omap.0",     "usbtll_fck",           &dummy_ck,      CK_443X),
+        CLK("usbhs_omap",       "usbhost_ick",          &dummy_ck,              CK_443X),
+        CLK("usbhs_omap",       "usbtll_fck",           &dummy_ck,      CK_443X),
         CLK("omap_wdt", "ick",                          &dummy_ck,      CK_443X),
         CLK("omap_timer.1",     "32k_ck",       &sys_32k_ck,    CK_443X),
         CLK("omap_timer.2",     "32k_ck",       &sys_32k_ck,    CK_443X),
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 684b8a7cd401..aaf421178c91 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -110,23 +110,49 @@ void __init omap3_map_io(void)
 
 /*
  * Adjust TAP register base such that omap3_check_revision accesses the correct
- * TI816X register for checking device ID (it adds 0x204 to tap base while
- * TI816X DEVICE ID register is at offset 0x600 from control base).
+ * TI81XX register for checking device ID (it adds 0x204 to tap base while
+ * TI81XX DEVICE ID register is at offset 0x600 from control base).
  */
-#define TI816X_TAP_BASE         (TI816X_CTRL_BASE + \
-                                TI816X_CONTROL_DEVICE_ID - 0x204)
+#define TI81XX_TAP_BASE         (TI81XX_CTRL_BASE + \
+                                TI81XX_CONTROL_DEVICE_ID - 0x204)
 
-static struct omap_globals ti816x_globals = {
+static struct omap_globals ti81xx_globals = {
         .class  = OMAP343X_CLASS,
-        .tap    = OMAP2_L4_IO_ADDRESS(TI816X_TAP_BASE),
-        .ctrl   = OMAP2_L4_IO_ADDRESS(TI816X_CTRL_BASE),
-        .prm    = OMAP2_L4_IO_ADDRESS(TI816X_PRCM_BASE),
-        .cm     = OMAP2_L4_IO_ADDRESS(TI816X_PRCM_BASE),
+        .tap    = OMAP2_L4_IO_ADDRESS(TI81XX_TAP_BASE),
+        .ctrl   = OMAP2_L4_IO_ADDRESS(TI81XX_CTRL_BASE),
+        .prm    = OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE),
+        .cm     = OMAP2_L4_IO_ADDRESS(TI81XX_PRCM_BASE),
 };
 
-void __init omap2_set_globals_ti816x(void)
+void __init omap2_set_globals_ti81xx(void)
 {
-        __omap2_set_globals(&ti816x_globals);
+        __omap2_set_globals(&ti81xx_globals);
+}
+
+void __init ti81xx_map_io(void)
+{
+        omapti81xx_map_common_io();
+}
+
+#define AM33XX_TAP_BASE         (AM33XX_CTRL_BASE + \
+                                TI81XX_CONTROL_DEVICE_ID - 0x204)
+
+static struct omap_globals am33xx_globals = {
+        .class  = AM335X_CLASS,
+        .tap    = AM33XX_L4_WK_IO_ADDRESS(AM33XX_TAP_BASE),
+        .ctrl   = AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE),
+        .prm    = AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE),
+        .cm     = AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE),
+};
+
+void __init omap2_set_globals_am33xx(void)
+{
+        __omap2_set_globals(&am33xx_globals);
+}
+
+void __init am33xx_map_io(void)
+{
+        omapam33xx_map_common_io();
 }
 #endif
 
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index cda888a2e635..febffde2ff10 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -24,9 +24,11 @@
 
 #ifndef __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
 #define __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H
+#ifndef __ASSEMBLER__
 
 #include <linux/delay.h>
 #include <plat/common.h>
+#include <asm/proc-fns.h>
 
 #ifdef CONFIG_SOC_OMAP2420
 extern void omap242x_map_common_io(void);
@@ -52,10 +54,18 @@ static inline void omap34xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI816X
-extern void omapti816x_map_common_io(void);
+#ifdef CONFIG_SOC_OMAPTI81XX
+extern void omapti81xx_map_common_io(void);
 #else
-static inline void omapti816x_map_common_io(void)
+static inline void omapti81xx_map_common_io(void)
+{
+}
+#endif
+
+#ifdef CONFIG_SOC_OMAPAM33XX
+extern void omapam33xx_map_common_io(void);
+#else
+static inline void omapam33xx_map_common_io(void)
 {
 }
 #endif
@@ -82,7 +92,7 @@ void omap35xx_init_early(void);
 void omap3630_init_early(void);
 void omap3_init_early(void);    /* Do not use this one */
 void am35xx_init_early(void);
-void ti816x_init_early(void);
+void ti81xx_init_early(void);
 void omap4430_init_early(void);
 void omap_prcm_restart(char, const char *);
 
@@ -107,7 +117,8 @@ void omap2_set_globals_242x(void);
 void omap2_set_globals_243x(void);
 void omap2_set_globals_3xxx(void);
 void omap2_set_globals_443x(void);
-void omap2_set_globals_ti816x(void);
+void omap2_set_globals_ti81xx(void);
+void omap2_set_globals_am33xx(void);
 
 /* These get called from omap2_set_globals_xxxx(), do not call these */
 void omap2_set_globals_tap(struct omap_globals *);
@@ -118,7 +129,9 @@ void omap2_set_globals_prcm(struct omap_globals *);
 void omap242x_map_io(void);
 void omap243x_map_io(void);
 void omap3_map_io(void);
+void am33xx_map_io(void);
 void omap4_map_io(void);
+void ti81xx_map_io(void);
 
 /**
  * omap_test_timeout - busy-loop, testing a condition
@@ -147,7 +160,7 @@ extern struct device *omap4_get_dsp_device(void);
 
 void omap2_init_irq(void);
 void omap3_init_irq(void);
-void ti816x_init_irq(void);
+void ti81xx_init_irq(void);
 extern int omap_irq_pending(void);
 void omap_intc_save_context(void);
 void omap_intc_restore_context(void);
@@ -157,23 +170,23 @@ void omap3_intc_resume_idle(void);
 void omap2_intc_handle_irq(struct pt_regs *regs);
 void omap3_intc_handle_irq(struct pt_regs *regs);
 
-/*
- * wfi used in low power code. Directly opcode is used instead
- * of instruction to avoid mulit-omap build break
- */
-#ifdef CONFIG_THUMB2_KERNEL
-#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
-#else
-#define do_wfi()                        \
-                __asm__ __volatile__ (".word    0xe320f003" : : : "memory")
+#ifdef CONFIG_CACHE_L2X0
+extern void __iomem *omap4_get_l2cache_base(void);
 #endif
 
-#ifdef CONFIG_CACHE_L2X0
-extern void __iomem *l2cache_base;
+#ifdef CONFIG_SMP
+extern void __iomem *omap4_get_scu_base(void);
+#else
+static inline void __iomem *omap4_get_scu_base(void)
+{
+        return NULL;
+}
 #endif
 
 extern void __init gic_init_irq(void);
 extern void omap_smc1(u32 fn, u32 arg);
+extern void __iomem *omap4_get_sar_ram_base(void);
+extern void omap_do_wfi(void);
 
 #ifdef CONFIG_SMP
 /* Needed for secondary core boot */
@@ -183,4 +196,44 @@ extern void omap_auxcoreboot_addr(u32 cpu_addr);
 extern u32 omap_read_auxcoreboot0(void);
 #endif
 
+#if defined(CONFIG_SMP) && defined(CONFIG_PM)
+extern int omap4_mpuss_init(void);
+extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);
+extern int omap4_finish_suspend(unsigned long cpu_state);
+extern void omap4_cpu_resume(void);
+extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);
+extern u32 omap4_mpuss_read_prev_context_state(void);
+#else
+static inline int omap4_enter_lowpower(unsigned int cpu,
+                                        unsigned int power_state)
+{
+        cpu_do_idle();
+        return 0;
+}
+
+static inline int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+{
+        cpu_do_idle();
+        return 0;
+}
+
+static inline int omap4_mpuss_init(void)
+{
+        return 0;
+}
+
+static inline int omap4_finish_suspend(unsigned long cpu_state)
+{
+        return 0;
+}
+
+static inline void omap4_cpu_resume(void)
+{}
+
+static inline u32 omap4_mpuss_read_prev_context_state(void)
+{
+        return 0;
+}
+#endif
+#endif /* __ASSEMBLER__ */
 #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index d4ef75d5a382..0ba68d3764bc 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -52,8 +52,8 @@
 #define OMAP343X_CONTROL_PADCONFS_WKUP  0xa00
 #define OMAP343X_CONTROL_GENERAL_WKUP   0xa60
 
-/* TI816X spefic control submodules */
-#define TI816X_CONTROL_DEVCONF          0x600
+/* TI81XX spefic control submodules */
+#define TI81XX_CONTROL_DEVCONF          0x600
 
 /* Control register offsets - read/write with omap_ctrl_{read,write}{bwl}() */
 
@@ -244,8 +244,8 @@
 #define OMAP3_PADCONF_SAD2D_MSTANDBY   0x250
 #define OMAP3_PADCONF_SAD2D_IDLEACK    0x254
 
-/* TI816X CONTROL_DEVCONF register offsets */
-#define TI816X_CONTROL_DEVICE_ID        (TI816X_CONTROL_DEVCONF + 0x000)
+/* TI81XX CONTROL_DEVCONF register offsets */
+#define TI81XX_CONTROL_DEVICE_ID        (TI81XX_CONTROL_DEVCONF + 0x000)
 
 /*
  * REVISIT: This list of registers is not comprehensive - there are more
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index e20332f4abdc..464cffde58fe 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -25,12 +25,12 @@
 #include <linux/sched.h>
 #include <linux/cpuidle.h>
 #include <linux/export.h>
+#include <linux/cpu_pm.h>
 
 #include <plat/prcm.h>
 #include <plat/irqs.h>
 #include "powerdomain.h"
 #include "clockdomain.h"
-#include <plat/serial.h>
 
 #include "pm.h"
 #include "control.h"
@@ -124,9 +124,23 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
                 pwrdm_for_each_clkdm(core_pd, _cpuidle_deny_idle);
         }
 
+        /*
+         * Call idle CPU PM enter notifier chain so that
+         * VFP context is saved.
+         */
+        if (mpu_state == PWRDM_POWER_OFF)
+                cpu_pm_enter();
+
         /* Execute ARM wfi */
         omap_sram_idle();
 
+        /*
+         * Call idle CPU PM enter notifier chain to restore
+         * VFP context.
+         */
+        if (pwrdm_read_prev_pwrst(mpu_pd) == PWRDM_POWER_OFF)
+                cpu_pm_exit();
+
         /* Re-allow idle for C1 */
         if (index == 0) {
                 pwrdm_for_each_clkdm(mpu_pd, _cpuidle_allow_idle);
@@ -245,11 +259,6 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
         struct omap3_idle_statedata *cx;
         int ret;
 
-        if (!omap3_can_sleep()) {
-                new_state_idx = drv->safe_state_index;
-                goto select_state;
-        }
-
         /*
          * Prevent idle completely if CAM is active.
          * CAM does not have wakeup capability in OMAP3.
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
new file mode 100644
index 000000000000..cfdbb86bc84e
--- /dev/null
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -0,0 +1,245 @@
+/*
+ * OMAP4 CPU idle Routines
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ * Santosh Shilimkar <santosh.shilimkar@ti.com>
+ * Rajendra Nayak <rnayak@ti.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.
+ */
+
+#include <linux/sched.h>
+#include <linux/cpuidle.h>
+#include <linux/cpu_pm.h>
+#include <linux/export.h>
+#include <linux/clockchips.h>
+
+#include <asm/proc-fns.h>
+
+#include "common.h"
+#include "pm.h"
+#include "prm.h"
+
+#ifdef CONFIG_CPU_IDLE
+
+/* Machine specific information to be recorded in the C-state driver_data */
+struct omap4_idle_statedata {
+        u32 cpu_state;
+        u32 mpu_logic_state;
+        u32 mpu_state;
+        u8 valid;
+};
+
+static struct cpuidle_params cpuidle_params_table[] = {
+        /* C1 - CPU0 ON + CPU1 ON + MPU ON */
+        {.exit_latency = 2 + 2 , .target_residency = 5, .valid = 1},
+        /* C2- CPU0 OFF + CPU1 OFF + MPU CSWR */
+        {.exit_latency = 328 + 440 , .target_residency = 960, .valid = 1},
+        /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
+        {.exit_latency = 460 + 518 , .target_residency = 1100, .valid = 1},
+};
+
+#define OMAP4_NUM_STATES ARRAY_SIZE(cpuidle_params_table)
+
+struct omap4_idle_statedata omap4_idle_data[OMAP4_NUM_STATES];
+static struct powerdomain *mpu_pd, *cpu0_pd, *cpu1_pd;
+
+/**
+ * omap4_enter_idle - Programs OMAP4 to enter the specified state
+ * @dev: cpuidle device
+ * @drv: cpuidle driver
+ * @index: the index of state to be entered
+ *
+ * Called from the CPUidle framework to program the device to the
+ * specified low power state selected by the governor.
+ * Returns the amount of time spent in the low power state.
+ */
+static int omap4_enter_idle(struct cpuidle_device *dev,
+                        struct cpuidle_driver *drv,
+                        int index)
+{
+        struct omap4_idle_statedata *cx =
+                        cpuidle_get_statedata(&dev->states_usage[index]);
+        struct timespec ts_preidle, ts_postidle, ts_idle;
+        u32 cpu1_state;
+        int idle_time;
+        int new_state_idx;
+        int cpu_id = smp_processor_id();
+
+        /* Used to keep track of the total time in idle */
+        getnstimeofday(&ts_preidle);
+
+        local_irq_disable();
+        local_fiq_disable();
+
+        /*
+         * CPU0 has to stay ON (i.e in C1) until CPU1 is OFF state.
+         * This is necessary to honour hardware recommondation
+         * of triggeing all the possible low power modes once CPU1 is
+         * out of coherency and in OFF mode.
+         * Update dev->last_state so that governor stats reflects right
+         * data.
+         */
+        cpu1_state = pwrdm_read_pwrst(cpu1_pd);
+        if (cpu1_state != PWRDM_POWER_OFF) {
+                new_state_idx = drv->safe_state_index;
+                cx = cpuidle_get_statedata(&dev->states_usage[new_state_idx]);
+        }
+
+        if (index > 0)
+                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu_id);
+
+        /*
+         * Call idle CPU PM enter notifier chain so that
+         * VFP and per CPU interrupt context is saved.
+         */
+        if (cx->cpu_state == PWRDM_POWER_OFF)
+                cpu_pm_enter();
+
+        pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state);
+        omap_set_pwrdm_state(mpu_pd, cx->mpu_state);
+
+        /*
+         * Call idle CPU cluster PM enter notifier chain
+         * to save GIC and wakeupgen context.
+         */
+        if ((cx->mpu_state == PWRDM_POWER_RET) &&
+                (cx->mpu_logic_state == PWRDM_POWER_OFF))
+                        cpu_cluster_pm_enter();
+
+        omap4_enter_lowpower(dev->cpu, cx->cpu_state);
+
+        /*
+         * Call idle CPU PM exit notifier chain to restore
+         * VFP and per CPU IRQ context. Only CPU0 state is
+         * considered since CPU1 is managed by CPU hotplug.
+         */
+        if (pwrdm_read_prev_pwrst(cpu0_pd) == PWRDM_POWER_OFF)
+                cpu_pm_exit();
+
+        /*
+         * Call idle CPU cluster PM exit notifier chain
+         * to restore GIC and wakeupgen context.
+         */
+        if (omap4_mpuss_read_prev_context_state())
+                cpu_cluster_pm_exit();
+
+        if (index > 0)
+                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id);
+
+        getnstimeofday(&ts_postidle);
+        ts_idle = timespec_sub(ts_postidle, ts_preidle);
+
+        local_irq_enable();
+        local_fiq_enable();
+
+        idle_time = ts_idle.tv_nsec / NSEC_PER_USEC + ts_idle.tv_sec * \
+                                                                USEC_PER_SEC;
+
+        /* Update cpuidle counters */
+        dev->last_residency = idle_time;
+
+        return index;
+}
+
+DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
+
+struct cpuidle_driver omap4_idle_driver = {
+        .name =         "omap4_idle",
+        .owner =        THIS_MODULE,
+};
+
+static inline void _fill_cstate(struct cpuidle_driver *drv,
+                                        int idx, const char *descr)
+{
+        struct cpuidle_state *state = &drv->states[idx];
+
+        state->exit_latency     = cpuidle_params_table[idx].exit_latency;
+        state->target_residency = cpuidle_params_table[idx].target_residency;
+        state->flags            = CPUIDLE_FLAG_TIME_VALID;
+        state->enter            = omap4_enter_idle;
+        sprintf(state->name, "C%d", idx + 1);
+        strncpy(state->desc, descr, CPUIDLE_DESC_LEN);
+}
+
+static inline struct omap4_idle_statedata *_fill_cstate_usage(
+                                        struct cpuidle_device *dev,
+                                        int idx)
+{
+        struct omap4_idle_statedata *cx = &omap4_idle_data[idx];
+        struct cpuidle_state_usage *state_usage = &dev->states_usage[idx];
+
+        cx->valid               = cpuidle_params_table[idx].valid;
+        cpuidle_set_statedata(state_usage, cx);
+
+        return cx;
+}
+
+
+
+/**
+ * omap4_idle_init - Init routine for OMAP4 idle
+ *
+ * Registers the OMAP4 specific cpuidle driver to the cpuidle
+ * framework with the valid set of states.
+ */
+int __init omap4_idle_init(void)
+{
+        struct omap4_idle_statedata *cx;
+        struct cpuidle_device *dev;
+        struct cpuidle_driver *drv = &omap4_idle_driver;
+        unsigned int cpu_id = 0;
+
+        mpu_pd = pwrdm_lookup("mpu_pwrdm");
+        cpu0_pd = pwrdm_lookup("cpu0_pwrdm");
+        cpu1_pd = pwrdm_lookup("cpu1_pwrdm");
+        if ((!mpu_pd) || (!cpu0_pd) || (!cpu1_pd))
+                return -ENODEV;
+
+
+        drv->safe_state_index = -1;
+        dev = &per_cpu(omap4_idle_dev, cpu_id);
+        dev->cpu = cpu_id;
+
+        /* C1 - CPU0 ON + CPU1 ON + MPU ON */
+        _fill_cstate(drv, 0, "MPUSS ON");
+        drv->safe_state_index = 0;
+        cx = _fill_cstate_usage(dev, 0);
+        cx->valid = 1;  /* C1 is always valid */
+        cx->cpu_state = PWRDM_POWER_ON;
+        cx->mpu_state = PWRDM_POWER_ON;
+        cx->mpu_logic_state = PWRDM_POWER_RET;
+
+        /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
+        _fill_cstate(drv, 1, "MPUSS CSWR");
+        cx = _fill_cstate_usage(dev, 1);
+        cx->cpu_state = PWRDM_POWER_OFF;
+        cx->mpu_state = PWRDM_POWER_RET;
+        cx->mpu_logic_state = PWRDM_POWER_RET;
+
+        /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
+        _fill_cstate(drv, 2, "MPUSS OSWR");
+        cx = _fill_cstate_usage(dev, 2);
+        cx->cpu_state = PWRDM_POWER_OFF;
+        cx->mpu_state = PWRDM_POWER_RET;
+        cx->mpu_logic_state = PWRDM_POWER_OFF;
+
+        drv->state_count = OMAP4_NUM_STATES;
+        cpuidle_register_driver(&omap4_idle_driver);
+
+        dev->state_count = OMAP4_NUM_STATES;
+        if (cpuidle_register_device(dev)) {
+                pr_err("%s: CPUidle register device failed\n", __func__);
+                        return -EIO;
+                }
+
+        return 0;
+}
+#else
+int __init omap4_idle_init(void)
+{
+        return 0;
+}
+#endif /* CONFIG_CPU_IDLE */
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c15cfada5f13..35d5dffab7e1 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -336,6 +336,27 @@ static void omap_init_mcpdm(void)
 static inline void omap_init_mcpdm(void) {}
 #endif
 
+#if defined(CONFIG_SND_OMAP_SOC_DMIC) || \
+                defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)
+
+static void omap_init_dmic(void)
+{
+        struct omap_hwmod *oh;
+        struct platform_device *pdev;
+
+        oh = omap_hwmod_lookup("dmic");
+        if (!oh) {
+                printk(KERN_ERR "Could not look up mcpdm hw_mod\n");
+                return;
+        }
+
+        pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0, NULL, 0, 0);
+        WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");
+}
+#else
+static inline void omap_init_dmic(void) {}
+#endif
+
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
 #include <plat/mcspi.h>
@@ -681,6 +702,7 @@ static int __init omap2_init_devices(void)
          */
         omap_init_audio();
         omap_init_mcpdm();
+        omap_init_dmic();
         omap_init_camera();
         omap_init_mbox();
         omap_init_mcspi();
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index f4a1020559a7..bd844af13af5 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -171,6 +171,17 @@ static void omap4_hsmmc1_after_set_reg(struct device *dev, int slot,
         }
 }
 
+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 |= OMAP2_MMCSDIO2ADPCLKISEL;
+                omap_ctrl_writel(reg, control_devconf1_offset);
+        }
+}
+
 static void hsmmc23_before_set_reg(struct device *dev, int slot,
                                    int power_on, int vdd)
 {
@@ -179,16 +190,19 @@ static void hsmmc23_before_set_reg(struct device *dev, int slot,
         if (mmc->slots[0].remux)
                 mmc->slots[0].remux(dev, slot, power_on);
 
-        if (power_on) {
-                /* Only MMC2 supports a CLKIN */
-                if (mmc->slots[0].internal_clock) {
-                        u32 reg;
+        if (power_on)
+                hsmmc2_select_input_clk_src(mmc);
+}
 
-                        reg = omap_ctrl_readl(control_devconf1_offset);
-                        reg |= OMAP2_MMCSDIO2ADPCLKISEL;
-                        omap_ctrl_writel(reg, control_devconf1_offset);
-                }
-        }
+static int am35x_hsmmc2_set_power(struct device *dev, int slot,
+                                  int power_on, int vdd)
+{
+        struct omap_mmc_platform_data *mmc = dev->platform_data;
+
+        if (power_on)
+                hsmmc2_select_input_clk_src(mmc);
+
+        return 0;
 }
 
 static int nop_mmc_set_power(struct device *dev, int slot, int power_on,
@@ -200,10 +214,12 @@ static int nop_mmc_set_power(struct device *dev, int slot, int power_on,
 static inline void omap_hsmmc_mux(struct omap_mmc_platform_data *mmc_controller,
                         int controller_nr)
 {
-        if (gpio_is_valid(mmc_controller->slots[0].switch_pin))
+        if (gpio_is_valid(mmc_controller->slots[0].switch_pin) &&
+                (mmc_controller->slots[0].switch_pin < OMAP_MAX_GPIO_LINES))
                 omap_mux_init_gpio(mmc_controller->slots[0].switch_pin,
                                         OMAP_PIN_INPUT_PULLUP);
-        if (gpio_is_valid(mmc_controller->slots[0].gpio_wp))
+        if (gpio_is_valid(mmc_controller->slots[0].gpio_wp) &&
+                (mmc_controller->slots[0].gpio_wp < OMAP_MAX_GPIO_LINES))
                 omap_mux_init_gpio(mmc_controller->slots[0].gpio_wp,
                                         OMAP_PIN_INPUT_PULLUP);
         if (cpu_is_omap34xx()) {
@@ -296,6 +312,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
         mmc->slots[0].name = hc_name;
         mmc->nr_slots = 1;
         mmc->slots[0].caps = c->caps;
+        mmc->slots[0].pm_caps = c->pm_caps;
         mmc->slots[0].internal_clock = !c->ext_clock;
         mmc->dma_mask = 0xffffffff;
         if (cpu_is_omap44xx())
@@ -336,11 +353,17 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
          *
          * temporary HACK: ocr_mask instead of fixed supply
          */
-        mmc->slots[0].ocr_mask = c->ocr_mask;
-
-        if (cpu_is_omap3517() || cpu_is_omap3505())
-                mmc->slots[0].set_power = nop_mmc_set_power;
+        if (cpu_is_omap3505() || cpu_is_omap3517())
+                mmc->slots[0].ocr_mask = MMC_VDD_165_195 |
+                                         MMC_VDD_26_27 |
+                                         MMC_VDD_27_28 |
+                                         MMC_VDD_29_30 |
+                                         MMC_VDD_30_31 |
+                                         MMC_VDD_31_32;
         else
+                mmc->slots[0].ocr_mask = c->ocr_mask;
+
+        if (!cpu_is_omap3517() && !cpu_is_omap3505())
                 mmc->slots[0].features |= HSMMC_HAS_PBIAS;
 
         if (cpu_is_omap44xx() && (omap_rev() > OMAP4430_REV_ES1_0))
@@ -363,6 +386,9 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
                         }
                 }
 
+                if (cpu_is_omap3517() || cpu_is_omap3505())
+                        mmc->slots[0].set_power = nop_mmc_set_power;
+
                 /* OMAP3630 HSMMC1 supports only 4-bit */
                 if (cpu_is_omap3630() &&
                                 (c->caps & MMC_CAP_8_BIT_DATA)) {
@@ -372,6 +398,9 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
                 }
                 break;
         case 2:
+                if (cpu_is_omap3517() || cpu_is_omap3505())
+                        mmc->slots[0].set_power = am35x_hsmmc2_set_power;
+
                 if (c->ext_clock)
                         c->transceiver = 1;
                 if (c->transceiver && (c->caps & MMC_CAP_8_BIT_DATA)) {
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index f757e78d4d4f..c4409730c4bb 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@ -12,6 +12,7 @@ struct omap2_hsmmc_info {
         u8      mmc;            /* controller 1/2/3 */
         u32     caps;           /* 4/8 wires and any additional host
                                  * capabilities OR'd (ref. linux/mmc/host.h) */
+        u32     pm_caps;        /* PM capabilities */
         bool    transceiver;    /* MMC-2 option */
         bool    ext_clock;      /* use external pin for input clock */
         bool    cover_only;     /* No card detect - just cover switch */
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 27ad722df637..6c5826605eae 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -226,7 +226,7 @@ static void __init omap4_check_features(void)
         }
 }
 
-static void __init ti816x_check_features(void)
+static void __init ti81xx_check_features(void)
 {
         omap_features = OMAP3_HAS_NEON;
 }
@@ -340,6 +340,29 @@ static void __init omap3_check_revision(const char **cpu_rev)
                         break;
                 }
                 break;
+        case 0xb944:
+                omap_revision = AM335X_REV_ES1_0;
+                *cpu_rev = "1.0";
+        case 0xb8f2:
+                switch (rev) {
+                case 0:
+                /* FALLTHROUGH */
+                case 1:
+                        omap_revision = TI8148_REV_ES1_0;
+                        *cpu_rev = "1.0";
+                        break;
+                case 2:
+                        omap_revision = TI8148_REV_ES2_0;
+                        *cpu_rev = "2.0";
+                        break;
+                case 3:
+                /* FALLTHROUGH */
+                default:
+                        omap_revision = TI8148_REV_ES2_1;
+                        *cpu_rev = "2.1";
+                        break;
+                }
+                break;
         default:
                 /* Unknown default to latest silicon rev as default */
                 omap_revision = OMAP3630_REV_ES1_2;
@@ -367,7 +390,7 @@ static void __init omap4_check_revision(void)
          * Few initial 4430 ES2.0 samples IDCODE is same as ES1.0
          * Use ARM register to detect the correct ES version
          */
-        if (!rev && (hawkeye != 0xb94e)) {
+        if (!rev && (hawkeye != 0xb94e) && (hawkeye != 0xb975)) {
                 idcode = read_cpuid(CPUID_ID);
                 rev = (idcode & 0xf) - 1;
         }
@@ -389,8 +412,11 @@ static void __init omap4_check_revision(void)
                         omap_revision = OMAP4430_REV_ES2_1;
                         break;
                 case 4:
-                default:
                         omap_revision = OMAP4430_REV_ES2_2;
+                        break;
+                case 6:
+                default:
+                        omap_revision = OMAP4430_REV_ES2_3;
                 }
                 break;
         case 0xb94e:
@@ -401,9 +427,17 @@ static void __init omap4_check_revision(void)
                         break;
                 }
                 break;
+        case 0xb975:
+                switch (rev) {
+                case 0:
+                default:
+                        omap_revision = OMAP4470_REV_ES1_0;
+                        break;
+                }
+                break;
         default:
                 /* Unknown default to latest silicon rev as default */
-                omap_revision = OMAP4430_REV_ES2_2;
+                omap_revision = OMAP4430_REV_ES2_3;
         }
 
         pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16,
@@ -432,6 +466,10 @@ static void __init omap3_cpuinfo(const char *cpu_rev)
                 cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
         } else if (cpu_is_ti816x()) {
                 cpu_name = "TI816X";
+        } else if (cpu_is_am335x()) {
+                cpu_name =  "AM335X";
+        } else if (cpu_is_ti814x()) {
+                cpu_name = "TI814X";
         } else if (omap3_has_iva() && omap3_has_sgx()) {
                 /* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
                 cpu_name = "OMAP3430/3530";
@@ -472,11 +510,11 @@ void __init omap2_check_revision(void)
         } else if (cpu_is_omap34xx()) {
                 omap3_check_revision(&cpu_rev);
 
-                /* TI816X doesn't have feature register */
-                if (!cpu_is_ti816x())
+                /* TI81XX doesn't have feature register */
+                if (!cpu_is_ti81xx())
                         omap3_check_features();
                 else
-                        ti816x_check_features();
+                        ti81xx_check_features();
 
                 omap3_cpuinfo(cpu_rev);
                 return;
diff --git a/arch/arm/mach-omap2/include/mach/barriers.h b/arch/arm/mach-omap2/include/mach/barriers.h
new file mode 100644
index 000000000000..4fa72c7cc7cd
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/barriers.h
@@ -0,0 +1,31 @@
+/*
+ * OMAP memory barrier header.
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *  Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *  Richard Woodruff <r-woodruff2@ti.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
+ */
+
+#ifndef __MACH_BARRIERS_H
+#define __MACH_BARRIERS_H
+
+extern void omap_bus_sync(void);
+
+#define rmb()           dsb()
+#define wmb()           do { dsb(); outer_sync(); omap_bus_sync(); } while (0)
+#define mb()            wmb()
+
+#endif  /* __MACH_BARRIERS_H */
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S
index 13f98e59cfef..cdfc2a1f0e75 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -66,11 +66,11 @@ omap_uart_lsr:	.word	0
                 beq     34f                     @ configure OMAP3UART4
                 cmp     \rp, #OMAP4UART4        @ only on 44xx
                 beq     44f                     @ configure OMAP4UART4
-                cmp     \rp, #TI816XUART1       @ ti816x UART offsets different
+                cmp     \rp, #TI81XXUART1       @ ti81Xx UART offsets different
                 beq     81f                     @ configure UART1
-                cmp     \rp, #TI816XUART2       @ ti816x UART offsets different
+                cmp     \rp, #TI81XXUART2       @ ti81Xx UART offsets different
                 beq     82f                     @ configure UART2
-                cmp     \rp, #TI816XUART3       @ ti816x UART offsets different
+                cmp     \rp, #TI81XXUART3       @ ti81Xx UART offsets different
                 beq     83f                     @ configure UART3
                 cmp     \rp, #ZOOM_UART         @ only on zoom2/3
                 beq     95f                     @ configure ZOOM_UART
@@ -94,11 +94,11 @@ omap_uart_lsr:	.word	0
                 b       98f
 44:             mov     \rp, #UART_OFFSET(OMAP4_UART4_BASE)
                 b       98f
-81:             mov     \rp, #UART_OFFSET(TI816X_UART1_BASE)
+81:             mov     \rp, #UART_OFFSET(TI81XX_UART1_BASE)
                 b       98f
-82:             mov     \rp, #UART_OFFSET(TI816X_UART2_BASE)
+82:             mov     \rp, #UART_OFFSET(TI81XX_UART2_BASE)
                 b       98f
-83:             mov     \rp, #UART_OFFSET(TI816X_UART3_BASE)
+83:             mov     \rp, #UART_OFFSET(TI81XX_UART3_BASE)
                 b       98f
 
 95:             ldr     \rp, =ZOOM_UART_BASE
diff --git a/arch/arm/mach-omap2/include/mach/omap-secure.h b/arch/arm/mach-omap2/include/mach/omap-secure.h
new file mode 100644
index 000000000000..c90a43589abe
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/omap-secure.h
@@ -0,0 +1,57 @@
+/*
+ * omap-secure.h: OMAP Secure infrastructure header.
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.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.
+ */
+#ifndef OMAP_ARCH_OMAP_SECURE_H
+#define OMAP_ARCH_OMAP_SECURE_H
+
+/* Monitor error code */
+#define  API_HAL_RET_VALUE_NS2S_CONVERSION_ERROR        0xFFFFFFFE
+#define  API_HAL_RET_VALUE_SERVICE_UNKNWON              0xFFFFFFFF
+
+/* HAL API error codes */
+#define  API_HAL_RET_VALUE_OK           0x00
+#define  API_HAL_RET_VALUE_FAIL         0x01
+
+/* Secure HAL API flags */
+#define FLAG_START_CRITICAL             0x4
+#define FLAG_IRQFIQ_MASK                0x3
+#define FLAG_IRQ_ENABLE                 0x2
+#define FLAG_FIQ_ENABLE                 0x1
+#define NO_FLAG                         0x0
+
+/* Maximum Secure memory storage size */
+#define OMAP_SECURE_RAM_STORAGE (88 * SZ_1K)
+
+/* Secure low power HAL API index */
+#define OMAP4_HAL_SAVESECURERAM_INDEX   0x1a
+#define OMAP4_HAL_SAVEHW_INDEX          0x1b
+#define OMAP4_HAL_SAVEALL_INDEX         0x1c
+#define OMAP4_HAL_SAVEGIC_INDEX         0x1d
+
+/* Secure Monitor mode APIs */
+#define OMAP4_MON_SCU_PWR_INDEX         0x108
+#define OMAP4_MON_L2X0_DBG_CTRL_INDEX   0x100
+#define OMAP4_MON_L2X0_CTRL_INDEX       0x102
+#define OMAP4_MON_L2X0_AUXCTRL_INDEX    0x109
+#define OMAP4_MON_L2X0_PREFETCH_INDEX   0x113
+
+/* Secure PPA(Primary Protected Application) APIs */
+#define OMAP4_PPA_L2_POR_INDEX          0x23
+#define OMAP4_PPA_CPU_ACTRL_SMP_INDEX   0x25
+
+#ifndef __ASSEMBLER__
+
+extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs,
+                                u32 arg1, u32 arg2, u32 arg3, u32 arg4);
+extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);
+extern phys_addr_t omap_secure_ram_mempool_base(void);
+
+#endif /* __ASSEMBLER__ */
+#endif /* OMAP_ARCH_OMAP_SECURE_H */
diff --git a/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h b/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
new file mode 100644
index 000000000000..d79321b0f2a2
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
@@ -0,0 +1,39 @@
+/*
+ * OMAP WakeupGen header file
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.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.
+ */
+#ifndef OMAP_ARCH_WAKEUPGEN_H
+#define OMAP_ARCH_WAKEUPGEN_H
+
+#define OMAP_WKG_CONTROL_0                      0x00
+#define OMAP_WKG_ENB_A_0                        0x10
+#define OMAP_WKG_ENB_B_0                        0x14
+#define OMAP_WKG_ENB_C_0                        0x18
+#define OMAP_WKG_ENB_D_0                        0x1c
+#define OMAP_WKG_ENB_SECURE_A_0                 0x20
+#define OMAP_WKG_ENB_SECURE_B_0                 0x24
+#define OMAP_WKG_ENB_SECURE_C_0                 0x28
+#define OMAP_WKG_ENB_SECURE_D_0                 0x2c
+#define OMAP_WKG_ENB_A_1                        0x410
+#define OMAP_WKG_ENB_B_1                        0x414
+#define OMAP_WKG_ENB_C_1                        0x418
+#define OMAP_WKG_ENB_D_1                        0x41c
+#define OMAP_WKG_ENB_SECURE_A_1                 0x420
+#define OMAP_WKG_ENB_SECURE_B_1                 0x424
+#define OMAP_WKG_ENB_SECURE_C_1                 0x428
+#define OMAP_WKG_ENB_SECURE_D_1                 0x42c
+#define OMAP_AUX_CORE_BOOT_0                    0x800
+#define OMAP_AUX_CORE_BOOT_1                    0x804
+#define OMAP_PTMSYNCREQ_MASK                    0xc00
+#define OMAP_PTMSYNCREQ_EN                      0xc04
+#define OMAP_TIMESTAMPCYCLELO                   0xc08
+#define OMAP_TIMESTAMPCYCLEHI                   0xc0c
+
+extern int __init omap_wakeupgen_init(void);
+#endif
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 3f565dd2ea8d..3f174d51f67f 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -176,14 +176,31 @@ static struct map_desc omap34xx_io_desc[] __initdata = {
 };
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI816X
-static struct map_desc omapti816x_io_desc[] __initdata = {
+#ifdef CONFIG_SOC_OMAPTI81XX
+static struct map_desc omapti81xx_io_desc[] __initdata = {
+        {
+                .virtual        = L4_34XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_34XX_PHYS),
+                .length         = L4_34XX_SIZE,
+                .type           = MT_DEVICE
+        }
+};
+#endif
+
+#ifdef CONFIG_SOC_OMAPAM33XX
+static struct map_desc omapam33xx_io_desc[] __initdata = {
         {
                 .virtual        = L4_34XX_VIRT,
                 .pfn            = __phys_to_pfn(L4_34XX_PHYS),
                 .length         = L4_34XX_SIZE,
                 .type           = MT_DEVICE
         },
+        {
+                .virtual        = L4_WK_AM33XX_VIRT,
+                .pfn            = __phys_to_pfn(L4_WK_AM33XX_PHYS),
+                .length         = L4_WK_AM33XX_SIZE,
+                .type           = MT_DEVICE
+        }
 };
 #endif
 
@@ -237,6 +254,15 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
                 .length         = L4_EMU_44XX_SIZE,
                 .type           = MT_DEVICE,
         },
+#ifdef CONFIG_OMAP4_ERRATA_I688
+        {
+                .virtual        = OMAP4_SRAM_VA,
+                .pfn            = __phys_to_pfn(OMAP4_SRAM_PA),
+                .length         = PAGE_SIZE,
+                .type           = MT_MEMORY_SO,
+        },
+#endif
+
 };
 #endif
 
@@ -263,10 +289,17 @@ void __init omap34xx_map_common_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAPTI816X
-void __init omapti816x_map_common_io(void)
+#ifdef CONFIG_SOC_OMAPTI81XX
+void __init omapti81xx_map_common_io(void)
+{
+        iotable_init(omapti81xx_io_desc, ARRAY_SIZE(omapti81xx_io_desc));
+}
+#endif
+
+#ifdef CONFIG_SOC_OMAPAM33XX
+void __init omapam33xx_map_common_io(void)
 {
-        iotable_init(omapti816x_io_desc, ARRAY_SIZE(omapti816x_io_desc));
+        iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));
 }
 #endif
 
@@ -418,9 +451,9 @@ void __init am35xx_init_early(void)
         omap3_init_early();
 }
 
-void __init ti816x_init_early(void)
+void __init ti81xx_init_early(void)
 {
-        omap2_set_globals_ti816x();
+        omap2_set_globals_ti81xx();
         omap_common_init_early();
         omap3xxx_voltagedomains_init();
         omap3xxx_powerdomains_init();
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 42b1d6591912..1fef061f7927 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -193,7 +193,7 @@ void __init omap3_init_irq(void)
         omap_init_irq(OMAP34XX_IC_BASE, 96);
 }
 
-void __init ti816x_init_irq(void)
+void __init ti81xx_init_irq(void)
 {
         omap_init_irq(OMAP34XX_IC_BASE, 128);
 }
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 655e9480eb98..e1cc75d1a57a 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -32,6 +32,8 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <asm/system.h>
 
@@ -39,6 +41,7 @@
 
 #include "control.h"
 #include "mux.h"
+#include "prm.h"
 
 #define OMAP_MUX_BASE_OFFSET            0x30    /* Offset from CTRL_BASE */
 #define OMAP_MUX_BASE_SZ                0x5ca
@@ -306,7 +309,8 @@ omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads)
                 pad->idle = bpad->idle;
                 pad->off = bpad->off;
 
-                if (pad->flags & OMAP_DEVICE_PAD_REMUX)
+                if (pad->flags &
+                    (OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP))
                         nr_pads_dynamic++;
 
                 pr_debug("%s: Initialized %s\n", __func__, pad->name);
@@ -331,7 +335,8 @@ omap_hwmod_mux_init(struct omap_device_pad *bpads, int nr_pads)
         for (i = 0; i < hmux->nr_pads; i++) {
                 struct omap_device_pad *pad = &hmux->pads[i];
 
-                if (pad->flags & OMAP_DEVICE_PAD_REMUX) {
+                if (pad->flags &
+                    (OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP)) {
                         pr_debug("%s: pad %s tagged dynamic\n",
                                         __func__, pad->name);
                         hmux->pads_dynamic[nr_pads_dynamic] = pad;
@@ -351,6 +356,78 @@ err1:
         return NULL;
 }
 
+/**
+ * omap_hwmod_mux_scan_wakeups - omap hwmod scan wakeup pads
+ * @hmux: Pads for a hwmod
+ * @mpu_irqs: MPU irq array for a hwmod
+ *
+ * Scans the wakeup status of pads for a single hwmod.  If an irq
+ * array is defined for this mux, the parser will call the registered
+ * ISRs for corresponding pads, otherwise the parser will stop at the
+ * first wakeup active pad and return.  Returns true if there is a
+ * pending and non-served wakeup event for the mux, otherwise false.
+ */
+static bool omap_hwmod_mux_scan_wakeups(struct omap_hwmod_mux_info *hmux,
+                struct omap_hwmod_irq_info *mpu_irqs)
+{
+        int i, irq;
+        unsigned int val;
+        u32 handled_irqs = 0;
+
+        for (i = 0; i < hmux->nr_pads_dynamic; i++) {
+                struct omap_device_pad *pad = hmux->pads_dynamic[i];
+
+                if (!(pad->flags & OMAP_DEVICE_PAD_WAKEUP) ||
+                    !(pad->idle & OMAP_WAKEUP_EN))
+                        continue;
+
+                val = omap_mux_read(pad->partition, pad->mux->reg_offset);
+                if (!(val & OMAP_WAKEUP_EVENT))
+                        continue;
+
+                if (!hmux->irqs)
+                        return true;
+
+                irq = hmux->irqs[i];
+                /* make sure we only handle each irq once */
+                if (handled_irqs & 1 << irq)
+                        continue;
+
+                handled_irqs |= 1 << irq;
+
+                generic_handle_irq(mpu_irqs[irq].irq);
+        }
+
+        return false;
+}
+
+/**
+ * _omap_hwmod_mux_handle_irq - Process wakeup events for a single hwmod
+ *
+ * Checks a single hwmod for every wakeup capable pad to see if there is an
+ * active wakeup event. If this is the case, call the corresponding ISR.
+ */
+static int _omap_hwmod_mux_handle_irq(struct omap_hwmod *oh, void *data)
+{
+        if (!oh->mux || !oh->mux->enabled)
+                return 0;
+        if (omap_hwmod_mux_scan_wakeups(oh->mux, oh->mpu_irqs))
+                generic_handle_irq(oh->mpu_irqs[0].irq);
+        return 0;
+}
+
+/**
+ * omap_hwmod_mux_handle_irq - Process pad wakeup irqs.
+ *
+ * Calls a function for each registered omap_hwmod to check
+ * pad wakeup statuses.
+ */
+static irqreturn_t omap_hwmod_mux_handle_irq(int irq, void *unused)
+{
+        omap_hwmod_for_each(_omap_hwmod_mux_handle_irq, NULL);
+        return IRQ_HANDLED;
+}
+
 /* Assumes the calling function takes care of locking */
 void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state)
 {
@@ -715,6 +792,7 @@ static void __init omap_mux_free_names(struct omap_mux *m)
 static int __init omap_mux_late_init(void)
 {
         struct omap_mux_partition *partition;
+        int ret;
 
         list_for_each_entry(partition, &mux_partitions, node) {
                 struct omap_mux_entry *e, *tmp;
@@ -735,6 +813,13 @@ static int __init omap_mux_late_init(void)
                 }
         }
 
+        ret = request_irq(omap_prcm_event_to_irq("io"),
+                omap_hwmod_mux_handle_irq, IRQF_SHARED | IRQF_NO_SUSPEND,
+                        "hwmod_io", omap_mux_late_init);
+
+        if (ret)
+                pr_warning("mux: Failed to setup hwmod io irq %d\n", ret);
+
         omap_mux_dbg_init();
 
         return 0;
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S
index 4ee6aeca885a..b13ef7ef5ef4 100644
--- a/arch/arm/mach-omap2/omap-headsmp.S
+++ b/arch/arm/mach-omap2/omap-headsmp.S
@@ -18,11 +18,6 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 
-/* Physical address needed since MMU not enabled yet on secondary core */
-#define OMAP4_AUX_CORE_BOOT1_PA                 0x48281804
-
-        __INIT
-
 /*
  * 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-hotplug.c b/arch/arm/mach-omap2/omap-hotplug.c
index e5a1c3f40a86..adbe4d8c7caf 100644
--- a/arch/arm/mach-omap2/omap-hotplug.c
+++ b/arch/arm/mach-omap2/omap-hotplug.c
@@ -22,6 +22,8 @@
 
 #include "common.h"
 
+#include "powerdomain.h"
+
 int platform_cpu_kill(unsigned int cpu)
 {
         return 1;
@@ -33,6 +35,8 @@ int platform_cpu_kill(unsigned int cpu)
  */
 void platform_cpu_die(unsigned int cpu)
 {
+        unsigned int this_cpu;
+
         flush_cache_all();
         dsb();
 
@@ -40,15 +44,15 @@ void platform_cpu_die(unsigned int cpu)
          * we're ready for shutdown now, so do it
          */
         if (omap_modify_auxcoreboot0(0x0, 0x200) != 0x0)
-                printk(KERN_CRIT "Secure clear status failed\n");
+                pr_err("Secure clear status failed\n");
 
         for (;;) {
                 /*
-                 * Execute WFI
+                 * Enter into low power state
                  */
-                do_wfi();
-
-                if (omap_read_auxcoreboot0() == cpu) {
+                omap4_hotplug_cpu(cpu, PWRDM_POWER_OFF);
+                this_cpu = smp_processor_id();
+                if (omap_read_auxcoreboot0() == this_cpu) {
                         /*
                          * OK, proper wakeup, we're done
                          */
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
new file mode 100644
index 000000000000..1d5d01056558
--- /dev/null
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -0,0 +1,398 @@
+/*
+ * OMAP MPUSS low power code
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *
+ * OMAP4430 MPUSS mainly consists of dual Cortex-A9 with per-CPU
+ * Local timer and Watchdog, GIC, SCU, PL310 L2 cache controller,
+ * CPU0 and CPU1 LPRM modules.
+ * CPU0, CPU1 and MPUSS each have there own power domain and
+ * hence multiple low power combinations of MPUSS are possible.
+ *
+ * The CPU0 and CPU1 can't support Closed switch Retention (CSWR)
+ * because the mode is not supported by hw constraints of dormant
+ * mode. While waking up from the dormant mode, a reset  signal
+ * to the Cortex-A9 processor must be asserted by the external
+ * power controller.
+ *
+ * With architectural inputs and hardware recommendations, only
+ * below modes are supported from power gain vs latency point of view.
+ *
+ *      CPU0            CPU1            MPUSS
+ *      ----------------------------------------------
+ *      ON              ON              ON
+ *      ON(Inactive)    OFF             ON(Inactive)
+ *      OFF             OFF             CSWR
+ *      OFF             OFF             OSWR
+ *      OFF             OFF             OFF(Device OFF *TBD)
+ *      ----------------------------------------------
+ *
+ * Note: CPU0 is the master core and it is the last CPU to go down
+ * and first to wake-up when MPUSS low power states are excercised
+ *
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/errno.h>
+#include <linux/linkage.h>
+#include <linux/smp.h>
+
+#include <asm/cacheflush.h>
+#include <asm/tlbflush.h>
+#include <asm/smp_scu.h>
+#include <asm/system.h>
+#include <asm/pgalloc.h>
+#include <asm/suspend.h>
+#include <asm/hardware/cache-l2x0.h>
+
+#include <plat/omap44xx.h>
+
+#include "common.h"
+#include "omap4-sar-layout.h"
+#include "pm.h"
+#include "prcm_mpu44xx.h"
+#include "prminst44xx.h"
+#include "prcm44xx.h"
+#include "prm44xx.h"
+#include "prm-regbits-44xx.h"
+
+#ifdef CONFIG_SMP
+
+struct omap4_cpu_pm_info {
+        struct powerdomain *pwrdm;
+        void __iomem *scu_sar_addr;
+        void __iomem *wkup_sar_addr;
+        void __iomem *l2x0_sar_addr;
+};
+
+static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
+static struct powerdomain *mpuss_pd;
+static void __iomem *sar_base;
+
+/*
+ * Program the wakeup routine address for the CPU0 and CPU1
+ * used for OFF or DORMANT wakeup.
+ */
+static inline void set_cpu_wakeup_addr(unsigned int cpu_id, u32 addr)
+{
+        struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu_id);
+
+        __raw_writel(addr, pm_info->wkup_sar_addr);
+}
+
+/*
+ * Set the CPUx powerdomain's previous power state
+ */
+static inline void set_cpu_next_pwrst(unsigned int cpu_id,
+                                unsigned int power_state)
+{
+        struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu_id);
+
+        pwrdm_set_next_pwrst(pm_info->pwrdm, power_state);
+}
+
+/*
+ * Read CPU's previous power state
+ */
+static inline unsigned int read_cpu_prev_pwrst(unsigned int cpu_id)
+{
+        struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu_id);
+
+        return pwrdm_read_prev_pwrst(pm_info->pwrdm);
+}
+
+/*
+ * Clear the CPUx powerdomain's previous power state
+ */
+static inline void clear_cpu_prev_pwrst(unsigned int cpu_id)
+{
+        struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu_id);
+
+        pwrdm_clear_all_prev_pwrst(pm_info->pwrdm);
+}
+
+/*
+ * Store the SCU power status value to scratchpad memory
+ */
+static void scu_pwrst_prepare(unsigned int cpu_id, unsigned int cpu_state)
+{
+        struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu_id);
+        u32 scu_pwr_st;
+
+        switch (cpu_state) {
+        case PWRDM_POWER_RET:
+                scu_pwr_st = SCU_PM_DORMANT;
+                break;
+        case PWRDM_POWER_OFF:
+                scu_pwr_st = SCU_PM_POWEROFF;
+                break;
+        case PWRDM_POWER_ON:
+        case PWRDM_POWER_INACTIVE:
+        default:
+                scu_pwr_st = SCU_PM_NORMAL;
+                break;
+        }
+
+        __raw_writel(scu_pwr_st, pm_info->scu_sar_addr);
+}
+
+/* Helper functions for MPUSS OSWR */
+static inline void mpuss_clear_prev_logic_pwrst(void)
+{
+        u32 reg;
+
+        reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
+                OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);
+        omap4_prminst_write_inst_reg(reg, OMAP4430_PRM_PARTITION,
+                OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);
+}
+
+static inline void cpu_clear_prev_logic_pwrst(unsigned int cpu_id)
+{
+        u32 reg;
+
+        if (cpu_id) {
+                reg = omap4_prcm_mpu_read_inst_reg(OMAP4430_PRCM_MPU_CPU1_INST,
+                                        OMAP4_RM_CPU1_CPU1_CONTEXT_OFFSET);
+                omap4_prcm_mpu_write_inst_reg(reg, OMAP4430_PRCM_MPU_CPU1_INST,
+                                        OMAP4_RM_CPU1_CPU1_CONTEXT_OFFSET);
+        } else {
+                reg = omap4_prcm_mpu_read_inst_reg(OMAP4430_PRCM_MPU_CPU0_INST,
+                                        OMAP4_RM_CPU0_CPU0_CONTEXT_OFFSET);
+                omap4_prcm_mpu_write_inst_reg(reg, OMAP4430_PRCM_MPU_CPU0_INST,
+                                        OMAP4_RM_CPU0_CPU0_CONTEXT_OFFSET);
+        }
+}
+
+/**
+ * omap4_mpuss_read_prev_context_state:
+ * Function returns the MPUSS previous context state
+ */
+u32 omap4_mpuss_read_prev_context_state(void)
+{
+        u32 reg;
+
+        reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
+                OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);
+        reg &= OMAP4430_LOSTCONTEXT_DFF_MASK;
+        return reg;
+}
+
+/*
+ * Store the CPU cluster state for L2X0 low power operations.
+ */
+static void l2x0_pwrst_prepare(unsigned int cpu_id, unsigned int save_state)
+{
+        struct omap4_cpu_pm_info *pm_info = &per_cpu(omap4_pm_info, cpu_id);
+
+        __raw_writel(save_state, pm_info->l2x0_sar_addr);
+}
+
+/*
+ * Save the L2X0 AUXCTRL and POR value to SAR memory. Its used to
+ * in every restore MPUSS OFF path.
+ */
+#ifdef CONFIG_CACHE_L2X0
+static void save_l2x0_context(void)
+{
+        u32 val;
+        void __iomem *l2x0_base = omap4_get_l2cache_base();
+
+        val = __raw_readl(l2x0_base + L2X0_AUX_CTRL);
+        __raw_writel(val, sar_base + L2X0_AUXCTRL_OFFSET);
+        val = __raw_readl(l2x0_base + L2X0_PREFETCH_CTRL);
+        __raw_writel(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);
+}
+#else
+static void save_l2x0_context(void)
+{}
+#endif
+
+/**
+ * omap4_enter_lowpower: OMAP4 MPUSS Low Power Entry Function
+ * The purpose of this function is to manage low power programming
+ * of OMAP4 MPUSS subsystem
+ * @cpu : CPU ID
+ * @power_state: Low power state.
+ *
+ * MPUSS states for the context save:
+ * save_state =
+ *      0 - Nothing lost and no need to save: MPUSS INACTIVE
+ *      1 - CPUx L1 and logic lost: MPUSS CSWR
+ *      2 - CPUx L1 and logic lost + GIC lost: MPUSS OSWR
+ *      3 - CPUx L1 and logic lost + GIC + L2 lost: DEVICE OFF
+ */
+int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state)
+{
+        unsigned int save_state = 0;
+        unsigned int wakeup_cpu;
+
+        if (omap_rev() == OMAP4430_REV_ES1_0)
+                return -ENXIO;
+
+        switch (power_state) {
+        case PWRDM_POWER_ON:
+        case PWRDM_POWER_INACTIVE:
+                save_state = 0;
+                break;
+        case PWRDM_POWER_OFF:
+                save_state = 1;
+                break;
+        case PWRDM_POWER_RET:
+        default:
+                /*
+                 * CPUx CSWR is invalid hardware state. Also CPUx OSWR
+                 * doesn't make much scense, since logic is lost and $L1
+                 * needs to be cleaned because of coherency. This makes
+                 * CPUx OSWR equivalent to CPUX OFF and hence not supported
+                 */
+                WARN_ON(1);
+                return -ENXIO;
+        }
+
+        pwrdm_pre_transition();
+
+        /*
+         * Check MPUSS next state and save interrupt controller if needed.
+         * In MPUSS OSWR or device OFF, interrupt controller  contest is lost.
+         */
+        mpuss_clear_prev_logic_pwrst();
+        pwrdm_clear_all_prev_pwrst(mpuss_pd);
+        if ((pwrdm_read_next_pwrst(mpuss_pd) == PWRDM_POWER_RET) &&
+                (pwrdm_read_logic_retst(mpuss_pd) == PWRDM_POWER_OFF))
+                save_state = 2;
+
+        clear_cpu_prev_pwrst(cpu);
+        cpu_clear_prev_logic_pwrst(cpu);
+        set_cpu_next_pwrst(cpu, power_state);
+        set_cpu_wakeup_addr(cpu, virt_to_phys(omap4_cpu_resume));
+        scu_pwrst_prepare(cpu, power_state);
+        l2x0_pwrst_prepare(cpu, save_state);
+
+        /*
+         * Call low level function  with targeted low power state.
+         */
+        cpu_suspend(save_state, omap4_finish_suspend);
+
+        /*
+         * Restore the CPUx power state to ON otherwise CPUx
+         * power domain can transitions to programmed low power
+         * state while doing WFI outside the low powe code. On
+         * secure devices, CPUx does WFI which can result in
+         * domain transition
+         */
+        wakeup_cpu = smp_processor_id();
+        set_cpu_next_pwrst(wakeup_cpu, PWRDM_POWER_ON);
+
+        pwrdm_post_transition();
+
+        return 0;
+}
+
+/**
+ * omap4_hotplug_cpu: OMAP4 CPU hotplug entry
+ * @cpu : CPU ID
+ * @power_state: CPU low power state.
+ */
+int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state)
+{
+        unsigned int cpu_state = 0;
+
+        if (omap_rev() == OMAP4430_REV_ES1_0)
+                return -ENXIO;
+
+        if (power_state == PWRDM_POWER_OFF)
+                cpu_state = 1;
+
+        clear_cpu_prev_pwrst(cpu);
+        set_cpu_next_pwrst(cpu, power_state);
+        set_cpu_wakeup_addr(cpu, virt_to_phys(omap_secondary_startup));
+        scu_pwrst_prepare(cpu, power_state);
+
+        /*
+         * CPU never retuns back if targetted power state is OFF mode.
+         * CPU ONLINE follows normal CPU ONLINE ptah via
+         * omap_secondary_startup().
+         */
+        omap4_finish_suspend(cpu_state);
+
+        set_cpu_next_pwrst(cpu, PWRDM_POWER_ON);
+        return 0;
+}
+
+
+/*
+ * Initialise OMAP4 MPUSS
+ */
+int __init omap4_mpuss_init(void)
+{
+        struct omap4_cpu_pm_info *pm_info;
+
+        if (omap_rev() == OMAP4430_REV_ES1_0) {
+                WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
+                return -ENODEV;
+        }
+
+        sar_base = omap4_get_sar_ram_base();
+
+        /* Initilaise per CPU PM information */
+        pm_info = &per_cpu(omap4_pm_info, 0x0);
+        pm_info->scu_sar_addr = sar_base + SCU_OFFSET0;
+        pm_info->wkup_sar_addr = sar_base + CPU0_WAKEUP_NS_PA_ADDR_OFFSET;
+        pm_info->l2x0_sar_addr = sar_base + L2X0_SAVE_OFFSET0;
+        pm_info->pwrdm = pwrdm_lookup("cpu0_pwrdm");
+        if (!pm_info->pwrdm) {
+                pr_err("Lookup failed for CPU0 pwrdm\n");
+                return -ENODEV;
+        }
+
+        /* Clear CPU previous power domain state */
+        pwrdm_clear_all_prev_pwrst(pm_info->pwrdm);
+        cpu_clear_prev_logic_pwrst(0);
+
+        /* Initialise CPU0 power domain state to ON */
+        pwrdm_set_next_pwrst(pm_info->pwrdm, PWRDM_POWER_ON);
+
+        pm_info = &per_cpu(omap4_pm_info, 0x1);
+        pm_info->scu_sar_addr = sar_base + SCU_OFFSET1;
+        pm_info->wkup_sar_addr = sar_base + CPU1_WAKEUP_NS_PA_ADDR_OFFSET;
+        pm_info->l2x0_sar_addr = sar_base + L2X0_SAVE_OFFSET1;
+        pm_info->pwrdm = pwrdm_lookup("cpu1_pwrdm");
+        if (!pm_info->pwrdm) {
+                pr_err("Lookup failed for CPU1 pwrdm\n");
+                return -ENODEV;
+        }
+
+        /* Clear CPU previous power domain state */
+        pwrdm_clear_all_prev_pwrst(pm_info->pwrdm);
+        cpu_clear_prev_logic_pwrst(1);
+
+        /* Initialise CPU1 power domain state to ON */
+        pwrdm_set_next_pwrst(pm_info->pwrdm, PWRDM_POWER_ON);
+
+        mpuss_pd = pwrdm_lookup("mpu_pwrdm");
+        if (!mpuss_pd) {
+                pr_err("Failed to lookup MPUSS power domain\n");
+                return -ENODEV;
+        }
+        pwrdm_clear_all_prev_pwrst(mpuss_pd);
+        mpuss_clear_prev_logic_pwrst();
+
+        /* Save device type on scratchpad for low level code to use */
+        if (omap_type() != OMAP2_DEVICE_TYPE_GP)
+                __raw_writel(1, sar_base + OMAP_TYPE_OFFSET);
+        else
+                __raw_writel(0, sar_base + OMAP_TYPE_OFFSET);
+
+        save_l2x0_context();
+
+        return 0;
+}
+
+#endif
diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
new file mode 100644
index 000000000000..69f3c72d959b
--- /dev/null
+++ b/arch/arm/mach-omap2/omap-secure.c
@@ -0,0 +1,81 @@
+/*
+ * OMAP Secure API infrastructure.
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/memblock.h>
+
+#include <asm/cacheflush.h>
+
+#include <mach/omap-secure.h>
+
+static phys_addr_t omap_secure_memblock_base;
+
+/**
+ * omap_sec_dispatcher: Routine to dispatch low power secure
+ * service routines
+ * @idx: The HAL API index
+ * @flag: The flag indicating criticality of operation
+ * @nargs: Number of valid arguments out of four.
+ * @arg1, arg2, arg3 args4: Parameters passed to secure API
+ *
+ * Return the non-zero error value on failure.
+ */
+u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, u32 arg1, u32 arg2,
+                                                         u32 arg3, u32 arg4)
+{
+        u32 ret;
+        u32 param[5];
+
+        param[0] = nargs;
+        param[1] = arg1;
+        param[2] = arg2;
+        param[3] = arg3;
+        param[4] = arg4;
+
+        /*
+         * Secure API needs physical address
+         * pointer for the parameters
+         */
+        flush_cache_all();
+        outer_clean_range(__pa(param), __pa(param + 5));
+        ret = omap_smc2(idx, flag, __pa(param));
+
+        return ret;
+}
+
+/* Allocate the memory to save secure ram */
+int __init omap_secure_ram_reserve_memblock(void)
+{
+        phys_addr_t paddr;
+        u32 size = OMAP_SECURE_RAM_STORAGE;
+
+        size = ALIGN(size, SZ_1M);
+        paddr = memblock_alloc(size, SZ_1M);
+        if (!paddr) {
+                pr_err("%s: failed to reserve %x bytes\n",
+                                __func__, size);
+                return -ENOMEM;
+        }
+        memblock_free(paddr, size);
+        memblock_remove(paddr, size);
+
+        omap_secure_memblock_base = paddr;
+
+        return 0;
+}
+
+phys_addr_t omap_secure_ram_mempool_base(void)
+{
+        return omap_secure_memblock_base;
+}
diff --git a/arch/arm/mach-omap2/omap44xx-smc.S b/arch/arm/mach-omap2/omap-smc.S
index e69d37d95204..f6441c13cd8c 100644
--- a/arch/arm/mach-omap2/omap44xx-smc.S
+++ b/arch/arm/mach-omap2/omap-smc.S
@@ -31,6 +31,29 @@ ENTRY(omap_smc1)
         ldmfd   sp!, {r2-r12, pc}
 ENDPROC(omap_smc1)
 
+/**
+ * u32 omap_smc2(u32 id, u32 falg, u32 pargs)
+ * Low level common routine for secure HAL and PPA APIs.
+ * @id: Application ID of HAL APIs
+ * @flag: Flag to indicate the criticality of operation
+ * @pargs: Physical address of parameter list starting
+ *          with number of parametrs
+ */
+ENTRY(omap_smc2)
+        stmfd   sp!, {r4-r12, lr}
+        mov     r3, r2
+        mov     r2, r1
+        mov     r1, #0x0        @ Process ID
+        mov     r6, #0xff
+        mov     r12, #0x00      @ Secure Service ID
+        mov     r7, #0
+        mcr     p15, 0, r7, c7, c5, 6
+        dsb
+        dmb
+        smc     #0
+        ldmfd   sp!, {r4-r12, pc}
+ENDPROC(omap_smc2)
+
 ENTRY(omap_modify_auxcoreboot0)
         stmfd   sp!, {r1-r12, lr}
         ldr     r12, =0x104
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index e99bc6cd4714..c1bf3ef0ba02 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -24,17 +24,37 @@
 #include <asm/hardware/gic.h>
 #include <asm/smp_scu.h>
 #include <mach/hardware.h>
+#include <mach/omap-secure.h>
 
 #include "common.h"
 
+#include "clockdomain.h"
+
 /* SCU base address */
 static void __iomem *scu_base;
 
 static DEFINE_SPINLOCK(boot_lock);
 
+void __iomem *omap4_get_scu_base(void)
+{
+        return scu_base;
+}
+
 void __cpuinit platform_secondary_init(unsigned int cpu)
 {
         /*
+         * Configure ACTRL and enable NS SMP bit access on CPU1 on HS device.
+         * OMAP44XX EMU/HS devices - CPU0 SMP bit access is enabled in PPA
+         * init and for CPU1, a secure PPA API provided. CPU0 must be ON
+         * while executing NS_SMP API on CPU1 and PPA version must be 1.4.0+.
+         * OMAP443X GP devices- SMP bit isn't accessible.
+         * OMAP446X GP devices - SMP bit access is enabled on both CPUs.
+         */
+        if (cpu_is_omap443x() && (omap_type() != OMAP2_DEVICE_TYPE_GP))
+                omap_secure_dispatcher(OMAP4_PPA_CPU_ACTRL_SMP_INDEX,
+                                                        4, 0, 0, 0, 0, 0);
+
+        /*
          * If any interrupts are already enabled for the primary
          * core (e.g. timer irq), then they will not have been enabled
          * for us: do so
@@ -50,6 +70,8 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
 
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
+        static struct clockdomain *cpu1_clkdm;
+        static bool booted;
         /*
          * Set synchronisation state between this boot processor
          * and the secondary one
@@ -65,6 +87,29 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
         omap_modify_auxcoreboot0(0x200, 0xfffffdff);
         flush_cache_all();
         smp_wmb();
+
+        if (!cpu1_clkdm)
+                cpu1_clkdm = clkdm_lookup("mpu1_clkdm");
+
+        /*
+         * The SGI(Software Generated Interrupts) are not wakeup capable
+         * from low power states. This is known limitation on OMAP4 and
+         * needs to be worked around by using software forced clockdomain
+         * wake-up. To wakeup CPU1, CPU0 forces the CPU1 clockdomain to
+         * software force wakeup. The clockdomain is then put back to
+         * hardware supervised mode.
+         * More details can be found in OMAP4430 TRM - Version J
+         * Section :
+         *      4.3.4.2 Power States of CPU0 and CPU1
+         */
+        if (booted) {
+                clkdm_wakeup(cpu1_clkdm);
+                clkdm_allow_idle(cpu1_clkdm);
+        } else {
+                dsb_sev();
+                booted = true;
+        }
+
         gic_raise_softirq(cpumask_of(cpu), 1);
 
         /*
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
new file mode 100644
index 000000000000..d3d8971d7f30
--- /dev/null
+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
@@ -0,0 +1,389 @@
+/*
+ * OMAP WakeupGen Source file
+ *
+ * OMAP WakeupGen is the interrupt controller extension used along
+ * with ARM GIC to wake the CPU out from low power states on
+ * external interrupts. It is responsible for generating wakeup
+ * event from the incoming interrupts and enable bits. It is
+ * implemented in MPU always ON power domain. During normal operation,
+ * WakeupGen delivers external interrupts directly to the GIC.
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/cpu.h>
+#include <linux/notifier.h>
+#include <linux/cpu_pm.h>
+
+#include <asm/hardware/gic.h>
+
+#include <mach/omap-wakeupgen.h>
+#include <mach/omap-secure.h>
+
+#include "omap4-sar-layout.h"
+#include "common.h"
+
+#define NR_REG_BANKS            4
+#define MAX_IRQS                128
+#define WKG_MASK_ALL            0x00000000
+#define WKG_UNMASK_ALL          0xffffffff
+#define CPU_ENA_OFFSET          0x400
+#define CPU0_ID                 0x0
+#define CPU1_ID                 0x1
+
+static void __iomem *wakeupgen_base;
+static void __iomem *sar_base;
+static DEFINE_PER_CPU(u32 [NR_REG_BANKS], irqmasks);
+static DEFINE_SPINLOCK(wakeupgen_lock);
+static unsigned int irq_target_cpu[NR_IRQS];
+
+/*
+ * Static helper functions.
+ */
+static inline u32 wakeupgen_readl(u8 idx, u32 cpu)
+{
+        return __raw_readl(wakeupgen_base + OMAP_WKG_ENB_A_0 +
+                                (cpu * CPU_ENA_OFFSET) + (idx * 4));
+}
+
+static inline void wakeupgen_writel(u32 val, u8 idx, u32 cpu)
+{
+        __raw_writel(val, wakeupgen_base + OMAP_WKG_ENB_A_0 +
+                                (cpu * CPU_ENA_OFFSET) + (idx * 4));
+}
+
+static inline void sar_writel(u32 val, u32 offset, u8 idx)
+{
+        __raw_writel(val, sar_base + offset + (idx * 4));
+}
+
+static void _wakeupgen_set_all(unsigned int cpu, unsigned int reg)
+{
+        u8 i;
+
+        for (i = 0; i < NR_REG_BANKS; i++)
+                wakeupgen_writel(reg, i, cpu);
+}
+
+static inline int _wakeupgen_get_irq_info(u32 irq, u32 *bit_posn, u8 *reg_index)
+{
+        unsigned int spi_irq;
+
+        /*
+         * PPIs and SGIs are not supported.
+         */
+        if (irq < OMAP44XX_IRQ_GIC_START)
+                return -EINVAL;
+
+        /*
+         * Subtract the GIC offset.
+         */
+        spi_irq = irq - OMAP44XX_IRQ_GIC_START;
+        if (spi_irq > MAX_IRQS) {
+                pr_err("omap wakeupGen: Invalid IRQ%d\n", irq);
+                return -EINVAL;
+        }
+
+        /*
+         * Each WakeupGen register controls 32 interrupt.
+         * i.e. 1 bit per SPI IRQ
+         */
+        *reg_index = spi_irq >> 5;
+        *bit_posn = spi_irq %= 32;
+
+        return 0;
+}
+
+static void _wakeupgen_clear(unsigned int irq, unsigned int cpu)
+{
+        u32 val, bit_number;
+        u8 i;
+
+        if (_wakeupgen_get_irq_info(irq, &bit_number, &i))
+                return;
+
+        val = wakeupgen_readl(i, cpu);
+        val &= ~BIT(bit_number);
+        wakeupgen_writel(val, i, cpu);
+}
+
+static void _wakeupgen_set(unsigned int irq, unsigned int cpu)
+{
+        u32 val, bit_number;
+        u8 i;
+
+        if (_wakeupgen_get_irq_info(irq, &bit_number, &i))
+                return;
+
+        val = wakeupgen_readl(i, cpu);
+        val |= BIT(bit_number);
+        wakeupgen_writel(val, i, cpu);
+}
+
+static void _wakeupgen_save_masks(unsigned int cpu)
+{
+        u8 i;
+
+        for (i = 0; i < NR_REG_BANKS; i++)
+                per_cpu(irqmasks, cpu)[i] = wakeupgen_readl(i, cpu);
+}
+
+static void _wakeupgen_restore_masks(unsigned int cpu)
+{
+        u8 i;
+
+        for (i = 0; i < NR_REG_BANKS; i++)
+                wakeupgen_writel(per_cpu(irqmasks, cpu)[i], i, cpu);
+}
+
+/*
+ * Architecture specific Mask extension
+ */
+static void wakeupgen_mask(struct irq_data *d)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wakeupgen_lock, flags);
+        _wakeupgen_clear(d->irq, irq_target_cpu[d->irq]);
+        spin_unlock_irqrestore(&wakeupgen_lock, flags);
+}
+
+/*
+ * Architecture specific Unmask extension
+ */
+static void wakeupgen_unmask(struct irq_data *d)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wakeupgen_lock, flags);
+        _wakeupgen_set(d->irq, irq_target_cpu[d->irq]);
+        spin_unlock_irqrestore(&wakeupgen_lock, flags);
+}
+
+/*
+ * Mask or unmask all interrupts on given CPU.
+ *      0 = Mask all interrupts on the 'cpu'
+ *      1 = Unmask all interrupts on the 'cpu'
+ * Ensure that the initial mask is maintained. This is faster than
+ * iterating through GIC registers to arrive at the correct masks.
+ */
+static void wakeupgen_irqmask_all(unsigned int cpu, unsigned int set)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&wakeupgen_lock, flags);
+        if (set) {
+                _wakeupgen_save_masks(cpu);
+                _wakeupgen_set_all(cpu, WKG_MASK_ALL);
+        } else {
+                _wakeupgen_set_all(cpu, WKG_UNMASK_ALL);
+                _wakeupgen_restore_masks(cpu);
+        }
+        spin_unlock_irqrestore(&wakeupgen_lock, flags);
+}
+
+#ifdef CONFIG_CPU_PM
+/*
+ * Save WakeupGen interrupt context in SAR BANK3. Restore is done by
+ * ROM code. WakeupGen IP is integrated along with GIC to manage the
+ * interrupt wakeups from CPU low power states. It manages
+ * masking/unmasking of Shared peripheral interrupts(SPI). So the
+ * interrupt enable/disable control should be in sync and consistent
+ * at WakeupGen and GIC so that interrupts are not lost.
+ */
+static void irq_save_context(void)
+{
+        u32 i, val;
+
+        if (omap_rev() == OMAP4430_REV_ES1_0)
+                return;
+
+        if (!sar_base)
+                sar_base = omap4_get_sar_ram_base();
+
+        for (i = 0; i < NR_REG_BANKS; i++) {
+                /* Save the CPUx interrupt mask for IRQ 0 to 127 */
+                val = wakeupgen_readl(i, 0);
+                sar_writel(val, WAKEUPGENENB_OFFSET_CPU0, i);
+                val = wakeupgen_readl(i, 1);
+                sar_writel(val, WAKEUPGENENB_OFFSET_CPU1, i);
+
+                /*
+                 * Disable the secure interrupts for CPUx. The restore
+                 * code blindly restores secure and non-secure interrupt
+                 * masks from SAR RAM. Secure interrupts are not suppose
+                 * to be enabled from HLOS. So overwrite the SAR location
+                 * so that the secure interrupt remains disabled.
+                 */
+                sar_writel(0x0, WAKEUPGENENB_SECURE_OFFSET_CPU0, i);
+                sar_writel(0x0, WAKEUPGENENB_SECURE_OFFSET_CPU1, i);
+        }
+
+        /* Save AuxBoot* registers */
+        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
+        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
+
+        /* Save SyncReq generation logic */
+        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        __raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
+        val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+        __raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
+
+        /* Save SyncReq generation logic */
+        val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_MASK);
+        __raw_writel(val, sar_base + PTMSYNCREQ_MASK_OFFSET);
+        val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_EN);
+        __raw_writel(val, sar_base + PTMSYNCREQ_EN_OFFSET);
+
+        /* Set the Backup Bit Mask status */
+        val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET);
+        val |= SAR_BACKUP_STATUS_WAKEUPGEN;
+        __raw_writel(val, sar_base + SAR_BACKUP_STATUS_OFFSET);
+}
+
+/*
+ * Clear WakeupGen SAR backup status.
+ */
+void irq_sar_clear(void)
+{
+        u32 val;
+        val = __raw_readl(sar_base + SAR_BACKUP_STATUS_OFFSET);
+        val &= ~SAR_BACKUP_STATUS_WAKEUPGEN;
+        __raw_writel(val, sar_base + SAR_BACKUP_STATUS_OFFSET);
+}
+
+/*
+ * Save GIC and Wakeupgen interrupt context using secure API
+ * for HS/EMU devices.
+ */
+static void irq_save_secure_context(void)
+{
+        u32 ret;
+        ret = omap_secure_dispatcher(OMAP4_HAL_SAVEGIC_INDEX,
+                                FLAG_START_CRITICAL,
+                                0, 0, 0, 0, 0);
+        if (ret != API_HAL_RET_VALUE_OK)
+                pr_err("GIC and Wakeupgen context save failed\n");
+}
+#endif
+
+#ifdef CONFIG_HOTPLUG_CPU
+static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,
+                                         unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned int)hcpu;
+
+        switch (action) {
+        case CPU_ONLINE:
+                wakeupgen_irqmask_all(cpu, 0);
+                break;
+        case CPU_DEAD:
+                wakeupgen_irqmask_all(cpu, 1);
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block __refdata irq_hotplug_notifier = {
+        .notifier_call = irq_cpu_hotplug_notify,
+};
+
+static void __init irq_hotplug_init(void)
+{
+        register_hotcpu_notifier(&irq_hotplug_notifier);
+}
+#else
+static void __init irq_hotplug_init(void)
+{}
+#endif
+
+#ifdef CONFIG_CPU_PM
+static int irq_notifier(struct notifier_block *self, unsigned long cmd, void *v)
+{
+        switch (cmd) {
+        case CPU_CLUSTER_PM_ENTER:
+                if (omap_type() == OMAP2_DEVICE_TYPE_GP)
+                        irq_save_context();
+                else
+                        irq_save_secure_context();
+                break;
+        case CPU_CLUSTER_PM_EXIT:
+                if (omap_type() == OMAP2_DEVICE_TYPE_GP)
+                        irq_sar_clear();
+                break;
+        }
+        return NOTIFY_OK;
+}
+
+static struct notifier_block irq_notifier_block = {
+        .notifier_call = irq_notifier,
+};
+
+static void __init irq_pm_init(void)
+{
+        cpu_pm_register_notifier(&irq_notifier_block);
+}
+#else
+static void __init irq_pm_init(void)
+{}
+#endif
+
+/*
+ * Initialise the wakeupgen module.
+ */
+int __init omap_wakeupgen_init(void)
+{
+        int i;
+        unsigned int boot_cpu = smp_processor_id();
+
+        /* Not supported on OMAP4 ES1.0 silicon */
+        if (omap_rev() == OMAP4430_REV_ES1_0) {
+                WARN(1, "WakeupGen: Not supported on OMAP4430 ES1.0\n");
+                return -EPERM;
+        }
+
+        /* Static mapping, never released */
+        wakeupgen_base = ioremap(OMAP44XX_WKUPGEN_BASE, SZ_4K);
+        if (WARN_ON(!wakeupgen_base))
+                return -ENOMEM;
+
+        /* Clear all IRQ bitmasks at wakeupGen level */
+        for (i = 0; i < NR_REG_BANKS; i++) {
+                wakeupgen_writel(0, i, CPU0_ID);
+                wakeupgen_writel(0, i, CPU1_ID);
+        }
+
+        /*
+         * Override GIC architecture specific functions to add
+         * OMAP WakeupGen interrupt controller along with GIC
+         */
+        gic_arch_extn.irq_mask = wakeupgen_mask;
+        gic_arch_extn.irq_unmask = wakeupgen_unmask;
+        gic_arch_extn.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE;
+
+        /*
+         * FIXME: Add support to set_smp_affinity() once the core
+         * GIC code has necessary hooks in place.
+         */
+
+        /* Associate all the IRQs to boot CPU like GIC init does. */
+        for (i = 0; i < NR_IRQS; i++)
+                irq_target_cpu[i] = boot_cpu;
+
+        irq_hotplug_init();
+        irq_pm_init();
+
+        return 0;
+}
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index beecfdd56ea3..bc16c818c6b7 100644
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -15,18 +15,73 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
+#include <linux/memblock.h>
 
 #include <asm/hardware/gic.h>
 #include <asm/hardware/cache-l2x0.h>
+#include <asm/mach/map.h>
 
 #include <plat/irqs.h>
+#include <plat/sram.h>
 
 #include <mach/hardware.h>
+#include <mach/omap-wakeupgen.h>
 
 #include "common.h"
+#include "omap4-sar-layout.h"
 
 #ifdef CONFIG_CACHE_L2X0
-void __iomem *l2cache_base;
+static void __iomem *l2cache_base;
+#endif
+
+static void __iomem *sar_ram_base;
+
+#ifdef CONFIG_OMAP4_ERRATA_I688
+/* Used to implement memory barrier on DRAM path */
+#define OMAP4_DRAM_BARRIER_VA                   0xfe600000
+
+void __iomem *dram_sync, *sram_sync;
+
+void omap_bus_sync(void)
+{
+        if (dram_sync && sram_sync) {
+                writel_relaxed(readl_relaxed(dram_sync), dram_sync);
+                writel_relaxed(readl_relaxed(sram_sync), sram_sync);
+                isb();
+        }
+}
+
+static int __init omap_barriers_init(void)
+{
+        struct map_desc dram_io_desc[1];
+        phys_addr_t paddr;
+        u32 size;
+
+        if (!cpu_is_omap44xx())
+                return -ENODEV;
+
+        size = ALIGN(PAGE_SIZE, SZ_1M);
+        paddr = memblock_alloc(size, SZ_1M);
+        if (!paddr) {
+                pr_err("%s: failed to reserve 4 Kbytes\n", __func__);
+                return -ENOMEM;
+        }
+        memblock_free(paddr, size);
+        memblock_remove(paddr, size);
+        dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;
+        dram_io_desc[0].pfn = __phys_to_pfn(paddr);
+        dram_io_desc[0].length = size;
+        dram_io_desc[0].type = MT_MEMORY_SO;
+        iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));
+        dram_sync = (void __iomem *) dram_io_desc[0].virtual;
+        sram_sync = (void __iomem *) OMAP4_SRAM_VA;
+
+        pr_info("OMAP4: Map 0x%08llx to 0x%08lx for dram barrier\n",
+                (long long) paddr, dram_io_desc[0].virtual);
+
+        return 0;
+}
+core_initcall(omap_barriers_init);
 #endif
 
 void __init gic_init_irq(void)
@@ -42,11 +97,18 @@ void __init gic_init_irq(void)
         omap_irq_base = ioremap(OMAP44XX_GIC_CPU_BASE, SZ_512);
         BUG_ON(!omap_irq_base);
 
+        omap_wakeupgen_init();
+
         gic_init(0, 29, gic_dist_base_addr, omap_irq_base);
 }
 
 #ifdef CONFIG_CACHE_L2X0
 
+void __iomem *omap4_get_l2cache_base(void)
+{
+        return l2cache_base;
+}
+
 static void omap4_l2x0_disable(void)
 {
         /* Disable PL310 L2 Cache controller */
@@ -72,7 +134,8 @@ static int __init omap_l2_cache_init(void)
 
         /* Static mapping, never released */
         l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);
-        BUG_ON(!l2cache_base);
+        if (WARN_ON(!l2cache_base))
+                return -ENOMEM;
 
         /*
          * 16-way associativity, parity disabled
@@ -112,3 +175,30 @@ static int __init omap_l2_cache_init(void)
 }
 early_initcall(omap_l2_cache_init);
 #endif
+
+void __iomem *omap4_get_sar_ram_base(void)
+{
+        return sar_ram_base;
+}
+
+/*
+ * SAR RAM used to save and restore the HW
+ * context in low power modes
+ */
+static int __init omap4_sar_ram_init(void)
+{
+        /*
+         * To avoid code running on other OMAPs in
+         * multi-omap builds
+         */
+        if (!cpu_is_omap44xx())
+                return -ENOMEM;
+
+        /* Static mapping, never released */
+        sar_ram_base = ioremap(OMAP44XX_SAR_RAM_BASE, SZ_16K);
+        if (WARN_ON(!sar_ram_base))
+                return -ENOMEM;
+
+        return 0;
+}
+early_initcall(omap4_sar_ram_init);
diff --git a/arch/arm/mach-omap2/omap4-sar-layout.h b/arch/arm/mach-omap2/omap4-sar-layout.h
new file mode 100644
index 000000000000..fe5b545ad443
--- /dev/null
+++ b/arch/arm/mach-omap2/omap4-sar-layout.h
@@ -0,0 +1,50 @@
+/*
+ * omap4-sar-layout.h: OMAP4 SAR RAM layout header file
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.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.
+ */
+#ifndef OMAP_ARCH_OMAP4_SAR_LAYOUT_H
+#define OMAP_ARCH_OMAP4_SAR_LAYOUT_H
+
+/*
+ * SAR BANK offsets from base address OMAP44XX_SAR_RAM_BASE
+ */
+#define SAR_BANK1_OFFSET                0x0000
+#define SAR_BANK2_OFFSET                0x1000
+#define SAR_BANK3_OFFSET                0x2000
+#define SAR_BANK4_OFFSET                0x3000
+
+/* Scratch pad memory offsets from SAR_BANK1 */
+#define SCU_OFFSET0                             0xd00
+#define SCU_OFFSET1                             0xd04
+#define OMAP_TYPE_OFFSET                        0xd10
+#define L2X0_SAVE_OFFSET0                       0xd14
+#define L2X0_SAVE_OFFSET1                       0xd18
+#define L2X0_AUXCTRL_OFFSET                     0xd1c
+#define L2X0_PREFETCH_CTRL_OFFSET               0xd20
+
+/* CPUx Wakeup Non-Secure Physical Address offsets in SAR_BANK3 */
+#define CPU0_WAKEUP_NS_PA_ADDR_OFFSET           0xa04
+#define CPU1_WAKEUP_NS_PA_ADDR_OFFSET           0xa08
+
+#define SAR_BACKUP_STATUS_OFFSET                (SAR_BANK3_OFFSET + 0x500)
+#define SAR_SECURE_RAM_SIZE_OFFSET              (SAR_BANK3_OFFSET + 0x504)
+#define SAR_SECRAM_SAVED_AT_OFFSET              (SAR_BANK3_OFFSET + 0x508)
+
+/* WakeUpGen save restore offset from OMAP44XX_SAR_RAM_BASE */
+#define WAKEUPGENENB_OFFSET_CPU0                (SAR_BANK3_OFFSET + 0x684)
+#define WAKEUPGENENB_SECURE_OFFSET_CPU0         (SAR_BANK3_OFFSET + 0x694)
+#define WAKEUPGENENB_OFFSET_CPU1                (SAR_BANK3_OFFSET + 0x6a4)
+#define WAKEUPGENENB_SECURE_OFFSET_CPU1         (SAR_BANK3_OFFSET + 0x6b4)
+#define AUXCOREBOOT0_OFFSET                     (SAR_BANK3_OFFSET + 0x6c4)
+#define AUXCOREBOOT1_OFFSET                     (SAR_BANK3_OFFSET + 0x6c8)
+#define PTMSYNCREQ_MASK_OFFSET                  (SAR_BANK3_OFFSET + 0x6cc)
+#define PTMSYNCREQ_EN_OFFSET                    (SAR_BANK3_OFFSET + 0x6d0)
+#define SAR_BACKUP_STATUS_WAKEUPGEN             0x10
+
+#endif
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 529142aff766..5192cabb40ed 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -136,6 +136,7 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
+#include <linux/slab.h>
 
 #include "common.h"
 #include <plat/cpu.h>
@@ -381,6 +382,51 @@ static int _set_module_autoidle(struct omap_hwmod *oh, u8 autoidle,
 }
 
 /**
+ * _set_idle_ioring_wakeup - enable/disable IO pad wakeup on hwmod idle for mux
+ * @oh: struct omap_hwmod *
+ * @set_wake: bool value indicating to set (true) or clear (false) wakeup enable
+ *
+ * Set or clear the I/O pad wakeup flag in the mux entries for the
+ * hwmod @oh.  This function changes the @oh->mux->pads_dynamic array
+ * in memory.  If the hwmod is currently idled, and the new idle
+ * values don't match the previous ones, this function will also
+ * update the SCM PADCTRL registers.  Otherwise, if the hwmod is not
+ * currently idled, this function won't touch the hardware: the new
+ * mux settings are written to the SCM PADCTRL registers when the
+ * hwmod is idled.  No return value.
+ */
+static void _set_idle_ioring_wakeup(struct omap_hwmod *oh, bool set_wake)
+{
+        struct omap_device_pad *pad;
+        bool change = false;
+        u16 prev_idle;
+        int j;
+
+        if (!oh->mux || !oh->mux->enabled)
+                return;
+
+        for (j = 0; j < oh->mux->nr_pads_dynamic; j++) {
+                pad = oh->mux->pads_dynamic[j];
+
+                if (!(pad->flags & OMAP_DEVICE_PAD_WAKEUP))
+                        continue;
+
+                prev_idle = pad->idle;
+
+                if (set_wake)
+                        pad->idle |= OMAP_WAKEUP_EN;
+                else
+                        pad->idle &= ~OMAP_WAKEUP_EN;
+
+                if (prev_idle != pad->idle)
+                        change = true;
+        }
+
+        if (change && oh->_state == _HWMOD_STATE_IDLE)
+                omap_hwmod_mux(oh->mux, _HWMOD_STATE_IDLE);
+}
+
+/**
  * _enable_wakeup: set OCP_SYSCONFIG.ENAWAKEUP bit in the hardware
  * @oh: struct omap_hwmod *
  *
@@ -706,27 +752,65 @@ static void _enable_module(struct omap_hwmod *oh)
 }
 
 /**
- * _disable_module - enable CLKCTRL modulemode on OMAP4
+ * _omap4_wait_target_disable - wait for a module to be disabled on OMAP4
+ * @oh: struct omap_hwmod *
+ *
+ * Wait for a module @oh to enter slave idle.  Returns 0 if the module
+ * does not have an IDLEST bit or if the module successfully enters
+ * slave idle; otherwise, pass along the return value of the
+ * appropriate *_cm*_wait_module_idle() function.
+ */
+static int _omap4_wait_target_disable(struct omap_hwmod *oh)
+{
+        if (!cpu_is_omap44xx())
+                return 0;
+
+        if (!oh)
+                return -EINVAL;
+
+        if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
+                return 0;
+
+        if (oh->flags & HWMOD_NO_IDLEST)
+                return 0;
+
+        return omap4_cminst_wait_module_idle(oh->clkdm->prcm_partition,
+                                             oh->clkdm->cm_inst,
+                                             oh->clkdm->clkdm_offs,
+                                             oh->prcm.omap4.clkctrl_offs);
+}
+
+/**
+ * _omap4_disable_module - enable CLKCTRL modulemode on OMAP4
  * @oh: struct omap_hwmod *
  *
  * Disable the PRCM module mode related to the hwmod @oh.
- * No return value.
+ * Return EINVAL if the modulemode is not supported and 0 in case of success.
  */
-static void _disable_module(struct omap_hwmod *oh)
+static int _omap4_disable_module(struct omap_hwmod *oh)
 {
+        int v;
+
         /* The module mode does not exist prior OMAP4 */
-        if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                return;
+        if (!cpu_is_omap44xx())
+                return -EINVAL;
 
         if (!oh->clkdm || !oh->prcm.omap4.modulemode)
-                return;
+                return -EINVAL;
 
-        pr_debug("omap_hwmod: %s: _disable_module\n", oh->name);
+        pr_debug("omap_hwmod: %s: %s\n", oh->name, __func__);
 
         omap4_cminst_module_disable(oh->clkdm->prcm_partition,
                                     oh->clkdm->cm_inst,
                                     oh->clkdm->clkdm_offs,
                                     oh->prcm.omap4.clkctrl_offs);
+
+        v = _omap4_wait_target_disable(oh);
+        if (v)
+                pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
+                        oh->name);
+
+        return 0;
 }
 
 /**
@@ -1153,36 +1237,6 @@ static int _wait_target_ready(struct omap_hwmod *oh)
 }
 
 /**
- * _wait_target_disable - wait for a module to be disabled
- * @oh: struct omap_hwmod *
- *
- * Wait for a module @oh to enter slave idle.  Returns 0 if the module
- * does not have an IDLEST bit or if the module successfully enters
- * slave idle; otherwise, pass along the return value of the
- * appropriate *_cm*_wait_module_idle() function.
- */
-static int _wait_target_disable(struct omap_hwmod *oh)
-{
-        /* TODO: For now just handle OMAP4+ */
-        if (cpu_is_omap24xx() || cpu_is_omap34xx())
-                return 0;
-
-        if (!oh)
-                return -EINVAL;
-
-        if (oh->_int_flags & _HWMOD_NO_MPU_PORT)
-                return 0;
-
-        if (oh->flags & HWMOD_NO_IDLEST)
-                return 0;
-
-        return omap4_cminst_wait_module_idle(oh->clkdm->prcm_partition,
-                                             oh->clkdm->cm_inst,
-                                             oh->clkdm->clkdm_offs,
-                                             oh->prcm.omap4.clkctrl_offs);
-}
-
-/**
  * _lookup_hardreset - fill register bit info for this hwmod/reset line
  * @oh: struct omap_hwmod *
  * @name: name of the reset line in the context of this hwmod
@@ -1441,6 +1495,25 @@ static int _enable(struct omap_hwmod *oh)
 
         pr_debug("omap_hwmod: %s: enabling\n", oh->name);
 
+        /*
+         * hwmods with HWMOD_INIT_NO_IDLE flag set are left
+         * in enabled state at init.
+         * Now that someone is really trying to enable them,
+         * just ensure that the hwmod mux is set.
+         */
+        if (oh->_int_flags & _HWMOD_SKIP_ENABLE) {
+                /*
+                 * If the caller has mux data populated, do the mux'ing
+                 * which wouldn't have been done as part of the _enable()
+                 * done during setup.
+                 */
+                if (oh->mux)
+                        omap_hwmod_mux(oh->mux, _HWMOD_STATE_ENABLED);
+
+                oh->_int_flags &= ~_HWMOD_SKIP_ENABLE;
+                return 0;
+        }
+
         if (oh->_state != _HWMOD_STATE_INITIALIZED &&
             oh->_state != _HWMOD_STATE_IDLE &&
             oh->_state != _HWMOD_STATE_DISABLED) {
@@ -1524,8 +1597,6 @@ static int _enable(struct omap_hwmod *oh)
  */
 static int _idle(struct omap_hwmod *oh)
 {
-        int ret;
-
         pr_debug("omap_hwmod: %s: idling\n", oh->name);
 
         if (oh->_state != _HWMOD_STATE_ENABLED) {
@@ -1537,11 +1608,9 @@ static int _idle(struct omap_hwmod *oh)
         if (oh->class->sysc)
                 _idle_sysc(oh);
         _del_initiator_dep(oh, mpu_oh);
-        _disable_module(oh);
-        ret = _wait_target_disable(oh);
-        if (ret)
-                pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
-                        oh->name);
+
+        _omap4_disable_module(oh);
+
         /*
          * The module must be in idle mode before disabling any parents
          * clocks. Otherwise, the parent clock might be disabled before
@@ -1642,11 +1711,7 @@ static int _shutdown(struct omap_hwmod *oh)
         if (oh->_state == _HWMOD_STATE_ENABLED) {
                 _del_initiator_dep(oh, mpu_oh);
                 /* XXX what about the other system initiators here? dma, dsp */
-                _disable_module(oh);
-                ret = _wait_target_disable(oh);
-                if (ret)
-                        pr_warn("omap_hwmod: %s: _wait_target_disable failed\n",
-                                oh->name);
+                _omap4_disable_module(oh);
                 _disable_clocks(oh);
                 if (oh->clkdm)
                         clkdm_hwmod_disable(oh->clkdm, oh);
@@ -1744,8 +1809,10 @@ static int _setup(struct omap_hwmod *oh, void *data)
          * it should be set by the core code as a runtime flag during startup
          */
         if ((oh->flags & HWMOD_INIT_NO_IDLE) &&
-            (postsetup_state == _HWMOD_STATE_IDLE))
+            (postsetup_state == _HWMOD_STATE_IDLE)) {
+                oh->_int_flags |= _HWMOD_SKIP_ENABLE;
                 postsetup_state = _HWMOD_STATE_ENABLED;
+        }
 
         if (postsetup_state == _HWMOD_STATE_IDLE)
                 _idle(oh);
@@ -2416,6 +2483,7 @@ int omap_hwmod_enable_wakeup(struct omap_hwmod *oh)
         v = oh->_sysc_cache;
         _enable_wakeup(oh, &v);
         _write_sysconfig(v, oh);
+        _set_idle_ioring_wakeup(oh, true);
         spin_unlock_irqrestore(&oh->_lock, flags);
 
         return 0;
@@ -2446,6 +2514,7 @@ int omap_hwmod_disable_wakeup(struct omap_hwmod *oh)
         v = oh->_sysc_cache;
         _disable_wakeup(oh, &v);
         _write_sysconfig(v, oh);
+        _set_idle_ioring_wakeup(oh, false);
         spin_unlock_irqrestore(&oh->_lock, flags);
 
         return 0;
@@ -2662,3 +2731,57 @@ int omap_hwmod_no_setup_reset(struct omap_hwmod *oh)
 
         return 0;
 }
+
+/**
+ * omap_hwmod_pad_route_irq - route an I/O pad wakeup to a particular MPU IRQ
+ * @oh: struct omap_hwmod * containing hwmod mux entries
+ * @pad_idx: array index in oh->mux of the hwmod mux entry to route wakeup
+ * @irq_idx: the hwmod mpu_irqs array index of the IRQ to trigger on wakeup
+ *
+ * When an I/O pad wakeup arrives for the dynamic or wakeup hwmod mux
+ * entry number @pad_idx for the hwmod @oh, trigger the interrupt
+ * service routine for the hwmod's mpu_irqs array index @irq_idx.  If
+ * this function is not called for a given pad_idx, then the ISR
+ * associated with @oh's first MPU IRQ will be triggered when an I/O
+ * pad wakeup occurs on that pad.  Note that @pad_idx is the index of
+ * the _dynamic or wakeup_ entry: if there are other entries not
+ * marked with OMAP_DEVICE_PAD_WAKEUP or OMAP_DEVICE_PAD_REMUX, these
+ * entries are NOT COUNTED in the dynamic pad index.  This function
+ * must be called separately for each pad that requires its interrupt
+ * to be re-routed this way.  Returns -EINVAL if there is an argument
+ * problem or if @oh does not have hwmod mux entries or MPU IRQs;
+ * returns -ENOMEM if memory cannot be allocated; or 0 upon success.
+ *
+ * XXX This function interface is fragile.  Rather than using array
+ * indexes, which are subject to unpredictable change, it should be
+ * using hwmod IRQ names, and some other stable key for the hwmod mux
+ * pad records.
+ */
+int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx)
+{
+        int nr_irqs;
+
+        might_sleep();
+
+        if (!oh || !oh->mux || !oh->mpu_irqs || pad_idx < 0 ||
+            pad_idx >= oh->mux->nr_pads_dynamic)
+                return -EINVAL;
+
+        /* Check the number of available mpu_irqs */
+        for (nr_irqs = 0; oh->mpu_irqs[nr_irqs].irq >= 0; nr_irqs++)
+                ;
+
+        if (irq_idx >= nr_irqs)
+                return -EINVAL;
+
+        if (!oh->mux->irqs) {
+                /* XXX What frees this? */
+                oh->mux->irqs = kzalloc(sizeof(int) * oh->mux->nr_pads_dynamic,
+                        GFP_KERNEL);
+                if (!oh->mux->irqs)
+                        return -ENOMEM;
+        }
+        oh->mux->irqs[pad_idx] = irq_idx;
+
+        return 0;
+}
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index eef43e2e163e..5324e8d93bc0 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -84,6 +84,8 @@ static struct omap_hwmod omap3xxx_mcbsp4_hwmod;
 static struct omap_hwmod omap3xxx_mcbsp5_hwmod;
 static struct omap_hwmod omap3xxx_mcbsp2_sidetone_hwmod;
 static struct omap_hwmod omap3xxx_mcbsp3_sidetone_hwmod;
+static struct omap_hwmod omap3xxx_usb_host_hs_hwmod;
+static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod;
 
 /* L3 -> L4_CORE interface */
 static struct omap_hwmod_ocp_if omap3xxx_l3_main__l4_core = {
@@ -164,6 +166,7 @@ static struct omap_hwmod omap3xxx_uart1_hwmod;
 static struct omap_hwmod omap3xxx_uart2_hwmod;
 static struct omap_hwmod omap3xxx_uart3_hwmod;
 static struct omap_hwmod omap3xxx_uart4_hwmod;
+static struct omap_hwmod am35xx_uart4_hwmod;
 static struct omap_hwmod omap3xxx_usbhsotg_hwmod;
 
 /* l3_core -> usbhsotg interface */
@@ -299,6 +302,23 @@ static struct omap_hwmod_ocp_if omap3_l4_per__uart4 = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* AM35xx: L4 CORE -> UART4 interface */
+static struct omap_hwmod_addr_space am35xx_uart4_addr_space[] = {
+        {
+                .pa_start       = OMAP3_UART4_AM35XX_BASE,
+                .pa_end         = OMAP3_UART4_AM35XX_BASE + SZ_1K - 1,
+                .flags          = ADDR_MAP_ON_INIT | ADDR_TYPE_RT,
+        },
+};
+
+static struct omap_hwmod_ocp_if am35xx_l4_core__uart4 = {
+        .master         = &omap3xxx_l4_core_hwmod,
+        .slave          = &am35xx_uart4_hwmod,
+        .clk            = "uart4_ick",
+        .addr           = am35xx_uart4_addr_space,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* L4 CORE -> I2C1 interface */
 static struct omap_hwmod_ocp_if omap3_l4_core__i2c1 = {
         .master         = &omap3xxx_l4_core_hwmod,
@@ -1162,6 +1182,7 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = {
                            SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |
                            SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS),
         .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .clockact       = CLOCKACT_TEST_ICLK,
         .sysc_fields    = &omap_hwmod_sysc_type1,
 };
 
@@ -1309,6 +1330,39 @@ static struct omap_hwmod omap3xxx_uart4_hwmod = {
         .class          = &omap2_uart_class,
 };
 
+static struct omap_hwmod_irq_info am35xx_uart4_mpu_irqs[] = {
+        { .irq = INT_35XX_UART4_IRQ, },
+};
+
+static struct omap_hwmod_dma_info am35xx_uart4_sdma_reqs[] = {
+        { .name = "rx", .dma_req = AM35XX_DMA_UART4_RX, },
+        { .name = "tx", .dma_req = AM35XX_DMA_UART4_TX, },
+};
+
+static struct omap_hwmod_ocp_if *am35xx_uart4_slaves[] = {
+        &am35xx_l4_core__uart4,
+};
+
+static struct omap_hwmod am35xx_uart4_hwmod = {
+        .name           = "uart4",
+        .mpu_irqs       = am35xx_uart4_mpu_irqs,
+        .sdma_reqs      = am35xx_uart4_sdma_reqs,
+        .main_clk       = "uart4_fck",
+        .prcm           = {
+                .omap2 = {
+                        .module_offs = CORE_MOD,
+                        .prcm_reg_id = 1,
+                        .module_bit = OMAP3430_EN_UART4_SHIFT,
+                        .idlest_reg_id = 1,
+                        .idlest_idle_bit = OMAP3430_EN_UART4_SHIFT,
+                },
+        },
+        .slaves         = am35xx_uart4_slaves,
+        .slaves_cnt     = ARRAY_SIZE(am35xx_uart4_slaves),
+        .class          = &omap2_uart_class,
+};
+
+
 static struct omap_hwmod_class i2c_class = {
         .name   = "i2c",
         .sysc   = &i2c_sysc,
@@ -1636,7 +1690,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c1_slaves[] = {
 
 static struct omap_hwmod omap3xxx_i2c1_hwmod = {
         .name           = "i2c1",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap2_i2c1_mpu_irqs,
         .sdma_reqs      = omap2_i2c1_sdma_reqs,
         .main_clk       = "i2c1_fck",
@@ -1670,7 +1724,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c2_slaves[] = {
 
 static struct omap_hwmod omap3xxx_i2c2_hwmod = {
         .name           = "i2c2",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap2_i2c2_mpu_irqs,
         .sdma_reqs      = omap2_i2c2_sdma_reqs,
         .main_clk       = "i2c2_fck",
@@ -1715,7 +1769,7 @@ static struct omap_hwmod_ocp_if *omap3xxx_i2c3_slaves[] = {
 
 static struct omap_hwmod omap3xxx_i2c3_hwmod = {
         .name           = "i2c3",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = i2c3_mpu_irqs,
         .sdma_reqs      = i2c3_sdma_reqs,
         .main_clk       = "i2c3_fck",
@@ -3072,7 +3126,35 @@ static struct omap_mmc_dev_attr mmc1_dev_attr = {
         .flags = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,
 };
 
-static struct omap_hwmod omap3xxx_mmc1_hwmod = {
+/* See 35xx errata 2.1.1.128 in SPRZ278F */
+static struct omap_mmc_dev_attr mmc1_pre_es3_dev_attr = {
+        .flags = (OMAP_HSMMC_SUPPORTS_DUAL_VOLT |
+                  OMAP_HSMMC_BROKEN_MULTIBLOCK_READ),
+};
+
+static struct omap_hwmod omap3xxx_pre_es3_mmc1_hwmod = {
+        .name           = "mmc1",
+        .mpu_irqs       = omap34xx_mmc1_mpu_irqs,
+        .sdma_reqs      = omap34xx_mmc1_sdma_reqs,
+        .opt_clks       = omap34xx_mmc1_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(omap34xx_mmc1_opt_clks),
+        .main_clk       = "mmchs1_fck",
+        .prcm           = {
+                .omap2 = {
+                        .module_offs = CORE_MOD,
+                        .prcm_reg_id = 1,
+                        .module_bit = OMAP3430_EN_MMC1_SHIFT,
+                        .idlest_reg_id = 1,
+                        .idlest_idle_bit = OMAP3430_ST_MMC1_SHIFT,
+                },
+        },
+        .dev_attr       = &mmc1_pre_es3_dev_attr,
+        .slaves         = omap3xxx_mmc1_slaves,
+        .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc1_slaves),
+        .class          = &omap34xx_mmc_class,
+};
+
+static struct omap_hwmod omap3xxx_es3plus_mmc1_hwmod = {
         .name           = "mmc1",
         .mpu_irqs       = omap34xx_mmc1_mpu_irqs,
         .sdma_reqs      = omap34xx_mmc1_sdma_reqs,
@@ -3115,7 +3197,34 @@ static struct omap_hwmod_ocp_if *omap3xxx_mmc2_slaves[] = {
         &omap3xxx_l4_core__mmc2,
 };
 
-static struct omap_hwmod omap3xxx_mmc2_hwmod = {
+/* See 35xx errata 2.1.1.128 in SPRZ278F */
+static struct omap_mmc_dev_attr mmc2_pre_es3_dev_attr = {
+        .flags = OMAP_HSMMC_BROKEN_MULTIBLOCK_READ,
+};
+
+static struct omap_hwmod omap3xxx_pre_es3_mmc2_hwmod = {
+        .name           = "mmc2",
+        .mpu_irqs       = omap34xx_mmc2_mpu_irqs,
+        .sdma_reqs      = omap34xx_mmc2_sdma_reqs,
+        .opt_clks       = omap34xx_mmc2_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(omap34xx_mmc2_opt_clks),
+        .main_clk       = "mmchs2_fck",
+        .prcm           = {
+                .omap2 = {
+                        .module_offs = CORE_MOD,
+                        .prcm_reg_id = 1,
+                        .module_bit = OMAP3430_EN_MMC2_SHIFT,
+                        .idlest_reg_id = 1,
+                        .idlest_idle_bit = OMAP3430_ST_MMC2_SHIFT,
+                },
+        },
+        .dev_attr       = &mmc2_pre_es3_dev_attr,
+        .slaves         = omap3xxx_mmc2_slaves,
+        .slaves_cnt     = ARRAY_SIZE(omap3xxx_mmc2_slaves),
+        .class          = &omap34xx_mmc_class,
+};
+
+static struct omap_hwmod omap3xxx_es3plus_mmc2_hwmod = {
         .name           = "mmc2",
         .mpu_irqs       = omap34xx_mmc2_mpu_irqs,
         .sdma_reqs      = omap34xx_mmc2_sdma_reqs,
@@ -3177,13 +3286,223 @@ static struct omap_hwmod omap3xxx_mmc3_hwmod = {
         .class          = &omap34xx_mmc_class,
 };
 
+/*
+ * 'usb_host_hs' class
+ * high-speed multi-port usb host controller
+ */
+static struct omap_hwmod_ocp_if omap3xxx_usb_host_hs__l3_main_2 = {
+        .master         = &omap3xxx_usb_host_hs_hwmod,
+        .slave          = &omap3xxx_l3_main_hwmod,
+        .clk            = "core_l3_ick",
+        .user           = OCP_USER_MPU,
+};
+
+static struct omap_hwmod_class_sysconfig omap3xxx_usb_host_hs_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_MIDLEMODE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |
+                           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,
+};
+
+static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = {
+        .name = "usb_host_hs",
+        .sysc = &omap3xxx_usb_host_hs_sysc,
+};
+
+static struct omap_hwmod_ocp_if *omap3xxx_usb_host_hs_masters[] = {
+        &omap3xxx_usb_host_hs__l3_main_2,
+};
+
+static struct omap_hwmod_addr_space omap3xxx_usb_host_hs_addrs[] = {
+        {
+                .name           = "uhh",
+                .pa_start       = 0x48064000,
+                .pa_end         = 0x480643ff,
+                .flags          = ADDR_TYPE_RT
+        },
+        {
+                .name           = "ohci",
+                .pa_start       = 0x48064400,
+                .pa_end         = 0x480647ff,
+        },
+        {
+                .name           = "ehci",
+                .pa_start       = 0x48064800,
+                .pa_end         = 0x48064cff,
+        },
+        {}
+};
+
+static struct omap_hwmod_ocp_if omap3xxx_l4_core__usb_host_hs = {
+        .master         = &omap3xxx_l4_core_hwmod,
+        .slave          = &omap3xxx_usb_host_hs_hwmod,
+        .clk            = "usbhost_ick",
+        .addr           = omap3xxx_usb_host_hs_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *omap3xxx_usb_host_hs_slaves[] = {
+        &omap3xxx_l4_core__usb_host_hs,
+};
+
+static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = {
+          { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", },
+};
+
+static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = {
+        { .name = "ohci-irq", .irq = 76 },
+        { .name = "ehci-irq", .irq = 77 },
+        { .irq = -1 }
+};
+
+static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
+        .name           = "usb_host_hs",
+        .class          = &omap3xxx_usb_host_hs_hwmod_class,
+        .clkdm_name     = "l3_init_clkdm",
+        .mpu_irqs       = omap3xxx_usb_host_hs_irqs,
+        .main_clk       = "usbhost_48m_fck",
+        .prcm = {
+                .omap2 = {
+                        .module_offs = OMAP3430ES2_USBHOST_MOD,
+                        .prcm_reg_id = 1,
+                        .module_bit = OMAP3430ES2_EN_USBHOST1_SHIFT,
+                        .idlest_reg_id = 1,
+                        .idlest_idle_bit = OMAP3430ES2_ST_USBHOST_IDLE_SHIFT,
+                        .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT,
+                },
+        },
+        .opt_clks       = omap3xxx_usb_host_hs_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks),
+        .slaves         = omap3xxx_usb_host_hs_slaves,
+        .slaves_cnt     = ARRAY_SIZE(omap3xxx_usb_host_hs_slaves),
+        .masters        = omap3xxx_usb_host_hs_masters,
+        .masters_cnt    = ARRAY_SIZE(omap3xxx_usb_host_hs_masters),
+
+        /*
+         * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
+         * id: i660
+         *
+         * Description:
+         * In the following configuration :
+         * - USBHOST module is set to smart-idle mode
+         * - PRCM asserts idle_req to the USBHOST module ( This typically
+         *   happens when the system is going to a low power mode : all ports
+         *   have been suspended, the master part of the USBHOST module has
+         *   entered the standby state, and SW has cut the functional clocks)
+         * - an USBHOST interrupt occurs before the module is able to answer
+         *   idle_ack, typically a remote wakeup IRQ.
+         * Then the USB HOST module will enter a deadlock situation where it
+         * is no more accessible nor functional.
+         *
+         * Workaround:
+         * Don't use smart idle; use only force idle, hence HWMOD_SWSUP_SIDLE
+         */
+
+        /*
+         * Errata: USB host EHCI may stall when entering smart-standby mode
+         * Id: i571
+         *
+         * Description:
+         * When the USBHOST module is set to smart-standby mode, and when it is
+         * ready to enter the standby state (i.e. all ports are suspended and
+         * all attached devices are in suspend mode), then it can wrongly assert
+         * the Mstandby signal too early while there are still some residual OCP
+         * transactions ongoing. If this condition occurs, the internal state
+         * machine may go to an undefined state and the USB link may be stuck
+         * upon the next resume.
+         *
+         * Workaround:
+         * Don't use smart standby; use only force standby,
+         * hence HWMOD_SWSUP_MSTANDBY
+         */
+
+        /*
+         * During system boot; If the hwmod framework resets the module
+         * the module will have smart idle settings; which can lead to deadlock
+         * (above Errata Id:i660); so, dont reset the module during boot;
+         * Use HWMOD_INIT_NO_RESET.
+         */
+
+        .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
+                          HWMOD_INIT_NO_RESET,
+};
+
+/*
+ * 'usb_tll_hs' class
+ * usb_tll_hs module is the adapter on the usb_host_hs ports
+ */
+static struct omap_hwmod_class_sysconfig omap3xxx_usb_tll_hs_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |
+                           SYSC_HAS_AUTOIDLE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap3xxx_usb_tll_hs_hwmod_class = {
+        .name = "usb_tll_hs",
+        .sysc = &omap3xxx_usb_tll_hs_sysc,
+};
+
+static struct omap_hwmod_irq_info omap3xxx_usb_tll_hs_irqs[] = {
+        { .name = "tll-irq", .irq = 78 },
+        { .irq = -1 }
+};
+
+static struct omap_hwmod_addr_space omap3xxx_usb_tll_hs_addrs[] = {
+        {
+                .name           = "tll",
+                .pa_start       = 0x48062000,
+                .pa_end         = 0x48062fff,
+                .flags          = ADDR_TYPE_RT
+        },
+        {}
+};
+
+static struct omap_hwmod_ocp_if omap3xxx_l4_core__usb_tll_hs = {
+        .master         = &omap3xxx_l4_core_hwmod,
+        .slave          = &omap3xxx_usb_tll_hs_hwmod,
+        .clk            = "usbtll_ick",
+        .addr           = omap3xxx_usb_tll_hs_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *omap3xxx_usb_tll_hs_slaves[] = {
+        &omap3xxx_l4_core__usb_tll_hs,
+};
+
+static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = {
+        .name           = "usb_tll_hs",
+        .class          = &omap3xxx_usb_tll_hs_hwmod_class,
+        .clkdm_name     = "l3_init_clkdm",
+        .mpu_irqs       = omap3xxx_usb_tll_hs_irqs,
+        .main_clk       = "usbtll_fck",
+        .prcm = {
+                .omap2 = {
+                        .module_offs = CORE_MOD,
+                        .prcm_reg_id = 3,
+                        .module_bit = OMAP3430ES2_EN_USBTLL_SHIFT,
+                        .idlest_reg_id = 3,
+                        .idlest_idle_bit = OMAP3430ES2_ST_USBTLL_SHIFT,
+                },
+        },
+        .slaves         = omap3xxx_usb_tll_hs_slaves,
+        .slaves_cnt     = ARRAY_SIZE(omap3xxx_usb_tll_hs_slaves),
+};
+
 static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_l3_main_hwmod,
         &omap3xxx_l4_core_hwmod,
         &omap3xxx_l4_per_hwmod,
         &omap3xxx_l4_wkup_hwmod,
-        &omap3xxx_mmc1_hwmod,
-        &omap3xxx_mmc2_hwmod,
         &omap3xxx_mmc3_hwmod,
         &omap3xxx_mpu_hwmod,
 
@@ -3198,12 +3517,12 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_timer9_hwmod,
         &omap3xxx_timer10_hwmod,
         &omap3xxx_timer11_hwmod,
-        &omap3xxx_timer12_hwmod,
 
         &omap3xxx_wd_timer2_hwmod,
         &omap3xxx_uart1_hwmod,
         &omap3xxx_uart2_hwmod,
         &omap3xxx_uart3_hwmod,
+
         /* dss class */
         &omap3xxx_dss_dispc_hwmod,
         &omap3xxx_dss_dsi1_hwmod,
@@ -3245,6 +3564,12 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         NULL,
 };
 
+/* GP-only hwmods */
+static __initdata struct omap_hwmod *omap3xxx_gp_hwmods[] = {
+        &omap3xxx_timer12_hwmod,
+        NULL
+};
+
 /* 3430ES1-only hwmods */
 static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
         &omap3430es1_dss_core_hwmod,
@@ -3255,6 +3580,22 @@ static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
 static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
         &omap3xxx_dss_core_hwmod,
         &omap3xxx_usbhsotg_hwmod,
+        &omap3xxx_usb_host_hs_hwmod,
+        &omap3xxx_usb_tll_hs_hwmod,
+        NULL
+};
+
+/* <= 3430ES3-only hwmods */
+static struct omap_hwmod *omap3430_pre_es3_hwmods[] __initdata = {
+        &omap3xxx_pre_es3_mmc1_hwmod,
+        &omap3xxx_pre_es3_mmc2_hwmod,
+        NULL
+};
+
+/* 3430ES3+-only hwmods */
+static struct omap_hwmod *omap3430_es3plus_hwmods[] __initdata = {
+        &omap3xxx_es3plus_mmc1_hwmod,
+        &omap3xxx_es3plus_mmc2_hwmod,
         NULL
 };
 
@@ -3276,12 +3617,21 @@ static __initdata struct omap_hwmod *omap36xx_hwmods[] = {
         &omap36xx_sr2_hwmod,
         &omap3xxx_usbhsotg_hwmod,
         &omap3xxx_mailbox_hwmod,
+        &omap3xxx_usb_host_hs_hwmod,
+        &omap3xxx_usb_tll_hs_hwmod,
+        &omap3xxx_es3plus_mmc1_hwmod,
+        &omap3xxx_es3plus_mmc2_hwmod,
         NULL
 };
 
 static __initdata struct omap_hwmod *am35xx_hwmods[] = {
         &omap3xxx_dss_core_hwmod, /* XXX ??? */
         &am35xx_usbhsotg_hwmod,
+        &am35xx_uart4_hwmod,
+        &omap3xxx_usb_host_hs_hwmod,
+        &omap3xxx_usb_tll_hs_hwmod,
+        &omap3xxx_es3plus_mmc1_hwmod,
+        &omap3xxx_es3plus_mmc2_hwmod,
         NULL
 };
 
@@ -3296,6 +3646,13 @@ int __init omap3xxx_hwmod_init(void)
         if (r < 0)
                 return r;
 
+        /* Register GP-only hwmods. */
+        if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
+                r = omap_hwmod_register(omap3xxx_gp_hwmods);
+                if (r < 0)
+                        return r;
+        }
+
         rev = omap_rev();
 
         /*
@@ -3334,6 +3691,21 @@ int __init omap3xxx_hwmod_init(void)
                 h = omap3430es2plus_hwmods;
         };
 
+        if (h) {
+                r = omap_hwmod_register(h);
+                if (r < 0)
+                        return r;
+        }
+
+        h = NULL;
+        if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 ||
+            rev == OMAP3430_REV_ES2_1) {
+                h = omap3430_pre_es3_hwmods;
+        } else if (rev == OMAP3430_REV_ES3_0 || rev == OMAP3430_REV_ES3_1 ||
+                   rev == OMAP3430_REV_ES3_1_2) {
+                h = omap3430_es3plus_hwmods;
+        };
+
         if (h)
                 r = omap_hwmod_register(h);
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index daaf165af696..f9f151081760 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -70,6 +70,8 @@ static struct omap_hwmod omap44xx_mmc2_hwmod;
 static struct omap_hwmod omap44xx_mpu_hwmod;
 static struct omap_hwmod omap44xx_mpu_private_hwmod;
 static struct omap_hwmod omap44xx_usb_otg_hs_hwmod;
+static struct omap_hwmod omap44xx_usb_host_hs_hwmod;
+static struct omap_hwmod omap44xx_usb_tll_hs_hwmod;
 
 /*
  * Interconnects omap_hwmod structures
@@ -2246,6 +2248,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_i2c_sysc = {
                            SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
         .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
                            SIDLE_SMART_WKUP),
+        .clockact       = CLOCKACT_TEST_ICLK,
         .sysc_fields    = &omap_hwmod_sysc_type1,
 };
 
@@ -2300,7 +2303,7 @@ static struct omap_hwmod omap44xx_i2c1_hwmod = {
         .name           = "i2c1",
         .class          = &omap44xx_i2c_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c1_irqs,
         .sdma_reqs      = omap44xx_i2c1_sdma_reqs,
         .main_clk       = "i2c1_fck",
@@ -2356,7 +2359,7 @@ static struct omap_hwmod omap44xx_i2c2_hwmod = {
         .name           = "i2c2",
         .class          = &omap44xx_i2c_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c2_irqs,
         .sdma_reqs      = omap44xx_i2c2_sdma_reqs,
         .main_clk       = "i2c2_fck",
@@ -2412,7 +2415,7 @@ static struct omap_hwmod omap44xx_i2c3_hwmod = {
         .name           = "i2c3",
         .class          = &omap44xx_i2c_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c3_irqs,
         .sdma_reqs      = omap44xx_i2c3_sdma_reqs,
         .main_clk       = "i2c3_fck",
@@ -2468,7 +2471,7 @@ static struct omap_hwmod omap44xx_i2c4_hwmod = {
         .name           = "i2c4",
         .class          = &omap44xx_i2c_hwmod_class,
         .clkdm_name     = "l4_per_clkdm",
-        .flags          = HWMOD_16BIT_REG,
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
         .mpu_irqs       = omap44xx_i2c4_irqs,
         .sdma_reqs      = omap44xx_i2c4_sdma_reqs,
         .main_clk       = "i2c4_fck",
@@ -5276,6 +5279,207 @@ static struct omap_hwmod omap44xx_wd_timer3_hwmod = {
         .slaves_cnt     = ARRAY_SIZE(omap44xx_wd_timer3_slaves),
 };
 
+/*
+ * 'usb_host_hs' class
+ * high-speed multi-port usb host controller
+ */
+static struct omap_hwmod_ocp_if omap44xx_usb_host_hs__l3_main_2 = {
+        .master         = &omap44xx_usb_host_hs_hwmod,
+        .slave          = &omap44xx_l3_main_2_hwmod,
+        .clk            = "l3_div_ck",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_class_sysconfig omap44xx_usb_host_hs_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
+                           MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class omap44xx_usb_host_hs_hwmod_class = {
+        .name = "usb_host_hs",
+        .sysc = &omap44xx_usb_host_hs_sysc,
+};
+
+static struct omap_hwmod_ocp_if *omap44xx_usb_host_hs_masters[] = {
+        &omap44xx_usb_host_hs__l3_main_2,
+};
+
+static struct omap_hwmod_addr_space omap44xx_usb_host_hs_addrs[] = {
+        {
+                .name           = "uhh",
+                .pa_start       = 0x4a064000,
+                .pa_end         = 0x4a0647ff,
+                .flags          = ADDR_TYPE_RT
+        },
+        {
+                .name           = "ohci",
+                .pa_start       = 0x4a064800,
+                .pa_end         = 0x4a064bff,
+        },
+        {
+                .name           = "ehci",
+                .pa_start       = 0x4a064c00,
+                .pa_end         = 0x4a064fff,
+        },
+        {}
+};
+
+static struct omap_hwmod_irq_info omap44xx_usb_host_hs_irqs[] = {
+        { .name = "ohci-irq", .irq = 76 + OMAP44XX_IRQ_GIC_START },
+        { .name = "ehci-irq", .irq = 77 + OMAP44XX_IRQ_GIC_START },
+        { .irq = -1 }
+};
+
+static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_host_hs = {
+        .master         = &omap44xx_l4_cfg_hwmod,
+        .slave          = &omap44xx_usb_host_hs_hwmod,
+        .clk            = "l4_div_ck",
+        .addr           = omap44xx_usb_host_hs_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *omap44xx_usb_host_hs_slaves[] = {
+        &omap44xx_l4_cfg__usb_host_hs,
+};
+
+static struct omap_hwmod omap44xx_usb_host_hs_hwmod = {
+        .name           = "usb_host_hs",
+        .class          = &omap44xx_usb_host_hs_hwmod_class,
+        .clkdm_name     = "l3_init_clkdm",
+        .main_clk       = "usb_host_hs_fck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP4_CM_L3INIT_USB_HOST_CLKCTRL_OFFSET,
+                        .context_offs = OMAP4_RM_L3INIT_USB_HOST_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .mpu_irqs       = omap44xx_usb_host_hs_irqs,
+        .slaves         = omap44xx_usb_host_hs_slaves,
+        .slaves_cnt     = ARRAY_SIZE(omap44xx_usb_host_hs_slaves),
+        .masters        = omap44xx_usb_host_hs_masters,
+        .masters_cnt    = ARRAY_SIZE(omap44xx_usb_host_hs_masters),
+
+        /*
+         * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
+         * id: i660
+         *
+         * Description:
+         * In the following configuration :
+         * - USBHOST module is set to smart-idle mode
+         * - PRCM asserts idle_req to the USBHOST module ( This typically
+         *   happens when the system is going to a low power mode : all ports
+         *   have been suspended, the master part of the USBHOST module has
+         *   entered the standby state, and SW has cut the functional clocks)
+         * - an USBHOST interrupt occurs before the module is able to answer
+         *   idle_ack, typically a remote wakeup IRQ.
+         * Then the USB HOST module will enter a deadlock situation where it
+         * is no more accessible nor functional.
+         *
+         * Workaround:
+         * Don't use smart idle; use only force idle, hence HWMOD_SWSUP_SIDLE
+         */
+
+        /*
+         * Errata: USB host EHCI may stall when entering smart-standby mode
+         * Id: i571
+         *
+         * Description:
+         * When the USBHOST module is set to smart-standby mode, and when it is
+         * ready to enter the standby state (i.e. all ports are suspended and
+         * all attached devices are in suspend mode), then it can wrongly assert
+         * the Mstandby signal too early while there are still some residual OCP
+         * transactions ongoing. If this condition occurs, the internal state
+         * machine may go to an undefined state and the USB link may be stuck
+         * upon the next resume.
+         *
+         * Workaround:
+         * Don't use smart standby; use only force standby,
+         * hence HWMOD_SWSUP_MSTANDBY
+         */
+
+        /*
+         * During system boot; If the hwmod framework resets the module
+         * the module will have smart idle settings; which can lead to deadlock
+         * (above Errata Id:i660); so, dont reset the module during boot;
+         * Use HWMOD_INIT_NO_RESET.
+         */
+
+        .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY |
+                          HWMOD_INIT_NO_RESET,
+};
+
+/*
+ * 'usb_tll_hs' class
+ * usb_tll_hs module is the adapter on the usb_host_hs ports
+ */
+static struct omap_hwmod_class_sysconfig omap44xx_usb_tll_hs_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |
+                           SYSC_HAS_AUTOIDLE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class omap44xx_usb_tll_hs_hwmod_class = {
+        .name = "usb_tll_hs",
+        .sysc = &omap44xx_usb_tll_hs_sysc,
+};
+
+static struct omap_hwmod_irq_info omap44xx_usb_tll_hs_irqs[] = {
+        { .name = "tll-irq", .irq = 78 + OMAP44XX_IRQ_GIC_START },
+        { .irq = -1 }
+};
+
+static struct omap_hwmod_addr_space omap44xx_usb_tll_hs_addrs[] = {
+        {
+                .name           = "tll",
+                .pa_start       = 0x4a062000,
+                .pa_end         = 0x4a063fff,
+                .flags          = ADDR_TYPE_RT
+        },
+        {}
+};
+
+static struct omap_hwmod_ocp_if omap44xx_l4_cfg__usb_tll_hs = {
+        .master         = &omap44xx_l4_cfg_hwmod,
+        .slave          = &omap44xx_usb_tll_hs_hwmod,
+        .clk            = "l4_div_ck",
+        .addr           = omap44xx_usb_tll_hs_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *omap44xx_usb_tll_hs_slaves[] = {
+        &omap44xx_l4_cfg__usb_tll_hs,
+};
+
+static struct omap_hwmod omap44xx_usb_tll_hs_hwmod = {
+        .name           = "usb_tll_hs",
+        .class          = &omap44xx_usb_tll_hs_hwmod_class,
+        .clkdm_name     = "l3_init_clkdm",
+        .main_clk       = "usb_tll_hs_ick",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP4_CM_L3INIT_USB_TLL_CLKCTRL_OFFSET,
+                        .context_offs = OMAP4_RM_L3INIT_USB_TLL_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .mpu_irqs       = omap44xx_usb_tll_hs_irqs,
+        .slaves         = omap44xx_usb_tll_hs_slaves,
+        .slaves_cnt     = ARRAY_SIZE(omap44xx_usb_tll_hs_slaves),
+};
+
 static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
 
         /* dmm class */
@@ -5415,13 +5619,16 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
         &omap44xx_uart3_hwmod,
         &omap44xx_uart4_hwmod,
 
+        /* usb host class */
+        &omap44xx_usb_host_hs_hwmod,
+        &omap44xx_usb_tll_hs_hwmod,
+
         /* usb_otg_hs class */
         &omap44xx_usb_otg_hs_hwmod,
 
         /* wd_timer class */
         &omap44xx_wd_timer2_hwmod,
         &omap44xx_wd_timer3_hwmod,
-
         NULL,
 };
 
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index 58775e3c8476..4c90477e6f82 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -260,3 +260,38 @@ void am35x_set_mode(u8 musb_mode)
 
         omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
 }
+
+void ti81xx_musb_phy_power(u8 on)
+{
+        void __iomem *scm_base = NULL;
+        u32 usbphycfg;
+
+        scm_base = ioremap(TI81XX_SCM_BASE, SZ_2K);
+        if (!scm_base) {
+                pr_err("system control module ioremap failed\n");
+                return;
+        }
+
+        usbphycfg = __raw_readl(scm_base + USBCTRL0);
+
+        if (on) {
+                if (cpu_is_ti816x()) {
+                        usbphycfg |= TI816X_USBPHY0_NORMAL_MODE;
+                        usbphycfg &= ~TI816X_USBPHY_REFCLK_OSC;
+                } else if (cpu_is_ti814x()) {
+                        usbphycfg &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN
+                                | USBPHY_DPINPUT | USBPHY_DMINPUT);
+                        usbphycfg |= (USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN
+                                | USBPHY_DPOPBUFCTL | USBPHY_DMOPBUFCTL);
+                }
+        } else {
+                if (cpu_is_ti816x())
+                        usbphycfg &= ~TI816X_USBPHY0_NORMAL_MODE;
+                else if (cpu_is_ti814x())
+                        usbphycfg |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN;
+
+        }
+        __raw_writel(usbphycfg, scm_base + USBCTRL0);
+
+        iounmap(scm_base);
+}
diff --git a/arch/arm/mach-omap2/opp2xxx.h b/arch/arm/mach-omap2/opp2xxx.h
index 8affc66a92c2..8fae534eb157 100644
--- a/arch/arm/mach-omap2/opp2xxx.h
+++ b/arch/arm/mach-omap2/opp2xxx.h
@@ -51,7 +51,7 @@ struct prcm_config {
         unsigned long cm_clksel2_pll;   /* dpllx1 or x2 out */
         unsigned long cm_clksel_mdm;    /* modem dividers 2430 only */
         unsigned long base_sdrc_rfr;    /* base refresh timing for a set */
-        unsigned char flags;
+        unsigned short flags;
 };
 
 
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 4e166add2f35..b737b11e4499 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -21,6 +21,7 @@ extern void omap_sram_idle(void);
 extern int omap3_can_sleep(void);
 extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);
 extern int omap3_idle_init(void);
+extern int omap4_idle_init(void);
 
 #if defined(CONFIG_PM_OPP)
 extern int omap3_opp_init(void);
diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index ef8595c80296..b8822f8b2891 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -30,7 +30,6 @@
 #include <linux/irq.h>
 #include <linux/time.h>
 #include <linux/gpio.h>
-#include <linux/console.h>
 
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
@@ -127,27 +126,11 @@ static void omap2_enter_full_retention(void)
         if (omap_irq_pending())
                 goto no_sleep;
 
-        /* Block console output in case it is on one of the OMAP UARTs */
-        if (!is_suspending())
-                if (!console_trylock())
-                        goto no_sleep;
-
-        omap_uart_prepare_idle(0);
-        omap_uart_prepare_idle(1);
-        omap_uart_prepare_idle(2);
-
         /* Jump to SRAM suspend code */
         omap2_sram_suspend(sdrc_read_reg(SDRC_DLLA_CTRL),
                            OMAP_SDRC_REGADDR(SDRC_DLLA_CTRL),
                            OMAP_SDRC_REGADDR(SDRC_POWER));
 
-        omap_uart_resume_idle(2);
-        omap_uart_resume_idle(1);
-        omap_uart_resume_idle(0);
-
-        if (!is_suspending())
-                console_unlock();
-
 no_sleep:
         omap2_gpio_resume_after_idle();
 
@@ -239,8 +222,6 @@ static int omap2_can_sleep(void)
 {
         if (omap2_fclks_active())
                 return 0;
-        if (!omap_uart_can_sleep())
-                return 0;
         if (osc_ck->usecount > 1)
                 return 0;
         if (omap_dma_running())
@@ -291,7 +272,6 @@ static int omap2_pm_suspend(void)
         mir1 = omap_readl(0x480fe0a4);
         omap_writel(1 << 5, 0x480fe0ac);
 
-        omap_uart_prepare_suspend();
         omap2_enter_full_retention();
 
         omap_writel(mir1, 0x480fe0a4);
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index fa637dfdda53..fc6987578920 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -28,7 +28,6 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/console.h>
 #include <trace/events/power.h>
 
 #include <asm/suspend.h>
@@ -36,7 +35,6 @@
 #include <plat/sram.h>
 #include "clockdomain.h"
 #include "powerdomain.h"
-#include <plat/serial.h>
 #include <plat/sdrc.h>
 #include <plat/prcm.h>
 #include <plat/gpmc.h>
@@ -54,15 +52,6 @@
 
 #ifdef CONFIG_SUSPEND
 static suspend_state_t suspend_state = PM_SUSPEND_ON;
-static inline bool is_suspending(void)
-{
-        return (suspend_state != PM_SUSPEND_ON) && console_suspend_enabled;
-}
-#else
-static inline bool is_suspending(void)
-{
-        return false;
-}
 #endif
 
 /* pm34xx errata defined in pm.h */
@@ -195,7 +184,7 @@ static void omap3_save_secure_ram_context(void)
  * that any peripheral wake-up events occurring while attempting to
  * clear the PM_WKST_x are detected and cleared.
  */
-static int prcm_clear_mod_irqs(s16 module, u8 regs)
+static int prcm_clear_mod_irqs(s16 module, u8 regs, u32 ignore_bits)
 {
         u32 wkst, fclk, iclk, clken;
         u16 wkst_off = (regs == 3) ? OMAP3430ES2_PM_WKST3 : PM_WKST1;
@@ -207,6 +196,7 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs)
 
         wkst = omap2_prm_read_mod_reg(module, wkst_off);
         wkst &= omap2_prm_read_mod_reg(module, grpsel_off);
+        wkst &= ~ignore_bits;
         if (wkst) {
                 iclk = omap2_cm_read_mod_reg(module, iclk_off);
                 fclk = omap2_cm_read_mod_reg(module, fclk_off);
@@ -222,6 +212,7 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs)
                         omap2_cm_set_mod_reg_bits(clken, module, fclk_off);
                         omap2_prm_write_mod_reg(wkst, module, wkst_off);
                         wkst = omap2_prm_read_mod_reg(module, wkst_off);
+                        wkst &= ~ignore_bits;
                         c++;
                 }
                 omap2_cm_write_mod_reg(iclk, module, iclk_off);
@@ -231,76 +222,35 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs)
         return c;
 }
 
-static int _prcm_int_handle_wakeup(void)
+static irqreturn_t _prcm_int_handle_io(int irq, void *unused)
 {
         int c;
 
-        c = prcm_clear_mod_irqs(WKUP_MOD, 1);
-        c += prcm_clear_mod_irqs(CORE_MOD, 1);
-        c += prcm_clear_mod_irqs(OMAP3430_PER_MOD, 1);
-        if (omap_rev() > OMAP3430_REV_ES1_0) {
-                c += prcm_clear_mod_irqs(CORE_MOD, 3);
-                c += prcm_clear_mod_irqs(OMAP3430ES2_USBHOST_MOD, 1);
-        }
+        c = prcm_clear_mod_irqs(WKUP_MOD, 1,
+                ~(OMAP3430_ST_IO_MASK | OMAP3430_ST_IO_CHAIN_MASK));
 
-        return c;
+        return c ? IRQ_HANDLED : IRQ_NONE;
 }
 
-/*
- * PRCM Interrupt Handler
- *
- * The PRM_IRQSTATUS_MPU register indicates if there are any pending
- * interrupts from the PRCM for the MPU. These bits must be cleared in
- * order to clear the PRCM interrupt. The PRCM interrupt handler is
- * implemented to simply clear the PRM_IRQSTATUS_MPU in order to clear
- * the PRCM interrupt. Please note that bit 0 of the PRM_IRQSTATUS_MPU
- * register indicates that a wake-up event is pending for the MPU and
- * this bit can only be cleared if the all the wake-up events latched
- * in the various PM_WKST_x registers have been cleared. The interrupt
- * handler is implemented using a do-while loop so that if a wake-up
- * event occurred during the processing of the prcm interrupt handler
- * (setting a bit in the corresponding PM_WKST_x register and thus
- * preventing us from clearing bit 0 of the PRM_IRQSTATUS_MPU register)
- * this would be handled.
- */
-static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
+static irqreturn_t _prcm_int_handle_wakeup(int irq, void *unused)
 {
-        u32 irqenable_mpu, irqstatus_mpu;
-        int c = 0;
-
-        irqenable_mpu = omap2_prm_read_mod_reg(OCP_MOD,
-                                         OMAP3_PRM_IRQENABLE_MPU_OFFSET);
-        irqstatus_mpu = omap2_prm_read_mod_reg(OCP_MOD,
-                                         OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
-        irqstatus_mpu &= irqenable_mpu;
-
-        do {
-                if (irqstatus_mpu & (OMAP3430_WKUP_ST_MASK |
-                                     OMAP3430_IO_ST_MASK)) {
-                        c = _prcm_int_handle_wakeup();
-
-                        /*
-                         * Is the MPU PRCM interrupt handler racing with the
-                         * IVA2 PRCM interrupt handler ?
-                         */
-                        WARN(c == 0, "prcm: WARNING: PRCM indicated MPU wakeup "
-                             "but no wakeup sources are marked\n");
-                } else {
-                        /* XXX we need to expand our PRCM interrupt handler */
-                        WARN(1, "prcm: WARNING: PRCM interrupt received, but "
-                             "no code to handle it (%08x)\n", irqstatus_mpu);
-                }
-
-                omap2_prm_write_mod_reg(irqstatus_mpu, OCP_MOD,
-                                        OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
-
-                irqstatus_mpu = omap2_prm_read_mod_reg(OCP_MOD,
-                                        OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
-                irqstatus_mpu &= irqenable_mpu;
+        int c;
 
-        } while (irqstatus_mpu);
+        /*
+         * Clear all except ST_IO and ST_IO_CHAIN for wkup module,
+         * these are handled in a separate handler to avoid acking
+         * IO events before parsing in mux code
+         */
+        c = prcm_clear_mod_irqs(WKUP_MOD, 1,
+                OMAP3430_ST_IO_MASK | OMAP3430_ST_IO_CHAIN_MASK);
+        c += prcm_clear_mod_irqs(CORE_MOD, 1, 0);
+        c += prcm_clear_mod_irqs(OMAP3430_PER_MOD, 1, 0);
+        if (omap_rev() > OMAP3430_REV_ES1_0) {
+                c += prcm_clear_mod_irqs(CORE_MOD, 3, 0);
+                c += prcm_clear_mod_irqs(OMAP3430ES2_USBHOST_MOD, 1, 0);
+        }
 
-        return IRQ_HANDLED;
+        return c ? IRQ_HANDLED : IRQ_NONE;
 }
 
 static void omap34xx_save_context(u32 *save)
@@ -376,20 +326,11 @@ void omap_sram_idle(void)
                         omap3_enable_io_chain();
         }
 
-        /* Block console output in case it is on one of the OMAP UARTs */
-        if (!is_suspending())
-                if (per_next_state < PWRDM_POWER_ON ||
-                    core_next_state < PWRDM_POWER_ON)
-                        if (!console_trylock())
-                                goto console_still_active;
-
         pwrdm_pre_transition();
 
         /* PER */
         if (per_next_state < PWRDM_POWER_ON) {
                 per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0;
-                omap_uart_prepare_idle(2);
-                omap_uart_prepare_idle(3);
                 omap2_gpio_prepare_for_idle(per_going_off);
                 if (per_next_state == PWRDM_POWER_OFF)
                                 omap3_per_save_context();
@@ -397,8 +338,6 @@ void omap_sram_idle(void)
 
         /* CORE */
         if (core_next_state < PWRDM_POWER_ON) {
-                omap_uart_prepare_idle(0);
-                omap_uart_prepare_idle(1);
                 if (core_next_state == PWRDM_POWER_OFF) {
                         omap3_core_save_context();
                         omap3_cm_save_context();
@@ -447,8 +386,6 @@ void omap_sram_idle(void)
                         omap3_sram_restore_context();
                         omap2_sms_restore_context();
                 }
-                omap_uart_resume_idle(0);
-                omap_uart_resume_idle(1);
                 if (core_next_state == PWRDM_POWER_OFF)
                         omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK,
                                                OMAP3430_GR_MOD,
@@ -464,14 +401,8 @@ void omap_sram_idle(void)
                 omap2_gpio_resume_after_idle();
                 if (per_prev_state == PWRDM_POWER_OFF)
                         omap3_per_restore_context();
-                omap_uart_resume_idle(2);
-                omap_uart_resume_idle(3);
         }
 
-        if (!is_suspending())
-                console_unlock();
-
-console_still_active:
         /* Disable IO-PAD and IO-CHAIN wakeup */
         if (omap3_has_io_wakeup() &&
             (per_next_state < PWRDM_POWER_ON ||
@@ -485,21 +416,11 @@ console_still_active:
         clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
 }
 
-int omap3_can_sleep(void)
-{
-        if (!omap_uart_can_sleep())
-                return 0;
-        return 1;
-}
-
 static void omap3_pm_idle(void)
 {
         local_irq_disable();
         local_fiq_disable();
 
-        if (!omap3_can_sleep())
-                goto out;
-
         if (omap_irq_pending() || need_resched())
                 goto out;
 
@@ -533,7 +454,6 @@ static int omap3_pm_suspend(void)
                         goto restore;
         }
 
-        omap_uart_prepare_suspend();
         omap3_intc_suspend();
 
         omap_sram_idle();
@@ -580,22 +500,27 @@ static int omap3_pm_begin(suspend_state_t state)
 {
         disable_hlt();
         suspend_state = state;
-        omap_uart_enable_irqs(0);
+        omap_prcm_irq_prepare();
         return 0;
 }
 
 static void omap3_pm_end(void)
 {
         suspend_state = PM_SUSPEND_ON;
-        omap_uart_enable_irqs(1);
         enable_hlt();
         return;
 }
 
+static void omap3_pm_finish(void)
+{
+        omap_prcm_irq_complete();
+}
+
 static const struct platform_suspend_ops omap_pm_ops = {
         .begin          = omap3_pm_begin,
         .end            = omap3_pm_end,
         .enter          = omap3_pm_enter,
+        .finish         = omap3_pm_finish,
         .valid          = suspend_valid_only_mem,
 };
 #endif /* CONFIG_SUSPEND */
@@ -701,10 +626,6 @@ static void __init prcm_setup_regs(void)
                           OMAP3430_GRPSEL_GPT1_MASK |
                           OMAP3430_GRPSEL_GPT12_MASK,
                           WKUP_MOD, OMAP3430_PM_MPUGRPSEL);
-        /* For some reason IO doesn't generate wakeup event even if
-         * it is selected to mpu wakeup goup */
-        omap2_prm_write_mod_reg(OMAP3430_IO_EN_MASK | OMAP3430_WKUP_EN_MASK,
-                          OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);
 
         /* Enable PM_WKEN to support DSS LPR */
         omap2_prm_write_mod_reg(OMAP3430_PM_WKEN_DSS_EN_DSS_MASK,
@@ -881,12 +802,21 @@ static int __init omap3_pm_init(void)
          * supervised mode for powerdomains */
         prcm_setup_regs();
 
-        ret = request_irq(INT_34XX_PRCM_MPU_IRQ,
-                          (irq_handler_t)prcm_interrupt_handler,
-                          IRQF_DISABLED, "prcm", NULL);
+        ret = request_irq(omap_prcm_event_to_irq("wkup"),
+                _prcm_int_handle_wakeup, IRQF_NO_SUSPEND, "pm_wkup", NULL);
+
+        if (ret) {
+                pr_err("pm: Failed to request pm_wkup irq\n");
+                goto err1;
+        }
+
+        /* IO interrupt is shared with mux code */
+        ret = request_irq(omap_prcm_event_to_irq("io"),
+                _prcm_int_handle_io, IRQF_SHARED | IRQF_NO_SUSPEND, "pm_io",
+                omap3_pm_init);
+
         if (ret) {
-                printk(KERN_ERR "request_irq failed to register for 0x%x\n",
-                       INT_34XX_PRCM_MPU_IRQ);
+                pr_err("pm: Failed to request pm_io irq\n");
                 goto err1;
         }
 
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 8edb015f5618..c264ef7219c1 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -1,8 +1,9 @@
 /*
  * OMAP4 Power Management Routines
  *
- * Copyright (C) 2010 Texas Instruments, Inc.
+ * Copyright (C) 2010-2011 Texas Instruments, Inc.
  * Rajendra Nayak <rnayak@ti.com>
+ * Santosh Shilimkar <santosh.shilimkar@ti.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
@@ -17,13 +18,16 @@
 #include <linux/slab.h>
 
 #include "common.h"
+#include "clockdomain.h"
 #include "powerdomain.h"
+#include "pm.h"
 
 struct power_state {
         struct powerdomain *pwrdm;
         u32 next_state;
 #ifdef CONFIG_SUSPEND
         u32 saved_state;
+        u32 saved_logic_state;
 #endif
         struct list_head node;
 };
@@ -33,7 +37,50 @@ static LIST_HEAD(pwrst_list);
 #ifdef CONFIG_SUSPEND
 static int omap4_pm_suspend(void)
 {
-        do_wfi();
+        struct power_state *pwrst;
+        int state, ret = 0;
+        u32 cpu_id = smp_processor_id();
+
+        /* Save current powerdomain state */
+        list_for_each_entry(pwrst, &pwrst_list, node) {
+                pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm);
+                pwrst->saved_logic_state = pwrdm_read_logic_retst(pwrst->pwrdm);
+        }
+
+        /* Set targeted power domain states by suspend */
+        list_for_each_entry(pwrst, &pwrst_list, node) {
+                omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
+                pwrdm_set_logic_retst(pwrst->pwrdm, PWRDM_POWER_OFF);
+        }
+
+        /*
+         * For MPUSS to hit power domain retention(CSWR or OSWR),
+         * CPU0 and CPU1 power domains need to be in OFF or DORMANT state,
+         * since CPU power domain CSWR is not supported by hardware
+         * Only master CPU follows suspend path. All other CPUs follow
+         * CPU hotplug path in system wide suspend. On OMAP4, CPU power
+         * domain CSWR is not supported by hardware.
+         * More details can be found in OMAP4430 TRM section 4.3.4.2.
+         */
+        omap4_enter_lowpower(cpu_id, PWRDM_POWER_OFF);
+
+        /* Restore next powerdomain state */
+        list_for_each_entry(pwrst, &pwrst_list, node) {
+                state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
+                if (state > pwrst->next_state) {
+                        pr_info("Powerdomain (%s) didn't enter "
+                               "target state %d\n",
+                               pwrst->pwrdm->name, pwrst->next_state);
+                        ret = -1;
+                }
+                omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
+                pwrdm_set_logic_retst(pwrst->pwrdm, pwrst->saved_logic_state);
+        }
+        if (ret)
+                pr_crit("Could not enter target state in pm_suspend\n");
+        else
+                pr_info("Successfully put all powerdomains to target state\n");
+
         return 0;
 }
 
@@ -73,6 +120,22 @@ static const struct platform_suspend_ops omap_pm_ops = {
 };
 #endif /* CONFIG_SUSPEND */
 
+/*
+ * Enable hardware supervised mode for all clockdomains if it's
+ * supported. Initiate sleep transition for other clockdomains, if
+ * they are not used
+ */
+static int __init clkdms_setup(struct clockdomain *clkdm, void *unused)
+{
+        if (clkdm->flags & CLKDM_CAN_ENABLE_AUTO)
+                clkdm_allow_idle(clkdm);
+        else if (clkdm->flags & CLKDM_CAN_FORCE_SLEEP &&
+                        atomic_read(&clkdm->usecount) == 0)
+                clkdm_sleep(clkdm);
+        return 0;
+}
+
+
 static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
 {
         struct power_state *pwrst;
@@ -80,14 +143,48 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
         if (!pwrdm->pwrsts)
                 return 0;
 
+        /*
+         * Skip CPU0 and CPU1 power domains. CPU1 is programmed
+         * through hotplug path and CPU0 explicitly programmed
+         * further down in the code path
+         */
+        if (!strncmp(pwrdm->name, "cpu", 3))
+                return 0;
+
+        /*
+         * FIXME: Remove this check when core retention is supported
+         * Only MPUSS power domain is added in the list.
+         */
+        if (strcmp(pwrdm->name, "mpu_pwrdm"))
+                return 0;
+
         pwrst = kmalloc(sizeof(struct power_state), GFP_ATOMIC);
         if (!pwrst)
                 return -ENOMEM;
+
         pwrst->pwrdm = pwrdm;
-        pwrst->next_state = PWRDM_POWER_ON;
+        pwrst->next_state = PWRDM_POWER_RET;
         list_add(&pwrst->node, &pwrst_list);
 
-        return pwrdm_set_next_pwrst(pwrst->pwrdm, pwrst->next_state);
+        return omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state);
+}
+
+/**
+ * omap_default_idle - OMAP4 default ilde routine.'
+ *
+ * Implements OMAP4 memory, IO ordering requirements which can't be addressed
+ * with default arch_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and
+ * by secondary CPU with CONFIG_CPUIDLE.
+ */
+static void omap_default_idle(void)
+{
+        local_irq_disable();
+        local_fiq_disable();
+
+        omap_do_wfi();
+
+        local_fiq_enable();
+        local_irq_enable();
 }
 
 /**
@@ -99,10 +196,17 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
 static int __init omap4_pm_init(void)
 {
         int ret;
+        struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;
+        struct clockdomain *ducati_clkdm, *l3_2_clkdm, *l4_per_clkdm;
 
         if (!cpu_is_omap44xx())
                 return -ENODEV;
 
+        if (omap_rev() == OMAP4430_REV_ES1_0) {
+                WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
+                return -ENODEV;
+        }
+
         pr_err("Power Management for TI OMAP4.\n");
 
         ret = pwrdm_for_each(pwrdms_setup, NULL);
@@ -111,10 +215,51 @@ static int __init omap4_pm_init(void)
                 goto err2;
         }
 
+        /*
+         * The dynamic dependency between MPUSS -> MEMIF and
+         * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as
+         * expected. The hardware recommendation is to enable static
+         * dependencies for these to avoid system lock ups or random crashes.
+         */
+        mpuss_clkdm = clkdm_lookup("mpuss_clkdm");
+        emif_clkdm = clkdm_lookup("l3_emif_clkdm");
+        l3_1_clkdm = clkdm_lookup("l3_1_clkdm");
+        l3_2_clkdm = clkdm_lookup("l3_2_clkdm");
+        l4_per_clkdm = clkdm_lookup("l4_per_clkdm");
+        ducati_clkdm = clkdm_lookup("ducati_clkdm");
+        if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) ||
+                (!l3_2_clkdm) || (!ducati_clkdm) || (!l4_per_clkdm))
+                goto err2;
+
+        ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);
+        ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);
+        ret |= clkdm_add_wkdep(mpuss_clkdm, l3_2_clkdm);
+        ret |= clkdm_add_wkdep(mpuss_clkdm, l4_per_clkdm);
+        ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm);
+        ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);
+        if (ret) {
+                pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 "
+                                "wakeup dependency\n");
+                goto err2;
+        }
+
+        ret = omap4_mpuss_init();
+        if (ret) {
+                pr_err("Failed to initialise OMAP4 MPUSS\n");
+                goto err2;
+        }
+
+        (void) clkdm_for_each(clkdms_setup, NULL);
+
 #ifdef CONFIG_SUSPEND
         suspend_set_ops(&omap_pm_ops);
 #endif /* CONFIG_SUSPEND */
 
+        /* Overwrite the default arch_idle() */
+        pm_idle = omap_default_idle;
+
+        omap4_idle_init();
+
 err2:
         return ret;
 }
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
index 0363dcb0ef93..5aa5435e3ff1 100644
--- a/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@ -4,7 +4,7 @@
 /*
  * OMAP2/3 PRCM base and module definitions
  *
- * Copyright (C) 2007-2009 Texas Instruments, Inc.
+ * Copyright (C) 2007-2009, 2011 Texas Instruments, Inc.
  * Copyright (C) 2007-2009 Nokia Corporation
  *
  * Written by Paul Walmsley
@@ -201,6 +201,8 @@
 #define OMAP3430_EN_MMC2_SHIFT                          25
 #define OMAP3430_EN_MMC1_MASK                           (1 << 24)
 #define OMAP3430_EN_MMC1_SHIFT                          24
+#define OMAP3430_EN_UART4_MASK                          (1 << 23)
+#define OMAP3430_EN_UART4_SHIFT                         23
 #define OMAP3430_EN_MCSPI4_MASK                         (1 << 21)
 #define OMAP3430_EN_MCSPI4_SHIFT                        21
 #define OMAP3430_EN_MCSPI3_MASK                         (1 << 20)
@@ -408,6 +410,79 @@
 extern void __iomem *prm_base;
 extern void __iomem *cm_base;
 extern void __iomem *cm2_base;
+
+/**
+ * struct omap_prcm_irq - describes a PRCM interrupt bit
+ * @name: a short name describing the interrupt type, e.g. "wkup" or "io"
+ * @offset: the bit shift of the interrupt inside the IRQ{ENABLE,STATUS} regs
+ * @priority: should this interrupt be handled before @priority=false IRQs?
+ *
+ * Describes interrupt bits inside the PRM_IRQ{ENABLE,STATUS}_MPU* registers.
+ * On systems with multiple PRM MPU IRQ registers, the bitfields read from
+ * the registers are concatenated, so @offset could be > 31 on these systems -
+ * see omap_prm_irq_handler() for more details.  I/O ring interrupts should
+ * have @priority set to true.
+ */
+struct omap_prcm_irq {
+        const char *name;
+        unsigned int offset;
+        bool priority;
+};
+
+/**
+ * struct omap_prcm_irq_setup - PRCM interrupt controller details
+ * @ack: PRM register offset for the first PRM_IRQSTATUS_MPU register
+ * @mask: PRM register offset for the first PRM_IRQENABLE_MPU register
+ * @nr_regs: number of PRM_IRQ{STATUS,ENABLE}_MPU* registers
+ * @nr_irqs: number of entries in the @irqs array
+ * @irqs: ptr to an array of PRCM interrupt bits (see @nr_irqs)
+ * @irq: MPU IRQ asserted when a PRCM interrupt arrives
+ * @read_pending_irqs: fn ptr to determine if any PRCM IRQs are pending
+ * @ocp_barrier: fn ptr to force buffered PRM writes to complete
+ * @save_and_clear_irqen: fn ptr to save and clear IRQENABLE regs
+ * @restore_irqen: fn ptr to save and clear IRQENABLE regs
+ * @saved_mask: IRQENABLE regs are saved here during suspend
+ * @priority_mask: 1 bit per IRQ, set to 1 if omap_prcm_irq.priority = true
+ * @base_irq: base dynamic IRQ number, returned from irq_alloc_descs() in init
+ * @suspended: set to true after Linux suspend code has called our ->prepare()
+ * @suspend_save_flag: set to true after IRQ masks have been saved and disabled
+ *
+ * @saved_mask, @priority_mask, @base_irq, @suspended, and
+ * @suspend_save_flag are populated dynamically, and are not to be
+ * specified in static initializers.
+ */
+struct omap_prcm_irq_setup {
+        u16 ack;
+        u16 mask;
+        u8 nr_regs;
+        u8 nr_irqs;
+        const struct omap_prcm_irq *irqs;
+        int irq;
+        void (*read_pending_irqs)(unsigned long *events);
+        void (*ocp_barrier)(void);
+        void (*save_and_clear_irqen)(u32 *saved_mask);
+        void (*restore_irqen)(u32 *saved_mask);
+        u32 *saved_mask;
+        u32 *priority_mask;
+        int base_irq;
+        bool suspended;
+        bool suspend_save_flag;
+};
+
+/* OMAP_PRCM_IRQ: convenience macro for creating struct omap_prcm_irq records */
+#define OMAP_PRCM_IRQ(_name, _offset, _priority) {      \
+        .name = _name,                                  \
+        .offset = _offset,                              \
+        .priority = _priority                           \
+        }
+
+extern void omap_prcm_irq_cleanup(void);
+extern int omap_prcm_register_chain_handler(
+        struct omap_prcm_irq_setup *irq_setup);
+extern int omap_prcm_event_to_irq(const char *event);
+extern void omap_prcm_irq_prepare(void);
+extern void omap_prcm_irq_complete(void);
+
 # endif
 
 #endif
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c
index 9a08ba397327..c1c4d86a79a8 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c
@@ -1,7 +1,7 @@
 /*
  * OMAP2/3 PRM module functions
  *
- * Copyright (C) 2010 Texas Instruments, Inc.
+ * Copyright (C) 2010-2011 Texas Instruments, Inc.
  * Copyright (C) 2010 Nokia Corporation
  * Benoît Cousson
  * Paul Walmsley
@@ -27,6 +27,24 @@
 #include "prm-regbits-24xx.h"
 #include "prm-regbits-34xx.h"
 
+static const struct omap_prcm_irq omap3_prcm_irqs[] = {
+        OMAP_PRCM_IRQ("wkup",   0,      0),
+        OMAP_PRCM_IRQ("io",     9,      1),
+};
+
+static struct omap_prcm_irq_setup omap3_prcm_irq_setup = {
+        .ack                    = OMAP3_PRM_IRQSTATUS_MPU_OFFSET,
+        .mask                   = OMAP3_PRM_IRQENABLE_MPU_OFFSET,
+        .nr_regs                = 1,
+        .irqs                   = omap3_prcm_irqs,
+        .nr_irqs                = ARRAY_SIZE(omap3_prcm_irqs),
+        .irq                    = INT_34XX_PRCM_MPU_IRQ,
+        .read_pending_irqs      = &omap3xxx_prm_read_pending_irqs,
+        .ocp_barrier            = &omap3xxx_prm_ocp_barrier,
+        .save_and_clear_irqen   = &omap3xxx_prm_save_and_clear_irqen,
+        .restore_irqen          = &omap3xxx_prm_restore_irqen,
+};
+
 u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
 {
         return __raw_readl(prm_base + module + idx);
@@ -212,3 +230,80 @@ u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)
 {
         return omap2_prm_rmw_mod_reg_bits(mask, bits, OMAP3430_GR_MOD, offset);
 }
+
+/**
+ * omap3xxx_prm_read_pending_irqs - read pending PRM MPU IRQs into @events
+ * @events: ptr to a u32, preallocated by caller
+ *
+ * Read PRM_IRQSTATUS_MPU bits, AND'ed with the currently-enabled PRM
+ * MPU IRQs, and store the result into the u32 pointed to by @events.
+ * No return value.
+ */
+void omap3xxx_prm_read_pending_irqs(unsigned long *events)
+{
+        u32 mask, st;
+
+        /* XXX Can the mask read be avoided (e.g., can it come from RAM?) */
+        mask = omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);
+        st = omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
+
+        events[0] = mask & st;
+}
+
+/**
+ * omap3xxx_prm_ocp_barrier - force buffered MPU writes to the PRM to complete
+ *
+ * Force any buffered writes to the PRM IP block to complete.  Needed
+ * by the PRM IRQ handler, which reads and writes directly to the IP
+ * block, to avoid race conditions after acknowledging or clearing IRQ
+ * bits.  No return value.
+ */
+void omap3xxx_prm_ocp_barrier(void)
+{
+        omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_REVISION_OFFSET);
+}
+
+/**
+ * omap3xxx_prm_save_and_clear_irqen - save/clear PRM_IRQENABLE_MPU reg
+ * @saved_mask: ptr to a u32 array to save IRQENABLE bits
+ *
+ * Save the PRM_IRQENABLE_MPU register to @saved_mask.  @saved_mask
+ * must be allocated by the caller.  Intended to be used in the PRM
+ * interrupt handler suspend callback.  The OCP barrier is needed to
+ * ensure the write to disable PRM interrupts reaches the PRM before
+ * returning; otherwise, spurious interrupts might occur.  No return
+ * value.
+ */
+void omap3xxx_prm_save_and_clear_irqen(u32 *saved_mask)
+{
+        saved_mask[0] = omap2_prm_read_mod_reg(OCP_MOD,
+                                               OMAP3_PRM_IRQENABLE_MPU_OFFSET);
+        omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQENABLE_MPU_OFFSET);
+
+        /* OCP barrier */
+        omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_REVISION_OFFSET);
+}
+
+/**
+ * omap3xxx_prm_restore_irqen - set PRM_IRQENABLE_MPU register from args
+ * @saved_mask: ptr to a u32 array of IRQENABLE bits saved previously
+ *
+ * Restore the PRM_IRQENABLE_MPU register from @saved_mask.  Intended
+ * to be used in the PRM interrupt handler resume callback to restore
+ * values saved by omap3xxx_prm_save_and_clear_irqen().  No OCP
+ * barrier should be needed here; any pending PRM interrupts will fire
+ * once the writes reach the PRM.  No return value.
+ */
+void omap3xxx_prm_restore_irqen(u32 *saved_mask)
+{
+        omap2_prm_write_mod_reg(saved_mask[0], OCP_MOD,
+                                OMAP3_PRM_IRQENABLE_MPU_OFFSET);
+}
+
+static int __init omap3xxx_prcm_init(void)
+{
+        if (cpu_is_omap34xx())
+                return omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);
+        return 0;
+}
+subsys_initcall(omap3xxx_prcm_init);
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
index cef533df0861..70ac2a19dc5f 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@ -1,7 +1,7 @@
 /*
  * OMAP2/3 Power/Reset Management (PRM) register definitions
  *
- * Copyright (C) 2007-2009 Texas Instruments, Inc.
+ * Copyright (C) 2007-2009, 2011 Texas Instruments, Inc.
  * Copyright (C) 2008-2010 Nokia Corporation
  * Paul Walmsley
  *
@@ -314,6 +314,13 @@ void omap3_prm_vp_clear_txdone(u8 vp_id);
 extern u32 omap3_prm_vcvp_read(u8 offset);
 extern void omap3_prm_vcvp_write(u32 val, u8 offset);
 extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);
+
+/* PRM interrupt-related functions */
+extern void omap3xxx_prm_read_pending_irqs(unsigned long *events);
+extern void omap3xxx_prm_ocp_barrier(void);
+extern void omap3xxx_prm_save_and_clear_irqen(u32 *saved_mask);
+extern void omap3xxx_prm_restore_irqen(u32 *saved_mask);
+
 #endif  /* CONFIG_ARCH_OMAP4 */
 
 #endif
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index dd885eecf22a..33dd655e6aab 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -27,6 +27,24 @@
 #include "prcm44xx.h"
 #include "prminst44xx.h"
 
+static const struct omap_prcm_irq omap4_prcm_irqs[] = {
+        OMAP_PRCM_IRQ("wkup",   0,      0),
+        OMAP_PRCM_IRQ("io",     9,      1),
+};
+
+static struct omap_prcm_irq_setup omap4_prcm_irq_setup = {
+        .ack                    = OMAP4_PRM_IRQSTATUS_MPU_OFFSET,
+        .mask                   = OMAP4_PRM_IRQENABLE_MPU_OFFSET,
+        .nr_regs                = 2,
+        .irqs                   = omap4_prcm_irqs,
+        .nr_irqs                = ARRAY_SIZE(omap4_prcm_irqs),
+        .irq                    = OMAP44XX_IRQ_PRCM,
+        .read_pending_irqs      = &omap44xx_prm_read_pending_irqs,
+        .ocp_barrier            = &omap44xx_prm_ocp_barrier,
+        .save_and_clear_irqen   = &omap44xx_prm_save_and_clear_irqen,
+        .restore_irqen          = &omap44xx_prm_restore_irqen,
+};
+
 /* PRM low-level functions */
 
 /* Read a register in a CM/PRM instance in the PRM module */
@@ -121,3 +139,101 @@ u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)
                                                OMAP4430_PRM_DEVICE_INST,
                                                offset);
 }
+
+static inline u32 _read_pending_irq_reg(u16 irqen_offs, u16 irqst_offs)
+{
+        u32 mask, st;
+
+        /* XXX read mask from RAM? */
+        mask = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, irqen_offs);
+        st = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST, irqst_offs);
+
+        return mask & st;
+}
+
+/**
+ * omap44xx_prm_read_pending_irqs - read pending PRM MPU IRQs into @events
+ * @events: ptr to two consecutive u32s, preallocated by caller
+ *
+ * Read PRM_IRQSTATUS_MPU* bits, AND'ed with the currently-enabled PRM
+ * MPU IRQs, and store the result into the two u32s pointed to by @events.
+ * No return value.
+ */
+void omap44xx_prm_read_pending_irqs(unsigned long *events)
+{
+        events[0] = _read_pending_irq_reg(OMAP4_PRM_IRQENABLE_MPU_OFFSET,
+                                          OMAP4_PRM_IRQSTATUS_MPU_OFFSET);
+
+        events[1] = _read_pending_irq_reg(OMAP4_PRM_IRQENABLE_MPU_2_OFFSET,
+                                          OMAP4_PRM_IRQSTATUS_MPU_2_OFFSET);
+}
+
+/**
+ * omap44xx_prm_ocp_barrier - force buffered MPU writes to the PRM to complete
+ *
+ * Force any buffered writes to the PRM IP block to complete.  Needed
+ * by the PRM IRQ handler, which reads and writes directly to the IP
+ * block, to avoid race conditions after acknowledging or clearing IRQ
+ * bits.  No return value.
+ */
+void omap44xx_prm_ocp_barrier(void)
+{
+        omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+                                OMAP4_REVISION_PRM_OFFSET);
+}
+
+/**
+ * omap44xx_prm_save_and_clear_irqen - save/clear PRM_IRQENABLE_MPU* regs
+ * @saved_mask: ptr to a u32 array to save IRQENABLE bits
+ *
+ * Save the PRM_IRQENABLE_MPU and PRM_IRQENABLE_MPU_2 registers to
+ * @saved_mask.  @saved_mask must be allocated by the caller.
+ * Intended to be used in the PRM interrupt handler suspend callback.
+ * The OCP barrier is needed to ensure the write to disable PRM
+ * interrupts reaches the PRM before returning; otherwise, spurious
+ * interrupts might occur.  No return value.
+ */
+void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask)
+{
+        saved_mask[0] =
+                omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+                                        OMAP4_PRM_IRQSTATUS_MPU_OFFSET);
+        saved_mask[1] =
+                omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+                                        OMAP4_PRM_IRQSTATUS_MPU_2_OFFSET);
+
+        omap4_prm_write_inst_reg(0, OMAP4430_PRM_DEVICE_INST,
+                                 OMAP4_PRM_IRQENABLE_MPU_OFFSET);
+        omap4_prm_write_inst_reg(0, OMAP4430_PRM_DEVICE_INST,
+                                 OMAP4_PRM_IRQENABLE_MPU_2_OFFSET);
+
+        /* OCP barrier */
+        omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+                                OMAP4_REVISION_PRM_OFFSET);
+}
+
+/**
+ * omap44xx_prm_restore_irqen - set PRM_IRQENABLE_MPU* registers from args
+ * @saved_mask: ptr to a u32 array of IRQENABLE bits saved previously
+ *
+ * Restore the PRM_IRQENABLE_MPU and PRM_IRQENABLE_MPU_2 registers from
+ * @saved_mask.  Intended to be used in the PRM interrupt handler resume
+ * callback to restore values saved by omap44xx_prm_save_and_clear_irqen().
+ * No OCP barrier should be needed here; any pending PRM interrupts will fire
+ * once the writes reach the PRM.  No return value.
+ */
+void omap44xx_prm_restore_irqen(u32 *saved_mask)
+{
+        omap4_prm_write_inst_reg(saved_mask[0], OMAP4430_PRM_DEVICE_INST,
+                                 OMAP4_PRM_IRQENABLE_MPU_OFFSET);
+        omap4_prm_write_inst_reg(saved_mask[1], OMAP4430_PRM_DEVICE_INST,
+                                 OMAP4_PRM_IRQENABLE_MPU_2_OFFSET);
+}
+
+static int __init omap4xxx_prcm_init(void)
+{
+        if (cpu_is_omap44xx())
+                return omap_prcm_register_chain_handler(&omap4_prcm_irq_setup);
+        return 0;
+}
+subsys_initcall(omap4xxx_prcm_init);
diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
index 3d66ccd849d2..7978092946db 100644
--- a/arch/arm/mach-omap2/prm44xx.h
+++ b/arch/arm/mach-omap2/prm44xx.h
@@ -1,7 +1,7 @@
 /*
  * OMAP44xx PRM instance offset macros
  *
- * Copyright (C) 2009-2010 Texas Instruments, Inc.
+ * Copyright (C) 2009-2011 Texas Instruments, Inc.
  * Copyright (C) 2009-2010 Nokia Corporation
  *
  * Paul Walmsley (paul@pwsan.com)
@@ -763,6 +763,12 @@ extern u32 omap4_prm_vcvp_read(u8 offset);
 extern void omap4_prm_vcvp_write(u32 val, u8 offset);
 extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);
 
+/* PRM interrupt-related functions */
+extern void omap44xx_prm_read_pending_irqs(unsigned long *events);
+extern void omap44xx_prm_ocp_barrier(void);
+extern void omap44xx_prm_save_and_clear_irqen(u32 *saved_mask);
+extern void omap44xx_prm_restore_irqen(u32 *saved_mask);
+
 # endif
 
 #endif
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
new file mode 100644
index 000000000000..860118ab43e2
--- /dev/null
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -0,0 +1,320 @@
+/*
+ * OMAP2+ common Power & Reset Management (PRM) IP block functions
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ * Tero Kristo <t-kristo@ti.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.
+ *
+ *
+ * For historical purposes, the API used to configure the PRM
+ * interrupt handler refers to it as the "PRCM interrupt."  The
+ * underlying registers are located in the PRM on OMAP3/4.
+ *
+ * XXX This code should eventually be moved to a PRM driver.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+
+#include <mach/system.h>
+#include <plat/common.h>
+#include <plat/prcm.h>
+#include <plat/irqs.h>
+
+#include "prm2xxx_3xxx.h"
+#include "prm44xx.h"
+
+/*
+ * OMAP_PRCM_MAX_NR_PENDING_REG: maximum number of PRM_IRQ*_MPU regs
+ * XXX this is technically not needed, since
+ * omap_prcm_register_chain_handler() could allocate this based on the
+ * actual amount of memory needed for the SoC
+ */
+#define OMAP_PRCM_MAX_NR_PENDING_REG            2
+
+/*
+ * prcm_irq_chips: an array of all of the "generic IRQ chips" in use
+ * by the PRCM interrupt handler code.  There will be one 'chip' per
+ * PRM_{IRQSTATUS,IRQENABLE}_MPU register pair.  (So OMAP3 will have
+ * one "chip" and OMAP4 will have two.)
+ */
+static struct irq_chip_generic **prcm_irq_chips;
+
+/*
+ * prcm_irq_setup: the PRCM IRQ parameters for the hardware the code
+ * is currently running on.  Defined and passed by initialization code
+ * that calls omap_prcm_register_chain_handler().
+ */
+static struct omap_prcm_irq_setup *prcm_irq_setup;
+
+/* Private functions */
+
+/*
+ * Move priority events from events to priority_events array
+ */
+static void omap_prcm_events_filter_priority(unsigned long *events,
+        unsigned long *priority_events)
+{
+        int i;
+
+        for (i = 0; i < prcm_irq_setup->nr_regs; i++) {
+                priority_events[i] =
+                        events[i] & prcm_irq_setup->priority_mask[i];
+                events[i] ^= priority_events[i];
+        }
+}
+
+/*
+ * PRCM Interrupt Handler
+ *
+ * This is a common handler for the OMAP PRCM interrupts. Pending
+ * interrupts are detected by a call to prcm_pending_events and
+ * dispatched accordingly. Clearing of the wakeup events should be
+ * done by the SoC specific individual handlers.
+ */
+static void omap_prcm_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned long pending[OMAP_PRCM_MAX_NR_PENDING_REG];
+        unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG];
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        unsigned int virtirq;
+        int nr_irqs = prcm_irq_setup->nr_regs * 32;
+
+        /*
+         * If we are suspended, mask all interrupts from PRCM level,
+         * this does not ack them, and they will be pending until we
+         * re-enable the interrupts, at which point the
+         * omap_prcm_irq_handler will be executed again.  The
+         * _save_and_clear_irqen() function must ensure that the PRM
+         * write to disable all IRQs has reached the PRM before
+         * returning, or spurious PRCM interrupts may occur during
+         * suspend.
+         */
+        if (prcm_irq_setup->suspended) {
+                prcm_irq_setup->save_and_clear_irqen(prcm_irq_setup->saved_mask);
+                prcm_irq_setup->suspend_save_flag = true;
+        }
+
+        /*
+         * Loop until all pending irqs are handled, since
+         * generic_handle_irq() can cause new irqs to come
+         */
+        while (!prcm_irq_setup->suspended) {
+                prcm_irq_setup->read_pending_irqs(pending);
+
+                /* No bit set, then all IRQs are handled */
+                if (find_first_bit(pending, nr_irqs) >= nr_irqs)
+                        break;
+
+                omap_prcm_events_filter_priority(pending, priority_pending);
+
+                /*
+                 * Loop on all currently pending irqs so that new irqs
+                 * cannot starve previously pending irqs
+                 */
+
+                /* Serve priority events first */
+                for_each_set_bit(virtirq, priority_pending, nr_irqs)
+                        generic_handle_irq(prcm_irq_setup->base_irq + virtirq);
+
+                /* Serve normal events next */
+                for_each_set_bit(virtirq, pending, nr_irqs)
+                        generic_handle_irq(prcm_irq_setup->base_irq + virtirq);
+        }
+        if (chip->irq_ack)
+                chip->irq_ack(&desc->irq_data);
+        if (chip->irq_eoi)
+                chip->irq_eoi(&desc->irq_data);
+        chip->irq_unmask(&desc->irq_data);
+
+        prcm_irq_setup->ocp_barrier(); /* avoid spurious IRQs */
+}
+
+/* Public functions */
+
+/**
+ * omap_prcm_event_to_irq - given a PRCM event name, returns the
+ * corresponding IRQ on which the handler should be registered
+ * @name: name of the PRCM interrupt bit to look up - see struct omap_prcm_irq
+ *
+ * Returns the Linux internal IRQ ID corresponding to @name upon success,
+ * or -ENOENT upon failure.
+ */
+int omap_prcm_event_to_irq(const char *name)
+{
+        int i;
+
+        if (!prcm_irq_setup || !name)
+                return -ENOENT;
+
+        for (i = 0; i < prcm_irq_setup->nr_irqs; i++)
+                if (!strcmp(prcm_irq_setup->irqs[i].name, name))
+                        return prcm_irq_setup->base_irq +
+                                prcm_irq_setup->irqs[i].offset;
+
+        return -ENOENT;
+}
+
+/**
+ * omap_prcm_irq_cleanup - reverses memory allocated and other steps
+ * done by omap_prcm_register_chain_handler()
+ *
+ * No return value.
+ */
+void omap_prcm_irq_cleanup(void)
+{
+        int i;
+
+        if (!prcm_irq_setup) {
+                pr_err("PRCM: IRQ handler not initialized; cannot cleanup\n");
+                return;
+        }
+
+        if (prcm_irq_chips) {
+                for (i = 0; i < prcm_irq_setup->nr_regs; i++) {
+                        if (prcm_irq_chips[i])
+                                irq_remove_generic_chip(prcm_irq_chips[i],
+                                        0xffffffff, 0, 0);
+                        prcm_irq_chips[i] = NULL;
+                }
+                kfree(prcm_irq_chips);
+                prcm_irq_chips = NULL;
+        }
+
+        kfree(prcm_irq_setup->saved_mask);
+        prcm_irq_setup->saved_mask = NULL;
+
+        kfree(prcm_irq_setup->priority_mask);
+        prcm_irq_setup->priority_mask = NULL;
+
+        irq_set_chained_handler(prcm_irq_setup->irq, NULL);
+
+        if (prcm_irq_setup->base_irq > 0)
+                irq_free_descs(prcm_irq_setup->base_irq,
+                        prcm_irq_setup->nr_regs * 32);
+        prcm_irq_setup->base_irq = 0;
+}
+
+void omap_prcm_irq_prepare(void)
+{
+        prcm_irq_setup->suspended = true;
+}
+
+void omap_prcm_irq_complete(void)
+{
+        prcm_irq_setup->suspended = false;
+
+        /* If we have not saved the masks, do not attempt to restore */
+        if (!prcm_irq_setup->suspend_save_flag)
+                return;
+
+        prcm_irq_setup->suspend_save_flag = false;
+
+        /*
+         * Re-enable all masked PRCM irq sources, this causes the PRCM
+         * interrupt to fire immediately if the events were masked
+         * previously in the chain handler
+         */
+        prcm_irq_setup->restore_irqen(prcm_irq_setup->saved_mask);
+}
+
+/**
+ * omap_prcm_register_chain_handler - initializes the prcm chained interrupt
+ * handler based on provided parameters
+ * @irq_setup: hardware data about the underlying PRM/PRCM
+ *
+ * Set up the PRCM chained interrupt handler on the PRCM IRQ.  Sets up
+ * one generic IRQ chip per PRM interrupt status/enable register pair.
+ * Returns 0 upon success, -EINVAL if called twice or if invalid
+ * arguments are passed, or -ENOMEM on any other error.
+ */
+int omap_prcm_register_chain_handler(struct omap_prcm_irq_setup *irq_setup)
+{
+        int nr_regs = irq_setup->nr_regs;
+        u32 mask[OMAP_PRCM_MAX_NR_PENDING_REG];
+        int offset, i;
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
+
+        if (!irq_setup)
+                return -EINVAL;
+
+        if (prcm_irq_setup) {
+                pr_err("PRCM: already initialized; won't reinitialize\n");
+                return -EINVAL;
+        }
+
+        if (nr_regs > OMAP_PRCM_MAX_NR_PENDING_REG) {
+                pr_err("PRCM: nr_regs too large\n");
+                return -EINVAL;
+        }
+
+        prcm_irq_setup = irq_setup;
+
+        prcm_irq_chips = kzalloc(sizeof(void *) * nr_regs, GFP_KERNEL);
+        prcm_irq_setup->saved_mask = kzalloc(sizeof(u32) * nr_regs, GFP_KERNEL);
+        prcm_irq_setup->priority_mask = kzalloc(sizeof(u32) * nr_regs,
+                GFP_KERNEL);
+
+        if (!prcm_irq_chips || !prcm_irq_setup->saved_mask ||
+            !prcm_irq_setup->priority_mask) {
+                pr_err("PRCM: kzalloc failed\n");
+                goto err;
+        }
+
+        memset(mask, 0, sizeof(mask));
+
+        for (i = 0; i < irq_setup->nr_irqs; i++) {
+                offset = irq_setup->irqs[i].offset;
+                mask[offset >> 5] |= 1 << (offset & 0x1f);
+                if (irq_setup->irqs[i].priority)
+                        irq_setup->priority_mask[offset >> 5] |=
+                                1 << (offset & 0x1f);
+        }
+
+        irq_set_chained_handler(irq_setup->irq, omap_prcm_irq_handler);
+
+        irq_setup->base_irq = irq_alloc_descs(-1, 0, irq_setup->nr_regs * 32,
+                0);
+
+        if (irq_setup->base_irq < 0) {
+                pr_err("PRCM: failed to allocate irq descs: %d\n",
+                        irq_setup->base_irq);
+                goto err;
+        }
+
+        for (i = 0; i <= irq_setup->nr_regs; i++) {
+                gc = irq_alloc_generic_chip("PRCM", 1,
+                        irq_setup->base_irq + i * 32, prm_base,
+                        handle_level_irq);
+
+                if (!gc) {
+                        pr_err("PRCM: failed to allocate generic chip\n");
+                        goto err;
+                }
+                ct = gc->chip_types;
+                ct->chip.irq_ack = irq_gc_ack_set_bit;
+                ct->chip.irq_mask = irq_gc_mask_clr_bit;
+                ct->chip.irq_unmask = irq_gc_mask_set_bit;
+
+                ct->regs.ack = irq_setup->ack + i * 4;
+                ct->regs.mask = irq_setup->mask + i * 4;
+
+                irq_setup_generic_chip(gc, mask[i], 0, IRQ_NOREQUEST, 0);
+                prcm_irq_chips[i] = gc;
+        }
+
+        return 0;
+
+err:
+        omap_prcm_irq_cleanup();
+        return -ENOMEM;
+}
diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c
index ee3a8ad304cb..7479d7ea1379 100644
--- a/arch/arm/mach-omap2/sdram-nokia.c
+++ b/arch/arm/mach-omap2/sdram-nokia.c
@@ -1,7 +1,7 @@
 /*
  * SDRC register values for Nokia boards
  *
- * Copyright (C) 2008, 2010 Nokia Corporation
+ * Copyright (C) 2008, 2010-2011 Nokia Corporation
  *
  * Lauri Leukkunen <lauri.leukkunen@nokia.com>
  *
@@ -107,14 +107,37 @@ static const struct sdram_timings nokia_195dot2mhz_timings[] = {
         },
 };
 
+static const struct sdram_timings nokia_200mhz_timings[] = {
+        {
+                .casl = 3,
+                .tDAL = 30000,
+                .tDPL = 15000,
+                .tRRD = 10000,
+                .tRCD = 20000,
+                .tRP = 15000,
+                .tRAS = 40000,
+                .tRC = 55000,
+                .tRFC = 140000,
+                .tXSR = 200000,
+
+                .tREF = 7800,
+
+                .tXP = 2,
+                .tCKE = 4,
+                .tWTR = 2
+        },
+};
+
 static const struct {
         long rate;
         struct sdram_timings const *data;
 } nokia_timings[] = {
         { 83000000, nokia_166mhz_timings },
         { 97600000, nokia_97dot6mhz_timings },
+        { 100000000, nokia_200mhz_timings },
         { 166000000, nokia_166mhz_timings },
         { 195200000, nokia_195dot2mhz_timings },
+        { 200000000, nokia_200mhz_timings },
 };
 static struct omap_sdrc_params nokia_sdrc_params[ARRAY_SIZE(nokia_timings) + 1];
 
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 42c326732a29..247d89478f24 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -19,26 +19,21 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/serial_reg.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/serial_8250.h>
 #include <linux/pm_runtime.h>
 #include <linux/console.h>
 
-#ifdef CONFIG_SERIAL_OMAP
 #include <plat/omap-serial.h>
-#endif
-
 #include "common.h"
 #include <plat/board.h>
-#include <plat/clock.h>
 #include <plat/dma.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
+#include <plat/omap-pm.h>
 
 #include "prm2xxx_3xxx.h"
 #include "pm.h"
@@ -47,603 +42,226 @@
 #include "control.h"
 #include "mux.h"
 
-#define UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV     0x52
-#define UART_OMAP_WER           0x17    /* Wake-up enable register */
-
-#define UART_ERRATA_FIFO_FULL_ABORT     (0x1 << 0)
-#define UART_ERRATA_i202_MDR1_ACCESS    (0x1 << 1)
-
 /*
- * NOTE: By default the serial timeout is disabled as it causes lost characters
- * over the serial ports. This means that the UART clocks will stay on until
- * disabled via sysfs. This also causes that any deeper omap sleep states are
- * blocked. 
+ * NOTE: By default the serial auto_suspend timeout is disabled as it causes
+ * lost characters over the serial ports. This means that the UART clocks will
+ * stay on until power/autosuspend_delay is set for the uart from sysfs.
+ * This also causes that any deeper omap sleep states are blocked.
  */
-#define DEFAULT_TIMEOUT 0
+#define DEFAULT_AUTOSUSPEND_DELAY       -1
 
 #define MAX_UART_HWMOD_NAME_LEN         16
 
 struct omap_uart_state {
         int num;
         int can_sleep;
-        struct timer_list timer;
-        u32 timeout;
-
-        void __iomem *wk_st;
-        void __iomem *wk_en;
-        u32 wk_mask;
-        u32 padconf;
-        u32 dma_enabled;
-
-        struct clk *ick;
-        struct clk *fck;
-        int clocked;
-
-        int irq;
-        int regshift;
-        int irqflags;
-        void __iomem *membase;
-        resource_size_t mapbase;
 
         struct list_head node;
         struct omap_hwmod *oh;
         struct platform_device *pdev;
-
-        u32 errata;
-#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
-        int context_valid;
-
-        /* Registers to be saved/restored for OFF-mode */
-        u16 dll;
-        u16 dlh;
-        u16 ier;
-        u16 sysc;
-        u16 scr;
-        u16 wer;
-        u16 mcr;
-#endif
 };
 
 static LIST_HEAD(uart_list);
 static u8 num_uarts;
+static u8 console_uart_id = -1;
+static u8 no_console_suspend;
+static u8 uart_debug;
+
+#define DEFAULT_RXDMA_POLLRATE          1       /* RX DMA polling rate (us) */
+#define DEFAULT_RXDMA_BUFSIZE           4096    /* RX DMA buffer size */
+#define DEFAULT_RXDMA_TIMEOUT           (3 * HZ)/* RX DMA timeout (jiffies) */
+
+static struct omap_uart_port_info omap_serial_default_info[] __initdata = {
+        {
+                .dma_enabled    = false,
+                .dma_rx_buf_size = DEFAULT_RXDMA_BUFSIZE,
+                .dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
+                .dma_rx_timeout = DEFAULT_RXDMA_TIMEOUT,
+                .autosuspend_timeout = DEFAULT_AUTOSUSPEND_DELAY,
+        },
+};
 
-static inline unsigned int __serial_read_reg(struct uart_port *up,
-                                             int offset)
-{
-        offset <<= up->regshift;
-        return (unsigned int)__raw_readb(up->membase + offset);
-}
-
-static inline unsigned int serial_read_reg(struct omap_uart_state *uart,
-                                           int offset)
+#ifdef CONFIG_PM
+static void omap_uart_enable_wakeup(struct platform_device *pdev, bool enable)
 {
-        offset <<= uart->regshift;
-        return (unsigned int)__raw_readb(uart->membase + offset);
-}
+        struct omap_device *od = to_omap_device(pdev);
 
-static inline void __serial_write_reg(struct uart_port *up, int offset,
-                int value)
-{
-        offset <<= up->regshift;
-        __raw_writeb(value, up->membase + offset);
-}
+        if (!od)
+                return;
 
-static inline void serial_write_reg(struct omap_uart_state *uart, int offset,
-                                    int value)
-{
-        offset <<= uart->regshift;
-        __raw_writeb(value, uart->membase + offset);
+        if (enable)
+                omap_hwmod_enable_wakeup(od->hwmods[0]);
+        else
+                omap_hwmod_disable_wakeup(od->hwmods[0]);
 }
 
 /*
- * Internal UARTs need to be initialized for the 8250 autoconfig to work
- * properly. Note that the TX watermark initialization may not be needed
- * once the 8250.c watermark handling code is merged.
+ * Errata i291: [UART]:Cannot Acknowledge Idle Requests
+ * in Smartidle Mode When Configured for DMA Operations.
+ * WA: configure uart in force idle mode.
  */
-
-static inline void __init omap_uart_reset(struct omap_uart_state *uart)
+static void omap_uart_set_noidle(struct platform_device *pdev)
 {
-        serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
-        serial_write_reg(uart, UART_OMAP_SCR, 0x08);
-        serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);
-}
-
-#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3)
+        struct omap_device *od = to_omap_device(pdev);
 
-/*
- * Work Around for Errata i202 (3430 - 1.12, 3630 - 1.6)
- * The access to uart register after MDR1 Access
- * causes UART to corrupt data.
- *
- * Need a delay =
- * 5 L4 clock cycles + 5 UART functional clock cycle (@48MHz = ~0.2uS)
- * give 10 times as much
- */
-static void omap_uart_mdr1_errataset(struct omap_uart_state *uart, u8 mdr1_val,
-                u8 fcr_val)
-{
-        u8 timeout = 255;
-
-        serial_write_reg(uart, UART_OMAP_MDR1, mdr1_val);
-        udelay(2);
-        serial_write_reg(uart, UART_FCR, fcr_val | UART_FCR_CLEAR_XMIT |
-                        UART_FCR_CLEAR_RCVR);
-        /*
-         * Wait for FIFO to empty: when empty, RX_FIFO_E bit is 0 and
-         * TX_FIFO_E bit is 1.
-         */
-        while (UART_LSR_THRE != (serial_read_reg(uart, UART_LSR) &
-                                (UART_LSR_THRE | UART_LSR_DR))) {
-                timeout--;
-                if (!timeout) {
-                        /* Should *never* happen. we warn and carry on */
-                        dev_crit(&uart->pdev->dev, "Errata i202: timedout %x\n",
-                        serial_read_reg(uart, UART_LSR));
-                        break;
-                }
-                udelay(1);
-        }
+        omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_NO);
 }
 
-static void omap_uart_save_context(struct omap_uart_state *uart)
+static void omap_uart_set_forceidle(struct platform_device *pdev)
 {
-        u16 lcr = 0;
+        struct omap_device *od = to_omap_device(pdev);
 
-        if (!enable_off_mode)
-                return;
-
-        lcr = serial_read_reg(uart, UART_LCR);
-        serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);
-        uart->dll = serial_read_reg(uart, UART_DLL);
-        uart->dlh = serial_read_reg(uart, UART_DLM);
-        serial_write_reg(uart, UART_LCR, lcr);
-        uart->ier = serial_read_reg(uart, UART_IER);
-        uart->sysc = serial_read_reg(uart, UART_OMAP_SYSC);
-        uart->scr = serial_read_reg(uart, UART_OMAP_SCR);
-        uart->wer = serial_read_reg(uart, UART_OMAP_WER);
-        serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_A);
-        uart->mcr = serial_read_reg(uart, UART_MCR);
-        serial_write_reg(uart, UART_LCR, lcr);
-
-        uart->context_valid = 1;
+        omap_hwmod_set_slave_idlemode(od->hwmods[0], HWMOD_IDLEMODE_FORCE);
 }
 
-static void omap_uart_restore_context(struct omap_uart_state *uart)
-{
-        u16 efr = 0;
-
-        if (!enable_off_mode)
-                return;
-
-        if (!uart->context_valid)
-                return;
-
-        uart->context_valid = 0;
-
-        if (uart->errata & UART_ERRATA_i202_MDR1_ACCESS)
-                omap_uart_mdr1_errataset(uart, UART_OMAP_MDR1_DISABLE, 0xA0);
-        else
-                serial_write_reg(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
-
-        serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);
-        efr = serial_read_reg(uart, UART_EFR);
-        serial_write_reg(uart, UART_EFR, UART_EFR_ECB);
-        serial_write_reg(uart, UART_LCR, 0x0); /* Operational mode */
-        serial_write_reg(uart, UART_IER, 0x0);
-        serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);
-        serial_write_reg(uart, UART_DLL, uart->dll);
-        serial_write_reg(uart, UART_DLM, uart->dlh);
-        serial_write_reg(uart, UART_LCR, 0x0); /* Operational mode */
-        serial_write_reg(uart, UART_IER, uart->ier);
-        serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_A);
-        serial_write_reg(uart, UART_MCR, uart->mcr);
-        serial_write_reg(uart, UART_LCR, UART_LCR_CONF_MODE_B);
-        serial_write_reg(uart, UART_EFR, efr);
-        serial_write_reg(uart, UART_LCR, UART_LCR_WLEN8);
-        serial_write_reg(uart, UART_OMAP_SCR, uart->scr);
-        serial_write_reg(uart, UART_OMAP_WER, uart->wer);
-        serial_write_reg(uart, UART_OMAP_SYSC, uart->sysc);
-
-        if (uart->errata & UART_ERRATA_i202_MDR1_ACCESS)
-                omap_uart_mdr1_errataset(uart, UART_OMAP_MDR1_16X_MODE, 0xA1);
-        else
-                /* UART 16x mode */
-                serial_write_reg(uart, UART_OMAP_MDR1,
-                                UART_OMAP_MDR1_16X_MODE);
-}
 #else
-static inline void omap_uart_save_context(struct omap_uart_state *uart) {}
-static inline void omap_uart_restore_context(struct omap_uart_state *uart) {}
-#endif /* CONFIG_PM && CONFIG_ARCH_OMAP3 */
-
-static inline void omap_uart_enable_clocks(struct omap_uart_state *uart)
-{
-        if (uart->clocked)
-                return;
-
-        omap_device_enable(uart->pdev);
-        uart->clocked = 1;
-        omap_uart_restore_context(uart);
-}
-
-#ifdef CONFIG_PM
-
-static inline void omap_uart_disable_clocks(struct omap_uart_state *uart)
-{
-        if (!uart->clocked)
-                return;
-
-        omap_uart_save_context(uart);
-        uart->clocked = 0;
-        omap_device_idle(uart->pdev);
-}
-
-static void omap_uart_enable_wakeup(struct omap_uart_state *uart)
-{
-        /* Set wake-enable bit */
-        if (uart->wk_en && uart->wk_mask) {
-                u32 v = __raw_readl(uart->wk_en);
-                v |= uart->wk_mask;
-                __raw_writel(v, uart->wk_en);
-        }
-
-        /* Ensure IOPAD wake-enables are set */
-        if (cpu_is_omap34xx() && uart->padconf) {
-                u16 v = omap_ctrl_readw(uart->padconf);
-                v |= OMAP3_PADCONF_WAKEUPENABLE0;
-                omap_ctrl_writew(v, uart->padconf);
-        }
-}
-
-static void omap_uart_disable_wakeup(struct omap_uart_state *uart)
-{
-        /* Clear wake-enable bit */
-        if (uart->wk_en && uart->wk_mask) {
-                u32 v = __raw_readl(uart->wk_en);
-                v &= ~uart->wk_mask;
-                __raw_writel(v, uart->wk_en);
-        }
-
-        /* Ensure IOPAD wake-enables are cleared */
-        if (cpu_is_omap34xx() && uart->padconf) {
-                u16 v = omap_ctrl_readw(uart->padconf);
-                v &= ~OMAP3_PADCONF_WAKEUPENABLE0;
-                omap_ctrl_writew(v, uart->padconf);
-        }
-}
-
-static void omap_uart_smart_idle_enable(struct omap_uart_state *uart,
-                                               int enable)
-{
-        u8 idlemode;
-
-        if (enable) {
-                /**
-                 * Errata 2.15: [UART]:Cannot Acknowledge Idle Requests
-                 * in Smartidle Mode When Configured for DMA Operations.
-                 */
-                if (uart->dma_enabled)
-                        idlemode = HWMOD_IDLEMODE_FORCE;
-                else
-                        idlemode = HWMOD_IDLEMODE_SMART;
-        } else {
-                idlemode = HWMOD_IDLEMODE_NO;
-        }
-
-        omap_hwmod_set_slave_idlemode(uart->oh, idlemode);
-}
-
-static void omap_uart_block_sleep(struct omap_uart_state *uart)
-{
-        omap_uart_enable_clocks(uart);
-
-        omap_uart_smart_idle_enable(uart, 0);
-        uart->can_sleep = 0;
-        if (uart->timeout)
-                mod_timer(&uart->timer, jiffies + uart->timeout);
-        else
-                del_timer(&uart->timer);
-}
-
-static void omap_uart_allow_sleep(struct omap_uart_state *uart)
-{
-        if (device_may_wakeup(&uart->pdev->dev))
-                omap_uart_enable_wakeup(uart);
-        else
-                omap_uart_disable_wakeup(uart);
-
-        if (!uart->clocked)
-                return;
-
-        omap_uart_smart_idle_enable(uart, 1);
-        uart->can_sleep = 1;
-        del_timer(&uart->timer);
-}
-
-static void omap_uart_idle_timer(unsigned long data)
-{
-        struct omap_uart_state *uart = (struct omap_uart_state *)data;
-
-        omap_uart_allow_sleep(uart);
-}
-
-void omap_uart_prepare_idle(int num)
-{
-        struct omap_uart_state *uart;
-
-        list_for_each_entry(uart, &uart_list, node) {
-                if (num == uart->num && uart->can_sleep) {
-                        omap_uart_disable_clocks(uart);
-                        return;
-                }
-        }
-}
-
-void omap_uart_resume_idle(int num)
-{
-        struct omap_uart_state *uart;
-
-        list_for_each_entry(uart, &uart_list, node) {
-                if (num == uart->num && uart->can_sleep) {
-                        omap_uart_enable_clocks(uart);
-
-                        /* Check for IO pad wakeup */
-                        if (cpu_is_omap34xx() && uart->padconf) {
-                                u16 p = omap_ctrl_readw(uart->padconf);
-
-                                if (p & OMAP3_PADCONF_WAKEUPEVENT0)
-                                        omap_uart_block_sleep(uart);
-                        }
-
-                        /* Check for normal UART wakeup */
-                        if (__raw_readl(uart->wk_st) & uart->wk_mask)
-                                omap_uart_block_sleep(uart);
-                        return;
-                }
-        }
-}
-
-void omap_uart_prepare_suspend(void)
-{
-        struct omap_uart_state *uart;
-
-        list_for_each_entry(uart, &uart_list, node) {
-                omap_uart_allow_sleep(uart);
-        }
-}
-
-int omap_uart_can_sleep(void)
-{
-        struct omap_uart_state *uart;
-        int can_sleep = 1;
-
-        list_for_each_entry(uart, &uart_list, node) {
-                if (!uart->clocked)
-                        continue;
-
-                if (!uart->can_sleep) {
-                        can_sleep = 0;
-                        continue;
-                }
-
-                /* This UART can now safely sleep. */
-                omap_uart_allow_sleep(uart);
-        }
-
-        return can_sleep;
-}
+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) {}
+#endif /* CONFIG_PM */
 
-/**
- * omap_uart_interrupt()
- *
- * This handler is used only to detect that *any* UART interrupt has
- * occurred.  It does _nothing_ to handle the interrupt.  Rather,
- * any UART interrupt will trigger the inactivity timer so the
- * UART will not idle or sleep for its timeout period.
- *
- **/
-/* static int first_interrupt; */
-static irqreturn_t omap_uart_interrupt(int irq, void *dev_id)
-{
-        struct omap_uart_state *uart = dev_id;
+#ifdef CONFIG_OMAP_MUX
+static struct omap_device_pad default_uart1_pads[] __initdata = {
+        {
+                .name   = "uart1_cts.uart1_cts",
+                .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart1_rts.uart1_rts",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart1_tx.uart1_tx",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart1_rx.uart1_rx",
+                .flags  = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+                .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+                .idle   = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+        },
+};
 
-        omap_uart_block_sleep(uart);
+static struct omap_device_pad default_uart2_pads[] __initdata = {
+        {
+                .name   = "uart2_cts.uart2_cts",
+                .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart2_rts.uart2_rts",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart2_tx.uart2_tx",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart2_rx.uart2_rx",
+                .flags  = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+                .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+                .idle   = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+        },
+};
 
-        return IRQ_NONE;
-}
+static struct omap_device_pad default_uart3_pads[] __initdata = {
+        {
+                .name   = "uart3_cts_rctx.uart3_cts_rctx",
+                .enable = OMAP_PIN_INPUT_PULLUP | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart3_rts_sd.uart3_rts_sd",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart3_tx_irtx.uart3_tx_irtx",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart3_rx_irrx.uart3_rx_irrx",
+                .flags  = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+                .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0,
+                .idle   = OMAP_PIN_INPUT | OMAP_MUX_MODE0,
+        },
+};
 
-static void omap_uart_idle_init(struct omap_uart_state *uart)
-{
-        int ret;
-
-        uart->can_sleep = 0;
-        uart->timeout = DEFAULT_TIMEOUT;
-        setup_timer(&uart->timer, omap_uart_idle_timer,
-                    (unsigned long) uart);
-        if (uart->timeout)
-                mod_timer(&uart->timer, jiffies + uart->timeout);
-        omap_uart_smart_idle_enable(uart, 0);
-
-        if (cpu_is_omap34xx() && !cpu_is_ti816x()) {
-                u32 mod = (uart->num > 1) ? OMAP3430_PER_MOD : CORE_MOD;
-                u32 wk_mask = 0;
-                u32 padconf = 0;
-
-                /* XXX These PRM accesses do not belong here */
-                uart->wk_en = OMAP34XX_PRM_REGADDR(mod, PM_WKEN1);
-                uart->wk_st = OMAP34XX_PRM_REGADDR(mod, PM_WKST1);
-                switch (uart->num) {
-                case 0:
-                        wk_mask = OMAP3430_ST_UART1_MASK;
-                        padconf = 0x182;
-                        break;
-                case 1:
-                        wk_mask = OMAP3430_ST_UART2_MASK;
-                        padconf = 0x17a;
-                        break;
-                case 2:
-                        wk_mask = OMAP3430_ST_UART3_MASK;
-                        padconf = 0x19e;
-                        break;
-                case 3:
-                        wk_mask = OMAP3630_ST_UART4_MASK;
-                        padconf = 0x0d2;
-                        break;
-                }
-                uart->wk_mask = wk_mask;
-                uart->padconf = padconf;
-        } else if (cpu_is_omap24xx()) {
-                u32 wk_mask = 0;
-                u32 wk_en = PM_WKEN1, wk_st = PM_WKST1;
-
-                switch (uart->num) {
-                case 0:
-                        wk_mask = OMAP24XX_ST_UART1_MASK;
-                        break;
-                case 1:
-                        wk_mask = OMAP24XX_ST_UART2_MASK;
-                        break;
-                case 2:
-                        wk_en = OMAP24XX_PM_WKEN2;
-                        wk_st = OMAP24XX_PM_WKST2;
-                        wk_mask = OMAP24XX_ST_UART3_MASK;
-                        break;
-                }
-                uart->wk_mask = wk_mask;
-                if (cpu_is_omap2430()) {
-                        uart->wk_en = OMAP2430_PRM_REGADDR(CORE_MOD, wk_en);
-                        uart->wk_st = OMAP2430_PRM_REGADDR(CORE_MOD, wk_st);
-                } else if (cpu_is_omap2420()) {
-                        uart->wk_en = OMAP2420_PRM_REGADDR(CORE_MOD, wk_en);
-                        uart->wk_st = OMAP2420_PRM_REGADDR(CORE_MOD, wk_st);
-                }
-        } else {
-                uart->wk_en = NULL;
-                uart->wk_st = NULL;
-                uart->wk_mask = 0;
-                uart->padconf = 0;
-        }
+static struct omap_device_pad default_omap36xx_uart4_pads[] __initdata = {
+        {
+                .name   = "gpmc_wait2.uart4_tx",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "gpmc_wait3.uart4_rx",
+                .flags  = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+                .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE2,
+                .idle   = OMAP_PIN_INPUT | OMAP_MUX_MODE2,
+        },
+};
 
-        uart->irqflags |= IRQF_SHARED;
-        ret = request_threaded_irq(uart->irq, NULL, omap_uart_interrupt,
-                                   IRQF_SHARED, "serial idle", (void *)uart);
-        WARN_ON(ret);
-}
+static struct omap_device_pad default_omap4_uart4_pads[] __initdata = {
+        {
+                .name   = "uart4_tx.uart4_tx",
+                .enable = OMAP_PIN_OUTPUT | OMAP_MUX_MODE0,
+        },
+        {
+                .name   = "uart4_rx.uart4_rx",
+                .flags  = OMAP_DEVICE_PAD_REMUX | OMAP_DEVICE_PAD_WAKEUP,
+                .enable = OMAP_PIN_INPUT | OMAP_MUX_MODE0,
+                .idle   = OMAP_PIN_INPUT | OMAP_MUX_MODE0,
+        },
+};
 
-void omap_uart_enable_irqs(int enable)
+static void omap_serial_fill_default_pads(struct omap_board_data *bdata)
 {
-        int ret;
-        struct omap_uart_state *uart;
-
-        list_for_each_entry(uart, &uart_list, node) {
-                if (enable) {
-                        pm_runtime_put_sync(&uart->pdev->dev);
-                        ret = request_threaded_irq(uart->irq, NULL,
-                                                   omap_uart_interrupt,
-                                                   IRQF_SHARED,
-                                                   "serial idle",
-                                                   (void *)uart);
-                } else {
-                        pm_runtime_get_noresume(&uart->pdev->dev);
-                        free_irq(uart->irq, (void *)uart);
+        switch (bdata->id) {
+        case 0:
+                bdata->pads = default_uart1_pads;
+                bdata->pads_cnt = ARRAY_SIZE(default_uart1_pads);
+                break;
+        case 1:
+                bdata->pads = default_uart2_pads;
+                bdata->pads_cnt = ARRAY_SIZE(default_uart2_pads);
+                break;
+        case 2:
+                bdata->pads = default_uart3_pads;
+                bdata->pads_cnt = ARRAY_SIZE(default_uart3_pads);
+                break;
+        case 3:
+                if (cpu_is_omap44xx()) {
+                        bdata->pads = default_omap4_uart4_pads;
+                        bdata->pads_cnt =
+                                ARRAY_SIZE(default_omap4_uart4_pads);
+                } else if (cpu_is_omap3630()) {
+                        bdata->pads = default_omap36xx_uart4_pads;
+                        bdata->pads_cnt =
+                                ARRAY_SIZE(default_omap36xx_uart4_pads);
                 }
+                break;
+        default:
+                break;
         }
 }
-
-static ssize_t sleep_timeout_show(struct device *dev,
-                                  struct device_attribute *attr,
-                                  char *buf)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct omap_device *odev = to_omap_device(pdev);
-        struct omap_uart_state *uart = odev->hwmods[0]->dev_attr;
-
-        return sprintf(buf, "%u\n", uart->timeout / HZ);
-}
-
-static ssize_t sleep_timeout_store(struct device *dev,
-                                   struct device_attribute *attr,
-                                   const char *buf, size_t n)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct omap_device *odev = to_omap_device(pdev);
-        struct omap_uart_state *uart = odev->hwmods[0]->dev_attr;
-        unsigned int value;
-
-        if (sscanf(buf, "%u", &value) != 1) {
-                dev_err(dev, "sleep_timeout_store: Invalid value\n");
-                return -EINVAL;
-        }
-
-        uart->timeout = value * HZ;
-        if (uart->timeout)
-                mod_timer(&uart->timer, jiffies + uart->timeout);
-        else
-                /* A zero value means disable timeout feature */
-                omap_uart_block_sleep(uart);
-
-        return n;
-}
-
-static DEVICE_ATTR(sleep_timeout, 0644, sleep_timeout_show,
-                sleep_timeout_store);
-#define DEV_CREATE_FILE(dev, attr) WARN_ON(device_create_file(dev, attr))
 #else
-static inline void omap_uart_idle_init(struct omap_uart_state *uart) {}
-static void omap_uart_block_sleep(struct omap_uart_state *uart)
-{
-        /* Needed to enable UART clocks when built without CONFIG_PM */
-        omap_uart_enable_clocks(uart);
-}
-#define DEV_CREATE_FILE(dev, attr)
-#endif /* CONFIG_PM */
-
-#ifndef CONFIG_SERIAL_OMAP
-/*
- * Override the default 8250 read handler: mem_serial_in()
- * Empty RX fifo read causes an abort on omap3630 and omap4
- * This function makes sure that an empty rx fifo is not read on these silicons
- * (OMAP1/2/3430 are not affected)
- */
-static unsigned int serial_in_override(struct uart_port *up, int offset)
-{
-        if (UART_RX == offset) {
-                unsigned int lsr;
-                lsr = __serial_read_reg(up, UART_LSR);
-                if (!(lsr & UART_LSR_DR))
-                        return -EPERM;
-        }
-
-        return __serial_read_reg(up, offset);
-}
+static void omap_serial_fill_default_pads(struct omap_board_data *bdata) {}
+#endif
 
-static void serial_out_override(struct uart_port *up, int offset, int value)
+char *cmdline_find_option(char *str)
 {
-        unsigned int status, tmout = 10000;
+        extern char *saved_command_line;
 
-        status = __serial_read_reg(up, UART_LSR);
-        while (!(status & UART_LSR_THRE)) {
-                /* Wait up to 10ms for the character(s) to be sent. */
-                if (--tmout == 0)
-                        break;
-                udelay(1);
-                status = __serial_read_reg(up, UART_LSR);
-        }
-        __serial_write_reg(up, offset, value);
+        return strstr(saved_command_line, str);
 }
-#endif
 
 static int __init omap_serial_early_init(void)
 {
-        int i = 0;
-
         do {
                 char oh_name[MAX_UART_HWMOD_NAME_LEN];
                 struct omap_hwmod *oh;
                 struct omap_uart_state *uart;
+                char uart_name[MAX_UART_HWMOD_NAME_LEN];
 
                 snprintf(oh_name, MAX_UART_HWMOD_NAME_LEN,
-                         "uart%d", i + 1);
+                         "uart%d", num_uarts + 1);
                 oh = omap_hwmod_lookup(oh_name);
                 if (!oh)
                         break;
@@ -653,21 +271,35 @@ static int __init omap_serial_early_init(void)
                         return -ENODEV;
 
                 uart->oh = oh;
-                uart->num = i++;
+                uart->num = num_uarts++;
                 list_add_tail(&uart->node, &uart_list);
-                num_uarts++;
-
-                /*
-                 * NOTE: omap_hwmod_setup*() has not yet been called,
-                 *       so no hwmod functions will work yet.
-                 */
-
-                /*
-                 * During UART early init, device need to be probed
-                 * to determine SoC specific init before omap_device
-                 * is ready.  Therefore, don't allow idle here
-                 */
-                uart->oh->flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;
+                snprintf(uart_name, MAX_UART_HWMOD_NAME_LEN,
+                                "%s%d", OMAP_SERIAL_NAME, uart->num);
+
+                if (cmdline_find_option(uart_name)) {
+                        console_uart_id = uart->num;
+
+                        if (console_loglevel >= 10) {
+                                uart_debug = true;
+                                pr_info("%s used as console in debug mode"
+                                                " uart%d clocks will not be"
+                                                " gated", uart_name, uart->num);
+                        }
+
+                        if (cmdline_find_option("no_console_suspend"))
+                                no_console_suspend = true;
+
+                        /*
+                         * omap-uart can be used for earlyprintk logs
+                         * So if omap-uart is used as console then prevent
+                         * uart reset and idle to get logs from omap-uart
+                         * until uart console driver is available to take
+                         * care for console messages.
+                         * Idling or resetting omap-uart while printing logs
+                         * early boot logs can stall the boot-up.
+                         */
+                        oh->flags |= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET;
+                }
         } while (1);
 
         return 0;
@@ -677,6 +309,7 @@ core_initcall(omap_serial_early_init);
 /**
  * omap_serial_init_port() - initialize single serial port
  * @bdata: port specific board data pointer
+ * @info: platform specific data pointer
  *
  * This function initialies serial driver for given port only.
  * Platforms can call this function instead of omap_serial_init()
@@ -685,7 +318,8 @@ core_initcall(omap_serial_early_init);
  * Don't mix calls to omap_serial_init_port() and omap_serial_init(),
  * use only one of the two.
  */
-void __init omap_serial_init_port(struct omap_board_data *bdata)
+void __init omap_serial_init_port(struct omap_board_data *bdata,
+                        struct omap_uart_port_info *info)
 {
         struct omap_uart_state *uart;
         struct omap_hwmod *oh;
@@ -693,15 +327,7 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
         void *pdata = NULL;
         u32 pdata_size = 0;
         char *name;
-#ifndef CONFIG_SERIAL_OMAP
-        struct plat_serial8250_port ports[2] = {
-                {},
-                {.flags = 0},
-        };
-        struct plat_serial8250_port *p = &ports[0];
-#else
         struct omap_uart_port_info omap_up;
-#endif
 
         if (WARN_ON(!bdata))
                 return;
@@ -713,66 +339,34 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
         list_for_each_entry(uart, &uart_list, node)
                 if (bdata->id == uart->num)
                         break;
+        if (!info)
+                info = omap_serial_default_info;
 
         oh = uart->oh;
-        uart->dma_enabled = 0;
-#ifndef CONFIG_SERIAL_OMAP
-        name = "serial8250";
-
-        /*
-         * !! 8250 driver does not use standard IORESOURCE* It
-         * has it's own custom pdata that can be taken from
-         * the hwmod resource data.  But, this needs to be
-         * done after the build.
-         *
-         * ?? does it have to be done before the register ??
-         * YES, because platform_device_data_add() copies
-         * pdata, it does not use a pointer.
-         */
-        p->flags = UPF_BOOT_AUTOCONF;
-        p->iotype = UPIO_MEM;
-        p->regshift = 2;
-        p->uartclk = OMAP24XX_BASE_BAUD * 16;
-        p->irq = oh->mpu_irqs[0].irq;
-        p->mapbase = oh->slaves[0]->addr->pa_start;
-        p->membase = omap_hwmod_get_mpu_rt_va(oh);
-        p->irqflags = IRQF_SHARED;
-        p->private_data = uart;
-
-        /*
-         * omap44xx, ti816x: Never read empty UART fifo
-         * omap3xxx: Never read empty UART fifo on UARTs
-         * with IP rev >=0x52
-         */
-        uart->regshift = p->regshift;
-        uart->membase = p->membase;
-        if (cpu_is_omap44xx() || cpu_is_ti816x())
-                uart->errata |= UART_ERRATA_FIFO_FULL_ABORT;
-        else if ((serial_read_reg(uart, UART_OMAP_MVER) & 0xFF)
-                        >= UART_OMAP_NO_EMPTY_FIFO_READ_IP_REV)
-                uart->errata |= UART_ERRATA_FIFO_FULL_ABORT;
-
-        if (uart->errata & UART_ERRATA_FIFO_FULL_ABORT) {
-                p->serial_in = serial_in_override;
-                p->serial_out = serial_out_override;
-        }
-
-        pdata = &ports[0];
-        pdata_size = 2 * sizeof(struct plat_serial8250_port);
-#else
-
         name = DRIVER_NAME;
 
-        omap_up.dma_enabled = uart->dma_enabled;
+        omap_up.dma_enabled = info->dma_enabled;
         omap_up.uartclk = OMAP24XX_BASE_BAUD * 16;
-        omap_up.mapbase = oh->slaves[0]->addr->pa_start;
-        omap_up.membase = omap_hwmod_get_mpu_rt_va(oh);
-        omap_up.irqflags = IRQF_SHARED;
-        omap_up.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
+        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_noidle = omap_uart_set_noidle;
+        omap_up.enable_wakeup = omap_uart_enable_wakeup;
+        omap_up.dma_rx_buf_size = info->dma_rx_buf_size;
+        omap_up.dma_rx_timeout = info->dma_rx_timeout;
+        omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
+        omap_up.autosuspend_timeout = info->autosuspend_timeout;
+
+        /* Enable the MDR1 Errata i202 for OMAP2430/3xxx/44xx */
+        if (!cpu_is_omap2420() && !cpu_is_ti816x())
+                omap_up.errata |= UART_ERRATA_i202_MDR1_ACCESS;
+
+        /* Enable DMA Mode Force Idle Errata i291 for omap34xx/3630 */
+        if (cpu_is_omap34xx() || cpu_is_omap3630())
+                omap_up.errata |= UART_ERRATA_i291_DMA_FORCEIDLE;
 
         pdata = &omap_up;
         pdata_size = sizeof(struct omap_uart_port_info);
-#endif
 
         if (WARN_ON(!oh))
                 return;
@@ -782,64 +376,29 @@ void __init omap_serial_init_port(struct omap_board_data *bdata)
         WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n",
              name, oh->name);
 
-        omap_device_disable_idle_on_suspend(pdev);
+        if ((console_uart_id == bdata->id) && no_console_suspend)
+                omap_device_disable_idle_on_suspend(pdev);
+
         oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
 
-        uart->irq = oh->mpu_irqs[0].irq;
-        uart->regshift = 2;
-        uart->mapbase = oh->slaves[0]->addr->pa_start;
-        uart->membase = omap_hwmod_get_mpu_rt_va(oh);
         uart->pdev = pdev;
 
         oh->dev_attr = uart;
 
-        console_lock(); /* in case the earlycon is on the UART */
-
-        /*
-         * Because of early UART probing, UART did not get idled
-         * on init.  Now that omap_device is ready, ensure full idle
-         * before doing omap_device_enable().
-         */
-        omap_hwmod_idle(uart->oh);
-
-        omap_device_enable(uart->pdev);
-        omap_uart_idle_init(uart);
-        omap_uart_reset(uart);
-        omap_hwmod_enable_wakeup(uart->oh);
-        omap_device_idle(uart->pdev);
-
-        /*
-         * Need to block sleep long enough for interrupt driven
-         * driver to start.  Console driver is in polling mode
-         * so device needs to be kept enabled while polling driver
-         * is in use.
-         */
-        if (uart->timeout)
-                uart->timeout = (30 * HZ);
-        omap_uart_block_sleep(uart);
-        uart->timeout = DEFAULT_TIMEOUT;
-
-        console_unlock();
-
-        if ((cpu_is_omap34xx() && uart->padconf) ||
-            (uart->wk_en && uart->wk_mask)) {
+        if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)
+                        && !uart_debug)
                 device_init_wakeup(&pdev->dev, true);
-                DEV_CREATE_FILE(&pdev->dev, &dev_attr_sleep_timeout);
-        }
-
-        /* Enable the MDR1 errata for OMAP3 */
-        if (cpu_is_omap34xx() && !cpu_is_ti816x())
-                uart->errata |= UART_ERRATA_i202_MDR1_ACCESS;
 }
 
 /**
- * omap_serial_init() - initialize all supported serial ports
+ * omap_serial_board_init() - initialize all supported serial ports
+ * @info: platform specific data pointer
  *
  * Initializes all available UARTs as serial ports. Platforms
  * can call this function when they want to have default behaviour
  * for serial ports (e.g initialize them all as serial ports).
  */
-void __init omap_serial_init(void)
+void __init omap_serial_board_init(struct omap_uart_port_info *info)
 {
         struct omap_uart_state *uart;
         struct omap_board_data bdata;
@@ -849,7 +408,25 @@ void __init omap_serial_init(void)
                 bdata.flags = 0;
                 bdata.pads = NULL;
                 bdata.pads_cnt = 0;
-                omap_serial_init_port(&bdata);
 
+                if (cpu_is_omap44xx() || cpu_is_omap34xx())
+                        omap_serial_fill_default_pads(&bdata);
+
+                if (!info)
+                        omap_serial_init_port(&bdata, NULL);
+                else
+                        omap_serial_init_port(&bdata, &info[uart->num]);
         }
 }
+
+/**
+ * omap_serial_init() - initialize all supported serial ports
+ *
+ * Initializes all available UARTs.
+ * Platforms can call this function when they want to have default behaviour
+ * for serial ports (e.g initialize them all as serial ports).
+ */
+void __init omap_serial_init(void)
+{
+        omap_serial_board_init(NULL);
+}
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
new file mode 100644
index 000000000000..abd283400490
--- /dev/null
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -0,0 +1,379 @@
+/*
+ * OMAP44xx sleep code.
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc.
+ *      Santosh Shilimkar <santosh.shilimkar@ti.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.
+ */
+
+#include <linux/linkage.h>
+#include <asm/system.h>
+#include <asm/smp_scu.h>
+#include <asm/memory.h>
+#include <asm/hardware/cache-l2x0.h>
+
+#include <plat/omap44xx.h>
+#include <mach/omap-secure.h>
+
+#include "common.h"
+#include "omap4-sar-layout.h"
+
+#if defined(CONFIG_SMP) && defined(CONFIG_PM)
+
+.macro  DO_SMC
+        dsb
+        smc     #0
+        dsb
+.endm
+
+ppa_zero_params:
+        .word           0x0
+
+ppa_por_params:
+        .word           1, 0
+
+/*
+ * =============================
+ * == CPU suspend finisher ==
+ * =============================
+ *
+ * void omap4_finish_suspend(unsigned long cpu_state)
+ *
+ * This function code saves the CPU context and performs the CPU
+ * power down sequence. Calling WFI effectively changes the CPU
+ * power domains states to the desired target power state.
+ *
+ * @cpu_state : contains context save state (r0)
+ *      0 - No context lost
+ *      1 - CPUx L1 and logic lost: MPUSS CSWR
+ *      2 - CPUx L1 and logic lost + GIC lost: MPUSS OSWR
+ *      3 - CPUx L1 and logic lost + GIC + L2 lost: MPUSS OFF
+ * @return: This function never returns for CPU OFF and DORMANT power states.
+ * Post WFI, CPU transitions to DORMANT or OFF power state and on wake-up
+ * from this follows a full CPU reset path via ROM code to CPU restore code.
+ * The restore function pointer is stored at CPUx_WAKEUP_NS_PA_ADDR_OFFSET.
+ * It returns to the caller for CPU INACTIVE and ON power states or in case
+ * CPU failed to transition to targeted OFF/DORMANT state.
+ */
+ENTRY(omap4_finish_suspend)
+        stmfd   sp!, {lr}
+        cmp     r0, #0x0
+        beq     do_WFI                          @ No lowpower state, jump to WFI
+
+        /*
+         * Flush all data from the L1 data cache before disabling
+         * SCTLR.C bit.
+         */
+        bl      omap4_get_sar_ram_base
+        ldr     r9, [r0, #OMAP_TYPE_OFFSET]
+        cmp     r9, #0x1                        @ Check for HS device
+        bne     skip_secure_l1_clean
+        mov     r0, #SCU_PM_NORMAL
+        mov     r1, #0xFF                       @ clean seucre L1
+        stmfd   r13!, {r4-r12, r14}
+        ldr     r12, =OMAP4_MON_SCU_PWR_INDEX
+        DO_SMC
+        ldmfd   r13!, {r4-r12, r14}
+skip_secure_l1_clean:
+        bl      v7_flush_dcache_all
+
+        /*
+         * Clear the SCTLR.C bit to prevent further data cache
+         * allocation. Clearing SCTLR.C would make all the data accesses
+         * strongly ordered and would not hit the cache.
+         */
+        mrc     p15, 0, r0, c1, c0, 0
+        bic     r0, r0, #(1 << 2)               @ Disable the C bit
+        mcr     p15, 0, r0, c1, c0, 0
+        isb
+
+        /*
+         * Invalidate L1 data cache. Even though only invalidate is
+         * necessary exported flush API is used here. Doing clean
+         * on already clean cache would be almost NOP.
+         */
+        bl      v7_flush_dcache_all
+
+        /*
+         * Switch the CPU from Symmetric Multiprocessing (SMP) mode
+         * to AsymmetricMultiprocessing (AMP) mode by programming
+         * the SCU power status to DORMANT or OFF mode.
+         * This enables the CPU to be taken out of coherency by
+         * preventing the CPU from receiving cache, TLB, or BTB
+         * maintenance operations broadcast by other CPUs in the cluster.
+         */
+        bl      omap4_get_sar_ram_base
+        mov     r8, r0
+        ldr     r9, [r8, #OMAP_TYPE_OFFSET]
+        cmp     r9, #0x1                        @ Check for HS device
+        bne     scu_gp_set
+        mrc     p15, 0, r0, c0, c0, 5           @ Read MPIDR
+        ands    r0, r0, #0x0f
+        ldreq   r0, [r8, #SCU_OFFSET0]
+        ldrne   r0, [r8, #SCU_OFFSET1]
+        mov     r1, #0x00
+        stmfd   r13!, {r4-r12, r14}
+        ldr     r12, =OMAP4_MON_SCU_PWR_INDEX
+        DO_SMC
+        ldmfd   r13!, {r4-r12, r14}
+        b       skip_scu_gp_set
+scu_gp_set:
+        mrc     p15, 0, r0, c0, c0, 5           @ Read MPIDR
+        ands    r0, r0, #0x0f
+        ldreq   r1, [r8, #SCU_OFFSET0]
+        ldrne   r1, [r8, #SCU_OFFSET1]
+        bl      omap4_get_scu_base
+        bl      scu_power_mode
+skip_scu_gp_set:
+        mrc     p15, 0, r0, c1, c1, 2           @ Read NSACR data
+        tst     r0, #(1 << 18)
+        mrcne   p15, 0, r0, c1, c0, 1
+        bicne   r0, r0, #(1 << 6)               @ Disable SMP bit
+        mcrne   p15, 0, r0, c1, c0, 1
+        isb
+        dsb
+#ifdef CONFIG_CACHE_L2X0
+        /*
+         * Clean and invalidate the L2 cache.
+         * Common cache-l2x0.c functions can't be used here since it
+         * uses spinlocks. We are out of coherency here with data cache
+         * disabled. The spinlock implementation uses exclusive load/store
+         * instruction which can fail without data cache being enabled.
+         * OMAP4 hardware doesn't support exclusive monitor which can
+         * overcome exclusive access issue. Because of this, CPU can
+         * lead to deadlock.
+         */
+        bl      omap4_get_sar_ram_base
+        mov     r8, r0
+        mrc     p15, 0, r5, c0, c0, 5           @ Read MPIDR
+        ands    r5, r5, #0x0f
+        ldreq   r0, [r8, #L2X0_SAVE_OFFSET0]    @ Retrieve L2 state from SAR
+        ldrne   r0, [r8, #L2X0_SAVE_OFFSET1]    @ memory.
+        cmp     r0, #3
+        bne     do_WFI
+#ifdef CONFIG_PL310_ERRATA_727915
+        mov     r0, #0x03
+        mov     r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX
+        DO_SMC
+#endif
+        bl      omap4_get_l2cache_base
+        mov     r2, r0
+        ldr     r0, =0xffff
+        str     r0, [r2, #L2X0_CLEAN_INV_WAY]
+wait:
+        ldr     r0, [r2, #L2X0_CLEAN_INV_WAY]
+        ldr     r1, =0xffff
+        ands    r0, r0, r1
+        bne     wait
+#ifdef CONFIG_PL310_ERRATA_727915
+        mov     r0, #0x00
+        mov     r12, #OMAP4_MON_L2X0_DBG_CTRL_INDEX
+        DO_SMC
+#endif
+l2x_sync:
+        bl      omap4_get_l2cache_base
+        mov     r2, r0
+        mov     r0, #0x0
+        str     r0, [r2, #L2X0_CACHE_SYNC]
+sync:
+        ldr     r0, [r2, #L2X0_CACHE_SYNC]
+        ands    r0, r0, #0x1
+        bne     sync
+#endif
+
+do_WFI:
+        bl      omap_do_wfi
+
+        /*
+         * CPU is here when it failed to enter OFF/DORMANT or
+         * no low power state was attempted.
+         */
+        mrc     p15, 0, r0, c1, c0, 0
+        tst     r0, #(1 << 2)                   @ Check C bit enabled?
+        orreq   r0, r0, #(1 << 2)               @ Enable the C bit
+        mcreq   p15, 0, r0, c1, c0, 0
+        isb
+
+        /*
+         * Ensure the CPU power state is set to NORMAL in
+         * SCU power state so that CPU is back in coherency.
+         * In non-coherent mode CPU can lock-up and lead to
+         * system deadlock.
+         */
+        mrc     p15, 0, r0, c1, c0, 1
+        tst     r0, #(1 << 6)                   @ Check SMP bit enabled?
+        orreq   r0, r0, #(1 << 6)
+        mcreq   p15, 0, r0, c1, c0, 1
+        isb
+        bl      omap4_get_sar_ram_base
+        mov     r8, r0
+        ldr     r9, [r8, #OMAP_TYPE_OFFSET]
+        cmp     r9, #0x1                        @ Check for HS device
+        bne     scu_gp_clear
+        mov     r0, #SCU_PM_NORMAL
+        mov     r1, #0x00
+        stmfd   r13!, {r4-r12, r14}
+        ldr     r12, =OMAP4_MON_SCU_PWR_INDEX
+        DO_SMC
+        ldmfd   r13!, {r4-r12, r14}
+        b       skip_scu_gp_clear
+scu_gp_clear:
+        bl      omap4_get_scu_base
+        mov     r1, #SCU_PM_NORMAL
+        bl      scu_power_mode
+skip_scu_gp_clear:
+        isb
+        dsb
+        ldmfd   sp!, {pc}
+ENDPROC(omap4_finish_suspend)
+
+/*
+ * ============================
+ * == CPU resume entry point ==
+ * ============================
+ *
+ * void omap4_cpu_resume(void)
+ *
+ * ROM code jumps to this function while waking up from CPU
+ * OFF or DORMANT state. Physical address of the function is
+ * stored in the SAR RAM while entering to OFF or DORMANT mode.
+ * The restore function pointer is stored at CPUx_WAKEUP_NS_PA_ADDR_OFFSET.
+ */
+ENTRY(omap4_cpu_resume)
+        /*
+         * Configure ACTRL and enable NS SMP bit access on CPU1 on HS device.
+         * OMAP44XX EMU/HS devices - CPU0 SMP bit access is enabled in PPA
+         * init and for CPU1, a secure PPA API provided. CPU0 must be ON
+         * while executing NS_SMP API on CPU1 and PPA version must be 1.4.0+.
+         * OMAP443X GP devices- SMP bit isn't accessible.
+         * OMAP446X GP devices - SMP bit access is enabled on both CPUs.
+         */
+        ldr     r8, =OMAP44XX_SAR_RAM_BASE
+        ldr     r9, [r8, #OMAP_TYPE_OFFSET]
+        cmp     r9, #0x1                        @ Skip if GP device
+        bne     skip_ns_smp_enable
+        mrc     p15, 0, r0, c0, c0, 5
+        ands    r0, r0, #0x0f
+        beq     skip_ns_smp_enable
+ppa_actrl_retry:
+        mov     r0, #OMAP4_PPA_CPU_ACTRL_SMP_INDEX
+        adr     r3, ppa_zero_params             @ Pointer to parameters
+        mov     r1, #0x0                        @ Process ID
+        mov     r2, #0x4                        @ Flag
+        mov     r6, #0xff
+        mov     r12, #0x00                      @ Secure Service ID
+        DO_SMC
+        cmp     r0, #0x0                        @ API returns 0 on success.
+        beq     enable_smp_bit
+        b       ppa_actrl_retry
+enable_smp_bit:
+        mrc     p15, 0, r0, c1, c0, 1
+        tst     r0, #(1 << 6)                   @ Check SMP bit enabled?
+        orreq   r0, r0, #(1 << 6)
+        mcreq   p15, 0, r0, c1, c0, 1
+        isb
+skip_ns_smp_enable:
+#ifdef CONFIG_CACHE_L2X0
+        /*
+         * Restore the L2 AUXCTRL and enable the L2 cache.
+         * OMAP4_MON_L2X0_AUXCTRL_INDEX =  Program the L2X0 AUXCTRL
+         * OMAP4_MON_L2X0_CTRL_INDEX =  Enable the L2 using L2X0 CTRL
+         * register r0 contains value to be programmed.
+         * L2 cache is already invalidate by ROM code as part
+         * of MPUSS OFF wakeup path.
+         */
+        ldr     r2, =OMAP44XX_L2CACHE_BASE
+        ldr     r0, [r2, #L2X0_CTRL]
+        and     r0, #0x0f
+        cmp     r0, #1
+        beq     skip_l2en                       @ Skip if already enabled
+        ldr     r3, =OMAP44XX_SAR_RAM_BASE
+        ldr     r1, [r3, #OMAP_TYPE_OFFSET]
+        cmp     r1, #0x1                        @ Check for HS device
+        bne     set_gp_por
+        ldr     r0, =OMAP4_PPA_L2_POR_INDEX
+        ldr     r1, =OMAP44XX_SAR_RAM_BASE
+        ldr     r4, [r1, #L2X0_PREFETCH_CTRL_OFFSET]
+        adr     r3, ppa_por_params
+        str     r4, [r3, #0x04]
+        mov     r1, #0x0                        @ Process ID
+        mov     r2, #0x4                        @ Flag
+        mov     r6, #0xff
+        mov     r12, #0x00                      @ Secure Service ID
+        DO_SMC
+        b       set_aux_ctrl
+set_gp_por:
+        ldr     r1, =OMAP44XX_SAR_RAM_BASE
+        ldr     r0, [r1, #L2X0_PREFETCH_CTRL_OFFSET]
+        ldr     r12, =OMAP4_MON_L2X0_PREFETCH_INDEX     @ Setup L2 PREFETCH
+        DO_SMC
+set_aux_ctrl:
+        ldr     r1, =OMAP44XX_SAR_RAM_BASE
+        ldr     r0, [r1, #L2X0_AUXCTRL_OFFSET]
+        ldr     r12, =OMAP4_MON_L2X0_AUXCTRL_INDEX      @ Setup L2 AUXCTRL
+        DO_SMC
+        mov     r0, #0x1
+        ldr     r12, =OMAP4_MON_L2X0_CTRL_INDEX         @ Enable L2 cache
+        DO_SMC
+skip_l2en:
+#endif
+
+        b       cpu_resume                      @ Jump to generic resume
+ENDPROC(omap4_cpu_resume)
+#endif
+
+#ifndef CONFIG_OMAP4_ERRATA_I688
+ENTRY(omap_bus_sync)
+        mov     pc, lr
+ENDPROC(omap_bus_sync)
+#endif
+
+ENTRY(omap_do_wfi)
+        stmfd   sp!, {lr}
+        /* Drain interconnect write buffers. */
+        bl omap_bus_sync
+
+        /*
+         * Execute an ISB instruction to ensure that all of the
+         * CP15 register changes have been committed.
+         */
+        isb
+
+        /*
+         * Execute a barrier instruction to ensure that all cache,
+         * TLB and branch predictor maintenance operations issued
+         * by any CPU in the cluster have completed.
+         */
+        dsb
+        dmb
+
+        /*
+         * Execute a WFI instruction and wait until the
+         * STANDBYWFI output is asserted to indicate that the
+         * CPU is in idle and low power state. CPU can specualatively
+         * prefetch the instructions so add NOPs after WFI. Sixteen
+         * NOPs as per Cortex-A9 pipeline.
+         */
+        wfi                                     @ Wait For Interrupt
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+        nop
+
+        ldmfd   sp!, {pc}
+ENDPROC(omap_do_wfi)
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 89ae29847c59..771dc781b746 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -28,51 +28,28 @@
 #include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <plat/usb.h>
+#include <plat/omap_device.h>
 
 #include "mux.h"
 
 #ifdef CONFIG_MFD_OMAP_USB_HOST
 
-#define OMAP_USBHS_DEVICE       "usbhs-omap"
-
-static struct resource usbhs_resources[] = {
-        {
-                .name   = "uhh",
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .name   = "tll",
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .name   = "ehci",
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .name   = "ehci-irq",
-                .flags  = IORESOURCE_IRQ,
-        },
-        {
-                .name   = "ohci",
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .name   = "ohci-irq",
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
-static struct platform_device usbhs_device = {
-        .name           = OMAP_USBHS_DEVICE,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(usbhs_resources),
-        .resource       = usbhs_resources,
-};
+#define OMAP_USBHS_DEVICE       "usbhs_omap"
+#define USBHS_UHH_HWMODNAME     "usb_host_hs"
+#define USBHS_TLL_HWMODNAME     "usb_tll_hs"
 
 static struct usbhs_omap_platform_data          usbhs_data;
 static struct ehci_hcd_omap_platform_data       ehci_data;
 static struct ohci_hcd_omap_platform_data       ohci_data;
 
+static struct omap_device_pm_latency omap_uhhtll_latency[] = {
+          {
+                .deactivate_func = omap_device_idle_hwmods,
+                .activate_func   = omap_device_enable_hwmods,
+                .flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
+          },
+};
+
 /* MUX settings for EHCI pins */
 /*
  * setup_ehci_io_mux - initialize IO pad mux for USBHOST
@@ -508,7 +485,10 @@ static void setup_4430ohci_io_mux(const enum usbhs_omap_port_mode *port_mode)
 
 void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
 {
-        int     i;
+        struct omap_hwmod       *oh[2];
+        struct omap_device      *od;
+        int                     bus_id = -1;
+        int                     i;
 
         for (i = 0; i < OMAP3_HS_USB_PORTS; i++) {
                 usbhs_data.port_mode[i] = pdata->port_mode[i];
@@ -523,44 +503,34 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
         usbhs_data.ohci_data = &ohci_data;
 
         if (cpu_is_omap34xx()) {
-                usbhs_resources[0].start = OMAP34XX_UHH_CONFIG_BASE;
-                usbhs_resources[0].end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1;
-                usbhs_resources[1].start = OMAP34XX_USBTLL_BASE;
-                usbhs_resources[1].end = OMAP34XX_USBTLL_BASE + SZ_4K - 1;
-                usbhs_resources[2].start        = OMAP34XX_EHCI_BASE;
-                usbhs_resources[2].end  = OMAP34XX_EHCI_BASE + SZ_1K - 1;
-                usbhs_resources[3].start = INT_34XX_EHCI_IRQ;
-                usbhs_resources[4].start        = OMAP34XX_OHCI_BASE;
-                usbhs_resources[4].end  = OMAP34XX_OHCI_BASE + SZ_1K - 1;
-                usbhs_resources[5].start = INT_34XX_OHCI_IRQ;
                 setup_ehci_io_mux(pdata->port_mode);
                 setup_ohci_io_mux(pdata->port_mode);
         } else if (cpu_is_omap44xx()) {
-                usbhs_resources[0].start = OMAP44XX_UHH_CONFIG_BASE;
-                usbhs_resources[0].end = OMAP44XX_UHH_CONFIG_BASE + SZ_1K - 1;
-                usbhs_resources[1].start = OMAP44XX_USBTLL_BASE;
-                usbhs_resources[1].end = OMAP44XX_USBTLL_BASE + SZ_4K - 1;
-                usbhs_resources[2].start = OMAP44XX_HSUSB_EHCI_BASE;
-                usbhs_resources[2].end = OMAP44XX_HSUSB_EHCI_BASE + SZ_1K - 1;
-                usbhs_resources[3].start = OMAP44XX_IRQ_EHCI;
-                usbhs_resources[4].start = OMAP44XX_HSUSB_OHCI_BASE;
-                usbhs_resources[4].end = OMAP44XX_HSUSB_OHCI_BASE + SZ_1K - 1;
-                usbhs_resources[5].start = OMAP44XX_IRQ_OHCI;
                 setup_4430ehci_io_mux(pdata->port_mode);
                 setup_4430ohci_io_mux(pdata->port_mode);
         }
 
-        if (platform_device_add_data(&usbhs_device,
-                                &usbhs_data, sizeof(usbhs_data)) < 0) {
-                printk(KERN_ERR "USBHS platform_device_add_data failed\n");
-                goto init_end;
+        oh[0] = omap_hwmod_lookup(USBHS_UHH_HWMODNAME);
+        if (!oh[0]) {
+                pr_err("Could not look up %s\n", USBHS_UHH_HWMODNAME);
+                return;
         }
 
-        if (platform_device_register(&usbhs_device) < 0)
-                printk(KERN_ERR "USBHS platform_device_register failed\n");
+        oh[1] = omap_hwmod_lookup(USBHS_TLL_HWMODNAME);
+        if (!oh[1]) {
+                pr_err("Could not look up %s\n", USBHS_TLL_HWMODNAME);
+                return;
+        }
 
-init_end:
-        return;
+        od = omap_device_build_ss(OMAP_USBHS_DEVICE, bus_id, oh, 2,
+                                (void *)&usbhs_data, sizeof(usbhs_data),
+                                omap_uhhtll_latency,
+                                ARRAY_SIZE(omap_uhhtll_latency), false);
+        if (IS_ERR(od)) {
+                pr_err("Could not build hwmod devices %s,%s\n",
+                        USBHS_UHH_HWMODNAME, USBHS_TLL_HWMODNAME);
+                return;
+        }
 }
 
 #else
@@ -570,5 +540,3 @@ void __init usbhs_init(const struct usbhs_omap_board_data *pdata)
 }
 
 #endif
-
-
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 267975086a7b..8d5ed775dd56 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -93,6 +93,9 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
         if (cpu_is_omap3517() || cpu_is_omap3505()) {
                 oh_name = "am35x_otg_hs";
                 name = "musb-am35x";
+        } else if (cpu_is_ti81xx()) {
+                oh_name = "usb_otg_hs";
+                name = "musb-ti81xx";
         } else {
                 oh_name = "usb_otg_hs";
                 name = "musb-omap2430";
diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index 474559d5b072..c005e2f5e383 100644
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -31,6 +31,14 @@
  * VDD data
  */
 
+/* OMAP3-common voltagedomain data */
+
+static struct voltagedomain omap3_voltdm_wkup = {
+        .name = "wakeup",
+};
+
+/* 34xx/36xx voltagedomain data */
+
 static const struct omap_vfsm_instance omap3_vdd1_vfsm = {
         .voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET,
         .voltsetup_mask = OMAP3430_SETUP_TIME1_MASK,
@@ -63,10 +71,6 @@ static struct voltagedomain omap3_voltdm_core = {
         .vp = &omap3_vp_core,
 };
 
-static struct voltagedomain omap3_voltdm_wkup = {
-        .name = "wakeup",
-};
-
 static struct voltagedomain *voltagedomains_omap3[] __initdata = {
         &omap3_voltdm_mpu,
         &omap3_voltdm_core,
@@ -74,11 +78,30 @@ static struct voltagedomain *voltagedomains_omap3[] __initdata = {
         NULL,
 };
 
+/* AM35xx voltagedomain data */
+
+static struct voltagedomain am35xx_voltdm_mpu = {
+        .name = "mpu_iva",
+};
+
+static struct voltagedomain am35xx_voltdm_core = {
+        .name = "core",
+};
+
+static struct voltagedomain *voltagedomains_am35xx[] __initdata = {
+        &am35xx_voltdm_mpu,
+        &am35xx_voltdm_core,
+        &omap3_voltdm_wkup,
+        NULL,
+};
+
+
 static const char *sys_clk_name __initdata = "sys_ck";
 
 void __init omap3xxx_voltagedomains_init(void)
 {
         struct voltagedomain *voltdm;
+        struct voltagedomain **voltdms;
         int i;
 
         /*
@@ -93,8 +116,13 @@ void __init omap3xxx_voltagedomains_init(void)
                 omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
         }
 
-        for (i = 0; voltdm = voltagedomains_omap3[i], voltdm; i++)
+        if (cpu_is_omap3517() || cpu_is_omap3505())
+                voltdms = voltagedomains_am35xx;
+        else
+                voltdms = voltagedomains_omap3;
+
+        for (i = 0; voltdm = voltdms[i], voltdm; i++)
                 voltdm->sys_clk.name = sys_clk_name;
 
-        voltdm_init(voltagedomains_omap3);
+        voltdm_init(voltdms);
 };
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 5ceafdccc456..3638e5c12b7e 100644
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -14,8 +14,8 @@
 #include <linux/init.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
-#include <linux/errno.h>
 #include <mach/hardware.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*
@@ -41,7 +41,6 @@
 /*
  * Generic Address Decode Windows bit settings
  */
-#define TARGET_DDR              0
 #define TARGET_DEV_BUS          1
 #define TARGET_PCI              3
 #define TARGET_PCIE             4
@@ -57,27 +56,10 @@
 #define ATTR_DEV_BOOT           0xf
 #define ATTR_SRAM               0x0
 
-/*
- * Helpers to get DDR bank info
- */
-#define ORION5X_DDR_REG(x)      (ORION5X_DDR_VIRT_BASE | (x))
-#define DDR_BASE_CS(n)          ORION5X_DDR_REG(0x1500 + ((n) << 3))
-#define DDR_SIZE_CS(n)          ORION5X_DDR_REG(0x1504 + ((n) << 3))
-
-/*
- * CPU Address Decode Windows registers
- */
-#define ORION5X_BRIDGE_REG(x)   (ORION5X_BRIDGE_VIRT_BASE | (x))
-#define CPU_WIN_CTRL(n)         ORION5X_BRIDGE_REG(0x000 | ((n) << 4))
-#define CPU_WIN_BASE(n)         ORION5X_BRIDGE_REG(0x004 | ((n) << 4))
-#define CPU_WIN_REMAP_LO(n)     ORION5X_BRIDGE_REG(0x008 | ((n) << 4))
-#define CPU_WIN_REMAP_HI(n)     ORION5X_BRIDGE_REG(0x00c | ((n) << 4))
-
-
-struct mbus_dram_target_info orion5x_mbus_dram_info;
 static int __initdata win_alloc_count;
 
-static int __init orion5x_cpu_win_can_remap(int win)
+static int __init cpu_win_can_remap(const struct orion_addr_map_cfg *cfg,
+                  const int win)
 {
         u32 dev, rev;
 
@@ -91,116 +73,82 @@ static int __init orion5x_cpu_win_can_remap(int win)
         return 0;
 }
 
-static int __init setup_cpu_win(int win, u32 base, u32 size,
-                                 u8 target, u8 attr, int remap)
-{
-        if (win >= 8) {
-                printk(KERN_ERR "setup_cpu_win: trying to allocate "
-                                "window %d\n", win);
-                return -ENOSPC;
-        }
-
-        writel(base & 0xffff0000, CPU_WIN_BASE(win));
-        writel(((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1,
-                CPU_WIN_CTRL(win));
-
-        if (orion5x_cpu_win_can_remap(win)) {
-                if (remap < 0)
-                        remap = base;
-
-                writel(remap & 0xffff0000, CPU_WIN_REMAP_LO(win));
-                writel(0, CPU_WIN_REMAP_HI(win));
-        }
-        return 0;
-}
-
-void __init orion5x_setup_cpu_mbus_bridge(void)
-{
-        int i;
-        int cs;
+/*
+ * Description of the windows needed by the platform code
+ */
+static struct __initdata orion_addr_map_cfg addr_map_cfg = {
+        .num_wins = 8,
+        .cpu_win_can_remap = cpu_win_can_remap,
+        .bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE,
+};
 
+static const struct __initdata orion_addr_map_info addr_map_info[] = {
         /*
-         * First, disable and clear windows.
+         * Setup windows for PCI+PCIe IO+MEM space.
          */
-        for (i = 0; i < 8; i++) {
-                writel(0, CPU_WIN_BASE(i));
-                writel(0, CPU_WIN_CTRL(i));
-                if (orion5x_cpu_win_can_remap(i)) {
-                        writel(0, CPU_WIN_REMAP_LO(i));
-                        writel(0, CPU_WIN_REMAP_HI(i));
-                }
-        }
+        { 0, ORION5X_PCIE_IO_PHYS_BASE, ORION5X_PCIE_IO_SIZE,
+          TARGET_PCIE, ATTR_PCIE_IO, ORION5X_PCIE_IO_BUS_BASE
+        },
+        { 1, ORION5X_PCI_IO_PHYS_BASE, ORION5X_PCI_IO_SIZE,
+          TARGET_PCI, ATTR_PCI_IO, ORION5X_PCI_IO_BUS_BASE
+        },
+        { 2, ORION5X_PCIE_MEM_PHYS_BASE, ORION5X_PCIE_MEM_SIZE,
+          TARGET_PCIE, ATTR_PCIE_MEM, -1
+        },
+        { 3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE,
+          TARGET_PCI, ATTR_PCI_MEM, -1
+        },
+        /* End marker */
+        { -1, 0, 0, 0, 0, 0 }
+};
 
+void __init orion5x_setup_cpu_mbus_bridge(void)
+{
         /*
-         * Setup windows for PCI+PCIe IO+MEM space.
+         * Disable, clear and configure windows.
          */
-        setup_cpu_win(0, ORION5X_PCIE_IO_PHYS_BASE, ORION5X_PCIE_IO_SIZE,
-                TARGET_PCIE, ATTR_PCIE_IO, ORION5X_PCIE_IO_BUS_BASE);
-        setup_cpu_win(1, ORION5X_PCI_IO_PHYS_BASE, ORION5X_PCI_IO_SIZE,
-                TARGET_PCI, ATTR_PCI_IO, ORION5X_PCI_IO_BUS_BASE);
-        setup_cpu_win(2, ORION5X_PCIE_MEM_PHYS_BASE, ORION5X_PCIE_MEM_SIZE,
-                TARGET_PCIE, ATTR_PCIE_MEM, -1);
-        setup_cpu_win(3, ORION5X_PCI_MEM_PHYS_BASE, ORION5X_PCI_MEM_SIZE,
-                TARGET_PCI, ATTR_PCI_MEM, -1);
+        orion_config_wins(&addr_map_cfg, addr_map_info);
         win_alloc_count = 4;
 
         /*
          * Setup MBUS dram target info.
          */
-        orion5x_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
-
-        for (i = 0, cs = 0; i < 4; i++) {
-                u32 base = readl(DDR_BASE_CS(i));
-                u32 size = readl(DDR_SIZE_CS(i));
-
-                /*
-                 * Chip select enabled?
-                 */
-                if (size & 1) {
-                        struct mbus_dram_window *w;
-
-                        w = &orion5x_mbus_dram_info.cs[cs++];
-                        w->cs_index = i;
-                        w->mbus_attr = 0xf & ~(1 << i);
-                        w->base = base & 0xffff0000;
-                        w->size = (size | 0x0000ffff) + 1;
-                }
-        }
-        orion5x_mbus_dram_info.num_cs = cs;
+        orion_setup_cpu_mbus_target(&addr_map_cfg, ORION5X_DDR_WINDOW_CPU_BASE);
 }
 
 void __init orion5x_setup_dev_boot_win(u32 base, u32 size)
 {
-        setup_cpu_win(win_alloc_count++, base, size,
-                      TARGET_DEV_BUS, ATTR_DEV_BOOT, -1);
+        orion_setup_cpu_win(&addr_map_cfg, win_alloc_count++, base, size,
+                            TARGET_DEV_BUS, ATTR_DEV_BOOT, -1);
 }
 
 void __init orion5x_setup_dev0_win(u32 base, u32 size)
 {
-        setup_cpu_win(win_alloc_count++, base, size,
-                      TARGET_DEV_BUS, ATTR_DEV_CS0, -1);
+        orion_setup_cpu_win(&addr_map_cfg, win_alloc_count++, base, size,
+                            TARGET_DEV_BUS, ATTR_DEV_CS0, -1);
 }
 
 void __init orion5x_setup_dev1_win(u32 base, u32 size)
 {
-        setup_cpu_win(win_alloc_count++, base, size,
-                      TARGET_DEV_BUS, ATTR_DEV_CS1, -1);
+        orion_setup_cpu_win(&addr_map_cfg, win_alloc_count++, base, size,
+                            TARGET_DEV_BUS, ATTR_DEV_CS1, -1);
 }
 
 void __init orion5x_setup_dev2_win(u32 base, u32 size)
 {
-        setup_cpu_win(win_alloc_count++, base, size,
-                      TARGET_DEV_BUS, ATTR_DEV_CS2, -1);
+        orion_setup_cpu_win(&addr_map_cfg, win_alloc_count++, base, size,
+                            TARGET_DEV_BUS, ATTR_DEV_CS2, -1);
 }
 
 void __init orion5x_setup_pcie_wa_win(u32 base, u32 size)
 {
-        setup_cpu_win(win_alloc_count++, base, size,
-                      TARGET_PCIE, ATTR_PCIE_WA, -1);
+        orion_setup_cpu_win(&addr_map_cfg, win_alloc_count++, base, size,
+                            TARGET_PCIE, ATTR_PCIE_WA, -1);
 }
 
-int __init orion5x_setup_sram_win(void)
+void __init orion5x_setup_sram_win(void)
 {
-        return setup_cpu_win(win_alloc_count++, ORION5X_SRAM_PHYS_BASE,
-                        ORION5X_SRAM_SIZE, TARGET_SRAM, ATTR_SRAM, -1);
+        orion_setup_cpu_win(&addr_map_cfg, win_alloc_count++,
+                            ORION5X_SRAM_PHYS_BASE, ORION5X_SRAM_SIZE,
+                            TARGET_SRAM, ATTR_SRAM, -1);
 }
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 41127e80cc1e..0e28bae20bd4 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -15,7 +15,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/serial_8250.h>
-#include <linux/mbus.h>
 #include <linux/mv643xx_i2c.h>
 #include <linux/ata_platform.h>
 #include <linux/delay.h>
@@ -32,6 +31,7 @@
 #include <plat/orion_nand.h>
 #include <plat/time.h>
 #include <plat/common.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*****************************************************************************
@@ -72,8 +72,7 @@ void __init orion5x_map_io(void)
  ****************************************************************************/
 void __init orion5x_ehci0_init(void)
 {
-        orion_ehci_init(&orion5x_mbus_dram_info,
-                        ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
+        orion_ehci_init(ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
 }
 
 
@@ -82,8 +81,7 @@ void __init orion5x_ehci0_init(void)
  ****************************************************************************/
 void __init orion5x_ehci1_init(void)
 {
-        orion_ehci_1_init(&orion5x_mbus_dram_info,
-                          ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);
+        orion_ehci_1_init(ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);
 }
 
 
@@ -92,7 +90,7 @@ void __init orion5x_ehci1_init(void)
  ****************************************************************************/
 void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        orion_ge00_init(eth_data, &orion5x_mbus_dram_info,
+        orion_ge00_init(eth_data,
                         ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,
                         IRQ_ORION5X_ETH_ERR, orion5x_tclk);
 }
@@ -122,8 +120,7 @@ void __init orion5x_i2c_init(void)
  ****************************************************************************/
 void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)
 {
-        orion_sata_init(sata_data, &orion5x_mbus_dram_info,
-                        ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);
+        orion_sata_init(sata_data, ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);
 }
 
 
@@ -159,8 +156,7 @@ void __init orion5x_uart1_init(void)
  ****************************************************************************/
 void __init orion5x_xor_init(void)
 {
-        orion_xor0_init(&orion5x_mbus_dram_info,
-                        ORION5X_XOR_PHYS_BASE,
+        orion_xor0_init(ORION5X_XOR_PHYS_BASE,
                         ORION5X_XOR_PHYS_BASE + 0x200,
                         IRQ_ORION5X_XOR0, IRQ_ORION5X_XOR1);
 }
@@ -170,12 +166,7 @@ void __init orion5x_xor_init(void)
  ****************************************************************************/
 static void __init orion5x_crypto_init(void)
 {
-        int ret;
-
-        ret = orion5x_setup_sram_win();
-        if (ret)
-                return;
-
+        orion5x_setup_sram_win();
         orion_crypto_init(ORION5X_CRYPTO_PHYS_BASE, ORION5X_SRAM_PHYS_BASE,
                           SZ_8K, IRQ_ORION5X_CESA);
 }
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
index 37ef18de61b7..d2513ac79ff5 100644
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -20,14 +20,13 @@ extern struct sys_timer orion5x_timer;
  * functions to map its interfaces and by the machine-setup to map its on-
  * board devices. Details in /mach-orion/addr-map.c
  */
-extern struct mbus_dram_target_info orion5x_mbus_dram_info;
 void orion5x_setup_cpu_mbus_bridge(void);
 void orion5x_setup_dev_boot_win(u32 base, u32 size);
 void orion5x_setup_dev0_win(u32 base, u32 size);
 void orion5x_setup_dev1_win(u32 base, u32 size);
 void orion5x_setup_dev2_win(u32 base, u32 size);
 void orion5x_setup_pcie_wa_win(u32 base, u32 size);
-int orion5x_setup_sram_win(void);
+void orion5x_setup_sram_win(void);
 
 void orion5x_ehci0_init(void);
 void orion5x_ehci1_init(void);
diff --git a/arch/arm/mach-orion5x/include/mach/orion5x.h b/arch/arm/mach-orion5x/include/mach/orion5x.h
index 0a28bbc76891..2745f5d95b3f 100644
--- a/arch/arm/mach-orion5x/include/mach/orion5x.h
+++ b/arch/arm/mach-orion5x/include/mach/orion5x.h
@@ -69,7 +69,7 @@
  ******************************************************************************/
 
 #define ORION5X_DDR_VIRT_BASE           (ORION5X_REGS_VIRT_BASE | 0x00000)
-
+#define  ORION5X_DDR_WINDOW_CPU_BASE    (ORION5X_DDR_VIRT_BASE | 0x1500)
 #define ORION5X_DEV_BUS_PHYS_BASE       (ORION5X_REGS_PHYS_BASE | 0x10000)
 #define ORION5X_DEV_BUS_VIRT_BASE       (ORION5X_REGS_VIRT_BASE | 0x10000)
 #define ORION5X_DEV_BUS_REG(x)          (ORION5X_DEV_BUS_VIRT_BASE | (x))
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c
index b6ddd7a5db6a..5b70026f478c 100644
--- a/arch/arm/mach-orion5x/mpp.c
+++ b/arch/arm/mach-orion5x/mpp.c
@@ -10,7 +10,6 @@
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/mbus.h>
 #include <linux/io.h>
 #include <mach/hardware.h>
 #include <plat/mpp.h>
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index bc4a920e26ee..a494c470e3e4 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -18,6 +18,7 @@
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
 #include <plat/pcie.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 /*****************************************************************************
@@ -145,7 +146,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
         /*
          * Generic PCIe unit setup.
          */
-        orion_pcie_setup(PCIE_BASE, &orion5x_mbus_dram_info);
+        orion_pcie_setup(PCIE_BASE);
 
         /*
          * Check whether to apply Orion-1/Orion-NAS PCIe config
@@ -477,7 +478,7 @@ static int __init pci_setup(struct pci_sys_data *sys)
         /*
          * Point PCI unit MBUS decode windows to DRAM space.
          */
-        orion5x_setup_pci_wins(&orion5x_mbus_dram_info);
+        orion5x_setup_pci_wins(&orion_mbus_dram_info);
 
         /*
          * Master + Slave enable
diff --git a/arch/arm/mach-picoxcell/Makefile b/arch/arm/mach-picoxcell/Makefile
index c550b6363488..e5ec4a8d9bcb 100644
--- a/arch/arm/mach-picoxcell/Makefile
+++ b/arch/arm/mach-picoxcell/Makefile
@@ -1,3 +1,2 @@
 obj-y   := common.o
 obj-y   += time.o
-obj-y   += io.o
diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index ad871bd7b1ab..a2e8ae8b5821 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -7,6 +7,7 @@
  *
  * All enquiries to support@picochip.com
  */
+#include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/of.h>
@@ -16,15 +17,49 @@
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/vic.h>
+#include <asm/mach/map.h>
 
 #include <mach/map.h>
 #include <mach/picoxcell_soc.h>
 
 #include "common.h"
 
+#define WDT_CTRL_REG_EN_MASK    (1 << 0)
+#define WDT_CTRL_REG_OFFS       (0x00)
+#define WDT_TIMEOUT_REG_OFFS    (0x04)
+static void __iomem *wdt_regs;
+
+/*
+ * The machine restart method can be called from an atomic context so we won't
+ * be able to ioremap the regs then.
+ */
+static void picoxcell_setup_restart(void)
+{
+        struct device_node *np = of_find_compatible_node(NULL, NULL,
+                                                         "snps,dw-apb-wdg");
+        if (WARN(!np, "unable to setup watchdog restart"))
+                return;
+
+        wdt_regs = of_iomap(np, 0);
+        WARN(!wdt_regs, "failed to remap watchdog regs");
+}
+
+static struct map_desc io_map __initdata = {
+        .virtual        = PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
+        .pfn            = __phys_to_pfn(PICOXCELL_PERIPH_BASE),
+        .length         = PICOXCELL_PERIPH_LENGTH,
+        .type           = MT_DEVICE,
+};
+
+static void __init picoxcell_map_io(void)
+{
+        iotable_init(&io_map, 1);
+}
+
 static void __init picoxcell_init_machine(void)
 {
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+        picoxcell_setup_restart();
 }
 
 static const char *picoxcell_dt_match[] = {
@@ -43,12 +78,27 @@ static void __init picoxcell_init_irq(void)
         of_irq_init(vic_of_match);
 }
 
+static void picoxcell_wdt_restart(char mode, const char *cmd)
+{
+        /*
+         * Configure the watchdog to reset with the shortest possible timeout
+         * and give it chance to do the reset.
+         */
+        if (wdt_regs) {
+                writel_relaxed(WDT_CTRL_REG_EN_MASK, wdt_regs + WDT_CTRL_REG_OFFS);
+                writel_relaxed(0, wdt_regs + WDT_TIMEOUT_REG_OFFS);
+                /* No sleeping, possibly atomic. */
+                mdelay(500);
+        }
+}
+
 DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
         .map_io         = picoxcell_map_io,
-        .nr_irqs        = ARCH_NR_IRQS,
+        .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = picoxcell_init_irq,
         .handle_irq     = vic_handle_irq,
         .timer          = &picoxcell_timer,
         .init_machine   = picoxcell_init_machine,
         .dt_compat      = picoxcell_dt_match,
+        .restart        = picoxcell_wdt_restart,
 MACHINE_END
diff --git a/arch/arm/mach-picoxcell/common.h b/arch/arm/mach-picoxcell/common.h
index 5263f0fa095c..83d55ab956a4 100644
--- a/arch/arm/mach-picoxcell/common.h
+++ b/arch/arm/mach-picoxcell/common.h
@@ -13,6 +13,5 @@
 #include <asm/mach/time.h>
 
 extern struct sys_timer picoxcell_timer;
-extern void picoxcell_map_io(void);
 
 #endif /* __PICOXCELL_COMMON_H__ */
diff --git a/arch/arm/mach-picoxcell/include/mach/irqs.h b/arch/arm/mach-picoxcell/include/mach/irqs.h
index 4d13ed970919..59eac1ee2820 100644
--- a/arch/arm/mach-picoxcell/include/mach/irqs.h
+++ b/arch/arm/mach-picoxcell/include/mach/irqs.h
@@ -1,8 +1,6 @@
 /*
  * Copyright (c) 2011 Picochip Ltd., Jamie Iles
  *
- * This file contains the hardware definitions of the picoXcell SoC devices.
- *
  * 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
@@ -16,10 +14,7 @@
 #ifndef __MACH_IRQS_H
 #define __MACH_IRQS_H
 
-#define ARCH_NR_IRQS                    64
-#define NR_IRQS                         (128 + ARCH_NR_IRQS)
-
-#define IRQ_VIC0_BASE                   0
-#define IRQ_VIC1_BASE                   32
+/* We dynamically allocate our irq_desc's. */
+#define NR_IRQS                         0
 
 #endif /* __MACH_IRQS_H */
diff --git a/arch/arm/mach-picoxcell/include/mach/memory.h b/arch/arm/mach-picoxcell/include/mach/memory.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/arch/arm/mach-picoxcell/include/mach/memory.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/arch/arm/mach-picoxcell/io.c b/arch/arm/mach-picoxcell/io.c
deleted file mode 100644
index 39e9b9e8cc37..000000000000
--- a/arch/arm/mach-picoxcell/io.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2011 Picochip Ltd., Jamie Iles
- *
- * 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.
- *
- * All enquiries to support@picochip.com
- */
-#include <linux/io.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/of.h>
-
-#include <asm/mach/map.h>
-
-#include <mach/map.h>
-#include <mach/picoxcell_soc.h>
-
-#include "common.h"
-
-void __init picoxcell_map_io(void)
-{
-        struct map_desc io_map = {
-                .virtual        = PHYS_TO_IO(PICOXCELL_PERIPH_BASE),
-                .pfn            = __phys_to_pfn(PICOXCELL_PERIPH_BASE),
-                .length         = PICOXCELL_PERIPH_LENGTH,
-                .type           = MT_DEVICE,
-        };
-
-        iotable_init(&io_map, 1);
-}
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
index 4cb069fd9af2..ccdac4b6a469 100644
--- a/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@ -138,7 +138,7 @@ static void am200_cleanup(struct metronomefb_par *par)
 {
         int i;
 
-        free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);
+        free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);
 
         for (i = 0; i < ARRAY_SIZE(gpios); i++)
                 gpio_free(gpios[i]);
@@ -292,7 +292,7 @@ static int am200_setup_irq(struct fb_info *info)
 {
         int ret;
 
-        ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,
+        ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am200_handle_irq,
                                 IRQF_DISABLED|IRQF_TRIGGER_FALLING,
                                 "AM200", info->par);
         if (ret)
diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c
index fa8bad235d9f..76c4b9494031 100644
--- a/arch/arm/mach-pxa/am300epd.c
+++ b/arch/arm/mach-pxa/am300epd.c
@@ -176,7 +176,7 @@ static void am300_cleanup(struct broadsheetfb_par *par)
 {
         int i;
 
-        free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);
+        free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);
 
         for (i = 0; i < ARRAY_SIZE(gpios); i++)
                 gpio_free(gpios[i]);
@@ -240,7 +240,7 @@ static int am300_setup_irq(struct fb_info *info)
         int ret;
         struct broadsheetfb_par *par = info->par;
 
-        ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am300_handle_irq,
+        ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am300_handle_irq,
                                 IRQF_DISABLED|IRQF_TRIGGER_RISING,
                                 "AM300", par);
         if (ret)
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 82514f5c38f1..c35456f02acb 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -13,6 +13,7 @@
  *  published by the Free Software Foundation.
  */
 
+#include <linux/export.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
@@ -179,7 +180,7 @@ static unsigned long balloon3_ac97_pin_config[] __initdata = {
 };
 
 static struct ucb1400_pdata vpac270_ucb1400_pdata = {
-        .irq            = IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ),
+        .irq            = PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ),
 };
 
 
diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c
index c2f0be040d27..c91727d1fe09 100644
--- a/arch/arm/mach-pxa/capc7117.c
+++ b/arch/arm/mach-pxa/capc7117.c
@@ -50,8 +50,8 @@ static struct resource capc7117_ide_resources[] = {
                .flags = IORESOURCE_MEM
         },
         [2] = {
-               .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO76)),
-               .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO76)),
+               .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO76)),
+               .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO76)),
                .flags = IORESOURCE_IRQ | IRQF_TRIGGER_RISING
         }
 };
@@ -80,7 +80,7 @@ static void __init capc7117_ide_init(void)
 static struct plat_serial8250_port ti16c752_platform_data[] = {
         [0] = {
                .mapbase = 0x14000000,
-               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO78)),
+               .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO78)),
                .irqflags = IRQF_TRIGGER_RISING,
                .flags = TI16C752_FLAGS,
                .iotype = UPIO_MEM,
@@ -89,7 +89,7 @@ static struct plat_serial8250_port ti16c752_platform_data[] = {
         },
         [1] = {
                .mapbase = 0x14000040,
-               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO79)),
+               .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO79)),
                .irqflags = IRQF_TRIGGER_RISING,
                .flags = TI16C752_FLAGS,
                .iotype = UPIO_MEM,
@@ -98,7 +98,7 @@ static struct plat_serial8250_port ti16c752_platform_data[] = {
         },
         [2] = {
                .mapbase = 0x14000080,
-               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO80)),
+               .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO80)),
                .irqflags = IRQF_TRIGGER_RISING,
                .flags = TI16C752_FLAGS,
                .iotype = UPIO_MEM,
@@ -107,7 +107,7 @@ static struct plat_serial8250_port ti16c752_platform_data[] = {
         },
         [3] = {
                .mapbase = 0x140000c0,
-               .irq = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO81)),
+               .irq = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO81)),
                .irqflags = IRQF_TRIGGER_RISING,
                .flags = TI16C752_FLAGS,
                .iotype = UPIO_MEM,
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index 13518a705399..431ef56700c4 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -33,7 +33,7 @@
 /* GPIO IRQ usage */
 #define GPIO83_MMC_IRQ          (83)
 
-#define CMX270_MMC_IRQ          IRQ_GPIO(GPIO83_MMC_IRQ)
+#define CMX270_MMC_IRQ          PXA_GPIO_TO_IRQ(GPIO83_MMC_IRQ)
 
 /* MMC power enable */
 #define GPIO105_MMC_POWER       (105)
@@ -380,7 +380,7 @@ static struct spi_board_info cm_x270_spi_devices[] __initdata = {
                 .modalias               = "libertas_spi",
                 .max_speed_hz           = 13000000,
                 .bus_num                = 2,
-                .irq                    = gpio_to_irq(95),
+                .irq                    = PXA_GPIO_TO_IRQ(95),
                 .chip_select            = 0,
                 .controller_data        = &cm_x270_libertas_chip,
                 .platform_data          = &cm_x270_libertas_pdata,
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index ec170a552c23..8fa4ad27edf3 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -58,8 +58,8 @@ extern void cmx270_init(void);
 #define CMX255_GPIO_IT8152_IRQ  (0)
 #define CMX270_GPIO_IT8152_IRQ  (22)
 
-#define CMX255_ETHIRQ           IRQ_GPIO(GPIO22_ETHIRQ)
-#define CMX270_ETHIRQ           IRQ_GPIO(GPIO10_ETHIRQ)
+#define CMX255_ETHIRQ           PXA_GPIO_TO_IRQ(GPIO22_ETHIRQ)
+#define CMX270_ETHIRQ           PXA_GPIO_TO_IRQ(GPIO10_ETHIRQ)
 
 #if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
 static struct resource cmx255_dm9000_resource[] = {
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 7236974da0b7..4b981b82d2a5 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -64,7 +64,7 @@
 #define GPIO82_MMC_IRQ          (82)
 #define GPIO85_MMC_WP           (85)
 
-#define CM_X300_MMC_IRQ         IRQ_GPIO(GPIO82_MMC_IRQ)
+#define CM_X300_MMC_IRQ         PXA_GPIO_TO_IRQ(GPIO82_MMC_IRQ)
 
 #define GPIO95_RTC_CS           (95)
 #define GPIO96_RTC_WR           (96)
@@ -229,8 +229,8 @@ static struct resource dm9000_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [2] = {
-                .start  = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO99)),
-                .end    = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO99)),
+                .start  = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO99)),
+                .end    = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO99)),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c
index 6a685165c9f2..29d5d541f602 100644
--- a/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/arch/arm/mach-pxa/colibri-pxa270.c
@@ -218,8 +218,8 @@ static struct resource colibri_pxa270_dm9000_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = gpio_to_irq(GPIO114_COLIBRI_PXA270_ETH_IRQ),
-                .end    = gpio_to_irq(GPIO114_COLIBRI_PXA270_ETH_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO114_COLIBRI_PXA270_ETH_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO114_COLIBRI_PXA270_ETH_IRQ),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_RISING,
         },
 };
@@ -249,7 +249,7 @@ static pxa2xx_audio_ops_t colibri_pxa270_ac97_pdata = {
 };
 
 static struct ucb1400_pdata colibri_pxa270_ucb1400_pdata = {
-        .irq            = gpio_to_irq(GPIO113_COLIBRI_PXA270_TS_IRQ),
+        .irq            = PXA_GPIO_TO_IRQ(GPIO113_COLIBRI_PXA270_TS_IRQ),
 };
 
 static struct platform_device colibri_pxa270_ucb1400_device = {
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c
index c01059a61f33..0846d210cb05 100644
--- a/arch/arm/mach-pxa/colibri-pxa300.c
+++ b/arch/arm/mach-pxa/colibri-pxa300.c
@@ -78,8 +78,8 @@ static struct resource colibri_asix_resource[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),
-                .end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),
+                .start = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),
+                .end   = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),
                 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
         }
 };
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c
index 5028f2300d50..6ad3359063af 100644
--- a/arch/arm/mach-pxa/colibri-pxa320.c
+++ b/arch/arm/mach-pxa/colibri-pxa320.c
@@ -115,8 +115,8 @@ static struct resource colibri_asix_resource[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),
-                .end   = gpio_to_irq(COLIBRI_ETH_IRQ_GPIO),
+                .start = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),
+                .end   = PXA_GPIO_TO_IRQ(COLIBRI_ETH_IRQ_GPIO),
                 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
         }
 };
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 9d4dc5970b9c..66600f05e436 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -531,7 +531,7 @@ static struct spi_board_info corgi_spi_devices[] = {
                 .chip_select    = 0,
                 .platform_data  = &corgi_ads7846_info,
                 .controller_data= &corgi_ads7846_chip,
-                .irq            = gpio_to_irq(CORGI_GPIO_TP_INT),
+                .irq            = PXA_GPIO_TO_IRQ(CORGI_GPIO_TP_INT),
         }, {
                 .modalias       = "corgi-lcd",
                 .max_speed_hz   = 50000,
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index 29034778bfda..39e265cfc86d 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/apm-emulation.h>
@@ -40,7 +41,9 @@ static struct gpio charger_gpios[] = {
         { CORGI_GPIO_ADC_TEMP_ON, GPIOF_OUT_INIT_LOW, "ADC Temp On" },
         { CORGI_GPIO_CHRG_ON,     GPIOF_OUT_INIT_LOW, "Charger On" },
         { CORGI_GPIO_CHRG_UKN,    GPIOF_OUT_INIT_LOW, "Charger Unknown" },
+        { CORGI_GPIO_AC_IN,       GPIOF_IN, "Charger Detection" },
         { CORGI_GPIO_KEY_INT,     GPIOF_IN, "Key Interrupt" },
+        { CORGI_GPIO_WAKEUP,      GPIOF_IN, "System wakeup notification" },
 };
 
 static void corgi_charger_init(void)
@@ -90,7 +93,12 @@ static int corgi_should_wakeup(unsigned int resume_on_alarm)
 {
         int is_resume = 0;
 
-        dev_dbg(sharpsl_pm.dev, "GPLR0 = %x,%x\n", GPLR0, PEDR);
+        dev_dbg(sharpsl_pm.dev, "PEDR = %x, GPIO_AC_IN = %d, "
+                "GPIO_CHRG_FULL = %d, GPIO_KEY_INT = %d, GPIO_WAKEUP = %d\n",
+                PEDR, gpio_get_value(CORGI_GPIO_AC_IN),
+                gpio_get_value(CORGI_GPIO_CHRG_FULL),
+                gpio_get_value(CORGI_GPIO_KEY_INT),
+                gpio_get_value(CORGI_GPIO_WAKEUP));
 
         if ((PEDR & GPIO_bit(CORGI_GPIO_AC_IN))) {
                 if (sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN)) {
@@ -124,14 +132,21 @@ static int corgi_should_wakeup(unsigned int resume_on_alarm)
 
 static unsigned long corgi_charger_wakeup(void)
 {
-        return ~GPLR0 & ( GPIO_bit(CORGI_GPIO_AC_IN) | GPIO_bit(CORGI_GPIO_KEY_INT) | GPIO_bit(CORGI_GPIO_WAKEUP) );
+        unsigned long ret;
+
+        ret = (!gpio_get_value(CORGI_GPIO_AC_IN) << GPIO_bit(CORGI_GPIO_AC_IN))
+                | (!gpio_get_value(CORGI_GPIO_KEY_INT)
+                << GPIO_bit(CORGI_GPIO_KEY_INT))
+                | (!gpio_get_value(CORGI_GPIO_WAKEUP)
+                << GPIO_bit(CORGI_GPIO_WAKEUP));
+        return ret;
 }
 
 unsigned long corgipm_read_devdata(int type)
 {
         switch(type) {
         case SHARPSL_STATUS_ACIN:
-                return ((GPLR(CORGI_GPIO_AC_IN) & GPIO_bit(CORGI_GPIO_AC_IN)) != 0);
+                return !gpio_get_value(CORGI_GPIO_AC_IN);
         case SHARPSL_STATUS_LOCK:
                 return gpio_get_value(sharpsl_pm.machinfo->gpio_batlock);
         case SHARPSL_STATUS_CHRGFULL:
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 2e0425404de5..18fd177073f4 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -415,9 +415,29 @@ 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 = {
@@ -1051,6 +1071,36 @@ struct platform_device pxa3xx_device_ssp4 = {
 };
 #endif /* CONFIG_PXA3xx || CONFIG_PXA95x */
 
+struct resource pxa_resource_gpio[] = {
+        {
+                .start  = 0x40e00000,
+                .end    = 0x40e0ffff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_GPIO0,
+                .end    = IRQ_GPIO0,
+                .name   = "gpio0",
+                .flags  = IORESOURCE_IRQ,
+        }, {
+                .start  = IRQ_GPIO1,
+                .end    = IRQ_GPIO1,
+                .name   = "gpio1",
+                .flags  = IORESOURCE_IRQ,
+        }, {
+                .start  = IRQ_GPIO_2_x,
+                .end    = IRQ_GPIO_2_x,
+                .name   = "gpio_mux",
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+struct platform_device pxa_device_gpio = {
+        .name           = "pxa-gpio",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(pxa_resource_gpio),
+        .resource       = pxa_resource_gpio,
+};
+
 /* pxa2xx-spi platform-device ID equals respective SSP platform-device ID + 1.
  * See comment in arch/arm/mach-pxa/ssp.c::ssp_probe() */
 void __init pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info)
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 2fd5a8b35757..1475db107254 100644
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -16,6 +16,7 @@ extern struct platform_device pxa_device_ficp;
 extern struct platform_device sa1100_device_rtc;
 extern struct platform_device pxa_device_rtc;
 extern struct platform_device pxa_device_ac97;
+extern struct platform_device pxa_device_gpio;
 
 extern struct platform_device pxa27x_device_i2c_power;
 extern struct platform_device pxa27x_device_ohci;
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index bd396ba67af7..d80c0ba9a095 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -70,7 +70,7 @@
 /* common  GPIOs */
 #define GPIO11_NAND_CS          (11)
 #define GPIO41_ETHIRQ           (41)
-#define EM_X270_ETHIRQ          IRQ_GPIO(GPIO41_ETHIRQ)
+#define EM_X270_ETHIRQ          PXA_GPIO_TO_IRQ(GPIO41_ETHIRQ)
 #define GPIO115_WLAN_PWEN       (115)
 #define GPIO19_WLAN_STRAP       (19)
 #define GPIO9_USB_VBUS_EN       (9)
@@ -805,7 +805,7 @@ static struct spi_board_info em_x270_spi_devices[] __initdata = {
                 .modalias               = "libertas_spi",
                 .max_speed_hz           = 13000000,
                 .bus_num                = 2,
-                .irq                    = IRQ_GPIO(116),
+                .irq                    = PXA_GPIO_TO_IRQ(116),
                 .chip_select            = 0,
                 .controller_data        = &em_x270_libertas_chip,
                 .platform_data          = &em_x270_libertas_pdata,
@@ -1203,7 +1203,7 @@ static struct da903x_platform_data em_x270_da9030_info = {
 
 static struct i2c_board_info em_x270_i2c_pmic_info = {
         I2C_BOARD_INFO("da9030", 0x49),
-        .irq = IRQ_GPIO(0),
+        .irq = PXA_GPIO_TO_IRQ(0),
         .platform_data = &em_x270_da9030_info,
 };
 
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index 69473db97758..f79a610c62fc 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -119,8 +119,8 @@ struct resource eseries_tmio_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = IRQ_GPIO(GPIO_ESERIES_TMIO_IRQ),
-                .end    = IRQ_GPIO(GPIO_ESERIES_TMIO_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO_ESERIES_TMIO_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO_ESERIES_TMIO_IRQ),
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index ce16bdae96de..fb9b62dcf4ca 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -252,8 +252,8 @@ static struct resource asic3_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(GPIO12_HX4700_ASIC3_IRQ),
-                .end    = gpio_to_irq(GPIO12_HX4700_ASIC3_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO12_HX4700_ASIC3_IRQ),
                 .flags  = IORESOURCE_IRQ,
         },
         /* SD part */
@@ -263,8 +263,8 @@ static struct resource asic3_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [3] = {
-                .start  = gpio_to_irq(GPIO66_HX4700_ASIC3_nSDIO_IRQ),
-                .end    = gpio_to_irq(GPIO66_HX4700_ASIC3_nSDIO_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO66_HX4700_ASIC3_nSDIO_IRQ),
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -587,7 +587,7 @@ static struct spi_board_info tsc2046_board_info[] __initdata = {
                 .modalias        = "ads7846",
                 .bus_num         = 2,
                 .max_speed_hz    = 2600000, /* 100 kHz sample rate */
-                .irq             = gpio_to_irq(GPIO58_HX4700_TSC2046_nPENIRQ),
+                .irq             = PXA_GPIO_TO_IRQ(GPIO58_HX4700_TSC2046_nPENIRQ),
                 .platform_data   = &tsc2046_info,
                 .controller_data = &tsc2046_chip,
         },
@@ -635,15 +635,15 @@ static struct resource power_supply_resources[] = {
                 .name  = "ac",
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |
                          IORESOURCE_IRQ_LOWEDGE,
-                .start = gpio_to_irq(GPIOD9_nAC_IN),
-                .end   = gpio_to_irq(GPIOD9_nAC_IN),
+                .start = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN),
+                .end   = PXA_GPIO_TO_IRQ(GPIOD9_nAC_IN),
         },
         [1] = {
                 .name  = "usb",
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |
                          IORESOURCE_IRQ_LOWEDGE,
-                .start = gpio_to_irq(GPIOD14_nUSBC_DETECT),
-                .end   = gpio_to_irq(GPIOD14_nUSBC_DETECT),
+                .start = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT),
+                .end   = PXA_GPIO_TO_IRQ(GPIOD14_nUSBC_DETECT),
         },
 };
 
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index e239b82c99d7..67400192ed3b 100644
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -86,7 +86,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .chip_select     = 0,
                 .platform_data   = &mcp251x_info,
                 .controller_data = &mcp251x_chip_info1,
-                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ1)
+                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ1)
         },
         {
                 .modalias        = "mcp2515",
@@ -95,7 +95,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .chip_select     = 1,
                 .platform_data   = &mcp251x_info,
                 .controller_data = &mcp251x_chip_info2,
-                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ2)
+                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ2)
         },
         {
                 .modalias        = "mcp2515",
@@ -104,7 +104,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .chip_select     = 0,
                 .platform_data   = &mcp251x_info,
                 .controller_data = &mcp251x_chip_info3,
-                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ3)
+                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ3)
         },
         {
                 .modalias        = "mcp2515",
@@ -113,7 +113,7 @@ static struct spi_board_info mcp251x_board_info[] = {
                 .chip_select     = 1,
                 .platform_data   = &mcp251x_info,
                 .controller_data = &mcp251x_chip_info4,
-                .irq             = gpio_to_irq(ICONTROL_MCP251x_nIRQ4)
+                .irq             = PXA_GPIO_TO_IRQ(ICONTROL_MCP251x_nIRQ4)
         }
 };
 
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index fbabd84e110c..8af1840e12cc 100644
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -75,8 +75,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = IRQ_GPIO(4),
-                .end    = IRQ_GPIO(4),
+                .start  = PXA_GPIO_TO_IRQ(4),
+                .end    = PXA_GPIO_TO_IRQ(4),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
diff --git a/arch/arm/mach-pxa/include/mach/balloon3.h b/arch/arm/mach-pxa/include/mach/balloon3.h
index 6d7eab3d0867..f02fa1e6ba86 100644
--- a/arch/arm/mach-pxa/include/mach/balloon3.h
+++ b/arch/arm/mach-pxa/include/mach/balloon3.h
@@ -172,9 +172,9 @@ enum balloon3_features {
 /* Balloon3 Interrupts */
 #define BALLOON3_IRQ(x)         (IRQ_BOARD_START + (x))
 
-#define BALLOON3_AUX_NIRQ       IRQ_GPIO(BALLOON3_GPIO_AUX_NIRQ)
-#define BALLOON3_CODEC_IRQ      IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ)
-#define BALLOON3_S0_CD_IRQ      IRQ_GPIO(BALLOON3_GPIO_S0_CD)
+#define BALLOON3_AUX_NIRQ       PXA_GPIO_TO_IRQ(BALLOON3_GPIO_AUX_NIRQ)
+#define BALLOON3_CODEC_IRQ      PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ)
+#define BALLOON3_S0_CD_IRQ      PXA_GPIO_TO_IRQ(BALLOON3_GPIO_S0_CD)
 
 #define BALLOON3_NR_IRQS        (IRQ_BOARD_START + 16)
 
diff --git a/arch/arm/mach-pxa/include/mach/corgi.h b/arch/arm/mach-pxa/include/mach/corgi.h
index 5dfd1195a5a7..f3c3493b468d 100644
--- a/arch/arm/mach-pxa/include/mach/corgi.h
+++ b/arch/arm/mach-pxa/include/mach/corgi.h
@@ -66,18 +66,18 @@
 /*
  * Corgi Interrupts
  */
-#define CORGI_IRQ_GPIO_KEY_INT          IRQ_GPIO(0)
-#define CORGI_IRQ_GPIO_AC_IN            IRQ_GPIO(1)
-#define CORGI_IRQ_GPIO_WAKEUP           IRQ_GPIO(3)
-#define CORGI_IRQ_GPIO_AK_INT           IRQ_GPIO(4)
-#define CORGI_IRQ_GPIO_TP_INT           IRQ_GPIO(5)
-#define CORGI_IRQ_GPIO_nSD_DETECT       IRQ_GPIO(9)
-#define CORGI_IRQ_GPIO_nSD_INT          IRQ_GPIO(10)
-#define CORGI_IRQ_GPIO_MAIN_BAT_LOW     IRQ_GPIO(11)
-#define CORGI_IRQ_GPIO_CF_CD            IRQ_GPIO(14)
-#define CORGI_IRQ_GPIO_CHRG_FULL        IRQ_GPIO(16)    /* Battery fully charged */
-#define CORGI_IRQ_GPIO_CF_IRQ           IRQ_GPIO(17)
-#define CORGI_IRQ_GPIO_KEY_SENSE(a)     IRQ_GPIO(58+(a))        /* Keyboard Sense lines */
+#define CORGI_IRQ_GPIO_KEY_INT          PXA_GPIO_TO_IRQ(0)
+#define CORGI_IRQ_GPIO_AC_IN            PXA_GPIO_TO_IRQ(1)
+#define CORGI_IRQ_GPIO_WAKEUP           PXA_GPIO_TO_IRQ(3)
+#define CORGI_IRQ_GPIO_AK_INT           PXA_GPIO_TO_IRQ(4)
+#define CORGI_IRQ_GPIO_TP_INT           PXA_GPIO_TO_IRQ(5)
+#define CORGI_IRQ_GPIO_nSD_DETECT       PXA_GPIO_TO_IRQ(9)
+#define CORGI_IRQ_GPIO_nSD_INT          PXA_GPIO_TO_IRQ(10)
+#define CORGI_IRQ_GPIO_MAIN_BAT_LOW     PXA_GPIO_TO_IRQ(11)
+#define CORGI_IRQ_GPIO_CF_CD            PXA_GPIO_TO_IRQ(14)
+#define CORGI_IRQ_GPIO_CHRG_FULL        PXA_GPIO_TO_IRQ(16)     /* Battery fully charged */
+#define CORGI_IRQ_GPIO_CF_IRQ           PXA_GPIO_TO_IRQ(17)
+#define CORGI_IRQ_GPIO_KEY_SENSE(a)     PXA_GPIO_TO_IRQ(58+(a)) /* Keyboard Sense lines */
 
 
 /*
@@ -98,7 +98,7 @@
                         CORGI_SCP_MIC_BIAS )
 #define CORGI_SCOOP_IO_OUT      ( CORGI_SCP_MUTE_L | CORGI_SCP_MUTE_R )
 
-#define CORGI_SCOOP_GPIO_BASE           (NR_BUILTIN_GPIO)
+#define CORGI_SCOOP_GPIO_BASE           (PXA_NR_BUILTIN_GPIO)
 #define CORGI_GPIO_LED_GREEN            (CORGI_SCOOP_GPIO_BASE + 0)
 #define CORGI_GPIO_SWA                  (CORGI_SCOOP_GPIO_BASE + 1)  /* Hinge Switch A */
 #define CORGI_GPIO_SWB                  (CORGI_SCOOP_GPIO_BASE + 2)  /* Hinge Switch B */
diff --git a/arch/arm/mach-pxa/include/mach/csb726.h b/arch/arm/mach-pxa/include/mach/csb726.h
index 747ab1a71f2f..2628e7b72116 100644
--- a/arch/arm/mach-pxa/include/mach/csb726.h
+++ b/arch/arm/mach-pxa/include/mach/csb726.h
@@ -19,8 +19,8 @@
 #define CSB726_FLASH_SIZE       (64 * 1024 * 1024)
 #define CSB726_FLASH_uMON       (8 * 1024 * 1024)
 
-#define CSB726_IRQ_LAN          gpio_to_irq(CSB726_GPIO_IRQ_LAN)
-#define CSB726_IRQ_SM501        gpio_to_irq(CSB726_GPIO_IRQ_SM501)
+#define CSB726_IRQ_LAN          PXA_GPIO_TO_IRQ(CSB726_GPIO_IRQ_LAN)
+#define CSB726_IRQ_SM501        PXA_GPIO_TO_IRQ(CSB726_GPIO_IRQ_SM501)
 
 #endif
 
diff --git a/arch/arm/mach-pxa/include/mach/gpio-pxa.h b/arch/arm/mach-pxa/include/mach/gpio-pxa.h
deleted file mode 100644
index 41b4c93a96c2..000000000000
--- a/arch/arm/mach-pxa/include/mach/gpio-pxa.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Written by Philipp Zabel <philipp.zabel@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#ifndef __MACH_PXA_GPIO_PXA_H
-#define __MACH_PXA_GPIO_PXA_H
-
-#include <mach/irqs.h>
-#include <mach/hardware.h>
-
-#define GPIO_REGS_VIRT  io_p2v(0x40E00000)
-
-#define BANK_OFF(n)     (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
-#define GPIO_REG(x)     (*(volatile u32 *)(GPIO_REGS_VIRT + (x)))
-
-/* GPIO Pin Level Registers */
-#define GPLR0           GPIO_REG(BANK_OFF(0) + 0x00)
-#define GPLR1           GPIO_REG(BANK_OFF(1) + 0x00)
-#define GPLR2           GPIO_REG(BANK_OFF(2) + 0x00)
-#define GPLR3           GPIO_REG(BANK_OFF(3) + 0x00)
-
-/* GPIO Pin Direction Registers */
-#define GPDR0           GPIO_REG(BANK_OFF(0) + 0x0c)
-#define GPDR1           GPIO_REG(BANK_OFF(1) + 0x0c)
-#define GPDR2           GPIO_REG(BANK_OFF(2) + 0x0c)
-#define GPDR3           GPIO_REG(BANK_OFF(3) + 0x0c)
-
-/* GPIO Pin Output Set Registers */
-#define GPSR0           GPIO_REG(BANK_OFF(0) + 0x18)
-#define GPSR1           GPIO_REG(BANK_OFF(1) + 0x18)
-#define GPSR2           GPIO_REG(BANK_OFF(2) + 0x18)
-#define GPSR3           GPIO_REG(BANK_OFF(3) + 0x18)
-
-/* GPIO Pin Output Clear Registers */
-#define GPCR0           GPIO_REG(BANK_OFF(0) + 0x24)
-#define GPCR1           GPIO_REG(BANK_OFF(1) + 0x24)
-#define GPCR2           GPIO_REG(BANK_OFF(2) + 0x24)
-#define GPCR3           GPIO_REG(BANK_OFF(3) + 0x24)
-
-/* GPIO Rising Edge Detect Registers */
-#define GRER0           GPIO_REG(BANK_OFF(0) + 0x30)
-#define GRER1           GPIO_REG(BANK_OFF(1) + 0x30)
-#define GRER2           GPIO_REG(BANK_OFF(2) + 0x30)
-#define GRER3           GPIO_REG(BANK_OFF(3) + 0x30)
-
-/* GPIO Falling Edge Detect Registers */
-#define GFER0           GPIO_REG(BANK_OFF(0) + 0x3c)
-#define GFER1           GPIO_REG(BANK_OFF(1) + 0x3c)
-#define GFER2           GPIO_REG(BANK_OFF(2) + 0x3c)
-#define GFER3           GPIO_REG(BANK_OFF(3) + 0x3c)
-
-/* GPIO Edge Detect Status Registers */
-#define GEDR0           GPIO_REG(BANK_OFF(0) + 0x48)
-#define GEDR1           GPIO_REG(BANK_OFF(1) + 0x48)
-#define GEDR2           GPIO_REG(BANK_OFF(2) + 0x48)
-#define GEDR3           GPIO_REG(BANK_OFF(3) + 0x48)
-
-/* GPIO Alternate Function Select Registers */
-#define GAFR0_L         GPIO_REG(0x0054)
-#define GAFR0_U         GPIO_REG(0x0058)
-#define GAFR1_L         GPIO_REG(0x005C)
-#define GAFR1_U         GPIO_REG(0x0060)
-#define GAFR2_L         GPIO_REG(0x0064)
-#define GAFR2_U         GPIO_REG(0x0068)
-#define GAFR3_L         GPIO_REG(0x006C)
-#define GAFR3_U         GPIO_REG(0x0070)
-
-/* More handy macros.  The argument is a literal GPIO number. */
-
-#define GPIO_bit(x)     (1 << ((x) & 0x1f))
-
-#define GPLR(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x00)
-#define GPDR(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x0c)
-#define GPSR(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x18)
-#define GPCR(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x24)
-#define GRER(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x30)
-#define GFER(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x3c)
-#define GEDR(x)         GPIO_REG(BANK_OFF((x) >> 5) + 0x48)
-#define GAFR(x)         GPIO_REG(0x54 + (((x) & 0x70) >> 2))
-
-
-#define NR_BUILTIN_GPIO         PXA_GPIO_IRQ_NUM
-
-#define gpio_to_bank(gpio)      ((gpio) >> 5)
-
-#ifdef CONFIG_CPU_PXA26x
-/* GPIO86/87/88/89 on PXA26x have their direction bits in GPDR2 inverted,
- * as well as their Alternate Function value being '1' for GPIO in GAFRx.
- */
-static inline int __gpio_is_inverted(unsigned gpio)
-{
-        return cpu_is_pxa25x() && gpio > 85;
-}
-#else
-static inline int __gpio_is_inverted(unsigned gpio) { return 0; }
-#endif
-
-/*
- * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate
- * function of a GPIO, and GPDRx cannot be altered once configured. It
- * is attributed as "occupied" here (I know this terminology isn't
- * accurate, you are welcome to propose a better one :-)
- */
-static inline int __gpio_is_occupied(unsigned gpio)
-{
-        if (cpu_is_pxa27x() || cpu_is_pxa25x()) {
-                int af = (GAFR(gpio) >> ((gpio & 0xf) * 2)) & 0x3;
-                int dir = GPDR(gpio) & GPIO_bit(gpio);
-
-                if (__gpio_is_inverted(gpio))
-                        return af != 1 || dir == 0;
-                else
-                        return af != 0 || dir != 0;
-        } else
-                return GPDR(gpio) & GPIO_bit(gpio);
-}
-
-#include <plat/gpio-pxa.h>
-#endif /* __MACH_PXA_GPIO_PXA_H */
diff --git a/arch/arm/mach-pxa/include/mach/gpio.h b/arch/arm/mach-pxa/include/mach/gpio.h
index 004cade7bb13..0248e433bc98 100644
--- a/arch/arm/mach-pxa/include/mach/gpio.h
+++ b/arch/arm/mach-pxa/include/mach/gpio.h
@@ -25,24 +25,8 @@
 #define __ASM_ARCH_PXA_GPIO_H
 
 #include <asm-generic/gpio.h>
-/* The defines for the driver are needed for the accelerated accessors */
-#include "gpio-pxa.h"
 
-#define gpio_to_irq(gpio)       IRQ_GPIO(gpio)
+#include <mach/irqs.h>
+#include <mach/hardware.h>
 
-static inline int irq_to_gpio(unsigned int irq)
-{
-        int gpio;
-
-        if (irq == IRQ_GPIO0 || irq == IRQ_GPIO1)
-                return irq - IRQ_GPIO0;
-
-        gpio = irq - PXA_GPIO_IRQ_BASE;
-        if (gpio >= 2 && gpio < NR_BUILTIN_GPIO)
-                return gpio;
-
-        return -1;
-}
-
-#include <plat/gpio.h>
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/gumstix.h b/arch/arm/mach-pxa/include/mach/gumstix.h
index 9b898680b206..dba14b6503ad 100644
--- a/arch/arm/mach-pxa/include/mach/gumstix.h
+++ b/arch/arm/mach-pxa/include/mach/gumstix.h
@@ -24,7 +24,7 @@ has detected a cable insertion; driven low otherwise. */
 #define GPIO_GUMSTIX_USB_GPIOx          41
 
 /* usb state change */
-#define GUMSTIX_USB_INTR_IRQ            IRQ_GPIO(GPIO_GUMSTIX_USB_GPIOn)
+#define GUMSTIX_USB_INTR_IRQ            PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_USB_GPIOn)
 
 #define GPIO_GUMSTIX_USB_GPIOn_MD       (GPIO_GUMSTIX_USB_GPIOn | GPIO_IN)
 #define GPIO_GUMSTIX_USB_GPIOx_CON_MD   (GPIO_GUMSTIX_USB_GPIOx | GPIO_OUT)
@@ -35,7 +35,7 @@ has detected a cable insertion; driven low otherwise. */
  */
 #define GUMSTIX_GPIO_nSD_WP             22 /* SD Write Protect */
 #define GUMSTIX_GPIO_nSD_DETECT         11 /* MMC/SD Card Detect */
-#define GUMSTIX_IRQ_GPIO_nSD_DETECT     IRQ_GPIO(GUMSTIX_GPIO_nSD_DETECT)
+#define GUMSTIX_IRQ_GPIO_nSD_DETECT     PXA_GPIO_TO_IRQ(GUMSTIX_GPIO_nSD_DETECT)
 
 /*
  * SMC Ethernet definitions
@@ -49,10 +49,10 @@ has detected a cable insertion; driven low otherwise. */
 
 #define GPIO_GUMSTIX_ETH0               36
 #define GPIO_GUMSTIX_ETH0_MD            (GPIO_GUMSTIX_ETH0 | GPIO_IN)
-#define GUMSTIX_ETH0_IRQ                IRQ_GPIO(GPIO_GUMSTIX_ETH0)
+#define GUMSTIX_ETH0_IRQ                PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_ETH0)
 #define GPIO_GUMSTIX_ETH1               27
 #define GPIO_GUMSTIX_ETH1_MD            (GPIO_GUMSTIX_ETH1 | GPIO_IN)
-#define GUMSTIX_ETH1_IRQ                IRQ_GPIO(GPIO_GUMSTIX_ETH1)
+#define GUMSTIX_ETH1_IRQ                PXA_GPIO_TO_IRQ(GPIO_GUMSTIX_ETH1)
 
 
 /* CF reset line */
@@ -63,18 +63,18 @@ has detected a cable insertion; driven low otherwise. */
 #define GPIO4_nSTSCHG                   GPIO4_nBVD1
 #define GPIO11_nCD                      11
 #define GPIO26_PRDY_nBSY                26
-#define GUMSTIX_S0_nSTSCHG_IRQ          IRQ_GPIO(GPIO4_nSTSCHG)
-#define GUMSTIX_S0_nCD_IRQ              IRQ_GPIO(GPIO11_nCD)
-#define GUMSTIX_S0_PRDY_nBSY_IRQ        IRQ_GPIO(GPIO26_PRDY_nBSY)
+#define GUMSTIX_S0_nSTSCHG_IRQ          PXA_GPIO_TO_IRQ(GPIO4_nSTSCHG)
+#define GUMSTIX_S0_nCD_IRQ              PXA_GPIO_TO_IRQ(GPIO11_nCD)
+#define GUMSTIX_S0_PRDY_nBSY_IRQ        PXA_GPIO_TO_IRQ(GPIO26_PRDY_nBSY)
 
 /* CF slot 1 */
 #define GPIO18_nBVD1                    18
 #define GPIO18_nSTSCHG                  GPIO18_nBVD1
 #define GPIO36_nCD                      36
 #define GPIO27_PRDY_nBSY                27
-#define GUMSTIX_S1_nSTSCHG_IRQ          IRQ_GPIO(GPIO18_nSTSCHG)
-#define GUMSTIX_S1_nCD_IRQ              IRQ_GPIO(GPIO36_nCD)
-#define GUMSTIX_S1_PRDY_nBSY_IRQ        IRQ_GPIO(GPIO27_PRDY_nBSY)
+#define GUMSTIX_S1_nSTSCHG_IRQ          PXA_GPIO_TO_IRQ(GPIO18_nSTSCHG)
+#define GUMSTIX_S1_nCD_IRQ              PXA_GPIO_TO_IRQ(GPIO36_nCD)
+#define GUMSTIX_S1_PRDY_nBSY_IRQ        PXA_GPIO_TO_IRQ(GPIO27_PRDY_nBSY)
 
 /* CF GPIO line modes */
 #define GPIO4_nSTSCHG_MD                (GPIO4_nSTSCHG | GPIO_IN)
diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h
index 37408449ec25..8bc02913517c 100644
--- a/arch/arm/mach-pxa/include/mach/hx4700.h
+++ b/arch/arm/mach-pxa/include/mach/hx4700.h
@@ -15,7 +15,7 @@
 #include <linux/gpio.h>
 #include <linux/mfd/asic3.h>
 
-#define HX4700_ASIC3_GPIO_BASE  NR_BUILTIN_GPIO
+#define HX4700_ASIC3_GPIO_BASE  PXA_NR_BUILTIN_GPIO
 #define HX4700_EGPIO_BASE       (HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)
 #define HX4700_NR_IRQS          (IRQ_BOARD_START + 70)
 
diff --git a/arch/arm/mach-pxa/include/mach/idp.h b/arch/arm/mach-pxa/include/mach/idp.h
index 5eff96fcc944..22a96f87232b 100644
--- a/arch/arm/mach-pxa/include/mach/idp.h
+++ b/arch/arm/mach-pxa/include/mach/idp.h
@@ -131,28 +131,26 @@
 #define PCC_VS2         (1 << 1)
 #define PCC_VS1         (1 << 0)
 
-#define PCC_DETECT(x)   (GPLR(7 + (x)) & GPIO_bit(7 + (x)))
-
 /* A listing of interrupts used by external hardware devices */
 
-#define TOUCH_PANEL_IRQ                 IRQ_GPIO(5)
-#define IDE_IRQ                         IRQ_GPIO(21)
+#define TOUCH_PANEL_IRQ                 PXA_GPIO_TO_IRQ(5)
+#define IDE_IRQ                         PXA_GPIO_TO_IRQ(21)
 
 #define TOUCH_PANEL_IRQ_EDGE            IRQ_TYPE_EDGE_FALLING
 
-#define ETHERNET_IRQ                    IRQ_GPIO(4)
+#define ETHERNET_IRQ                    PXA_GPIO_TO_IRQ(4)
 #define ETHERNET_IRQ_EDGE               IRQ_TYPE_EDGE_RISING
 
 #define IDE_IRQ_EDGE                    IRQ_TYPE_EDGE_RISING
 
-#define PCMCIA_S0_CD_VALID              IRQ_GPIO(7)
+#define PCMCIA_S0_CD_VALID              PXA_GPIO_TO_IRQ(7)
 #define PCMCIA_S0_CD_VALID_EDGE         IRQ_TYPE_EDGE_BOTH
 
-#define PCMCIA_S1_CD_VALID              IRQ_GPIO(8)
+#define PCMCIA_S1_CD_VALID              PXA_GPIO_TO_IRQ(8)
 #define PCMCIA_S1_CD_VALID_EDGE         IRQ_TYPE_EDGE_BOTH
 
-#define PCMCIA_S0_RDYINT                IRQ_GPIO(19)
-#define PCMCIA_S1_RDYINT                IRQ_GPIO(22)
+#define PCMCIA_S0_RDYINT                PXA_GPIO_TO_IRQ(19)
+#define PCMCIA_S1_RDYINT                PXA_GPIO_TO_IRQ(22)
 
 
 /*
diff --git a/arch/arm/mach-pxa/include/mach/irqs.h b/arch/arm/mach-pxa/include/mach/irqs.h
index 7cc5a781e99e..32975adf3ca4 100644
--- a/arch/arm/mach-pxa/include/mach/irqs.h
+++ b/arch/arm/mach-pxa/include/mach/irqs.h
@@ -88,10 +88,8 @@
 #define IRQ_U2P         PXA_IRQ(93)     /* USB PHY D+/D- Lines (PXA935) */
 
 #define PXA_GPIO_IRQ_BASE       PXA_IRQ(96)
-#define PXA_GPIO_IRQ_NUM        (192)
-
-#define GPIO_2_x_TO_IRQ(x)      (PXA_GPIO_IRQ_BASE + (x))
-#define IRQ_GPIO(x)     (((x) < 2) ? (IRQ_GPIO0 + (x)) : GPIO_2_x_TO_IRQ(x))
+#define PXA_NR_BUILTIN_GPIO     (192)
+#define PXA_GPIO_TO_IRQ(x)      (PXA_GPIO_IRQ_BASE + (x))
 
 /*
  * The following interrupts are for board specific purposes. Since
@@ -100,7 +98,7 @@
  * By default, no board IRQ is reserved. It should be finished in
  * custom board since sparse IRQ is already enabled.
  */
-#define IRQ_BOARD_START         (PXA_GPIO_IRQ_BASE + PXA_GPIO_IRQ_NUM)
+#define IRQ_BOARD_START         (PXA_GPIO_IRQ_BASE + PXA_NR_BUILTIN_GPIO)
 
 #define NR_IRQS                 (IRQ_BOARD_START)
 
diff --git a/arch/arm/mach-pxa/include/mach/littleton.h b/arch/arm/mach-pxa/include/mach/littleton.h
index b6238cbd8aea..8066be54e9f5 100644
--- a/arch/arm/mach-pxa/include/mach/littleton.h
+++ b/arch/arm/mach-pxa/include/mach/littleton.h
@@ -1,13 +1,11 @@
 #ifndef __ASM_ARCH_LITTLETON_H
 #define __ASM_ARCH_LITTLETON_H
 
-#include <mach/gpio-pxa.h>
-
 #define LITTLETON_ETH_PHYS      0x30000000
 
 #define LITTLETON_GPIO_LCD_CS   (17)
 
-#define EXT0_GPIO_BASE  (NR_BUILTIN_GPIO)
+#define EXT0_GPIO_BASE  (PXA_NR_BUILTIN_GPIO)
 #define EXT0_GPIO(x)    (EXT0_GPIO_BASE + (x))
 
 #define LITTLETON_NR_IRQS       (IRQ_BOARD_START + 8)
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
index 7cbfc5d3f9df..ba6a6e1d29e9 100644
--- a/arch/arm/mach-pxa/include/mach/magician.h
+++ b/arch/arm/mach-pxa/include/mach/magician.h
@@ -78,7 +78,7 @@
  * CPLD EGPIOs
  */
 
-#define MAGICIAN_EGPIO_BASE                     NR_BUILTIN_GPIO
+#define MAGICIAN_EGPIO_BASE                     PXA_NR_BUILTIN_GPIO
 #define MAGICIAN_EGPIO(reg,bit) \
         (MAGICIAN_EGPIO_BASE + 8*reg + bit)
 
diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h
index ae536e86d8e8..2c4471336570 100644
--- a/arch/arm/mach-pxa/include/mach/palmld.h
+++ b/arch/arm/mach-pxa/include/mach/palmld.h
@@ -68,10 +68,10 @@
 /* 20, 53 and 86 are usb related too */
 
 /* INTERRUPTS */
-#define IRQ_GPIO_PALMLD_GPIO_RESET      IRQ_GPIO(GPIO_NR_PALMLD_GPIO_RESET)
-#define IRQ_GPIO_PALMLD_SD_DETECT_N     IRQ_GPIO(GPIO_NR_PALMLD_SD_DETECT_N)
-#define IRQ_GPIO_PALMLD_WM9712_IRQ      IRQ_GPIO(GPIO_NR_PALMLD_WM9712_IRQ)
-#define IRQ_GPIO_PALMLD_IDE_IRQ         IRQ_GPIO(GPIO_NR_PALMLD_IDE_IRQ)
+#define IRQ_GPIO_PALMLD_GPIO_RESET      PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_GPIO_RESET)
+#define IRQ_GPIO_PALMLD_SD_DETECT_N     PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_SD_DETECT_N)
+#define IRQ_GPIO_PALMLD_WM9712_IRQ      PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_WM9712_IRQ)
+#define IRQ_GPIO_PALMLD_IDE_IRQ         PXA_GPIO_TO_IRQ(GPIO_NR_PALMLD_IDE_IRQ)
 
 
 /** HERE ARE INIT VALUES **/
diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h
index 6baf7469d4ec..0bd4f036c72f 100644
--- a/arch/arm/mach-pxa/include/mach/palmt5.h
+++ b/arch/arm/mach-pxa/include/mach/palmt5.h
@@ -48,10 +48,10 @@
 #define GPIO_NR_PALMT5_BT_RESET                 83
 
 /* INTERRUPTS */
-#define IRQ_GPIO_PALMT5_SD_DETECT_N     IRQ_GPIO(GPIO_NR_PALMT5_SD_DETECT_N)
-#define IRQ_GPIO_PALMT5_WM9712_IRQ      IRQ_GPIO(GPIO_NR_PALMT5_WM9712_IRQ)
-#define IRQ_GPIO_PALMT5_USB_DETECT      IRQ_GPIO(GPIO_NR_PALMT5_USB_DETECT)
-#define IRQ_GPIO_PALMT5_GPIO_RESET      IRQ_GPIO(GPIO_NR_PALMT5_GPIO_RESET)
+#define IRQ_GPIO_PALMT5_SD_DETECT_N     PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_SD_DETECT_N)
+#define IRQ_GPIO_PALMT5_WM9712_IRQ      PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_WM9712_IRQ)
+#define IRQ_GPIO_PALMT5_USB_DETECT      PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_USB_DETECT)
+#define IRQ_GPIO_PALMT5_GPIO_RESET      PXA_GPIO_TO_IRQ(GPIO_NR_PALMT5_GPIO_RESET)
 
 /** HERE ARE INIT VALUES **/
 
diff --git a/arch/arm/mach-pxa/include/mach/palmtc.h b/arch/arm/mach-pxa/include/mach/palmtc.h
index 3f9dd3fd4638..c383a21680b6 100644
--- a/arch/arm/mach-pxa/include/mach/palmtc.h
+++ b/arch/arm/mach-pxa/include/mach/palmtc.h
@@ -52,8 +52,8 @@
 #define GPIO_NR_PALMTC_IR_DISABLE       45
 
 /* IRQs */
-#define IRQ_GPIO_PALMTC_SD_DETECT_N     IRQ_GPIO(GPIO_NR_PALMTC_SD_DETECT_N)
-#define IRQ_GPIO_PALMTC_WLAN_READY      IRQ_GPIO(GPIO_NR_PALMTC_WLAN_READY)
+#define IRQ_GPIO_PALMTC_SD_DETECT_N     PXA_GPIO_TO_IRQ(GPIO_NR_PALMTC_SD_DETECT_N)
+#define IRQ_GPIO_PALMTC_WLAN_READY      PXA_GPIO_TO_IRQ(GPIO_NR_PALMTC_WLAN_READY)
 
 /* UCB1400 GPIOs */
 #define GPIO_NR_PALMTC_POWER_DETECT     (0x80 | 0x00)
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h
index 7074a6ed46c6..f2e530380253 100644
--- a/arch/arm/mach-pxa/include/mach/palmtx.h
+++ b/arch/arm/mach-pxa/include/mach/palmtx.h
@@ -62,10 +62,10 @@
 #define GPIO_NR_PALMTX_NAND_BUFFER_DIR          79
 
 /* INTERRUPTS */
-#define IRQ_GPIO_PALMTX_SD_DETECT_N     IRQ_GPIO(GPIO_NR_PALMTX_SD_DETECT_N)
-#define IRQ_GPIO_PALMTX_WM9712_IRQ      IRQ_GPIO(GPIO_NR_PALMTX_WM9712_IRQ)
-#define IRQ_GPIO_PALMTX_USB_DETECT      IRQ_GPIO(GPIO_NR_PALMTX_USB_DETECT)
-#define IRQ_GPIO_PALMTX_GPIO_RESET      IRQ_GPIO(GPIO_NR_PALMTX_GPIO_RESET)
+#define IRQ_GPIO_PALMTX_SD_DETECT_N     PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_SD_DETECT_N)
+#define IRQ_GPIO_PALMTX_WM9712_IRQ      PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_WM9712_IRQ)
+#define IRQ_GPIO_PALMTX_USB_DETECT      PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_USB_DETECT)
+#define IRQ_GPIO_PALMTX_GPIO_RESET      PXA_GPIO_TO_IRQ(GPIO_NR_PALMTX_GPIO_RESET)
 
 /** HERE ARE INIT VALUES **/
 
diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h
index 4bac588478a8..6bf28de228bd 100644
--- a/arch/arm/mach-pxa/include/mach/pcm027.h
+++ b/arch/arm/mach-pxa/include/mach/pcm027.h
@@ -34,7 +34,7 @@
 
 /* I2C RTC */
 #define PCM027_RTC_IRQ_GPIO     0
-#define PCM027_RTC_IRQ          IRQ_GPIO(PCM027_RTC_IRQ_GPIO)
+#define PCM027_RTC_IRQ          PXA_GPIO_TO_IRQ(PCM027_RTC_IRQ_GPIO)
 #define PCM027_RTC_IRQ_EDGE     IRQ_TYPE_EDGE_FALLING
 #define ADR_PCM027_RTC          0x51    /* I2C address */
 
@@ -43,21 +43,21 @@
 
 /* Ethernet chip (SMSC91C111) */
 #define PCM027_ETH_IRQ_GPIO     52
-#define PCM027_ETH_IRQ          IRQ_GPIO(PCM027_ETH_IRQ_GPIO)
+#define PCM027_ETH_IRQ          PXA_GPIO_TO_IRQ(PCM027_ETH_IRQ_GPIO)
 #define PCM027_ETH_IRQ_EDGE     IRQ_TYPE_EDGE_RISING
 #define PCM027_ETH_PHYS         PXA_CS5_PHYS
 #define PCM027_ETH_SIZE         (1*1024*1024)
 
 /* CAN controller SJA1000 (unsupported yet) */
 #define PCM027_CAN_IRQ_GPIO     114
-#define PCM027_CAN_IRQ          IRQ_GPIO(PCM027_CAN_IRQ_GPIO)
+#define PCM027_CAN_IRQ          PXA_GPIO_TO_IRQ(PCM027_CAN_IRQ_GPIO)
 #define PCM027_CAN_IRQ_EDGE     IRQ_TYPE_EDGE_FALLING
 #define PCM027_CAN_PHYS         0x22000000
 #define PCM027_CAN_SIZE         0x100
 
 /* SPI GPIO expander (unsupported yet) */
 #define PCM027_EGPIO_IRQ_GPIO   27
-#define PCM027_EGPIO_IRQ        IRQ_GPIO(PCM027_EGPIO_IRQ_GPIO)
+#define PCM027_EGPIO_IRQ        PXA_GPIO_TO_IRQ(PCM027_EGPIO_IRQ_GPIO)
 #define PCM027_EGPIO_IRQ_EDGE   IRQ_TYPE_EDGE_FALLING
 #define PCM027_EGPIO_CS         24
 /*
diff --git a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
index 8a4383b776d7..d72791695b26 100644
--- a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
+++ b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
@@ -28,14 +28,14 @@
 
 /* CPLD's interrupt controller is connected to PCM-027 GPIO 9 */
 #define PCM990_CTRL_INT_IRQ_GPIO        9
-#define PCM990_CTRL_INT_IRQ             IRQ_GPIO(PCM990_CTRL_INT_IRQ_GPIO)
+#define PCM990_CTRL_INT_IRQ             PXA_GPIO_TO_IRQ(PCM990_CTRL_INT_IRQ_GPIO)
 #define PCM990_CTRL_INT_IRQ_EDGE        IRQ_TYPE_EDGE_RISING
 #define PCM990_CTRL_PHYS                PXA_CS1_PHYS    /* 16-Bit */
 #define PCM990_CTRL_BASE                0xea000000
 #define PCM990_CTRL_SIZE                (1*1024*1024)
 
 #define PCM990_CTRL_PWR_IRQ_GPIO        14
-#define PCM990_CTRL_PWR_IRQ             IRQ_GPIO(PCM990_CTRL_PWR_IRQ_GPIO)
+#define PCM990_CTRL_PWR_IRQ             PXA_GPIO_TO_IRQ(PCM990_CTRL_PWR_IRQ_GPIO)
 #define PCM990_CTRL_PWR_IRQ_EDGE        IRQ_TYPE_EDGE_RISING
 
 /* visible CPLD (U7) registers */
@@ -132,7 +132,7 @@
  * IDE
  */
 #define PCM990_IDE_IRQ_GPIO     13
-#define PCM990_IDE_IRQ          IRQ_GPIO(PCM990_IDE_IRQ_GPIO)
+#define PCM990_IDE_IRQ          PXA_GPIO_TO_IRQ(PCM990_IDE_IRQ_GPIO)
 #define PCM990_IDE_IRQ_EDGE     IRQ_TYPE_EDGE_RISING
 #define PCM990_IDE_PLD_PHYS     0x20000000      /* 16 bit wide */
 #define PCM990_IDE_PLD_BASE     0xee000000
@@ -188,11 +188,11 @@
  * Compact Flash
  */
 #define PCM990_CF_IRQ_GPIO      11
-#define PCM990_CF_IRQ           IRQ_GPIO(PCM990_CF_IRQ_GPIO)
+#define PCM990_CF_IRQ           PXA_GPIO_TO_IRQ(PCM990_CF_IRQ_GPIO)
 #define PCM990_CF_IRQ_EDGE      IRQ_TYPE_EDGE_RISING
 
 #define PCM990_CF_CD_GPIO       12
-#define PCM990_CF_CD            IRQ_GPIO(PCM990_CF_CD_GPIO)
+#define PCM990_CF_CD            PXA_GPIO_TO_IRQ(PCM990_CF_CD_GPIO)
 #define PCM990_CF_CD_EDGE       IRQ_TYPE_EDGE_RISING
 
 #define PCM990_CF_PLD_PHYS      0x30000000      /* 16 bit wide */
@@ -258,14 +258,14 @@
  * Wolfson AC97 Touch
  */
 #define PCM990_AC97_IRQ_GPIO    10
-#define PCM990_AC97_IRQ         IRQ_GPIO(PCM990_AC97_IRQ_GPIO)
+#define PCM990_AC97_IRQ         PXA_GPIO_TO_IRQ(PCM990_AC97_IRQ_GPIO)
 #define PCM990_AC97_IRQ_EDGE    IRQ_TYPE_EDGE_RISING
 
 /*
  * MMC phyCORE
  */
 #define PCM990_MMC0_IRQ_GPIO    9
-#define PCM990_MMC0_IRQ         IRQ_GPIO(PCM990_MMC0_IRQ_GPIO)
+#define PCM990_MMC0_IRQ         PXA_GPIO_TO_IRQ(PCM990_MMC0_IRQ_GPIO)
 #define PCM990_MMC0_IRQ_EDGE    IRQ_TYPE_EDGE_FALLING
 
 /*
diff --git a/arch/arm/mach-pxa/include/mach/poodle.h b/arch/arm/mach-pxa/include/mach/poodle.h
index 83d1cfd00fc9..f32ff75dcca8 100644
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
@@ -47,18 +47,18 @@
 #define POODLE_GPIO_DISCHARGE_ON        (42) /* Enable battery discharge */
 
 /* PXA GPIOs */
-#define POODLE_IRQ_GPIO_ON_KEY          IRQ_GPIO(0)
-#define POODLE_IRQ_GPIO_AC_IN           IRQ_GPIO(1)
-#define POODLE_IRQ_GPIO_HP_IN           IRQ_GPIO(4)
-#define POODLE_IRQ_GPIO_CO              IRQ_GPIO(16)
-#define POODLE_IRQ_GPIO_TP_INT          IRQ_GPIO(5)
-#define POODLE_IRQ_GPIO_WAKEUP          IRQ_GPIO(11)
-#define POODLE_IRQ_GPIO_GA_INT          IRQ_GPIO(10)
-#define POODLE_IRQ_GPIO_CF_IRQ          IRQ_GPIO(17)
-#define POODLE_IRQ_GPIO_CF_CD           IRQ_GPIO(14)
-#define POODLE_IRQ_GPIO_nSD_INT         IRQ_GPIO(8)
-#define POODLE_IRQ_GPIO_nSD_DETECT      IRQ_GPIO(9)
-#define POODLE_IRQ_GPIO_MAIN_BAT_LOW    IRQ_GPIO(13)
+#define POODLE_IRQ_GPIO_ON_KEY          PXA_GPIO_TO_IRQ(0)
+#define POODLE_IRQ_GPIO_AC_IN           PXA_GPIO_TO_IRQ(1)
+#define POODLE_IRQ_GPIO_HP_IN           PXA_GPIO_TO_IRQ(4)
+#define POODLE_IRQ_GPIO_CO              PXA_GPIO_TO_IRQ(16)
+#define POODLE_IRQ_GPIO_TP_INT          PXA_GPIO_TO_IRQ(5)
+#define POODLE_IRQ_GPIO_WAKEUP          PXA_GPIO_TO_IRQ(11)
+#define POODLE_IRQ_GPIO_GA_INT          PXA_GPIO_TO_IRQ(10)
+#define POODLE_IRQ_GPIO_CF_IRQ          PXA_GPIO_TO_IRQ(17)
+#define POODLE_IRQ_GPIO_CF_CD           PXA_GPIO_TO_IRQ(14)
+#define POODLE_IRQ_GPIO_nSD_INT         PXA_GPIO_TO_IRQ(8)
+#define POODLE_IRQ_GPIO_nSD_DETECT      PXA_GPIO_TO_IRQ(9)
+#define POODLE_IRQ_GPIO_MAIN_BAT_LOW    PXA_GPIO_TO_IRQ(13)
 
 /* SCOOP GPIOs */
 #define POODLE_SCOOP_CHARGE_ON  SCOOP_GPCR_PA11
@@ -71,7 +71,7 @@
 #define POODLE_SCOOP_IO_DIR     ( POODLE_SCOOP_VPEN | POODLE_SCOOP_HS_OUT )
 #define POODLE_SCOOP_IO_OUT     ( 0 )
 
-#define POODLE_SCOOP_GPIO_BASE  (NR_BUILTIN_GPIO)
+#define POODLE_SCOOP_GPIO_BASE  (PXA_NR_BUILTIN_GPIO)
 #define POODLE_GPIO_CHARGE_ON   (POODLE_SCOOP_GPIO_BASE + 0)
 #define POODLE_GPIO_CP401       (POODLE_SCOOP_GPIO_BASE + 2)
 #define POODLE_GPIO_VPEN        (POODLE_SCOOP_GPIO_BASE + 7)
diff --git a/arch/arm/mach-pxa/include/mach/spitz.h b/arch/arm/mach-pxa/include/mach/spitz.h
index 685749a51c42..0bfe6507c95d 100644
--- a/arch/arm/mach-pxa/include/mach/spitz.h
+++ b/arch/arm/mach-pxa/include/mach/spitz.h
@@ -108,7 +108,7 @@
 #define SPITZ_SCP_SUS_CLR     (SPITZ_SCP_MUTE_L | SPITZ_SCP_MUTE_R | SPITZ_SCP_JK_A | SPITZ_SCP_ADC_TEMP_ON)
 #define SPITZ_SCP_SUS_SET     0
 
-#define SPITZ_SCP_GPIO_BASE     (NR_BUILTIN_GPIO)
+#define SPITZ_SCP_GPIO_BASE     (PXA_NR_BUILTIN_GPIO)
 #define SPITZ_GPIO_LED_GREEN    (SPITZ_SCP_GPIO_BASE + 0)
 #define SPITZ_GPIO_JK_B         (SPITZ_SCP_GPIO_BASE + 1)
 #define SPITZ_GPIO_CHRG_ON      (SPITZ_SCP_GPIO_BASE + 2)
@@ -140,7 +140,7 @@
                              SPITZ_SCP2_BACKLIGHT_CONT | SPITZ_SCP2_BACKLIGHT_ON | SPITZ_SCP2_MIC_BIAS)
 #define SPITZ_SCP2_SUS_SET  (SPITZ_SCP2_IR_ON | SPITZ_SCP2_RESERVED_1)
 
-#define SPITZ_SCP2_GPIO_BASE            (NR_BUILTIN_GPIO + 12)
+#define SPITZ_SCP2_GPIO_BASE            (PXA_NR_BUILTIN_GPIO + 12)
 #define SPITZ_GPIO_IR_ON                (SPITZ_SCP2_GPIO_BASE + 0)
 #define SPITZ_GPIO_AKIN_PULLUP          (SPITZ_SCP2_GPIO_BASE + 1)
 #define SPITZ_GPIO_RESERVED_1           (SPITZ_SCP2_GPIO_BASE + 2)
@@ -152,7 +152,7 @@
 #define SPITZ_GPIO_MIC_BIAS             (SPITZ_SCP2_GPIO_BASE + 8)
 
 /* Akita IO Expander GPIOs */
-#define AKITA_IOEXP_GPIO_BASE           (NR_BUILTIN_GPIO + 12)
+#define AKITA_IOEXP_GPIO_BASE           (PXA_NR_BUILTIN_GPIO + 12)
 #define AKITA_GPIO_RESERVED_0           (AKITA_IOEXP_GPIO_BASE + 0)
 #define AKITA_GPIO_RESERVED_1           (AKITA_IOEXP_GPIO_BASE + 1)
 #define AKITA_GPIO_MIC_BIAS             (AKITA_IOEXP_GPIO_BASE + 2)
@@ -164,23 +164,23 @@
 
 /* Spitz IRQ Definitions */
 
-#define SPITZ_IRQ_GPIO_KEY_INT        IRQ_GPIO(SPITZ_GPIO_KEY_INT)
-#define SPITZ_IRQ_GPIO_AC_IN          IRQ_GPIO(SPITZ_GPIO_AC_IN)
-#define SPITZ_IRQ_GPIO_AK_INT         IRQ_GPIO(SPITZ_GPIO_AK_INT)
-#define SPITZ_IRQ_GPIO_HP_IN          IRQ_GPIO(SPITZ_GPIO_HP_IN)
-#define SPITZ_IRQ_GPIO_TP_INT         IRQ_GPIO(SPITZ_GPIO_TP_INT)
-#define SPITZ_IRQ_GPIO_SYNC           IRQ_GPIO(SPITZ_GPIO_SYNC)
-#define SPITZ_IRQ_GPIO_ON_KEY         IRQ_GPIO(SPITZ_GPIO_ON_KEY)
-#define SPITZ_IRQ_GPIO_SWA            IRQ_GPIO(SPITZ_GPIO_SWA)
-#define SPITZ_IRQ_GPIO_SWB            IRQ_GPIO(SPITZ_GPIO_SWB)
-#define SPITZ_IRQ_GPIO_BAT_COVER      IRQ_GPIO(SPITZ_GPIO_BAT_COVER)
-#define SPITZ_IRQ_GPIO_FATAL_BAT      IRQ_GPIO(SPITZ_GPIO_FATAL_BAT)
-#define SPITZ_IRQ_GPIO_CO             IRQ_GPIO(SPITZ_GPIO_CO)
-#define SPITZ_IRQ_GPIO_CF_IRQ         IRQ_GPIO(SPITZ_GPIO_CF_IRQ)
-#define SPITZ_IRQ_GPIO_CF_CD          IRQ_GPIO(SPITZ_GPIO_CF_CD)
-#define SPITZ_IRQ_GPIO_CF2_IRQ        IRQ_GPIO(SPITZ_GPIO_CF2_IRQ)
-#define SPITZ_IRQ_GPIO_nSD_INT        IRQ_GPIO(SPITZ_GPIO_nSD_INT)
-#define SPITZ_IRQ_GPIO_nSD_DETECT     IRQ_GPIO(SPITZ_GPIO_nSD_DETECT)
+#define SPITZ_IRQ_GPIO_KEY_INT        PXA_GPIO_TO_IRQ(SPITZ_GPIO_KEY_INT)
+#define SPITZ_IRQ_GPIO_AC_IN          PXA_GPIO_TO_IRQ(SPITZ_GPIO_AC_IN)
+#define SPITZ_IRQ_GPIO_AK_INT         PXA_GPIO_TO_IRQ(SPITZ_GPIO_AK_INT)
+#define SPITZ_IRQ_GPIO_HP_IN          PXA_GPIO_TO_IRQ(SPITZ_GPIO_HP_IN)
+#define SPITZ_IRQ_GPIO_TP_INT         PXA_GPIO_TO_IRQ(SPITZ_GPIO_TP_INT)
+#define SPITZ_IRQ_GPIO_SYNC           PXA_GPIO_TO_IRQ(SPITZ_GPIO_SYNC)
+#define SPITZ_IRQ_GPIO_ON_KEY         PXA_GPIO_TO_IRQ(SPITZ_GPIO_ON_KEY)
+#define SPITZ_IRQ_GPIO_SWA            PXA_GPIO_TO_IRQ(SPITZ_GPIO_SWA)
+#define SPITZ_IRQ_GPIO_SWB            PXA_GPIO_TO_IRQ(SPITZ_GPIO_SWB)
+#define SPITZ_IRQ_GPIO_BAT_COVER      PXA_GPIO_TO_IRQ(SPITZ_GPIO_BAT_COVER)
+#define SPITZ_IRQ_GPIO_FATAL_BAT      PXA_GPIO_TO_IRQ(SPITZ_GPIO_FATAL_BAT)
+#define SPITZ_IRQ_GPIO_CO             PXA_GPIO_TO_IRQ(SPITZ_GPIO_CO)
+#define SPITZ_IRQ_GPIO_CF_IRQ         PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF_IRQ)
+#define SPITZ_IRQ_GPIO_CF_CD          PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF_CD)
+#define SPITZ_IRQ_GPIO_CF2_IRQ        PXA_GPIO_TO_IRQ(SPITZ_GPIO_CF2_IRQ)
+#define SPITZ_IRQ_GPIO_nSD_INT        PXA_GPIO_TO_IRQ(SPITZ_GPIO_nSD_INT)
+#define SPITZ_IRQ_GPIO_nSD_DETECT     PXA_GPIO_TO_IRQ(SPITZ_GPIO_nSD_DETECT)
 
 /*
  * Shared data structures
diff --git a/arch/arm/mach-pxa/include/mach/tosa.h b/arch/arm/mach-pxa/include/mach/tosa.h
index 1272c4b56ceb..2bb0e862598c 100644
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
@@ -24,7 +24,7 @@
 /*
  * SCOOP2 internal GPIOs
  */
-#define TOSA_SCOOP_GPIO_BASE            NR_BUILTIN_GPIO
+#define TOSA_SCOOP_GPIO_BASE            PXA_NR_BUILTIN_GPIO
 #define TOSA_SCOOP_PXA_VCORE1           SCOOP_GPCR_PA11
 #define TOSA_GPIO_TC6393XB_REST_IN      (TOSA_SCOOP_GPIO_BASE + 1)
 #define TOSA_GPIO_IR_POWERDWN           (TOSA_SCOOP_GPIO_BASE + 2)
@@ -42,7 +42,7 @@
 /*
  * SCOOP2 jacket GPIOs
  */
-#define TOSA_SCOOP_JC_GPIO_BASE         (NR_BUILTIN_GPIO + 12)
+#define TOSA_SCOOP_JC_GPIO_BASE         (PXA_NR_BUILTIN_GPIO + 12)
 #define TOSA_GPIO_BT_LED                (TOSA_SCOOP_JC_GPIO_BASE + 0)
 #define TOSA_GPIO_NOTE_LED              (TOSA_SCOOP_JC_GPIO_BASE + 1)
 #define TOSA_GPIO_CHRG_ERR_LED          (TOSA_SCOOP_JC_GPIO_BASE + 2)
@@ -59,7 +59,7 @@
 /*
  * TC6393XB GPIOs
  */
-#define TOSA_TC6393XB_GPIO_BASE         (NR_BUILTIN_GPIO + 2 * 12)
+#define TOSA_TC6393XB_GPIO_BASE         (PXA_NR_BUILTIN_GPIO + 2 * 12)
 
 #define TOSA_GPIO_TG_ON                 (TOSA_TC6393XB_GPIO_BASE + 0)
 #define TOSA_GPIO_L_MUTE                (TOSA_TC6393XB_GPIO_BASE + 1)
@@ -141,30 +141,30 @@
 /*
  * Interrupts
  */
-#define TOSA_IRQ_GPIO_WAKEUP            IRQ_GPIO(TOSA_GPIO_WAKEUP)
-#define TOSA_IRQ_GPIO_AC_IN             IRQ_GPIO(TOSA_GPIO_AC_IN)
-#define TOSA_IRQ_GPIO_RECORD_BTN        IRQ_GPIO(TOSA_GPIO_RECORD_BTN)
-#define TOSA_IRQ_GPIO_SYNC              IRQ_GPIO(TOSA_GPIO_SYNC)
-#define TOSA_IRQ_GPIO_USB_IN            IRQ_GPIO(TOSA_GPIO_USB_IN)
-#define TOSA_IRQ_GPIO_JACKET_DETECT     IRQ_GPIO(TOSA_GPIO_JACKET_DETECT)
-#define TOSA_IRQ_GPIO_nSD_INT           IRQ_GPIO(TOSA_GPIO_nSD_INT)
-#define TOSA_IRQ_GPIO_nSD_DETECT        IRQ_GPIO(TOSA_GPIO_nSD_DETECT)
-#define TOSA_IRQ_GPIO_BAT1_CRG          IRQ_GPIO(TOSA_GPIO_BAT1_CRG)
-#define TOSA_IRQ_GPIO_CF_CD             IRQ_GPIO(TOSA_GPIO_CF_CD)
-#define TOSA_IRQ_GPIO_BAT0_CRG          IRQ_GPIO(TOSA_GPIO_BAT0_CRG)
-#define TOSA_IRQ_GPIO_TC6393XB_INT      IRQ_GPIO(TOSA_GPIO_TC6393XB_INT)
-#define TOSA_IRQ_GPIO_BAT0_LOW          IRQ_GPIO(TOSA_GPIO_BAT0_LOW)
-#define TOSA_IRQ_GPIO_EAR_IN            IRQ_GPIO(TOSA_GPIO_EAR_IN)
-#define TOSA_IRQ_GPIO_CF_IRQ            IRQ_GPIO(TOSA_GPIO_CF_IRQ)
-#define TOSA_IRQ_GPIO_ON_KEY            IRQ_GPIO(TOSA_GPIO_ON_KEY)
-#define TOSA_IRQ_GPIO_VGA_LINE          IRQ_GPIO(TOSA_GPIO_VGA_LINE)
-#define TOSA_IRQ_GPIO_TP_INT            IRQ_GPIO(TOSA_GPIO_TP_INT)
-#define TOSA_IRQ_GPIO_JC_CF_IRQ         IRQ_GPIO(TOSA_GPIO_JC_CF_IRQ)
-#define TOSA_IRQ_GPIO_BAT_LOCKED        IRQ_GPIO(TOSA_GPIO_BAT_LOCKED)
-#define TOSA_IRQ_GPIO_BAT1_LOW          IRQ_GPIO(TOSA_GPIO_BAT1_LOW)
-#define TOSA_IRQ_GPIO_KEY_SENSE(a)      IRQ_GPIO(69+(a))
-
-#define TOSA_IRQ_GPIO_MAIN_BAT_LOW      IRQ_GPIO(TOSA_GPIO_MAIN_BAT_LOW)
+#define TOSA_IRQ_GPIO_WAKEUP            PXA_GPIO_TO_IRQ(TOSA_GPIO_WAKEUP)
+#define TOSA_IRQ_GPIO_AC_IN             PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN)
+#define TOSA_IRQ_GPIO_RECORD_BTN        PXA_GPIO_TO_IRQ(TOSA_GPIO_RECORD_BTN)
+#define TOSA_IRQ_GPIO_SYNC              PXA_GPIO_TO_IRQ(TOSA_GPIO_SYNC)
+#define TOSA_IRQ_GPIO_USB_IN            PXA_GPIO_TO_IRQ(TOSA_GPIO_USB_IN)
+#define TOSA_IRQ_GPIO_JACKET_DETECT     PXA_GPIO_TO_IRQ(TOSA_GPIO_JACKET_DETECT)
+#define TOSA_IRQ_GPIO_nSD_INT           PXA_GPIO_TO_IRQ(TOSA_GPIO_nSD_INT)
+#define TOSA_IRQ_GPIO_nSD_DETECT        PXA_GPIO_TO_IRQ(TOSA_GPIO_nSD_DETECT)
+#define TOSA_IRQ_GPIO_BAT1_CRG          PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT1_CRG)
+#define TOSA_IRQ_GPIO_CF_CD             PXA_GPIO_TO_IRQ(TOSA_GPIO_CF_CD)
+#define TOSA_IRQ_GPIO_BAT0_CRG          PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT0_CRG)
+#define TOSA_IRQ_GPIO_TC6393XB_INT      PXA_GPIO_TO_IRQ(TOSA_GPIO_TC6393XB_INT)
+#define TOSA_IRQ_GPIO_BAT0_LOW          PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT0_LOW)
+#define TOSA_IRQ_GPIO_EAR_IN            PXA_GPIO_TO_IRQ(TOSA_GPIO_EAR_IN)
+#define TOSA_IRQ_GPIO_CF_IRQ            PXA_GPIO_TO_IRQ(TOSA_GPIO_CF_IRQ)
+#define TOSA_IRQ_GPIO_ON_KEY            PXA_GPIO_TO_IRQ(TOSA_GPIO_ON_KEY)
+#define TOSA_IRQ_GPIO_VGA_LINE          PXA_GPIO_TO_IRQ(TOSA_GPIO_VGA_LINE)
+#define TOSA_IRQ_GPIO_TP_INT            PXA_GPIO_TO_IRQ(TOSA_GPIO_TP_INT)
+#define TOSA_IRQ_GPIO_JC_CF_IRQ         PXA_GPIO_TO_IRQ(TOSA_GPIO_JC_CF_IRQ)
+#define TOSA_IRQ_GPIO_BAT_LOCKED        PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT_LOCKED)
+#define TOSA_IRQ_GPIO_BAT1_LOW          PXA_GPIO_TO_IRQ(TOSA_GPIO_BAT1_LOW)
+#define TOSA_IRQ_GPIO_KEY_SENSE(a)      PXA_GPIO_TO_IRQ(69+(a))
+
+#define TOSA_IRQ_GPIO_MAIN_BAT_LOW      PXA_GPIO_TO_IRQ(TOSA_GPIO_MAIN_BAT_LOW)
 
 #define TOSA_KEY_SYNC           KEY_102ND /* ??? */
 
diff --git a/arch/arm/mach-pxa/include/mach/trizeps4.h b/arch/arm/mach-pxa/include/mach/trizeps4.h
index 903e1a2e6641..d2ca01053f69 100644
--- a/arch/arm/mach-pxa/include/mach/trizeps4.h
+++ b/arch/arm/mach-pxa/include/mach/trizeps4.h
@@ -43,30 +43,30 @@
 
 /* Ethernet Controller Davicom DM9000 */
 #define GPIO_DM9000             101
-#define TRIZEPS4_ETH_IRQ        IRQ_GPIO(GPIO_DM9000)
+#define TRIZEPS4_ETH_IRQ        PXA_GPIO_TO_IRQ(GPIO_DM9000)
 
 /* UCB1400 audio / TS-controller */
 #define GPIO_UCB1400            1
-#define TRIZEPS4_UCB1400_IRQ    IRQ_GPIO(GPIO_UCB1400)
+#define TRIZEPS4_UCB1400_IRQ    PXA_GPIO_TO_IRQ(GPIO_UCB1400)
 
 /* PCMCIA socket Compact Flash */
 #define GPIO_PCD                11              /* PCMCIA Card Detect */
-#define TRIZEPS4_CD_IRQ         IRQ_GPIO(GPIO_PCD)
+#define TRIZEPS4_CD_IRQ         PXA_GPIO_TO_IRQ(GPIO_PCD)
 #define GPIO_PRDY               13              /* READY / nINT */
-#define TRIZEPS4_READY_NINT     IRQ_GPIO(GPIO_PRDY)
+#define TRIZEPS4_READY_NINT     PXA_GPIO_TO_IRQ(GPIO_PRDY)
 
 /* MMC socket */
 #define GPIO_MMC_DET            12
-#define TRIZEPS4_MMC_IRQ        IRQ_GPIO(GPIO_MMC_DET)
+#define TRIZEPS4_MMC_IRQ        PXA_GPIO_TO_IRQ(GPIO_MMC_DET)
 
 /* DOC NAND chip */
 #define GPIO_DOC_LOCK           94
 #define GPIO_DOC_IRQ            93
-#define TRIZEPS4_DOC_IRQ        IRQ_GPIO(GPIO_DOC_IRQ)
+#define TRIZEPS4_DOC_IRQ        PXA_GPIO_TO_IRQ(GPIO_DOC_IRQ)
 
 /* SPI interface */
 #define GPIO_SPI                53
-#define TRIZEPS4_SPI_IRQ        IRQ_GPIO(GPIO_SPI)
+#define TRIZEPS4_SPI_IRQ        PXA_GPIO_TO_IRQ(GPIO_SPI)
 
 /* LEDS using tx2 / rx2 */
 #define GPIO_SYS_BUSY_LED       46
@@ -74,7 +74,7 @@
 
 /* Off-module PIC on ConXS board */
 #define GPIO_PIC                0
-#define TRIZEPS4_PIC_IRQ        IRQ_GPIO(GPIO_PIC)
+#define TRIZEPS4_PIC_IRQ        PXA_GPIO_TO_IRQ(GPIO_PIC)
 
 #ifdef CONFIG_MACH_TRIZEPS_CONXS
 /* for CONXS base board define these registers */
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 532c5d3a97d2..5dae15ea6718 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -22,7 +22,6 @@
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>
-#include <mach/gpio-pxa.h>
 
 #include "generic.h"
 
@@ -92,44 +91,6 @@ static struct irq_chip pxa_internal_irq_chip = {
         .irq_unmask     = pxa_unmask_irq,
 };
 
-/*
- * GPIO IRQs for GPIO 0 and 1
- */
-static int pxa_set_low_gpio_type(struct irq_data *d, unsigned int type)
-{
-        int gpio = d->irq - IRQ_GPIO0;
-
-        if (__gpio_is_occupied(gpio)) {
-                pr_err("%s failed: GPIO is configured\n", __func__);
-                return -EINVAL;
-        }
-
-        if (type & IRQ_TYPE_EDGE_RISING)
-                GRER0 |= GPIO_bit(gpio);
-        else
-                GRER0 &= ~GPIO_bit(gpio);
-
-        if (type & IRQ_TYPE_EDGE_FALLING)
-                GFER0 |= GPIO_bit(gpio);
-        else
-                GFER0 &= ~GPIO_bit(gpio);
-
-        return 0;
-}
-
-static void pxa_ack_low_gpio(struct irq_data *d)
-{
-        GEDR0 = (1 << (d->irq - IRQ_GPIO0));
-}
-
-static struct irq_chip pxa_low_gpio_chip = {
-        .name           = "GPIO-l",
-        .irq_ack        = pxa_ack_low_gpio,
-        .irq_mask       = pxa_mask_irq,
-        .irq_unmask     = pxa_unmask_irq,
-        .irq_set_type   = pxa_set_low_gpio_type,
-};
-
 asmlinkage void __exception_irq_entry icip_handle_irq(struct pt_regs *regs)
 {
         uint32_t icip, icmr, mask;
@@ -160,26 +121,7 @@ asmlinkage void __exception_irq_entry ichp_handle_irq(struct pt_regs *regs)
         } while (1);
 }
 
-static void __init pxa_init_low_gpio_irq(set_wake_t fn)
-{
-        int irq;
-
-        /* clear edge detection on GPIO 0 and 1 */
-        GFER0 &= ~0x3;
-        GRER0 &= ~0x3;
-        GEDR0 = 0x3;
-
-        for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
-                irq_set_chip_and_handler(irq, &pxa_low_gpio_chip,
-                                         handle_edge_irq);
-                irq_set_chip_data(irq, irq_base(0));
-                set_irq_flags(irq, IRQF_VALID);
-        }
-
-        pxa_low_gpio_chip.irq_set_wake = fn;
-}
-
-void __init pxa_init_irq(int irq_nr, set_wake_t fn)
+void __init pxa_init_irq(int irq_nr, int (*fn)(struct irq_data *, unsigned int))
 {
         int irq, i, n;
 
@@ -209,7 +151,6 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
         __raw_writel(1, irq_base(0) + ICCR);
 
         pxa_internal_irq_chip.irq_set_wake = fn;
-        pxa_init_low_gpio_irq(fn);
 }
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index c337c7eed514..1fb86edb857c 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -124,8 +124,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),
-                .end    = IRQ_GPIO(mfp_to_gpio(MFP_PIN_GPIO90)),
+                .start  = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)),
+                .end    = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO90)),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
         }
 };
@@ -396,7 +396,7 @@ static struct i2c_board_info littleton_i2c_info[] = {
                 .type           = "da9034",
                 .addr           = 0x34,
                 .platform_data  = &littleton_da9034_info,
-                .irq            = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO18)),
+                .irq            = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO18)),
         },
         [1] = {
                 .type           = "max7320",
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index 6119c015f393..cee9ce2fc0b5 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -152,8 +152,8 @@ static void __init lpd270_init_irq(void)
                                          handle_level_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
-        irq_set_chained_handler(IRQ_GPIO(0), lpd270_irq_handler);
-        irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
+        irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lpd270_irq_handler);
+        irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);
 }
 
 
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 4b7a52871652..6ebd276aebeb 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -170,8 +170,8 @@ static void __init lubbock_init_irq(void)
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        irq_set_chained_handler(IRQ_GPIO(0), lubbock_irq_handler);
-        irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
+        irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), lubbock_irq_handler);
+        irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);
 }
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 4e6774fff422..3d6baf91396c 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -184,8 +184,8 @@ static struct resource egpio_resources[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = gpio_to_irq(GPIO13_MAGICIAN_CPLD_IRQ),
-                .end   = gpio_to_irq(GPIO13_MAGICIAN_CPLD_IRQ),
+                .start = PXA_GPIO_TO_IRQ(GPIO13_MAGICIAN_CPLD_IRQ),
+                .end   = PXA_GPIO_TO_IRQ(GPIO13_MAGICIAN_CPLD_IRQ),
                 .flags = IORESOURCE_IRQ,
         },
 };
@@ -468,8 +468,8 @@ static struct resource pasic3_resources[] = {
         },
         /* No IRQ handler in the PASIC3, DS1WM needs an external IRQ */
         [1] = {
-                .start  = gpio_to_irq(GPIO107_MAGICIAN_DS1WM_IRQ),
-                .end    = gpio_to_irq(GPIO107_MAGICIAN_DS1WM_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO107_MAGICIAN_DS1WM_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO107_MAGICIAN_DS1WM_IRQ),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index ca14555d5e15..1aebaf719462 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -178,8 +178,8 @@ static void __init mainstone_init_irq(void)
         MST_INTMSKENA = 0;
         MST_INTSETCLR = 0;
 
-        irq_set_chained_handler(IRQ_GPIO(0), mainstone_irq_handler);
-        irq_set_irq_type(IRQ_GPIO(0), IRQ_TYPE_EDGE_FALLING);
+        irq_set_chained_handler(PXA_GPIO_TO_IRQ(0), mainstone_irq_handler);
+        irq_set_irq_type(PXA_GPIO_TO_IRQ(0), IRQ_TYPE_EDGE_FALLING);
 }
 
 #ifdef CONFIG_PM
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index 43a5f6861ca3..f14775536b83 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -13,6 +13,7 @@
  *  published by the Free Software Foundation.
  */
 #include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -20,7 +21,6 @@
 
 #include <mach/pxa2xx-regs.h>
 #include <mach/mfp-pxa2xx.h>
-#include <mach/gpio-pxa.h>
 
 #include "generic.h"
 
@@ -29,6 +29,10 @@
 #define GAFR_L(x)       __GAFR(0, x)
 #define GAFR_U(x)       __GAFR(1, x)
 
+#define BANK_OFF(n)     (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
+#define GPLR(x)         __REG2(0x40E00000, BANK_OFF((x) >> 5))
+#define GPDR(x)         __REG2(0x40E00000, BANK_OFF((x) >> 5) + 0x0c)
+
 #define PWER_WE35       (1 << 24)
 
 struct gpio_desc {
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 924a3b5f8da6..e80a3db735c2 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -53,6 +53,7 @@
 #include <mach/pxa27x-udc.h>
 #include <mach/camera.h>
 #include <mach/audio.h>
+#include <mach/smemc.h>
 #include <media/soc_camera.h>
 
 #include <mach/mioa701.h>
@@ -390,24 +391,19 @@ static struct pxamci_platform_data mioa701_mci_info = {
 };
 
 /* FlashRAM */
-static struct resource strataflash_resource = {
+static struct resource docg3_resource = {
         .start = PXA_CS0_PHYS,
-        .end   = PXA_CS0_PHYS + SZ_64M - 1,
+        .end   = PXA_CS0_PHYS + SZ_8K - 1,
         .flags = IORESOURCE_MEM,
 };
 
-static struct physmap_flash_data strataflash_data = {
-        .width = 2,
-        /* .set_vpp = mioa701_set_vpp, */
-};
-
-static struct platform_device strataflash = {
-        .name          = "physmap-flash",
+static struct platform_device docg3 = {
+        .name          = "docg3",
         .id            = -1,
-        .resource      = &strataflash_resource,
+        .resource      = &docg3_resource,
         .num_resources = 1,
         .dev = {
-                .platform_data = &strataflash_data,
+                .platform_data = NULL,
         },
 };
 
@@ -541,15 +537,15 @@ static struct pda_power_pdata power_pdata = {
 static struct resource power_resources[] = {
         [0] = {
                 .name   = "ac",
-                .start  = gpio_to_irq(GPIO96_AC_DETECT),
-                .end    = gpio_to_irq(GPIO96_AC_DETECT),
+                .start  = PXA_GPIO_TO_IRQ(GPIO96_AC_DETECT),
+                .end    = PXA_GPIO_TO_IRQ(GPIO96_AC_DETECT),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |
                 IORESOURCE_IRQ_LOWEDGE,
         },
         [1] = {
                 .name   = "usb",
-                .start  = gpio_to_irq(GPIO13_nUSB_DETECT),
-                .end    = gpio_to_irq(GPIO13_nUSB_DETECT),
+                .start  = PXA_GPIO_TO_IRQ(GPIO13_nUSB_DETECT),
+                .end    = PXA_GPIO_TO_IRQ(GPIO13_nUSB_DETECT),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |
                 IORESOURCE_IRQ_LOWEDGE,
         },
@@ -685,7 +681,7 @@ static struct platform_device *devices[] __initdata = {
         &pxa2xx_pcm,
         &mioa701_sound,
         &power_dev,
-        &strataflash,
+        &docg3,
         &gpio_vbus,
         &mioa701_camera,
         &mioa701_board,
@@ -720,6 +716,15 @@ static void __init mioa701_machine_init(void)
         RTTR = 32768 - 1; /* Reset crazy WinCE value */
         UP2OCR = UP2OCR_HXOE;
 
+        /*
+         * Set up the flash memory : DiskOnChip G3 on first static memory bank
+         */
+        __raw_writel(0x7ff02dd8, MSC0);
+        __raw_writel(0x0001c391, MCMEM0);
+        __raw_writel(0x0001c391, MCATT0);
+        __raw_writel(0x0001c391, MCIO0);
+
+
         pxa2xx_mfp_config(ARRAY_AND_SIZE(mioa701_pin_config));
         pxa_set_ffuart_info(NULL);
         pxa_set_btuart_info(NULL);
diff --git a/arch/arm/mach-pxa/mxm8x10.c b/arch/arm/mach-pxa/mxm8x10.c
index 90928d6e1a5b..83570a79e7d2 100644
--- a/arch/arm/mach-pxa/mxm8x10.c
+++ b/arch/arm/mach-pxa/mxm8x10.c
@@ -417,8 +417,8 @@ static struct resource dm9k_resources[] = {
                .flags = IORESOURCE_MEM
         },
         [2] = {
-               .start = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO9)),
-               .end = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO9)),
+               .start = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO9)),
+               .end = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO9)),
                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE
         }
 };
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 6d38c6548b3d..abab4e2b122c 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -378,7 +378,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
 #include <linux/i2c/pca953x.h>
 
 static struct pca953x_platform_data pca9536_data = {
-        .gpio_base      = NR_BUILTIN_GPIO,
+        .gpio_base      = PXA_NR_BUILTIN_GPIO,
 };
 
 static int gpio_bus_switch = -EINVAL;
@@ -406,9 +406,9 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)
         int ret;
 
         if (gpio_bus_switch < 0) {
-                ret = gpio_request(NR_BUILTIN_GPIO, "camera");
+                ret = gpio_request(PXA_NR_BUILTIN_GPIO, "camera");
                 if (!ret) {
-                        gpio_bus_switch = NR_BUILTIN_GPIO;
+                        gpio_bus_switch = PXA_NR_BUILTIN_GPIO;
                         gpio_direction_output(gpio_bus_switch, 0);
                 }
         }
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index b260ce872d2d..69036e42ca31 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -166,8 +166,8 @@ static struct resource locomo_resources[] = {
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
-                .start          = IRQ_GPIO(10),
-                .end            = IRQ_GPIO(10),
+                .start          = PXA_GPIO_TO_IRQ(10),
+                .end            = PXA_GPIO_TO_IRQ(10),
                 .flags          = IORESOURCE_IRQ,
         },
 };
@@ -212,7 +212,7 @@ static struct spi_board_info poodle_spi_devices[] = {
                 .bus_num        = 1,
                 .platform_data  = &poodle_ads7846_info,
                 .controller_data= &poodle_ads7846_chip,
-                .irq            = gpio_to_irq(POODLE_GPIO_TP_INT),
+                .irq            = PXA_GPIO_TO_IRQ(POODLE_GPIO_TP_INT),
         },
 };
 
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index f05f9486b0cb..adf058fa97ee 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -17,6 +17,7 @@
  * need be.
  */
 #include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -208,6 +209,8 @@ 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 =
@@ -287,7 +290,7 @@ static inline void pxa25x_init_pm(void) {}
 
 static int pxa25x_set_wake(struct irq_data *d, unsigned int on)
 {
-        int gpio = irq_to_gpio(d->irq);
+        int gpio = pxa_irq_to_gpio(d->irq);
         uint32_t mask = 0;
 
         if (gpio >= 0 && gpio < 85)
@@ -312,14 +315,12 @@ set_pwer:
 void __init pxa25x_init_irq(void)
 {
         pxa_init_irq(32, pxa25x_set_wake);
-        pxa_init_gpio(IRQ_GPIO_2_x, 2, 84, pxa25x_set_wake);
 }
 
 #ifdef CONFIG_CPU_PXA26x
 void __init pxa26x_init_irq(void)
 {
         pxa_init_irq(32, pxa25x_set_wake);
-        pxa_init_gpio(IRQ_GPIO_2_x, 2, 89, pxa25x_set_wake);
 }
 #endif
 
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index bc5a98ebaa72..180bd8675d4b 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -12,6 +12,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -229,6 +230,8 @@ 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
@@ -355,7 +358,7 @@ static inline void pxa27x_init_pm(void) {}
  */
 static int pxa27x_set_wake(struct irq_data *d, unsigned int on)
 {
-        int gpio = irq_to_gpio(d->irq);
+        int gpio = pxa_irq_to_gpio(d->irq);
         uint32_t mask;
 
         if (gpio >= 0 && gpio < 128)
@@ -386,7 +389,6 @@ static int pxa27x_set_wake(struct irq_data *d, unsigned int on)
 void __init pxa27x_init_irq(void)
 {
         pxa_init_irq(34, pxa27x_set_wake);
-        pxa_init_gpio(IRQ_GPIO_2_x, 2, 120, pxa27x_set_wake);
 }
 
 static struct map_desc pxa27x_io_desc[] __initdata = {
@@ -422,6 +424,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 }
 
 static struct platform_device *devices[] __initdata = {
+        &pxa_device_gpio,
         &pxa27x_device_udc,
         &pxa_device_pmu,
         &pxa_device_i2s,
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c
index 40bb16501d86..0388eda7878a 100644
--- a/arch/arm/mach-pxa/pxa300.c
+++ b/arch/arm/mach-pxa/pxa300.c
@@ -89,6 +89,7 @@ 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 8d614ecd8e99..d487e1ff4c9a 100644
--- a/arch/arm/mach-pxa/pxa320.c
+++ b/arch/arm/mach-pxa/pxa320.c
@@ -83,6 +83,7 @@ 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 0737c59b88ae..f107c71c7589 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -25,7 +25,6 @@
 #include <asm/mach/map.h>
 #include <asm/suspend.h>
 #include <mach/hardware.h>
-#include <mach/gpio-pxa.h>
 #include <mach/pxa3xx-regs.h>
 #include <mach/reset.h>
 #include <mach/ohci.h>
@@ -56,6 +55,7 @@ static DEFINE_PXA3_CKEN(pxa3xx_pwm0, PWM0, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_pwm1, PWM1, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_mmc1, MMC1, 19500000, 0);
 static DEFINE_PXA3_CKEN(pxa3xx_mmc2, MMC2, 19500000, 0);
+static DEFINE_PXA3_CKEN(pxa3xx_gpio, GPIO, 13000000, 0);
 
 static DEFINE_CK(pxa3xx_lcd, LCD, &clk_pxa3xx_hsio_ops);
 static DEFINE_CK(pxa3xx_smemc, SMC, &clk_pxa3xx_smemc_ops);
@@ -67,6 +67,7 @@ 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"),
@@ -88,6 +89,7 @@ static struct clk_lookup pxa3xx_clkregs[] = {
         INIT_CLKREG(&clk_pxa3xx_mmc1, "pxa2xx-mci.0", NULL),
         INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL),
         INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL),
+        INIT_CLKREG(&clk_pxa3xx_gpio, "pxa-gpio", NULL),
 };
 
 #ifdef CONFIG_PM
@@ -365,7 +367,8 @@ static struct irq_chip pxa_ext_wakeup_chip = {
         .irq_set_type   = pxa_set_ext_wakeup_type,
 };
 
-static void __init pxa_init_ext_wakeup_irq(set_wake_t fn)
+static void __init pxa_init_ext_wakeup_irq(int (*fn)(struct irq_data *,
+                                           unsigned int))
 {
         int irq;
 
@@ -388,7 +391,6 @@ void __init pxa3xx_init_irq(void)
 
         pxa_init_irq(56, pxa3xx_set_wake);
         pxa_init_ext_wakeup_irq(pxa3xx_set_wake);
-        pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL);
 }
 
 static struct map_desc pxa3xx_io_desc[] __initdata = {
@@ -417,6 +419,7 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 }
 
 static struct platform_device *devices[] __initdata = {
+        &pxa_device_gpio,
         &pxa27x_device_udc,
         &pxa_device_pmu,
         &pxa_device_i2s,
diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c
index 51371b39d2a3..fccc644702e6 100644
--- a/arch/arm/mach-pxa/pxa95x.c
+++ b/arch/arm/mach-pxa/pxa95x.c
@@ -20,7 +20,6 @@
 #include <linux/syscore_ops.h>
 
 #include <mach/hardware.h>
-#include <mach/gpio-pxa.h>
 #include <mach/pxa3xx-regs.h>
 #include <mach/pxa930.h>
 #include <mach/reset.h>
@@ -212,11 +211,13 @@ static DEFINE_PXA3_CKEN(pxa95x_ssp3, SSP3, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa95x_ssp4, SSP4, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa95x_pwm0, PWM0, 13000000, 0);
 static DEFINE_PXA3_CKEN(pxa95x_pwm1, PWM1, 13000000, 0);
+static DEFINE_PXA3_CKEN(pxa95x_gpio, GPIO, 13000000, 0);
 
 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),
@@ -230,12 +231,12 @@ static struct clk_lookup pxa95x_clkregs[] = {
         INIT_CLKREG(&clk_pxa95x_ssp4, "pxa27x-ssp.3", NULL),
         INIT_CLKREG(&clk_pxa95x_pwm0, "pxa27x-pwm.0", NULL),
         INIT_CLKREG(&clk_pxa95x_pwm1, "pxa27x-pwm.1", NULL),
+        INIT_CLKREG(&clk_pxa95x_gpio, "pxa-gpio", NULL),
 };
 
 void __init pxa95x_init_irq(void)
 {
         pxa_init_irq(96, NULL);
-        pxa_init_gpio(IRQ_GPIO_2_x, 2, 127, NULL);
 }
 
 /*
@@ -248,6 +249,7 @@ void __init pxa95x_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 }
 
 static struct platform_device *devices[] __initdata = {
+        &pxa_device_gpio,
         &sa1100_device_rtc,
         &pxa_device_rtc,
         &pxa27x_device_ssp1,
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 4962b1676629..22818c7694a8 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -292,8 +292,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = gpio_to_irq(GPIO_ETH_IRQ),
-                .end    = gpio_to_irq(GPIO_ETH_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO_ETH_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO_ETH_IRQ),
                 .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_FALLING,
         }
 };
@@ -672,7 +672,7 @@ static struct lis3lv02d_platform_data lis3_pdata = {
         .chip_select    = 1,                    \
         .controller_data = (void *) GPIO_ACCEL_CS,      \
         .platform_data  = &lis3_pdata,          \
-        .irq            = gpio_to_irq(GPIO_ACCEL_IRQ),  \
+        .irq            = PXA_GPIO_TO_IRQ(GPIO_ACCEL_IRQ),      \
 }
 
 #define SPI_DAC7512     \
@@ -956,7 +956,7 @@ static struct eeti_ts_platform_data eeti_ts_pdata = {
 static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {
         .type   = "eeti_ts",
         .addr   = 0x0a,
-        .irq    = gpio_to_irq(GPIO_TOUCH_IRQ),
+        .irq    = PXA_GPIO_TO_IRQ(GPIO_TOUCH_IRQ),
         .platform_data = &eeti_ts_pdata,
 };
 
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c
index 878707056e65..0fe354efb931 100644
--- a/arch/arm/mach-pxa/saar.c
+++ b/arch/arm/mach-pxa/saar.c
@@ -96,8 +96,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO97)),
-                .end    = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO97)),
+                .start  = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO97)),
+                .end    = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO97)),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
@@ -502,7 +502,7 @@ static struct i2c_board_info saar_i2c_info[] = {
                 .type           = "da9034",
                 .addr           = 0x34,
                 .platform_data  = &saar_da9034_info,
-                .irq            = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)),
+                .irq            = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)),
         },
 };
 
diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c
index b6dbaca460c7..febc809ed5a6 100644
--- a/arch/arm/mach-pxa/saarb.c
+++ b/arch/arm/mach-pxa/saarb.c
@@ -92,7 +92,7 @@ static struct i2c_board_info saarb_i2c_info[] = {
                 .type           = "88PM860x",
                 .addr           = 0x34,
                 .platform_data  = &saarb_pm8607_info,
-                .irq            = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)),
+                .irq            = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)),
         },
 };
 
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 785880f67b60..8d5168d253a9 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -907,24 +907,24 @@ static int __devinit sharpsl_pm_probe(struct platform_device *pdev)
         gpio_direction_input(sharpsl_pm.machinfo->gpio_batlock);
 
         /* Register interrupt handlers */
-        if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "AC Input Detect", sharpsl_ac_isr)) {
-                dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin));
+        if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, "AC Input Detect", sharpsl_ac_isr)) {
+                dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_acin));
         }
 
-        if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Battery Cover", sharpsl_fatal_isr)) {
-                dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock));
+        if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Battery Cover", sharpsl_fatal_isr)) {
+                dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_batlock));
         }
 
         if (sharpsl_pm.machinfo->gpio_fatal) {
-                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Fatal Battery", sharpsl_fatal_isr)) {
-                        dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal));
+                if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr, IRQF_DISABLED | IRQF_TRIGGER_FALLING, "Fatal Battery", sharpsl_fatal_isr)) {
+                        dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_fatal));
                 }
         }
 
         if (sharpsl_pm.machinfo->batfull_irq) {
                 /* Register interrupt handler. */
-                if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) {
-                        dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull));
+                if (request_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) {
+                        dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_batfull));
                 }
         }
 
@@ -953,14 +953,14 @@ static int sharpsl_pm_remove(struct platform_device *pdev)
 
         led_trigger_unregister_simple(sharpsl_charge_led_trigger);
 
-        free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr);
-        free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr);
+        free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr);
+        free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr);
 
         if (sharpsl_pm.machinfo->gpio_fatal)
-                free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr);
+                free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_fatal), sharpsl_fatal_isr);
 
         if (sharpsl_pm.machinfo->batfull_irq)
-                free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr);
+                free_irq(PXA_GPIO_TO_IRQ(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr);
 
         gpio_free(sharpsl_pm.machinfo->gpio_batlock);
         gpio_free(sharpsl_pm.machinfo->gpio_batfull);
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index a7f81a3fd132..abf355d0c92f 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -552,7 +552,7 @@ static struct spi_board_info spitz_spi_devices[] = {
                 .chip_select            = 0,
                 .platform_data          = &spitz_ads7846_info,
                 .controller_data        = &spitz_ads7846_chip,
-                .irq                    = gpio_to_irq(SPITZ_GPIO_TP_INT),
+                .irq                    = PXA_GPIO_TO_IRQ(SPITZ_GPIO_TP_INT),
         }, {
                 .modalias               = "corgi-lcd",
                 .max_speed_hz           = 50000,
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 094279aefe9c..34cbdac51525 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/apm-emulation.h>
@@ -41,6 +42,7 @@ static int spitz_last_ac_status;
 static struct gpio spitz_charger_gpios[] = {
         { SPITZ_GPIO_KEY_INT,   GPIOF_IN, "Keyboard Interrupt" },
         { SPITZ_GPIO_SYNC,      GPIOF_IN, "Sync" },
+        { SPITZ_GPIO_AC_IN,     GPIOF_IN, "Charger Detection" },
         { SPITZ_GPIO_ADC_TEMP_ON, GPIOF_OUT_INIT_LOW, "ADC Temp On" },
         { SPITZ_GPIO_JK_B,        GPIOF_OUT_INIT_LOW, "JK B" },
         { SPITZ_GPIO_CHRG_ON,     GPIOF_OUT_INIT_LOW, "Charger On" },
@@ -169,14 +171,19 @@ static int spitz_should_wakeup(unsigned int resume_on_alarm)
 
 static unsigned long spitz_charger_wakeup(void)
 {
-        return (~GPLR0 & GPIO_bit(SPITZ_GPIO_KEY_INT)) | (GPLR0 & GPIO_bit(SPITZ_GPIO_SYNC));
+        unsigned long ret;
+        ret = (!gpio_get_value(SPITZ_GPIO_KEY_INT)
+                << GPIO_bit(SPITZ_GPIO_KEY_INT))
+                | (!gpio_get_value(SPITZ_GPIO_SYNC)
+                << GPIO_bit(SPITZ_GPIO_SYNC));
+        return ret;
 }
 
 unsigned long spitzpm_read_devdata(int type)
 {
         switch (type) {
         case SHARPSL_STATUS_ACIN:
-                return (((~GPLR(SPITZ_GPIO_AC_IN)) & GPIO_bit(SPITZ_GPIO_AC_IN)) != 0);
+                return !gpio_get_value(SPITZ_GPIO_AC_IN);
         case SHARPSL_STATUS_LOCK:
                 return gpio_get_value(sharpsl_pm.machinfo->gpio_batlock);
         case SHARPSL_STATUS_CHRGFULL:
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 80d7f23ad0fd..d8a2467de92e 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -376,7 +376,7 @@ static struct spi_board_info spi_board_info[] __initdata = {
                 .bus_num = 1,
                 .chip_select = 0,
                 .controller_data = &staccel_chip_info,
-                .irq = IRQ_GPIO(96),
+                .irq = PXA_GPIO_TO_IRQ(96),
         }, {
                 .modalias = "cc2420",
                 .max_speed_hz = 6500000,
@@ -546,7 +546,7 @@ static struct i2c_board_info __initdata imote2_pwr_i2c_board_info[] = {
                 .type = "da9030",
                 .addr = 0x49,
                 .platform_data = &imote2_da9030_pdata,
-                .irq = gpio_to_irq(1),
+                .irq = PXA_GPIO_TO_IRQ(1),
         },
 };
 
@@ -560,18 +560,18 @@ static struct i2c_board_info __initdata imote2_i2c_board_info[] = {
                 /* Through a nand gate - Also beware, on V2 sensor board the
                  * pull up resistors are missing.
                  */
-                .irq = IRQ_GPIO(99),
+                .irq = PXA_GPIO_TO_IRQ(99),
         }, { /* ITS400 Sensor board only */
                 .type = "tsl2561",
                 .addr = 0x49,
                 /* Through a nand gate - Also beware, on V2 sensor board the
                  * pull up resistors are missing.
                  */
-                .irq = IRQ_GPIO(99),
+                .irq = PXA_GPIO_TO_IRQ(99),
         }, { /* ITS400 Sensor board only */
                 .type = "tmp175",
                 .addr = 0x4A,
-                .irq = IRQ_GPIO(96),
+                .irq = PXA_GPIO_TO_IRQ(96),
         }, { /* IMB400 Multimedia board */
                 .type = "wm8940",
                 .addr = 0x1A,
@@ -661,8 +661,8 @@ static struct resource smc91x_resources[] = {
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
-                .start = IRQ_GPIO(40),
-                .end = IRQ_GPIO(40),
+                .start = PXA_GPIO_TO_IRQ(40),
+                .end = PXA_GPIO_TO_IRQ(40),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
@@ -707,7 +707,7 @@ static int stargate2_mci_init(struct device *dev,
         }
         gpio_direction_input(SG2_GPIO_nSD_DETECT);
 
-        err = request_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT),
+        err = request_irq(PXA_GPIO_TO_IRQ(SG2_GPIO_nSD_DETECT),
                           stargate2_detect_int,
                           IRQ_TYPE_EDGE_BOTH,
                           "MMC card detect",
@@ -738,7 +738,7 @@ static void stargate2_mci_setpower(struct device *dev, unsigned int vdd)
 
 static void stargate2_mci_exit(struct device *dev, void *data)
 {
-        free_irq(IRQ_GPIO(SG2_GPIO_nSD_DETECT), data);
+        free_irq(PXA_GPIO_TO_IRQ(SG2_GPIO_nSD_DETECT), data);
         gpio_free(SG2_SD_POWER_ENABLE);
         gpio_free(SG2_GPIO_nSD_DETECT);
 }
@@ -913,7 +913,7 @@ static struct i2c_board_info __initdata stargate2_pwr_i2c_board_info[] = {
                 .type = "da9030",
                 .addr = 0x49,
                 .platform_data = &stargate2_da9030_pdata,
-                .irq = gpio_to_irq(1),
+                .irq = PXA_GPIO_TO_IRQ(1),
         },
 };
 
@@ -938,18 +938,18 @@ static struct i2c_board_info __initdata stargate2_i2c_board_info[] = {
                 /* Through a nand gate - Also beware, on V2 sensor board the
                  * pull up resistors are missing.
                  */
-                .irq = IRQ_GPIO(99),
+                .irq = PXA_GPIO_TO_IRQ(99),
         }, { /* ITS400 Sensor board only */
                 .type = "tsl2561",
                 .addr = 0x49,
                 /* Through a nand gate - Also beware, on V2 sensor board the
                  * pull up resistors are missing.
                  */
-                .irq = IRQ_GPIO(99),
+                .irq = PXA_GPIO_TO_IRQ(99),
         }, { /* ITS400 Sensor board only */
                 .type = "tmp175",
                 .addr = 0x4A,
-                .irq = IRQ_GPIO(96),
+                .irq = PXA_GPIO_TO_IRQ(96),
         },
 };
 
diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c
index 4fa36a3e383c..9fb38e80e076 100644
--- a/arch/arm/mach-pxa/tavorevb.c
+++ b/arch/arm/mach-pxa/tavorevb.c
@@ -85,8 +85,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO47)),
-                .end    = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO47)),
+                .start  = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO47)),
+                .end    = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO47)),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         }
 };
diff --git a/arch/arm/mach-pxa/tavorevb3.c b/arch/arm/mach-pxa/tavorevb3.c
index 8a22879f0bb0..f7d9305cfd77 100644
--- a/arch/arm/mach-pxa/tavorevb3.c
+++ b/arch/arm/mach-pxa/tavorevb3.c
@@ -101,7 +101,7 @@ static struct i2c_board_info evb3_i2c_info[] = {
                 .type           = "88PM860x",
                 .addr           = 0x34,
                 .platform_data  = &evb3_pm8607_info,
-                .irq            = gpio_to_irq(mfp_to_gpio(MFP_PIN_GPIO83)),
+                .irq            = PXA_GPIO_TO_IRQ(mfp_to_gpio(MFP_PIN_GPIO83)),
         },
 };
 
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index dfe40f8705aa..7ce5c436cc4e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -404,8 +404,8 @@ static struct pda_power_pdata tosa_power_data = {
 static struct resource tosa_power_resource[] = {
         {
                 .name           = "ac",
-                .start          = gpio_to_irq(TOSA_GPIO_AC_IN),
-                .end            = gpio_to_irq(TOSA_GPIO_AC_IN),
+                .start          = PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN),
+                .end            = PXA_GPIO_TO_IRQ(TOSA_GPIO_AC_IN),
                 .flags          = IORESOURCE_IRQ |
                                   IORESOURCE_IRQ_HIGHEDGE |
                                   IORESOURCE_IRQ_LOWEDGE,
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index afe2b7495523..023d6ca789de 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -422,8 +422,8 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = gpio_to_irq(VIPER_ETH_GPIO),
-                .end    = gpio_to_irq(VIPER_ETH_GPIO),
+                .start  = PXA_GPIO_TO_IRQ(VIPER_ETH_GPIO),
+                .end    = PXA_GPIO_TO_IRQ(VIPER_ETH_GPIO),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
         [2] = {
@@ -546,7 +546,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         /* External UARTs */
         {
                 .mapbase        = VIPER_UARTA_PHYS,
-                .irq            = gpio_to_irq(VIPER_UARTA_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(VIPER_UARTA_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 1843200,
                 .regshift       = 1,
@@ -556,7 +556,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         {
                 .mapbase        = VIPER_UARTB_PHYS,
-                .irq            = gpio_to_irq(VIPER_UARTB_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(VIPER_UARTB_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 1843200,
                 .regshift       = 1,
@@ -596,8 +596,8 @@ static struct resource isp116x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [2] = {
-                .start  = gpio_to_irq(VIPER_USB_GPIO),
-                .end    = gpio_to_irq(VIPER_USB_GPIO),
+                .start  = PXA_GPIO_TO_IRQ(VIPER_USB_GPIO),
+                .end    = PXA_GPIO_TO_IRQ(VIPER_USB_GPIO),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
 };
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index fed5fb088714..1f5cfa96f6d6 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -395,8 +395,8 @@ static struct resource vpac270_dm9000_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [2] = {
-                .start  = IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ),
-                .end    = IRQ_GPIO(GPIO114_VPAC270_ETH_IRQ),
+                .start  = PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ),
+                .end    = PXA_GPIO_TO_IRQ(GPIO114_VPAC270_ETH_IRQ),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
 };
@@ -433,7 +433,7 @@ static pxa2xx_audio_ops_t vpac270_ac97_pdata = {
 };
 
 static struct ucb1400_pdata vpac270_ucb1400_pdata = {
-        .irq            = IRQ_GPIO(GPIO113_VPAC270_TS_IRQ),
+        .irq            = PXA_GPIO_TO_IRQ(GPIO113_VPAC270_TS_IRQ),
 };
 
 static struct platform_device vpac270_ucb1400_device = {
@@ -610,8 +610,8 @@ static struct resource vpac270_ide_resources[] = {
                .flags   = IORESOURCE_DMA
         },
         [3] = { /* IDE IRQ pin */
-               .start   = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),
-               .end     = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),
+               .start   = PXA_GPIO_TO_IRQ(GPIO36_VPAC270_IDE_IRQ),
+               .end     = PXA_GPIO_TO_IRQ(GPIO36_VPAC270_IDE_IRQ),
                .flags   = IORESOURCE_IRQ
         }
 };
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index d75f66ab8c34..b6476848b561 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -573,7 +573,7 @@ static struct spi_board_info spi_board_info[] __initdata = {
         .modalias               = "libertas_spi",
         .platform_data          = &z2_lbs_pdata,
         .controller_data        = &z2_lbs_chip_info,
-        .irq                    = gpio_to_irq(GPIO36_ZIPITZ2_WIFI_IRQ),
+        .irq                    = PXA_GPIO_TO_IRQ(GPIO36_ZIPITZ2_WIFI_IRQ),
         .max_speed_hz           = 13000000,
         .bus_num                = 1,
         .chip_select            = 0,
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 9db35a7fcfc0..a4dd1c347050 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -233,7 +233,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         /* FIXME: Shared IRQs on COM1-COM4 will not work properly on v1i1 hardware. */
         { /* COM1 */
                 .mapbase        = 0x10000000,
-                .irq            = gpio_to_irq(ZEUS_UARTA_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTA_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -242,7 +242,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         { /* COM2 */
                 .mapbase        = 0x10800000,
-                .irq            = gpio_to_irq(ZEUS_UARTB_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTB_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -251,7 +251,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         { /* COM3 */
                 .mapbase        = 0x11000000,
-                .irq            = gpio_to_irq(ZEUS_UARTC_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTC_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -260,7 +260,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         },
         { /* COM4 */
                 .mapbase        = 0x11800000,
-                .irq            = gpio_to_irq(ZEUS_UARTD_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_UARTD_GPIO),
                 .irqflags       = IRQF_TRIGGER_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 1,
@@ -321,8 +321,8 @@ static struct resource zeus_dm9k0_resource[] = {
                 .flags = IORESOURCE_MEM
         },
         [2] = {
-                .start = gpio_to_irq(ZEUS_ETH0_GPIO),
-                .end   = gpio_to_irq(ZEUS_ETH0_GPIO),
+                .start = PXA_GPIO_TO_IRQ(ZEUS_ETH0_GPIO),
+                .end   = PXA_GPIO_TO_IRQ(ZEUS_ETH0_GPIO),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
         },
 };
@@ -339,8 +339,8 @@ static struct resource zeus_dm9k1_resource[] = {
                 .flags = IORESOURCE_MEM,
         },
         [2] = {
-                .start = gpio_to_irq(ZEUS_ETH1_GPIO),
-                .end   = gpio_to_irq(ZEUS_ETH1_GPIO),
+                .start = PXA_GPIO_TO_IRQ(ZEUS_ETH1_GPIO),
+                .end   = PXA_GPIO_TO_IRQ(ZEUS_ETH1_GPIO),
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWEDGE,
         },
 };
@@ -423,7 +423,7 @@ static struct spi_board_info zeus_spi_board_info[] = {
         [0] = {
                 .modalias       = "mcp2515",
                 .platform_data  = &zeus_mcp2515_pdata,
-                .irq            = gpio_to_irq(ZEUS_CAN_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_CAN_GPIO),
                 .max_speed_hz   = 1*1000*1000,
                 .bus_num        = 3,
                 .mode           = SPI_MODE_0,
@@ -753,7 +753,7 @@ static struct i2c_board_info __initdata zeus_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("pca9535",       0x20),
                 .platform_data  = &zeus_pca953x_pdata[2],
-                .irq            = gpio_to_irq(ZEUS_EXTGPIO_GPIO),
+                .irq            = PXA_GPIO_TO_IRQ(ZEUS_EXTGPIO_GPIO),
         },
         { I2C_BOARD_INFO("lm75a",       0x48) },
         { I2C_BOARD_INFO("24c01",       0x50) },
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index 7678b1bf7903..98eec80623e3 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -408,8 +408,8 @@ static void __init zylonite_init(void)
          * Note: We depend that the bootloader set
          * the correct value to MSC register for SMC91x.
          */
-        smc91x_resources[1].start = gpio_to_irq(gpio_eth_irq);
-        smc91x_resources[1].end   = gpio_to_irq(gpio_eth_irq);
+        smc91x_resources[1].start = PXA_GPIO_TO_IRQ(gpio_eth_irq);
+        smc91x_resources[1].end   = PXA_GPIO_TO_IRQ(gpio_eth_irq);
         platform_device_register(&smc91x_device);
 
         pxa_set_ac97_info(NULL);
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c
index 93c64d8d7de9..86e59c043de2 100644
--- a/arch/arm/mach-pxa/zylonite_pxa300.c
+++ b/arch/arm/mach-pxa/zylonite_pxa300.c
@@ -231,12 +231,12 @@ static struct i2c_board_info zylonite_i2c_board_info[] = {
                 .type           = "pca9539",
                 .addr           = 0x74,
                 .platform_data  = &gpio_exp[0],
-                .irq            = IRQ_GPIO(18),
+                .irq            = PXA_GPIO_TO_IRQ(18),
         }, {
                 .type           = "pca9539",
                 .addr           = 0x75,
                 .platform_data  = &gpio_exp[1],
-                .irq            = IRQ_GPIO(19),
+                .irq            = PXA_GPIO_TO_IRQ(19),
         },
 };
 
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index c6133c6ec18f..feeaf73933dc 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -165,22 +165,6 @@ static struct map_desc bast_iodesc[] __initdata = {
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
 #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
 
-static struct s3c24xx_uart_clksrc bast_serial_clocks[] = {
-        [0] = {
-                .name           = "uclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-        [1] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        }
-};
-
-
 static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
         [0] = {
                 .hwport      = 0,
@@ -188,8 +172,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = bast_serial_clocks,
-                .clocks_size = ARRAY_SIZE(bast_serial_clocks),
         },
         [1] = {
                 .hwport      = 1,
@@ -197,8 +179,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = bast_serial_clocks,
-                .clocks_size = ARRAY_SIZE(bast_serial_clocks),
         },
         /* port 2 is not actually used */
         [2] = {
@@ -207,8 +187,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = bast_serial_clocks,
-                .clocks_size = ARRAY_SIZE(bast_serial_clocks),
         }
 };
 
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index cc7032b5c65b..dbe668a803ef 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -110,23 +110,6 @@ static struct map_desc vr1000_iodesc[] __initdata = {
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
 #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
 
-/* uart clock source(s) */
-
-static struct s3c24xx_uart_clksrc vr1000_serial_clocks[] = {
-        [0] = {
-                .name           = "uclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-        [1] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0.
-        }
-};
-
 static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {
         [0] = {
                 .hwport      = 0,
@@ -134,8 +117,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = vr1000_serial_clocks,
-                .clocks_size = ARRAY_SIZE(vr1000_serial_clocks),
         },
         [1] = {
                 .hwport      = 1,
@@ -143,8 +124,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = vr1000_serial_clocks,
-                .clocks_size = ARRAY_SIZE(vr1000_serial_clocks),
         },
         /* port 2 is not actually used */
         [2] = {
@@ -153,9 +132,6 @@ static struct s3c2410_uartcfg vr1000_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = vr1000_serial_clocks,
-                .clocks_size = ARRAY_SIZE(vr1000_serial_clocks),
-
         }
 };
 
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index eea559ec7a58..061b6bb1a557 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -124,12 +124,18 @@ static struct clk s3c2410_armclk = {
         .id     = -1,
 };
 
+static struct clk_lookup s3c2410_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud0", &clk_p),
+        CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
+};
+
 void __init s3c2410_init_clocks(int xtal)
 {
         s3c24xx_register_baseclocks(xtal);
         s3c2410_setup_clocks();
         s3c2410_baseclk_add();
         s3c24xx_register_clock(&s3c2410_armclk);
+        clkdev_add_table(s3c2410_clk_lookup, ARRAY_SIZE(s3c2410_clk_lookup));
 }
 
 struct bus_type s3c2410_subsys = {
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c
index 516881640808..d10b695a9066 100644
--- a/arch/arm/mach-s3c2412/clock.c
+++ b/arch/arm/mach-s3c2412/clock.c
@@ -659,6 +659,12 @@ static struct clk *clks[] __initdata = {
         &clk_armclk,
 };
 
+static struct clk_lookup s3c2412_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_usysclk),
+};
+
 int __init s3c2412_baseclk_add(void)
 {
         unsigned long clkcon  = __raw_readl(S3C2410_CLKCON);
@@ -751,6 +757,7 @@ int __init s3c2412_baseclk_add(void)
                 s3c2412_clkcon_enable(clkp, 0);
         }
 
+        clkdev_add_table(s3c2412_clk_lookup, ARRAY_SIZE(s3c2412_clk_lookup));
         s3c_pwmclk_init();
         return 0;
 }
diff --git a/arch/arm/mach-s3c2416/Makefile b/arch/arm/mach-s3c2416/Makefile
index 7b805b279caf..ca0cd227f873 100644
--- a/arch/arm/mach-s3c2416/Makefile
+++ b/arch/arm/mach-s3c2416/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_S3C2416_PM)	+= pm.o
 #obj-$(CONFIG_S3C2416_DMA)      += dma.o
 
 # Device setup
-obj-$(CONFIG_S3C2416_SETUP_SDHCI) += setup-sdhci.o
 obj-$(CONFIG_S3C2416_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
 
 # Machine support
diff --git a/arch/arm/mach-s3c2416/clock.c b/arch/arm/mach-s3c2416/clock.c
index afbbe8bc21d1..59f54d1d7f8b 100644
--- a/arch/arm/mach-s3c2416/clock.c
+++ b/arch/arm/mach-s3c2416/clock.c
@@ -90,39 +90,38 @@ static struct clksrc_clk hsmmc_div[] = {
         },
 };
 
-static struct clksrc_clk hsmmc_mux[] = {
-        [0] = {
-                .clk    = {
-                        .name   = "hsmmc-if",
-                        .devname        = "s3c-sdhci.0",
-                        .ctrlbit = (1 << 6),
-                        .enable = s3c2443_clkcon_enable_s,
-                },
-                .sources = &(struct clksrc_sources) {
-                        .nr_sources = 2,
-                        .sources = (struct clk *[]) {
-                                [0] = &hsmmc_div[0].clk,
-                                [1] = NULL, /* to fix */
-                        },
-                },
-                .reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 16 },
+static struct clksrc_clk hsmmc_mux0 = {
+        .clk    = {
+                .name           = "hsmmc-if",
+                .devname        = "s3c-sdhci.0",
+                .ctrlbit        = (1 << 6),
+                .enable         = s3c2443_clkcon_enable_s,
         },
-        [1] = {
-                .clk    = {
-                        .name   = "hsmmc-if",
-                        .devname        = "s3c-sdhci.1",
-                        .ctrlbit = (1 << 12),
-                        .enable = s3c2443_clkcon_enable_s,
+        .sources        = &(struct clksrc_sources) {
+                .nr_sources     = 2,
+                .sources        = (struct clk * []) {
+                        [0]     = &hsmmc_div[0].clk,
+                        [1]     = NULL, /* to fix */
                 },
-                .sources = &(struct clksrc_sources) {
-                        .nr_sources = 2,
-                        .sources = (struct clk *[]) {
-                                [0] = &hsmmc_div[1].clk,
-                                [1] = NULL, /* to fix */
-                        },
+        },
+        .reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 16 },
+};
+
+static struct clksrc_clk hsmmc_mux1 = {
+        .clk    = {
+                .name           = "hsmmc-if",
+                .devname        = "s3c-sdhci.1",
+                .ctrlbit        = (1 << 12),
+                .enable         = s3c2443_clkcon_enable_s,
+        },
+        .sources        = &(struct clksrc_sources) {
+                .nr_sources     = 2,
+                .sources        = (struct clk * []) {
+                        [0]     = &hsmmc_div[1].clk,
+                        [1]     = NULL, /* to fix */
                 },
-                .reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 17 },
         },
+        .reg_src = { .reg = S3C2443_CLKSRC, .size = 1, .shift = 17 },
 };
 
 static struct clk hsmmc0_clk = {
@@ -144,8 +143,14 @@ static struct clksrc_clk *clksrcs[] __initdata = {
         &hsspi_mux,
         &hsmmc_div[0],
         &hsmmc_div[1],
-        &hsmmc_mux[0],
-        &hsmmc_mux[1],
+        &hsmmc_mux0,
+        &hsmmc_mux1,
+};
+
+static struct clk_lookup s3c2416_clk_lookup[] = {
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &hsmmc0_clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &hsmmc_mux0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &hsmmc_mux1.clk),
 };
 
 void __init s3c2416_init_clocks(int xtal)
@@ -167,6 +172,7 @@ void __init s3c2416_init_clocks(int xtal)
                 s3c_register_clksrc(clksrcs[ptr], 1);
 
         s3c24xx_register_clock(&hsmmc0_clk);
+        clkdev_add_table(s3c2416_clk_lookup, ARRAY_SIZE(s3c2416_clk_lookup));
 
         s3c_pwmclk_init();
 
diff --git a/arch/arm/mach-s3c2416/mach-smdk2416.c b/arch/arm/mach-s3c2416/mach-smdk2416.c
index 66b71736609c..eebe1e72b93e 100644
--- a/arch/arm/mach-s3c2416/mach-smdk2416.c
+++ b/arch/arm/mach-s3c2416/mach-smdk2416.c
@@ -50,6 +50,7 @@
 #include <plat/nand.h>
 #include <plat/sdhci.h>
 #include <plat/udc.h>
+#include <linux/platform_data/s3c-hsudc.h>
 
 #include <plat/regs-fb-v4.h>
 #include <plat/fb.h>
diff --git a/arch/arm/mach-s3c2416/setup-sdhci.c b/arch/arm/mach-s3c2416/setup-sdhci.c
deleted file mode 100644
index cee53955eb02..000000000000
--- a/arch/arm/mach-s3c2416/setup-sdhci.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* linux/arch/arm/mach-s3c2416/setup-sdhci.c
- *
- * Copyright 2010 Promwad Innovation Company
- *      Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
- *
- * S3C2416 - Helper functions for settign up SDHCI device(s) (HSMMC)
- *
- * Based on mach-s3c64xx/setup-sdhci.c
- *
- * 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.
-*/
-
-#include <linux/types.h>
-
-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
-
-char *s3c2416_hsmmc_clksrcs[4] = {
-        [0] = "hsmmc",
-        [1] = "hsmmc",
-        [2] = "hsmmc-if",
-        /* [3] = "48m", - note not successfully used yet */
-};
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c
index d8957592fdc4..bedbc87a3426 100644
--- a/arch/arm/mach-s3c2440/clock.c
+++ b/arch/arm/mach-s3c2440/clock.c
@@ -33,6 +33,7 @@
 #include <linux/mutex.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/serial_core.h>
 
 #include <mach/hardware.h>
 #include <linux/atomic.h>
@@ -42,6 +43,7 @@
 
 #include <plat/clock.h>
 #include <plat/cpu.h>
+#include <plat/regs-serial.h>
 
 /* S3C2440 extended clock support */
 
@@ -107,6 +109,46 @@ static struct clk s3c2440_clk_ac97 = {
         .ctrlbit        = S3C2440_CLKCON_CAMERA,
 };
 
+static unsigned long  s3c2440_fclk_n_getrate(struct clk *clk)
+{
+        unsigned long ucon0, ucon1, ucon2, divisor;
+
+        /* the fun of calculating the uart divisors on the s3c2440 */
+        ucon0 = __raw_readl(S3C24XX_VA_UART0 + S3C2410_UCON);
+        ucon1 = __raw_readl(S3C24XX_VA_UART1 + S3C2410_UCON);
+        ucon2 = __raw_readl(S3C24XX_VA_UART2 + S3C2410_UCON);
+
+        ucon0 &= S3C2440_UCON0_DIVMASK;
+        ucon1 &= S3C2440_UCON1_DIVMASK;
+        ucon2 &= S3C2440_UCON2_DIVMASK;
+
+        if (ucon0 != 0)
+                divisor = (ucon0 >> S3C2440_UCON_DIVSHIFT) + 6;
+        else if (ucon1 != 0)
+                divisor = (ucon1 >> S3C2440_UCON_DIVSHIFT) + 21;
+        else if (ucon2 != 0)
+                divisor = (ucon2 >> S3C2440_UCON_DIVSHIFT) + 36;
+        else
+                /* manual calims 44, seems to be 9 */
+                divisor = 9;
+
+        return clk_get_rate(clk->parent) / divisor;
+}
+
+static struct clk s3c2440_clk_fclk_n = {
+        .name           = "fclk_n",
+        .parent         = &clk_f,
+        .ops            = &(struct clk_ops) {
+                .get_rate       = s3c2440_fclk_n_getrate,
+        },
+};
+
+static struct clk_lookup s3c2440_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
+};
+
 static int s3c2440_clk_add(struct device *dev)
 {
         struct clk *clock_upll;
@@ -125,10 +167,12 @@ static int s3c2440_clk_add(struct device *dev)
         s3c2440_clk_cam.parent = clock_h;
         s3c2440_clk_ac97.parent = clock_p;
         s3c2440_clk_cam_upll.parent = clock_upll;
+        s3c24xx_register_clock(&s3c2440_clk_fclk_n);
 
         s3c24xx_register_clock(&s3c2440_clk_ac97);
         s3c24xx_register_clock(&s3c2440_clk_cam);
         s3c24xx_register_clock(&s3c2440_clk_cam_upll);
+        clkdev_add_table(s3c2440_clk_lookup, ARRAY_SIZE(s3c2440_clk_lookup));
 
         clk_disable(&s3c2440_clk_ac97);
         clk_disable(&s3c2440_clk_cam);
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index 121ff8d2c887..24569550de1a 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -98,22 +98,6 @@ static struct map_desc anubis_iodesc[] __initdata = {
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
 #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
 
-static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {
-        [0] = {
-                .name           = "uclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-        [1] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        }
-};
-
-
 static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
         [0] = {
                 .hwport      = 0,
@@ -121,8 +105,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = anubis_serial_clocks,
-                .clocks_size = ARRAY_SIZE(anubis_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         },
         [1] = {
                 .hwport      = 2,
@@ -130,8 +113,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = anubis_serial_clocks,
-                .clocks_size = ARRAY_SIZE(anubis_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         },
 };
 
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c
index b7e334f07da4..d6a9763110cd 100644
--- a/arch/arm/mach-s3c2440/mach-at2440evb.c
+++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -59,22 +59,6 @@ static struct map_desc at2440evb_iodesc[] __initdata = {
 #define ULCON (S3C2410_LCON_CS8 | S3C2410_LCON_PNONE)
 #define UFCON (S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE)
 
-static struct s3c24xx_uart_clksrc at2440evb_serial_clocks[] = {
-        [0] = {
-                .name           = "uclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-        [1] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        }
-};
-
-
 static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {
         [0] = {
                 .hwport      = 0,
@@ -82,8 +66,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = at2440evb_serial_clocks,
-                .clocks_size = ARRAY_SIZE(at2440evb_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         },
         [1] = {
                 .hwport      = 1,
@@ -91,8 +74,7 @@ static struct s3c2410_uartcfg at2440evb_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = at2440evb_serial_clocks,
-                .clocks_size = ARRAY_SIZE(at2440evb_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         },
 };
 
diff --git a/arch/arm/mach-s3c2440/mach-mini2440.c b/arch/arm/mach-s3c2440/mach-mini2440.c
index 437322ffd88d..adbbb85bc4cd 100644
--- a/arch/arm/mach-s3c2440/mach-mini2440.c
+++ b/arch/arm/mach-s3c2440/mach-mini2440.c
@@ -169,6 +169,24 @@ static struct s3c2410fb_display mini2440_lcd_cfg[] __initdata = {
                 .lcdcon5        = (S3C2410_LCDCON5_FRM565 |
                                    S3C2410_LCDCON5_HWSWP),
         },
+        /* mini2440 + 3.5" TFT (LCD-W35i, LQ035Q1DG06 type) + touchscreen*/
+        [3] = {
+                _LCD_DECLARE(
+                        /* clock */
+                        7,
+                        /* xres, margin_right, margin_left, hsync */
+                        320, 68, 66, 4,
+                        /* yres, margin_top, margin_bottom, vsync */
+                        240, 4, 4, 9,
+                        /* refresh rate */
+                        60),
+                .lcdcon5        = (S3C2410_LCDCON5_FRM565 |
+                                   S3C2410_LCDCON5_INVVDEN |
+                                   S3C2410_LCDCON5_INVVFRAME |
+                                   S3C2410_LCDCON5_INVVLINE |
+                                   S3C2410_LCDCON5_INVVCLK |
+                                   S3C2410_LCDCON5_HWSWP),
+        },
 };
 
 /* todo - put into gpio header */
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index e795715fba30..4c480ef734f6 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -102,21 +102,6 @@ static struct map_desc osiris_iodesc[] __initdata = {
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
 #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
 
-static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = {
-        [0] = {
-                .name           = "uclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-        [1] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        }
-};
-
 static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
         [0] = {
                 .hwport      = 0,
@@ -124,8 +109,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = osiris_serial_clocks,
-                .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         },
         [1] = {
                 .hwport      = 1,
@@ -133,8 +117,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = osiris_serial_clocks,
-                .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         },
         [2] = {
                 .hwport      = 2,
@@ -142,8 +125,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = {
                 .ucon        = UCON,
                 .ulcon       = ULCON,
                 .ufcon       = UFCON,
-                .clocks      = osiris_serial_clocks,
-                .clocks_size = ARRAY_SIZE(osiris_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL1 | S3C2410_UCON_CLKSEL2,
         }
 };
 
diff --git a/arch/arm/mach-s3c2440/mach-rx1950.c b/arch/arm/mach-s3c2440/mach-rx1950.c
index 332d7533bd96..80077f6472ee 100644
--- a/arch/arm/mach-s3c2440/mach-rx1950.c
+++ b/arch/arm/mach-s3c2440/mach-rx1950.c
@@ -70,15 +70,6 @@
 static struct map_desc rx1950_iodesc[] __initdata = {
 };
 
-static struct s3c24xx_uart_clksrc rx1950_serial_clocks[] = {
-        [0] = {
-               .name = "fclk",
-               .divisor = 0x0a,
-               .min_baud = 0,
-               .max_baud = 0,
-        },
-};
-
 static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {
         [0] = {
                .hwport = 0,
@@ -86,8 +77,7 @@ static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {
                .ucon = 0x3c5,
                .ulcon = 0x03,
                .ufcon = 0x51,
-               .clocks = rx1950_serial_clocks,
-               .clocks_size = ARRAY_SIZE(rx1950_serial_clocks),
+                .clk_sel = S3C2410_UCON_CLKSEL3,
         },
         [1] = {
                .hwport = 1,
@@ -95,8 +85,7 @@ static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {
                .ucon = 0x3c5,
                .ulcon = 0x03,
                .ufcon = 0x51,
-               .clocks = rx1950_serial_clocks,
-               .clocks_size = ARRAY_SIZE(rx1950_serial_clocks),
+                .clk_sel = S3C2410_UCON_CLKSEL3,
         },
         /* IR port */
         [2] = {
@@ -105,8 +94,7 @@ static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = {
                .ucon = 0x3c5,
                .ulcon = 0x43,
                .ufcon = 0xf1,
-               .clocks = rx1950_serial_clocks,
-               .clocks_size = ARRAY_SIZE(rx1950_serial_clocks),
+                .clk_sel = S3C2410_UCON_CLKSEL3,
         },
 };
 
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index 80a0972873c2..20103bafbd4b 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -69,16 +69,6 @@ static struct map_desc rx3715_iodesc[] __initdata = {
         },
 };
 
-
-static struct s3c24xx_uart_clksrc rx3715_serial_clocks[] = {
-        [0] = {
-                .name           = "fclk",
-                .divisor        = 0,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        }
-};
-
 static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
         [0] = {
                 .hwport      = 0,
@@ -86,8 +76,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
                 .ucon        = 0x3c5,
                 .ulcon       = 0x03,
                 .ufcon       = 0x51,
-                .clocks      = rx3715_serial_clocks,
-                .clocks_size = ARRAY_SIZE(rx3715_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL3,
         },
         [1] = {
                 .hwport      = 1,
@@ -95,8 +84,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
                 .ucon        = 0x3c5,
                 .ulcon       = 0x03,
                 .ufcon       = 0x00,
-                .clocks      = rx3715_serial_clocks,
-                .clocks_size = ARRAY_SIZE(rx3715_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL3,
         },
         /* IR port */
         [2] = {
@@ -105,8 +93,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
                 .ucon        = 0x3c5,
                 .ulcon       = 0x43,
                 .ufcon       = 0x51,
-                .clocks      = rx3715_serial_clocks,
-                .clocks_size = ARRAY_SIZE(rx3715_serial_clocks),
+                .clk_sel        = S3C2410_UCON_CLKSEL3,
         }
 };
 
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 381586c7b1b2..dd20c66cd700 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -78,6 +78,11 @@ config S3C64XX_SETUP_SDHCI_GPIO
         help
           Common setup code for S3C64XX SDHCI GPIO configurations
 
+config S3C64XX_SETUP_SPI
+        bool
+        help
+         Common setup code for SPI GPIO configurations
+
 # S36400 Macchine support
 
 config MACH_SMDK6400
@@ -189,7 +194,7 @@ config SMDK6410_WM1190_EV1
         depends on MACH_SMDK6410
         select REGULATOR
         select REGULATOR_WM8350
-        select S3C24XX_GPIO_EXTRA64
+        select SAMSUNG_GPIO_EXTRA64
         select MFD_WM8350_I2C
         select MFD_WM8350_CONFIG_MODE_0
         select MFD_WM8350_CONFIG_MODE_3
@@ -207,7 +212,7 @@ config SMDK6410_WM1192_EV1
         depends on MACH_SMDK6410
         select REGULATOR
         select REGULATOR_WM831X
-        select S3C24XX_GPIO_EXTRA64
+        select SAMSUNG_GPIO_EXTRA64
         select MFD_WM831X
         select MFD_WM831X_I2C
         help
@@ -277,6 +282,7 @@ config MACH_WLF_CRAGG_6410
         select S3C64XX_SETUP_IDE
         select S3C64XX_SETUP_FB_24BPP
         select S3C64XX_SETUP_KEYPAD
+        select S3C64XX_SETUP_SPI
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_KEYPAD
         select S3C_DEV_USB_HOST
@@ -287,8 +293,8 @@ config MACH_WLF_CRAGG_6410
         select S3C_DEV_I2C1
         select S3C_DEV_WDT
         select S3C_DEV_RTC
-        select S3C64XX_DEV_SPI
-        select S3C24XX_GPIO_EXTRA128
+        select S3C64XX_DEV_SPI0
+        select SAMSUNG_GPIO_EXTRA128
         select I2C
         help
           Machine support for the Wolfson Cragganmore S3C6410 variant.
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index f37016cebbe3..1822ac2eba31 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -40,8 +40,8 @@ obj-$(CONFIG_S3C64XX_SETUP_I2C0)	+= setup-i2c0.o
 obj-$(CONFIG_S3C64XX_SETUP_I2C1)        += setup-i2c1.o
 obj-$(CONFIG_S3C64XX_SETUP_IDE)         += setup-ide.o
 obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)      += setup-keypad.o
-obj-$(CONFIG_S3C64XX_SETUP_SDHCI)       += setup-sdhci.o
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
+obj-$(CONFIG_S3C64XX_SETUP_SPI)         += setup-spi.o
 
 # Machine support
 
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 625219b9cefc..31bb27dc4aeb 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -184,18 +184,6 @@ static struct clk init_clocks_off[] = {
                 .enable         = s3c64xx_pclk_ctrl,
                 .ctrlbit        = S3C_CLKCON_PCLK_SPI1,
         }, {
-                .name           = "spi_48m",
-                .devname        = "s3c64xx-spi.0",
-                .parent         = &clk_48m,
-                .enable         = s3c64xx_sclk_ctrl,
-                .ctrlbit        = S3C_CLKCON_SCLK_SPI0_48,
-        }, {
-                .name           = "spi_48m",
-                .devname        = "s3c64xx-spi.1",
-                .parent         = &clk_48m,
-                .enable         = s3c64xx_sclk_ctrl,
-                .ctrlbit        = S3C_CLKCON_SCLK_SPI1_48,
-        }, {
                 .name           = "48m",
                 .devname        = "s3c-sdhci.0",
                 .parent         = &clk_48m,
@@ -226,6 +214,22 @@ static struct clk init_clocks_off[] = {
         },
 };
 
+static struct clk clk_48m_spi0 = {
+        .name           = "spi_48m",
+        .devname        = "s3c64xx-spi.0",
+        .parent         = &clk_48m,
+        .enable         = s3c64xx_sclk_ctrl,
+        .ctrlbit        = S3C_CLKCON_SCLK_SPI0_48,
+};
+
+static struct clk clk_48m_spi1 = {
+        .name           = "spi_48m",
+        .devname        = "s3c64xx-spi.1",
+        .parent         = &clk_48m,
+        .enable         = s3c64xx_sclk_ctrl,
+        .ctrlbit        = S3C_CLKCON_SCLK_SPI1_48,
+};
+
 static struct clk init_clocks[] = {
         {
                 .name           = "lcd",
@@ -243,24 +247,6 @@ static struct clk init_clocks[] = {
                 .enable         = s3c64xx_hclk_ctrl,
                 .ctrlbit        = S3C_CLKCON_HCLK_UHOST,
         }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_h,
-                .enable         = s3c64xx_hclk_ctrl,
-                .ctrlbit        = S3C_CLKCON_HCLK_HSMMC0,
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_h,
-                .enable         = s3c64xx_hclk_ctrl,
-                .ctrlbit        = S3C_CLKCON_HCLK_HSMMC1,
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_h,
-                .enable         = s3c64xx_hclk_ctrl,
-                .ctrlbit        = S3C_CLKCON_HCLK_HSMMC2,
-        }, {
                 .name           = "otg",
                 .parent         = &clk_h,
                 .enable         = s3c64xx_hclk_ctrl,
@@ -310,6 +296,29 @@ static struct clk init_clocks[] = {
         }
 };
 
+static struct clk clk_hsmmc0 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.0",
+        .parent         = &clk_h,
+        .enable         = s3c64xx_hclk_ctrl,
+        .ctrlbit        = S3C_CLKCON_HCLK_HSMMC0,
+};
+
+static struct clk clk_hsmmc1 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.1",
+        .parent         = &clk_h,
+        .enable         = s3c64xx_hclk_ctrl,
+        .ctrlbit        = S3C_CLKCON_HCLK_HSMMC1,
+};
+
+static struct clk clk_hsmmc2 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.2",
+        .parent         = &clk_h,
+        .enable         = s3c64xx_hclk_ctrl,
+        .ctrlbit        = S3C_CLKCON_HCLK_HSMMC2,
+};
 
 static struct clk clk_fout_apll = {
         .name           = "fout_apll",
@@ -578,36 +587,6 @@ static struct clksrc_sources clkset_camif = {
 static struct clksrc_clk clksrcs[] = {
         {
                 .clk    = {
-                        .name           = "mmc_bus",
-                        .devname        = "s3c-sdhci.0",
-                        .ctrlbit        = S3C_CLKCON_SCLK_MMC0,
-                        .enable         = s3c64xx_sclk_ctrl,
-                },
-                .reg_src        = { .reg = S3C_CLK_SRC, .shift = 18, .size = 2  },
-                .reg_div        = { .reg = S3C_CLK_DIV1, .shift = 0, .size = 4  },
-                .sources        = &clkset_spi_mmc,
-        }, {
-                .clk    = {
-                        .name           = "mmc_bus",
-                        .devname        = "s3c-sdhci.1",
-                        .ctrlbit        = S3C_CLKCON_SCLK_MMC1,
-                        .enable         = s3c64xx_sclk_ctrl,
-                },
-                .reg_src        = { .reg = S3C_CLK_SRC, .shift = 20, .size = 2  },
-                .reg_div        = { .reg = S3C_CLK_DIV1, .shift = 4, .size = 4  },
-                .sources        = &clkset_spi_mmc,
-        }, {
-                .clk    = {
-                        .name           = "mmc_bus",
-                        .devname        = "s3c-sdhci.2",
-                        .ctrlbit        = S3C_CLKCON_SCLK_MMC2,
-                        .enable         = s3c64xx_sclk_ctrl,
-                },
-                .reg_src        = { .reg = S3C_CLK_SRC, .shift = 22, .size = 2  },
-                .reg_div        = { .reg = S3C_CLK_DIV1, .shift = 8, .size = 4  },
-                .sources        = &clkset_spi_mmc,
-        }, {
-                .clk    = {
                         .name           = "usb-bus-host",
                         .ctrlbit        = S3C_CLKCON_SCLK_UHOST,
                         .enable         = s3c64xx_sclk_ctrl,
@@ -617,35 +596,6 @@ static struct clksrc_clk clksrcs[] = {
                 .sources        = &clkset_uhost,
         }, {
                 .clk    = {
-                        .name           = "uclk1",
-                        .ctrlbit        = S3C_CLKCON_SCLK_UART,
-                        .enable         = s3c64xx_sclk_ctrl,
-                },
-                .reg_src        = { .reg = S3C_CLK_SRC, .shift = 13, .size = 1  },
-                .reg_div        = { .reg = S3C_CLK_DIV2, .shift = 16, .size = 4  },
-                .sources        = &clkset_uart,
-        }, {
-/* Where does UCLK0 come from? */
-                .clk    = {
-                        .name           = "spi-bus",
-                        .devname        = "s3c64xx-spi.0",
-                        .ctrlbit        = S3C_CLKCON_SCLK_SPI0,
-                        .enable         = s3c64xx_sclk_ctrl,
-                },
-                .reg_src        = { .reg = S3C_CLK_SRC, .shift = 14, .size = 2  },
-                .reg_div        = { .reg = S3C_CLK_DIV2, .shift = 0, .size = 4  },
-                .sources        = &clkset_spi_mmc,
-        }, {
-                .clk    = {
-                        .name           = "spi-bus",
-                        .devname        = "s3c64xx-spi.1",
-                        .enable         = s3c64xx_sclk_ctrl,
-                },
-                .reg_src        = { .reg = S3C_CLK_SRC, .shift = 16, .size = 2  },
-                .reg_div        = { .reg = S3C_CLK_DIV2, .shift = 4, .size = 4  },
-                .sources        = &clkset_spi_mmc,
-        }, {
-                .clk    = {
                         .name           = "audio-bus",
                         .devname        = "samsung-i2s.0",
                         .ctrlbit        = S3C_CLKCON_SCLK_AUDIO0,
@@ -695,6 +645,78 @@ static struct clksrc_clk clksrcs[] = {
         },
 };
 
+/* Where does UCLK0 come from? */
+static struct clksrc_clk clk_sclk_uclk = {
+        .clk    = {
+                .name           = "uclk1",
+                .ctrlbit        = S3C_CLKCON_SCLK_UART,
+                .enable         = s3c64xx_sclk_ctrl,
+        },
+        .reg_src        = { .reg = S3C_CLK_SRC, .shift = 13, .size = 1  },
+        .reg_div        = { .reg = S3C_CLK_DIV2, .shift = 16, .size = 4  },
+        .sources        = &clkset_uart,
+};
+
+static struct clksrc_clk clk_sclk_mmc0 = {
+        .clk    = {
+                .name           = "mmc_bus",
+                .devname        = "s3c-sdhci.0",
+                .ctrlbit        = S3C_CLKCON_SCLK_MMC0,
+                .enable         = s3c64xx_sclk_ctrl,
+        },
+        .reg_src        = { .reg = S3C_CLK_SRC, .shift = 18, .size = 2  },
+        .reg_div        = { .reg = S3C_CLK_DIV1, .shift = 0, .size = 4  },
+        .sources        = &clkset_spi_mmc,
+};
+
+static struct clksrc_clk clk_sclk_mmc1 = {
+        .clk    = {
+                .name           = "mmc_bus",
+                .devname        = "s3c-sdhci.1",
+                .ctrlbit        = S3C_CLKCON_SCLK_MMC1,
+                .enable         = s3c64xx_sclk_ctrl,
+        },
+        .reg_src        = { .reg = S3C_CLK_SRC, .shift = 20, .size = 2  },
+        .reg_div        = { .reg = S3C_CLK_DIV1, .shift = 4, .size = 4  },
+        .sources        = &clkset_spi_mmc,
+};
+
+static struct clksrc_clk clk_sclk_mmc2 = {
+        .clk    = {
+                .name           = "mmc_bus",
+                .devname        = "s3c-sdhci.2",
+                .ctrlbit        = S3C_CLKCON_SCLK_MMC2,
+                .enable         = s3c64xx_sclk_ctrl,
+        },
+        .reg_src        = { .reg = S3C_CLK_SRC, .shift = 22, .size = 2  },
+        .reg_div        = { .reg = S3C_CLK_DIV1, .shift = 8, .size = 4  },
+        .sources        = &clkset_spi_mmc,
+};
+
+static struct clksrc_clk clk_sclk_spi0 = {
+        .clk    = {
+                .name           = "spi-bus",
+                .devname        = "s3c64xx-spi.0",
+                .ctrlbit        = S3C_CLKCON_SCLK_SPI0,
+                .enable         = s3c64xx_sclk_ctrl,
+        },
+        .reg_src = { .reg = S3C_CLK_SRC, .shift = 14, .size = 2 },
+        .reg_div = { .reg = S3C_CLK_DIV2, .shift = 0, .size = 4 },
+        .sources = &clkset_spi_mmc,
+};
+
+static struct clksrc_clk clk_sclk_spi1 = {
+        .clk    = {
+                .name           = "spi-bus",
+                .devname        = "s3c64xx-spi.1",
+                .ctrlbit        = S3C_CLKCON_SCLK_SPI1,
+                .enable         = s3c64xx_sclk_ctrl,
+        },
+        .reg_src = { .reg = S3C_CLK_SRC, .shift = 16, .size = 2 },
+        .reg_div = { .reg = S3C_CLK_DIV2, .shift = 4, .size = 4 },
+        .sources = &clkset_spi_mmc,
+};
+
 /* Clock initialisation code */
 
 static struct clksrc_clk *init_parents[] = {
@@ -703,6 +725,39 @@ static struct clksrc_clk *init_parents[] = {
         &clk_mout_mpll,
 };
 
+static struct clksrc_clk *clksrc_cdev[] = {
+        &clk_sclk_uclk,
+        &clk_sclk_mmc0,
+        &clk_sclk_mmc1,
+        &clk_sclk_mmc2,
+        &clk_sclk_spi0,
+        &clk_sclk_spi1,
+};
+
+static struct clk *clk_cdev[] = {
+        &clk_hsmmc0,
+        &clk_hsmmc1,
+        &clk_hsmmc2,
+        &clk_48m_spi0,
+        &clk_48m_spi1,
+};
+
+static struct clk_lookup s3c64xx_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uclk.clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &clk_hsmmc0),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &clk_hsmmc1),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &clk_hsmmc2),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
+        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &clk_48m_spi0),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk2", &clk_48m_spi1),
+};
+
 #define GET_DIV(clk, field) ((((clk) & field##_MASK) >> field##_SHIFT) + 1)
 
 void __init_or_cpufreq s3c64xx_setup_clocks(void)
@@ -811,6 +866,8 @@ static struct clk *clks[] __initdata = {
 void __init s3c64xx_register_clocks(unsigned long xtal, 
                                     unsigned armclk_divlimit)
 {
+        unsigned int cnt;
+
         armclk_mask = armclk_divlimit;
 
         s3c24xx_register_baseclocks(xtal);
@@ -821,7 +878,15 @@ void __init s3c64xx_register_clocks(unsigned long xtal,
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
 
+        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
+        for (cnt = 0; cnt < ARRAY_SIZE(clk_cdev); cnt++)
+                s3c_disable_clocks(clk_cdev[cnt], 1);
+
         s3c24xx_register_clocks(clks1, ARRAY_SIZE(clks1));
         s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
+        for (cnt = 0; cnt < ARRAY_SIZE(clksrc_cdev); cnt++)
+                s3c_register_clksrc(clksrc_cdev[cnt], 1);
+        clkdev_add_table(s3c64xx_clk_lookup, ARRAY_SIZE(s3c64xx_clk_lookup));
+
         s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s3c64xx/dev-spi.c b/arch/arm/mach-s3c64xx/dev-spi.c
deleted file mode 100644
index 3341fd118723..000000000000
--- a/arch/arm/mach-s3c64xx/dev-spi.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* linux/arch/arm/plat-s3c64xx/dev-spi.c
- *
- * Copyright (C) 2009 Samsung Electronics Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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.
- */
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/export.h>
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <mach/dma.h>
-#include <mach/map.h>
-#include <mach/spi-clocks.h>
-#include <mach/irqs.h>
-
-#include <plat/s3c64xx-spi.h>
-#include <plat/gpio-cfg.h>
-#include <plat/devs.h>
-
-static char *spi_src_clks[] = {
-        [S3C64XX_SPI_SRCCLK_PCLK] = "pclk",
-        [S3C64XX_SPI_SRCCLK_SPIBUS] = "spi-bus",
-        [S3C64XX_SPI_SRCCLK_48M] = "spi_48m",
-};
-
-/* SPI Controller platform_devices */
-
-/* Since we emulate multi-cs capability, we do not touch the GPC-3,7.
- * The emulated CS is toggled by board specific mechanism, as it can
- * be either some immediate GPIO or some signal out of some other
- * chip in between ... or some yet another way.
- * We simply do not assume anything about CS.
- */
-static int s3c64xx_spi_cfg_gpio(struct platform_device *pdev)
-{
-        unsigned int base;
-
-        switch (pdev->id) {
-        case 0:
-                base = S3C64XX_GPC(0);
-                break;
-
-        case 1:
-                base = S3C64XX_GPC(4);
-                break;
-
-        default:
-                dev_err(&pdev->dev, "Invalid SPI Controller number!");
-                return -EINVAL;
-        }
-
-        s3c_gpio_cfgall_range(base, 3,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-
-        return 0;
-}
-
-static struct resource s3c64xx_spi0_resource[] = {
-        [0] = {
-                .start = S3C64XX_PA_SPI0,
-                .end   = S3C64XX_PA_SPI0 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI0_TX,
-                .end   = DMACH_SPI0_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI0_RX,
-                .end   = DMACH_SPI0_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI0,
-                .end   = IRQ_SPI0,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s3c64xx_spi0_pdata = {
-        .cfg_gpio = s3c64xx_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x7f,
-        .rx_lvl_offset = 13,
-        .tx_st_done = 21,
-};
-
-static u64 spi_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s3c64xx_device_spi0 = {
-        .name             = "s3c64xx-spi",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s3c64xx_spi0_resource),
-        .resource         = s3c64xx_spi0_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s3c64xx_spi0_pdata,
-        },
-};
-EXPORT_SYMBOL(s3c64xx_device_spi0);
-
-static struct resource s3c64xx_spi1_resource[] = {
-        [0] = {
-                .start = S3C64XX_PA_SPI1,
-                .end   = S3C64XX_PA_SPI1 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI1_TX,
-                .end   = DMACH_SPI1_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI1_RX,
-                .end   = DMACH_SPI1_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI1,
-                .end   = IRQ_SPI1,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s3c64xx_spi1_pdata = {
-        .cfg_gpio = s3c64xx_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x7f,
-        .rx_lvl_offset = 13,
-        .tx_st_done = 21,
-};
-
-struct platform_device s3c64xx_device_spi1 = {
-        .name             = "s3c64xx-spi",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s3c64xx_spi1_resource),
-        .resource         = s3c64xx_spi1_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s3c64xx_spi1_pdata,
-        },
-};
-EXPORT_SYMBOL(s3c64xx_device_spi1);
-
-void __init s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
-{
-        struct s3c64xx_spi_info *pd;
-
-        /* Reject invalid configuration */
-        if (!num_cs || src_clk_nr < 0
-                        || src_clk_nr > S3C64XX_SPI_SRCCLK_48M) {
-                printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);
-                return;
-        }
-
-        switch (cntrlr) {
-        case 0:
-                pd = &s3c64xx_spi0_pdata;
-                break;
-        case 1:
-                pd = &s3c64xx_spi1_pdata;
-                break;
-        default:
-                printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",
-                                                        __func__, cntrlr);
-                return;
-        }
-
-        pd->num_cs = num_cs;
-        pd->src_clk_nr = src_clk_nr;
-        pd->src_clk_name = spi_src_clks[src_clk_nr];
-}
diff --git a/arch/arm/mach-s3c64xx/include/mach/crag6410.h b/arch/arm/mach-s3c64xx/include/mach/crag6410.h
index be9074e17dfd..5d55ab018b6b 100644
--- a/arch/arm/mach-s3c64xx/include/mach/crag6410.h
+++ b/arch/arm/mach-s3c64xx/include/mach/crag6410.h
@@ -15,9 +15,11 @@
 
 #define BANFF_PMIC_IRQ_BASE             IRQ_BOARD_START
 #define GLENFARCLAS_PMIC_IRQ_BASE       (IRQ_BOARD_START + 64)
+#define CODEC_IRQ_BASE                  (IRQ_BOARD_START + 128)
 
 #define PCA935X_GPIO_BASE               GPIO_BOARD_START
-#define CODEC_GPIO_BASE         (GPIO_BOARD_START + 8)
-#define GLENFARCLAS_PMIC_GPIO_BASE      (GPIO_BOARD_START + 16)
+#define CODEC_GPIO_BASE                 (GPIO_BOARD_START + 8)
+#define GLENFARCLAS_PMIC_GPIO_BASE      (GPIO_BOARD_START + 32)
+#define BANFF_PMIC_GPIO_BASE            (GPIO_BOARD_START + 64)
 
 #endif
diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio.h b/arch/arm/mach-s3c64xx/include/mach/gpio.h
index 6e34c2f6e670..8b540c42d5dd 100644
--- a/arch/arm/mach-s3c64xx/include/mach/gpio.h
+++ b/arch/arm/mach-s3c64xx/include/mach/gpio.h
@@ -88,6 +88,6 @@ enum s3c_gpio_number {
 /* define the number of gpios we need to the one after the GPQ() range */
 #define GPIO_BOARD_START (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1)
 
-#define BOARD_NR_GPIOS 16
+#define BOARD_NR_GPIOS  (16 + CONFIG_SAMSUNG_GPIO_EXTRA)
 
 #define ARCH_NR_GPIOS   (GPIO_BOARD_START + BOARD_NR_GPIOS)
diff --git a/arch/arm/mach-s3c64xx/include/mach/irqs.h b/arch/arm/mach-s3c64xx/include/mach/irqs.h
index 443f85b3c203..96d60e0d9372 100644
--- a/arch/arm/mach-s3c64xx/include/mach/irqs.h
+++ b/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -169,7 +169,7 @@
 #define IRQ_BOARD_START (IRQ_EINT_GROUP9_BASE + IRQ_EINT_GROUP9_NR + 1)
 
 #ifdef CONFIG_MACH_WLF_CRAGG_6410
-#define IRQ_BOARD_NR 128
+#define IRQ_BOARD_NR 160
 #elif defined(CONFIG_SMDK6410_WM1190_EV1)
 #define IRQ_BOARD_NR 64
 #elif defined(CONFIG_SMDK6410_WM1192_EV1)
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index 23a1d71e4d53..8e2097bb208a 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -115,6 +115,8 @@
 #define S3C_PA_USB_HSOTG        S3C64XX_PA_USB_HSOTG
 #define S3C_PA_RTC              S3C64XX_PA_RTC
 #define S3C_PA_WDT              S3C64XX_PA_WATCHDOG
+#define S3C_PA_SPI0             S3C64XX_PA_SPI0
+#define S3C_PA_SPI1             S3C64XX_PA_SPI1
 
 #define SAMSUNG_PA_ADC          S3C64XX_PA_ADC
 #define SAMSUNG_PA_CFCON        S3C64XX_PA_CFCON
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index f208154b1382..cd3c97e2ee75 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -14,13 +14,43 @@
 
 #include <linux/mfd/wm831x/irq.h>
 #include <linux/mfd/wm831x/gpio.h>
+#include <linux/mfd/wm8994/pdata.h>
 
+#include <sound/wm5100.h>
 #include <sound/wm8996.h>
 #include <sound/wm8962.h>
 #include <sound/wm9081.h>
 
 #include <mach/crag6410.h>
 
+static struct wm5100_pdata wm5100_pdata = {
+        .ldo_ena = S3C64XX_GPN(7),
+        .irq_flags = IRQF_TRIGGER_HIGH,
+        .gpio_base = CODEC_GPIO_BASE,
+
+        .in_mode = {
+                WM5100_IN_DIFF,
+                WM5100_IN_DIFF,
+                WM5100_IN_DIFF,
+                WM5100_IN_SE,
+        },
+
+        .hp_pol = CODEC_GPIO_BASE + 3,
+        .jack_modes = {
+                { WM5100_MICDET_MICBIAS3, 0, 0 },
+                { WM5100_MICDET_MICBIAS2, 1, 1 },
+        },
+
+        .gpio_defaults = {
+                0,
+                0,
+                0,
+                0,
+                0x2, /* IRQ: CMOS output */
+                0x3, /* CLKOUT: CMOS output */
+        },
+};
+
 static struct wm8996_retune_mobile_config wm8996_retune[] = {
         {
                 .name = "Sub LPF",
@@ -72,7 +102,6 @@ static struct wm8962_pdata wm8962_pdata __initdata = {
                 0x8000 | WM8962_GPIO_FN_DMICDAT,
                 WM8962_GPIO_FN_IRQ,    /* Open drain mode */
         },
-        .irq_active_low = true,
 };
 
 static struct wm9081_pdata wm9081_pdata __initdata = {
@@ -91,6 +120,7 @@ static const struct i2c_board_info wm1254_devs[] = {
 
 static const struct i2c_board_info wm1255_devs[] = {
         { I2C_BOARD_INFO("wm5100", 0x1a),
+          .platform_data = &wm5100_pdata,
           .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,
         },
         { I2C_BOARD_INFO("wm9081", 0x6c),
@@ -104,6 +134,24 @@ static const struct i2c_board_info wm1259_devs[] = {
         },
 };
 
+static struct wm8994_pdata wm8994_pdata = {
+        .gpio_base = CODEC_GPIO_BASE,
+        .gpio_defaults = {
+                0x3,          /* IRQ out, active high, CMOS */
+        },
+        .irq_base = CODEC_IRQ_BASE,
+        .ldo = {
+                { .supply = "WALLVDD" },
+                { .supply = "WALLVDD" },
+        },
+};
+
+static const struct i2c_board_info wm1277_devs[] = {
+        { I2C_BOARD_INFO("wm8958", 0x1a),  /* WM8958 is the superset */
+          .platform_data = &wm8994_pdata,
+          .irq = GLENFARCLAS_PMIC_IRQ_BASE + WM831X_IRQ_GPIO_2,
+        },
+};
 
 static __devinitdata const struct {
         u8 id;
@@ -125,6 +173,8 @@ static __devinitdata const struct {
         { .id = 0x3b, .name = "1255-EV1 Kilchoman",
           .i2c_devs = wm1255_devs, .num_i2c_devs = ARRAY_SIZE(wm1255_devs) },
         { .id = 0x3c, .name = "1273-EV1 Longmorn" },
+        { .id = 0x3d, .name = "1277-EV1 Littlemill",
+          .i2c_devs = wm1277_devs, .num_i2c_devs = ARRAY_SIZE(wm1277_devs) },
 };
 
 static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,
@@ -154,8 +204,8 @@ static __devinit int wlf_gf_module_probe(struct i2c_client *i2c,
                                         "Failed to register dev: %d\n", ret);
                 }
         } else {
-                dev_warn(&i2c->dev, "Unknown module ID %d revision %d\n",
-                         id, rev);
+                dev_warn(&i2c->dev, "Unknown module ID 0x%x revision %d\n",
+                         id, rev + 1);
         }
 
         return 0;
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index fb786b6a2eae..680fd758ff2d 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -37,6 +37,8 @@
 #include <linux/mfd/wm831x/irq.h>
 #include <linux/mfd/wm831x/gpio.h>
 
+#include <sound/wm1250-ev1.h>
+
 #include <asm/hardware/vic.h>
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
@@ -289,6 +291,11 @@ static struct platform_device speyside_wm8962_device = {
         .id             = -1,
 };
 
+static struct platform_device littlemill_device = {
+        .name           = "littlemill",
+        .id             = -1,
+};
+
 static struct regulator_consumer_supply wallvdd_consumers[] = {
         REGULATOR_SUPPLY("SPKVDD1", "1-001a"),
         REGULATOR_SUPPLY("SPKVDD2", "1-001a"),
@@ -341,6 +348,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
         &crag6410_backlight_device,
         &speyside_device,
         &speyside_wm8962_device,
+        &littlemill_device,
         &lowland_device,
         &wallvdd_device,
 };
@@ -374,6 +382,10 @@ static struct regulator_init_data vddarm __initdata = {
         .driver_data = &vddarm_pdata,
 };
 
+static struct regulator_consumer_supply vddint_consumers[] __initdata = {
+        REGULATOR_SUPPLY("vddint", NULL),
+};
+
 static struct regulator_init_data vddint __initdata = {
         .constraints = {
                 .name = "VDDINT",
@@ -382,6 +394,9 @@ static struct regulator_init_data vddint __initdata = {
                 .always_on = 1,
                 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
         },
+        .num_consumer_supplies = ARRAY_SIZE(vddint_consumers),
+        .consumer_supplies = vddint_consumers,
+        .supply_regulator = "WALLVDD",
 };
 
 static struct regulator_init_data vddmem __initdata = {
@@ -502,7 +517,8 @@ static struct wm831x_touch_pdata touch_pdata __initdata = {
 static struct wm831x_pdata crag_pmic_pdata __initdata = {
         .wm831x_num = 1,
         .irq_base = BANFF_PMIC_IRQ_BASE,
-        .gpio_base = GPIO_BOARD_START + 8,
+        .gpio_base = BANFF_PMIC_GPIO_BASE,
+        .soft_shutdown = true,
 
         .backup = &banff_backup_pdata,
 
@@ -607,6 +623,7 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = {
         .wm831x_num = 2,
         .irq_base = GLENFARCLAS_PMIC_IRQ_BASE,
         .gpio_base = GLENFARCLAS_PMIC_GPIO_BASE,
+        .soft_shutdown = true,
 
         .gpio_defaults = {
                 /* GPIO1-3: IRQ inputs, rising edge triggered, CMOS */
@@ -624,6 +641,16 @@ static struct wm831x_pdata glenfarclas_pmic_pdata __initdata = {
         .disable_touch = true,
 };
 
+static struct wm1250_ev1_pdata wm1250_ev1_pdata = {
+        .gpios = {
+                [WM1250_EV1_GPIO_CLK_ENA] = S3C64XX_GPN(12),
+                [WM1250_EV1_GPIO_CLK_SEL0] = S3C64XX_GPL(12),
+                [WM1250_EV1_GPIO_CLK_SEL1] = S3C64XX_GPL(13),
+                [WM1250_EV1_GPIO_OSR] = S3C64XX_GPL(14),
+                [WM1250_EV1_GPIO_MASTER] = S3C64XX_GPL(8),
+        },
+};
+
 static struct i2c_board_info i2c_devs1[] __initdata = {
         { I2C_BOARD_INFO("wm8311", 0x34),
           .irq = S3C_EINT(0),
@@ -633,7 +660,13 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
         { I2C_BOARD_INFO("wlf-gf-module", 0x25) },
         { I2C_BOARD_INFO("wlf-gf-module", 0x26) },
 
-        { I2C_BOARD_INFO("wm1250-ev1", 0x27) },
+        { I2C_BOARD_INFO("wm1250-ev1", 0x27),
+          .platform_data = &wm1250_ev1_pdata },
+};
+
+static struct s3c2410_platform_i2c i2c1_pdata = {
+        .frequency = 400000,
+        .bus_num = 1,
 };
 
 static void __init crag6410_map_io(void)
@@ -694,7 +727,7 @@ static void __init crag6410_machine_init(void)
         s3c_sdhci2_set_platdata(&crag6410_hsmmc2_pdata);
 
         s3c_i2c0_set_platdata(&i2c0_pdata);
-        s3c_i2c1_set_platdata(NULL);
+        s3c_i2c1_set_platdata(&i2c1_pdata);
         s3c_fb_set_platdata(&crag6410_lcd_pdata);
 
         i2c_register_board_info(0, i2c_devs0, ARRAY_SIZE(i2c_devs0));
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index 7d3e81b9dd06..055dac90e0e2 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -346,10 +346,23 @@ int __init s3c64xx_pm_init(void)
 
 static __init int s3c64xx_pm_initcall(void)
 {
+        u32 val;
+
         pm_cpu_prep = s3c64xx_pm_prepare;
         pm_cpu_sleep = s3c64xx_cpu_suspend;
         pm_uart_udivslot = 1;
 
+        /*
+         * Unconditionally disable power domains that contain only
+         * blocks which have no mainline driver support.
+         */
+        val = __raw_readl(S3C64XX_NORMAL_CFG);
+        val &= ~(S3C64XX_NORMALCFG_DOMAIN_G_ON |
+                 S3C64XX_NORMALCFG_DOMAIN_V_ON |
+                 S3C64XX_NORMALCFG_DOMAIN_I_ON |
+                 S3C64XX_NORMALCFG_DOMAIN_P_ON);
+        __raw_writel(val, S3C64XX_NORMAL_CFG);
+
 #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK
         gpio_request(S3C64XX_GPN(12), "DEBUG_LED0");
         gpio_request(S3C64XX_GPN(13), "DEBUG_LED1");
diff --git a/arch/arm/mach-s3c64xx/setup-sdhci.c b/arch/arm/mach-s3c64xx/setup-sdhci.c
deleted file mode 100644
index c75a71b21165..000000000000
--- a/arch/arm/mach-s3c64xx/setup-sdhci.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* linux/arch/arm/mach-s3c64xx/setup-sdhci.c
- *
- * Copyright 2008 Simtec Electronics
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C6400/S3C6410 - Helper functions for settign up SDHCI device(s) (HSMMC)
- *
- * 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.
-*/
-
-#include <linux/types.h>
-
-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
-
-char *s3c64xx_hsmmc_clksrcs[4] = {
-        [0] = "hsmmc",
-        [1] = "hsmmc",
-        [2] = "mmc_bus",
-        /* [3] = "48m", - note not successfully used yet */
-};
diff --git a/arch/arm/mach-s3c64xx/setup-spi.c b/arch/arm/mach-s3c64xx/setup-spi.c
new file mode 100644
index 000000000000..d9592ad7a825
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/setup-spi.c
@@ -0,0 +1,45 @@
+/* linux/arch/arm/mach-s3c64xx/setup-spi.c
+ *
+ * Copyright (C) 2011 Samsung Electronics Ltd.
+ *              http://www.samsung.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.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <plat/gpio-cfg.h>
+#include <plat/s3c64xx-spi.h>
+
+#ifdef CONFIG_S3C64XX_DEV_SPI0
+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 13,
+        .tx_st_done     = 21,
+};
+
+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgall_range(S3C64XX_GPC(0), 3,
+                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI1
+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 13,
+        .tx_st_done     = 21,
+};
+
+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgall_range(S3C64XX_GPC(4), 3,
+                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index 18690c5f99e6..c87f6108eeb1 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -36,6 +36,16 @@ config S5P64X0_SETUP_I2C1
         help
           Common setup code for i2c bus 1.
 
+config S5P64X0_SETUP_SPI
+        bool
+        help
+          Common setup code for SPI GPIO configurations
+
+config S5P64X0_SETUP_SDHCI_GPIO
+        bool
+        help
+          Common setup code for SDHCI gpio.
+
 # machine support
 
 config MACH_SMDK6440
@@ -45,13 +55,16 @@ config MACH_SMDK6440
         select S3C_DEV_I2C1
         select S3C_DEV_RTC
         select S3C_DEV_WDT
-        select S3C64XX_DEV_SPI
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_TS
         select S5P64X0_SETUP_FB_24BPP
         select S5P64X0_SETUP_I2C1
+        select S5P64X0_SETUP_SDHCI_GPIO
         help
           Machine support for the Samsung SMDK6440
 
@@ -62,14 +75,28 @@ config MACH_SMDK6450
         select S3C_DEV_I2C1
         select S3C_DEV_RTC
         select S3C_DEV_WDT
-        select S3C64XX_DEV_SPI
+        select S3C_DEV_HSMMC
+        select S3C_DEV_HSMMC1
+        select S3C_DEV_HSMMC2
         select SAMSUNG_DEV_ADC
         select SAMSUNG_DEV_BACKLIGHT
         select SAMSUNG_DEV_PWM
         select SAMSUNG_DEV_TS
         select S5P64X0_SETUP_FB_24BPP
         select S5P64X0_SETUP_I2C1
+        select S5P64X0_SETUP_SDHCI_GPIO
         help
           Machine support for the Samsung SMDK6450
 
+menu "Use 8-bit SDHCI bus width"
+
+config S5P64X0_SD_CH1_8BIT
+        bool "SDHCI Channel 1 (Slot 1)"
+        depends on MACH_SMDK6450 || MACH_SMDK6440
+        help
+          Support SDHCI Channel 1 8-bit bus.
+          If selected, Channel 2 is disabled.
+
+endmenu
+
 endif
diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile
index d3f7409999f2..12bb951187a4 100644
--- a/arch/arm/mach-s5p64x0/Makefile
+++ b/arch/arm/mach-s5p64x0/Makefile
@@ -28,8 +28,9 @@ obj-$(CONFIG_MACH_SMDK6450)	+= mach-smdk6450.o
 # device support
 
 obj-y                           += dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
 
 obj-y                                   += setup-i2c0.o
 obj-$(CONFIG_S5P64X0_SETUP_I2C1)        += setup-i2c1.o
 obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)    += setup-fb-24bpp.o
+obj-$(CONFIG_S5P64X0_SETUP_SPI)         += setup-spi.o
+obj-$(CONFIG_S5P64X0_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c
index eb4ffe331e1a..ee1e8e7f5631 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -269,18 +269,6 @@ static struct clk init_clocks_off[] = {
                 .enable         = s5p64x0_pclk_ctrl,
                 .ctrlbit        = (1 << 31),
         }, {
-                .name           = "sclk_spi_48",
-                .devname        = "s3c64xx-spi.0",
-                .parent         = &clk_48m,
-                .enable         = s5p64x0_sclk_ctrl,
-                .ctrlbit        = (1 << 22),
-        }, {
-                .name           = "sclk_spi_48",
-                .devname        = "s3c64xx-spi.1",
-                .parent         = &clk_48m,
-                .enable         = s5p64x0_sclk_ctrl,
-                .ctrlbit        = (1 << 23),
-        }, {
                 .name           = "mmc_48m",
                 .devname        = "s3c-sdhci.0",
                 .parent         = &clk_48m,
@@ -392,65 +380,6 @@ static struct clksrc_sources clkset_audio = {
 static struct clksrc_clk clksrcs[] = {
         {
                 .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.0",
-                        .ctrlbit        = (1 << 24),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.1",
-                        .ctrlbit        = (1 << 25),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.2",
-                        .ctrlbit        = (1 << 26),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "uclk1",
-                        .ctrlbit        = (1 << 5),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_uart,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.0",
-                        .ctrlbit        = (1 << 20),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.1",
-                        .ctrlbit        = (1 << 21),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group1,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
                         .name           = "sclk_post",
                         .ctrlbit        = (1 << 10),
                         .enable         = s5p64x0_sclk_ctrl,
@@ -488,6 +417,77 @@ static struct clksrc_clk clksrcs[] = {
         },
 };
 
+static struct clksrc_clk clk_sclk_mmc0 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.0",
+                .ctrlbit        = (1 << 24),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group1,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc1 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.1",
+                .ctrlbit        = (1 << 25),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group1,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc2 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.2",
+                .ctrlbit        = (1 << 26),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group1,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uclk = {
+        .clk    = {
+                .name           = "uclk1",
+                .ctrlbit        = (1 << 5),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_uart,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi0 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.0",
+                .ctrlbit        = (1 << 20),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group1,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi1 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.1",
+                .ctrlbit        = (1 << 21),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group1,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },
+};
+
 /* Clock initialization code */
 static struct clksrc_clk *sysclks[] = {
         &clk_mout_apll,
@@ -506,6 +506,26 @@ static struct clk dummy_apb_pclk = {
         .id             = -1,
 };
 
+static struct clksrc_clk *clksrc_cdev[] = {
+        &clk_sclk_uclk,
+        &clk_sclk_spi0,
+        &clk_sclk_spi1,
+        &clk_sclk_mmc0,
+        &clk_sclk_mmc1,
+        &clk_sclk_mmc2
+};
+
+static struct clk_lookup s5p6440_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_pclk_low.clk),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uclk.clk),
+        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
+};
+
 void __init_or_cpufreq s5p6440_setup_clocks(void)
 {
         struct clk *xtal_clk;
@@ -584,9 +604,12 @@ void __init s5p6440_register_clocks(void)
 
         s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
         s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
+        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
+                s3c_register_clksrc(clksrc_cdev[ptr], 1);
 
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+        clkdev_add_table(s5p6440_clk_lookup, ARRAY_SIZE(s5p6440_clk_lookup));
 
         s3c24xx_register_clock(&dummy_apb_pclk);
 
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c
index bb7ee912090b..dae6a13f43bb 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@ -414,65 +414,6 @@ static struct clksrc_clk clk_sclk_audio0 = {
 static struct clksrc_clk clksrcs[] = {
         {
                 .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.0",
-                        .ctrlbit        = (1 << 24),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.1",
-                        .ctrlbit        = (1 << 25),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.2",
-                        .ctrlbit        = (1 << 26),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "uclk1",
-                        .ctrlbit        = (1 << 5),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_uart,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.0",
-                        .ctrlbit        = (1 << 20),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.1",
-                        .ctrlbit        = (1 << 21),
-                        .enable         = s5p64x0_sclk_ctrl,
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },
-                .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
                         .name           = "sclk_fimc",
                         .ctrlbit        = (1 << 10),
                         .enable         = s5p64x0_sclk_ctrl,
@@ -537,6 +478,97 @@ static struct clksrc_clk clksrcs[] = {
         },
 };
 
+static struct clksrc_clk clk_sclk_mmc0 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.0",
+                .ctrlbit        = (1 << 24),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 18, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc1 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.1",
+                .ctrlbit        = (1 << 25),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 20, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc2 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.2",
+                .ctrlbit        = (1 << 26),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 22, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV1, .shift = 8, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uclk = {
+        .clk    = {
+                .name           = "uclk1",
+                .ctrlbit        = (1 << 5),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_uart,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 13, .size = 1 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 16, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi0 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.0",
+                .ctrlbit        = (1 << 20),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 14, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi1 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.1",
+                .ctrlbit        = (1 << 21),
+                .enable         = s5p64x0_sclk_ctrl,
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P64X0_CLK_SRC0, .shift = 16, .size = 2 },
+        .reg_div = { .reg = S5P64X0_CLK_DIV2, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk *clksrc_cdev[] = {
+        &clk_sclk_uclk,
+        &clk_sclk_spi0,
+        &clk_sclk_spi1,
+        &clk_sclk_mmc0,
+        &clk_sclk_mmc1,
+        &clk_sclk_mmc2,
+};
+
+static struct clk_lookup s5p6450_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_pclk_low.clk),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uclk.clk),
+        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
+};
+
 /* Clock initialization code */
 static struct clksrc_clk *sysclks[] = {
         &clk_mout_apll,
@@ -635,9 +667,12 @@ void __init s5p6450_register_clocks(void)
 
         s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
         s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
+        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
+                s3c_register_clksrc(clksrc_cdev[ptr], 1);
 
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+        clkdev_add_table(s5p6450_clk_lookup, ARRAY_SIZE(s5p6450_clk_lookup));
 
         s3c24xx_register_clock(&dummy_apb_pclk);
 
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index 28d0b918cd4b..52b89a376447 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -40,6 +40,7 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
+#include <plat/sdhci.h>
 #include <plat/adc-core.h>
 #include <plat/fb-core.h>
 #include <plat/gpio-cfg.h>
@@ -181,6 +182,10 @@ void __init s5p6440_map_io(void)
         s3c_adc_setname("s3c64xx-adc");
         s3c_fb_setname("s5p64x0-fb");
 
+        s5p64x0_default_sdhci0();
+        s5p64x0_default_sdhci1();
+        s5p6440_default_sdhci2();
+
         iotable_init(s5p6440_iodesc, ARRAY_SIZE(s5p6440_iodesc));
         init_consistent_dma_size(SZ_8M);
 }
@@ -191,6 +196,10 @@ void __init s5p6450_map_io(void)
         s3c_adc_setname("s3c64xx-adc");
         s3c_fb_setname("s5p64x0-fb");
 
+        s5p64x0_default_sdhci0();
+        s5p64x0_default_sdhci1();
+        s5p6450_default_sdhci2();
+
         iotable_init(s5p6450_iodesc, ARRAY_SIZE(s5p6450_iodesc));
         init_consistent_dma_size(SZ_8M);
 }
@@ -282,36 +291,7 @@ int __init s5p64x0_init(void)
         return device_register(&s5p64x0_dev);
 }
 
-static struct s3c24xx_uart_clksrc s5p64x0_serial_clocks[] = {
-        [0] = {
-                .name           = "pclk_low",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-        [1] = {
-                .name           = "uclk1",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-};
-
 /* uart registration process */
-
-void __init s5p64x0_common_init_uarts(struct s3c2410_uartcfg *cfg, int no)
-{
-        struct s3c2410_uartcfg *tcfg = cfg;
-        u32 ucnt;
-
-        for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
-                if (!tcfg->clocks) {
-                        tcfg->clocks = s5p64x0_serial_clocks;
-                        tcfg->clocks_size = ARRAY_SIZE(s5p64x0_serial_clocks);
-                }
-        }
-}
-
 void __init s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
         int uart;
@@ -321,13 +301,11 @@ void __init s5p6440_init_uarts(struct s3c2410_uartcfg *cfg, int no)
                 s5p_uart_resources[uart].resources->end = S5P6440_PA_UART(uart) + S5P_SZ_UART;
         }
 
-        s5p64x0_common_init_uarts(cfg, no);
         s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
 }
 
 void __init s5p6450_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
-        s5p64x0_common_init_uarts(cfg, no);
         s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
 }
 
diff --git a/arch/arm/mach-s5p64x0/dev-spi.c b/arch/arm/mach-s5p64x0/dev-spi.c
deleted file mode 100644
index 1fd9c79c7dbc..000000000000
--- a/arch/arm/mach-s5p64x0/dev-spi.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/* linux/arch/arm/mach-s5p64x0/dev-spi.c
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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.
-*/
-
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <mach/dma.h>
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/regs-clock.h>
-#include <mach/spi-clocks.h>
-
-#include <plat/cpu.h>
-#include <plat/s3c64xx-spi.h>
-#include <plat/gpio-cfg.h>
-
-static char *s5p64x0_spi_src_clks[] = {
-        [S5P64X0_SPI_SRCCLK_PCLK] = "pclk",
-        [S5P64X0_SPI_SRCCLK_SCLK] = "sclk_spi",
-};
-
-/* SPI Controller platform_devices */
-
-/* Since we emulate multi-cs capability, we do not touch the CS.
- * The emulated CS is toggled by board specific mechanism, as it can
- * be either some immediate GPIO or some signal out of some other
- * chip in between ... or some yet another way.
- * We simply do not assume anything about CS.
- */
-static int s5p6440_spi_cfg_gpio(struct platform_device *pdev)
-{
-        unsigned int base;
-
-        switch (pdev->id) {
-        case 0:
-                base = S5P6440_GPC(0);
-                break;
-
-        case 1:
-                base = S5P6440_GPC(4);
-                break;
-
-        default:
-                dev_err(&pdev->dev, "Invalid SPI Controller number!");
-                return -EINVAL;
-        }
-
-        s3c_gpio_cfgall_range(base, 3,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-
-        return 0;
-}
-
-static int s5p6450_spi_cfg_gpio(struct platform_device *pdev)
-{
-        unsigned int base;
-
-        switch (pdev->id) {
-        case 0:
-                base = S5P6450_GPC(0);
-                break;
-
-        case 1:
-                base = S5P6450_GPC(4);
-                break;
-
-        default:
-                dev_err(&pdev->dev, "Invalid SPI Controller number!");
-                return -EINVAL;
-        }
-
-        s3c_gpio_cfgall_range(base, 3,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-
-        return 0;
-}
-
-static struct resource s5p64x0_spi0_resource[] = {
-        [0] = {
-                .start  = S5P64X0_PA_SPI0,
-                .end    = S5P64X0_PA_SPI0 + 0x100 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = DMACH_SPI0_TX,
-                .end    = DMACH_SPI0_TX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start  = DMACH_SPI0_RX,
-                .end    = DMACH_SPI0_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = IRQ_SPI0,
-                .end    = IRQ_SPI0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5p6440_spi0_pdata = {
-        .cfg_gpio       = s5p6440_spi_cfg_gpio,
-        .fifo_lvl_mask  = 0x1ff,
-        .rx_lvl_offset  = 15,
-        .tx_st_done     = 25,
-};
-
-static struct s3c64xx_spi_info s5p6450_spi0_pdata = {
-        .cfg_gpio       = s5p6450_spi_cfg_gpio,
-        .fifo_lvl_mask  = 0x1ff,
-        .rx_lvl_offset  = 15,
-        .tx_st_done     = 25,
-};
-
-static u64 spi_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5p64x0_device_spi0 = {
-        .name           = "s3c64xx-spi",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(s5p64x0_spi0_resource),
-        .resource       = s5p64x0_spi0_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-
-static struct resource s5p64x0_spi1_resource[] = {
-        [0] = {
-                .start  = S5P64X0_PA_SPI1,
-                .end    = S5P64X0_PA_SPI1 + 0x100 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = DMACH_SPI1_TX,
-                .end    = DMACH_SPI1_TX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start  = DMACH_SPI1_RX,
-                .end    = DMACH_SPI1_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = IRQ_SPI1,
-                .end    = IRQ_SPI1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5p6440_spi1_pdata = {
-        .cfg_gpio       = s5p6440_spi_cfg_gpio,
-        .fifo_lvl_mask  = 0x7f,
-        .rx_lvl_offset  = 15,
-        .tx_st_done     = 25,
-};
-
-static struct s3c64xx_spi_info s5p6450_spi1_pdata = {
-        .cfg_gpio       = s5p6450_spi_cfg_gpio,
-        .fifo_lvl_mask  = 0x7f,
-        .rx_lvl_offset  = 15,
-        .tx_st_done     = 25,
-};
-
-struct platform_device s5p64x0_device_spi1 = {
-        .name           = "s3c64xx-spi",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(s5p64x0_spi1_resource),
-        .resource       = s5p64x0_spi1_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-};
-
-void __init s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
-{
-        struct s3c64xx_spi_info *pd;
-
-        /* Reject invalid configuration */
-        if (!num_cs || src_clk_nr < 0
-                        || src_clk_nr > S5P64X0_SPI_SRCCLK_SCLK) {
-                printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);
-                return;
-        }
-
-        switch (cntrlr) {
-        case 0:
-                if (soc_is_s5p6450())
-                        pd = &s5p6450_spi0_pdata;
-                else
-                        pd = &s5p6440_spi0_pdata;
-
-                s5p64x0_device_spi0.dev.platform_data = pd;
-                break;
-        case 1:
-                if (soc_is_s5p6450())
-                        pd = &s5p6450_spi1_pdata;
-                else
-                        pd = &s5p6440_spi1_pdata;
-
-                s5p64x0_device_spi1.dev.platform_data = pd;
-                break;
-        default:
-                printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",
-                                                        __func__, cntrlr);
-                return;
-        }
-
-        pd->num_cs = num_cs;
-        pd->src_clk_nr = src_clk_nr;
-        pd->src_clk_name = s5p64x0_spi_src_clks[src_clk_nr];
-}
diff --git a/arch/arm/mach-s5p64x0/dma.c b/arch/arm/mach-s5p64x0/dma.c
index 442dd4ad12da..f820c0744405 100644
--- a/arch/arm/mach-s5p64x0/dma.c
+++ b/arch/arm/mach-s5p64x0/dma.c
@@ -38,176 +38,74 @@
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
-struct dma_pl330_peri s5p6440_pdma_peri[22] = {
-        {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = DMACH_MAX,
-        }, {
-                .peri_id = DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        },
+u8 s5p6440_pdma_peri[] = {
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_PCM0_TX,
+        DMACH_PCM0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI0_RX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_SPI1_TX,
+        DMACH_SPI1_RX,
 };
 
 struct dma_pl330_platdata s5p6440_pdma_pdata = {
         .nr_valid_peri = ARRAY_SIZE(s5p6440_pdma_peri),
-        .peri = s5p6440_pdma_peri,
+        .peri_id = s5p6440_pdma_peri,
 };
 
-struct dma_pl330_peri s5p6450_pdma_peri[32] = {
-        {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART4_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART4_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_USI_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_USI_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PWM,
-        }, {
-                .peri_id = (u8)DMACH_UART5_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART5_TX,
-                .rqtype = MEMTODEV,
-        },
+u8 s5p6450_pdma_peri[] = {
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_UART4_RX,
+        DMACH_UART4_TX,
+        DMACH_PCM0_TX,
+        DMACH_PCM0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI0_RX,
+        DMACH_PCM1_TX,
+        DMACH_PCM1_RX,
+        DMACH_PCM2_TX,
+        DMACH_PCM2_RX,
+        DMACH_SPI1_TX,
+        DMACH_SPI1_RX,
+        DMACH_USI_TX,
+        DMACH_USI_RX,
+        DMACH_MAX,
+        DMACH_I2S1_TX,
+        DMACH_I2S1_RX,
+        DMACH_I2S2_TX,
+        DMACH_I2S2_RX,
+        DMACH_PWM,
+        DMACH_UART5_RX,
+        DMACH_UART5_TX,
 };
 
 struct dma_pl330_platdata s5p6450_pdma_pdata = {
         .nr_valid_peri = ARRAY_SIZE(s5p6450_pdma_peri),
-        .peri = s5p6450_pdma_peri,
+        .peri_id = s5p6450_pdma_peri,
 };
 
 struct amba_device s5p64x0_device_pdma = {
@@ -227,10 +125,15 @@ struct amba_device s5p64x0_device_pdma = {
 
 static int __init s5p64x0_dma_init(void)
 {
-        if (soc_is_s5p6450())
+        if (soc_is_s5p6450()) {
+                dma_cap_set(DMA_SLAVE, s5p6450_pdma_pdata.cap_mask);
+                dma_cap_set(DMA_CYCLIC, s5p6450_pdma_pdata.cap_mask);
                 s5p64x0_device_pdma.dev.platform_data = &s5p6450_pdma_pdata;
-        else
+        } else {
+                dma_cap_set(DMA_SLAVE, s5p6440_pdma_pdata.cap_mask);
+                dma_cap_set(DMA_CYCLIC, s5p6440_pdma_pdata.cap_mask);
                 s5p64x0_device_pdma.dev.platform_data = &s5p6440_pdma_pdata;
+        }
 
         amba_device_register(&s5p64x0_device_pdma, &iomem_resource);
 
diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-s5p64x0/include/mach/irqs.h
index 53982db9d259..5b845e849b30 100644
--- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
+++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h
@@ -141,6 +141,8 @@
 
 #define IRQ_EINT_GROUP(grp, x)  (IRQ_EINT_GROUP##grp##_BASE + (x))
 
+#define IRQ_TIMER_BASE          (11)
+
 /* Set the default NR_IRQS */
 
 #define NR_IRQS                 (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1)
diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h
index 4d3ac8a3709d..0c0175dbfa34 100644
--- a/arch/arm/mach-s5p64x0/include/mach/map.h
+++ b/arch/arm/mach-s5p64x0/include/mach/map.h
@@ -67,6 +67,8 @@
 #define S3C_PA_RTC              S5P64X0_PA_RTC
 #define S3C_PA_WDT              S5P64X0_PA_WDT
 #define S3C_PA_FB               S5P64X0_PA_FB
+#define S3C_PA_SPI0             S5P64X0_PA_SPI0
+#define S3C_PA_SPI1             S5P64X0_PA_SPI1
 
 #define S5P_PA_CHIPID           S5P64X0_PA_CHIPID
 #define S5P_PA_SROMC            S5P64X0_PA_SROMC
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 34d98a1dae57..a40e325d62c8 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/pwm_backlight.h>
 #include <linux/fb.h>
+#include <linux/mmc/host.h>
 
 #include <video/platform_lcd.h>
 
@@ -52,6 +53,7 @@
 #include <plat/backlight.h>
 #include <plat/fb.h>
 #include <plat/regs-fb.h>
+#include <plat/sdhci.h>
 
 #include "common.h"
 
@@ -163,6 +165,25 @@ static struct platform_device *smdk6440_devices[] __initdata = {
         &s5p6440_device_iis,
         &s3c_device_fb,
         &smdk6440_lcd_lte480wv,
+        &s3c_device_hsmmc0,
+        &s3c_device_hsmmc1,
+        &s3c_device_hsmmc2,
+};
+
+static struct s3c_sdhci_platdata smdk6440_hsmmc0_pdata __initdata = {
+        .cd_type        = S3C_SDHCI_CD_NONE,
+};
+
+static struct s3c_sdhci_platdata smdk6440_hsmmc1_pdata __initdata = {
+        .cd_type        = S3C_SDHCI_CD_INTERNAL,
+#if defined(CONFIG_S5P64X0_SD_CH1_8BIT)
+        .max_width      = 8,
+        .host_caps      = MMC_CAP_8_BIT_DATA,
+#endif
+};
+
+static struct s3c_sdhci_platdata smdk6440_hsmmc2_pdata __initdata = {
+        .cd_type        = S3C_SDHCI_CD_NONE,
 };
 
 static struct s3c2410_platform_i2c s5p6440_i2c0_data __initdata = {
@@ -236,6 +257,10 @@ static void __init smdk6440_machine_init(void)
         s5p6440_set_lcd_interface();
         s3c_fb_set_platdata(&smdk6440_lcd_pdata);
 
+        s3c_sdhci0_set_platdata(&smdk6440_hsmmc0_pdata);
+        s3c_sdhci1_set_platdata(&smdk6440_hsmmc1_pdata);
+        s3c_sdhci2_set_platdata(&smdk6440_hsmmc2_pdata);
+
         platform_add_devices(smdk6440_devices, ARRAY_SIZE(smdk6440_devices));
 }
 
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 135cf5d84737..efb69e2f2afe 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -24,6 +24,7 @@
 #include <linux/gpio.h>
 #include <linux/pwm_backlight.h>
 #include <linux/fb.h>
+#include <linux/mmc/host.h>
 
 #include <video/platform_lcd.h>
 
@@ -52,6 +53,7 @@
 #include <plat/backlight.h>
 #include <plat/fb.h>
 #include <plat/regs-fb.h>
+#include <plat/sdhci.h>
 
 #include "common.h"
 
@@ -181,10 +183,28 @@ static struct platform_device *smdk6450_devices[] __initdata = {
         &s5p6450_device_iis0,
         &s3c_device_fb,
         &smdk6450_lcd_lte480wv,
-
+        &s3c_device_hsmmc0,
+        &s3c_device_hsmmc1,
+        &s3c_device_hsmmc2,
         /* s5p6450_device_spi0 will be added */
 };
 
+static struct s3c_sdhci_platdata smdk6450_hsmmc0_pdata __initdata = {
+        .cd_type        = S3C_SDHCI_CD_NONE,
+};
+
+static struct s3c_sdhci_platdata smdk6450_hsmmc1_pdata __initdata = {
+        .cd_type        = S3C_SDHCI_CD_NONE,
+#if defined(CONFIG_S5P64X0_SD_CH1_8BIT)
+        .max_width      = 8,
+        .host_caps      = MMC_CAP_8_BIT_DATA,
+#endif
+};
+
+static struct s3c_sdhci_platdata smdk6450_hsmmc2_pdata __initdata = {
+        .cd_type        = S3C_SDHCI_CD_NONE,
+};
+
 static struct s3c2410_platform_i2c s5p6450_i2c0_data __initdata = {
         .flags          = 0,
         .slave_addr     = 0x10,
@@ -256,6 +276,10 @@ static void __init smdk6450_machine_init(void)
         s5p6450_set_lcd_interface();
         s3c_fb_set_platdata(&smdk6450_lcd_pdata);
 
+        s3c_sdhci0_set_platdata(&smdk6450_hsmmc0_pdata);
+        s3c_sdhci1_set_platdata(&smdk6450_hsmmc1_pdata);
+        s3c_sdhci2_set_platdata(&smdk6450_hsmmc2_pdata);
+
         platform_add_devices(smdk6450_devices, ARRAY_SIZE(smdk6450_devices));
 }
 
diff --git a/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c b/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
new file mode 100644
index 000000000000..8410af0d12bf
--- /dev/null
+++ b/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
@@ -0,0 +1,104 @@
+/* linux/arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com/
+ *
+ * S5P64X0 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC)
+ *
+ * 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.
+*/
+
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+
+#include <mach/regs-gpio.h>
+#include <mach/regs-clock.h>
+
+#include <plat/gpio-cfg.h>
+#include <plat/sdhci.h>
+#include <plat/cpu.h>
+
+void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
+{
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
+
+        /* Set all the necessary GPG pins to special-function 2 */
+        if (soc_is_s5p6450())
+                s3c_gpio_cfgrange_nopull(S5P6450_GPG(0), 2 + width,
+                                         S3C_GPIO_SFN(2));
+        else
+                s3c_gpio_cfgrange_nopull(S5P6440_GPG(0), 2 + width,
+                                         S3C_GPIO_SFN(2));
+
+        /* Set GPG[6] pin to special-function 2 - MMC0 CDn */
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                if (soc_is_s5p6450()) {
+                        s3c_gpio_setpull(S5P6450_GPG(6), S3C_GPIO_PULL_UP);
+                        s3c_gpio_cfgpin(S5P6450_GPG(6), S3C_GPIO_SFN(2));
+                } else {
+                        s3c_gpio_setpull(S5P6440_GPG(6), S3C_GPIO_PULL_UP);
+                        s3c_gpio_cfgpin(S5P6440_GPG(6), S3C_GPIO_SFN(2));
+                }
+        }
+}
+
+void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
+{
+        struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
+
+        /* Set GPH[0:1] pins to special-function 2 - CLK and CMD */
+        if (soc_is_s5p6450())
+                s3c_gpio_cfgrange_nopull(S5P6450_GPH(0), 2, S3C_GPIO_SFN(2));
+        else
+                s3c_gpio_cfgrange_nopull(S5P6440_GPH(0), 2 , S3C_GPIO_SFN(2));
+
+        switch (width) {
+        case 8:
+                /* Set data pins GPH[6:9] special-function 2 */
+                if (soc_is_s5p6450())
+                        s3c_gpio_cfgrange_nopull(S5P6450_GPH(6), 4,
+                                                 S3C_GPIO_SFN(2));
+                else
+                        s3c_gpio_cfgrange_nopull(S5P6440_GPH(6), 4,
+                                                 S3C_GPIO_SFN(2));
+        case 4:
+                /* set data pins GPH[2:5] special-function 2 */
+                if (soc_is_s5p6450())
+                        s3c_gpio_cfgrange_nopull(S5P6450_GPH(2), 4,
+                                                 S3C_GPIO_SFN(2));
+                else
+                        s3c_gpio_cfgrange_nopull(S5P6440_GPH(2), 4,
+                                                 S3C_GPIO_SFN(2));
+        default:
+                break;
+        }
+
+        /* Set GPG[6] pin to special-funtion 3 : MMC1 CDn */
+        if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
+                if (soc_is_s5p6450()) {
+                        s3c_gpio_setpull(S5P6450_GPG(6), S3C_GPIO_PULL_UP);
+                        s3c_gpio_cfgpin(S5P6450_GPG(6), S3C_GPIO_SFN(3));
+                } else {
+                        s3c_gpio_setpull(S5P6440_GPG(6), S3C_GPIO_PULL_UP);
+                        s3c_gpio_cfgpin(S5P6440_GPG(6), S3C_GPIO_SFN(3));
+                }
+        }
+}
+
+void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
+{
+        /* Set GPC[4:5] pins to special-function 3 - CLK and CMD */
+        s3c_gpio_cfgrange_nopull(S5P6440_GPC(4), 2, S3C_GPIO_SFN(3));
+
+        /* Set data pins GPH[6:9] pins to special-function 3 */
+        s3c_gpio_cfgrange_nopull(S5P6440_GPH(6), 4, S3C_GPIO_SFN(3));
+}
+
+void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
+{
+        /* Set all the necessary GPG pins to special-function 3 */
+        s3c_gpio_cfgrange_nopull(S5P6450_GPG(7), 2 + width, S3C_GPIO_SFN(3));
+}
diff --git a/arch/arm/mach-s5p64x0/setup-spi.c b/arch/arm/mach-s5p64x0/setup-spi.c
new file mode 100644
index 000000000000..e9b841240352
--- /dev/null
+++ b/arch/arm/mach-s5p64x0/setup-spi.c
@@ -0,0 +1,55 @@
+/* linux/arch/arm/mach-s5p64x0/setup-spi.c
+ *
+ * Copyright (C) 2011 Samsung Electronics Ltd.
+ *              http://www.samsung.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.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+
+#include <plat/gpio-cfg.h>
+#include <plat/cpu.h>
+#include <plat/s3c64xx-spi.h>
+
+#ifdef CONFIG_S3C64XX_DEV_SPI0
+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {
+        .fifo_lvl_mask  = 0x1ff,
+        .rx_lvl_offset  = 15,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)
+{
+        if (soc_is_s5p6450())
+                s3c_gpio_cfgall_range(S5P6450_GPC(0), 3,
+                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        else
+                s3c_gpio_cfgall_range(S5P6440_GPC(0), 3,
+                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI1
+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 15,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)
+{
+        if (soc_is_s5p6450())
+                s3c_gpio_cfgall_range(S5P6450_GPC(4), 3,
+                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        else
+                s3c_gpio_cfgall_range(S5P6440_GPC(4), 3,
+                                        S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index e538a4c67e9c..75a26eaf2633 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -45,6 +45,11 @@ config S5PC100_SETUP_SDHCI_GPIO
         help
           Common setup code for SDHCI gpio.
 
+config S5PC100_SETUP_SPI
+        bool
+        help
+          Common setup code for SPI GPIO configurations.
+
 config MACH_SMDKC100
         bool "SMDKC100"
         select CPU_S5PC100
diff --git a/arch/arm/mach-s5pc100/Makefile b/arch/arm/mach-s5pc100/Makefile
index c3166c4d2ace..118c711f74e8 100644
--- a/arch/arm/mach-s5pc100/Makefile
+++ b/arch/arm/mach-s5pc100/Makefile
@@ -22,12 +22,11 @@ obj-$(CONFIG_MACH_SMDKC100)	+= mach-smdkc100.o
 # device support
 
 obj-y                           += dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
 
 obj-y                                   += setup-i2c0.o
 obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)    += setup-fb-24bpp.o
 obj-$(CONFIG_S5PC100_SETUP_I2C1)        += setup-i2c1.o
 obj-$(CONFIG_S5PC100_SETUP_IDE)         += setup-ide.o
 obj-$(CONFIG_S5PC100_SETUP_KEYPAD)      += setup-keypad.o
-obj-$(CONFIG_S5PC100_SETUP_SDHCI)       += setup-sdhci.o
 obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
+obj-$(CONFIG_S5PC100_SETUP_SPI)         += setup-spi.o
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
index c4c74893f53c..247194dd366c 100644
--- a/arch/arm/mach-s5pc100/clock.c
+++ b/arch/arm/mach-s5pc100/clock.c
@@ -427,24 +427,6 @@ static struct clk init_clocks_off[] = {
                 .enable         = s5pc100_d0_2_ctrl,
                 .ctrlbit        = (1 << 1),
         }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 6),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_div_d1_bus.clk,
-                .enable         = s5pc100_d1_0_ctrl,
-                .ctrlbit        = (1 << 5),
-        }, {
                 .name           = "modemif",
                 .parent         = &clk_div_d1_bus.clk,
                 .enable         = s5pc100_d1_0_ctrl,
@@ -674,24 +656,6 @@ static struct clk init_clocks_off[] = {
                 .enable         = s5pc100_d1_5_ctrl,
                 .ctrlbit        = (1 << 8),
         }, {
-                .name           = "spi_48m",
-                .devname        = "s3c64xx-spi.0",
-                .parent         = &clk_mout_48m.clk,
-                .enable         = s5pc100_sclk0_ctrl,
-                .ctrlbit        = (1 << 7),
-        }, {
-                .name           = "spi_48m",
-                .devname        = "s3c64xx-spi.1",
-                .parent         = &clk_mout_48m.clk,
-                .enable         = s5pc100_sclk0_ctrl,
-                .ctrlbit        = (1 << 8),
-        }, {
-                .name           = "spi_48m",
-                .devname        = "s3c64xx-spi.2",
-                .parent         = &clk_mout_48m.clk,
-                .enable         = s5pc100_sclk0_ctrl,
-                .ctrlbit        = (1 << 9),
-        }, {
                 .name           = "mmc_48m",
                 .devname        = "s3c-sdhci.0",
                 .parent         = &clk_mout_48m.clk,
@@ -712,6 +676,54 @@ static struct clk init_clocks_off[] = {
         },
 };
 
+static struct clk clk_hsmmc2 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.2",
+        .parent         = &clk_div_d1_bus.clk,
+        .enable         = s5pc100_d1_0_ctrl,
+        .ctrlbit        = (1 << 7),
+};
+
+static struct clk clk_hsmmc1 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.1",
+        .parent         = &clk_div_d1_bus.clk,
+        .enable         = s5pc100_d1_0_ctrl,
+        .ctrlbit        = (1 << 6),
+};
+
+static struct clk clk_hsmmc0 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.0",
+        .parent         = &clk_div_d1_bus.clk,
+        .enable         = s5pc100_d1_0_ctrl,
+        .ctrlbit        = (1 << 5),
+};
+
+static struct clk clk_48m_spi0 = {
+        .name           = "spi_48m",
+        .devname        = "s3c64xx-spi.0",
+        .parent         = &clk_mout_48m.clk,
+        .enable         = s5pc100_sclk0_ctrl,
+        .ctrlbit        = (1 << 7),
+};
+
+static struct clk clk_48m_spi1 = {
+        .name           = "spi_48m",
+        .devname        = "s3c64xx-spi.1",
+        .parent         = &clk_mout_48m.clk,
+        .enable         = s5pc100_sclk0_ctrl,
+        .ctrlbit        = (1 << 8),
+};
+
+static struct clk clk_48m_spi2 = {
+        .name           = "spi_48m",
+        .devname        = "s3c64xx-spi.2",
+        .parent         = &clk_mout_48m.clk,
+        .enable         = s5pc100_sclk0_ctrl,
+        .ctrlbit        = (1 << 9),
+};
+
 static struct clk clk_vclk54m = {
         .name           = "vclk_54m",
         .rate           = 54000000,
@@ -930,49 +942,6 @@ static struct clksrc_clk clk_sclk_spdif = {
 static struct clksrc_clk clksrcs[] = {
         {
                 .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.0",
-                        .ctrlbit        = (1 << 4),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_group1,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 4, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.1",
-                        .ctrlbit        = (1 << 5),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_group1,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 8, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 8, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.2",
-                        .ctrlbit        = (1 << 6),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_group1,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 12, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 12, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "uclk1",
-                        .ctrlbit        = (1 << 3),
-                        .enable         = s5pc100_sclk0_ctrl,
-
-                },
-                .sources = &clk_src_group2,
-                .reg_src = { .reg = S5P_CLK_SRC1, .shift = 0, .size = 1 },
-                .reg_div = { .reg = S5P_CLK_DIV2, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
                         .name           = "sclk_mixer",
                         .ctrlbit        = (1 << 6),
                         .enable         = s5pc100_sclk0_ctrl,
@@ -1025,39 +994,6 @@ static struct clksrc_clk clksrcs[] = {
                 .reg_div = { .reg = S5P_CLK_DIV3, .shift = 24, .size = 4 },
         }, {
                 .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.0",
-                        .ctrlbit        = (1 << 12),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_mmc0,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 0, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.1",
-                        .ctrlbit        = (1 << 13),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_mmc12,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 4, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },
-        }, {
-                .clk    = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.2",
-                        .ctrlbit        = (1 << 14),
-                        .enable         = s5pc100_sclk1_ctrl,
-
-                },
-                .sources = &clk_src_mmc12,
-                .reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },
-                .reg_div = { .reg = S5P_CLK_DIV3, .shift = 8, .size = 4 },
-        }, {
-                .clk    = {
                         .name           = "sclk_irda",
                         .ctrlbit        = (1 << 10),
                         .enable         = s5pc100_sclk0_ctrl,
@@ -1099,6 +1035,89 @@ static struct clksrc_clk clksrcs[] = {
         },
 };
 
+static struct clksrc_clk clk_sclk_uart = {
+        .clk    = {
+                .name           = "uclk1",
+                .ctrlbit        = (1 << 3),
+                .enable         = s5pc100_sclk0_ctrl,
+        },
+        .sources = &clk_src_group2,
+        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 0, .size = 1 },
+        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc0 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.0",
+                .ctrlbit        = (1 << 12),
+                .enable         = s5pc100_sclk1_ctrl,
+        },
+        .sources = &clk_src_mmc0,
+        .reg_src = { .reg = S5P_CLK_SRC2, .shift = 0, .size = 2 },
+        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc1 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.1",
+                .ctrlbit        = (1 << 13),
+                .enable         = s5pc100_sclk1_ctrl,
+        },
+        .sources = &clk_src_mmc12,
+        .reg_src = { .reg = S5P_CLK_SRC2, .shift = 4, .size = 2 },
+        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc2 = {
+        .clk    = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.2",
+                .ctrlbit        = (1 << 14),
+                .enable         = s5pc100_sclk1_ctrl,
+        },
+        .sources = &clk_src_mmc12,
+        .reg_src = { .reg = S5P_CLK_SRC2, .shift = 8, .size = 2 },
+        .reg_div = { .reg = S5P_CLK_DIV3, .shift = 8, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi0 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.0",
+                .ctrlbit        = (1 << 4),
+                .enable         = s5pc100_sclk0_ctrl,
+        },
+        .sources = &clk_src_group1,
+        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 4, .size = 2 },
+        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi1 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.1",
+                .ctrlbit        = (1 << 5),
+                .enable         = s5pc100_sclk0_ctrl,
+        },
+        .sources = &clk_src_group1,
+        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 8, .size = 2 },
+        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 8, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi2 = {
+        .clk    = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.2",
+                .ctrlbit        = (1 << 6),
+                .enable         = s5pc100_sclk0_ctrl,
+        },
+        .sources = &clk_src_group1,
+        .reg_src = { .reg = S5P_CLK_SRC1, .shift = 12, .size = 2 },
+        .reg_div = { .reg = S5P_CLK_DIV2, .shift = 12, .size = 4 },
+};
+
 /* Clock initialisation code */
 static struct clksrc_clk *sysclks[] = {
         &clk_mout_apll,
@@ -1128,6 +1147,25 @@ static struct clksrc_clk *sysclks[] = {
         &clk_sclk_spdif,
 };
 
+static struct clk *clk_cdev[] = {
+        &clk_hsmmc0,
+        &clk_hsmmc1,
+        &clk_hsmmc2,
+        &clk_48m_spi0,
+        &clk_48m_spi1,
+        &clk_48m_spi2,
+};
+
+static struct clksrc_clk *clksrc_cdev[] = {
+        &clk_sclk_uart,
+        &clk_sclk_mmc0,
+        &clk_sclk_mmc1,
+        &clk_sclk_mmc2,
+        &clk_sclk_spi0,
+        &clk_sclk_spi1,
+        &clk_sclk_spi2,
+};
+
 void __init_or_cpufreq s5pc100_setup_clocks(void)
 {
         unsigned long xtal;
@@ -1267,6 +1305,24 @@ static struct clk *clks[] __initdata = {
         &clk_pcmcdclk1,
 };
 
+static struct clk_lookup s5pc100_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_sclk_uart.clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &clk_hsmmc0),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &clk_hsmmc1),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &clk_hsmmc2),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
+        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &clk_48m_spi0),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk2", &clk_sclk_spi0.clk),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &clk_48m_spi1),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk2", &clk_sclk_spi1.clk),
+        CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk1", &clk_48m_spi2),
+        CLKDEV_INIT("s3c64xx-spi.2", "spi_busclk2", &clk_sclk_spi2.clk),
+};
+
 void __init s5pc100_register_clocks(void)
 {
         int ptr;
@@ -1278,9 +1334,16 @@ void __init s5pc100_register_clocks(void)
 
         s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
         s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
+        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
+                s3c_register_clksrc(clksrc_cdev[ptr], 1);
 
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+        clkdev_add_table(s5pc100_clk_lookup, ARRAY_SIZE(s5pc100_clk_lookup));
+
+        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
+        for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
+                s3c_disable_clocks(clk_cdev[ptr], 1);
 
         s3c24xx_register_clock(&dummy_apb_pclk);
 
diff --git a/arch/arm/mach-s5pc100/dev-spi.c b/arch/arm/mach-s5pc100/dev-spi.c
deleted file mode 100644
index e5d6c4dceb56..000000000000
--- a/arch/arm/mach-s5pc100/dev-spi.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/dev-spi.c
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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.
- */
-
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <mach/dma.h>
-#include <mach/map.h>
-#include <mach/spi-clocks.h>
-#include <mach/irqs.h>
-
-#include <plat/s3c64xx-spi.h>
-#include <plat/gpio-cfg.h>
-#include <plat/irqs.h>
-
-static char *spi_src_clks[] = {
-        [S5PC100_SPI_SRCCLK_PCLK] = "pclk",
-        [S5PC100_SPI_SRCCLK_48M] = "spi_48m",
-        [S5PC100_SPI_SRCCLK_SPIBUS] = "spi_bus",
-};
-
-/* SPI Controller platform_devices */
-
-/* Since we emulate multi-cs capability, we do not touch the CS.
- * The emulated CS is toggled by board specific mechanism, as it can
- * be either some immediate GPIO or some signal out of some other
- * chip in between ... or some yet another way.
- * We simply do not assume anything about CS.
- */
-static int s5pc100_spi_cfg_gpio(struct platform_device *pdev)
-{
-        switch (pdev->id) {
-        case 0:
-                s3c_gpio_cfgall_range(S5PC100_GPB(0), 3,
-                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-                break;
-
-        case 1:
-                s3c_gpio_cfgall_range(S5PC100_GPB(4), 3,
-                                      S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-                break;
-
-        case 2:
-                s3c_gpio_cfgpin(S5PC100_GPG3(0), S3C_GPIO_SFN(3));
-                s3c_gpio_setpull(S5PC100_GPG3(0), S3C_GPIO_PULL_UP);
-                s3c_gpio_cfgall_range(S5PC100_GPB(2), 2,
-                                      S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);
-                break;
-
-        default:
-                dev_err(&pdev->dev, "Invalid SPI Controller number!");
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static struct resource s5pc100_spi0_resource[] = {
-        [0] = {
-                .start = S5PC100_PA_SPI0,
-                .end   = S5PC100_PA_SPI0 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI0_TX,
-                .end   = DMACH_SPI0_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI0_RX,
-                .end   = DMACH_SPI0_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI0,
-                .end   = IRQ_SPI0,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5pc100_spi0_pdata = {
-        .cfg_gpio = s5pc100_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x7f,
-        .rx_lvl_offset = 13,
-        .high_speed = 1,
-        .tx_st_done = 21,
-};
-
-static u64 spi_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pc100_device_spi0 = {
-        .name             = "s3c64xx-spi",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s5pc100_spi0_resource),
-        .resource         = s5pc100_spi0_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s5pc100_spi0_pdata,
-        },
-};
-
-static struct resource s5pc100_spi1_resource[] = {
-        [0] = {
-                .start = S5PC100_PA_SPI1,
-                .end   = S5PC100_PA_SPI1 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI1_TX,
-                .end   = DMACH_SPI1_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI1_RX,
-                .end   = DMACH_SPI1_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI1,
-                .end   = IRQ_SPI1,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5pc100_spi1_pdata = {
-        .cfg_gpio = s5pc100_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x7f,
-        .rx_lvl_offset = 13,
-        .high_speed = 1,
-        .tx_st_done = 21,
-};
-
-struct platform_device s5pc100_device_spi1 = {
-        .name             = "s3c64xx-spi",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5pc100_spi1_resource),
-        .resource         = s5pc100_spi1_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s5pc100_spi1_pdata,
-        },
-};
-
-static struct resource s5pc100_spi2_resource[] = {
-        [0] = {
-                .start = S5PC100_PA_SPI2,
-                .end   = S5PC100_PA_SPI2 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI2_TX,
-                .end   = DMACH_SPI2_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI2_RX,
-                .end   = DMACH_SPI2_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI2,
-                .end   = IRQ_SPI2,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5pc100_spi2_pdata = {
-        .cfg_gpio = s5pc100_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x7f,
-        .rx_lvl_offset = 13,
-        .high_speed = 1,
-        .tx_st_done = 21,
-};
-
-struct platform_device s5pc100_device_spi2 = {
-        .name             = "s3c64xx-spi",
-        .id               = 2,
-        .num_resources    = ARRAY_SIZE(s5pc100_spi2_resource),
-        .resource         = s5pc100_spi2_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s5pc100_spi2_pdata,
-        },
-};
-
-void __init s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
-{
-        struct s3c64xx_spi_info *pd;
-
-        /* Reject invalid configuration */
-        if (!num_cs || src_clk_nr < 0
-                        || src_clk_nr > S5PC100_SPI_SRCCLK_SPIBUS) {
-                printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);
-                return;
-        }
-
-        switch (cntrlr) {
-        case 0:
-                pd = &s5pc100_spi0_pdata;
-                break;
-        case 1:
-                pd = &s5pc100_spi1_pdata;
-                break;
-        case 2:
-                pd = &s5pc100_spi2_pdata;
-                break;
-        default:
-                printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",
-                                                        __func__, cntrlr);
-                return;
-        }
-
-        pd->num_cs = num_cs;
-        pd->src_clk_nr = src_clk_nr;
-        pd->src_clk_name = spi_src_clks[src_clk_nr];
-}
diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c
index 065a087f5a8b..c841f4d313f2 100644
--- a/arch/arm/mach-s5pc100/dma.c
+++ b/arch/arm/mach-s5pc100/dma.c
@@ -35,100 +35,42 @@
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
-struct dma_pl330_peri pdma0_peri[30] = {
-        {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = DMACH_IRDA,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0S_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_AC97_MICIN,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_AC97_PCMIN,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_AC97_PCMOUT,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_EXTERNAL,
-        }, {
-                .peri_id = (u8)DMACH_PWM,
-        }, {
-                .peri_id = (u8)DMACH_SPDIF,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_HSI_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_HSI_TX,
-                .rqtype = MEMTODEV,
-        },
+u8 pdma0_peri[] = {
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_IRDA,
+        DMACH_I2S0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S0S_TX,
+        DMACH_I2S1_RX,
+        DMACH_I2S1_TX,
+        DMACH_I2S2_RX,
+        DMACH_I2S2_TX,
+        DMACH_SPI0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI1_RX,
+        DMACH_SPI1_TX,
+        DMACH_SPI2_RX,
+        DMACH_SPI2_TX,
+        DMACH_AC97_MICIN,
+        DMACH_AC97_PCMIN,
+        DMACH_AC97_PCMOUT,
+        DMACH_EXTERNAL,
+        DMACH_PWM,
+        DMACH_SPDIF,
+        DMACH_HSI_RX,
+        DMACH_HSI_TX,
 };
 
 struct dma_pl330_platdata s5pc100_pdma0_pdata = {
         .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-        .peri = pdma0_peri,
+        .peri_id = pdma0_peri,
 };
 
 struct amba_device s5pc100_device_pdma0 = {
@@ -147,98 +89,42 @@ struct amba_device s5pc100_device_pdma0 = {
         .periphid = 0x00041330,
 };
 
-struct dma_pl330_peri pdma1_peri[30] = {
-        {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = DMACH_IRDA,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0S_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ0,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ1,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ2,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ3,
-        },
+u8 pdma1_peri[] = {
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_IRDA,
+        DMACH_I2S0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S0S_TX,
+        DMACH_I2S1_RX,
+        DMACH_I2S1_TX,
+        DMACH_I2S2_RX,
+        DMACH_I2S2_TX,
+        DMACH_SPI0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI1_RX,
+        DMACH_SPI1_TX,
+        DMACH_SPI2_RX,
+        DMACH_SPI2_TX,
+        DMACH_PCM0_RX,
+        DMACH_PCM0_TX,
+        DMACH_PCM1_RX,
+        DMACH_PCM1_TX,
+        DMACH_MSM_REQ0,
+        DMACH_MSM_REQ1,
+        DMACH_MSM_REQ2,
+        DMACH_MSM_REQ3,
 };
 
 struct dma_pl330_platdata s5pc100_pdma1_pdata = {
         .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
-        .peri = pdma1_peri,
+        .peri_id = pdma1_peri,
 };
 
 struct amba_device s5pc100_device_pdma1 = {
@@ -259,7 +145,12 @@ struct amba_device s5pc100_device_pdma1 = {
 
 static int __init s5pc100_dma_init(void)
 {
+        dma_cap_set(DMA_SLAVE, s5pc100_pdma0_pdata.cap_mask);
+        dma_cap_set(DMA_CYCLIC, s5pc100_pdma0_pdata.cap_mask);
         amba_device_register(&s5pc100_device_pdma0, &iomem_resource);
+
+        dma_cap_set(DMA_SLAVE, s5pc100_pdma1_pdata.cap_mask);
+        dma_cap_set(DMA_CYCLIC, s5pc100_pdma1_pdata.cap_mask);
         amba_device_register(&s5pc100_device_pdma1, &iomem_resource);
 
         return 0;
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h
index d2eb4757381f..2870f12c7926 100644
--- a/arch/arm/mach-s5pc100/include/mach/irqs.h
+++ b/arch/arm/mach-s5pc100/include/mach/irqs.h
@@ -97,6 +97,8 @@
 #define IRQ_SDMFIQ              S5P_IRQ_VIC2(31)
 #define IRQ_VIC_END             S5P_IRQ_VIC2(31)
 
+#define IRQ_TIMER_BASE          (11)
+
 #define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
 #define S5P_EINT_BASE2          (IRQ_VIC_END + 1)
 
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index ccbe6b767f7d..54bc4f82e17a 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -100,6 +100,9 @@
 #define S3C_PA_USB_HSOTG                S5PC100_PA_USB_HSOTG
 #define S3C_PA_USB_HSPHY                S5PC100_PA_USB_HSPHY
 #define S3C_PA_WDT                      S5PC100_PA_WATCHDOG
+#define S3C_PA_SPI0                     S5PC100_PA_SPI0
+#define S3C_PA_SPI1                     S5PC100_PA_SPI1
+#define S3C_PA_SPI2                     S5PC100_PA_SPI2
 
 #define S5P_PA_CHIPID                   S5PC100_PA_CHIPID
 #define S5P_PA_FIMC0                    S5PC100_PA_FIMC0
diff --git a/arch/arm/mach-s5pc100/setup-sdhci.c b/arch/arm/mach-s5pc100/setup-sdhci.c
deleted file mode 100644
index 6418c6e8a7b7..000000000000
--- a/arch/arm/mach-s5pc100/setup-sdhci.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* linux/arch/arm/mach-s5pc100/setup-sdhci.c
- *
- * Copyright 2008 Samsung Electronics
- *
- * S5PC100 - Helper functions for settign up SDHCI device(s) (HSMMC)
- *
- * Based on mach-s3c6410/setup-sdhci.c
- *
- * 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.
-*/
-
-#include <linux/types.h>
-
-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
-
-char *s5pc100_hsmmc_clksrcs[4] = {
-        [0] = "hsmmc",          /* HCLK */
-        /* [1] = "hsmmc",       - duplicate HCLK entry */
-        [2] = "sclk_mmc",       /* mmc_bus */
-        /* [3] = "48m",         - note not successfully used yet */
-};
diff --git a/arch/arm/mach-s5pc100/setup-spi.c b/arch/arm/mach-s5pc100/setup-spi.c
new file mode 100644
index 000000000000..431a6f747caa
--- /dev/null
+++ b/arch/arm/mach-s5pc100/setup-spi.c
@@ -0,0 +1,65 @@
+/* linux/arch/arm/mach-s5pc100/setup-spi.c
+ *
+ * Copyright (C) 2011 Samsung Electronics Ltd.
+ *              http://www.samsung.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.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <plat/gpio-cfg.h>
+#include <plat/s3c64xx-spi.h>
+
+#ifdef CONFIG_S3C64XX_DEV_SPI0
+struct s3c64xx_spi_info s3c64xx_spi0_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 13,
+        .high_speed     = 1,
+        .tx_st_done     = 21,
+};
+
+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgall_range(S5PC100_GPB(0), 3,
+                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI1
+struct s3c64xx_spi_info s3c64xx_spi1_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 13,
+        .high_speed     = 1,
+        .tx_st_done     = 21,
+};
+
+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgall_range(S5PC100_GPB(4), 3,
+                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI2
+struct s3c64xx_spi_info s3c64xx_spi2_pdata __initdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 13,
+        .high_speed     = 1,
+        .tx_st_done     = 21,
+};
+
+int s3c64xx_spi2_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgpin(S5PC100_GPG3(0), S3C_GPIO_SFN(3));
+        s3c_gpio_setpull(S5PC100_GPG3(0), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(S5PC100_GPB(2), 2,
+                                S3C_GPIO_SFN(3), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 646057ab2e4c..2cdc42e838b8 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -60,6 +60,11 @@ config S5PV210_SETUP_FIMC
         help
           Common setup code for the camera interfaces.
 
+config S5PV210_SETUP_SPI
+        bool
+        help
+          Common setup code for SPI GPIO configurations.
+
 menu "S5PC110 Machines"
 
 config MACH_AQUILA
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 4c59186de957..76a121dd52b4 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_MACH_TORBRECK)	+= mach-torbreck.o
 # device support
 
 obj-y                           += dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)   += dev-spi.o
 
 obj-y                                   += setup-i2c0.o
 obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)    += setup-fb-24bpp.o
@@ -38,5 +37,5 @@ obj-$(CONFIG_S5PV210_SETUP_I2C1)	+= setup-i2c1.o
 obj-$(CONFIG_S5PV210_SETUP_I2C2)        += setup-i2c2.o
 obj-$(CONFIG_S5PV210_SETUP_IDE)         += setup-ide.o
 obj-$(CONFIG_S5PV210_SETUP_KEYPAD)      += setup-keypad.o
-obj-$(CONFIG_S5PV210_SETUP_SDHCI)       += setup-sdhci.o
 obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
+obj-$(CONFIG_S5PV210_SETUP_SPI)         += setup-spi.o
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 04c9b578e626..c78dfddd77fd 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -400,30 +400,6 @@ static struct clk init_clocks_off[] = {
                 .enable         = s5pv210_clk_ip1_ctrl,
                 .ctrlbit        = (1<<25),
         }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.0",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip2_ctrl,
-                .ctrlbit        = (1<<16),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip2_ctrl,
-                .ctrlbit        = (1<<17),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.2",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip2_ctrl,
-                .ctrlbit        = (1<<18),
-        }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.3",
-                .parent         = &clk_hclk_psys.clk,
-                .enable         = s5pv210_clk_ip2_ctrl,
-                .ctrlbit        = (1<<19),
-        }, {
                 .name           = "systimer",
                 .parent         = &clk_pclk_psys.clk,
                 .enable         = s5pv210_clk_ip3_ctrl,
@@ -560,6 +536,38 @@ static struct clk init_clocks[] = {
         },
 };
 
+static struct clk clk_hsmmc0 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.0",
+        .parent         = &clk_hclk_psys.clk,
+        .enable         = s5pv210_clk_ip2_ctrl,
+        .ctrlbit        = (1<<16),
+};
+
+static struct clk clk_hsmmc1 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.1",
+        .parent         = &clk_hclk_psys.clk,
+        .enable         = s5pv210_clk_ip2_ctrl,
+        .ctrlbit        = (1<<17),
+};
+
+static struct clk clk_hsmmc2 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.2",
+        .parent         = &clk_hclk_psys.clk,
+        .enable         = s5pv210_clk_ip2_ctrl,
+        .ctrlbit        = (1<<18),
+};
+
+static struct clk clk_hsmmc3 = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.3",
+        .parent         = &clk_hclk_psys.clk,
+        .enable         = s5pv210_clk_ip2_ctrl,
+        .ctrlbit        = (1<<19),
+};
+
 static struct clk *clkset_uart_list[] = {
         [6] = &clk_mout_mpll.clk,
         [7] = &clk_mout_epll.clk,
@@ -810,46 +818,6 @@ static struct clksrc_clk clksrcs[] = {
                 .reg_div = { .reg = S5P_CLK_DIV6, .shift = 12, .size = 3 },
         }, {
                 .clk    = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.0",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 12),
-                },
-                .sources = &clkset_uart,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 16, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 16, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.1",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 13),
-                },
-                .sources = &clkset_uart,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 20, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 20, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.2",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 14),
-                },
-                .sources = &clkset_uart,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 24, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 24, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "uclk1",
-                        .devname        = "s5pv210-uart.3",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 15),
-                },
-                .sources = &clkset_uart,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 28, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 28, .size = 4 },
-        }, {
-                .clk    = {
                         .name           = "sclk_fimc",
                         .devname        = "s5pv210-fimc.0",
                         .enable         = s5pv210_clk_mask1_ctrl,
@@ -907,46 +875,6 @@ static struct clksrc_clk clksrcs[] = {
                 .reg_div = { .reg = S5P_CLK_DIV1, .shift = 20, .size = 4 },
         }, {
                 .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.0",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 8),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 0, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 0, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.1",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 9),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 4, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 4, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.2",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 10),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 8, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 8, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_mmc",
-                        .devname        = "s3c-sdhci.3",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 11),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC4, .shift = 12, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV4, .shift = 12, .size = 4 },
-        }, {
-                .clk            = {
                         .name           = "sclk_mfc",
                         .devname        = "s5p-mfc",
                         .enable         = s5pv210_clk_ip0_ctrl,
@@ -984,26 +912,6 @@ static struct clksrc_clk clksrcs[] = {
                 .reg_div = { .reg = S5P_CLK_DIV1, .shift = 28, .size = 4 },
         }, {
                 .clk            = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.0",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 16),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC5, .shift = 0, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV5, .shift = 0, .size = 4 },
-        }, {
-                .clk            = {
-                        .name           = "sclk_spi",
-                        .devname        = "s3c64xx-spi.1",
-                        .enable         = s5pv210_clk_mask0_ctrl,
-                        .ctrlbit        = (1 << 17),
-                },
-                .sources = &clkset_group2,
-                .reg_src = { .reg = S5P_CLK_SRC5, .shift = 4, .size = 4 },
-                .reg_div = { .reg = S5P_CLK_DIV5, .shift = 4, .size = 4 },
-        }, {
-                .clk            = {
                         .name           = "sclk_pwi",
                         .enable         = s5pv210_clk_mask0_ctrl,
                         .ctrlbit        = (1 << 29),
@@ -1023,6 +931,147 @@ static struct clksrc_clk clksrcs[] = {
         },
 };
 
+static struct clksrc_clk clk_sclk_uart0 = {
+        .clk    = {
+                .name           = "uclk1",
+                .devname        = "s5pv210-uart.0",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 12),
+        },
+        .sources = &clkset_uart,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 16, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 16, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uart1 = {
+        .clk            = {
+                .name           = "uclk1",
+                .devname        = "s5pv210-uart.1",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 13),
+        },
+        .sources = &clkset_uart,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 20, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 20, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uart2 = {
+        .clk            = {
+                .name           = "uclk1",
+                .devname        = "s5pv210-uart.2",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 14),
+        },
+        .sources = &clkset_uart,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 24, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 24, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_uart3 = {
+        .clk            = {
+                .name           = "uclk1",
+                .devname        = "s5pv210-uart.3",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 15),
+        },
+        .sources = &clkset_uart,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 28, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 28, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc0 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.0",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 8),
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 0, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 0, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc1 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.1",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 9),
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 4, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 4, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc2 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.2",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 10),
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 8, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 8, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_mmc3 = {
+        .clk            = {
+                .name           = "sclk_mmc",
+                .devname        = "s3c-sdhci.3",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 11),
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P_CLK_SRC4, .shift = 12, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV4, .shift = 12, .size = 4 },
+};
+
+static struct clksrc_clk clk_sclk_spi0 = {
+        .clk            = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.0",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 16),
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P_CLK_SRC5, .shift = 0, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV5, .shift = 0, .size = 4 },
+        };
+
+static struct clksrc_clk clk_sclk_spi1 = {
+        .clk            = {
+                .name           = "sclk_spi",
+                .devname        = "s3c64xx-spi.1",
+                .enable         = s5pv210_clk_mask0_ctrl,
+                .ctrlbit        = (1 << 17),
+        },
+        .sources = &clkset_group2,
+        .reg_src = { .reg = S5P_CLK_SRC5, .shift = 4, .size = 4 },
+        .reg_div = { .reg = S5P_CLK_DIV5, .shift = 4, .size = 4 },
+        };
+
+
+static struct clksrc_clk *clksrc_cdev[] = {
+        &clk_sclk_uart0,
+        &clk_sclk_uart1,
+        &clk_sclk_uart2,
+        &clk_sclk_uart3,
+        &clk_sclk_mmc0,
+        &clk_sclk_mmc1,
+        &clk_sclk_mmc2,
+        &clk_sclk_mmc3,
+        &clk_sclk_spi0,
+        &clk_sclk_spi1,
+};
+
+static struct clk *clk_cdev[] = {
+        &clk_hsmmc0,
+        &clk_hsmmc1,
+        &clk_hsmmc2,
+        &clk_hsmmc3,
+};
+
 /* Clock initialisation code */
 static struct clksrc_clk *sysclks[] = {
         &clk_mout_apll,
@@ -1262,6 +1311,25 @@ static struct clk *clks[] __initdata = {
         &clk_pcmcdclk2,
 };
 
+static struct clk_lookup s5pv210_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud0", &clk_p),
+        CLKDEV_INIT("s5pv210-uart.0", "clk_uart_baud1", &clk_sclk_uart0.clk),
+        CLKDEV_INIT("s5pv210-uart.1", "clk_uart_baud1", &clk_sclk_uart1.clk),
+        CLKDEV_INIT("s5pv210-uart.2", "clk_uart_baud1", &clk_sclk_uart2.clk),
+        CLKDEV_INIT("s5pv210-uart.3", "clk_uart_baud1", &clk_sclk_uart3.clk),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.0", &clk_hsmmc0),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &clk_hsmmc1),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.0", &clk_hsmmc2),
+        CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.0", &clk_hsmmc3),
+        CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),
+        CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),
+        CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),
+        CLKDEV_INIT(NULL, "spi_busclk0", &clk_p),
+        CLKDEV_INIT("s3c64xx-spi.0", "spi_busclk1", &clk_sclk_spi0.clk),
+        CLKDEV_INIT("s3c64xx-spi.1", "spi_busclk1", &clk_sclk_spi1.clk),
+};
+
 void __init s5pv210_register_clocks(void)
 {
         int ptr;
@@ -1274,11 +1342,19 @@ void __init s5pv210_register_clocks(void)
         for (ptr = 0; ptr < ARRAY_SIZE(sclk_tv); ptr++)
                 s3c_register_clksrc(sclk_tv[ptr], 1);
 
+        for (ptr = 0; ptr < ARRAY_SIZE(clksrc_cdev); ptr++)
+                s3c_register_clksrc(clksrc_cdev[ptr], 1);
+
         s3c_register_clksrc(clksrcs, ARRAY_SIZE(clksrcs));
         s3c_register_clocks(init_clocks, ARRAY_SIZE(init_clocks));
 
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+        clkdev_add_table(s5pv210_clk_lookup, ARRAY_SIZE(s5pv210_clk_lookup));
+
+        s3c24xx_register_clocks(clk_cdev, ARRAY_SIZE(clk_cdev));
+        for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
+                s3c_disable_clocks(clk_cdev[ptr], 1);
 
         s3c24xx_register_clock(&dummy_apb_pclk);
         s3c_pwmclk_init();
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 0ec393305d7c..9c1bcdcc12c3 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -254,28 +254,9 @@ int __init s5pv210_init(void)
         return device_register(&s5pv210_dev);
 }
 
-static struct s3c24xx_uart_clksrc s5pv210_serial_clocks[] = {
-        [0] = {
-                .name           = "pclk",
-                .divisor        = 1,
-                .min_baud       = 0,
-                .max_baud       = 0,
-        },
-};
-
 /* uart registration process */
 
 void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
-        struct s3c2410_uartcfg *tcfg = cfg;
-        u32 ucnt;
-
-        for (ucnt = 0; ucnt < no; ucnt++, tcfg++) {
-                if (!tcfg->clocks) {
-                        tcfg->clocks = s5pv210_serial_clocks;
-                        tcfg->clocks_size = ARRAY_SIZE(s5pv210_serial_clocks);
-                }
-        }
-
         s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
 }
diff --git a/arch/arm/mach-s5pv210/dev-spi.c b/arch/arm/mach-s5pv210/dev-spi.c
deleted file mode 100644
index eaf9a7bff7a0..000000000000
--- a/arch/arm/mach-s5pv210/dev-spi.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/dev-spi.c
- *
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.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.
- */
-
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-
-#include <mach/dma.h>
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <mach/spi-clocks.h>
-
-#include <plat/s3c64xx-spi.h>
-#include <plat/gpio-cfg.h>
-
-static char *spi_src_clks[] = {
-        [S5PV210_SPI_SRCCLK_PCLK] = "pclk",
-        [S5PV210_SPI_SRCCLK_SCLK] = "sclk_spi",
-};
-
-/* SPI Controller platform_devices */
-
-/* Since we emulate multi-cs capability, we do not touch the CS.
- * The emulated CS is toggled by board specific mechanism, as it can
- * be either some immediate GPIO or some signal out of some other
- * chip in between ... or some yet another way.
- * We simply do not assume anything about CS.
- */
-static int s5pv210_spi_cfg_gpio(struct platform_device *pdev)
-{
-        unsigned int base;
-
-        switch (pdev->id) {
-        case 0:
-                base = S5PV210_GPB(0);
-                break;
-
-        case 1:
-                base = S5PV210_GPB(4);
-                break;
-
-        default:
-                dev_err(&pdev->dev, "Invalid SPI Controller number!");
-                return -EINVAL;
-        }
-
-        s3c_gpio_cfgall_range(base, 3,
-                              S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
-
-        return 0;
-}
-
-static struct resource s5pv210_spi0_resource[] = {
-        [0] = {
-                .start = S5PV210_PA_SPI0,
-                .end   = S5PV210_PA_SPI0 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI0_TX,
-                .end   = DMACH_SPI0_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI0_RX,
-                .end   = DMACH_SPI0_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI0,
-                .end   = IRQ_SPI0,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5pv210_spi0_pdata = {
-        .cfg_gpio = s5pv210_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x1ff,
-        .rx_lvl_offset = 15,
-        .high_speed = 1,
-        .tx_st_done = 25,
-};
-
-static u64 spi_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device s5pv210_device_spi0 = {
-        .name             = "s3c64xx-spi",
-        .id               = 0,
-        .num_resources    = ARRAY_SIZE(s5pv210_spi0_resource),
-        .resource         = s5pv210_spi0_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s5pv210_spi0_pdata,
-        },
-};
-
-static struct resource s5pv210_spi1_resource[] = {
-        [0] = {
-                .start = S5PV210_PA_SPI1,
-                .end   = S5PV210_PA_SPI1 + 0x100 - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start = DMACH_SPI1_TX,
-                .end   = DMACH_SPI1_TX,
-                .flags = IORESOURCE_DMA,
-        },
-        [2] = {
-                .start = DMACH_SPI1_RX,
-                .end   = DMACH_SPI1_RX,
-                .flags = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start = IRQ_SPI1,
-                .end   = IRQ_SPI1,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct s3c64xx_spi_info s5pv210_spi1_pdata = {
-        .cfg_gpio = s5pv210_spi_cfg_gpio,
-        .fifo_lvl_mask = 0x7f,
-        .rx_lvl_offset = 15,
-        .high_speed = 1,
-        .tx_st_done = 25,
-};
-
-struct platform_device s5pv210_device_spi1 = {
-        .name             = "s3c64xx-spi",
-        .id               = 1,
-        .num_resources    = ARRAY_SIZE(s5pv210_spi1_resource),
-        .resource         = s5pv210_spi1_resource,
-        .dev = {
-                .dma_mask               = &spi_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data = &s5pv210_spi1_pdata,
-        },
-};
-
-void __init s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs)
-{
-        struct s3c64xx_spi_info *pd;
-
-        /* Reject invalid configuration */
-        if (!num_cs || src_clk_nr < 0
-                        || src_clk_nr > S5PV210_SPI_SRCCLK_SCLK) {
-                printk(KERN_ERR "%s: Invalid SPI configuration\n", __func__);
-                return;
-        }
-
-        switch (cntrlr) {
-        case 0:
-                pd = &s5pv210_spi0_pdata;
-                break;
-        case 1:
-                pd = &s5pv210_spi1_pdata;
-                break;
-        default:
-                printk(KERN_ERR "%s: Invalid SPI controller(%d)\n",
-                                                        __func__, cntrlr);
-                return;
-        }
-
-        pd->num_cs = num_cs;
-        pd->src_clk_nr = src_clk_nr;
-        pd->src_clk_name = spi_src_clks[src_clk_nr];
-}
diff --git a/arch/arm/mach-s5pv210/dma.c b/arch/arm/mach-s5pv210/dma.c
index 86b749c18b77..a6113e0267f2 100644
--- a/arch/arm/mach-s5pv210/dma.c
+++ b/arch/arm/mach-s5pv210/dma.c
@@ -35,90 +35,40 @@
 
 static u64 dma_dmamask = DMA_BIT_MASK(32);
 
-struct dma_pl330_peri pdma0_peri[28] = {
-        {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0S_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_AC97_MICIN,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_AC97_PCMIN,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_AC97_PCMOUT,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_PWM,
-        }, {
-                .peri_id = (u8)DMACH_SPDIF,
-                .rqtype = MEMTODEV,
-        },
+u8 pdma0_peri[] = {
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_MAX,
+        DMACH_I2S0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S0S_TX,
+        DMACH_I2S1_RX,
+        DMACH_I2S1_TX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_SPI0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI1_RX,
+        DMACH_SPI1_TX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_AC97_MICIN,
+        DMACH_AC97_PCMIN,
+        DMACH_AC97_PCMOUT,
+        DMACH_MAX,
+        DMACH_PWM,
+        DMACH_SPDIF,
 };
 
 struct dma_pl330_platdata s5pv210_pdma0_pdata = {
         .nr_valid_peri = ARRAY_SIZE(pdma0_peri),
-        .peri = pdma0_peri,
+        .peri_id = pdma0_peri,
 };
 
 struct amba_device s5pv210_device_pdma0 = {
@@ -137,102 +87,44 @@ struct amba_device s5pv210_device_pdma0 = {
         .periphid = 0x00041330,
 };
 
-struct dma_pl330_peri pdma1_peri[32] = {
-        {
-                .peri_id = (u8)DMACH_UART0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_UART3_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_UART3_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S0S_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_I2S2_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_SPI1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_MAX,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM0_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM1_TX,
-                .rqtype = MEMTODEV,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ0,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ1,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ2,
-        }, {
-                .peri_id = (u8)DMACH_MSM_REQ3,
-        }, {
-                .peri_id = (u8)DMACH_PCM2_RX,
-                .rqtype = DEVTOMEM,
-        }, {
-                .peri_id = (u8)DMACH_PCM2_TX,
-                .rqtype = MEMTODEV,
-        },
+u8 pdma1_peri[] = {
+        DMACH_UART0_RX,
+        DMACH_UART0_TX,
+        DMACH_UART1_RX,
+        DMACH_UART1_TX,
+        DMACH_UART2_RX,
+        DMACH_UART2_TX,
+        DMACH_UART3_RX,
+        DMACH_UART3_TX,
+        DMACH_MAX,
+        DMACH_I2S0_RX,
+        DMACH_I2S0_TX,
+        DMACH_I2S0S_TX,
+        DMACH_I2S1_RX,
+        DMACH_I2S1_TX,
+        DMACH_I2S2_RX,
+        DMACH_I2S2_TX,
+        DMACH_SPI0_RX,
+        DMACH_SPI0_TX,
+        DMACH_SPI1_RX,
+        DMACH_SPI1_TX,
+        DMACH_MAX,
+        DMACH_MAX,
+        DMACH_PCM0_RX,
+        DMACH_PCM0_TX,
+        DMACH_PCM1_RX,
+        DMACH_PCM1_TX,
+        DMACH_MSM_REQ0,
+        DMACH_MSM_REQ1,
+        DMACH_MSM_REQ2,
+        DMACH_MSM_REQ3,
+        DMACH_PCM2_RX,
+        DMACH_PCM2_TX,
 };
 
 struct dma_pl330_platdata s5pv210_pdma1_pdata = {
         .nr_valid_peri = ARRAY_SIZE(pdma1_peri),
-        .peri = pdma1_peri,
+        .peri_id = pdma1_peri,
 };
 
 struct amba_device s5pv210_device_pdma1 = {
@@ -253,7 +145,12 @@ struct amba_device s5pv210_device_pdma1 = {
 
 static int __init s5pv210_dma_init(void)
 {
+        dma_cap_set(DMA_SLAVE, s5pv210_pdma0_pdata.cap_mask);
+        dma_cap_set(DMA_CYCLIC, s5pv210_pdma0_pdata.cap_mask);
         amba_device_register(&s5pv210_device_pdma0, &iomem_resource);
+
+        dma_cap_set(DMA_SLAVE, s5pv210_pdma1_pdata.cap_mask);
+        dma_cap_set(DMA_CYCLIC, s5pv210_pdma1_pdata.cap_mask);
         amba_device_register(&s5pv210_device_pdma1, &iomem_resource);
 
         return 0;
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
index 5e0de3a31f3d..e777e010ed2e 100644
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -118,6 +118,8 @@
 #define IRQ_MDNIE3              S5P_IRQ_VIC3(8)
 #define IRQ_VIC_END             S5P_IRQ_VIC3(31)
 
+#define IRQ_TIMER_BASE          (11)
+
 #define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
 #define S5P_EINT_BASE2          (IRQ_VIC_END + 1)
 
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 7ff609f1568b..89c34b8f73bf 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -109,6 +109,8 @@
 #define S3C_PA_RTC                      S5PV210_PA_RTC
 #define S3C_PA_USB_HSOTG                S5PV210_PA_HSOTG
 #define S3C_PA_WDT                      S5PV210_PA_WATCHDOG
+#define S3C_PA_SPI0                     S5PV210_PA_SPI0
+#define S3C_PA_SPI1                     S5PV210_PA_SPI1
 
 #define S5P_PA_CHIPID                   S5PV210_PA_CHIPID
 #define S5P_PA_FIMC0                    S5PV210_PA_FIMC0
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 6f7dfe993c12..5e734d025a6a 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -597,8 +597,7 @@ static struct s3c_sdhci_platdata aquila_hsmmc2_data __initdata = {
 
 static void aquila_setup_sdhci(void)
 {
-        gpio_request(AQUILA_EXT_FLASH_EN, "FLASH_EN");
-        gpio_direction_output(AQUILA_EXT_FLASH_EN, 1);
+        gpio_request_one(AQUILA_EXT_FLASH_EN, GPIOF_OUT_INIT_HIGH, "FLASH_EN");
 
         s3c_sdhci0_set_platdata(&aquila_hsmmc0_data);
         s3c_sdhci1_set_platdata(&aquila_hsmmc1_data);
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 12c693717398..ff9152610439 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -229,8 +229,7 @@ static void __init goni_radio_init(void)
         i2c1_devs[0].irq = gpio_to_irq(gpio);
 
         gpio = S5PV210_GPJ2(5);                 /* XMSMDATA_5 */
-        gpio_request(gpio, "FM_RST");
-        gpio_direction_output(gpio, 1);
+        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "FM_RST");
 }
 
 /* TSP */
@@ -266,8 +265,7 @@ static void __init goni_tsp_init(void)
         int gpio;
 
         gpio = S5PV210_GPJ1(3);         /* XMSMADDR_11 */
-        gpio_request(gpio, "TSP_LDO_ON");
-        gpio_direction_output(gpio, 1);
+        gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");
         gpio_export(gpio, 0);
 
         gpio = S5PV210_GPJ0(5);         /* XMSMADDR_5 */
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index b4021dd802a8..dff9ea7b5bba 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -155,15 +155,12 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
 {
         if (power) {
 #if !defined(CONFIG_BACKLIGHT_PWM)
-                gpio_request(S5PV210_GPD0(3), "GPD0");
-                gpio_direction_output(S5PV210_GPD0(3), 1);
+                gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0");
                 gpio_free(S5PV210_GPD0(3));
 #endif
 
                 /* fire nRESET on power up */
-                gpio_request(S5PV210_GPH0(6), "GPH0");
-
-                gpio_direction_output(S5PV210_GPH0(6), 1);
+                gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0");
 
                 gpio_set_value(S5PV210_GPH0(6), 0);
                 mdelay(10);
@@ -174,8 +171,7 @@ static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
                 gpio_free(S5PV210_GPH0(6));
         } else {
 #if !defined(CONFIG_BACKLIGHT_PWM)
-                gpio_request(S5PV210_GPD0(3), "GPD0");
-                gpio_direction_output(S5PV210_GPD0(3), 0);
+                gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0");
                 gpio_free(S5PV210_GPD0(3));
 #endif
         }
diff --git a/arch/arm/mach-s5pv210/setup-sdhci.c b/arch/arm/mach-s5pv210/setup-sdhci.c
deleted file mode 100644
index 6b8ccc4d35fd..000000000000
--- a/arch/arm/mach-s5pv210/setup-sdhci.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* linux/arch/arm/mach-s5pv210/setup-sdhci.c
- *
- * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * S5PV210 - Helper functions for settign up SDHCI device(s) (HSMMC)
- *
- * 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.
-*/
-
-#include <linux/types.h>
-
-/* clock sources for the mmc bus clock, order as for the ctrl2[5..4] */
-
-char *s5pv210_hsmmc_clksrcs[4] = {
-        [0] = "hsmmc",          /* HCLK */
-        /* [1] = "hsmmc",       - duplicate HCLK entry */
-        [2] = "sclk_mmc",       /* mmc_bus */
-        /* [3] = NULL,          - reserved */
-};
diff --git a/arch/arm/mach-s5pv210/setup-spi.c b/arch/arm/mach-s5pv210/setup-spi.c
new file mode 100644
index 000000000000..f43c5048a37d
--- /dev/null
+++ b/arch/arm/mach-s5pv210/setup-spi.c
@@ -0,0 +1,51 @@
+/* linux/arch/arm/mach-s5pv210/setup-spi.c
+ *
+ * Copyright (C) 2011 Samsung Electronics Ltd.
+ *              http://www.samsung.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.
+ */
+
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+
+#include <plat/gpio-cfg.h>
+#include <plat/s3c64xx-spi.h>
+
+#ifdef CONFIG_S3C64XX_DEV_SPI0
+struct s3c64xx_spi_info s3c64xx_spi0_pdata = {
+        .fifo_lvl_mask  = 0x1ff,
+        .rx_lvl_offset  = 15,
+        .high_speed     = 1,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi0_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgpin(S5PV210_GPB(0), S3C_GPIO_SFN(2));
+        s3c_gpio_setpull(S5PV210_GPB(0), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(S5PV210_GPB(2), 2,
+                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
+
+#ifdef CONFIG_S3C64XX_DEV_SPI1
+struct s3c64xx_spi_info s3c64xx_spi1_pdata = {
+        .fifo_lvl_mask  = 0x7f,
+        .rx_lvl_offset  = 15,
+        .high_speed     = 1,
+        .tx_st_done     = 25,
+};
+
+int s3c64xx_spi1_cfg_gpio(struct platform_device *dev)
+{
+        s3c_gpio_cfgpin(S5PV210_GPB(4), S3C_GPIO_SFN(2));
+        s3c_gpio_setpull(S5PV210_GPB(4), S3C_GPIO_PULL_UP);
+        s3c_gpio_cfgall_range(S5PV210_GPB(6), 2,
+                                S3C_GPIO_SFN(2), S3C_GPIO_PULL_UP);
+        return 0;
+}
+#endif
diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c
index dab3c6347a8f..d6df9f6c9f7e 100644
--- a/arch/arm/mach-sa1100/clock.c
+++ b/arch/arm/mach-sa1100/clock.c
@@ -11,17 +11,39 @@
 #include <linux/clk.h>
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
+#include <linux/io.h>
+#include <linux/clkdev.h>
 
 #include <mach/hardware.h>
 
-/*
- * Very simple clock implementation - we only have one clock to deal with.
- */
+struct clkops {
+        void                    (*enable)(struct clk *);
+        void                    (*disable)(struct clk *);
+        unsigned long           (*getrate)(struct clk *);
+};
+
 struct clk {
+        const struct clkops     *ops;
+        unsigned long           rate;
         unsigned int            enabled;
 };
 
-static void clk_gpio27_enable(void)
+#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)
 {
         /*
          * First, set up the 3.6864MHz clock on GPIO 27 for the SA-1111:
@@ -32,38 +54,22 @@ static void clk_gpio27_enable(void)
         TUCR = TUCR_3_6864MHz;
 }
 
-static void clk_gpio27_disable(void)
+static void clk_gpio27_disable(struct clk *clk)
 {
         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_gpio27_enable();
+                clk->ops->enable(clk);
         spin_unlock_irqrestore(&clocks_lock, flags);
+
         return 0;
 }
 EXPORT_SYMBOL(clk_enable);
@@ -76,13 +82,48 @@ void clk_disable(struct clk *clk)
 
         spin_lock_irqsave(&clocks_lock, flags);
         if (--clk->enabled == 0)
-                clk_gpio27_disable();
+                clk->ops->disable(clk);
         spin_unlock_irqrestore(&clocks_lock, flags);
 }
 EXPORT_SYMBOL(clk_disable);
 
 unsigned long clk_get_rate(struct clk *clk)
 {
-        return 3686400;
+        unsigned long rate;
+
+        rate = clk->rate;
+        if (clk->ops->getrate)
+                rate = clk->ops->getrate(clk);
+
+        return rate;
 }
 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/generic.c b/arch/arm/mach-sa1100/generic.c
index bb10ee2cb89f..480d2ea46b00 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -345,9 +345,29 @@ 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-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 91aff7cb8284..373652d76b90 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,11 +2,8 @@ if ARCH_TEGRA
 
 comment "NVIDIA Tegra options"
 
-choice
-        prompt "Select Tegra processor family for target system"
-
 config ARCH_TEGRA_2x_SOC
-        bool "Tegra 2 family"
+        bool "Enable support for Tegra20 family"
         select CPU_V7
         select ARM_GIC
         select ARCH_REQUIRE_GPIOLIB
@@ -17,22 +14,36 @@ config ARCH_TEGRA_2x_SOC
           Support for NVIDIA Tegra AP20 and T20 processors, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
 
-endchoice
+config ARCH_TEGRA_3x_SOC
+        bool "Enable support for Tegra30 family"
+        select CPU_V7
+        select ARM_GIC
+        select ARCH_REQUIRE_GPIOLIB
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB_SUPPORT
+        select USB_ULPI_VIEWPORT if USB_SUPPORT
+        select USE_OF
+        help
+          Support for NVIDIA Tegra T30 processor family, based on the
+          ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
 
 config TEGRA_PCI
         bool "PCI Express support"
+        depends on ARCH_TEGRA_2x_SOC
         select PCI
 
 comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
+       depends on ARCH_TEGRA_2x_SOC
        select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
+       depends on ARCH_TEGRA_2x_SOC
        select MACH_SEABOARD
        select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
        help
@@ -40,11 +51,13 @@ config MACH_KAEN
 
 config MACH_PAZ00
        bool "Paz00 board"
+       depends on ARCH_TEGRA_2x_SOC
        help
          Support for the Toshiba AC100/Dynabook AZ netbook
 
 config MACH_SEABOARD
        bool "Seaboard board"
+       depends on ARCH_TEGRA_2x_SOC
        select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
        help
          Support for nVidia Seaboard development platform. It will
@@ -52,25 +65,29 @@ config MACH_SEABOARD
          have large similarities with the seaboard design.
 
 config MACH_TEGRA_DT
-        bool "Generic Tegra board (FDT support)"
+        bool "Generic Tegra20 board (FDT support)"
+        depends on ARCH_TEGRA_2x_SOC
         select USE_OF
         help
-          Support for generic nVidia Tegra boards using Flattened Device Tree
+          Support for generic NVIDIA Tegra20 boards using Flattened Device Tree
 
 config MACH_TRIMSLICE
        bool "TrimSlice board"
+       depends on ARCH_TEGRA_2x_SOC
        select TEGRA_PCI
        help
          Support for CompuLab TrimSlice platform
 
 config MACH_WARIO
        bool "Wario board"
+       depends on ARCH_TEGRA_2x_SOC
        select MACH_SEABOARD
        help
          Support for the Wario version of Seaboard
 
 config MACH_VENTANA
        bool "Ventana board"
+       depends on ARCH_TEGRA_2x_SOC
        select MACH_TEGRA_DT
        help
          Support for the nVidia Ventana development platform
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 91a07e187208..e120ff54f663 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -1,3 +1,4 @@
+obj-y                                   += board-pinmux.o
 obj-y                                   += common.o
 obj-y                                   += devices.o
 obj-y                                   += io.o
@@ -5,12 +6,13 @@ obj-y                                   += irq.o
 obj-y                                   += clock.o
 obj-y                                   += timer.o
 obj-y                                   += pinmux.o
-obj-y                                   += powergate.o
 obj-y                                   += fuse.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += clock.o
+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += powergate.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_emc.o
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += pinmux-t2-tables.o
+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += pinmux-tegra20-tables.o
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += pinmux-tegra30-tables.o
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += board-dt-tegra30.o
 obj-$(CONFIG_SMP)                       += platsmp.o localtimer.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
 obj-$(CONFIG_TEGRA_SYSTEM_DMA)          += dma.o
@@ -18,20 +20,22 @@ obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
 obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
 obj-$(CONFIG_USB_SUPPORT)               += usb_phy.o
 
-obj-${CONFIG_MACH_HARMONY}              += board-harmony.o
-obj-${CONFIG_MACH_HARMONY}              += board-harmony-pinmux.o
-obj-${CONFIG_MACH_HARMONY}              += board-harmony-pcie.o
-obj-${CONFIG_MACH_HARMONY}              += board-harmony-power.o
+obj-$(CONFIG_MACH_HARMONY)              += board-harmony.o
+obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pinmux.o
+obj-$(CONFIG_MACH_HARMONY)              += board-harmony-pcie.o
+obj-$(CONFIG_MACH_HARMONY)              += board-harmony-power.o
 
-obj-${CONFIG_MACH_PAZ00}                += board-paz00.o
-obj-${CONFIG_MACH_PAZ00}                += board-paz00-pinmux.o
+obj-$(CONFIG_MACH_PAZ00)                += board-paz00.o
+obj-$(CONFIG_MACH_PAZ00)                += board-paz00-pinmux.o
 
-obj-${CONFIG_MACH_SEABOARD}             += board-seaboard.o
-obj-${CONFIG_MACH_SEABOARD}             += board-seaboard-pinmux.o
+obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard.o
+obj-$(CONFIG_MACH_SEABOARD)             += board-seaboard-pinmux.o
 
-obj-${CONFIG_MACH_TEGRA_DT}             += board-dt.o
-obj-${CONFIG_MACH_TEGRA_DT}             += board-harmony-pinmux.o
-obj-${CONFIG_MACH_TEGRA_DT}             += board-seaboard-pinmux.o
+obj-$(CONFIG_MACH_TEGRA_DT)             += board-dt-tegra20.o
+obj-$(CONFIG_MACH_TEGRA_DT)             += board-harmony-pinmux.o
+obj-$(CONFIG_MACH_TEGRA_DT)             += board-seaboard-pinmux.o
+obj-$(CONFIG_MACH_TEGRA_DT)             += board-paz00-pinmux.o
+obj-$(CONFIG_MACH_TEGRA_DT)             += board-trimslice-pinmux.o
 
-obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice.o
-obj-${CONFIG_MACH_TRIMSLICE}            += board-trimslice-pinmux.o
+obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice.o
+obj-$(CONFIG_MACH_TRIMSLICE)            += board-trimslice-pinmux.o
diff --git a/arch/arm/mach-tegra/Makefile.boot b/arch/arm/mach-tegra/Makefile.boot
index bd12c9fb81e8..9a82094092d7 100644
--- a/arch/arm/mach-tegra/Makefile.boot
+++ b/arch/arm/mach-tegra/Makefile.boot
@@ -3,5 +3,8 @@ params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00000100
 initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC) := 0x00800000
 
 dtb-$(CONFIG_MACH_HARMONY) += tegra-harmony.dtb
+dtb-$(CONFIG_MACH_PAZ00) += tegra-paz00.dtb
 dtb-$(CONFIG_MACH_SEABOARD) += tegra-seaboard.dtb
+dtb-$(CONFIG_MACH_TRIMSLICE) += tegra-trimslice.dtb
 dtb-$(CONFIG_MACH_VENTANA) += tegra-ventana.dtb
+dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra-cardhu.dtb
diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index e417a8383dbb..7a95e0bc4aba 100644
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -37,6 +37,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/setup.h>
+#include <asm/hardware/gic.h>
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>
@@ -47,10 +48,14 @@
 #include "devices.h"
 
 void harmony_pinmux_init(void);
+void paz00_pinmux_init(void);
 void seaboard_pinmux_init(void);
+void trimslice_pinmux_init(void);
 void ventana_pinmux_init(void);
 
 struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
+        OF_DEV_AUXDATA("nvidia,tegra20-pinmux", TEGRA_APB_MISC_BASE + 0x14, "tegra-pinmux", NULL),
+        OF_DEV_AUXDATA("nvidia,tegra20-gpio", TEGRA_GPIO_BASE, "tegra-gpio", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC1_BASE, "sdhci-tegra.0", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC2_BASE, "sdhci-tegra.1", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-sdhci", TEGRA_SDMMC3_BASE, "sdhci-tegra.2", NULL),
@@ -58,16 +63,30 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C_BASE, "tegra-i2c.0", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C2_BASE, "tegra-i2c.1", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C3_BASE, "tegra-i2c.2", NULL),
-        OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),
+        OF_DEV_AUXDATA("nvidia,tegra20-i2c-dvc", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.0", NULL),
-        OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.1", NULL),
+        OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),
         OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),
+        OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB_BASE, "tegra-ehci.0",
+                       &tegra_ehci1_device.dev.platform_data),
+        OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB2_BASE, "tegra-ehci.1",
+                       &tegra_ehci2_device.dev.platform_data),
+        OF_DEV_AUXDATA("nvidia,tegra20-ehci", TEGRA_USB3_BASE, "tegra-ehci.2",
+                       &tegra_ehci3_device.dev.platform_data),
         {}
 };
 
 static __initdata struct tegra_clk_init_table tegra_dt_clk_init_table[] = {
         /* name         parent          rate            enabled */
         { "uartd",      "pll_p",        216000000,      true },
+        { "usbd",       "clk_m",        12000000,       false },
+        { "usb2",       "clk_m",        12000000,       false },
+        { "usb3",       "clk_m",        12000000,       false },
+        { "pll_a",      "pll_p_out1",   56448000,       true },
+        { "pll_a_out0", "pll_a",        11289600,       true },
+        { "cdev1",      NULL,           0,              true },
+        { "i2s1",       "pll_a_out0",   11289600,       false},
+        { "i2s2",       "pll_a_out0",   11289600,       false},
         { NULL,         NULL,           0,              0},
 };
 
@@ -76,39 +95,23 @@ static struct of_device_id tegra_dt_match_table[] __initdata = {
         {}
 };
 
-static struct of_device_id tegra_dt_gic_match[] __initdata = {
-        { .compatible = "nvidia,tegra20-gic", },
-        {}
-};
-
 static struct {
         char *machine;
         void (*init)(void);
 } pinmux_configs[] = {
+        { "compulab,trimslice", trimslice_pinmux_init },
         { "nvidia,harmony", harmony_pinmux_init },
+        { "compal,paz00", paz00_pinmux_init },
         { "nvidia,seaboard", seaboard_pinmux_init },
         { "nvidia,ventana", ventana_pinmux_init },
 };
 
 static void __init tegra_dt_init(void)
 {
-        struct device_node *node;
         int i;
 
-        node = of_find_matching_node_by_address(NULL, tegra_dt_gic_match,
-                                                TEGRA_ARM_INT_DIST_BASE);
-        if (node)
-                irq_domain_add_simple(node, INT_GIC_BASE);
-
         tegra_clk_init_from_table(tegra_dt_clk_init_table);
 
-        /*
-         * Finished with the static registrations now; fill in the missing
-         * devices
-         */
-        of_platform_populate(NULL, tegra_dt_match_table,
-                                tegra20_auxdata_lookup, NULL);
-
         for (i = 0; i < ARRAY_SIZE(pinmux_configs); i++) {
                 if (of_machine_is_compatible(pinmux_configs[i].machine)) {
                         pinmux_configs[i].init();
@@ -118,22 +121,31 @@ static void __init tegra_dt_init(void)
 
         WARN(i == ARRAY_SIZE(pinmux_configs),
                 "Unknown platform! Pinmuxing not initialized\n");
+
+        /*
+         * Finished with the static registrations now; fill in the missing
+         * devices
+         */
+        of_platform_populate(NULL, tegra_dt_match_table,
+                                tegra20_auxdata_lookup, NULL);
 }
 
-static const char * tegra_dt_board_compat[] = {
+static const char *tegra20_dt_board_compat[] = {
+        "compulab,trimslice",
         "nvidia,harmony",
+        "compal,paz00",
         "nvidia,seaboard",
         "nvidia,ventana",
         NULL
 };
 
-DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)")
+DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
-        .init_irq       = tegra_init_irq,
+        .init_early     = tegra20_init_early,
+        .init_irq       = tegra_dt_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
         .init_machine   = tegra_dt_init,
         .restart        = tegra_assert_system_reset,
-        .dt_compat      = tegra_dt_board_compat,
+        .dt_compat      = tegra20_dt_board_compat,
 MACHINE_END
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c
new file mode 100644
index 000000000000..3c197e2440b7
--- /dev/null
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@ -0,0 +1,63 @@
+/*
+ * arch/arm/mach-tegra/board-dt-tegra30.c
+ *
+ * NVIDIA Tegra30 device tree board support
+ *
+ * Copyright (C) 2011 NVIDIA Corporation
+ *
+ * Derived from:
+ *
+ * arch/arm/mach-tegra/board-dt-tegra20.c
+ *
+ * Copyright (C) 2010 Secret Lab Technologies, Ltd.
+ * Copyright (C) 2010 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/kernel.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+
+#include <asm/mach/arch.h>
+#include <asm/hardware/gic.h>
+
+#include "board.h"
+
+static struct of_device_id tegra_dt_match_table[] __initdata = {
+        { .compatible = "simple-bus", },
+        {}
+};
+
+static void __init tegra30_dt_init(void)
+{
+        of_platform_populate(NULL, tegra_dt_match_table,
+                                NULL, NULL);
+}
+
+static const char *tegra30_dt_board_compat[] = {
+        "nvidia,cardhu",
+        NULL
+};
+
+DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")
+        .map_io         = tegra_map_common_io,
+        .init_early     = tegra30_init_early,
+        .init_irq       = tegra_dt_init_irq,
+        .handle_irq     = gic_handle_irq,
+        .timer          = &tegra_timer,
+        .init_machine   = tegra30_dt_init,
+        .restart        = tegra_assert_system_reset,
+        .dt_compat      = tegra30_dt_board_compat,
+MACHINE_END
diff --git a/arch/arm/mach-tegra/board-harmony-pcie.c b/arch/arm/mach-tegra/board-harmony-pcie.c
index 6db7d699ef1c..33c4fedab840 100644
--- a/arch/arm/mach-tegra/board-harmony-pcie.c
+++ b/arch/arm/mach-tegra/board-harmony-pcie.c
@@ -22,7 +22,6 @@
 
 #include <asm/mach-types.h>
 
-#include <mach/pinmux.h>
 #include "board.h"
 #include "board-harmony.h"
 
@@ -48,10 +47,6 @@ static int __init harmony_pcie_init(void)
 
         regulator_enable(regulator);
 
-        tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_NORMAL);
-        tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_NORMAL);
-        tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_NORMAL);
-
         err = tegra_pcie_init(true, true);
         if (err)
                 goto err_pcie;
@@ -59,10 +54,6 @@ static int __init harmony_pcie_init(void)
         return 0;
 
 err_pcie:
-        tegra_pinmux_set_tristate(TEGRA_PINGROUP_GPV, TEGRA_TRI_TRISTATE);
-        tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXA, TEGRA_TRI_TRISTATE);
-        tegra_pinmux_set_tristate(TEGRA_PINGROUP_SLXK, TEGRA_TRI_TRISTATE);
-
         regulator_disable(regulator);
         regulator_put(regulator);
 err_reg:
diff --git a/arch/arm/mach-tegra/board-harmony-pinmux.c b/arch/arm/mach-tegra/board-harmony-pinmux.c
index 7a4a26d5174c..465808c8ac0b 100644
--- a/arch/arm/mach-tegra/board-harmony-pinmux.c
+++ b/arch/arm/mach-tegra/board-harmony-pinmux.c
@@ -19,10 +19,11 @@
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
+#include <mach/pinmux-tegra20.h>
 
 #include "gpio-names.h"
 #include "board-harmony.h"
-#include "devices.h"
+#include "board-pinmux.h"
 
 static struct tegra_pingroup_config harmony_pinmux[] = {
         {TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -143,11 +144,6 @@ static struct tegra_pingroup_config harmony_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
 };
 
-static struct platform_device *pinmux_devices[] = {
-        &tegra_gpio_device,
-        &tegra_pinmux_device,
-};
-
 static struct tegra_gpio_table gpio_table[] = {
         { .gpio = TEGRA_GPIO_SD2_CD,            .enable = true  },
         { .gpio = TEGRA_GPIO_SD2_WP,            .enable = true  },
@@ -161,13 +157,14 @@ static struct tegra_gpio_table gpio_table[] = {
         { .gpio = TEGRA_GPIO_EXT_MIC_EN,        .enable = true  },
 };
 
+static struct tegra_board_pinmux_conf conf = {
+        .pgs = harmony_pinmux,
+        .pg_count = ARRAY_SIZE(harmony_pinmux),
+        .gpios = gpio_table,
+        .gpio_count = ARRAY_SIZE(gpio_table),
+};
+
 void harmony_pinmux_init(void)
 {
-        if (!of_machine_is_compatible("nvidia,tegra20"))
-                platform_add_devices(pinmux_devices,
-                                        ARRAY_SIZE(pinmux_devices));
-
-        tegra_pinmux_config_table(harmony_pinmux, ARRAY_SIZE(harmony_pinmux));
-
-        tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));
+        tegra_board_pinmux_init(&conf, NULL);
 }
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 70ee674131f9..a0f9634f6727 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -186,7 +186,7 @@ MACHINE_START(HARMONY, "harmony")
         .atag_offset    = 0x100,
         .fixup          = tegra_harmony_fixup,
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
+        .init_early     = tegra20_init_early,
         .init_irq       = tegra_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c
index be30e215f4b7..c775572dcea4 100644
--- a/arch/arm/mach-tegra/board-paz00-pinmux.c
+++ b/arch/arm/mach-tegra/board-paz00-pinmux.c
@@ -19,10 +19,11 @@
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
+#include <mach/pinmux-tegra20.h>
 
 #include "gpio-names.h"
 #include "board-paz00.h"
-#include "devices.h"
+#include "board-pinmux.h"
 
 static struct tegra_pingroup_config paz00_pinmux[] = {
         {TEGRA_PINGROUP_ATA,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -30,7 +31,7 @@ static struct tegra_pingroup_config paz00_pinmux[] = {
         {TEGRA_PINGROUP_ATC,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_ATD,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_ATE,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_CDEV1, TEGRA_MUX_PLLA_OUT,      TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_CDEV1, TEGRA_MUX_PLLA_OUT,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_CDEV2, TEGRA_MUX_PLLP_OUT4,     TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_CRTP,  TEGRA_MUX_CRT,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_CSUS,  TEGRA_MUX_PLLC_OUT1,     TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
@@ -143,11 +144,6 @@ static struct tegra_pingroup_config paz00_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
 };
 
-static struct platform_device *pinmux_devices[] = {
-        &tegra_gpio_device,
-        &tegra_pinmux_device,
-};
-
 static struct tegra_gpio_table gpio_table[] = {
         { .gpio = TEGRA_GPIO_SD1_CD,    .enable = true },
         { .gpio = TEGRA_GPIO_SD1_WP,    .enable = true },
@@ -158,13 +154,14 @@ static struct tegra_gpio_table gpio_table[] = {
         { .gpio = TEGRA_WIFI_LED,       .enable = true },
 };
 
+static struct tegra_board_pinmux_conf conf = {
+        .pgs = paz00_pinmux,
+        .pg_count = ARRAY_SIZE(paz00_pinmux),
+        .gpios = gpio_table,
+        .gpio_count = ARRAY_SIZE(gpio_table),
+};
+
 void paz00_pinmux_init(void)
 {
-        if (!of_machine_is_compatible("nvidia,tegra20"))
-                platform_add_devices(pinmux_devices,
-                                        ARRAY_SIZE(pinmux_devices));
-
-        tegra_pinmux_config_table(paz00_pinmux, ARRAY_SIZE(paz00_pinmux));
-
-        tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));
+        tegra_board_pinmux_init(&conf, NULL);
 }
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index 33d6205ad307..fcf4f377b1dc 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -23,8 +23,10 @@
 #include <linux/serial_8250.h>
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio_keys.h>
 #include <linux/pda_power.h>
 #include <linux/io.h>
+#include <linux/input.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/rfkill-gpio.h>
@@ -115,12 +117,37 @@ static struct platform_device leds_gpio = {
         },
 };
 
+static struct gpio_keys_button paz00_gpio_keys_buttons[] = {
+        {
+                .code           = KEY_POWER,
+                .gpio           = TEGRA_GPIO_POWERKEY,
+                .active_low     = 1,
+                .desc           = "Power",
+                .type           = EV_KEY,
+                .wakeup         = 1,
+        },
+};
+
+static struct gpio_keys_platform_data paz00_gpio_keys = {
+        .buttons        = paz00_gpio_keys_buttons,
+        .nbuttons       = ARRAY_SIZE(paz00_gpio_keys_buttons),
+};
+
+static struct platform_device gpio_keys_device = {
+        .name   = "gpio-keys",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &paz00_gpio_keys,
+        },
+};
+
 static struct platform_device *paz00_devices[] __initdata = {
         &debug_uart,
         &tegra_sdhci_device4,
         &tegra_sdhci_device1,
         &wifi_rfkill_device,
         &leds_gpio,
+        &gpio_keys_device,
 };
 
 static void paz00_i2c_init(void)
@@ -189,7 +216,7 @@ MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ")
         .atag_offset    = 0x100,
         .fixup          = tegra_paz00_fixup,
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
+        .init_early     = tegra20_init_early,
         .init_irq       = tegra_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h
index 8aff06eb58c3..ffa83f580db6 100644
--- a/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@ -32,6 +32,9 @@
 #define TEGRA_WIFI_RST                  TEGRA_GPIO_PD1
 #define TEGRA_WIFI_LED                  TEGRA_GPIO_PD0
 
+/* WakeUp */
+#define TEGRA_GPIO_POWERKEY     TEGRA_GPIO_PJ7
+
 void paz00_pinmux_init(void);
 
 #endif
diff --git a/arch/arm/mach-tegra/board-pinmux.c b/arch/arm/mach-tegra/board-pinmux.c
new file mode 100644
index 000000000000..adc3efe979b3
--- /dev/null
+++ b/arch/arm/mach-tegra/board-pinmux.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2011, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * 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/device.h>
+#include <linux/kernel.h>
+#include <linux/notifier.h>
+#include <linux/of.h>
+#include <linux/string.h>
+
+#include <mach/gpio-tegra.h>
+#include <mach/pinmux.h>
+
+#include "board-pinmux.h"
+#include "devices.h"
+
+struct tegra_board_pinmux_conf *confs[2];
+
+static void tegra_board_pinmux_setup_gpios(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(confs); i++) {
+                if (!confs[i])
+                        continue;
+
+                tegra_gpio_config(confs[i]->gpios, confs[i]->gpio_count);
+        }
+}
+
+static void tegra_board_pinmux_setup_pinmux(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(confs); i++) {
+                if (!confs[i])
+                        continue;
+
+                tegra_pinmux_config_table(confs[i]->pgs, confs[i]->pg_count);
+
+                if (confs[i]->drives)
+                        tegra_drive_pinmux_config_table(confs[i]->drives,
+                                                        confs[i]->drive_count);
+        }
+}
+
+static int tegra_board_pinmux_bus_notify(struct notifier_block *nb,
+                                         unsigned long event, void *vdev)
+{
+        static bool had_gpio;
+        static bool had_pinmux;
+
+        struct device *dev = vdev;
+        const char *devname;
+
+        if (event != BUS_NOTIFY_BOUND_DRIVER)
+                return NOTIFY_DONE;
+
+        devname = dev_name(dev);
+
+        if (!had_gpio && !strcmp(devname, GPIO_DEV)) {
+                tegra_board_pinmux_setup_gpios();
+                had_gpio = true;
+        } else if (!had_pinmux && !strcmp(devname, PINMUX_DEV)) {
+                tegra_board_pinmux_setup_pinmux();
+                had_pinmux = true;
+        }
+
+        if (had_gpio && had_pinmux)
+                return NOTIFY_STOP_MASK;
+        else
+                return NOTIFY_DONE;
+}
+
+static struct notifier_block nb = {
+        .notifier_call = tegra_board_pinmux_bus_notify,
+};
+
+static struct platform_device *devices[] = {
+        &tegra_gpio_device,
+        &tegra_pinmux_device,
+};
+
+void tegra_board_pinmux_init(struct tegra_board_pinmux_conf *conf_a,
+                             struct tegra_board_pinmux_conf *conf_b)
+{
+        confs[0] = conf_a;
+        confs[1] = conf_b;
+
+        bus_register_notifier(&platform_bus_type, &nb);
+
+        if (!of_machine_is_compatible("nvidia,tegra20"))
+                platform_add_devices(devices, ARRAY_SIZE(devices));
+}
diff --git a/arch/arm/mach-tegra/board-pinmux.h b/arch/arm/mach-tegra/board-pinmux.h
new file mode 100644
index 000000000000..4aac73546f54
--- /dev/null
+++ b/arch/arm/mach-tegra/board-pinmux.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2011, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * 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 __MACH_TEGRA_BOARD_PINMUX_H
+#define __MACH_TEGRA_BOARD_PINMUX_H
+
+#define GPIO_DEV "tegra-gpio"
+#define PINMUX_DEV "tegra-pinmux"
+
+struct tegra_pingroup_config;
+struct tegra_gpio_table;
+
+struct tegra_board_pinmux_conf {
+        struct tegra_pingroup_config *pgs;
+        int pg_count;
+
+        struct tegra_drive_pingroup_config *drives;
+        int drive_count;
+
+        struct tegra_gpio_table *gpios;
+        int gpio_count;
+};
+
+void tegra_board_pinmux_init(struct tegra_board_pinmux_conf *conf_a,
+                             struct tegra_board_pinmux_conf *conf_b);
+
+#endif
diff --git a/arch/arm/mach-tegra/board-seaboard-pinmux.c b/arch/arm/mach-tegra/board-seaboard-pinmux.c
index b1c2972f62fe..55e7e43a14ad 100644
--- a/arch/arm/mach-tegra/board-seaboard-pinmux.c
+++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c
@@ -19,11 +19,11 @@
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
-#include <mach/pinmux-t2.h>
+#include <mach/pinmux-tegra20.h>
 
 #include "gpio-names.h"
+#include "board-pinmux.h"
 #include "board-seaboard.h"
-#include "devices.h"
 
 #define DEFAULT_DRIVE(_name)                                    \
         {                                                       \
@@ -37,11 +37,11 @@
                 .slew_falling = TEGRA_SLEW_SLOWEST,             \
         }
 
-static __initdata struct tegra_drive_pingroup_config seaboard_drive_pinmux[] = {
+static struct tegra_drive_pingroup_config seaboard_drive_pinmux[] = {
         DEFAULT_DRIVE(SDIO1),
 };
 
-static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {
+static struct tegra_pingroup_config common_pinmux[] = {
         {TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -55,7 +55,6 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {
         {TEGRA_PINGROUP_DAP2,  TEGRA_MUX_DAP2,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_DAP3,  TEGRA_MUX_DAP3,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_DAP4,  TEGRA_MUX_DAP4,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_DDC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_DTA,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_DTB,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_DTC,   TEGRA_MUX_VI,            TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
@@ -65,7 +64,6 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {
         {TEGRA_PINGROUP_GMA,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_GMB,   TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_GMC,   TEGRA_MUX_UARTD,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_GMD,   TEGRA_MUX_SFLASH,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_GME,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_GPU,   TEGRA_MUX_PWM,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_GPU7,  TEGRA_MUX_RTCK,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -108,13 +106,8 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {
         {TEGRA_PINGROUP_LM0,   TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_LM1,   TEGRA_MUX_CRT,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_LPP,   TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_LPW0,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_LPW1,  TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_LPW2,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_LSC0,  TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_LSC1,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_LSCK,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_LSDA,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_LSDI,  TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_LSPI,  TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_LVP0,  TEGRA_MUX_RSVD4,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
@@ -122,25 +115,19 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {
         {TEGRA_PINGROUP_LVS,   TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_OWC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_PMC,   TEGRA_MUX_PWR_ON,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_PTA,   TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_RM,    TEGRA_MUX_I2C,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SDB,   TEGRA_MUX_SDIO3,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SDC,   TEGRA_MUX_SDIO3,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SDD,   TEGRA_MUX_SDIO3,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SDIO1, TEGRA_MUX_SDIO1,         TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SLXA,  TEGRA_MUX_PCIE,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_SLXC,  TEGRA_MUX_SPDIF,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_SLXD,  TEGRA_MUX_SPDIF,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_SLXK,  TEGRA_MUX_PCIE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SPDI,  TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SPDO,  TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_SPIA,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_SPIB,  TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_SPIC,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SPID,  TEGRA_MUX_SPI1,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_SPIE,  TEGRA_MUX_SPI1,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_SPIF,  TEGRA_MUX_SPI1,          TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_SPIH,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_UAA,   TEGRA_MUX_ULPI,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_UAB,   TEGRA_MUX_ULPI,          TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},
@@ -160,13 +147,24 @@ static __initdata struct tegra_pingroup_config seaboard_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
 };
 
-static __initdata struct tegra_pingroup_config ventana_pinmux[] = {
-        {TEGRA_PINGROUP_DAP3, TEGRA_MUX_DAP3,     TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
+static struct tegra_pingroup_config seaboard_pinmux[] = {
+        {TEGRA_PINGROUP_DDC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_GMD,   TEGRA_MUX_SFLASH,        TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
+        {TEGRA_PINGROUP_LPW0,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
+        {TEGRA_PINGROUP_LPW2,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
+        {TEGRA_PINGROUP_LSC1,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_LSCK,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_LSDA,  TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_PTA,   TEGRA_MUX_HDMI,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
+        {TEGRA_PINGROUP_SLXC,  TEGRA_MUX_SPDIF,         TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_SLXK,  TEGRA_MUX_PCIE,          TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
+        {TEGRA_PINGROUP_SPIA,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_SPIC,  TEGRA_MUX_GMI,           TEGRA_PUPD_PULL_UP,   TEGRA_TRI_NORMAL},
+        {TEGRA_PINGROUP_SPIG,  TEGRA_MUX_SPI2_ALT,      TEGRA_PUPD_PULL_UP,   TEGRA_TRI_TRISTATE},
+};
+
+static struct tegra_pingroup_config ventana_pinmux[] = {
         {TEGRA_PINGROUP_DDC,  TEGRA_MUX_RSVD2,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_DTA,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_DTB,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_DTC,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
-        {TEGRA_PINGROUP_DTD,  TEGRA_MUX_VI,       TEGRA_PUPD_PULL_DOWN, TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_GMD,  TEGRA_MUX_SFLASH,   TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_LPW0, TEGRA_MUX_RSVD4,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_LPW2, TEGRA_MUX_RSVD4,    TEGRA_PUPD_NORMAL,    TEGRA_TRI_NORMAL},
@@ -181,65 +179,59 @@ static __initdata struct tegra_pingroup_config ventana_pinmux[] = {
         {TEGRA_PINGROUP_SPIG, TEGRA_MUX_SPI2_ALT, TEGRA_PUPD_NORMAL,    TEGRA_TRI_TRISTATE},
 };
 
-static struct platform_device *pinmux_devices[] = {
-        &tegra_gpio_device,
-        &tegra_pinmux_device,
-};
-
 static struct tegra_gpio_table common_gpio_table[] = {
         { .gpio = TEGRA_GPIO_SD2_CD,            .enable = true },
         { .gpio = TEGRA_GPIO_SD2_WP,            .enable = true },
         { .gpio = TEGRA_GPIO_SD2_POWER,         .enable = true },
+        { .gpio = TEGRA_GPIO_CDC_IRQ,           .enable = true },
+};
+
+static struct tegra_gpio_table seaboard_gpio_table[] = {
         { .gpio = TEGRA_GPIO_LIDSWITCH,         .enable = true },
         { .gpio = TEGRA_GPIO_POWERKEY,          .enable = true },
         { .gpio = TEGRA_GPIO_HP_DET,            .enable = true },
         { .gpio = TEGRA_GPIO_ISL29018_IRQ,      .enable = true },
-        { .gpio = TEGRA_GPIO_CDC_IRQ,           .enable = true },
         { .gpio = TEGRA_GPIO_USB1,              .enable = true },
 };
 
-static void __init update_pinmux(struct tegra_pingroup_config *newtbl, int size)
-{
-        int i, j;
-        struct tegra_pingroup_config *new_pingroup, *base_pingroup;
-
-        /* Update base seaboard pinmux table with secondary board
-         * specific pinmux table table.
-         */
-        for (i = 0; i < size; i++) {
-                new_pingroup = &newtbl[i];
-                for (j = 0; j < ARRAY_SIZE(seaboard_pinmux); j++) {
-                        base_pingroup = &seaboard_pinmux[j];
-                        if (new_pingroup->pingroup == base_pingroup->pingroup) {
-                                *base_pingroup = *new_pingroup;
-                                break;
-                        }
-                }
-        }
-}
-
-void __init seaboard_common_pinmux_init(void)
-{
-        if (!of_machine_is_compatible("nvidia,tegra20"))
-                platform_add_devices(pinmux_devices,
-                                        ARRAY_SIZE(pinmux_devices));
+static struct tegra_gpio_table ventana_gpio_table[] = {
+        /* hp_det */
+        { .gpio = TEGRA_GPIO_PW2,               .enable = true },
+        /* int_mic_en */
+        { .gpio = TEGRA_GPIO_PX0,               .enable = true },
+        /* ext_mic_en */
+        { .gpio = TEGRA_GPIO_PX1,               .enable = true },
+};
 
-        tegra_pinmux_config_table(seaboard_pinmux, ARRAY_SIZE(seaboard_pinmux));
+static struct tegra_board_pinmux_conf common_conf = {
+        .pgs = common_pinmux,
+        .pg_count = ARRAY_SIZE(common_pinmux),
+        .gpios = common_gpio_table,
+        .gpio_count = ARRAY_SIZE(common_gpio_table),
+};
 
-        tegra_drive_pinmux_config_table(seaboard_drive_pinmux,
-                                        ARRAY_SIZE(seaboard_drive_pinmux));
+static struct tegra_board_pinmux_conf seaboard_conf = {
+        .pgs = seaboard_pinmux,
+        .pg_count = ARRAY_SIZE(seaboard_pinmux),
+        .drives = seaboard_drive_pinmux,
+        .drive_count = ARRAY_SIZE(seaboard_drive_pinmux),
+        .gpios = seaboard_gpio_table,
+        .gpio_count = ARRAY_SIZE(seaboard_gpio_table),
+};
 
-        tegra_gpio_config(common_gpio_table, ARRAY_SIZE(common_gpio_table));
-}
+static struct tegra_board_pinmux_conf ventana_conf = {
+        .pgs = ventana_pinmux,
+        .pg_count = ARRAY_SIZE(ventana_pinmux),
+        .gpios = ventana_gpio_table,
+        .gpio_count = ARRAY_SIZE(ventana_gpio_table),
+};
 
-void __init seaboard_pinmux_init(void)
+void seaboard_pinmux_init(void)
 {
-        seaboard_common_pinmux_init();
+        tegra_board_pinmux_init(&common_conf, &seaboard_conf);
 }
 
-void __init ventana_pinmux_init(void)
+void ventana_pinmux_init(void)
 {
-        update_pinmux(ventana_pinmux, ARRAY_SIZE(ventana_pinmux));
-        seaboard_common_pinmux_init();
+        tegra_board_pinmux_init(&common_conf, &ventana_conf);
 }
-
diff --git a/arch/arm/mach-tegra/board-seaboard.c b/arch/arm/mach-tegra/board-seaboard.c
index c1599eb8e0cb..cfc74d46a09e 100644
--- a/arch/arm/mach-tegra/board-seaboard.c
+++ b/arch/arm/mach-tegra/board-seaboard.c
@@ -283,7 +283,7 @@ static void __init tegra_wario_init(void)
 MACHINE_START(SEABOARD, "seaboard")
         .atag_offset    = 0x100,
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
+        .init_early     = tegra20_init_early,
         .init_irq       = tegra_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
@@ -294,7 +294,7 @@ MACHINE_END
 MACHINE_START(KAEN, "kaen")
         .atag_offset    = 0x100,
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
+        .init_early     = tegra20_init_early,
         .init_irq       = tegra_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
@@ -305,7 +305,7 @@ MACHINE_END
 MACHINE_START(WARIO, "wario")
         .atag_offset    = 0x100,
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
+        .init_early     = tegra20_init_early,
         .init_irq       = tegra_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
diff --git a/arch/arm/mach-tegra/board-trimslice-pinmux.c b/arch/arm/mach-tegra/board-trimslice-pinmux.c
index 7ab719d46da0..a21a2be57cb6 100644
--- a/arch/arm/mach-tegra/board-trimslice-pinmux.c
+++ b/arch/arm/mach-tegra/board-trimslice-pinmux.c
@@ -19,12 +19,13 @@
 #include <linux/of.h>
 
 #include <mach/pinmux.h>
+#include <mach/pinmux-tegra20.h>
 
 #include "gpio-names.h"
+#include "board-pinmux.h"
 #include "board-trimslice.h"
-#include "devices.h"
 
-static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {
+static struct tegra_pingroup_config trimslice_pinmux[] = {
         {TEGRA_PINGROUP_ATA,   TEGRA_MUX_IDE,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_ATB,   TEGRA_MUX_SDIO4,         TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_ATC,   TEGRA_MUX_NAND,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},
@@ -105,7 +106,7 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {
         {TEGRA_PINGROUP_LVS,   TEGRA_MUX_DISPLAYA,      TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_OWC,   TEGRA_MUX_RSVD2,         TEGRA_PUPD_PULL_UP,     TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_PMC,   TEGRA_MUX_PWR_ON,        TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},
-        {TEGRA_PINGROUP_PTA,   TEGRA_MUX_RSVD3,         TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},
+        {TEGRA_PINGROUP_PTA,   TEGRA_MUX_GMI,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_TRISTATE},
         {TEGRA_PINGROUP_RM,    TEGRA_MUX_I2C,           TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SDB,   TEGRA_MUX_PWM,           TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},
         {TEGRA_PINGROUP_SDC,   TEGRA_MUX_PWM,           TEGRA_PUPD_PULL_UP,     TEGRA_TRI_NORMAL},
@@ -143,11 +144,6 @@ static __initdata struct tegra_pingroup_config trimslice_pinmux[] = {
         {TEGRA_PINGROUP_XM2D,  TEGRA_MUX_NONE,          TEGRA_PUPD_NORMAL,      TEGRA_TRI_NORMAL},
 };
 
-static struct platform_device *pinmux_devices[] = {
-        &tegra_gpio_device,
-        &tegra_pinmux_device,
-};
-
 static struct tegra_gpio_table gpio_table[] = {
         { .gpio = TRIMSLICE_GPIO_SD4_CD, .enable = true }, /* mmc4 cd */
         { .gpio = TRIMSLICE_GPIO_SD4_WP, .enable = true }, /* mmc4 wp */
@@ -156,11 +152,14 @@ static struct tegra_gpio_table gpio_table[] = {
         { .gpio = TRIMSLICE_GPIO_USB2_RST,  .enable = true }, /* USB2 PHY rst */
 };
 
-void __init trimslice_pinmux_init(void)
+static struct tegra_board_pinmux_conf conf = {
+        .pgs = trimslice_pinmux,
+        .pg_count = ARRAY_SIZE(trimslice_pinmux),
+        .gpios = gpio_table,
+        .gpio_count = ARRAY_SIZE(gpio_table),
+};
+
+void trimslice_pinmux_init(void)
 {
-        if (!of_machine_is_compatible("nvidia,tegra20"))
-                platform_add_devices(pinmux_devices,
-                                        ARRAY_SIZE(pinmux_devices));
-        tegra_pinmux_config_table(trimslice_pinmux, ARRAY_SIZE(trimslice_pinmux));
-        tegra_gpio_config(gpio_table, ARRAY_SIZE(gpio_table));
+        tegra_board_pinmux_init(&conf, NULL);
 }
diff --git a/arch/arm/mach-tegra/board-trimslice.c b/arch/arm/mach-tegra/board-trimslice.c
index c242314a1db5..cd52820a3e37 100644
--- a/arch/arm/mach-tegra/board-trimslice.c
+++ b/arch/arm/mach-tegra/board-trimslice.c
@@ -175,7 +175,7 @@ MACHINE_START(TRIMSLICE, "trimslice")
         .atag_offset    = 0x100,
         .fixup          = tegra_trimslice_fixup,
         .map_io         = tegra_map_common_io,
-        .init_early     = tegra_init_early,
+        .init_early     = tegra20_init_early,
         .init_irq       = tegra_init_irq,
         .handle_irq     = gic_handle_irq,
         .timer          = &tegra_timer,
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 1d14df7eb7de..75d1543d77c0 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -25,10 +25,11 @@
 
 void tegra_assert_system_reset(char mode, const char *cmd);
 
-void __init tegra_init_early(void);
+void __init tegra20_init_early(void);
+void __init tegra30_init_early(void);
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
-void __init tegra_init_clock(void);
+void __init tegra_dt_init_irq(void);
 int __init tegra_pcie_init(bool init_port0, bool init_port1);
 
 extern struct sys_timer tegra_timer;
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index f8d41ffc0ca9..8337068a4abe 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -387,35 +387,18 @@ EXPORT_SYMBOL(tegra_clk_init_from_table);
 
 void tegra_periph_reset_deassert(struct clk *c)
 {
-        tegra2_periph_reset_deassert(c);
+        BUG_ON(!c->ops->reset);
+        c->ops->reset(c, false);
 }
 EXPORT_SYMBOL(tegra_periph_reset_deassert);
 
 void tegra_periph_reset_assert(struct clk *c)
 {
-        tegra2_periph_reset_assert(c);
+        BUG_ON(!c->ops->reset);
+        c->ops->reset(c, true);
 }
 EXPORT_SYMBOL(tegra_periph_reset_assert);
 
-void __init tegra_init_clock(void)
-{
-        tegra2_init_clocks();
-}
-
-/*
- * The SDMMC controllers have extra bits in the clock source register that
- * adjust the delay between the clock and data to compenstate for delays
- * on the PCB.
- */
-void tegra_sdmmc_tap_delay(struct clk *c, int delay)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&c->spinlock, flags);
-        tegra2_sdmmc_tap_delay(c, delay);
-        spin_unlock_irqrestore(&c->spinlock, flags);
-}
-
 #ifdef CONFIG_DEBUG_FS
 
 static int __clk_lock_all_spinlocks(void)
diff --git a/arch/arm/mach-tegra/clock.h b/arch/arm/mach-tegra/clock.h
index 688316abc64e..5c44106616c5 100644
--- a/arch/arm/mach-tegra/clock.h
+++ b/arch/arm/mach-tegra/clock.h
@@ -146,15 +146,11 @@ struct tegra_clk_init_table {
 };
 
 void tegra2_init_clocks(void);
-void tegra2_periph_reset_deassert(struct clk *c);
-void tegra2_periph_reset_assert(struct clk *c);
 void clk_init(struct clk *clk);
 struct clk *tegra_get_clock_by_name(const char *name);
-unsigned long clk_measure_input_freq(void);
 int clk_reparent(struct clk *c, struct clk *parent);
 void tegra_clk_init_from_table(struct tegra_clk_init_table *table);
 unsigned long clk_get_rate_locked(struct clk *c);
 int clk_set_rate_locked(struct clk *c, unsigned long rate);
-void tegra2_sdmmc_tap_delay(struct clk *c, int delay);
 
 #endif
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 20f396d740fa..a2eb90169aed 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-tegra/board-harmony.c
+ * arch/arm/mach-tegra/common.c
  *
  * Copyright (C) 2010 Google, Inc.
  *
@@ -21,8 +21,10 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/of_irq.h>
 
 #include <asm/hardware/cache-l2x0.h>
+#include <asm/hardware/gic.h>
 
 #include <mach/iomap.h>
 #include <mach/system.h>
@@ -31,18 +33,31 @@
 #include "clock.h"
 #include "fuse.h"
 
+#ifdef CONFIG_OF
+static const struct of_device_id tegra_dt_irq_match[] __initconst = {
+        { .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
+        { }
+};
+
+void __init tegra_dt_init_irq(void)
+{
+        tegra_init_irq();
+        of_irq_init(tegra_dt_irq_match);
+}
+#endif
+
 void tegra_assert_system_reset(char mode, const char *cmd)
 {
-        void __iomem *reset = IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x04);
+        void __iomem *reset = IO_ADDRESS(TEGRA_PMC_BASE + 0);
         u32 reg;
 
-        /* use *_related to avoid spinlock since caches are off */
         reg = readl_relaxed(reset);
-        reg |= 0x04;
+        reg |= 0x10;
         writel_relaxed(reg, reset);
 }
 
-static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+static __initdata struct tegra_clk_init_table tegra20_clk_init_table[] = {
         /* name         parent          rate            enabled */
         { "clk_m",      NULL,           0,              true },
         { "pll_p",      "clk_m",        216000000,      true },
@@ -58,24 +73,38 @@ static __initdata struct tegra_clk_init_table common_clk_init_table[] = {
         { "cpu",        NULL,           0,              true },
         { NULL,         NULL,           0,              0},
 };
+#endif
 
-static void __init tegra_init_cache(void)
+static void __init tegra_init_cache(u32 tag_latency, u32 data_latency)
 {
 #ifdef CONFIG_CACHE_L2X0
         void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
+        u32 aux_ctrl, cache_type;
+
+        writel_relaxed(tag_latency, p + L2X0_TAG_LATENCY_CTRL);
+        writel_relaxed(data_latency, p + L2X0_DATA_LATENCY_CTRL);
 
-        writel_relaxed(0x331, p + L2X0_TAG_LATENCY_CTRL);
-        writel_relaxed(0x441, p + L2X0_DATA_LATENCY_CTRL);
+        cache_type = readl(p + L2X0_CACHE_TYPE);
+        aux_ctrl = (cache_type & 0x700) << (17-8);
+        aux_ctrl |= 0x6C000001;
 
-        l2x0_init(p, 0x6C080001, 0x8200c3fe);
+        l2x0_init(p, aux_ctrl, 0x8200c3fe);
 #endif
 
 }
 
-void __init tegra_init_early(void)
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+void __init tegra20_init_early(void)
 {
         tegra_init_fuse();
-        tegra_init_clock();
-        tegra_clk_init_from_table(common_clk_init_table);
-        tegra_init_cache();
+        tegra2_init_clocks();
+        tegra_clk_init_from_table(tegra20_clk_init_table);
+        tegra_init_cache(0x331, 0x441);
+}
+#endif
+#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+void __init tegra30_init_early(void)
+{
+        tegra_init_cache(0x441, 0x551);
 }
+#endif
diff --git a/arch/arm/mach-tegra/include/mach/clk.h b/arch/arm/mach-tegra/include/mach/clk.h
index c8baf8f80d23..fc3ecb66de08 100644
--- a/arch/arm/mach-tegra/include/mach/clk.h
+++ b/arch/arm/mach-tegra/include/mach/clk.h
@@ -26,6 +26,6 @@ void tegra_periph_reset_deassert(struct clk *c);
 void tegra_periph_reset_assert(struct clk *c);
 
 unsigned long clk_get_rate_all_locked(struct clk *c);
-void tegra_sdmmc_tap_delay(struct clk *c, int delay);
+void tegra2_sdmmc_tap_delay(struct clk *c, int delay);
 
 #endif
diff --git a/arch/arm/mach-tegra/include/mach/entry-macro.S b/arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262149c7..e577cfe27e72 100644
--- a/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@ -18,21 +18,3 @@
 
         .macro  arch_ret_to_user, tmp1, tmp2
         .endm
-
-#if !defined(CONFIG_ARM_GIC)
-        /* legacy interrupt controller for AP16 */
-
-        .macro  get_irqnr_preamble, base, tmp
-        @ enable imprecise aborts
-        cpsie   a
-        @ EVP base at 0xf010f000
-        mov \base, #0xf0000000
-        orr \base, #0x00100000
-        orr \base, #0x0000f000
-        .endm
-
-        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-        ldr \irqnr, [\base, #0x20]      @ EVT_IRQ_STS
-        cmp \irqnr, #0x80
-        .endm
-#endif
diff --git a/arch/arm/mach-tegra/include/mach/irqs.h b/arch/arm/mach-tegra/include/mach/irqs.h
index 73265af4dda3..a2146cd6867d 100644
--- a/arch/arm/mach-tegra/include/mach/irqs.h
+++ b/arch/arm/mach-tegra/include/mach/irqs.h
@@ -25,7 +25,6 @@
 
 #define IRQ_LOCALTIMER                  29
 
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
 /* Primary Interrupt Controller */
 #define INT_PRI_BASE                    (INT_GIC_BASE + 32)
 #define INT_TMR1                        (INT_PRI_BASE + 0)
@@ -178,6 +177,5 @@
 #define NR_BOARD_IRQS                   32
 
 #define NR_IRQS                         (INT_BOARD_BASE + NR_BOARD_IRQS)
-#endif
 
 #endif
diff --git a/arch/arm/mach-tegra/include/mach/pinmux-t2.h b/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h
index 4c2626347263..6a40c1dbab17 100644
--- a/arch/arm/mach-tegra/include/mach/pinmux-t2.h
+++ b/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-tegra/include/mach/pinmux-t2.h
+ * linux/arch/arm/mach-tegra/include/mach/pinmux-tegra20.h
  *
  * Copyright (C) 2010 Google, Inc.
  *
@@ -14,8 +14,8 @@
  *
  */
 
-#ifndef __MACH_TEGRA_PINMUX_T2_H
-#define __MACH_TEGRA_PINMUX_T2_H
+#ifndef __MACH_TEGRA_PINMUX_TEGRA20_H
+#define __MACH_TEGRA_PINMUX_TEGRA20_H
 
 enum tegra_pingroup {
         TEGRA_PINGROUP_ATA = 0,
diff --git a/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h b/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h
new file mode 100644
index 000000000000..c1aee3eb2df1
--- /dev/null
+++ b/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h
@@ -0,0 +1,320 @@
+/*
+ * linux/arch/arm/mach-tegra/include/mach/pinmux-tegra30.h
+ *
+ * Copyright (C) 2010 Google, Inc.
+ * Copyright (C) 2010,2011 Nvidia, 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 __MACH_TEGRA_PINMUX_TEGRA30_H
+#define __MACH_TEGRA_PINMUX_TEGRA30_H
+
+enum tegra_pingroup {
+        TEGRA_PINGROUP_ULPI_DATA0 = 0,
+        TEGRA_PINGROUP_ULPI_DATA1,
+        TEGRA_PINGROUP_ULPI_DATA2,
+        TEGRA_PINGROUP_ULPI_DATA3,
+        TEGRA_PINGROUP_ULPI_DATA4,
+        TEGRA_PINGROUP_ULPI_DATA5,
+        TEGRA_PINGROUP_ULPI_DATA6,
+        TEGRA_PINGROUP_ULPI_DATA7,
+        TEGRA_PINGROUP_ULPI_CLK,
+        TEGRA_PINGROUP_ULPI_DIR,
+        TEGRA_PINGROUP_ULPI_NXT,
+        TEGRA_PINGROUP_ULPI_STP,
+        TEGRA_PINGROUP_DAP3_FS,
+        TEGRA_PINGROUP_DAP3_DIN,
+        TEGRA_PINGROUP_DAP3_DOUT,
+        TEGRA_PINGROUP_DAP3_SCLK,
+        TEGRA_PINGROUP_GPIO_PV0,
+        TEGRA_PINGROUP_GPIO_PV1,
+        TEGRA_PINGROUP_SDMMC1_CLK,
+        TEGRA_PINGROUP_SDMMC1_CMD,
+        TEGRA_PINGROUP_SDMMC1_DAT3,
+        TEGRA_PINGROUP_SDMMC1_DAT2,
+        TEGRA_PINGROUP_SDMMC1_DAT1,
+        TEGRA_PINGROUP_SDMMC1_DAT0,
+        TEGRA_PINGROUP_GPIO_PV2,
+        TEGRA_PINGROUP_GPIO_PV3,
+        TEGRA_PINGROUP_CLK2_OUT,
+        TEGRA_PINGROUP_CLK2_REQ,
+        TEGRA_PINGROUP_LCD_PWR1,
+        TEGRA_PINGROUP_LCD_PWR2,
+        TEGRA_PINGROUP_LCD_SDIN,
+        TEGRA_PINGROUP_LCD_SDOUT,
+        TEGRA_PINGROUP_LCD_WR_N,
+        TEGRA_PINGROUP_LCD_CS0_N,
+        TEGRA_PINGROUP_LCD_DC0,
+        TEGRA_PINGROUP_LCD_SCK,
+        TEGRA_PINGROUP_LCD_PWR0,
+        TEGRA_PINGROUP_LCD_PCLK,
+        TEGRA_PINGROUP_LCD_DE,
+        TEGRA_PINGROUP_LCD_HSYNC,
+        TEGRA_PINGROUP_LCD_VSYNC,
+        TEGRA_PINGROUP_LCD_D0,
+        TEGRA_PINGROUP_LCD_D1,
+        TEGRA_PINGROUP_LCD_D2,
+        TEGRA_PINGROUP_LCD_D3,
+        TEGRA_PINGROUP_LCD_D4,
+        TEGRA_PINGROUP_LCD_D5,
+        TEGRA_PINGROUP_LCD_D6,
+        TEGRA_PINGROUP_LCD_D7,
+        TEGRA_PINGROUP_LCD_D8,
+        TEGRA_PINGROUP_LCD_D9,
+        TEGRA_PINGROUP_LCD_D10,
+        TEGRA_PINGROUP_LCD_D11,
+        TEGRA_PINGROUP_LCD_D12,
+        TEGRA_PINGROUP_LCD_D13,
+        TEGRA_PINGROUP_LCD_D14,
+        TEGRA_PINGROUP_LCD_D15,
+        TEGRA_PINGROUP_LCD_D16,
+        TEGRA_PINGROUP_LCD_D17,
+        TEGRA_PINGROUP_LCD_D18,
+        TEGRA_PINGROUP_LCD_D19,
+        TEGRA_PINGROUP_LCD_D20,
+        TEGRA_PINGROUP_LCD_D21,
+        TEGRA_PINGROUP_LCD_D22,
+        TEGRA_PINGROUP_LCD_D23,
+        TEGRA_PINGROUP_LCD_CS1_N,
+        TEGRA_PINGROUP_LCD_M1,
+        TEGRA_PINGROUP_LCD_DC1,
+        TEGRA_PINGROUP_HDMI_INT,
+        TEGRA_PINGROUP_DDC_SCL,
+        TEGRA_PINGROUP_DDC_SDA,
+        TEGRA_PINGROUP_CRT_HSYNC,
+        TEGRA_PINGROUP_CRT_VSYNC,
+        TEGRA_PINGROUP_VI_D0,
+        TEGRA_PINGROUP_VI_D1,
+        TEGRA_PINGROUP_VI_D2,
+        TEGRA_PINGROUP_VI_D3,
+        TEGRA_PINGROUP_VI_D4,
+        TEGRA_PINGROUP_VI_D5,
+        TEGRA_PINGROUP_VI_D6,
+        TEGRA_PINGROUP_VI_D7,
+        TEGRA_PINGROUP_VI_D8,
+        TEGRA_PINGROUP_VI_D9,
+        TEGRA_PINGROUP_VI_D10,
+        TEGRA_PINGROUP_VI_D11,
+        TEGRA_PINGROUP_VI_PCLK,
+        TEGRA_PINGROUP_VI_MCLK,
+        TEGRA_PINGROUP_VI_VSYNC,
+        TEGRA_PINGROUP_VI_HSYNC,
+        TEGRA_PINGROUP_UART2_RXD,
+        TEGRA_PINGROUP_UART2_TXD,
+        TEGRA_PINGROUP_UART2_RTS_N,
+        TEGRA_PINGROUP_UART2_CTS_N,
+        TEGRA_PINGROUP_UART3_TXD,
+        TEGRA_PINGROUP_UART3_RXD,
+        TEGRA_PINGROUP_UART3_CTS_N,
+        TEGRA_PINGROUP_UART3_RTS_N,
+        TEGRA_PINGROUP_GPIO_PU0,
+        TEGRA_PINGROUP_GPIO_PU1,
+        TEGRA_PINGROUP_GPIO_PU2,
+        TEGRA_PINGROUP_GPIO_PU3,
+        TEGRA_PINGROUP_GPIO_PU4,
+        TEGRA_PINGROUP_GPIO_PU5,
+        TEGRA_PINGROUP_GPIO_PU6,
+        TEGRA_PINGROUP_GEN1_I2C_SDA,
+        TEGRA_PINGROUP_GEN1_I2C_SCL,
+        TEGRA_PINGROUP_DAP4_FS,
+        TEGRA_PINGROUP_DAP4_DIN,
+        TEGRA_PINGROUP_DAP4_DOUT,
+        TEGRA_PINGROUP_DAP4_SCLK,
+        TEGRA_PINGROUP_CLK3_OUT,
+        TEGRA_PINGROUP_CLK3_REQ,
+        TEGRA_PINGROUP_GMI_WP_N,
+        TEGRA_PINGROUP_GMI_IORDY,
+        TEGRA_PINGROUP_GMI_WAIT,
+        TEGRA_PINGROUP_GMI_ADV_N,
+        TEGRA_PINGROUP_GMI_CLK,
+        TEGRA_PINGROUP_GMI_CS0_N,
+        TEGRA_PINGROUP_GMI_CS1_N,
+        TEGRA_PINGROUP_GMI_CS2_N,
+        TEGRA_PINGROUP_GMI_CS3_N,
+        TEGRA_PINGROUP_GMI_CS4_N,
+        TEGRA_PINGROUP_GMI_CS6_N,
+        TEGRA_PINGROUP_GMI_CS7_N,
+        TEGRA_PINGROUP_GMI_AD0,
+        TEGRA_PINGROUP_GMI_AD1,
+        TEGRA_PINGROUP_GMI_AD2,
+        TEGRA_PINGROUP_GMI_AD3,
+        TEGRA_PINGROUP_GMI_AD4,
+        TEGRA_PINGROUP_GMI_AD5,
+        TEGRA_PINGROUP_GMI_AD6,
+        TEGRA_PINGROUP_GMI_AD7,
+        TEGRA_PINGROUP_GMI_AD8,
+        TEGRA_PINGROUP_GMI_AD9,
+        TEGRA_PINGROUP_GMI_AD10,
+        TEGRA_PINGROUP_GMI_AD11,
+        TEGRA_PINGROUP_GMI_AD12,
+        TEGRA_PINGROUP_GMI_AD13,
+        TEGRA_PINGROUP_GMI_AD14,
+        TEGRA_PINGROUP_GMI_AD15,
+        TEGRA_PINGROUP_GMI_A16,
+        TEGRA_PINGROUP_GMI_A17,
+        TEGRA_PINGROUP_GMI_A18,
+        TEGRA_PINGROUP_GMI_A19,
+        TEGRA_PINGROUP_GMI_WR_N,
+        TEGRA_PINGROUP_GMI_OE_N,
+        TEGRA_PINGROUP_GMI_DQS,
+        TEGRA_PINGROUP_GMI_RST_N,
+        TEGRA_PINGROUP_GEN2_I2C_SCL,
+        TEGRA_PINGROUP_GEN2_I2C_SDA,
+        TEGRA_PINGROUP_SDMMC4_CLK,
+        TEGRA_PINGROUP_SDMMC4_CMD,
+        TEGRA_PINGROUP_SDMMC4_DAT0,
+        TEGRA_PINGROUP_SDMMC4_DAT1,
+        TEGRA_PINGROUP_SDMMC4_DAT2,
+        TEGRA_PINGROUP_SDMMC4_DAT3,
+        TEGRA_PINGROUP_SDMMC4_DAT4,
+        TEGRA_PINGROUP_SDMMC4_DAT5,
+        TEGRA_PINGROUP_SDMMC4_DAT6,
+        TEGRA_PINGROUP_SDMMC4_DAT7,
+        TEGRA_PINGROUP_SDMMC4_RST_N,
+        TEGRA_PINGROUP_CAM_MCLK,
+        TEGRA_PINGROUP_GPIO_PCC1,
+        TEGRA_PINGROUP_GPIO_PBB0,
+        TEGRA_PINGROUP_CAM_I2C_SCL,
+        TEGRA_PINGROUP_CAM_I2C_SDA,
+        TEGRA_PINGROUP_GPIO_PBB3,
+        TEGRA_PINGROUP_GPIO_PBB4,
+        TEGRA_PINGROUP_GPIO_PBB5,
+        TEGRA_PINGROUP_GPIO_PBB6,
+        TEGRA_PINGROUP_GPIO_PBB7,
+        TEGRA_PINGROUP_GPIO_PCC2,
+        TEGRA_PINGROUP_JTAG_RTCK,
+        TEGRA_PINGROUP_PWR_I2C_SCL,
+        TEGRA_PINGROUP_PWR_I2C_SDA,
+        TEGRA_PINGROUP_KB_ROW0,
+        TEGRA_PINGROUP_KB_ROW1,
+        TEGRA_PINGROUP_KB_ROW2,
+        TEGRA_PINGROUP_KB_ROW3,
+        TEGRA_PINGROUP_KB_ROW4,
+        TEGRA_PINGROUP_KB_ROW5,
+        TEGRA_PINGROUP_KB_ROW6,
+        TEGRA_PINGROUP_KB_ROW7,
+        TEGRA_PINGROUP_KB_ROW8,
+        TEGRA_PINGROUP_KB_ROW9,
+        TEGRA_PINGROUP_KB_ROW10,
+        TEGRA_PINGROUP_KB_ROW11,
+        TEGRA_PINGROUP_KB_ROW12,
+        TEGRA_PINGROUP_KB_ROW13,
+        TEGRA_PINGROUP_KB_ROW14,
+        TEGRA_PINGROUP_KB_ROW15,
+        TEGRA_PINGROUP_KB_COL0,
+        TEGRA_PINGROUP_KB_COL1,
+        TEGRA_PINGROUP_KB_COL2,
+        TEGRA_PINGROUP_KB_COL3,
+        TEGRA_PINGROUP_KB_COL4,
+        TEGRA_PINGROUP_KB_COL5,
+        TEGRA_PINGROUP_KB_COL6,
+        TEGRA_PINGROUP_KB_COL7,
+        TEGRA_PINGROUP_CLK_32K_OUT,
+        TEGRA_PINGROUP_SYS_CLK_REQ,
+        TEGRA_PINGROUP_CORE_PWR_REQ,
+        TEGRA_PINGROUP_CPU_PWR_REQ,
+        TEGRA_PINGROUP_PWR_INT_N,
+        TEGRA_PINGROUP_CLK_32K_IN,
+        TEGRA_PINGROUP_OWR,
+        TEGRA_PINGROUP_DAP1_FS,
+        TEGRA_PINGROUP_DAP1_DIN,
+        TEGRA_PINGROUP_DAP1_DOUT,
+        TEGRA_PINGROUP_DAP1_SCLK,
+        TEGRA_PINGROUP_CLK1_REQ,
+        TEGRA_PINGROUP_CLK1_OUT,
+        TEGRA_PINGROUP_SPDIF_IN,
+        TEGRA_PINGROUP_SPDIF_OUT,
+        TEGRA_PINGROUP_DAP2_FS,
+        TEGRA_PINGROUP_DAP2_DIN,
+        TEGRA_PINGROUP_DAP2_DOUT,
+        TEGRA_PINGROUP_DAP2_SCLK,
+        TEGRA_PINGROUP_SPI2_MOSI,
+        TEGRA_PINGROUP_SPI2_MISO,
+        TEGRA_PINGROUP_SPI2_CS0_N,
+        TEGRA_PINGROUP_SPI2_SCK,
+        TEGRA_PINGROUP_SPI1_MOSI,
+        TEGRA_PINGROUP_SPI1_SCK,
+        TEGRA_PINGROUP_SPI1_CS0_N,
+        TEGRA_PINGROUP_SPI1_MISO,
+        TEGRA_PINGROUP_SPI2_CS1_N,
+        TEGRA_PINGROUP_SPI2_CS2_N,
+        TEGRA_PINGROUP_SDMMC3_CLK,
+        TEGRA_PINGROUP_SDMMC3_CMD,
+        TEGRA_PINGROUP_SDMMC3_DAT0,
+        TEGRA_PINGROUP_SDMMC3_DAT1,
+        TEGRA_PINGROUP_SDMMC3_DAT2,
+        TEGRA_PINGROUP_SDMMC3_DAT3,
+        TEGRA_PINGROUP_SDMMC3_DAT4,
+        TEGRA_PINGROUP_SDMMC3_DAT5,
+        TEGRA_PINGROUP_SDMMC3_DAT6,
+        TEGRA_PINGROUP_SDMMC3_DAT7,
+        TEGRA_PINGROUP_PEX_L0_PRSNT_N,
+        TEGRA_PINGROUP_PEX_L0_RST_N,
+        TEGRA_PINGROUP_PEX_L0_CLKREQ_N,
+        TEGRA_PINGROUP_PEX_WAKE_N,
+        TEGRA_PINGROUP_PEX_L1_PRSNT_N,
+        TEGRA_PINGROUP_PEX_L1_RST_N,
+        TEGRA_PINGROUP_PEX_L1_CLKREQ_N,
+        TEGRA_PINGROUP_PEX_L2_PRSNT_N,
+        TEGRA_PINGROUP_PEX_L2_RST_N,
+        TEGRA_PINGROUP_PEX_L2_CLKREQ_N,
+        TEGRA_PINGROUP_HDMI_CEC,
+        TEGRA_MAX_PINGROUP,
+};
+
+enum tegra_drive_pingroup {
+        TEGRA_DRIVE_PINGROUP_AO1 = 0,
+        TEGRA_DRIVE_PINGROUP_AO2,
+        TEGRA_DRIVE_PINGROUP_AT1,
+        TEGRA_DRIVE_PINGROUP_AT2,
+        TEGRA_DRIVE_PINGROUP_AT3,
+        TEGRA_DRIVE_PINGROUP_AT4,
+        TEGRA_DRIVE_PINGROUP_AT5,
+        TEGRA_DRIVE_PINGROUP_CDEV1,
+        TEGRA_DRIVE_PINGROUP_CDEV2,
+        TEGRA_DRIVE_PINGROUP_CSUS,
+        TEGRA_DRIVE_PINGROUP_DAP1,
+        TEGRA_DRIVE_PINGROUP_DAP2,
+        TEGRA_DRIVE_PINGROUP_DAP3,
+        TEGRA_DRIVE_PINGROUP_DAP4,
+        TEGRA_DRIVE_PINGROUP_DBG,
+        TEGRA_DRIVE_PINGROUP_LCD1,
+        TEGRA_DRIVE_PINGROUP_LCD2,
+        TEGRA_DRIVE_PINGROUP_SDIO2,
+        TEGRA_DRIVE_PINGROUP_SDIO3,
+        TEGRA_DRIVE_PINGROUP_SPI,
+        TEGRA_DRIVE_PINGROUP_UAA,
+        TEGRA_DRIVE_PINGROUP_UAB,
+        TEGRA_DRIVE_PINGROUP_UART2,
+        TEGRA_DRIVE_PINGROUP_UART3,
+        TEGRA_DRIVE_PINGROUP_VI1,
+        TEGRA_DRIVE_PINGROUP_SDIO1,
+        TEGRA_DRIVE_PINGROUP_CRT,
+        TEGRA_DRIVE_PINGROUP_DDC,
+        TEGRA_DRIVE_PINGROUP_GMA,
+        TEGRA_DRIVE_PINGROUP_GMB,
+        TEGRA_DRIVE_PINGROUP_GMC,
+        TEGRA_DRIVE_PINGROUP_GMD,
+        TEGRA_DRIVE_PINGROUP_GME,
+        TEGRA_DRIVE_PINGROUP_GMF,
+        TEGRA_DRIVE_PINGROUP_GMG,
+        TEGRA_DRIVE_PINGROUP_GMH,
+        TEGRA_DRIVE_PINGROUP_OWR,
+        TEGRA_DRIVE_PINGROUP_UAD,
+        TEGRA_DRIVE_PINGROUP_GPV,
+        TEGRA_DRIVE_PINGROUP_DEV3,
+        TEGRA_DRIVE_PINGROUP_CEC,
+        TEGRA_MAX_DRIVE_PINGROUP,
+};
+
+#endif
+
diff --git a/arch/arm/mach-tegra/include/mach/pinmux.h b/arch/arm/mach-tegra/include/mach/pinmux.h
index bb7dfdb61205..055f1792c8ff 100644
--- a/arch/arm/mach-tegra/include/mach/pinmux.h
+++ b/arch/arm/mach-tegra/include/mach/pinmux.h
@@ -2,6 +2,7 @@
  * linux/arch/arm/mach-tegra/include/mach/pinmux.h
  *
  * Copyright (C) 2010 Google, Inc.
+ * Copyright (C) 2010,2011 Nvidia, Inc.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -17,18 +18,13 @@
 #ifndef __MACH_TEGRA_PINMUX_H
 #define __MACH_TEGRA_PINMUX_H
 
-#if defined(CONFIG_ARCH_TEGRA_2x_SOC)
-#include "pinmux-t2.h"
-#else
-#error "Undefined Tegra architecture"
-#endif
-
 enum tegra_mux_func {
         TEGRA_MUX_RSVD = 0x8000,
         TEGRA_MUX_RSVD1 = 0x8000,
         TEGRA_MUX_RSVD2 = 0x8001,
         TEGRA_MUX_RSVD3 = 0x8002,
         TEGRA_MUX_RSVD4 = 0x8003,
+        TEGRA_MUX_INVALID = 0x4000,
         TEGRA_MUX_NONE = -1,
         TEGRA_MUX_AHB_CLK,
         TEGRA_MUX_APB_CLK,
@@ -90,6 +86,49 @@ enum tegra_mux_func {
         TEGRA_MUX_VI,
         TEGRA_MUX_VI_SENSOR_CLK,
         TEGRA_MUX_XIO,
+        TEGRA_MUX_BLINK,
+        TEGRA_MUX_CEC,
+        TEGRA_MUX_CLK12,
+        TEGRA_MUX_DAP,
+        TEGRA_MUX_DAPSDMMC2,
+        TEGRA_MUX_DDR,
+        TEGRA_MUX_DEV3,
+        TEGRA_MUX_DTV,
+        TEGRA_MUX_VI_ALT1,
+        TEGRA_MUX_VI_ALT2,
+        TEGRA_MUX_VI_ALT3,
+        TEGRA_MUX_EMC_DLL,
+        TEGRA_MUX_EXTPERIPH1,
+        TEGRA_MUX_EXTPERIPH2,
+        TEGRA_MUX_EXTPERIPH3,
+        TEGRA_MUX_GMI_ALT,
+        TEGRA_MUX_HDA,
+        TEGRA_MUX_HSI,
+        TEGRA_MUX_I2C4,
+        TEGRA_MUX_I2C5,
+        TEGRA_MUX_I2CPWR,
+        TEGRA_MUX_I2S0,
+        TEGRA_MUX_I2S1,
+        TEGRA_MUX_I2S2,
+        TEGRA_MUX_I2S3,
+        TEGRA_MUX_I2S4,
+        TEGRA_MUX_NAND_ALT,
+        TEGRA_MUX_POPSDIO4,
+        TEGRA_MUX_POPSDMMC4,
+        TEGRA_MUX_PWM0,
+        TEGRA_MUX_PWM1,
+        TEGRA_MUX_PWM2,
+        TEGRA_MUX_PWM3,
+        TEGRA_MUX_SATA,
+        TEGRA_MUX_SPI5,
+        TEGRA_MUX_SPI6,
+        TEGRA_MUX_SYSCLK,
+        TEGRA_MUX_VGP1,
+        TEGRA_MUX_VGP2,
+        TEGRA_MUX_VGP3,
+        TEGRA_MUX_VGP4,
+        TEGRA_MUX_VGP5,
+        TEGRA_MUX_VGP6,
         TEGRA_MUX_SAFE,
         TEGRA_MAX_MUX,
 };
@@ -105,6 +144,11 @@ enum tegra_tristate {
         TEGRA_TRI_TRISTATE = 1,
 };
 
+enum tegra_pin_io {
+        TEGRA_PIN_OUTPUT = 0,
+        TEGRA_PIN_INPUT = 1,
+};
+
 enum tegra_vddio {
         TEGRA_VDDIO_BB = 0,
         TEGRA_VDDIO_LCD,
@@ -115,10 +159,16 @@ enum tegra_vddio {
         TEGRA_VDDIO_SYS,
         TEGRA_VDDIO_AUDIO,
         TEGRA_VDDIO_SD,
+        TEGRA_VDDIO_CAM,
+        TEGRA_VDDIO_GMI,
+        TEGRA_VDDIO_PEXCTL,
+        TEGRA_VDDIO_SDMMC1,
+        TEGRA_VDDIO_SDMMC3,
+        TEGRA_VDDIO_SDMMC4,
 };
 
 struct tegra_pingroup_config {
-        enum tegra_pingroup     pingroup;
+        int pingroup;
         enum tegra_mux_func     func;
         enum tegra_pullupdown   pupd;
         enum tegra_tristate     tristate;
@@ -187,7 +237,7 @@ enum tegra_schmitt {
 };
 
 struct tegra_drive_pingroup_config {
-        enum tegra_drive_pingroup pingroup;
+        int pingroup;
         enum tegra_hsm hsm;
         enum tegra_schmitt schmitt;
         enum tegra_drive drive;
@@ -208,6 +258,7 @@ struct tegra_pingroup_desc {
         int funcs[4];
         int func_safe;
         int vddio;
+        enum tegra_pin_io io_default;
         s16 tri_bank;   /* Register bank the tri_reg exists within */
         s16 mux_bank;   /* Register bank the mux_reg exists within */
         s16 pupd_bank;  /* Register bank the pupd_reg exists within */
@@ -217,15 +268,23 @@ struct tegra_pingroup_desc {
         s8 tri_bit;     /* offset into the TRISTATE_REG_* register bit */
         s8 mux_bit;     /* offset into the PIN_MUX_CTL_* register bit */
         s8 pupd_bit;    /* offset into the PULL_UPDOWN_REG_* register bit */
+        s8 lock_bit;    /* offset of the LOCK bit into mux register bit */
+        s8 od_bit;      /* offset of the OD bit into mux register bit */
+        s8 ioreset_bit; /* offset of the IO_RESET bit into mux register bit */
 };
 
-extern const struct tegra_pingroup_desc tegra_soc_pingroups[];
-extern const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[];
+typedef void (*pinmux_init) (const struct tegra_pingroup_desc **pg,
+        int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,
+        int *pgdrive_max);
 
-int tegra_pinmux_set_tristate(enum tegra_pingroup pg,
-        enum tegra_tristate tristate);
-int tegra_pinmux_set_pullupdown(enum tegra_pingroup pg,
-        enum tegra_pullupdown pupd);
+void tegra20_pinmux_init(const struct tegra_pingroup_desc **pg, int *pg_max,
+        const struct tegra_drive_pingroup_desc **pgdrive, int *pgdrive_max);
+
+void tegra30_pinmux_init(const struct tegra_pingroup_desc **pg, int *pg_max,
+        const struct tegra_drive_pingroup_desc **pgdrive, int *pgdrive_max);
+
+int tegra_pinmux_set_tristate(int pg, enum tegra_tristate tristate);
+int tegra_pinmux_set_pullupdown(int pg, enum tegra_pullupdown pupd);
 
 void tegra_pinmux_config_table(const struct tegra_pingroup_config *config,
         int len);
@@ -241,4 +300,3 @@ void tegra_pinmux_config_tristate_table(const struct tegra_pingroup_config *conf
 void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *config,
         int len, enum tegra_pullupdown pupd);
 #endif
-
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
index 4956c3cea731..4e1afcd54fae 100644
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/of.h>
 
 #include <asm/hardware/gic.h>
 
@@ -28,10 +29,6 @@
 
 #include "board.h"
 
-#define INT_SYS_NR      (INT_GPIO_BASE - INT_PRI_BASE)
-#define INT_SYS_SZ      (INT_SEC_BASE - INT_PRI_BASE)
-#define PPI_NR          ((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ)
-
 #define ICTLR_CPU_IEP_VFIQ      0x08
 #define ICTLR_CPU_IEP_FIR       0x14
 #define ICTLR_CPU_IEP_FIR_SET   0x18
@@ -129,6 +126,11 @@ void __init tegra_init_irq(void)
         gic_arch_extn.irq_unmask = tegra_unmask;
         gic_arch_extn.irq_retrigger = tegra_retrigger;
 
-        gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE),
-                 IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
+        /*
+         * Check if there is a devicetree present, since the GIC will be
+         * initialized elsewhere under DT.
+         */
+        if (!of_have_populated_dt())
+                gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE),
+                        IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
 }
diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
index 97ef3e55dfdf..ec63c6b2b6b5 100644
--- a/arch/arm/mach-tegra/pcie.c
+++ b/arch/arm/mach-tegra/pcie.c
@@ -37,7 +37,6 @@
 #include <asm/sizes.h>
 #include <asm/mach/pci.h>
 
-#include <mach/pinmux.h>
 #include <mach/iomap.h>
 #include <mach/clk.h>
 #include <mach/powergate.h>
diff --git a/arch/arm/mach-tegra/pinmux-t2-tables.c b/arch/arm/mach-tegra/pinmux-tegra20-tables.c
index a0dc2bc28ed3..734add1280b7 100644
--- a/arch/arm/mach-tegra/pinmux-t2-tables.c
+++ b/arch/arm/mach-tegra/pinmux-tegra20-tables.c
@@ -1,7 +1,7 @@
 /*
- * linux/arch/arm/mach-tegra/pinmux-t2-tables.c
+ * linux/arch/arm/mach-tegra/pinmux-tegra20-tables.c
  *
- * Common pinmux configurations for Tegra 2 SoCs
+ * Common pinmux configurations for Tegra20 SoCs
  *
  * Copyright (C) 2010 NVIDIA Corporation
  *
@@ -29,6 +29,7 @@
 
 #include <mach/iomap.h>
 #include <mach/pinmux.h>
+#include <mach/pinmux-tegra20.h>
 #include <mach/suspend.h>
 
 #define TRISTATE_REG_A          0x14
@@ -43,7 +44,7 @@
                 .reg = ((r) - PINGROUP_REG_A)                   \
         }
 
-const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE_PINGROUP] = {
+static const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE_PINGROUP] = {
         DRIVE_PINGROUP(AO1,             0x868),
         DRIVE_PINGROUP(AO2,             0x86c),
         DRIVE_PINGROUP(AT1,             0x870),
@@ -105,9 +106,13 @@ const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE
                 .pupd_bank = 2,                         \
                 .pupd_reg = ((pupd_r) - PULLUPDOWN_REG_A),      \
                 .pupd_bit = pupd_b,                             \
+                .lock_bit = -1,                                 \
+                .od_bit = -1,                                   \
+                .ioreset_bit = -1,                              \
+                .io_default = -1,                               \
         }
 
-const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {
+static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {
         PINGROUP(ATA,   NAND,  IDE,       NAND,      GMI,       RSVD,          IDE,       0x14, 0,  0x80, 24, 0xA0, 0),
         PINGROUP(ATB,   NAND,  IDE,       NAND,      GMI,       SDIO4,         IDE,       0x14, 1,  0x80, 16, 0xA0, 2),
         PINGROUP(ATC,   NAND,  IDE,       NAND,      GMI,       SDIO4,         IDE,       0x14, 2,  0x80, 22, 0xA0, 4),
@@ -226,3 +231,14 @@ const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {
         PINGROUP(XM2C,  DDR,   RSVD,      RSVD,      RSVD,      RSVD,          RSVD,      -1,   -1, -1,   -1, 0xA8, 30),
         PINGROUP(XM2D,  DDR,   RSVD,      RSVD,      RSVD,      RSVD,          RSVD,      -1,   -1, -1,   -1, 0xA8, 28),
 };
+
+void __devinit tegra20_pinmux_init(const struct tegra_pingroup_desc **pg,
+                int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,
+                int *pgdrive_max)
+{
+        *pg = tegra_soc_pingroups;
+        *pg_max = TEGRA_MAX_PINGROUP;
+        *pgdrive = tegra_soc_drive_pingroups;
+        *pgdrive_max = TEGRA_MAX_DRIVE_PINGROUP;
+}
+
diff --git a/arch/arm/mach-tegra/pinmux-tegra30-tables.c b/arch/arm/mach-tegra/pinmux-tegra30-tables.c
new file mode 100644
index 000000000000..14fc0e4c1c44
--- /dev/null
+++ b/arch/arm/mach-tegra/pinmux-tegra30-tables.c
@@ -0,0 +1,376 @@
+/*
+ * linux/arch/arm/mach-tegra/pinmux-tegra30-tables.c
+ *
+ * Common pinmux configurations for Tegra30 SoCs
+ *
+ * Copyright (C) 2010,2011 NVIDIA Corporation
+ *
+ * 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.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/string.h>
+
+#include <mach/iomap.h>
+#include <mach/pinmux.h>
+#include <mach/pinmux-tegra30.h>
+#include <mach/suspend.h>
+
+#define PINGROUP_REG_A  0x868
+#define MUXCTL_REG_A    0x3000
+
+#define DRIVE_PINGROUP(pg_name, r)              \
+        [TEGRA_DRIVE_PINGROUP_ ## pg_name] = {  \
+                .name = #pg_name,               \
+                .reg_bank = 0,                  \
+                .reg = ((r) - PINGROUP_REG_A)   \
+        }
+
+static const struct tegra_drive_pingroup_desc tegra_soc_drive_pingroups[TEGRA_MAX_DRIVE_PINGROUP] = {
+        DRIVE_PINGROUP(AO1,             0x868),
+        DRIVE_PINGROUP(AO2,             0x86c),
+        DRIVE_PINGROUP(AT1,             0x870),
+        DRIVE_PINGROUP(AT2,             0x874),
+        DRIVE_PINGROUP(AT3,             0x878),
+        DRIVE_PINGROUP(AT4,             0x87c),
+        DRIVE_PINGROUP(AT5,             0x880),
+        DRIVE_PINGROUP(CDEV1,           0x884),
+        DRIVE_PINGROUP(CDEV2,           0x888),
+        DRIVE_PINGROUP(CSUS,            0x88c),
+        DRIVE_PINGROUP(DAP1,            0x890),
+        DRIVE_PINGROUP(DAP2,            0x894),
+        DRIVE_PINGROUP(DAP3,            0x898),
+        DRIVE_PINGROUP(DAP4,            0x89c),
+        DRIVE_PINGROUP(DBG,             0x8a0),
+        DRIVE_PINGROUP(LCD1,            0x8a4),
+        DRIVE_PINGROUP(LCD2,            0x8a8),
+        DRIVE_PINGROUP(SDIO2,           0x8ac),
+        DRIVE_PINGROUP(SDIO3,           0x8b0),
+        DRIVE_PINGROUP(SPI,             0x8b4),
+        DRIVE_PINGROUP(UAA,             0x8b8),
+        DRIVE_PINGROUP(UAB,             0x8bc),
+        DRIVE_PINGROUP(UART2,           0x8c0),
+        DRIVE_PINGROUP(UART3,           0x8c4),
+        DRIVE_PINGROUP(VI1,             0x8c8),
+        DRIVE_PINGROUP(SDIO1,           0x8ec),
+        DRIVE_PINGROUP(CRT,             0x8f8),
+        DRIVE_PINGROUP(DDC,             0x8fc),
+        DRIVE_PINGROUP(GMA,             0x900),
+        DRIVE_PINGROUP(GMB,             0x904),
+        DRIVE_PINGROUP(GMC,             0x908),
+        DRIVE_PINGROUP(GMD,             0x90c),
+        DRIVE_PINGROUP(GME,             0x910),
+        DRIVE_PINGROUP(GMF,             0x914),
+        DRIVE_PINGROUP(GMG,             0x918),
+        DRIVE_PINGROUP(GMH,             0x91c),
+        DRIVE_PINGROUP(OWR,             0x920),
+        DRIVE_PINGROUP(UAD,             0x924),
+        DRIVE_PINGROUP(GPV,             0x928),
+        DRIVE_PINGROUP(DEV3,            0x92c),
+        DRIVE_PINGROUP(CEC,             0x938),
+};
+
+#define PINGROUP(pg_name, vdd, f0, f1, f2, f3, fs, iod, reg)    \
+        [TEGRA_PINGROUP_ ## pg_name] = {                        \
+                .name = #pg_name,                               \
+                .vddio = TEGRA_VDDIO_ ## vdd,                   \
+                .funcs = {                                      \
+                        TEGRA_MUX_ ## f0,                       \
+                        TEGRA_MUX_ ## f1,                       \
+                        TEGRA_MUX_ ## f2,                       \
+                        TEGRA_MUX_ ## f3,                       \
+                },                                              \
+                .func_safe = TEGRA_MUX_ ## fs,                  \
+                .tri_bank = 1,                                  \
+                .tri_reg = ((reg) - MUXCTL_REG_A),              \
+                .tri_bit = 4,                                   \
+                .mux_bank = 1,                                  \
+                .mux_reg = ((reg) - MUXCTL_REG_A),              \
+                .mux_bit = 0,                                   \
+                .pupd_bank = 1,                                 \
+                .pupd_reg = ((reg) - MUXCTL_REG_A),             \
+                .pupd_bit = 2,                                  \
+                .io_default = TEGRA_PIN_ ## iod,                \
+                .od_bit = 6,                                    \
+                .lock_bit = 7,                                  \
+                .ioreset_bit = 8,                               \
+        }
+
+static const struct tegra_pingroup_desc tegra_soc_pingroups[TEGRA_MAX_PINGROUP] = {
+        /*       NAME             VDD       f0          f1          f2          f3          fSafe       io      reg */
+        PINGROUP(ULPI_DATA0,      BB,       SPI3,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x3000),
+        PINGROUP(ULPI_DATA1,      BB,       SPI3,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x3004),
+        PINGROUP(ULPI_DATA2,      BB,       SPI3,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x3008),
+        PINGROUP(ULPI_DATA3,      BB,       SPI3,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x300c),
+        PINGROUP(ULPI_DATA4,      BB,       SPI2,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x3010),
+        PINGROUP(ULPI_DATA5,      BB,       SPI2,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x3014),
+        PINGROUP(ULPI_DATA6,      BB,       SPI2,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x3018),
+        PINGROUP(ULPI_DATA7,      BB,       SPI2,       HSI,        UARTA,      ULPI,       RSVD,       INPUT,  0x301c),
+        PINGROUP(ULPI_CLK,        BB,       SPI1,       RSVD,       UARTD,      ULPI,       RSVD,       INPUT,  0x3020),
+        PINGROUP(ULPI_DIR,        BB,       SPI1,       RSVD,       UARTD,      ULPI,       RSVD,       INPUT,  0x3024),
+        PINGROUP(ULPI_NXT,        BB,       SPI1,       RSVD,       UARTD,      ULPI,       RSVD,       INPUT,  0x3028),
+        PINGROUP(ULPI_STP,        BB,       SPI1,       RSVD,       UARTD,      ULPI,       RSVD,       INPUT,  0x302c),
+        PINGROUP(DAP3_FS,         BB,       I2S2,       RSVD1,      DISPLAYA,   DISPLAYB,   RSVD,       INPUT,  0x3030),
+        PINGROUP(DAP3_DIN,        BB,       I2S2,       RSVD1,      DISPLAYA,   DISPLAYB,   RSVD,       INPUT,  0x3034),
+        PINGROUP(DAP3_DOUT,       BB,       I2S2,       RSVD1,      DISPLAYA,   DISPLAYB,   RSVD,       INPUT,  0x3038),
+        PINGROUP(DAP3_SCLK,       BB,       I2S2,       RSVD1,      DISPLAYA,   DISPLAYB,   RSVD,       INPUT,  0x303c),
+        PINGROUP(GPIO_PV0,        BB,       RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3040),
+        PINGROUP(GPIO_PV1,        BB,       RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3044),
+        PINGROUP(SDMMC1_CLK,      SDMMC1,   SDIO1,      RSVD1,      RSVD2,      INVALID,    RSVD,       INPUT,  0x3048),
+        PINGROUP(SDMMC1_CMD,      SDMMC1,   SDIO1,      RSVD1,      RSVD2,      INVALID,    RSVD,       INPUT,  0x304c),
+        PINGROUP(SDMMC1_DAT3,     SDMMC1,   SDIO1,      RSVD1,      UARTE,      INVALID,    RSVD,       INPUT,  0x3050),
+        PINGROUP(SDMMC1_DAT2,     SDMMC1,   SDIO1,      RSVD1,      UARTE,      INVALID,    RSVD,       INPUT,  0x3054),
+        PINGROUP(SDMMC1_DAT1,     SDMMC1,   SDIO1,      RSVD1,      UARTE,      INVALID,    RSVD,       INPUT,  0x3058),
+        PINGROUP(SDMMC1_DAT0,     SDMMC1,   SDIO1,      RSVD1,      UARTE,      INVALID,    RSVD,       INPUT,  0x305c),
+        PINGROUP(GPIO_PV2,        SDMMC1,   OWR,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3060),
+        PINGROUP(GPIO_PV3,        SDMMC1,   INVALID,    RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3064),
+        PINGROUP(CLK2_OUT,        SDMMC1,   EXTPERIPH2, RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3068),
+        PINGROUP(CLK2_REQ,        SDMMC1,   DAP,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x306c),
+        PINGROUP(LCD_PWR1,        LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x3070),
+        PINGROUP(LCD_PWR2,        LCD,      DISPLAYA,   DISPLAYB,   SPI5,       INVALID,    RSVD,       OUTPUT, 0x3074),
+        PINGROUP(LCD_SDIN,        LCD,      DISPLAYA,   DISPLAYB,   SPI5,       RSVD,       RSVD,       OUTPUT, 0x3078),
+        PINGROUP(LCD_SDOUT,       LCD,      DISPLAYA,   DISPLAYB,   SPI5,       INVALID,    RSVD,       OUTPUT, 0x307c),
+        PINGROUP(LCD_WR_N,        LCD,      DISPLAYA,   DISPLAYB,   SPI5,       INVALID,    RSVD,       OUTPUT, 0x3080),
+        PINGROUP(LCD_CS0_N,       LCD,      DISPLAYA,   DISPLAYB,   SPI5,       RSVD,       RSVD,       OUTPUT, 0x3084),
+        PINGROUP(LCD_DC0,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x3088),
+        PINGROUP(LCD_SCK,         LCD,      DISPLAYA,   DISPLAYB,   SPI5,       INVALID,    RSVD,       OUTPUT, 0x308c),
+        PINGROUP(LCD_PWR0,        LCD,      DISPLAYA,   DISPLAYB,   SPI5,       INVALID,    RSVD,       OUTPUT, 0x3090),
+        PINGROUP(LCD_PCLK,        LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x3094),
+        PINGROUP(LCD_DE,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x3098),
+        PINGROUP(LCD_HSYNC,       LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x309c),
+        PINGROUP(LCD_VSYNC,       LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30a0),
+        PINGROUP(LCD_D0,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30a4),
+        PINGROUP(LCD_D1,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30a8),
+        PINGROUP(LCD_D2,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30ac),
+        PINGROUP(LCD_D3,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30b0),
+        PINGROUP(LCD_D4,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30b4),
+        PINGROUP(LCD_D5,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30b8),
+        PINGROUP(LCD_D6,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30bc),
+        PINGROUP(LCD_D7,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30c0),
+        PINGROUP(LCD_D8,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30c4),
+        PINGROUP(LCD_D9,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30c8),
+        PINGROUP(LCD_D10,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30cc),
+        PINGROUP(LCD_D11,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30d0),
+        PINGROUP(LCD_D12,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30d4),
+        PINGROUP(LCD_D13,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30d8),
+        PINGROUP(LCD_D14,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30dc),
+        PINGROUP(LCD_D15,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30e0),
+        PINGROUP(LCD_D16,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30e4),
+        PINGROUP(LCD_D17,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30e8),
+        PINGROUP(LCD_D18,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30ec),
+        PINGROUP(LCD_D19,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30f0),
+        PINGROUP(LCD_D20,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30f4),
+        PINGROUP(LCD_D21,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30f8),
+        PINGROUP(LCD_D22,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x30fc),
+        PINGROUP(LCD_D23,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x3100),
+        PINGROUP(LCD_CS1_N,       LCD,      DISPLAYA,   DISPLAYB,   SPI5,       RSVD2,      RSVD,       OUTPUT, 0x3104),
+        PINGROUP(LCD_M1,          LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x3108),
+        PINGROUP(LCD_DC1,         LCD,      DISPLAYA,   DISPLAYB,   RSVD1,      RSVD2,      RSVD,       OUTPUT, 0x310c),
+        PINGROUP(HDMI_INT,        LCD,      RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3110),
+        PINGROUP(DDC_SCL,         LCD,      I2C4,       RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3114),
+        PINGROUP(DDC_SDA,         LCD,      I2C4,       RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3118),
+        PINGROUP(CRT_HSYNC,       LCD,      CRT,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x311c),
+        PINGROUP(CRT_VSYNC,       LCD,      CRT,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3120),
+        PINGROUP(VI_D0,           VI,       INVALID,    RSVD1,      VI,         RSVD2,      RSVD,       INPUT,  0x3124),
+        PINGROUP(VI_D1,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3128),
+        PINGROUP(VI_D2,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x312c),
+        PINGROUP(VI_D3,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3130),
+        PINGROUP(VI_D4,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3134),
+        PINGROUP(VI_D5,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3138),
+        PINGROUP(VI_D6,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x313c),
+        PINGROUP(VI_D7,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3140),
+        PINGROUP(VI_D8,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3144),
+        PINGROUP(VI_D9,           VI,       INVALID,    SDIO2,      VI,         RSVD1,      RSVD,       INPUT,  0x3148),
+        PINGROUP(VI_D10,          VI,       INVALID,    RSVD1,      VI,         RSVD2,      RSVD,       INPUT,  0x314c),
+        PINGROUP(VI_D11,          VI,       INVALID,    RSVD1,      VI,         RSVD2,      RSVD,       INPUT,  0x3150),
+        PINGROUP(VI_PCLK,         VI,       RSVD1,      SDIO2,      VI,         RSVD2,      RSVD,       INPUT,  0x3154),
+        PINGROUP(VI_MCLK,         VI,       VI,         INVALID,    INVALID,    INVALID,    RSVD,       INPUT,  0x3158),
+        PINGROUP(VI_VSYNC,        VI,       INVALID,    RSVD1,      VI,         RSVD2,      RSVD,       INPUT,  0x315c),
+        PINGROUP(VI_HSYNC,        VI,       INVALID,    RSVD1,      VI,         RSVD2,      RSVD,       INPUT,  0x3160),
+        PINGROUP(UART2_RXD,       UART,     IRDA,       SPDIF,      UARTA,      SPI4,       RSVD,       INPUT,  0x3164),
+        PINGROUP(UART2_TXD,       UART,     IRDA,       SPDIF,      UARTA,      SPI4,       RSVD,       INPUT,  0x3168),
+        PINGROUP(UART2_RTS_N,     UART,     UARTA,      UARTB,      GMI,        SPI4,       RSVD,       INPUT,  0x316c),
+        PINGROUP(UART2_CTS_N,     UART,     UARTA,      UARTB,      GMI,        SPI4,       RSVD,       INPUT,  0x3170),
+        PINGROUP(UART3_TXD,       UART,     UARTC,      RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x3174),
+        PINGROUP(UART3_RXD,       UART,     UARTC,      RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x3178),
+        PINGROUP(UART3_CTS_N,     UART,     UARTC,      RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x317c),
+        PINGROUP(UART3_RTS_N,     UART,     UARTC,      PWM0,       GMI,        RSVD2,      RSVD,       INPUT,  0x3180),
+        PINGROUP(GPIO_PU0,        UART,     OWR,        UARTA,      GMI,        RSVD1,      RSVD,       INPUT,  0x3184),
+        PINGROUP(GPIO_PU1,        UART,     RSVD1,      UARTA,      GMI,        RSVD2,      RSVD,       INPUT,  0x3188),
+        PINGROUP(GPIO_PU2,        UART,     RSVD1,      UARTA,      GMI,        RSVD2,      RSVD,       INPUT,  0x318c),
+        PINGROUP(GPIO_PU3,        UART,     PWM0,       UARTA,      GMI,        RSVD1,      RSVD,       INPUT,  0x3190),
+        PINGROUP(GPIO_PU4,        UART,     PWM1,       UARTA,      GMI,        RSVD1,      RSVD,       INPUT,  0x3194),
+        PINGROUP(GPIO_PU5,        UART,     PWM2,       UARTA,      GMI,        RSVD1,      RSVD,       INPUT,  0x3198),
+        PINGROUP(GPIO_PU6,        UART,     PWM3,       UARTA,      GMI,        RSVD1,      RSVD,       INPUT,  0x319c),
+        PINGROUP(GEN1_I2C_SDA,    UART,     I2C,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x31a0),
+        PINGROUP(GEN1_I2C_SCL,    UART,     I2C,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x31a4),
+        PINGROUP(DAP4_FS,         UART,     I2S3,       RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x31a8),
+        PINGROUP(DAP4_DIN,        UART,     I2S3,       RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x31ac),
+        PINGROUP(DAP4_DOUT,       UART,     I2S3,       RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x31b0),
+        PINGROUP(DAP4_SCLK,       UART,     I2S3,       RSVD1,      GMI,        RSVD2,      RSVD,       INPUT,  0x31b4),
+        PINGROUP(CLK3_OUT,        UART,     EXTPERIPH3, RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x31b8),
+        PINGROUP(CLK3_REQ,        UART,     DEV3,       RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x31bc),
+        PINGROUP(GMI_WP_N,        GMI,      RSVD1,      NAND,       GMI,        GMI_ALT,    RSVD,       INPUT,  0x31c0),
+        PINGROUP(GMI_IORDY,       GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31c4),
+        PINGROUP(GMI_WAIT,        GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31c8),
+        PINGROUP(GMI_ADV_N,       GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31cc),
+        PINGROUP(GMI_CLK,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31d0),
+        PINGROUP(GMI_CS0_N,       GMI,      RSVD1,      NAND,       GMI,        INVALID,    RSVD,       INPUT,  0x31d4),
+        PINGROUP(GMI_CS1_N,       GMI,      RSVD1,      NAND,       GMI,        DTV,        RSVD,       INPUT,  0x31d8),
+        PINGROUP(GMI_CS2_N,       GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31dc),
+        PINGROUP(GMI_CS3_N,       GMI,      RSVD1,      NAND,       GMI,        GMI_ALT,    RSVD,       INPUT,  0x31e0),
+        PINGROUP(GMI_CS4_N,       GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31e4),
+        PINGROUP(GMI_CS6_N,       GMI,      NAND,       NAND_ALT,   GMI,        SATA,       RSVD,       INPUT,  0x31e8),
+        PINGROUP(GMI_CS7_N,       GMI,      NAND,       NAND_ALT,   GMI,        GMI_ALT,    RSVD,       INPUT,  0x31ec),
+        PINGROUP(GMI_AD0,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31f0),
+        PINGROUP(GMI_AD1,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31f4),
+        PINGROUP(GMI_AD2,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31f8),
+        PINGROUP(GMI_AD3,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x31fc),
+        PINGROUP(GMI_AD4,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3200),
+        PINGROUP(GMI_AD5,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3204),
+        PINGROUP(GMI_AD6,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3208),
+        PINGROUP(GMI_AD7,         GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x320c),
+        PINGROUP(GMI_AD8,         GMI,      PWM0,       NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3210),
+        PINGROUP(GMI_AD9,         GMI,      PWM1,       NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3214),
+        PINGROUP(GMI_AD10,        GMI,      PWM2,       NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3218),
+        PINGROUP(GMI_AD11,        GMI,      PWM3,       NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x321c),
+        PINGROUP(GMI_AD12,        GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3220),
+        PINGROUP(GMI_AD13,        GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3224),
+        PINGROUP(GMI_AD14,        GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x3228),
+        PINGROUP(GMI_AD15,        GMI,      RSVD1,      NAND,       GMI,        RSVD2,      RSVD,       INPUT,  0x322c),
+        PINGROUP(GMI_A16,         GMI,      UARTD,      SPI4,       GMI,        GMI_ALT,    RSVD,       INPUT,  0x3230),
+        PINGROUP(GMI_A17,         GMI,      UARTD,      SPI4,       GMI,        INVALID,    RSVD,       INPUT,  0x3234),
+        PINGROUP(GMI_A18,         GMI,      UARTD,      SPI4,       GMI,        INVALID,    RSVD,       INPUT,  0x3238),
+        PINGROUP(GMI_A19,         GMI,      UARTD,      SPI4,       GMI,        RSVD3,      RSVD,       INPUT,  0x323c),
+        PINGROUP(GMI_WR_N,        GMI,      RSVD1,      NAND,       GMI,        RSVD3,      RSVD,       INPUT,  0x3240),
+        PINGROUP(GMI_OE_N,        GMI,      RSVD1,      NAND,       GMI,        RSVD3,      RSVD,       INPUT,  0x3244),
+        PINGROUP(GMI_DQS,         GMI,      RSVD1,      NAND,       GMI,        RSVD3,      RSVD,       INPUT,  0x3248),
+        PINGROUP(GMI_RST_N,       GMI,      NAND,       NAND_ALT,   GMI,        RSVD3,      RSVD,       INPUT,  0x324c),
+        PINGROUP(GEN2_I2C_SCL,    GMI,      I2C2,       INVALID,    GMI,        RSVD3,      RSVD,       INPUT,  0x3250),
+        PINGROUP(GEN2_I2C_SDA,    GMI,      I2C2,       INVALID,    GMI,        RSVD3,      RSVD,       INPUT,  0x3254),
+        PINGROUP(SDMMC4_CLK,      SDMMC4,   INVALID,    NAND,       GMI,        SDIO4,      RSVD,       INPUT,  0x3258),
+        PINGROUP(SDMMC4_CMD,      SDMMC4,   I2C3,       NAND,       GMI,        SDIO4,      RSVD,       INPUT,  0x325c),
+        PINGROUP(SDMMC4_DAT0,     SDMMC4,   UARTE,      SPI3,       GMI,        SDIO4,      RSVD,       INPUT,  0x3260),
+        PINGROUP(SDMMC4_DAT1,     SDMMC4,   UARTE,      SPI3,       GMI,        SDIO4,      RSVD,       INPUT,  0x3264),
+        PINGROUP(SDMMC4_DAT2,     SDMMC4,   UARTE,      SPI3,       GMI,        SDIO4,      RSVD,       INPUT,  0x3268),
+        PINGROUP(SDMMC4_DAT3,     SDMMC4,   UARTE,      SPI3,       GMI,        SDIO4,      RSVD,       INPUT,  0x326c),
+        PINGROUP(SDMMC4_DAT4,     SDMMC4,   I2C3,       I2S4,       GMI,        SDIO4,      RSVD,       INPUT,  0x3270),
+        PINGROUP(SDMMC4_DAT5,     SDMMC4,   VGP3,       I2S4,       GMI,        SDIO4,      RSVD,       INPUT,  0x3274),
+        PINGROUP(SDMMC4_DAT6,     SDMMC4,   VGP4,       I2S4,       GMI,        SDIO4,      RSVD,       INPUT,  0x3278),
+        PINGROUP(SDMMC4_DAT7,     SDMMC4,   VGP5,       I2S4,       GMI,        SDIO4,      RSVD,       INPUT,  0x327c),
+        PINGROUP(SDMMC4_RST_N,    SDMMC4,   VGP6,       RSVD1,      RSVD2,      POPSDMMC4,  RSVD,       INPUT,  0x3280),
+        PINGROUP(CAM_MCLK,        CAM,      VI,         INVALID,    VI_ALT2,    POPSDMMC4,  RSVD,       INPUT,  0x3284),
+        PINGROUP(GPIO_PCC1,       CAM,      I2S4,       RSVD1,      RSVD2,      POPSDMMC4,  RSVD,       INPUT,  0x3288),
+        PINGROUP(GPIO_PBB0,       CAM,      I2S4,       RSVD1,      RSVD2,      POPSDMMC4,  RSVD,       INPUT,  0x328c),
+        PINGROUP(CAM_I2C_SCL,     CAM,      INVALID,    I2C3,       RSVD2,      POPSDMMC4,  RSVD,       INPUT,  0x3290),
+        PINGROUP(CAM_I2C_SDA,     CAM,      INVALID,    I2C3,       RSVD2,      POPSDMMC4,  RSVD,       INPUT,  0x3294),
+        PINGROUP(GPIO_PBB3,       CAM,      VGP3,       DISPLAYA,   DISPLAYB,   POPSDMMC4,  RSVD,       INPUT,  0x3298),
+        PINGROUP(GPIO_PBB4,       CAM,      VGP4,       DISPLAYA,   DISPLAYB,   POPSDMMC4,  RSVD,       INPUT,  0x329c),
+        PINGROUP(GPIO_PBB5,       CAM,      VGP5,       DISPLAYA,   DISPLAYB,   POPSDMMC4,  RSVD,       INPUT,  0x32a0),
+        PINGROUP(GPIO_PBB6,       CAM,      VGP6,       DISPLAYA,   DISPLAYB,   POPSDMMC4,  RSVD,       INPUT,  0x32a4),
+        PINGROUP(GPIO_PBB7,       CAM,      I2S4,       RSVD1,      RSVD2,      POPSDMMC4,  RSVD,       INPUT,  0x32a8),
+        PINGROUP(GPIO_PCC2,       CAM,      I2S4,       RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x32ac),
+        PINGROUP(JTAG_RTCK,       SYS,      RTCK,       RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x32b0),
+        PINGROUP(PWR_I2C_SCL,     SYS,      I2CPWR,     RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x32b4),
+        PINGROUP(PWR_I2C_SDA,     SYS,      I2CPWR,     RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x32b8),
+        PINGROUP(KB_ROW0,         SYS,      KBC,        INVALID,    RSVD2,      RSVD3,      RSVD,       INPUT,  0x32bc),
+        PINGROUP(KB_ROW1,         SYS,      KBC,        INVALID,    RSVD2,      RSVD3,      RSVD,       INPUT,  0x32c0),
+        PINGROUP(KB_ROW2,         SYS,      KBC,        INVALID,    RSVD2,      RSVD3,      RSVD,       INPUT,  0x32c4),
+        PINGROUP(KB_ROW3,         SYS,      KBC,        INVALID,    RSVD2,      INVALID,    RSVD,       INPUT,  0x32c8),
+        PINGROUP(KB_ROW4,         SYS,      KBC,        INVALID,    TRACE,      RSVD3,      RSVD,       INPUT,  0x32cc),
+        PINGROUP(KB_ROW5,         SYS,      KBC,        INVALID,    TRACE,      OWR,        RSVD,       INPUT,  0x32d0),
+        PINGROUP(KB_ROW6,         SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32d4),
+        PINGROUP(KB_ROW7,         SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32d8),
+        PINGROUP(KB_ROW8,         SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32dc),
+        PINGROUP(KB_ROW9,         SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32e0),
+        PINGROUP(KB_ROW10,        SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32e4),
+        PINGROUP(KB_ROW11,        SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32e8),
+        PINGROUP(KB_ROW12,        SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32ec),
+        PINGROUP(KB_ROW13,        SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32f0),
+        PINGROUP(KB_ROW14,        SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32f4),
+        PINGROUP(KB_ROW15,        SYS,      KBC,        INVALID,    SDIO2,      INVALID,    RSVD,       INPUT,  0x32f8),
+        PINGROUP(KB_COL0,         SYS,      KBC,        INVALID,    TRACE,      INVALID,    RSVD,       INPUT,  0x32fc),
+        PINGROUP(KB_COL1,         SYS,      KBC,        INVALID,    TRACE,      INVALID,    RSVD,       INPUT,  0x3300),
+        PINGROUP(KB_COL2,         SYS,      KBC,        INVALID,    TRACE,      RSVD,       RSVD,       INPUT,  0x3304),
+        PINGROUP(KB_COL3,         SYS,      KBC,        INVALID,    TRACE,      RSVD,       RSVD,       INPUT,  0x3308),
+        PINGROUP(KB_COL4,         SYS,      KBC,        INVALID,    TRACE,      RSVD,       RSVD,       INPUT,  0x330c),
+        PINGROUP(KB_COL5,         SYS,      KBC,        INVALID,    TRACE,      RSVD,       RSVD,       INPUT,  0x3310),
+        PINGROUP(KB_COL6,         SYS,      KBC,        INVALID,    TRACE,      INVALID,    RSVD,       INPUT,  0x3314),
+        PINGROUP(KB_COL7,         SYS,      KBC,        INVALID,    TRACE,      INVALID,    RSVD,       INPUT,  0x3318),
+        PINGROUP(CLK_32K_OUT,     SYS,      BLINK,      RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x331c),
+        PINGROUP(SYS_CLK_REQ,     SYS,      SYSCLK,     RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x3320),
+        PINGROUP(CORE_PWR_REQ,    SYS,      RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3324),
+        PINGROUP(CPU_PWR_REQ,     SYS,      RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3328),
+        PINGROUP(PWR_INT_N,       SYS,      RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x332c),
+        PINGROUP(CLK_32K_IN,      SYS,      RSVD,       RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3330),
+        PINGROUP(OWR,             SYS,      OWR,        RSVD,       RSVD,       RSVD,       RSVD,       INPUT,  0x3334),
+        PINGROUP(DAP1_FS,         AUDIO,    I2S0,       HDA,        GMI,        SDIO2,      RSVD,       INPUT,  0x3338),
+        PINGROUP(DAP1_DIN,        AUDIO,    I2S0,       HDA,        GMI,        SDIO2,      RSVD,       INPUT,  0x333c),
+        PINGROUP(DAP1_DOUT,       AUDIO,    I2S0,       HDA,        GMI,        SDIO2,      RSVD,       INPUT,  0x3340),
+        PINGROUP(DAP1_SCLK,       AUDIO,    I2S0,       HDA,        GMI,        SDIO2,      RSVD,       INPUT,  0x3344),
+        PINGROUP(CLK1_REQ,        AUDIO,    DAP,        HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x3348),
+        PINGROUP(CLK1_OUT,        AUDIO,    EXTPERIPH1, RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x334c),
+        PINGROUP(SPDIF_IN,        AUDIO,    SPDIF,      HDA,        INVALID,    DAPSDMMC2,  RSVD,       INPUT,  0x3350),
+        PINGROUP(SPDIF_OUT,       AUDIO,    SPDIF,      RSVD1,      INVALID,    DAPSDMMC2,  RSVD,       INPUT,  0x3354),
+        PINGROUP(DAP2_FS,         AUDIO,    I2S1,       HDA,        RSVD2,      GMI,        RSVD,       INPUT,  0x3358),
+        PINGROUP(DAP2_DIN,        AUDIO,    I2S1,       HDA,        RSVD2,      GMI,        RSVD,       INPUT,  0x335c),
+        PINGROUP(DAP2_DOUT,       AUDIO,    I2S1,       HDA,        RSVD2,      GMI,        RSVD,       INPUT,  0x3360),
+        PINGROUP(DAP2_SCLK,       AUDIO,    I2S1,       HDA,        RSVD2,      GMI,        RSVD,       INPUT,  0x3364),
+        PINGROUP(SPI2_MOSI,       AUDIO,    SPI6,       SPI2,       INVALID,    GMI,        RSVD,       INPUT,  0x3368),
+        PINGROUP(SPI2_MISO,       AUDIO,    SPI6,       SPI2,       INVALID,    GMI,        RSVD,       INPUT,  0x336c),
+        PINGROUP(SPI2_CS0_N,      AUDIO,    SPI6,       SPI2,       INVALID,    GMI,        RSVD,       INPUT,  0x3370),
+        PINGROUP(SPI2_SCK,        AUDIO,    SPI6,       SPI2,       INVALID,    GMI,        RSVD,       INPUT,  0x3374),
+        PINGROUP(SPI1_MOSI,       AUDIO,    SPI2,       SPI1,       INVALID,    GMI,        RSVD,       INPUT,  0x3378),
+        PINGROUP(SPI1_SCK,        AUDIO,    SPI2,       SPI1,       INVALID,    GMI,        RSVD,       INPUT,  0x337c),
+        PINGROUP(SPI1_CS0_N,      AUDIO,    SPI2,       SPI1,       INVALID,    GMI,        RSVD,       INPUT,  0x3380),
+        PINGROUP(SPI1_MISO,       AUDIO,    INVALID,    SPI1,       INVALID,    RSVD3,      RSVD,       INPUT,  0x3384),
+        PINGROUP(SPI2_CS1_N,      AUDIO,    INVALID,    SPI2,       INVALID,    INVALID,    RSVD,       INPUT,  0x3388),
+        PINGROUP(SPI2_CS2_N,      AUDIO,    INVALID,    SPI2,       INVALID,    INVALID,    RSVD,       INPUT,  0x338c),
+        PINGROUP(SDMMC3_CLK,      SDMMC3,   UARTA,      PWM2,       SDIO3,      INVALID,    RSVD,       INPUT,  0x3390),
+        PINGROUP(SDMMC3_CMD,      SDMMC3,   UARTA,      PWM3,       SDIO3,      INVALID,    RSVD,       INPUT,  0x3394),
+        PINGROUP(SDMMC3_DAT0,     SDMMC3,   RSVD,       RSVD1,      SDIO3,      INVALID,    RSVD,       INPUT,  0x3398),
+        PINGROUP(SDMMC3_DAT1,     SDMMC3,   RSVD,       RSVD1,      SDIO3,      INVALID,    RSVD,       INPUT,  0x339c),
+        PINGROUP(SDMMC3_DAT2,     SDMMC3,   RSVD,       PWM1,       SDIO3,      INVALID,    RSVD,       INPUT,  0x33a0),
+        PINGROUP(SDMMC3_DAT3,     SDMMC3,   RSVD,       PWM0,       SDIO3,      INVALID,    RSVD,       INPUT,  0x33a4),
+        PINGROUP(SDMMC3_DAT4,     SDMMC3,   PWM1,       INVALID,    SDIO3,      INVALID,    RSVD,       INPUT,  0x33a8),
+        PINGROUP(SDMMC3_DAT5,     SDMMC3,   PWM0,       INVALID,    SDIO3,      INVALID,    RSVD,       INPUT,  0x33ac),
+        PINGROUP(SDMMC3_DAT6,     SDMMC3,   SPDIF,      INVALID,    SDIO3,      INVALID,    RSVD,       INPUT,  0x33b0),
+        PINGROUP(SDMMC3_DAT7,     SDMMC3,   SPDIF,      INVALID,    SDIO3,      INVALID,    RSVD,       INPUT,  0x33b4),
+        PINGROUP(PEX_L0_PRSNT_N,  PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33b8),
+        PINGROUP(PEX_L0_RST_N,    PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33bc),
+        PINGROUP(PEX_L0_CLKREQ_N, PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33c0),
+        PINGROUP(PEX_WAKE_N,      PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33c4),
+        PINGROUP(PEX_L1_PRSNT_N,  PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33c8),
+        PINGROUP(PEX_L1_RST_N,    PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33cc),
+        PINGROUP(PEX_L1_CLKREQ_N, PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33d0),
+        PINGROUP(PEX_L2_PRSNT_N,  PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33d4),
+        PINGROUP(PEX_L2_RST_N,    PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33d8),
+        PINGROUP(PEX_L2_CLKREQ_N, PEXCTL,   PCIE,       HDA,        RSVD2,      RSVD3,      RSVD,       INPUT,  0x33dc),
+        PINGROUP(HDMI_CEC,        SYS,      CEC,        RSVD1,      RSVD2,      RSVD3,      RSVD,       INPUT,  0x33e0),
+};
+
+void __devinit tegra30_pinmux_init(const struct tegra_pingroup_desc **pg,
+                int *pg_max, const struct tegra_drive_pingroup_desc **pgdrive,
+                int *pgdrive_max)
+{
+        *pg = tegra_soc_pingroups;
+        *pg_max = TEGRA_MAX_PINGROUP;
+        *pgdrive = tegra_soc_drive_pingroups;
+        *pgdrive_max = TEGRA_MAX_DRIVE_PINGROUP;
+}
+
diff --git a/arch/arm/mach-tegra/pinmux.c b/arch/arm/mach-tegra/pinmux.c
index 1d201650d7a4..ac35d2b76850 100644
--- a/arch/arm/mach-tegra/pinmux.c
+++ b/arch/arm/mach-tegra/pinmux.c
@@ -21,6 +21,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
+#include <linux/of_device.h>
 
 #include <mach/iomap.h>
 #include <mach/pinmux.h>
@@ -33,8 +34,10 @@
 #define SLWR(reg)       (((reg) >> 28) & 0x3)
 #define SLWF(reg)       (((reg) >> 30) & 0x3)
 
-static const struct tegra_pingroup_desc *const pingroups = tegra_soc_pingroups;
-static const struct tegra_drive_pingroup_desc *const drive_pingroups = tegra_soc_drive_pingroups;
+static const struct tegra_pingroup_desc *pingroups;
+static const struct tegra_drive_pingroup_desc *drive_pingroups;
+static int pingroup_max;
+static int drive_max;
 
 static char *tegra_mux_names[TEGRA_MAX_MUX] = {
         [TEGRA_MUX_AHB_CLK] = "AHB_CLK",
@@ -97,6 +100,49 @@ static char *tegra_mux_names[TEGRA_MAX_MUX] = {
         [TEGRA_MUX_VI] = "VI",
         [TEGRA_MUX_VI_SENSOR_CLK] = "VI_SENSOR_CLK",
         [TEGRA_MUX_XIO] = "XIO",
+        [TEGRA_MUX_BLINK] = "BLINK",
+        [TEGRA_MUX_CEC] = "CEC",
+        [TEGRA_MUX_CLK12] = "CLK12",
+        [TEGRA_MUX_DAP] = "DAP",
+        [TEGRA_MUX_DAPSDMMC2] = "DAPSDMMC2",
+        [TEGRA_MUX_DDR] = "DDR",
+        [TEGRA_MUX_DEV3] = "DEV3",
+        [TEGRA_MUX_DTV] = "DTV",
+        [TEGRA_MUX_VI_ALT1] = "VI_ALT1",
+        [TEGRA_MUX_VI_ALT2] = "VI_ALT2",
+        [TEGRA_MUX_VI_ALT3] = "VI_ALT3",
+        [TEGRA_MUX_EMC_DLL] = "EMC_DLL",
+        [TEGRA_MUX_EXTPERIPH1] = "EXTPERIPH1",
+        [TEGRA_MUX_EXTPERIPH2] = "EXTPERIPH2",
+        [TEGRA_MUX_EXTPERIPH3] = "EXTPERIPH3",
+        [TEGRA_MUX_GMI_ALT] = "GMI_ALT",
+        [TEGRA_MUX_HDA] = "HDA",
+        [TEGRA_MUX_HSI] = "HSI",
+        [TEGRA_MUX_I2C4] = "I2C4",
+        [TEGRA_MUX_I2C5] = "I2C5",
+        [TEGRA_MUX_I2CPWR] = "I2CPWR",
+        [TEGRA_MUX_I2S0] = "I2S0",
+        [TEGRA_MUX_I2S1] = "I2S1",
+        [TEGRA_MUX_I2S2] = "I2S2",
+        [TEGRA_MUX_I2S3] = "I2S3",
+        [TEGRA_MUX_I2S4] = "I2S4",
+        [TEGRA_MUX_NAND_ALT] = "NAND_ALT",
+        [TEGRA_MUX_POPSDIO4] = "POPSDIO4",
+        [TEGRA_MUX_POPSDMMC4] = "POPSDMMC4",
+        [TEGRA_MUX_PWM0] = "PWM0",
+        [TEGRA_MUX_PWM1] = "PWM2",
+        [TEGRA_MUX_PWM2] = "PWM2",
+        [TEGRA_MUX_PWM3] = "PWM3",
+        [TEGRA_MUX_SATA] = "SATA",
+        [TEGRA_MUX_SPI5] = "SPI5",
+        [TEGRA_MUX_SPI6] = "SPI6",
+        [TEGRA_MUX_SYSCLK] = "SYSCLK",
+        [TEGRA_MUX_VGP1] = "VGP1",
+        [TEGRA_MUX_VGP2] = "VGP2",
+        [TEGRA_MUX_VGP3] = "VGP3",
+        [TEGRA_MUX_VGP4] = "VGP4",
+        [TEGRA_MUX_VGP5] = "VGP5",
+        [TEGRA_MUX_VGP6] = "VGP6",
         [TEGRA_MUX_SAFE] = "<safe>",
 };
 
@@ -116,9 +162,9 @@ static const char *tegra_slew_names[TEGRA_MAX_SLEW] = {
 
 static DEFINE_SPINLOCK(mux_lock);
 
-static const char *pingroup_name(enum tegra_pingroup pg)
+static const char *pingroup_name(int pg)
 {
-        if (pg < 0 || pg >=  TEGRA_MAX_PINGROUP)
+        if (pg < 0 || pg >=  pingroup_max)
                 return "<UNKNOWN>";
 
         return pingroups[pg].name;
@@ -189,10 +235,10 @@ static int tegra_pinmux_set_func(const struct tegra_pingroup_config *config)
         int i;
         unsigned long reg;
         unsigned long flags;
-        enum tegra_pingroup pg = config->pingroup;
+        int pg = config->pingroup;
         enum tegra_mux_func func = config->func;
 
-        if (pg < 0 || pg >=  TEGRA_MAX_PINGROUP)
+        if (pg < 0 || pg >=  pingroup_max)
                 return -ERANGE;
 
         if (pingroups[pg].mux_reg < 0)
@@ -230,13 +276,12 @@ static int tegra_pinmux_set_func(const struct tegra_pingroup_config *config)
         return 0;
 }
 
-int tegra_pinmux_set_tristate(enum tegra_pingroup pg,
-        enum tegra_tristate tristate)
+int tegra_pinmux_set_tristate(int pg, enum tegra_tristate tristate)
 {
         unsigned long reg;
         unsigned long flags;
 
-        if (pg < 0 || pg >=  TEGRA_MAX_PINGROUP)
+        if (pg < 0 || pg >=  pingroup_max)
                 return -ERANGE;
 
         if (pingroups[pg].tri_reg < 0)
@@ -255,13 +300,12 @@ int tegra_pinmux_set_tristate(enum tegra_pingroup pg,
         return 0;
 }
 
-int tegra_pinmux_set_pullupdown(enum tegra_pingroup pg,
-        enum tegra_pullupdown pupd)
+int tegra_pinmux_set_pullupdown(int pg, enum tegra_pullupdown pupd)
 {
         unsigned long reg;
         unsigned long flags;
 
-        if (pg < 0 || pg >=  TEGRA_MAX_PINGROUP)
+        if (pg < 0 || pg >=  pingroup_max)
                 return -ERANGE;
 
         if (pingroups[pg].pupd_reg < 0)
@@ -287,7 +331,7 @@ int tegra_pinmux_set_pullupdown(enum tegra_pingroup pg,
 
 static void tegra_pinmux_config_pingroup(const struct tegra_pingroup_config *config)
 {
-        enum tegra_pingroup pingroup = config->pingroup;
+        int pingroup = config->pingroup;
         enum tegra_mux_func func     = config->func;
         enum tegra_pullupdown pupd   = config->pupd;
         enum tegra_tristate tristate = config->tristate;
@@ -323,9 +367,9 @@ void tegra_pinmux_config_table(const struct tegra_pingroup_config *config, int l
                 tegra_pinmux_config_pingroup(&config[i]);
 }
 
-static const char *drive_pinmux_name(enum tegra_drive_pingroup pg)
+static const char *drive_pinmux_name(int pg)
 {
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return "<UNKNOWN>";
 
         return drive_pingroups[pg].name;
@@ -352,12 +396,11 @@ static const char *slew_name(unsigned long val)
         return tegra_slew_names[val];
 }
 
-static int tegra_drive_pinmux_set_hsm(enum tegra_drive_pingroup pg,
-        enum tegra_hsm hsm)
+static int tegra_drive_pinmux_set_hsm(int pg, enum tegra_hsm hsm)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (hsm != TEGRA_HSM_ENABLE && hsm != TEGRA_HSM_DISABLE)
@@ -377,12 +420,11 @@ static int tegra_drive_pinmux_set_hsm(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static int tegra_drive_pinmux_set_schmitt(enum tegra_drive_pingroup pg,
-        enum tegra_schmitt schmitt)
+static int tegra_drive_pinmux_set_schmitt(int pg, enum tegra_schmitt schmitt)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (schmitt != TEGRA_SCHMITT_ENABLE && schmitt != TEGRA_SCHMITT_DISABLE)
@@ -402,12 +444,11 @@ static int tegra_drive_pinmux_set_schmitt(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static int tegra_drive_pinmux_set_drive(enum tegra_drive_pingroup pg,
-        enum tegra_drive drive)
+static int tegra_drive_pinmux_set_drive(int pg, enum tegra_drive drive)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (drive < 0 || drive >= TEGRA_MAX_DRIVE)
@@ -425,12 +466,12 @@ static int tegra_drive_pinmux_set_drive(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static int tegra_drive_pinmux_set_pull_down(enum tegra_drive_pingroup pg,
+static int tegra_drive_pinmux_set_pull_down(int pg,
         enum tegra_pull_strength pull_down)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (pull_down < 0 || pull_down >= TEGRA_MAX_PULL)
@@ -448,12 +489,12 @@ static int tegra_drive_pinmux_set_pull_down(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static int tegra_drive_pinmux_set_pull_up(enum tegra_drive_pingroup pg,
+static int tegra_drive_pinmux_set_pull_up(int pg,
         enum tegra_pull_strength pull_up)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (pull_up < 0 || pull_up >= TEGRA_MAX_PULL)
@@ -471,12 +512,12 @@ static int tegra_drive_pinmux_set_pull_up(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static int tegra_drive_pinmux_set_slew_rising(enum tegra_drive_pingroup pg,
+static int tegra_drive_pinmux_set_slew_rising(int pg,
         enum tegra_slew slew_rising)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (slew_rising < 0 || slew_rising >= TEGRA_MAX_SLEW)
@@ -494,12 +535,12 @@ static int tegra_drive_pinmux_set_slew_rising(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static int tegra_drive_pinmux_set_slew_falling(enum tegra_drive_pingroup pg,
+static int tegra_drive_pinmux_set_slew_falling(int pg,
         enum tegra_slew slew_falling)
 {
         unsigned long flags;
         u32 reg;
-        if (pg < 0 || pg >=  TEGRA_MAX_DRIVE_PINGROUP)
+        if (pg < 0 || pg >=  drive_max)
                 return -ERANGE;
 
         if (slew_falling < 0 || slew_falling >= TEGRA_MAX_SLEW)
@@ -517,7 +558,7 @@ static int tegra_drive_pinmux_set_slew_falling(enum tegra_drive_pingroup pg,
         return 0;
 }
 
-static void tegra_drive_pinmux_config_pingroup(enum tegra_drive_pingroup pingroup,
+static void tegra_drive_pinmux_config_pingroup(int pingroup,
                                           enum tegra_hsm hsm,
                                           enum tegra_schmitt schmitt,
                                           enum tegra_drive drive,
@@ -596,7 +637,7 @@ void tegra_pinmux_set_safe_pinmux_table(const struct tegra_pingroup_config *conf
         for (i = 0; i < len; i++) {
                 int err;
                 c = config[i];
-                if (c.pingroup < 0 || c.pingroup >= TEGRA_MAX_PINGROUP) {
+                if (c.pingroup < 0 || c.pingroup >= pingroup_max) {
                         WARN_ON(1);
                         continue;
                 }
@@ -617,7 +658,7 @@ void tegra_pinmux_config_pinmux_table(const struct tegra_pingroup_config *config
         for (i = 0; i < len; i++) {
                 int err;
                 if (config[i].pingroup < 0 ||
-                    config[i].pingroup >= TEGRA_MAX_PINGROUP) {
+                    config[i].pingroup >= pingroup_max) {
                         WARN_ON(1);
                         continue;
                 }
@@ -635,7 +676,7 @@ void tegra_pinmux_config_tristate_table(const struct tegra_pingroup_config *conf
 {
         int i;
         int err;
-        enum tegra_pingroup pingroup;
+        int pingroup;
 
         for (i = 0; i < len; i++) {
                 pingroup = config[i].pingroup;
@@ -654,7 +695,7 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co
 {
         int i;
         int err;
-        enum tegra_pingroup pingroup;
+        int pingroup;
 
         for (i = 0; i < len; i++) {
                 pingroup = config[i].pingroup;
@@ -668,11 +709,36 @@ void tegra_pinmux_config_pullupdown_table(const struct tegra_pingroup_config *co
         }
 }
 
+static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+        { .compatible = "nvidia,tegra20-pinmux", tegra20_pinmux_init },
+#endif
+#ifdef CONFIG_ARCH_TEGRA_3x_SOC
+        { .compatible = "nvidia,tegra30-pinmux", tegra30_pinmux_init },
+#endif
+        { },
+};
+
 static int __devinit tegra_pinmux_probe(struct platform_device *pdev)
 {
         struct resource *res;
         int i;
         int config_bad = 0;
+        const struct of_device_id *match;
+
+        match = of_match_device(tegra_pinmux_of_match, &pdev->dev);
+
+        if (match)
+                ((pinmux_init)(match->data))(&pingroups, &pingroup_max,
+                        &drive_pingroups, &drive_max);
+#ifdef CONFIG_ARCH_TEGRA_2x_SOC
+        else
+                /* no device tree available, so we must be on tegra20 */
+                tegra20_pinmux_init(&pingroups, &pingroup_max,
+                                        &drive_pingroups, &drive_max);
+#else
+        pr_warn("non Tegra20 platform requires pinmux devicetree node\n");
+#endif
 
         for (i = 0; ; i++) {
                 res = platform_get_resource(pdev, IORESOURCE_MEM, i);
@@ -681,7 +747,7 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)
         }
         nbanks = i;
 
-        for (i = 0; i < TEGRA_MAX_PINGROUP; i++) {
+        for (i = 0; i < pingroup_max; i++) {
                 if (pingroups[i].tri_bank >= nbanks) {
                         dev_err(&pdev->dev, "pingroup %d: bad tri_bank\n", i);
                         config_bad = 1;
@@ -698,7 +764,7 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)
                 }
         }
 
-        for (i = 0; i < TEGRA_MAX_DRIVE_PINGROUP; i++) {
+        for (i = 0; i < drive_max; i++) {
                 if (drive_pingroups[i].reg_bank >= nbanks) {
                         dev_err(&pdev->dev,
                                 "drive pingroup %d: bad reg_bank\n", i);
@@ -741,11 +807,6 @@ static int __devinit tegra_pinmux_probe(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id tegra_pinmux_of_match[] __devinitdata = {
-        { .compatible = "nvidia,tegra20-pinmux", },
-        { },
-};
-
 static struct platform_driver tegra_pinmux_driver = {
         .driver         = {
                 .name   = "tegra-pinmux",
@@ -779,7 +840,7 @@ static int dbg_pinmux_show(struct seq_file *s, void *unused)
         int i;
         int len;
 
-        for (i = 0; i < TEGRA_MAX_PINGROUP; i++) {
+        for (i = 0; i < pingroup_max; i++) {
                 unsigned long reg;
                 unsigned long tri;
                 unsigned long mux;
@@ -850,7 +911,7 @@ static int dbg_drive_pinmux_show(struct seq_file *s, void *unused)
         int i;
         int len;
 
-        for (i = 0; i < TEGRA_MAX_DRIVE_PINGROUP; i++) {
+        for (i = 0; i < drive_max; i++) {
                 u32 reg;
 
                 seq_printf(s, "\t{TEGRA_DRIVE_PINGROUP_%s",
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 371869d8ea01..ff9e6b6c0460 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -174,7 +174,7 @@ static int tegra_periph_clk_enable_refcount[3 * 32];
 #define pmc_readl(reg) \
         __raw_readl(reg_pmc_base + (reg))
 
-unsigned long clk_measure_input_freq(void)
+static unsigned long clk_measure_input_freq(void)
 {
         u32 clock_autodetect;
         clk_writel(OSC_FREQ_DET_TRIG | 1, OSC_FREQ_DET);
@@ -278,18 +278,6 @@ static struct clk_ops tegra_clk_m_ops = {
         .disable        = tegra2_clk_m_disable,
 };
 
-void tegra2_periph_reset_assert(struct clk *c)
-{
-        BUG_ON(!c->ops->reset);
-        c->ops->reset(c, true);
-}
-
-void tegra2_periph_reset_deassert(struct clk *c)
-{
-        BUG_ON(!c->ops->reset);
-        c->ops->reset(c, false);
-}
-
 /* super clock functions */
 /* "super clocks" on tegra have two-stage muxes and a clock skipping
  * super divider.  We will ignore the clock skipping divider, since we
@@ -1132,6 +1120,9 @@ static struct clk_ops tegra_periph_clk_ops = {
 void tegra2_sdmmc_tap_delay(struct clk *c, int delay)
 {
         u32 reg;
+        unsigned long flags;
+
+        spin_lock_irqsave(&c->spinlock, flags);
 
         delay = clamp(delay, 0, 15);
         reg = clk_readl(c->reg);
@@ -1139,6 +1130,8 @@ void tegra2_sdmmc_tap_delay(struct clk *c, int delay)
         reg |= SDMMC_CLK_INT_FB_SEL;
         reg |= delay << SDMMC_CLK_INT_FB_DLY_SHIFT;
         clk_writel(reg, c->reg);
+
+        spin_unlock_irqrestore(&c->spinlock, flags);
 }
 
 /* External memory controller clock ops */
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 732c724008b1..1d1acda4f3e0 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -165,20 +165,28 @@ static struct irqaction tegra_timer_irq = {
 static void __init tegra_init_timer(void)
 {
         struct clk *clk;
-        unsigned long rate = clk_measure_input_freq();
+        unsigned long rate;
         int ret;
 
         clk = clk_get_sys("timer", NULL);
-        BUG_ON(IS_ERR(clk));
-        clk_enable(clk);
+        if (IS_ERR(clk)) {
+                pr_warn("Unable to get timer clock."
+                        " Assuming 12Mhz input clock.\n");
+                rate = 12000000;
+        } else {
+                clk_enable(clk);
+                rate = clk_get_rate(clk);
+        }
 
         /*
          * rtc registers are used by read_persistent_clock, keep the rtc clock
          * enabled
          */
         clk = clk_get_sys("rtc-tegra", NULL);
-        BUG_ON(IS_ERR(clk));
-        clk_enable(clk);
+        if (IS_ERR(clk))
+                pr_warn("Unable to get rtc-tegra clock\n");
+        else
+                clk_enable(clk);
 
 #ifdef CONFIG_HAVE_ARM_TWD
         twd_base = IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x600);
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h
deleted file mode 100644
index c808f347a081..000000000000
--- a/arch/arm/mach-u300/include/mach/memory.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *
- * arch/arm/mach-u300/include/mach/memory.h
- *
- *
- * Copyright (C) 2007-2009 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * Memory virtual/physical mapping constants.
- * Author: Linus Walleij <linus.walleij@stericsson.com>
- * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- */
-
-#ifndef __MACH_MEMORY_H
-#define __MACH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET        UL(0x48000000)
-#define BOOT_PARAMS_OFFSET      0x100
-
-#endif
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index def45bda2932..f30c69d91d99 100644
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -47,7 +47,7 @@ static void __init u300_init_machine(void)
 
 MACHINE_START(U300, MACH_U300_STRING)
         /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
-        .atag_offset    = BOOT_PARAMS_OFFSET,
+        .atag_offset    = 0x100,
         .map_io         = u300_map_io,
         .init_irq       = u300_init_irq,
         .handle_irq     = vic_handle_irq,
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index 6826faeecc68..23be34b3bb6e 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -22,6 +22,12 @@
 #include "ste-dma40-db8500.h"
 
 /*
+ * v2 has a new version of this block that need to be forced, the number found
+ * in hardware is incorrect
+ */
+#define U8500_SDI_V2_PERIPHID 0x10480180
+
+/*
  * SDI 0 (MicroSD slot)
  */
 
@@ -117,10 +123,7 @@ static void sdi0_configure(void)
         gpio_direction_output(sdi0_en, 1);
 
         /* Add the device, force v2 to subrevision 1 */
-        if (cpu_is_u8500v2())
-                db8500_add_sdi0(&mop500_sdi0_data, 0x10480180);
-        else
-                db8500_add_sdi0(&mop500_sdi0_data, 0);
+        db8500_add_sdi0(&mop500_sdi0_data, U8500_SDI_V2_PERIPHID);
 }
 
 void mop500_sdi_tc35892_init(void)
@@ -132,6 +135,42 @@ void mop500_sdi_tc35892_init(void)
 }
 
 /*
+ * SDI1 (SDIO WLAN)
+ */
+#ifdef CONFIG_STE_DMA40
+static struct stedma40_chan_cfg sdi1_dma_cfg_rx = {
+        .mode = STEDMA40_MODE_LOGICAL,
+        .dir = STEDMA40_PERIPH_TO_MEM,
+        .src_dev_type = DB8500_DMA_DEV32_SD_MM1_RX,
+        .dst_dev_type = STEDMA40_DEV_DST_MEMORY,
+        .src_info.data_width = STEDMA40_WORD_WIDTH,
+        .dst_info.data_width = STEDMA40_WORD_WIDTH,
+};
+
+static struct stedma40_chan_cfg sdi1_dma_cfg_tx = {
+        .mode = STEDMA40_MODE_LOGICAL,
+        .dir = STEDMA40_MEM_TO_PERIPH,
+        .src_dev_type = STEDMA40_DEV_SRC_MEMORY,
+        .dst_dev_type = DB8500_DMA_DEV32_SD_MM1_TX,
+        .src_info.data_width = STEDMA40_WORD_WIDTH,
+        .dst_info.data_width = STEDMA40_WORD_WIDTH,
+};
+#endif
+
+static struct mmci_platform_data mop500_sdi1_data = {
+        .ocr_mask       = MMC_VDD_29_30,
+        .f_max          = 50000000,
+        .capabilities   = MMC_CAP_4_BIT_DATA,
+        .gpio_cd        = -1,
+        .gpio_wp        = -1,
+#ifdef CONFIG_STE_DMA40
+        .dma_filter     = stedma40_filter,
+        .dma_rx_param   = &sdi1_dma_cfg_rx,
+        .dma_tx_param   = &sdi1_dma_cfg_tx,
+#endif
+};
+
+/*
  * SDI 2 (POP eMMC, not on DB8500ed)
  */
 
@@ -158,7 +197,8 @@ static struct stedma40_chan_cfg mop500_sdi2_dma_cfg_tx = {
 static struct mmci_platform_data mop500_sdi2_data = {
         .ocr_mask       = MMC_VDD_165_195,
         .f_max          = 50000000,
-        .capabilities   = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
+        .capabilities   = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA |
+                          MMC_CAP_MMC_HIGHSPEED,
         .gpio_cd        = -1,
         .gpio_wp        = -1,
 #ifdef CONFIG_STE_DMA40
@@ -208,20 +248,10 @@ static struct mmci_platform_data mop500_sdi4_data = {
 
 void __init mop500_sdi_init(void)
 {
-        u32 periphid = 0;
-
-        /* v2 has a new version of this block that need to be forced */
-        if (cpu_is_u8500v2())
-                periphid = 0x10480180;
-        /* PoP:ed eMMC on top of DB8500 v1.0 has problems with high speed */
-        if (!cpu_is_u8500v10())
-                mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-
-        db8500_add_sdi2(&mop500_sdi2_data, periphid);
-
+        /* PoP:ed eMMC */
+        db8500_add_sdi2(&mop500_sdi2_data, U8500_SDI_V2_PERIPHID);
         /* On-board eMMC */
-        db8500_add_sdi4(&mop500_sdi4_data, periphid);
-
+        db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
         /*
          * On boards with the TC35892 GPIO expander, sdi0 will finally
          * be added when the TC35892 initializes and calls
@@ -231,13 +261,9 @@ void __init mop500_sdi_init(void)
 
 void __init snowball_sdi_init(void)
 {
-        u32 periphid = 0x10480180;
-
-        mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-
         /* On-board eMMC */
-        db8500_add_sdi4(&mop500_sdi4_data, periphid);
-
+        db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
+        /* External Micro SD slot */
         mop500_sdi0_data.gpio_cd = SNOWBALL_SDMMC_CD_GPIO;
         mop500_sdi0_data.cd_invert = true;
         sdi0_en = SNOWBALL_SDMMC_EN_GPIO;
@@ -247,17 +273,15 @@ void __init snowball_sdi_init(void)
 
 void __init hrefv60_sdi_init(void)
 {
-        u32 periphid = 0x10480180;
-
-        mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-
-        db8500_add_sdi2(&mop500_sdi2_data, periphid);
-
+        /* PoP:ed eMMC */
+        db8500_add_sdi2(&mop500_sdi2_data, U8500_SDI_V2_PERIPHID);
         /* On-board eMMC */
-        db8500_add_sdi4(&mop500_sdi4_data, periphid);
-
+        db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID);
+        /* External Micro SD slot */
         mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO;
         sdi0_en = HREFV60_SDMMC_EN_GPIO;
         sdi0_vsel = HREFV60_SDMMC_1V8_3V_GPIO;
         sdi0_configure();
+        /* WLAN SDIO channel */
+        db8500_add_sdi1(&mop500_sdi1_data, U8500_SDI_V2_PERIPHID);
 }
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index de1f5f8f7330..9361a5290177 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -673,7 +673,7 @@ static void __init hrefv60_init_machine(void)
                         ARRAY_SIZE(mop500_platform_devs));
 
         mop500_i2c_init();
-        mop500_sdi_init();
+        hrefv60_sdi_init();
         mop500_spi_init();
         mop500_uart_init();
 
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index de18a2a23e6e..f926d3db6207 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -7,40 +7,77 @@
 #ifndef __BOARD_MOP500_H
 #define __BOARD_MOP500_H
 
-/* snowball GPIO for MMC card */
-#define SNOWBALL_SDMMC_EN_GPIO 217
-#define SNOWBALL_SDMMC_1V8_3V_GPIO 228
-#define SNOWBALL_SDMMC_CD_GPIO 218
+/* Snowball specific GPIO assignments, this board has no GPIO expander */
+#define SNOWBALL_ACCEL_INT1_GPIO        163
+#define SNOWBALL_ACCEL_INT2_GPIO        164
+#define SNOWBALL_MAGNET_DRDY_GPIO       165
+#define SNOWBALL_SDMMC_EN_GPIO          217
+#define SNOWBALL_SDMMC_1V8_3V_GPIO      228
+#define SNOWBALL_SDMMC_CD_GPIO          218
 
 /* HREFv60-specific GPIO assignments, this board has no GPIO expander */
-#define HREFV60_TOUCH_RST_GPIO          143
-#define HREFV60_PROX_SENSE_GPIO         217
-#define HREFV60_HAL_SW_GPIO             145
-#define HREFV60_SDMMC_EN_GPIO           169
 #define HREFV60_SDMMC_1V8_3V_GPIO       5
-#define HREFV60_SDMMC_CD_GPIO           95
-#define HREFV60_ACCEL_INT1_GPIO         82
-#define HREFV60_ACCEL_INT2_GPIO         83
+#define HREFV60_CAMERA_FLASH_ENABLE     21
 #define HREFV60_MAGNET_DRDY_GPIO        32
 #define HREFV60_DISP1_RST_GPIO          65
 #define HREFV60_DISP2_RST_GPIO          66
+#define HREFV60_ACCEL_INT1_GPIO         82
+#define HREFV60_ACCEL_INT2_GPIO         83
+#define HREFV60_SDMMC_CD_GPIO           95
+#define HREFV60_XSHUTDOWN_SECONDARY_SENSOR 140
+#define HREFV60_TOUCH_RST_GPIO          143
+#define HREFV60_HAL_SW_GPIO             145
+#define HREFV60_SDMMC_EN_GPIO           169
+#define HREFV60_MMIO_XENON_CHARGE       170
+#define HREFV60_PROX_SENSE_GPIO         217
+
+/* MOP500 generic GPIOs */
+#define CAMERA_FLASH_INT_PIN            7
+#define CYPRESS_TOUCH_INT_PIN           84
+#define XSHUTDOWN_PRIMARY_SENSOR        141
+#define XSHUTDOWN_SECONDARY_SENSOR      142
+#define CYPRESS_TOUCH_RST_GPIO          143
+#define MOP500_HDMI_RST_GPIO            196
+#define CYPRESS_SLAVE_SELECT_GPIO       216
 
 /* GPIOs on the TC35892 expander */
 #define MOP500_EGPIO(x)                 (NOMADIK_NR_GPIO + (x))
+#define GPIO_MAGNET_DRDY                MOP500_EGPIO(1)
 #define GPIO_SDMMC_CD                   MOP500_EGPIO(3)
+#define GPIO_CAMERA_FLASH_ENABLE        MOP500_EGPIO(4)
+#define GPIO_MMIO_XENON_CHARGE          MOP500_EGPIO(5)
 #define GPIO_PROX_SENSOR                MOP500_EGPIO(7)
+#define GPIO_HAL_SENSOR                 MOP500_EGPIO(8)
+#define GPIO_ACCEL_INT1                 MOP500_EGPIO(10)
+#define GPIO_ACCEL_INT2                 MOP500_EGPIO(11)
 #define GPIO_BU21013_CS                 MOP500_EGPIO(13)
+#define MOP500_DISP2_RST_GPIO           MOP500_EGPIO(14)
+#define MOP500_DISP1_RST_GPIO           MOP500_EGPIO(15)
 #define GPIO_SDMMC_EN                   MOP500_EGPIO(17)
 #define GPIO_SDMMC_1V8_3V_SEL           MOP500_EGPIO(18)
 #define MOP500_EGPIO_END                MOP500_EGPIO(24)
 
-/* GPIOs on the AB8500 mixed-signals circuit */
-#define MOP500_AB8500_GPIO(x)           (MOP500_EGPIO_END + (x))
+/*
+ * GPIOs on the AB8500 mixed-signals circuit
+ * Notice that we subtract 1 from the number passed into the macro, this is
+ * because the AB8500 GPIO pins are enumbered starting from 1, so the value in
+ * parens matches the GPIO pin number in the data sheet.
+ */
+#define MOP500_AB8500_GPIO(x)           (MOP500_EGPIO_END + (x) - 1)
+/*Snowball AB8500 GPIO */
+#define SNOWBALL_VSMPS2_1V8_GPIO        MOP500_AB8500_PIN_GPIO(1)       /* SYSCLKREQ2/GPIO1 */
+#define SNOWBALL_PM_GPIO1_GPIO          MOP500_AB8500_PIN_GPIO(2)       /* SYSCLKREQ3/GPIO2 */
+#define SNOWBALL_WLAN_CLK_REQ_GPIO      MOP500_AB8500_PIN_GPIO(3)       /* SYSCLKREQ4/GPIO3 */
+#define SNOWBALL_PM_GPIO4_GPIO          MOP500_AB8500_PIN_GPIO(4)       /* SYSCLKREQ6/GPIO4 */
+#define SNOWBALL_EN_3V6_GPIO            MOP500_AB8500_PIN_GPIO(16)      /* PWMOUT3/GPIO16 */
+#define SNOWBALL_PME_ETH_GPIO           MOP500_AB8500_PIN_GPIO(24)      /* SYSCLKREQ7/GPIO24 */
+#define SNOWBALL_EN_3V3_ETH_GPIO        MOP500_AB8500_PIN_GPIO(26)      /* GPIO26 */
 
 struct i2c_board_info;
 
 extern void mop500_sdi_init(void);
 extern void snowball_sdi_init(void);
+extern void hrefv60_sdi_init(void);
 extern void mop500_sdi_tc35892_init(void);
 void __init mop500_u8500uib_init(void);
 void __init mop500_stuib_init(void);
diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c
index e832664d1bd9..737907537004 100644
--- a/arch/arm/mach-ux500/clock.c
+++ b/arch/arm/mach-ux500/clock.c
@@ -239,23 +239,6 @@ static void clk_prcmu_disable(struct clk *clk)
         writel(1 << clk->prcmu_cg_bit, cg_clr_reg);
 }
 
-/* ED doesn't have the combined set/clr registers */
-static void clk_prcmu_ed_enable(struct clk *clk)
-{
-        void __iomem *addr = __io_address(U8500_PRCMU_BASE)
-                             + clk->prcmu_cg_mgt;
-
-        writel(readl(addr) | PRCM_MGT_ENABLE, addr);
-}
-
-static void clk_prcmu_ed_disable(struct clk *clk)
-{
-        void __iomem *addr = __io_address(U8500_PRCMU_BASE)
-                             + clk->prcmu_cg_mgt;
-
-        writel(readl(addr) & ~PRCM_MGT_ENABLE, addr);
-}
-
 static struct clkops clk_prcmu_ops = {
         .enable = clk_prcmu_enable,
         .disable = clk_prcmu_disable,
@@ -267,7 +250,6 @@ static unsigned int clkrst_base[] = {
         [3] = U8500_CLKRST3_BASE,
         [5] = U8500_CLKRST5_BASE,
         [6] = U8500_CLKRST6_BASE,
-        [7] = U8500_CLKRST7_BASE_ED,
 };
 
 static void clk_prcc_enable(struct clk *clk)
@@ -321,7 +303,6 @@ static DEFINE_PRCMU_CLK(per2clk,	0x0, 12, PER2CLK);
 static DEFINE_PRCMU_CLK(per3clk,        0x0, 13, PER3CLK);
 static DEFINE_PRCMU_CLK(per5clk,        0x0, 14, PER5CLK);
 static DEFINE_PRCMU_CLK_RATE(per6clk,   0x0, 15, PER6CLK, 133330000);
-static DEFINE_PRCMU_CLK_RATE(per7clk,   0x0, 16, PER7CLK, 100000000);
 static DEFINE_PRCMU_CLK(lcdclk,         0x0, 17, LCDCLK);
 static DEFINE_PRCMU_CLK(bmlclk,         0x0, 18, BMLCLK);
 static DEFINE_PRCMU_CLK(hsitxclk,       0x0, 19, HSITXCLK);
@@ -351,44 +332,28 @@ static DEFINE_PRCMU_CLK(uiccclk,	0x4, 1, UICCCLK); /* v1 */
 static DEFINE_PRCC_CLK(1, i2c4,         10, 9, &clk_i2cclk);
 static DEFINE_PRCC_CLK(1, gpio0,        9, -1, NULL);
 static DEFINE_PRCC_CLK(1, slimbus0,     8,  8, &clk_slimclk);
-static DEFINE_PRCC_CLK(1, spi3_ed,      7,  7, NULL);
-static DEFINE_PRCC_CLK(1, spi3_v1,      7, -1, NULL);
+static DEFINE_PRCC_CLK(1, spi3,         7, -1, NULL);
 static DEFINE_PRCC_CLK(1, i2c2,         6,  6, &clk_i2cclk);
 static DEFINE_PRCC_CLK(1, sdi0,         5,  5, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(1, msp1_ed,      4,  4, &clk_msp02clk);
-static DEFINE_PRCC_CLK(1, msp1_v1,      4,  4, &clk_msp1clk);
+static DEFINE_PRCC_CLK(1, msp1,         4,  4, &clk_msp1clk);
 static DEFINE_PRCC_CLK(1, msp0,         3,  3, &clk_msp02clk);
 static DEFINE_PRCC_CLK(1, i2c1,         2,  2, &clk_i2cclk);
 static DEFINE_PRCC_CLK(1, uart1,        1,  1, &clk_uartclk);
 static DEFINE_PRCC_CLK(1, uart0,        0,  0, &clk_uartclk);
 
 /* Peripheral Cluster #2 */
-
-static DEFINE_PRCC_CLK(2, gpio1_ed,     12, -1, NULL);
-static DEFINE_PRCC_CLK(2, ssitx_ed,     11, -1, NULL);
-static DEFINE_PRCC_CLK(2, ssirx_ed,     10, -1, NULL);
-static DEFINE_PRCC_CLK(2, spi0_ed,       9, -1, NULL);
-static DEFINE_PRCC_CLK(2, sdi3_ed,       8,  6, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(2, sdi1_ed,       7,  5, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(2, msp2_ed,       6,  4, &clk_msp02clk);
-static DEFINE_PRCC_CLK(2, sdi4_ed,       4,  2, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(2, pwl_ed,        3,  1, NULL);
-static DEFINE_PRCC_CLK(2, spi1_ed,       2, -1, NULL);
-static DEFINE_PRCC_CLK(2, spi2_ed,       1, -1, NULL);
-static DEFINE_PRCC_CLK(2, i2c3_ed,       0,  0, &clk_i2cclk);
-
-static DEFINE_PRCC_CLK(2, gpio1_v1,     11, -1, NULL);
-static DEFINE_PRCC_CLK(2, ssitx_v1,     10,  7, NULL);
-static DEFINE_PRCC_CLK(2, ssirx_v1,      9,  6, NULL);
-static DEFINE_PRCC_CLK(2, spi0_v1,       8, -1, NULL);
-static DEFINE_PRCC_CLK(2, sdi3_v1,       7,  5, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(2, sdi1_v1,       6,  4, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(2, msp2_v1,       5,  3, &clk_msp02clk);
-static DEFINE_PRCC_CLK(2, sdi4_v1,       4,  2, &clk_sdmmcclk);
-static DEFINE_PRCC_CLK(2, pwl_v1,        3,  1, NULL);
-static DEFINE_PRCC_CLK(2, spi1_v1,       2, -1, NULL);
-static DEFINE_PRCC_CLK(2, spi2_v1,       1, -1, NULL);
-static DEFINE_PRCC_CLK(2, i2c3_v1,       0,  0, &clk_i2cclk);
+static DEFINE_PRCC_CLK(2, gpio1,        11, -1, NULL);
+static DEFINE_PRCC_CLK(2, ssitx,        10,  7, NULL);
+static DEFINE_PRCC_CLK(2, ssirx,         9,  6, NULL);
+static DEFINE_PRCC_CLK(2, spi0,         8, -1, NULL);
+static DEFINE_PRCC_CLK(2, sdi3,         7,  5, &clk_sdmmcclk);
+static DEFINE_PRCC_CLK(2, sdi1,         6,  4, &clk_sdmmcclk);
+static DEFINE_PRCC_CLK(2, msp2,         5,  3, &clk_msp02clk);
+static DEFINE_PRCC_CLK(2, sdi4,         4,  2, &clk_sdmmcclk);
+static DEFINE_PRCC_CLK(2, pwl,          3,  1, NULL);
+static DEFINE_PRCC_CLK(2, spi1,         2, -1, NULL);
+static DEFINE_PRCC_CLK(2, spi2,         1, -1, NULL);
+static DEFINE_PRCC_CLK(2, i2c3,         0,  0, &clk_i2cclk);
 
 /* Peripheral Cluster #3 */
 static DEFINE_PRCC_CLK(3, gpio2,        8, -1, NULL);
@@ -397,49 +362,34 @@ static DEFINE_PRCC_CLK(3, uart2,	6,  6, &clk_uartclk);
 static DEFINE_PRCC_CLK(3, ske,          5,  5, &clk_32khz);
 static DEFINE_PRCC_CLK(3, sdi2,         4,  4, &clk_sdmmcclk);
 static DEFINE_PRCC_CLK(3, i2c0,         3,  3, &clk_i2cclk);
-static DEFINE_PRCC_CLK(3, ssp1_ed,      2,  2, &clk_i2cclk);
-static DEFINE_PRCC_CLK(3, ssp0_ed,      1,  1, &clk_i2cclk);
-static DEFINE_PRCC_CLK(3, ssp1_v1,      2,  2, &clk_sspclk);
-static DEFINE_PRCC_CLK(3, ssp0_v1,      1,  1, &clk_sspclk);
+static DEFINE_PRCC_CLK(3, ssp1,         2,  2, &clk_sspclk);
+static DEFINE_PRCC_CLK(3, ssp0,         1,  1, &clk_sspclk);
 static DEFINE_PRCC_CLK(3, fsmc,         0, -1, NULL);
 
 /* Peripheral Cluster #4 is in the always on domain */
 
 /* Peripheral Cluster #5 */
 static DEFINE_PRCC_CLK(5, gpio3,        1, -1, NULL);
-static DEFINE_PRCC_CLK(5, usb_ed,       0,  0, &clk_i2cclk);
-static DEFINE_PRCC_CLK(5, usb_v1,       0,  0, NULL);
+static DEFINE_PRCC_CLK(5, usb,          0,  0, NULL);
 
 /* Peripheral Cluster #6 */
 
 /* MTU ID in data */
-static DEFINE_PRCC_CLK_CUSTOM(6, mtu1_v1, 8, -1, NULL, clk_mtu_get_rate, 1);
-static DEFINE_PRCC_CLK_CUSTOM(6, mtu0_v1, 7, -1, NULL, clk_mtu_get_rate, 0);
-static DEFINE_PRCC_CLK(6, cfgreg_v1,    6,  6, NULL);
-static DEFINE_PRCC_CLK(6, dmc_ed,       6,  6, NULL);
+static DEFINE_PRCC_CLK_CUSTOM(6, mtu1, 8, -1, NULL, clk_mtu_get_rate, 1);
+static DEFINE_PRCC_CLK_CUSTOM(6, mtu0, 7, -1, NULL, clk_mtu_get_rate, 0);
+static DEFINE_PRCC_CLK(6, cfgreg,       6,  6, NULL);
 static DEFINE_PRCC_CLK(6, hash1,        5, -1, NULL);
-static DEFINE_PRCC_CLK(6, unipro_v1,    4,  1, &clk_uniproclk);
-static DEFINE_PRCC_CLK(6, cryp1_ed,     4, -1, NULL);
+static DEFINE_PRCC_CLK(6, unipro,       4,  1, &clk_uniproclk);
 static DEFINE_PRCC_CLK(6, pka,          3, -1, NULL);
 static DEFINE_PRCC_CLK(6, hash0,        2, -1, NULL);
 static DEFINE_PRCC_CLK(6, cryp0,        1, -1, NULL);
-static DEFINE_PRCC_CLK(6, rng_ed,       0,  0, &clk_i2cclk);
-static DEFINE_PRCC_CLK(6, rng_v1,       0,  0, &clk_rngclk);
-
-/* Peripheral Cluster #7 */
-
-static DEFINE_PRCC_CLK(7, tzpc0_ed,     4, -1, NULL);
-/* MTU ID in data */
-static DEFINE_PRCC_CLK_CUSTOM(7, mtu1_ed, 3, -1, NULL, clk_mtu_get_rate, 1);
-static DEFINE_PRCC_CLK_CUSTOM(7, mtu0_ed, 2, -1, NULL, clk_mtu_get_rate, 0);
-static DEFINE_PRCC_CLK(7, wdg_ed,       1, -1, NULL);
-static DEFINE_PRCC_CLK(7, cfgreg_ed,    0, -1, NULL);
+static DEFINE_PRCC_CLK(6, rng,  0,  0, &clk_rngclk);
 
 static struct clk clk_dummy_apb_pclk = {
         .name = "apb_pclk",
 };
 
-static struct clk_lookup u8500_common_clks[] = {
+static struct clk_lookup u8500_clks[] = {
         CLK(dummy_apb_pclk, NULL,       "apb_pclk"),
 
         /* Peripheral Cluster #1 */
@@ -494,83 +444,41 @@ static struct clk_lookup u8500_common_clks[] = {
         CLK(dmaclk,     "dma40.0",      NULL),
         CLK(b2r2clk,    "b2r2",         NULL),
         CLK(tvclk,      "tv",           NULL),
-};
 
-static struct clk_lookup u8500_ed_clks[] = {
-        /* Peripheral Cluster #1 */
-        CLK(spi3_ed,    "spi3",         NULL),
-        CLK(msp1_ed,    "msp1",         NULL),
-
-        /* Peripheral Cluster #2 */
-        CLK(gpio1_ed,   "gpio.6",       NULL),
-        CLK(gpio1_ed,   "gpio.7",       NULL),
-        CLK(ssitx_ed,   "ssitx",        NULL),
-        CLK(ssirx_ed,   "ssirx",        NULL),
-        CLK(spi0_ed,    "spi0",         NULL),
-        CLK(sdi3_ed,    "sdi3",         NULL),
-        CLK(sdi1_ed,    "sdi1",         NULL),
-        CLK(msp2_ed,    "msp2",         NULL),
-        CLK(sdi4_ed,    "sdi4",         NULL),
-        CLK(pwl_ed,     "pwl",          NULL),
-        CLK(spi1_ed,    "spi1",         NULL),
-        CLK(spi2_ed,    "spi2",         NULL),
-        CLK(i2c3_ed,    "nmk-i2c.3",    NULL),
-
-        /* Peripheral Cluster #3 */
-        CLK(ssp1_ed,    "ssp1",         NULL),
-        CLK(ssp0_ed,    "ssp0",         NULL),
-
-        /* Peripheral Cluster #5 */
-        CLK(usb_ed,     "musb-ux500.0", "usb"),
-
-        /* Peripheral Cluster #6 */
-        CLK(dmc_ed,     "dmc",          NULL),
-        CLK(cryp1_ed,   "cryp1",        NULL),
-        CLK(rng_ed,     "rng",          NULL),
-
-        /* Peripheral Cluster #7 */
-        CLK(tzpc0_ed,   "tzpc0",        NULL),
-        CLK(mtu1_ed,    "mtu1",         NULL),
-        CLK(mtu0_ed,    "mtu0",         NULL),
-        CLK(wdg_ed,     "wdg",          NULL),
-        CLK(cfgreg_ed,  "cfgreg",       NULL),
-};
-
-static struct clk_lookup u8500_v1_clks[] = {
         /* Peripheral Cluster #1 */
         CLK(i2c4,       "nmk-i2c.4",    NULL),
-        CLK(spi3_v1,    "spi3",         NULL),
-        CLK(msp1_v1,    "msp1",         NULL),
+        CLK(spi3,       "spi3",         NULL),
+        CLK(msp1,       "msp1",         NULL),
 
         /* Peripheral Cluster #2 */
-        CLK(gpio1_v1,   "gpio.6",       NULL),
-        CLK(gpio1_v1,   "gpio.7",       NULL),
-        CLK(ssitx_v1,   "ssitx",        NULL),
-        CLK(ssirx_v1,   "ssirx",        NULL),
-        CLK(spi0_v1,    "spi0",         NULL),
-        CLK(sdi3_v1,    "sdi3",         NULL),
-        CLK(sdi1_v1,    "sdi1",         NULL),
-        CLK(msp2_v1,    "msp2",         NULL),
-        CLK(sdi4_v1,    "sdi4",         NULL),
-        CLK(pwl_v1,     "pwl",          NULL),
-        CLK(spi1_v1,    "spi1",         NULL),
-        CLK(spi2_v1,    "spi2",         NULL),
-        CLK(i2c3_v1,    "nmk-i2c.3",    NULL),
+        CLK(gpio1,      "gpio.6",       NULL),
+        CLK(gpio1,      "gpio.7",       NULL),
+        CLK(ssitx,      "ssitx",        NULL),
+        CLK(ssirx,      "ssirx",        NULL),
+        CLK(spi0,       "spi0",         NULL),
+        CLK(sdi3,       "sdi3",         NULL),
+        CLK(sdi1,       "sdi1",         NULL),
+        CLK(msp2,       "msp2",         NULL),
+        CLK(sdi4,       "sdi4",         NULL),
+        CLK(pwl,        "pwl",          NULL),
+        CLK(spi1,       "spi1",         NULL),
+        CLK(spi2,       "spi2",         NULL),
+        CLK(i2c3,       "nmk-i2c.3",    NULL),
 
         /* Peripheral Cluster #3 */
-        CLK(ssp1_v1,    "ssp1",         NULL),
-        CLK(ssp0_v1,    "ssp0",         NULL),
+        CLK(ssp1,       "ssp1",         NULL),
+        CLK(ssp0,       "ssp0",         NULL),
 
         /* Peripheral Cluster #5 */
-        CLK(usb_v1,     "musb-ux500.0", "usb"),
+        CLK(usb,        "musb-ux500.0", "usb"),
 
         /* Peripheral Cluster #6 */
-        CLK(mtu1_v1,    "mtu1",         NULL),
-        CLK(mtu0_v1,    "mtu0",         NULL),
-        CLK(cfgreg_v1,  "cfgreg",       NULL),
+        CLK(mtu1,       "mtu1",         NULL),
+        CLK(mtu0,       "mtu0",         NULL),
+        CLK(cfgreg,     "cfgreg",       NULL),
         CLK(hash1,      "hash1",        NULL),
-        CLK(unipro_v1,  "unipro",       NULL),
-        CLK(rng_v1,     "rng",          NULL),
+        CLK(unipro,     "unipro",       NULL),
+        CLK(rng,        "rng",          NULL),
 
         /* PRCMU level clock gating */
 
@@ -743,7 +651,7 @@ err_out:
 late_initcall(clk_debugfs_init);
 #endif /* defined(CONFIG_DEBUG_FS) */
 
-unsigned long clk_smp_twd_rate = 400000000;
+unsigned long clk_smp_twd_rate = 500000000;
 
 unsigned long clk_smp_twd_get_rate(struct clk *clk)
 {
@@ -769,7 +677,7 @@ static int clk_twd_cpufreq_transition(struct notifier_block *nb,
 
         if (state == CPUFREQ_PRECHANGE) {
                 /* Save frequency in simple Hz */
-                clk_smp_twd_rate = f->new * 1000;
+                clk_smp_twd_rate = (f->new * 1000) / 2;
         }
 
         return NOTIFY_OK;
@@ -790,11 +698,7 @@ late_initcall(clk_init_smp_twd_cpufreq);
 
 int __init clk_init(void)
 {
-        if (cpu_is_u8500ed()) {
-                clk_prcmu_ops.enable = clk_prcmu_ed_enable;
-                clk_prcmu_ops.disable = clk_prcmu_ed_disable;
-                clk_per6clk.rate = 100000000;
-        } else if (cpu_is_u5500()) {
+        if (cpu_is_u5500()) {
                 /* Clock tree for U5500 not implemented yet */
                 clk_prcc_ops.enable = clk_prcc_ops.disable = NULL;
                 clk_prcmu_ops.enable = clk_prcmu_ops.disable = NULL;
@@ -802,20 +706,11 @@ int __init clk_init(void)
                 clk_sdmmcclk.rate = 99900000;
         }
 
-        clkdev_add_table(u8500_common_clks, ARRAY_SIZE(u8500_common_clks));
-        if (cpu_is_u8500ed())
-                clkdev_add_table(u8500_ed_clks, ARRAY_SIZE(u8500_ed_clks));
-        else
-                clkdev_add_table(u8500_v1_clks, ARRAY_SIZE(u8500_v1_clks));
-
+        clkdev_add_table(u8500_clks, ARRAY_SIZE(u8500_clks));
         clkdev_add(&clk_smp_twd_lookup);
 
 #ifdef CONFIG_DEBUG_FS
-        clk_debugfs_add_table(u8500_common_clks, ARRAY_SIZE(u8500_common_clks));
-        if (cpu_is_u8500ed())
-                clk_debugfs_add_table(u8500_ed_clks, ARRAY_SIZE(u8500_ed_clks));
-        else
-                clk_debugfs_add_table(u8500_v1_clks, ARRAY_SIZE(u8500_v1_clks));
+        clk_debugfs_add_table(u8500_clks, ARRAY_SIZE(u8500_clks));
 #endif
         return 0;
 }
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index 5323286b265e..18aa5c05c69e 100644
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -46,26 +46,6 @@ static struct map_desc u5500_io_desc[] __initdata = {
         __IO_DEV_DESC(U5500_PRCMU_TCDM_BASE, SZ_4K),
 };
 
-static struct resource db5500_pmu_resources[] = {
-        [0] = {
-                .start          = IRQ_DB5500_PMU0,
-                .end            = IRQ_DB5500_PMU0,
-                .flags          = IORESOURCE_IRQ,
-        },
-        [1] = {
-                .start          = IRQ_DB5500_PMU1,
-                .end            = IRQ_DB5500_PMU1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device db5500_pmu_device = {
-        .name                   = "arm-pmu",
-        .id                     = ARM_PMU_DEVICE_CPU,
-        .num_resources          = ARRAY_SIZE(db5500_pmu_resources),
-        .resource               = db5500_pmu_resources,
-};
-
 static struct resource mbox0_resources[] = {
         {
                 .name = "mbox_peer",
@@ -151,7 +131,6 @@ static struct platform_device mbox2_device = {
 };
 
 static struct platform_device *db5500_platform_devs[] __initdata = {
-        &db5500_pmu_device,
         &mbox0_device,
         &mbox1_device,
         &mbox2_device,
@@ -192,6 +171,25 @@ void __init u5500_map_io(void)
         _PRCMU_BASE = __io_address(U5500_PRCMU_BASE);
 }
 
+static void __init db5500_pmu_init(void)
+{
+        struct resource res[] = {
+                [0] = {
+                        .start          = IRQ_DB5500_PMU0,
+                        .end            = IRQ_DB5500_PMU0,
+                        .flags          = IORESOURCE_IRQ,
+                },
+                [1] = {
+                        .start          = IRQ_DB5500_PMU1,
+                        .end            = IRQ_DB5500_PMU1,
+                        .flags          = IORESOURCE_IRQ,
+                },
+        };
+
+        platform_device_register_simple("arm-pmu", ARM_PMU_DEVICE_CPU,
+                                        res, ARRAY_SIZE(res));
+}
+
 static int usb_db5500_rx_dma_cfg[] = {
         DB5500_DMA_DEV4_USB_OTG_IEP_1_9,
         DB5500_DMA_DEV5_USB_OTG_IEP_2_10,
@@ -217,6 +215,7 @@ static int usb_db5500_tx_dma_cfg[] = {
 void __init u5500_init_devices(void)
 {
         db5500_add_gpios();
+        db5500_pmu_init();
         db5500_dma_init();
         db5500_add_rtc();
         db5500_add_usb(usb_db5500_rx_dma_cfg, usb_db5500_tx_dma_cfg);
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 7f2729c05db3..7176ee7491ab 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 ST-Ericsson
+ * Copyright (C) 2008-2009 ST-Ericsson SA
  *
  * Author: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
  *
@@ -53,19 +53,6 @@ static struct map_desc u8500_io_desc[] __initdata = {
         __IO_DEV_DESC(U8500_GPIO1_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_GPIO2_BASE, SZ_4K),
         __IO_DEV_DESC(U8500_GPIO3_BASE, SZ_4K),
-};
-
-static struct map_desc u8500_ed_io_desc[] __initdata = {
-        __IO_DEV_DESC(U8500_MTU0_BASE_ED, SZ_4K),
-        __IO_DEV_DESC(U8500_CLKRST7_BASE_ED, SZ_8K),
-};
-
-static struct map_desc u8500_v1_io_desc[] __initdata = {
-        __IO_DEV_DESC(U8500_MTU0_BASE, SZ_4K),
-        __IO_DEV_DESC(U8500_PRCMU_TCDM_BASE_V1, SZ_4K),
-};
-
-static struct map_desc u8500_v2_io_desc[] __initdata = {
         __IO_DEV_DESC(U8500_PRCMU_TCDM_BASE, SZ_4K),
 };
 
@@ -80,13 +67,6 @@ void __init u8500_map_io(void)
 
         iotable_init(u8500_io_desc, ARRAY_SIZE(u8500_io_desc));
 
-        if (cpu_is_u8500ed())
-                iotable_init(u8500_ed_io_desc, ARRAY_SIZE(u8500_ed_io_desc));
-        else if (cpu_is_u8500v1())
-                iotable_init(u8500_v1_io_desc, ARRAY_SIZE(u8500_v1_io_desc));
-        else if (cpu_is_u8500v2())
-                iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc));
-
         _PRCMU_BASE = __io_address(U8500_PRCMU_BASE);
 }
 
@@ -155,12 +135,9 @@ static resource_size_t __initdata db8500_gpio_base[] = {
 static void __init db8500_add_gpios(void)
 {
         struct nmk_gpio_platform_data pdata = {
-                /* No custom data yet */
+                .supports_sleepmode = true,
         };
 
-        if (cpu_is_u8500v2())
-                pdata.supports_sleepmode = true;
-
         dbx500_add_gpios(ARRAY_AND_SIZE(db8500_gpio_base),
                          IRQ_DB8500_GPIO0, &pdata);
 }
@@ -192,9 +169,6 @@ static int usb_db8500_tx_dma_cfg[] = {
  */
 void __init u8500_init_devices(void)
 {
-        if (cpu_is_u8500ed())
-                dma40_u8500ed_fixup();
-
         db8500_add_rtc();
         db8500_add_gpios();
         db8500_add_usb(usb_db8500_rx_dma_cfg, usb_db8500_tx_dma_cfg);
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 73b17404b194..a7c6cdc9b11e 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -166,16 +166,6 @@ struct platform_device u8500_dma40_device = {
         .resource = dma40_resources
 };
 
-void dma40_u8500ed_fixup(void)
-{
-        dma40_plat_data.memcpy = NULL;
-        dma40_plat_data.memcpy_len = 0;
-        dma40_resources[0].start = U8500_DMA_BASE_ED;
-        dma40_resources[0].end = U8500_DMA_BASE_ED + SZ_4K - 1;
-        dma40_resources[1].start = U8500_DMA_LCPA_BASE_ED;
-        dma40_resources[1].end = U8500_DMA_LCPA_BASE_ED + 2 * SZ_1K - 1;
-}
-
 struct resource keypad_resources[] = {
         [0] = {
                 .start = U8500_SKE_BASE,
diff --git a/arch/arm/mach-ux500/id.c b/arch/arm/mach-ux500/id.c
index d35122ebc67b..15a0f63b2e2b 100644
--- a/arch/arm/mach-ux500/id.c
+++ b/arch/arm/mach-ux500/id.c
@@ -65,6 +65,7 @@ static unsigned int partnumber(unsigned int asicid)
  * DB8500v1     0x411fc091      0x9001FFF4              0x008500A0
  * DB8500v1.1   0x411fc091      0x9001FFF4              0x008500A1
  * DB8500v2     0x412fc091      0x9001DBF4              0x008500B0
+ * DB8520v2.2   0x412fc091      0x9001DBF4              0x008500B2
  * DB5500v1     0x412fc091      0x9001FFF4              0x005500A0
  */
 
@@ -80,9 +81,10 @@ void __init ux500_map_io(void)
                 addr = 0x9001FFF4;
                 break;
 
-        case 0x412fc091: /* DB8500v2 / DB5500v1 */
+        case 0x412fc091: /* DB8520 / DB8500v2 / DB5500v1 */
                 asicid = ux500_read_asicid(0x9001DBF4);
-                if (partnumber(asicid) == 0x8500)
+                if (partnumber(asicid) == 0x8500 ||
+                    partnumber(asicid) == 0x8520)
                         /* DB8500v2 */
                         break;
 
diff --git a/arch/arm/mach-ux500/include/mach/db5500-regs.h b/arch/arm/mach-ux500/include/mach/db5500-regs.h
index 994b5fe6f85a..8e714bcb099f 100644
--- a/arch/arm/mach-ux500/include/mach/db5500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db5500-regs.h
@@ -65,8 +65,11 @@
 #define U5500_PRCMU_TIMER_4_BASE (U5500_PER4_BASE + 0x07450)
 #define U5500_MSP1_BASE         (U5500_PER4_BASE + 0x9000)
 #define U5500_GPIO2_BASE        (U5500_PER4_BASE + 0xA000)
+#define U5500_MTIMER_BASE       (U5500_PER4_BASE + 0xC000)
 #define U5500_CDETECT_BASE      (U5500_PER4_BASE + 0xF000)
 #define U5500_PRCMU_TCDM_BASE   (U5500_PER4_BASE + 0x18000)
+#define U5500_PRCMU_TCPM_BASE   (U5500_PER4_BASE + 0x10000)
+#define U5500_TPIU_BASE         (U5500_PER4_BASE + 0x50000)
 
 #define U5500_SPI0_BASE         (U5500_PER5_BASE + 0x0000)
 #define U5500_SPI1_BASE         (U5500_PER5_BASE + 0x1000)
@@ -125,6 +128,7 @@
 #define U5500_ACCCON_BASE               (0xBFFF1000)
 #define U5500_ACCCON_CPUVEC_RESET_ADDR_OFFSET (0x00000020)
 #define U5500_ACCCON_ACC_CPU_CTRL_OFFSET (0x000000BC)
+#define U5500_INTCON_MBOX1_INT_RESET_ADDR       (0xBFFD31A4)
 
 #define U5500_ESRAM_BASE                0x40000000
 #define U5500_ESRAM_DMA_LCPA_OFFSET     0x10000
diff --git a/arch/arm/mach-ux500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h
index 751b0e6938d4..80e10f50282e 100644
--- a/arch/arm/mach-ux500/include/mach/db8500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db8500-regs.h
@@ -22,7 +22,9 @@
 #define U8500_ESRAM_DMA_LCPA_OFFSET     0x10000
 
 #define U8500_DMA_LCPA_BASE    (U8500_ESRAM_BANK0 + U8500_ESRAM_DMA_LCPA_OFFSET)
-#define U8500_DMA_LCPA_BASE_ED  (U8500_ESRAM_BANK4 + 0x4000)
+
+/* This address fulfills the 256k alignment requirement of the lcla base */
+#define U8500_DMA_LCLA_BASE     U8500_ESRAM_BANK4
 
 #define U8500_PER3_BASE         0x80000000
 #define U8500_STM_BASE          0x80100000
@@ -40,15 +42,14 @@
 #define U8500_ASIC_ID_BASE      0x9001D000
 
 #define U8500_PER6_BASE         0xa03c0000
+#define U8500_PER7_BASE         0xa03d0000
 #define U8500_PER5_BASE         0xa03e0000
-#define U8500_PER7_BASE_ED      0xa03d0000
 
 #define U8500_SVA_BASE          0xa0100000
 #define U8500_SIA_BASE          0xa0200000
 
 #define U8500_SGA_BASE          0xa0300000
 #define U8500_MCDE_BASE         0xa0350000
-#define U8500_DMA_BASE_ED       0xa0362000
 #define U8500_DMA_BASE          0x801C0000      /* v1 */
 
 #define U8500_SBAG_BASE         0xa0390000
@@ -66,13 +67,6 @@
 #define U8500_GPIO2_BASE        (U8500_PER2_BASE + 0xE000)
 #define U8500_GPIO3_BASE        (U8500_PER5_BASE + 0x1E000)
 
-/* per7 base addresses */
-#define U8500_CR_BASE_ED        (U8500_PER7_BASE_ED + 0x8000)
-#define U8500_MTU0_BASE_ED      (U8500_PER7_BASE_ED + 0xa000)
-#define U8500_MTU1_BASE_ED      (U8500_PER7_BASE_ED + 0xb000)
-#define U8500_TZPC0_BASE_ED     (U8500_PER7_BASE_ED + 0xc000)
-#define U8500_CLKRST7_BASE_ED   (U8500_PER7_BASE_ED + 0xf000)
-
 #define U8500_UART0_BASE        (U8500_PER1_BASE + 0x0000)
 #define U8500_UART1_BASE        (U8500_PER1_BASE + 0x1000)
 
@@ -102,12 +96,10 @@
 #define U8500_SCR_BASE          (U8500_PER4_BASE + 0x05000)
 #define U8500_DMC_BASE          (U8500_PER4_BASE + 0x06000)
 #define U8500_PRCMU_BASE        (U8500_PER4_BASE + 0x07000)
-#define U8500_PRCMU_TIMER_3_BASE (U8500_PER4_BASE + 0x07338)
-#define U8500_PRCMU_TIMER_4_BASE (U8500_PER4_BASE + 0x07450)
-#define U8500_PRCMU_TCDM_BASE_V1 (U8500_PER4_BASE + 0x0f000)
 #define U8500_PRCMU_TCDM_BASE   (U8500_PER4_BASE + 0x68000)
 #define U8500_PRCMU_TCPM_BASE   (U8500_PER4_BASE + 0x60000)
-
+#define U8500_PRCMU_TIMER_3_BASE (U8500_PER4_BASE + 0x07338)
+#define U8500_PRCMU_TIMER_4_BASE (U8500_PER4_BASE + 0x07450)
 
 /* per3 base addresses */
 #define U8500_FSMC_BASE         (U8500_PER3_BASE + 0x0000)
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 020b6369a30a..5f6cb71fc62d 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -18,6 +18,4 @@ extern struct amba_device ux500_pl031_device;
 extern struct platform_device u8500_dma40_device;
 extern struct platform_device ux500_ske_keypad_device;
 
-void dma40_u8500ed_fixup(void);
-
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h
index 470ac52663d6..b6ba26a1367d 100644
--- a/arch/arm/mach-ux500/include/mach/hardware.h
+++ b/arch/arm/mach-ux500/include/mach/hardware.h
@@ -10,20 +10,21 @@
 #ifndef __MACH_HARDWARE_H
 #define __MACH_HARDWARE_H
 
-/* macros to get at IO space when running virtually
+/*
+ * Macros to get at IO space when running virtually
  * We dont map all the peripherals, let ioremap do
  * this for us. We map only very basic peripherals here.
  */
 #define U8500_IO_VIRTUAL        0xf0000000
 #define U8500_IO_PHYSICAL       0xa0000000
 
-/* this macro is used in assembly, so no cast */
+/* This macro is used in assembly, so no cast */
 #define IO_ADDRESS(x)           \
         (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + U8500_IO_VIRTUAL)
 
 /* typesafe io address */
 #define __io_address(n)         __io(IO_ADDRESS(n))
-/* used by some plat-nomadik code */
+/* Used by some plat-nomadik code */
 #define io_p2v(n)               __io_address(n)
 
 #include <mach/db8500-regs.h>
@@ -36,6 +37,5 @@ extern void __iomem *_PRCMU_BASE;
 
 #define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
 
-#endif
-
+#endif                          /* __ASSEMBLY__ */
 #endif                          /* __MACH_HARDWARE_H */
diff --git a/arch/arm/mach-ux500/include/mach/id.h b/arch/arm/mach-ux500/include/mach/id.h
index 02b541a37ee5..833d6a6edc9b 100644
--- a/arch/arm/mach-ux500/include/mach/id.h
+++ b/arch/arm/mach-ux500/include/mach/id.h
@@ -47,6 +47,30 @@ static inline bool __attribute_const__ cpu_is_u5500(void)
 }
 
 /*
+ * 5500 revisions
+ */
+
+static inline bool __attribute_const__ cpu_is_u5500v1(void)
+{
+        return cpu_is_u5500() && (dbx500_revision() & 0xf0) == 0xA0;
+}
+
+static inline bool __attribute_const__ cpu_is_u5500v2(void)
+{
+        return (dbx500_id.revision & 0xf0) == 0xB0;
+}
+
+static inline bool __attribute_const__ cpu_is_u5500v20(void)
+{
+        return cpu_is_u5500() && ((dbx500_revision() & 0xf0) == 0xB0);
+}
+
+static inline bool __attribute_const__ cpu_is_u5500v21(void)
+{
+        return cpu_is_u5500() && (dbx500_revision() == 0xB1);
+}
+
+/*
  * 8500 revisions
  */
 
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index 83cca9bcfc97..1bf0df81bdc6 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -131,6 +131,12 @@ extern void imx53_evk_common_init(void);
 extern void imx53_qsb_common_init(void);
 extern void imx53_smd_common_init(void);
 extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
-extern void imx6q_pm_init(void);
 extern void imx6q_clock_map_io(void);
+
+#ifdef CONFIG_PM
+extern void imx6q_pm_init(void);
+#else
+static inline void imx6q_pm_init(void) {}
+#endif
+
 #endif
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
index bf64e1e594ed..f0726d48df22 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx25.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
@@ -265,16 +265,20 @@
 #define MX25_PAD_CSI_D2__CSI_D2         IOMUX_PAD(0x318, 0x120, 0x10, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D2__UART5_RXD_MUX  IOMUX_PAD(0x318, 0x120, 0x11, 0x578, 1, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D2__GPIO_1_27      IOMUX_PAD(0x318, 0x120, 0x15, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CSI_D2__CSPI3_MOSI     IOMUX_PAD(0x318, 0x120, 0x17, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CSI_D3__CSI_D3         IOMUX_PAD(0x31c, 0x124, 0x10, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D3__GPIO_1_28      IOMUX_PAD(0x31c, 0x124, 0x15, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CSI_D3__CSPI3_MISO     IOMUX_PAD(0x31c, 0x124, 0x17, 0x4b4, 1, NO_PAD_CTRL)
 
 #define MX25_PAD_CSI_D4__CSI_D4         IOMUX_PAD(0x320, 0x128, 0x10, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D4__UART5_RTS      IOMUX_PAD(0x320, 0x128, 0x11, 0x574, 1, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D4__GPIO_1_29      IOMUX_PAD(0x320, 0x128, 0x15, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CSI_D4__CSPI3_SCLK     IOMUX_PAD(0x320, 0x128, 0x17, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CSI_D5__CSI_D5         IOMUX_PAD(0x324, 0x12c, 0x10, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D5__GPIO_1_30      IOMUX_PAD(0x324, 0x12c, 0x15, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CSI_D5__CSPI3_RDY      IOMUX_PAD(0x324, 0x12c, 0x17, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CSI_D6__CSI_D6         IOMUX_PAD(0x328, 0x130, 0x10, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CSI_D6__GPIO_1_31      IOMUX_PAD(0x328, 0x130, 0x15, 0, 0, NO_PAD_CTRL)
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index a4d36d601d55..d78298366a91 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -168,7 +168,7 @@ struct cpu_op {
         u32 cpu_rate;
 };
 
-int tzic_enable_wake(int is_idle);
+int tzic_enable_wake(void);
 
 extern struct cpu_op *(*get_cpu_op)(int *op);
 #endif
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index a3c164c7ba82..98308ec1f321 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -73,7 +73,28 @@ static int tzic_set_irq_fiq(unsigned int irq, unsigned int type)
 #define tzic_set_irq_fiq NULL
 #endif
 
-static unsigned int *wakeup_intr[4];
+#ifdef CONFIG_PM
+static void tzic_irq_suspend(struct irq_data *d)
+{
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        int idx = gc->irq_base >> 5;
+
+        __raw_writel(gc->wake_active, tzic_base + TZIC_WAKEUP0(idx));
+}
+
+static void tzic_irq_resume(struct irq_data *d)
+{
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        int idx = gc->irq_base >> 5;
+
+        __raw_writel(__raw_readl(tzic_base + TZIC_ENSET0(idx)),
+                     tzic_base + TZIC_WAKEUP0(idx));
+}
+
+#else
+#define tzic_irq_suspend NULL
+#define tzic_irq_resume NULL
+#endif
 
 static struct mxc_extra_irq tzic_extra_irq = {
 #ifdef CONFIG_FIQ
@@ -91,12 +112,13 @@ static __init void tzic_init_gc(unsigned int irq_start)
                                     handle_level_irq);
         gc->private = &tzic_extra_irq;
         gc->wake_enabled = IRQ_MSK(32);
-        wakeup_intr[idx] = &gc->wake_active;
 
         ct = gc->chip_types;
         ct->chip.irq_mask = irq_gc_mask_disable_reg;
         ct->chip.irq_unmask = irq_gc_unmask_enable_reg;
         ct->chip.irq_set_wake = irq_gc_set_wake;
+        ct->chip.irq_suspend = tzic_irq_suspend;
+        ct->chip.irq_resume = tzic_irq_resume;
         ct->regs.disable = TZIC_ENCLEAR0(idx);
         ct->regs.enable = TZIC_ENSET0(idx);
 
@@ -167,23 +189,19 @@ void __init tzic_init_irq(void __iomem *irqbase)
 /**
  * tzic_enable_wake() - enable wakeup interrupt
  *
- * @param is_idle               1 if called in idle loop (ENSET0 register);
- *                              0 to be used when called from low power entry
  * @return                      0 if successful; non-zero otherwise
  */
-int tzic_enable_wake(int is_idle)
+int tzic_enable_wake(void)
 {
-        unsigned int i, v;
+        unsigned int i;
 
         __raw_writel(1, tzic_base + TZIC_DSMINT);
         if (unlikely(__raw_readl(tzic_base + TZIC_DSMINT) == 0))
                 return -EAGAIN;
 
-        for (i = 0; i < 4; i++) {
-                v = is_idle ? __raw_readl(tzic_base + TZIC_ENSET0(i)) :
-                        *wakeup_intr[i];
-                __raw_writel(v, tzic_base + TZIC_WAKEUP0(i));
-        }
+        for (i = 0; i < 4; i++)
+                __raw_writel(__raw_readl(tzic_base + TZIC_ENSET0(i)),
+                             tzic_base + TZIC_WAKEUP0(i));
 
         return 0;
 }
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 3df04d944e4d..9a584614e7e6 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
-obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
 obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 2ee6341fffdb..06383b51e655 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -22,6 +22,8 @@
 #include <plat/vram.h>
 #include <plat/dsp.h>
 
+#include <plat/omap-secure.h>
+
 
 #define NO_LENGTH_CHECK 0xffffffff
 
@@ -66,6 +68,7 @@ void __init omap_reserve(void)
         omapfb_reserve_sdram_memblock();
         omap_vram_reserve_sdram_memblock();
         omap_dsp_reserve_sdram_memblock();
+        omap_secure_ram_reserve_memblock();
 }
 
 void __init omap_init_consistent_dma_size(void)
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c22217c2ee5f..002fb4d96bbc 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1034,6 +1034,18 @@ dma_addr_t omap_get_dma_src_pos(int lch)
         if (IS_DMA_ERRATA(DMA_ERRATA_3_3) && offset == 0)
                 offset = p->dma_read(CSAC, lch);
 
+        if (!cpu_is_omap15xx()) {
+                /*
+                 * CDAC == 0 indicates that the DMA transfer on the channel has
+                 * not been started (no data has been transferred so far).
+                 * Return the programmed source start address in this case.
+                 */
+                if (likely(p->dma_read(CDAC, lch)))
+                        offset = p->dma_read(CSAC, lch);
+                else
+                        offset = p->dma_read(CSSA, lch);
+        }
+
         if (cpu_class_is_omap1())
                 offset |= (p->dma_read(CSSA, lch) & 0xFFFF0000);
 
@@ -1062,8 +1074,16 @@ dma_addr_t omap_get_dma_dst_pos(int lch)
          * omap 3.2/3.3 erratum: sometimes 0 is returned if CSAC/CDAC is
          * read before the DMA controller finished disabling the channel.
          */
-        if (!cpu_is_omap15xx() && offset == 0)
+        if (!cpu_is_omap15xx() && offset == 0) {
                 offset = p->dma_read(CDAC, lch);
+                /*
+                 * CDAC == 0 indicates that the DMA transfer on the channel has
+                 * not been started (no data has been transferred so far).
+                 * Return the programmed destination start address in this case.
+                 */
+                if (unlikely(!offset))
+                        offset = p->dma_read(CDSA, lch);
+        }
 
         if (cpu_class_is_omap1())
                 offset |= (p->dma_read(CDSA, lch) & 0xFFFF0000);
diff --git a/arch/arm/plat-omap/include/plat/am33xx.h b/arch/arm/plat-omap/include/plat/am33xx.h
new file mode 100644
index 000000000000..06c19bb7bca6
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/am33xx.h
@@ -0,0 +1,25 @@
+/*
+ * This file contains the address info for various AM33XX modules.
+ *
+ * Copyright (C) 2011 Texas Instruments, Inc. - http://www.ti.com/
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __ASM_ARCH_AM33XX_H
+#define __ASM_ARCH_AM33XX_H
+
+#define L4_SLOW_AM33XX_BASE     0x48000000
+
+#define AM33XX_SCM_BASE         0x44E10000
+#define AM33XX_CTRL_BASE        AM33XX_SCM_BASE
+#define AM33XX_PRCM_BASE        0x44E00000
+
+#endif /* __ASM_ARCH_AM33XX_H */
diff --git a/arch/arm/plat-omap/include/plat/clkdev_omap.h b/arch/arm/plat-omap/include/plat/clkdev_omap.h
index 387a9638991b..b299b8d201c8 100644
--- a/arch/arm/plat-omap/include/plat/clkdev_omap.h
+++ b/arch/arm/plat-omap/include/plat/clkdev_omap.h
@@ -40,6 +40,7 @@ struct omap_clk {
 #define CK_443X         (1 << 11)
 #define CK_TI816X       (1 << 12)
 #define CK_446X         (1 << 13)
+#define CK_1710         (1 << 15)       /* 1710 extra for rate selection */
 
 
 #define CK_34XX         (CK_3430ES1 | CK_3430ES2PLUS)
diff --git a/arch/arm/plat-omap/include/plat/clock.h b/arch/arm/plat-omap/include/plat/clock.h
index eb73ab40e955..240a7b9fd946 100644
--- a/arch/arm/plat-omap/include/plat/clock.h
+++ b/arch/arm/plat-omap/include/plat/clock.h
@@ -59,6 +59,8 @@ struct clkops {
 #define RATE_IN_4430            (1 << 5)
 #define RATE_IN_TI816X          (1 << 6)
 #define RATE_IN_4460            (1 << 7)
+#define RATE_IN_AM33XX          (1 << 8)
+#define RATE_IN_TI814X          (1 << 9)
 
 #define RATE_IN_24XX            (RATE_IN_242X | RATE_IN_243X)
 #define RATE_IN_34XX            (RATE_IN_3430ES1 | RATE_IN_3430ES2PLUS)
@@ -84,7 +86,7 @@ struct clkops {
 struct clksel_rate {
         u32                     val;
         u8                      div;
-        u8                      flags;
+        u16                     flags;
 };
 
 /**
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 408a12f79205..6b51086fce18 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -69,6 +69,7 @@ unsigned int omap_rev(void);
  * cpu_is_omap343x():   True for OMAP3430
  * cpu_is_omap443x():   True for OMAP4430
  * cpu_is_omap446x():   True for OMAP4460
+ * cpu_is_omap447x():   True for OMAP4470
  */
 #define GET_OMAP_CLASS  (omap_rev() & 0xff)
 
@@ -78,6 +79,22 @@ static inline int is_omap ##class (void)		\
         return (GET_OMAP_CLASS == (id)) ? 1 : 0;        \
 }
 
+#define GET_AM_CLASS    ((omap_rev() >> 24) & 0xff)
+
+#define IS_AM_CLASS(class, id)                          \
+static inline int is_am ##class (void)                  \
+{                                                       \
+        return (GET_AM_CLASS == (id)) ? 1 : 0;          \
+}
+
+#define GET_TI_CLASS    ((omap_rev() >> 24) & 0xff)
+
+#define IS_TI_CLASS(class, id)                  \
+static inline int is_ti ##class (void)          \
+{                                                       \
+        return (GET_TI_CLASS == (id)) ? 1 : 0;  \
+}
+
 #define GET_OMAP_SUBCLASS       ((omap_rev() >> 20) & 0x0fff)
 
 #define IS_OMAP_SUBCLASS(subclass, id)                  \
@@ -92,12 +109,21 @@ static inline int is_ti ##subclass (void)		\
         return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0;     \
 }
 
+#define IS_AM_SUBCLASS(subclass, id)                    \
+static inline int is_am ##subclass (void)               \
+{                                                       \
+        return (GET_OMAP_SUBCLASS == (id)) ? 1 : 0;     \
+}
+
 IS_OMAP_CLASS(7xx, 0x07)
 IS_OMAP_CLASS(15xx, 0x15)
 IS_OMAP_CLASS(16xx, 0x16)
 IS_OMAP_CLASS(24xx, 0x24)
 IS_OMAP_CLASS(34xx, 0x34)
 IS_OMAP_CLASS(44xx, 0x44)
+IS_AM_CLASS(33xx, 0x33)
+
+IS_TI_CLASS(81xx, 0x81)
 
 IS_OMAP_SUBCLASS(242x, 0x242)
 IS_OMAP_SUBCLASS(243x, 0x243)
@@ -105,8 +131,11 @@ IS_OMAP_SUBCLASS(343x, 0x343)
 IS_OMAP_SUBCLASS(363x, 0x363)
 IS_OMAP_SUBCLASS(443x, 0x443)
 IS_OMAP_SUBCLASS(446x, 0x446)
+IS_OMAP_SUBCLASS(447x, 0x447)
 
 IS_TI_SUBCLASS(816x, 0x816)
+IS_TI_SUBCLASS(814x, 0x814)
+IS_AM_SUBCLASS(335x, 0x335)
 
 #define cpu_is_omap7xx()                0
 #define cpu_is_omap15xx()               0
@@ -116,10 +145,15 @@ IS_TI_SUBCLASS(816x, 0x816)
 #define cpu_is_omap243x()               0
 #define cpu_is_omap34xx()               0
 #define cpu_is_omap343x()               0
+#define cpu_is_ti81xx()                 0
 #define cpu_is_ti816x()                 0
+#define cpu_is_ti814x()                 0
+#define cpu_is_am33xx()                 0
+#define cpu_is_am335x()                 0
 #define cpu_is_omap44xx()               0
 #define cpu_is_omap443x()               0
 #define cpu_is_omap446x()               0
+#define cpu_is_omap447x()               0
 
 #if defined(MULTI_OMAP1)
 # if defined(CONFIG_ARCH_OMAP730)
@@ -322,7 +356,11 @@ IS_OMAP_TYPE(3517, 0x3517)
 # undef cpu_is_omap3530
 # undef cpu_is_omap3505
 # undef cpu_is_omap3517
+# undef cpu_is_ti81xx
 # undef cpu_is_ti816x
+# undef cpu_is_ti814x
+# undef cpu_is_am33xx
+# undef cpu_is_am335x
 # define cpu_is_omap3430()              is_omap3430()
 # define cpu_is_omap3503()              (cpu_is_omap3430() &&           \
                                                 (!omap3_has_iva()) &&   \
@@ -339,16 +377,22 @@ IS_OMAP_TYPE(3517, 0x3517)
                                                 !omap3_has_sgx())
 # undef cpu_is_omap3630
 # define cpu_is_omap3630()              is_omap363x()
+# define cpu_is_ti81xx()                is_ti81xx()
 # define cpu_is_ti816x()                is_ti816x()
+# define cpu_is_ti814x()                is_ti814x()
+# define cpu_is_am33xx()                is_am33xx()
+# define cpu_is_am335x()                is_am335x()
 #endif
 
 # if defined(CONFIG_ARCH_OMAP4)
 # undef cpu_is_omap44xx
 # undef cpu_is_omap443x
 # undef cpu_is_omap446x
+# undef cpu_is_omap447x
 # define cpu_is_omap44xx()              is_omap44xx()
 # define cpu_is_omap443x()              is_omap443x()
 # define cpu_is_omap446x()              is_omap446x()
+# define cpu_is_omap447x()              is_omap447x()
 # endif
 
 /* Macros to detect if we have OMAP1 or OMAP2 */
@@ -386,15 +430,27 @@ IS_OMAP_TYPE(3517, 0x3517)
 #define TI8168_REV_ES1_0        TI816X_CLASS
 #define TI8168_REV_ES1_1        (TI816X_CLASS | (0x1 << 8))
 
+#define TI814X_CLASS            0x81400034
+#define TI8148_REV_ES1_0        TI814X_CLASS
+#define TI8148_REV_ES2_0        (TI814X_CLASS | (0x1 << 8))
+#define TI8148_REV_ES2_1        (TI814X_CLASS | (0x2 << 8))
+
+#define AM335X_CLASS            0x33500034
+#define AM335X_REV_ES1_0        AM335X_CLASS
+
 #define OMAP443X_CLASS          0x44300044
 #define OMAP4430_REV_ES1_0      (OMAP443X_CLASS | (0x10 << 8))
 #define OMAP4430_REV_ES2_0      (OMAP443X_CLASS | (0x20 << 8))
 #define OMAP4430_REV_ES2_1      (OMAP443X_CLASS | (0x21 << 8))
 #define OMAP4430_REV_ES2_2      (OMAP443X_CLASS | (0x22 << 8))
+#define OMAP4430_REV_ES2_3      (OMAP443X_CLASS | (0x23 << 8))
 
 #define OMAP446X_CLASS          0x44600044
 #define OMAP4460_REV_ES1_0      (OMAP446X_CLASS | (0x10 << 8))
 
+#define OMAP447X_CLASS          0x44700044
+#define OMAP4470_REV_ES1_0      (OMAP447X_CLASS | (0x10 << 8))
+
 void omap2_check_revision(void);
 
 /*
diff --git a/arch/arm/plat-omap/include/plat/hardware.h b/arch/arm/plat-omap/include/plat/hardware.h
index e87efe1499b8..e897978371c2 100644
--- a/arch/arm/plat-omap/include/plat/hardware.h
+++ b/arch/arm/plat-omap/include/plat/hardware.h
@@ -286,6 +286,7 @@
 #include <plat/omap24xx.h>
 #include <plat/omap34xx.h>
 #include <plat/omap44xx.h>
-#include <plat/ti816x.h>
+#include <plat/ti81xx.h>
+#include <plat/am33xx.h>
 
 #endif  /* __ASM_ARCH_OMAP_HARDWARE_H */
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h
index 1234944a4da0..0696bae1818b 100644
--- a/arch/arm/plat-omap/include/plat/io.h
+++ b/arch/arm/plat-omap/include/plat/io.h
@@ -73,6 +73,9 @@
 #define OMAP4_L3_IO_OFFSET      0xb4000000
 #define OMAP4_L3_IO_ADDRESS(pa) IOMEM((pa) + OMAP4_L3_IO_OFFSET) /* L3 */
 
+#define AM33XX_L4_WK_IO_OFFSET  0xb5000000
+#define AM33XX_L4_WK_IO_ADDRESS(pa)     IOMEM((pa) + AM33XX_L4_WK_IO_OFFSET)
+
 #define OMAP4_L3_PER_IO_OFFSET  0xb1100000
 #define OMAP4_L3_PER_IO_ADDRESS(pa)     IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET)
 
@@ -154,6 +157,15 @@
 #define L4_34XX_SIZE            SZ_4M   /* 1MB of 128MB used, want 1MB sect */
 
 /*
+ * ----------------------------------------------------------------------------
+ * AM33XX specific IO mapping
+ * ----------------------------------------------------------------------------
+ */
+#define L4_WK_AM33XX_PHYS       L4_WK_AM33XX_BASE
+#define L4_WK_AM33XX_VIRT       (L4_WK_AM33XX_PHYS + AM33XX_L4_WK_IO_OFFSET)
+#define L4_WK_AM33XX_SIZE       SZ_4M   /* 1MB of 128MB used, want 1MB sect */
+
+/*
  * Need to look at the Size 4M for L4.
  * VPOM3430 was not working for Int controller
  */
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h
index ebda7382c65b..2efd6454bce0 100644
--- a/arch/arm/plat-omap/include/plat/irqs.h
+++ b/arch/arm/plat-omap/include/plat/irqs.h
@@ -357,7 +357,7 @@
 #define INT_35XX_EMAC_C0_TX_PULSE_IRQ   69
 #define INT_35XX_EMAC_C0_MISC_PULSE_IRQ 70
 #define INT_35XX_USBOTG_IRQ             71
-#define INT_35XX_UART4                  84
+#define INT_35XX_UART4_IRQ              84
 #define INT_35XX_CCDC_VD0_IRQ           88
 #define INT_35XX_CCDC_VD1_IRQ           92
 #define INT_35XX_CCDC_VD2_IRQ           93
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index 94cf70afb236..f75946c3293d 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -96,6 +96,7 @@ struct omap_mmc_platform_data {
                  */
                 u8  wires;      /* Used for the MMC driver on omap1 and 2420 */
                 u32 caps;       /* Used for the MMC driver on 2430 and later */
+                u32 pm_caps;    /* PM capabilities of the mmc */
 
                 /*
                  * nomux means "standard" muxing is wrong on this board, and
diff --git a/arch/arm/plat-omap/include/plat/omap-secure.h b/arch/arm/plat-omap/include/plat/omap-secure.h
new file mode 100644
index 000000000000..64f9d1c7f1bb
--- /dev/null
+++ b/arch/arm/plat-omap/include/plat/omap-secure.h
@@ -0,0 +1,13 @@
+#ifndef __OMAP_SECURE_H__
+#define __OMAP_SECURE_H__
+
+#include <linux/types.h>
+
+#ifdef CONFIG_ARCH_OMAP2PLUS
+extern int omap_secure_ram_reserve_memblock(void);
+#else
+static inline void omap_secure_ram_reserve_memblock(void)
+{ }
+#endif
+
+#endif /* __OMAP_SECURE_H__ */
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 2682043f5a5b..9ff444469f3d 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -19,6 +19,7 @@
 
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
+#include <linux/pm_qos.h>
 
 #include <plat/mux.h>
 
@@ -33,6 +34,8 @@
 
 #define OMAP_MODE13X_SPEED      230400
 
+#define OMAP_UART_SCR_TX_EMPTY  0x08
+
 /* WER = 0x7F
  * Enable module level wakeup in WER reg
  */
@@ -51,18 +54,27 @@
 
 #define OMAP_UART_DMA_CH_FREE   -1
 
-#define RX_TIMEOUT              (3 * HZ)
 #define OMAP_MAX_HSUART_PORTS   4
 
 #define MSR_SAVE_FLAGS          UART_MSR_ANY_DELTA
 
+#define UART_ERRATA_i202_MDR1_ACCESS    BIT(0)
+#define UART_ERRATA_i291_DMA_FORCEIDLE  BIT(1)
+
 struct omap_uart_port_info {
         bool                    dma_enabled;    /* To specify DMA Mode */
         unsigned int            uartclk;        /* UART clock rate */
-        void __iomem            *membase;       /* ioremap cookie or NULL */
-        resource_size_t         mapbase;        /* resource base */
-        unsigned long           irqflags;       /* request_irq flags */
         upf_t                   flags;          /* UPF_* flags */
+        u32                     errata;
+        unsigned int            dma_rx_buf_size;
+        unsigned int            dma_rx_timeout;
+        unsigned int            autosuspend_timeout;
+        unsigned int            dma_rx_poll_rate;
+
+        int (*get_context_loss_count)(struct device *);
+        void (*set_forceidle)(struct platform_device *);
+        void (*set_noidle)(struct platform_device *);
+        void (*enable_wakeup)(struct platform_device *, bool);
 };
 
 struct uart_omap_dma {
@@ -86,8 +98,9 @@ struct uart_omap_dma {
         spinlock_t              rx_lock;
         /* timer to poll activity on rx dma */
         struct timer_list       rx_timer;
-        int                     rx_buf_size;
-        int                     rx_timeout;
+        unsigned int            rx_buf_size;
+        unsigned int            rx_poll_rate;
+        unsigned int            rx_timeout;
 };
 
 struct uart_omap_port {
@@ -100,6 +113,10 @@ struct uart_omap_port {
         unsigned char           mcr;
         unsigned char           fcr;
         unsigned char           efr;
+        unsigned char           dll;
+        unsigned char           dlh;
+        unsigned char           mdr1;
+        unsigned char           scr;
 
         int                     use_dma;
         /*
@@ -111,6 +128,14 @@ struct uart_omap_port {
         unsigned char           msr_saved_flags;
         char                    name[20];
         unsigned long           port_activity;
+        u32                     context_loss_cnt;
+        u32                     errata;
+        u8                      wakeups_enabled;
+
+        struct pm_qos_request   pm_qos_request;
+        u32                     latency;
+        u32                     calc_latency;
+        struct work_struct      qos_work;
 };
 
 #endif /* __OMAP_SERIAL_H__ */
diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h
index b9e85886b9d6..0d818acf3917 100644
--- a/arch/arm/plat-omap/include/plat/omap34xx.h
+++ b/arch/arm/plat-omap/include/plat/omap34xx.h
@@ -35,6 +35,8 @@
 #define L4_EMU_34XX_BASE        0x54000000
 #define L3_34XX_BASE            0x68000000
 
+#define L4_WK_AM33XX_BASE       0x44C00000
+
 #define OMAP3430_32KSYNCT_BASE  0x48320000
 #define OMAP3430_CM_BASE        0x48004800
 #define OMAP3430_PRM_BASE       0x48306800
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index ea2b8a6306e7..c0d478e55c84 100644
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -45,6 +45,7 @@
 #define OMAP44XX_WKUPGEN_BASE           0x48281000
 #define OMAP44XX_MCPDM_BASE             0x40132000
 #define OMAP44XX_MCPDM_L3_BASE          0x49032000
+#define OMAP44XX_SAR_RAM_BASE           0x4a326000
 
 #define OMAP44XX_MAILBOX_BASE           (L4_44XX_BASE + 0xF4000)
 #define OMAP44XX_HSUSB_OTG_BASE         (L4_44XX_BASE + 0xAB000)
diff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index 8b372ede17c1..647010109afa 100644
--- a/arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h
@@ -97,6 +97,7 @@ struct omap_hwmod_mux_info {
         struct omap_device_pad          *pads;
         int                             nr_pads_dynamic;
         struct omap_device_pad          **pads_dynamic;
+        int                             *irqs;
         bool                            enabled;
 };
 
@@ -416,10 +417,13 @@ struct omap_hwmod_omap4_prcm {
  * _HWMOD_NO_MPU_PORT: no path exists for the MPU to write to this module
  * _HWMOD_WAKEUP_ENABLED: set when the omap_hwmod code has enabled ENAWAKEUP
  * _HWMOD_SYSCONFIG_LOADED: set when the OCP_SYSCONFIG value has been cached
+ * _HWMOD_SKIP_ENABLE: set if hwmod enabled during init (HWMOD_INIT_NO_IDLE) -
+ *     causes the first call to _enable() to only update the pinmux
  */
 #define _HWMOD_NO_MPU_PORT                      (1 << 0)
 #define _HWMOD_WAKEUP_ENABLED                   (1 << 1)
 #define _HWMOD_SYSCONFIG_LOADED                 (1 << 2)
+#define _HWMOD_SKIP_ENABLE                      (1 << 3)
 
 /*
  * omap_hwmod._state definitions
@@ -604,6 +608,8 @@ int omap_hwmod_get_context_loss_count(struct omap_hwmod *oh);
 
 int omap_hwmod_no_setup_reset(struct omap_hwmod *oh);
 
+int omap_hwmod_pad_route_irq(struct omap_hwmod *oh, int pad_idx, int irq_idx);
+
 /*
  * Chip variant-specific hwmod init routines - XXX should be converted
  * to use initcalls once the initial boot ordering is straightened out
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h
index ac44bde5d36d..198d1e6a4a6c 100644
--- a/arch/arm/plat-omap/include/plat/serial.h
+++ b/arch/arm/plat-omap/include/plat/serial.h
@@ -44,6 +44,7 @@
 #define OMAP3_UART2_BASE        OMAP2_UART2_BASE
 #define OMAP3_UART3_BASE        0x49020000
 #define OMAP3_UART4_BASE        0x49042000      /* Only on 36xx */
+#define OMAP3_UART4_AM35XX_BASE 0x4809E000      /* Only on AM35xx */
 
 /* OMAP4 serial ports */
 #define OMAP4_UART1_BASE        OMAP2_UART1_BASE
@@ -51,10 +52,10 @@
 #define OMAP4_UART3_BASE        0x48020000
 #define OMAP4_UART4_BASE        0x4806e000
 
-/* TI816X serial ports */
-#define TI816X_UART1_BASE       0x48020000
-#define TI816X_UART2_BASE       0x48022000
-#define TI816X_UART3_BASE       0x48024000
+/* TI81XX serial ports */
+#define TI81XX_UART1_BASE       0x48020000
+#define TI81XX_UART2_BASE       0x48022000
+#define TI81XX_UART3_BASE       0x48024000
 
 /* AM3505/3517 UART4 */
 #define AM35XX_UART4_BASE       0x4809E000      /* Only on AM3505/3517 */
@@ -89,9 +90,9 @@
 #define OMAP4UART2              OMAP2UART2
 #define OMAP4UART3              43
 #define OMAP4UART4              44
-#define TI816XUART1             81
-#define TI816XUART2             82
-#define TI816XUART3             83
+#define TI81XXUART1             81
+#define TI81XXUART2             82
+#define TI81XXUART3             83
 #define ZOOM_UART               95              /* Only on zoom2/3 */
 
 /* This is only used by 8250.c for omap1510 */
@@ -106,15 +107,13 @@
 #ifndef __ASSEMBLER__
 
 struct omap_board_data;
+struct omap_uart_port_info;
 
 extern void omap_serial_init(void);
-extern void omap_serial_init_port(struct omap_board_data *bdata);
 extern int omap_uart_can_sleep(void);
-extern void omap_uart_check_wakeup(void);
-extern void omap_uart_prepare_suspend(void);
-extern void omap_uart_prepare_idle(int num);
-extern void omap_uart_resume_idle(int num);
-extern void omap_uart_enable_irqs(int enable);
+extern void omap_serial_board_init(struct omap_uart_port_info *platform_data);
+extern void omap_serial_init_port(struct omap_board_data *bdata,
+                struct omap_uart_port_info *platform_data);
 #endif
 
 #endif
diff --git a/arch/arm/plat-omap/include/plat/sram.h b/arch/arm/plat-omap/include/plat/sram.h
index f500fc34d065..75aa1b2bef51 100644
--- a/arch/arm/plat-omap/include/plat/sram.h
+++ b/arch/arm/plat-omap/include/plat/sram.h
@@ -95,6 +95,10 @@ static inline void omap_push_sram_idle(void) {}
  */
 #define OMAP2_SRAM_PA           0x40200000
 #define OMAP3_SRAM_PA           0x40200000
+#ifdef CONFIG_OMAP4_ERRATA_I688
+#define OMAP4_SRAM_PA           0x40304000
+#define OMAP4_SRAM_VA           0xfe404000
+#else
 #define OMAP4_SRAM_PA           0x40300000
-
+#endif
 #endif
diff --git a/arch/arm/plat-omap/include/plat/ti816x.h b/arch/arm/plat-omap/include/plat/ti81xx.h
index 50510f5dda1e..8f9843f78422 100644
--- a/arch/arm/plat-omap/include/plat/ti816x.h
+++ b/arch/arm/plat-omap/include/plat/ti81xx.h
@@ -1,5 +1,5 @@
 /*
- * This file contains the address data for various TI816X modules.
+ * This file contains the address data for various TI81XX modules.
  *
  * Copyright (C) 2010 Texas Instruments, Inc. - http://www.ti.com/
  *
@@ -13,15 +13,15 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __ASM_ARCH_TI816X_H
-#define __ASM_ARCH_TI816X_H
+#ifndef __ASM_ARCH_TI81XX_H
+#define __ASM_ARCH_TI81XX_H
 
-#define L4_SLOW_TI816X_BASE     0x48000000
+#define L4_SLOW_TI81XX_BASE     0x48000000
 
-#define TI816X_SCM_BASE         0x48140000
-#define TI816X_CTRL_BASE        TI816X_SCM_BASE
-#define TI816X_PRCM_BASE        0x48180000
+#define TI81XX_SCM_BASE         0x48140000
+#define TI81XX_CTRL_BASE        TI81XX_SCM_BASE
+#define TI81XX_PRCM_BASE        0x48180000
 
-#define TI816X_ARM_INTC_BASE    0x48200000
+#define TI81XX_ARM_INTC_BASE    0x48200000
 
-#endif /* __ASM_ARCH_TI816X_H */
+#endif /* __ASM_ARCH_TI81XX_H */
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h
index 2f472e989ec6..6ee90495ca4c 100644
--- a/arch/arm/plat-omap/include/plat/uncompress.h
+++ b/arch/arm/plat-omap/include/plat/uncompress.h
@@ -99,9 +99,9 @@ static inline void flush(void)
 #define DEBUG_LL_ZOOM(mach)                                             \
         _DEBUG_LL_ENTRY(mach, ZOOM_UART_BASE, ZOOM_PORT_SHIFT, ZOOM_UART)
 
-#define DEBUG_LL_TI816X(p, mach)                                        \
-        _DEBUG_LL_ENTRY(mach, TI816X_UART##p##_BASE, OMAP_PORT_SHIFT,   \
-                TI816XUART##p)
+#define DEBUG_LL_TI81XX(p, mach)                                        \
+        _DEBUG_LL_ENTRY(mach, TI81XX_UART##p##_BASE, OMAP_PORT_SHIFT,   \
+                TI81XXUART##p)
 
 static inline void __arch_decomp_setup(unsigned long arch_id)
 {
@@ -177,7 +177,10 @@ static inline void __arch_decomp_setup(unsigned long arch_id)
                 DEBUG_LL_ZOOM(omap_zoom3);
 
                 /* TI8168 base boards using UART3 */
-                DEBUG_LL_TI816X(3, ti8168evm);
+                DEBUG_LL_TI81XX(3, ti8168evm);
+
+                /* TI8148 base boards using UART1 */
+                DEBUG_LL_TI81XX(1, ti8148evm);
 
         } while (0);
 }
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 17d3c939775c..dc864b580da0 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -100,9 +100,6 @@ extern void usb_musb_init(struct omap_musb_board_data *board_data);
 
 extern void usbhs_init(const struct usbhs_omap_board_data *pdata);
 
-extern int omap_usbhs_enable(struct device *dev);
-extern void omap_usbhs_disable(struct device *dev);
-
 extern int omap4430_phy_power(struct device *dev, int ID, int on);
 extern int omap4430_phy_set_clk(struct device *dev, int on);
 extern int omap4430_phy_init(struct device *dev);
@@ -114,6 +111,7 @@ extern void am35x_musb_reset(void);
 extern void am35x_musb_phy_power(u8 on);
 extern void am35x_musb_clear_irq(void);
 extern void am35x_set_mode(u8 musb_mode);
+extern void ti81xx_musb_phy_power(u8 on);
 
 /*
  * FIXME correct answer depends on hmc_mode,
@@ -273,6 +271,37 @@ static inline void omap2_usbfs_init(struct omap_usb_config *pdata)
 #define CONF2_OTGPWRDN          (1 << 2)
 #define CONF2_DATPOL            (1 << 1)
 
+/* TI81XX specific definitions */
+#define USBCTRL0        0x620
+#define USBSTAT0        0x624
+
+/* TI816X PHY controls bits */
+#define TI816X_USBPHY0_NORMAL_MODE      (1 << 0)
+#define TI816X_USBPHY_REFCLK_OSC        (1 << 8)
+
+/* TI814X PHY controls bits */
+#define USBPHY_CM_PWRDN         (1 << 0)
+#define USBPHY_OTG_PWRDN        (1 << 1)
+#define USBPHY_CHGDET_DIS       (1 << 2)
+#define USBPHY_CHGDET_RSTRT     (1 << 3)
+#define USBPHY_SRCONDM          (1 << 4)
+#define USBPHY_SINKONDP         (1 << 5)
+#define USBPHY_CHGISINK_EN      (1 << 6)
+#define USBPHY_CHGVSRC_EN       (1 << 7)
+#define USBPHY_DMPULLUP         (1 << 8)
+#define USBPHY_DPPULLUP         (1 << 9)
+#define USBPHY_CDET_EXTCTL      (1 << 10)
+#define USBPHY_GPIO_MODE        (1 << 12)
+#define USBPHY_DPOPBUFCTL       (1 << 13)
+#define USBPHY_DMOPBUFCTL       (1 << 14)
+#define USBPHY_DPINPUT          (1 << 15)
+#define USBPHY_DMINPUT          (1 << 16)
+#define USBPHY_DPGPIO_PD        (1 << 17)
+#define USBPHY_DMGPIO_PD        (1 << 18)
+#define USBPHY_OTGVDET_EN       (1 << 19)
+#define USBPHY_OTGSESSEND_EN    (1 << 20)
+#define USBPHY_DATA_POLARITY    (1 << 23)
+
 #if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
 u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
 u32 omap1_usb1_init(unsigned nwires);
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 8b28664d1c62..4243bdcc87bc 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -40,7 +40,11 @@
 #define OMAP1_SRAM_PA           0x20000000
 #define OMAP2_SRAM_PUB_PA       (OMAP2_SRAM_PA + 0xf800)
 #define OMAP3_SRAM_PUB_PA       (OMAP3_SRAM_PA + 0x8000)
+#ifdef CONFIG_OMAP4_ERRATA_I688
+#define OMAP4_SRAM_PUB_PA       OMAP4_SRAM_PA
+#else
 #define OMAP4_SRAM_PUB_PA       (OMAP4_SRAM_PA + 0x4000)
+#endif
 
 #if defined(CONFIG_ARCH_OMAP2PLUS)
 #define SRAM_BOOTLOADER_SZ      0x00
@@ -141,11 +145,9 @@ static void __init omap_detect_sram(void)
                         omap_sram_size = 0x32000;       /* 200K */
                 else if (cpu_is_omap15xx())
                         omap_sram_size = 0x30000;       /* 192K */
-                else if (cpu_is_omap1610() || cpu_is_omap1621() ||
-                     cpu_is_omap1710())
+                else if (cpu_is_omap1610() || cpu_is_omap1611() ||
+                                cpu_is_omap1621() || cpu_is_omap1710())
                         omap_sram_size = 0x4000;        /* 16K */
-                else if (cpu_is_omap1611())
-                        omap_sram_size = SZ_256K;
                 else {
                         pr_err("Could not detect SRAM size\n");
                         omap_sram_size = 0x4000;
@@ -163,6 +165,10 @@ static void __init omap_map_sram(void)
         if (omap_sram_size == 0)
                 return;
 
+#ifdef CONFIG_OMAP4_ERRATA_I688
+                omap_sram_start += PAGE_SIZE;
+                omap_sram_size -= SZ_16K;
+#endif
         if (cpu_is_omap34xx()) {
                 /*
                  * SRAM must be marked as non-cached on OMAP3 since the
@@ -224,6 +230,9 @@ static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl);
 void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)
 {
         BUG_ON(!_omap_sram_reprogram_clock);
+        /* On 730, bit 13 must always be 1 */
+        if (cpu_is_omap7xx())
+                ckctl |= 0x2000;
         _omap_sram_reprogram_clock(dpllctl, ckctl);
 }
 
diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile
index 95a5fc53b6db..c20ce0f5ce33 100644
--- a/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y   := irq.o pcie.o time.o common.o mpp.o
+obj-y   := irq.o pcie.o time.o common.o mpp.o addr-map.o
 obj-m   :=
 obj-n   :=
 obj-    :=
diff --git a/arch/arm/plat-orion/addr-map.c b/arch/arm/plat-orion/addr-map.c
new file mode 100644
index 000000000000..367ca89ac403
--- /dev/null
+++ b/arch/arm/plat-orion/addr-map.c
@@ -0,0 +1,174 @@
+/*
+ * arch/arm/plat-orion/addr-map.c
+ *
+ * Address map functions for Marvell Orion based SoCs
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/mbus.h>
+#include <linux/io.h>
+#include <plat/addr-map.h>
+
+struct mbus_dram_target_info orion_mbus_dram_info;
+
+const struct mbus_dram_target_info *mv_mbus_dram_info(void)
+{
+        return &orion_mbus_dram_info;
+}
+EXPORT_SYMBOL_GPL(mv_mbus_dram_info);
+
+/*
+ * DDR target is the same on all Orion platforms.
+ */
+#define TARGET_DDR              0
+
+/*
+ * Helpers to get DDR bank info
+ */
+#define DDR_BASE_CS_OFF(n)      (0x0000 + ((n) << 3))
+#define DDR_SIZE_CS_OFF(n)      (0x0004 + ((n) << 3))
+
+/*
+ * CPU Address Decode Windows registers
+ */
+#define WIN_CTRL_OFF            0x0000
+#define WIN_BASE_OFF            0x0004
+#define WIN_REMAP_LO_OFF        0x0008
+#define WIN_REMAP_HI_OFF        0x000c
+
+/*
+ * Default implementation
+ */
+static void __init __iomem *
+orion_win_cfg_base(const struct orion_addr_map_cfg *cfg, int win)
+{
+        return (void __iomem *)(cfg->bridge_virt_base + (win << 4));
+}
+
+/*
+ * Default implementation
+ */
+static int __init orion_cpu_win_can_remap(const struct orion_addr_map_cfg *cfg,
+                                          const int win)
+{
+        if (win < cfg->remappable_wins)
+                return 1;
+
+        return 0;
+}
+
+void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg,
+                                const int win, const u32 base,
+                                const u32 size, const u8 target,
+                                const u8 attr, const int remap)
+{
+        void __iomem *addr = cfg->win_cfg_base(cfg, win);
+        u32 ctrl, base_high, remap_addr;
+
+        if (win >= cfg->num_wins) {
+                printk(KERN_ERR "setup_cpu_win: trying to allocate window "
+                       "%d when only %d allowed\n", win, cfg->num_wins);
+        }
+
+        base_high = base & 0xffff0000;
+        ctrl = ((size - 1) & 0xffff0000) | (attr << 8) | (target << 4) | 1;
+
+        writel(base_high, addr + WIN_BASE_OFF);
+        writel(ctrl, addr + WIN_CTRL_OFF);
+        if (cfg->cpu_win_can_remap(cfg, win)) {
+                if (remap < 0)
+                        remap_addr = base;
+                else
+                        remap_addr = remap;
+                writel(remap_addr & 0xffff0000, addr + WIN_REMAP_LO_OFF);
+                writel(0, addr + WIN_REMAP_HI_OFF);
+        }
+}
+
+/*
+ * Configure a number of windows.
+ */
+static void __init orion_setup_cpu_wins(const struct orion_addr_map_cfg * cfg,
+                                        const struct orion_addr_map_info *info)
+{
+        while (info->win != -1) {
+                orion_setup_cpu_win(cfg, info->win, info->base, info->size,
+                                    info->target, info->attr, info->remap);
+                info++;
+        }
+}
+
+static void __init orion_disable_wins(const struct orion_addr_map_cfg * cfg)
+{
+        void __iomem *addr;
+        int i;
+
+        for (i = 0; i < cfg->num_wins; i++) {
+                addr = cfg->win_cfg_base(cfg, i);
+
+                writel(0, addr + WIN_BASE_OFF);
+                writel(0, addr + WIN_CTRL_OFF);
+                if (cfg->cpu_win_can_remap(cfg, i)) {
+                        writel(0, addr + WIN_REMAP_LO_OFF);
+                        writel(0, addr + WIN_REMAP_HI_OFF);
+                }
+        }
+}
+
+/*
+ * Disable, clear and configure windows.
+ */
+void __init orion_config_wins(struct orion_addr_map_cfg * cfg,
+                              const struct orion_addr_map_info *info)
+{
+        if (!cfg->cpu_win_can_remap)
+                cfg->cpu_win_can_remap = orion_cpu_win_can_remap;
+
+        if (!cfg->win_cfg_base)
+                cfg->win_cfg_base = orion_win_cfg_base;
+
+        orion_disable_wins(cfg);
+
+        if (info)
+                orion_setup_cpu_wins(cfg, info);
+}
+
+/*
+ * Setup MBUS dram target info.
+ */
+void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg,
+                                        const u32 ddr_window_cpu_base)
+{
+        void __iomem *addr;
+        int i;
+        int cs;
+
+        orion_mbus_dram_info.mbus_dram_target_id = TARGET_DDR;
+
+        addr = (void __iomem *)ddr_window_cpu_base;
+
+        for (i = 0, cs = 0; i < 4; i++) {
+                u32 base = readl(addr + DDR_BASE_CS_OFF(i));
+                u32 size = readl(addr + DDR_SIZE_CS_OFF(i));
+
+                /*
+                 * Chip select enabled?
+                 */
+                if (size & 1) {
+                        struct mbus_dram_window *w;
+
+                        w = &orion_mbus_dram_info.cs[cs++];
+                        w->cs_index = i;
+                        w->mbus_attr = 0xf & ~(1 << i);
+                        w->base = base & 0xffff0000;
+                        w->size = (size | 0x0000ffff) + 1;
+                }
+        }
+        orion_mbus_dram_info.num_cs = cs;
+}
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 9e5451b3c8e3..e5a2fde29b19 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -13,7 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/serial_8250.h>
-#include <linux/mbus.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/mv643xx_i2c.h>
@@ -203,13 +202,12 @@ void __init orion_rtc_init(unsigned long mapbase,
  ****************************************************************************/
 static __init void ge_complete(
         struct mv643xx_eth_shared_platform_data *orion_ge_shared_data,
-        struct mbus_dram_target_info *mbus_dram_info, int tclk,
+        int tclk,
         struct resource *orion_ge_resource, unsigned long irq,
         struct platform_device *orion_ge_shared,
         struct mv643xx_eth_platform_data *eth_data,
         struct platform_device *orion_ge)
 {
-        orion_ge_shared_data->dram = mbus_dram_info;
         orion_ge_shared_data->t_clk = tclk;
         orion_ge_resource->start = irq;
         orion_ge_resource->end = irq;
@@ -259,7 +257,6 @@ static struct platform_device orion_ge00 = {
 };
 
 void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -267,7 +264,7 @@ void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge00_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge00_shared_data, tclk,
                     orion_ge00_resources, irq, &orion_ge00_shared,
                     eth_data, &orion_ge00);
 }
@@ -313,7 +310,6 @@ static struct platform_device orion_ge01 = {
 };
 
 void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -321,7 +317,7 @@ void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge01_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge01_shared_data, tclk,
                     orion_ge01_resources, irq, &orion_ge01_shared,
                     eth_data, &orion_ge01);
 }
@@ -367,7 +363,6 @@ static struct platform_device orion_ge10 = {
 };
 
 void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -375,7 +370,7 @@ void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge10_shared, orion_ge10_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge10_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge10_shared_data, tclk,
                     orion_ge10_resources, irq, &orion_ge10_shared,
                     eth_data, &orion_ge10);
 }
@@ -421,7 +416,6 @@ static struct platform_device orion_ge11 = {
 };
 
 void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -429,7 +423,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
 {
         fill_resources(&orion_ge11_shared, orion_ge11_shared_resources,
                        mapbase + 0x2000, SZ_16K - 1, irq_err);
-        ge_complete(&orion_ge11_shared_data, mbus_dram_info, tclk,
+        ge_complete(&orion_ge11_shared_data, tclk,
                     orion_ge11_resources, irq, &orion_ge11_shared,
                     eth_data, &orion_ge11);
 }
@@ -592,8 +586,6 @@ void __init orion_wdt_init(unsigned long tclk)
 /*****************************************************************************
  * XOR
  ****************************************************************************/
-static struct mv_xor_platform_shared_data orion_xor_shared_data;
-
 static u64 orion_xor_dmamask = DMA_BIT_MASK(32);
 
 void __init orion_xor_init_channels(
@@ -632,9 +624,6 @@ static struct resource orion_xor0_shared_resources[] = {
 static struct platform_device orion_xor0_shared = {
         .name           = MV_XOR_SHARED_NAME,
         .id             = 0,
-        .dev            = {
-                .platform_data = &orion_xor_shared_data,
-        },
         .num_resources  = ARRAY_SIZE(orion_xor0_shared_resources),
         .resource       = orion_xor0_shared_resources,
 };
@@ -687,14 +676,11 @@ static struct platform_device orion_xor01_channel = {
         },
 };
 
-void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase_low,
+void __init orion_xor0_init(unsigned long mapbase_low,
                             unsigned long mapbase_high,
                             unsigned long irq_0,
                             unsigned long irq_1)
 {
-        orion_xor_shared_data.dram = mbus_dram_info;
-
         orion_xor0_shared_resources[0].start = mapbase_low;
         orion_xor0_shared_resources[0].end = mapbase_low + 0xff;
         orion_xor0_shared_resources[1].start = mapbase_high;
@@ -727,9 +713,6 @@ static struct resource orion_xor1_shared_resources[] = {
 static struct platform_device orion_xor1_shared = {
         .name           = MV_XOR_SHARED_NAME,
         .id             = 1,
-        .dev            = {
-                .platform_data = &orion_xor_shared_data,
-        },
         .num_resources  = ARRAY_SIZE(orion_xor1_shared_resources),
         .resource       = orion_xor1_shared_resources,
 };
@@ -828,11 +811,9 @@ static struct platform_device orion_ehci = {
         },
 };
 
-void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase,
+void __init orion_ehci_init(unsigned long mapbase,
                             unsigned long irq)
 {
-        orion_ehci_data.dram = mbus_dram_info;
         fill_resources(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
                        irq);
 
@@ -854,11 +835,9 @@ static struct platform_device orion_ehci_1 = {
         },
 };
 
-void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_1_init(unsigned long mapbase,
                               unsigned long irq)
 {
-        orion_ehci_data.dram = mbus_dram_info;
         fill_resources(&orion_ehci_1, orion_ehci_1_resources,
                        mapbase, SZ_4K - 1, irq);
 
@@ -880,11 +859,9 @@ static struct platform_device orion_ehci_2 = {
         },
 };
 
-void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_2_init(unsigned long mapbase,
                               unsigned long irq)
 {
-        orion_ehci_data.dram = mbus_dram_info;
         fill_resources(&orion_ehci_2, orion_ehci_2_resources,
                        mapbase, SZ_4K - 1, irq);
 
@@ -911,11 +888,9 @@ static struct platform_device orion_sata = {
 };
 
 void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq)
 {
-        sata_data->dram = mbus_dram_info;
         orion_sata.dev.platform_data = sata_data;
         fill_resources(&orion_sata, orion_sata_resources,
                        mapbase, 0x5000 - 1, irq);
diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h
new file mode 100644
index 000000000000..fd556f77562c
--- /dev/null
+++ b/arch/arm/plat-orion/include/plat/addr-map.h
@@ -0,0 +1,53 @@
+/*
+ * arch/arm/plat-orion/include/plat/addr-map.h
+ *
+ * Marvell Orion SoC address map handling.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __PLAT_ADDR_MAP_H
+#define __PLAT_ADDR_MAP_H
+
+extern struct mbus_dram_target_info orion_mbus_dram_info;
+
+struct orion_addr_map_cfg {
+        const int num_wins;     /* Total number of windows */
+        const int remappable_wins;
+        const u32 bridge_virt_base;
+
+        /* If NULL, the default cpu_win_can_remap will be used, using
+           the value in remappable_wins */
+        int (*cpu_win_can_remap) (const struct orion_addr_map_cfg *cfg,
+                                  const int win);
+        /* If NULL, the default win_cfg_base will be used, using the
+           value in bridge_virt_base */
+        void __iomem *(*win_cfg_base) (const struct orion_addr_map_cfg *cfg,
+                                 const int win);
+};
+
+/*
+ * Information needed to setup one address mapping.
+ */
+struct orion_addr_map_info {
+        const int win;
+        const u32 base;
+        const u32 size;
+        const u8 target;
+        const u8 attr;
+        const int remap;
+};
+
+void __init orion_config_wins(struct orion_addr_map_cfg *cfg,
+                              const struct orion_addr_map_info *info);
+
+void __init orion_setup_cpu_win(const struct orion_addr_map_cfg *cfg,
+                                const int win, const u32 base,
+                                const u32 size, const u8 target,
+                                const u8 attr, const int remap);
+
+void __init orion_setup_cpu_mbus_target(const struct orion_addr_map_cfg *cfg,
+                                        const u32 ddr_window_cpu_base);
+#endif
diff --git a/arch/arm/plat-orion/include/plat/audio.h b/arch/arm/plat-orion/include/plat/audio.h
index 9cf1f781329b..885f8abd927b 100644
--- a/arch/arm/plat-orion/include/plat/audio.h
+++ b/arch/arm/plat-orion/include/plat/audio.h
@@ -1,11 +1,8 @@
 #ifndef __PLAT_AUDIO_H
 #define __PLAT_AUDIO_H
 
-#include <linux/mbus.h>
-
 struct kirkwood_asoc_platform_data {
         u32 tclk;
-        struct mbus_dram_target_info *dram;
         int burst;
 };
 #endif
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index a63c357e2ab1..0fe08d77e835 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -37,28 +37,24 @@ void __init orion_rtc_init(unsigned long mapbase,
                            unsigned long irq);
 
 void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
                             int tclk);
 
 void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
                             int tclk);
 
 void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
                             int tclk);
 
 void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq,
                             unsigned long irq_err,
@@ -82,8 +78,7 @@ void __init orion_spi_1_init(unsigned long mapbase,
 
 void __init orion_wdt_init(unsigned long tclk);
 
-void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase_low,
+void __init orion_xor0_init(unsigned long mapbase_low,
                             unsigned long mapbase_high,
                             unsigned long irq_0,
                             unsigned long irq_1);
@@ -93,20 +88,16 @@ void __init orion_xor1_init(unsigned long mapbase_low,
                             unsigned long irq_0,
                             unsigned long irq_1);
 
-void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
-                            unsigned long mapbase,
+void __init orion_ehci_init(unsigned long mapbase,
                             unsigned long irq);
 
-void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_1_init(unsigned long mapbase,
                               unsigned long irq);
 
-void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,
-                              unsigned long mapbase,
+void __init orion_ehci_2_init(unsigned long mapbase,
                               unsigned long irq);
 
 void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
-                            struct mbus_dram_target_info *mbus_dram_info,
                             unsigned long mapbase,
                             unsigned long irq);
 
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/arch/arm/plat-orion/include/plat/ehci-orion.h
index 4ec668e77460..6fc78e430420 100644
--- a/arch/arm/plat-orion/include/plat/ehci-orion.h
+++ b/arch/arm/plat-orion/include/plat/ehci-orion.h
@@ -19,7 +19,6 @@ enum orion_ehci_phy_ver {
 };
 
 struct orion_ehci_data {
-        struct mbus_dram_target_info    *dram;
         enum orion_ehci_phy_ver phy_version;
 };
 
diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/arch/arm/plat-orion/include/plat/mv_xor.h
index bd5f3bdb4ae3..2ba1f7d76eef 100644
--- a/arch/arm/plat-orion/include/plat/mv_xor.h
+++ b/arch/arm/plat-orion/include/plat/mv_xor.h
@@ -13,12 +13,6 @@
 #define MV_XOR_SHARED_NAME      "mv_xor_shared"
 #define MV_XOR_NAME             "mv_xor"
 
-struct mbus_dram_target_info;
-
-struct mv_xor_platform_shared_data {
-        struct mbus_dram_target_info    *dram;
-};
-
 struct mv_xor_platform_data {
         struct platform_device          *shared;
         int                             hw_id;
diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/arch/arm/plat-orion/include/plat/mvsdio.h
index 14ca88676002..1190efedcb94 100644
--- a/arch/arm/plat-orion/include/plat/mvsdio.h
+++ b/arch/arm/plat-orion/include/plat/mvsdio.h
@@ -12,7 +12,6 @@
 #include <linux/mbus.h>
 
 struct mvsdio_platform_data {
-        struct mbus_dram_target_info *dram;
         unsigned int clock;
         int gpio_card_detect;
         int gpio_write_protect;
diff --git a/arch/arm/plat-orion/include/plat/pcie.h b/arch/arm/plat-orion/include/plat/pcie.h
index cc99163e73fd..fe5b9e862747 100644
--- a/arch/arm/plat-orion/include/plat/pcie.h
+++ b/arch/arm/plat-orion/include/plat/pcie.h
@@ -20,8 +20,7 @@ int orion_pcie_x4_mode(void __iomem *base);
 int orion_pcie_get_local_bus_nr(void __iomem *base);
 void orion_pcie_set_local_bus_nr(void __iomem *base, int nr);
 void orion_pcie_reset(void __iomem *base);
-void orion_pcie_setup(void __iomem *base,
-                      struct mbus_dram_target_info *dram);
+void orion_pcie_setup(void __iomem *base);
 int orion_pcie_rd_conf(void __iomem *base, struct pci_bus *bus,
                        u32 devfn, int where, int size, u32 *val);
 int orion_pcie_rd_conf_tlp(void __iomem *base, struct pci_bus *bus,
diff --git a/arch/arm/plat-orion/pcie.c b/arch/arm/plat-orion/pcie.c
index af2d733c50b5..86dbb5bdb172 100644
--- a/arch/arm/plat-orion/pcie.c
+++ b/arch/arm/plat-orion/pcie.c
@@ -13,6 +13,7 @@
 #include <linux/mbus.h>
 #include <asm/mach/pci.h>
 #include <plat/pcie.h>
+#include <plat/addr-map.h>
 #include <linux/delay.h>
 
 /*
@@ -175,8 +176,7 @@ static void __init orion_pcie_setup_wins(void __iomem *base,
         writel(((size - 1) & 0xffff0000) | 1, base + PCIE_BAR_CTRL_OFF(1));
 }
 
-void __init orion_pcie_setup(void __iomem *base,
-                             struct mbus_dram_target_info *dram)
+void __init orion_pcie_setup(void __iomem *base)
 {
         u16 cmd;
         u32 mask;
@@ -184,7 +184,7 @@ void __init orion_pcie_setup(void __iomem *base,
         /*
          * Point PCIe unit MBUS decode windows to DRAM space.
          */
-        orion_pcie_setup_wins(base, dram);
+        orion_pcie_setup_wins(base, &orion_mbus_dram_info);
 
         /*
          * Master + slave enable.
diff --git a/arch/arm/plat-pxa/include/plat/gpio-pxa.h b/arch/arm/plat-pxa/include/plat/gpio-pxa.h
deleted file mode 100644
index b6390beff323..000000000000
--- a/arch/arm/plat-pxa/include/plat/gpio-pxa.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef __PLAT_PXA_GPIO_H
-#define __PLAT_PXA_GPIO_H
-
-struct irq_data;
-
-/*
- * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with
- * one set of registers. The register offsets are organized below:
- *
- *           GPLR    GPDR    GPSR    GPCR    GRER    GFER    GEDR
- * BANK 0 - 0x0000  0x000C  0x0018  0x0024  0x0030  0x003C  0x0048
- * BANK 1 - 0x0004  0x0010  0x001C  0x0028  0x0034  0x0040  0x004C
- * BANK 2 - 0x0008  0x0014  0x0020  0x002C  0x0038  0x0044  0x0050
- *
- * BANK 3 - 0x0100  0x010C  0x0118  0x0124  0x0130  0x013C  0x0148
- * BANK 4 - 0x0104  0x0110  0x011C  0x0128  0x0134  0x0140  0x014C
- * BANK 5 - 0x0108  0x0114  0x0120  0x012C  0x0138  0x0144  0x0150
- *
- * NOTE:
- *   BANK 3 is only available on PXA27x and later processors.
- *   BANK 4 and 5 are only available on PXA935
- */
-
-#define GPIO_BANK(n)    (GPIO_REGS_VIRT + BANK_OFF(n))
-
-#define GPLR_OFFSET     0x00
-#define GPDR_OFFSET     0x0C
-#define GPSR_OFFSET     0x18
-#define GPCR_OFFSET     0x24
-#define GRER_OFFSET     0x30
-#define GFER_OFFSET     0x3C
-#define GEDR_OFFSET     0x48
-
-/* NOTE: some PXAs have fewer on-chip GPIOs (like PXA255, with 85).
- * Those cases currently cause holes in the GPIO number space, the
- * actual number of the last GPIO is recorded by 'pxa_last_gpio'.
- */
-extern int pxa_last_gpio;
-
-typedef int (*set_wake_t)(struct irq_data *d, unsigned int on);
-
-extern void pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn);
-
-#endif /* __PLAT_PXA_GPIO_H */
diff --git a/arch/arm/plat-pxa/include/plat/gpio.h b/arch/arm/plat-pxa/include/plat/gpio.h
deleted file mode 100644
index 258f77210b02..000000000000
--- a/arch/arm/plat-pxa/include/plat/gpio.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef __PLAT_GPIO_H
-#define __PLAT_GPIO_H
-
-#define __ARM_GPIOLIB_COMPLEX
-
-/* The individual machine provides register offsets and NR_BUILTIN_GPIO */
-#include <mach/gpio-pxa.h>
-
-static inline int gpio_get_value(unsigned gpio)
-{
-        if (__builtin_constant_p(gpio) && (gpio < NR_BUILTIN_GPIO))
-                return GPLR(gpio) & GPIO_bit(gpio);
-        else
-                return __gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
-        if (__builtin_constant_p(gpio) && (gpio < NR_BUILTIN_GPIO)) {
-                if (value)
-                        GPSR(gpio) = GPIO_bit(gpio);
-                else
-                        GPCR(gpio) = GPIO_bit(gpio);
-        } else
-                __gpio_set_value(gpio, value);
-}
-
-#define gpio_cansleep           __gpio_cansleep
-
-#endif /* __PLAT_GPIO_H */
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 53754bcf15a7..9fe35348e03b 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1437,11 +1437,10 @@ int __init s3c24xx_dma_init_map(struct s3c24xx_dma_selection *sel)
         size_t map_sz = sizeof(*nmap) * sel->map_size;
         int ptr;
 
-        nmap = kmalloc(map_sz, GFP_KERNEL);
+        nmap = kmemdup(sel->map, map_sz, GFP_KERNEL);
         if (nmap == NULL)
                 return -ENOMEM;
 
-        memcpy(nmap, sel->map, map_sz);
         memcpy(&dma_sel, sel, sizeof(*sel));
 
         dma_sel.map = nmap;
diff --git a/arch/arm/plat-s3c24xx/s3c2443-clock.c b/arch/arm/plat-s3c24xx/s3c2443-clock.c
index 5a21b15b2a97..95e68190d593 100644
--- a/arch/arm/plat-s3c24xx/s3c2443-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c2443-clock.c
@@ -297,13 +297,6 @@ static struct clksrc_clk clk_usb_bus_host = {
 
 static struct clksrc_clk clksrc_clks[] = {
         {
-                /* ART baud-rate clock sourced from esysclk via a divisor */
-                .clk    = {
-                        .name           = "uartclk",
-                        .parent         = &clk_esysclk.clk,
-                },
-                .reg_div = { .reg = S3C2443_CLKDIV1, .size = 4, .shift = 8 },
-        }, {
                 /* camera interface bus-clock, divided down from esysclk */
                 .clk    = {
                         .name           = "camif-upll", /* same as 2440 name */
@@ -323,6 +316,15 @@ static struct clksrc_clk clksrc_clks[] = {
         },
 };
 
+static struct clksrc_clk clk_esys_uart = {
+        /* ART baud-rate clock sourced from esysclk via a divisor */
+        .clk    = {
+                .name           = "uartclk",
+                .parent         = &clk_esysclk.clk,
+        },
+        .reg_div = { .reg = S3C2443_CLKDIV1, .size = 4, .shift = 8 },
+};
+
 static struct clk clk_i2s_ext = {
         .name           = "i2s-ext",
 };
@@ -425,12 +427,6 @@ static struct clk init_clocks[] = {
                 .enable         = s3c2443_clkcon_enable_h,
                 .ctrlbit        = S3C2443_HCLKCON_DMA5,
         }, {
-                .name           = "hsmmc",
-                .devname        = "s3c-sdhci.1",
-                .parent         = &clk_h,
-                .enable         = s3c2443_clkcon_enable_h,
-                .ctrlbit        = S3C2443_HCLKCON_HSMMC,
-        }, {
                 .name           = "gpio",
                 .parent         = &clk_p,
                 .enable         = s3c2443_clkcon_enable_p,
@@ -512,6 +508,14 @@ static struct clk init_clocks[] = {
         }
 };
 
+static struct clk hsmmc1_clk = {
+        .name           = "hsmmc",
+        .devname        = "s3c-sdhci.1",
+        .parent         = &clk_h,
+        .enable         = s3c2443_clkcon_enable_h,
+        .ctrlbit        = S3C2443_HCLKCON_HSMMC,
+};
+
 static inline unsigned long s3c2443_get_hdiv(unsigned long clkcon0)
 {
         clkcon0 &= S3C2443_CLKDIV0_HCLKDIV_MASK;
@@ -577,6 +581,7 @@ static struct clk *clks[] __initdata = {
         &clk_epll,
         &clk_usb_bus,
         &clk_armdiv,
+        &hsmmc1_clk,
 };
 
 static struct clksrc_clk *clksrcs[] __initdata = {
@@ -589,6 +594,13 @@ static struct clksrc_clk *clksrcs[] __initdata = {
         &clk_arm,
 };
 
+static struct clk_lookup s3c2443_clk_lookup[] = {
+        CLKDEV_INIT(NULL, "clk_uart_baud1", &s3c24xx_uclk),
+        CLKDEV_INIT(NULL, "clk_uart_baud2", &clk_p),
+        CLKDEV_INIT(NULL, "clk_uart_baud3", &clk_esys_uart.clk),
+        CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.0", &hsmmc1_clk),
+};
+
 void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,
                                        unsigned int *divs, int nr_divs,
                                        int divmask)
@@ -618,6 +630,7 @@ void __init s3c2443_common_init_clocks(int xtal, pll_fn get_mpll,
         /* See s3c2443/etc notes on disabling clocks at init time */
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
+        clkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup));
 
         s3c2443_common_setup_clocks(get_mpll);
 }
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 313eb26cfa62..6a2abe67c8b2 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -88,12 +88,20 @@ config S5P_GPIO_DRVSTR
 
 config SAMSUNG_GPIO_EXTRA
         int "Number of additional GPIO pins"
+        default 128 if SAMSUNG_GPIO_EXTRA128
+        default 64 if SAMSUNG_GPIO_EXTRA64
         default 0
         help
           Use additional GPIO space in addition to the GPIO's the SOC
           provides. This allows expanding the GPIO space for use with
           GPIO expanders.
 
+config SAMSUNG_GPIO_EXTRA64
+        bool
+
+config SAMSUNG_GPIO_EXTRA128
+        bool
+
 config S3C_GPIO_SPACE
         int "Space between gpio banks"
         default 0
@@ -226,11 +234,23 @@ config SAMSUNG_DEV_IDE
         help
           Compile in platform device definitions for IDE
 
-config S3C64XX_DEV_SPI
+config S3C64XX_DEV_SPI0
+        bool
+        help
+          Compile in platform device definitions for S3C64XX's type
+          SPI controller 0
+
+config S3C64XX_DEV_SPI1
+        bool
+        help
+          Compile in platform device definitions for S3C64XX's type
+          SPI controller 1
+
+config S3C64XX_DEV_SPI2
         bool
         help
           Compile in platform device definitions for S3C64XX's type
-          SPI controllers.
+          SPI controller 2
 
 config SAMSUNG_DEV_TS
         bool
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 4ca8b571f971..32a6e394db24 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -29,6 +29,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mmc/host.h>
 #include <linux/ioport.h>
+#include <linux/platform_data/s3c-hsudc.h>
 
 #include <asm/irq.h>
 #include <asm/pmu.h>
@@ -61,6 +62,7 @@
 #include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
+#include <plat/s3c64xx-spi.h>
 
 static u64 samsung_device_dma_mask = DMA_BIT_MASK(32);
 
@@ -1461,3 +1463,129 @@ struct platform_device s3c_device_wdt = {
         .resource       = s3c_wdt_resource,
 };
 #endif /* CONFIG_S3C_DEV_WDT */
+
+#ifdef CONFIG_S3C64XX_DEV_SPI0
+static struct resource s3c64xx_spi0_resource[] = {
+        [0] = DEFINE_RES_MEM(S3C_PA_SPI0, SZ_256),
+        [1] = DEFINE_RES_DMA(DMACH_SPI0_TX),
+        [2] = DEFINE_RES_DMA(DMACH_SPI0_RX),
+        [3] = DEFINE_RES_IRQ(IRQ_SPI0),
+};
+
+struct platform_device s3c64xx_device_spi0 = {
+        .name           = "s3c64xx-spi",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(s3c64xx_spi0_resource),
+        .resource       = s3c64xx_spi0_resource,
+        .dev = {
+                .dma_mask               = &samsung_device_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd,
+                                      int src_clk_nr, int num_cs)
+{
+        if (!pd) {
+                pr_err("%s:Need to pass platform data\n", __func__);
+                return;
+        }
+
+        /* Reject invalid configuration */
+        if (!num_cs || src_clk_nr < 0) {
+                pr_err("%s: Invalid SPI configuration\n", __func__);
+                return;
+        }
+
+        pd->num_cs = num_cs;
+        pd->src_clk_nr = src_clk_nr;
+        if (!pd->cfg_gpio)
+                pd->cfg_gpio = s3c64xx_spi0_cfg_gpio;
+
+        s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi0);
+}
+#endif /* CONFIG_S3C64XX_DEV_SPI0 */
+
+#ifdef CONFIG_S3C64XX_DEV_SPI1
+static struct resource s3c64xx_spi1_resource[] = {
+        [0] = DEFINE_RES_MEM(S3C_PA_SPI1, SZ_256),
+        [1] = DEFINE_RES_DMA(DMACH_SPI1_TX),
+        [2] = DEFINE_RES_DMA(DMACH_SPI1_RX),
+        [3] = DEFINE_RES_IRQ(IRQ_SPI1),
+};
+
+struct platform_device s3c64xx_device_spi1 = {
+        .name           = "s3c64xx-spi",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(s3c64xx_spi1_resource),
+        .resource       = s3c64xx_spi1_resource,
+        .dev = {
+                .dma_mask               = &samsung_device_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,
+                                      int src_clk_nr, int num_cs)
+{
+        if (!pd) {
+                pr_err("%s:Need to pass platform data\n", __func__);
+                return;
+        }
+
+        /* Reject invalid configuration */
+        if (!num_cs || src_clk_nr < 0) {
+                pr_err("%s: Invalid SPI configuration\n", __func__);
+                return;
+        }
+
+        pd->num_cs = num_cs;
+        pd->src_clk_nr = src_clk_nr;
+        if (!pd->cfg_gpio)
+                pd->cfg_gpio = s3c64xx_spi1_cfg_gpio;
+
+        s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi1);
+}
+#endif /* CONFIG_S3C64XX_DEV_SPI1 */
+
+#ifdef CONFIG_S3C64XX_DEV_SPI2
+static struct resource s3c64xx_spi2_resource[] = {
+        [0] = DEFINE_RES_MEM(S3C_PA_SPI2, SZ_256),
+        [1] = DEFINE_RES_DMA(DMACH_SPI2_TX),
+        [2] = DEFINE_RES_DMA(DMACH_SPI2_RX),
+        [3] = DEFINE_RES_IRQ(IRQ_SPI2),
+};
+
+struct platform_device s3c64xx_device_spi2 = {
+        .name           = "s3c64xx-spi",
+        .id             = 2,
+        .num_resources  = ARRAY_SIZE(s3c64xx_spi2_resource),
+        .resource       = s3c64xx_spi2_resource,
+        .dev = {
+                .dma_mask               = &samsung_device_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,
+                                      int src_clk_nr, int num_cs)
+{
+        if (!pd) {
+                pr_err("%s:Need to pass platform data\n", __func__);
+                return;
+        }
+
+        /* Reject invalid configuration */
+        if (!num_cs || src_clk_nr < 0) {
+                pr_err("%s: Invalid SPI configuration\n", __func__);
+                return;
+        }
+
+        pd->num_cs = num_cs;
+        pd->src_clk_nr = src_clk_nr;
+        if (!pd->cfg_gpio)
+                pd->cfg_gpio = s3c64xx_spi2_cfg_gpio;
+
+        s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi2);
+}
+#endif /* CONFIG_S3C64XX_DEV_SPI2 */
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c
index 93a994a5dd8f..2cded872f22b 100644
--- a/arch/arm/plat-samsung/dma-ops.c
+++ b/arch/arm/plat-samsung/dma-ops.c
@@ -18,23 +18,24 @@
 
 #include <mach/dma.h>
 
-static inline bool pl330_filter(struct dma_chan *chan, void *param)
-{
-        struct dma_pl330_peri *peri = chan->private;
-        return peri->peri_id == (unsigned)param;
-}
-
 static unsigned samsung_dmadev_request(enum dma_ch dma_ch,
                                 struct samsung_dma_info *info)
 {
         struct dma_chan *chan;
         dma_cap_mask_t mask;
         struct dma_slave_config slave_config;
+        void *filter_param;
 
         dma_cap_zero(mask);
         dma_cap_set(info->cap, mask);
 
-        chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);
+        /*
+         * If a dma channel property of a device node from device tree is
+         * specified, use that as the fliter parameter.
+         */
+        filter_param = (dma_ch == DMACH_DT_PROP) ? (void *)info->dt_dmach_prop :
+                                (void *)dma_ch;
+        chan = dma_request_channel(mask, pl330_filter, filter_param);
 
         if (info->direction == DMA_FROM_DEVICE) {
                 memset(&slave_config, 0, sizeof(struct dma_slave_config));
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index ab633c9c2aec..4214ea0ff8fe 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -39,6 +39,7 @@ extern struct platform_device s3c64xx_device_pcm0;
 extern struct platform_device s3c64xx_device_pcm1;
 extern struct platform_device s3c64xx_device_spi0;
 extern struct platform_device s3c64xx_device_spi1;
+extern struct platform_device s3c64xx_device_spi2;
 
 extern struct platform_device s3c_device_adc;
 extern struct platform_device s3c_device_cfcon;
@@ -98,8 +99,6 @@ extern struct platform_device s5p6450_device_iis1;
 extern struct platform_device s5p6450_device_iis2;
 extern struct platform_device s5p6450_device_pcm0;
 
-extern struct platform_device s5p64x0_device_spi0;
-extern struct platform_device s5p64x0_device_spi1;
 
 extern struct platform_device s5pc100_device_ac97;
 extern struct platform_device s5pc100_device_iis0;
@@ -108,9 +107,6 @@ extern struct platform_device s5pc100_device_iis2;
 extern struct platform_device s5pc100_device_pcm0;
 extern struct platform_device s5pc100_device_pcm1;
 extern struct platform_device s5pc100_device_spdif;
-extern struct platform_device s5pc100_device_spi0;
-extern struct platform_device s5pc100_device_spi1;
-extern struct platform_device s5pc100_device_spi2;
 
 extern struct platform_device s5pv210_device_ac97;
 extern struct platform_device s5pv210_device_iis0;
@@ -120,8 +116,6 @@ extern struct platform_device s5pv210_device_pcm0;
 extern struct platform_device s5pv210_device_pcm1;
 extern struct platform_device s5pv210_device_pcm2;
 extern struct platform_device s5pv210_device_spdif;
-extern struct platform_device s5pv210_device_spi0;
-extern struct platform_device s5pv210_device_spi1;
 
 extern struct platform_device exynos4_device_ac97;
 extern struct platform_device exynos4_device_ahci;
@@ -129,6 +123,7 @@ extern struct platform_device exynos4_device_dwmci;
 extern struct platform_device exynos4_device_i2s0;
 extern struct platform_device exynos4_device_i2s1;
 extern struct platform_device exynos4_device_i2s2;
+extern struct platform_device exynos4_device_ohci;
 extern struct platform_device exynos4_device_pcm0;
 extern struct platform_device exynos4_device_pcm1;
 extern struct platform_device exynos4_device_pcm2;
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
index 4c1a363526cf..22eafc310bd7 100644
--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
@@ -31,6 +31,7 @@ struct samsung_dma_info {
         enum dma_slave_buswidth width;
         dma_addr_t fifo;
         struct s3c2410_dma_client *client;
+        struct property *dt_dmach_prop;
 };
 
 struct samsung_dma_ops {
diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h
index 2e55e5958674..c5eaad529de5 100644
--- a/arch/arm/plat-samsung/include/plat/dma-pl330.h
+++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h
@@ -21,7 +21,8 @@
  * use these just as IDs.
  */
 enum dma_ch {
-        DMACH_UART0_RX,
+        DMACH_DT_PROP = -1,
+        DMACH_UART0_RX = 0,
         DMACH_UART0_TX,
         DMACH_UART1_RX,
         DMACH_UART1_TX,
diff --git a/arch/arm/plat-samsung/include/plat/irqs.h b/arch/arm/plat-samsung/include/plat/irqs.h
index 08d1a7ef97b7..df46b776976a 100644
--- a/arch/arm/plat-samsung/include/plat/irqs.h
+++ b/arch/arm/plat-samsung/include/plat/irqs.h
@@ -44,13 +44,14 @@
 #define S5P_IRQ_VIC2(x)         (S5P_VIC2_BASE + (x))
 #define S5P_IRQ_VIC3(x)         (S5P_VIC3_BASE + (x))
 
-#define S5P_TIMER_IRQ(x)        (11 + (x))
+#define S5P_TIMER_IRQ(x)        (IRQ_TIMER_BASE + (x))
 
 #define IRQ_TIMER0              S5P_TIMER_IRQ(0)
 #define IRQ_TIMER1              S5P_TIMER_IRQ(1)
 #define IRQ_TIMER2              S5P_TIMER_IRQ(2)
 #define IRQ_TIMER3              S5P_TIMER_IRQ(3)
 #define IRQ_TIMER4              S5P_TIMER_IRQ(4)
+#define IRQ_TIMER_COUNT         (5)
 
 #define IRQ_EINT(x)             ((x) < 16 ? ((x) + S5P_EINT_BASE1) \
                                         : ((x) - 16 + S5P_EINT_BASE2))
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h
index 720734847027..29c26a818842 100644
--- a/arch/arm/plat-samsung/include/plat/regs-serial.h
+++ b/arch/arm/plat-samsung/include/plat/regs-serial.h
@@ -71,6 +71,7 @@
 #define S3C2410_LCON_IRM          (1<<6)
 
 #define S3C2440_UCON_CLKMASK      (3<<10)
+#define S3C2440_UCON_CLKSHIFT     (10)
 #define S3C2440_UCON_PCLK         (0<<10)
 #define S3C2440_UCON_UCLK         (1<<10)
 #define S3C2440_UCON_PCLK2        (2<<10)
@@ -78,6 +79,7 @@
 #define S3C2443_UCON_EPLL         (3<<10)
 
 #define S3C6400_UCON_CLKMASK    (3<<10)
+#define S3C6400_UCON_CLKSHIFT   (10)
 #define S3C6400_UCON_PCLK       (0<<10)
 #define S3C6400_UCON_PCLK2      (2<<10)
 #define S3C6400_UCON_UCLK0      (1<<10)
@@ -90,11 +92,14 @@
 #define S3C2440_UCON_DIVSHIFT     (12)
 
 #define S3C2412_UCON_CLKMASK    (3<<10)
+#define S3C2412_UCON_CLKSHIFT   (10)
 #define S3C2412_UCON_UCLK       (1<<10)
 #define S3C2412_UCON_USYSCLK    (3<<10)
 #define S3C2412_UCON_PCLK       (0<<10)
 #define S3C2412_UCON_PCLK2      (2<<10)
 
+#define S3C2410_UCON_CLKMASK    (1 << 10)
+#define S3C2410_UCON_CLKSHIFT   (10)
 #define S3C2410_UCON_UCLK         (1<<10)
 #define S3C2410_UCON_SBREAK       (1<<4)
 
@@ -193,6 +198,7 @@
 
 /* Following are specific to S5PV210 */
 #define S5PV210_UCON_CLKMASK    (1<<10)
+#define S5PV210_UCON_CLKSHIFT   (10)
 #define S5PV210_UCON_PCLK       (0<<10)
 #define S5PV210_UCON_UCLK       (1<<10)
 
@@ -221,29 +227,24 @@
 #define S5PV210_UFSTAT_RXMASK   (255<<0)
 #define S5PV210_UFSTAT_RXSHIFT  (0)
 
-#define NO_NEED_CHECK_CLKSRC    1
+#define S3C2410_UCON_CLKSEL0    (1 << 0)
+#define S3C2410_UCON_CLKSEL1    (1 << 1)
+#define S3C2410_UCON_CLKSEL2    (1 << 2)
+#define S3C2410_UCON_CLKSEL3    (1 << 3)
 
-#ifndef __ASSEMBLY__
+/* Default values for s5pv210 UCON and UFCON uart registers */
+#define S5PV210_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |        \
+                                 S3C2410_UCON_RXILEVEL |        \
+                                 S3C2410_UCON_TXIRQMODE |       \
+                                 S3C2410_UCON_RXIRQMODE |       \
+                                 S3C2410_UCON_RXFIFO_TOI |      \
+                                 S3C2443_UCON_RXERR_IRQEN)
 
-/* struct s3c24xx_uart_clksrc
- *
- * this structure defines a named clock source that can be used for the
- * uart, so that the best clock can be selected for the requested baud
- * rate.
- *
- * min_baud and max_baud define the range of baud-rates this clock is
- * acceptable for, if they are both zero, it is assumed any baud rate that
- * can be generated from this clock will be used.
- *
- * divisor gives the divisor from the clock to the one seen by the uart
-*/
+#define S5PV210_UFCON_DEFAULT   (S3C2410_UFCON_FIFOMODE |       \
+                                 S5PV210_UFCON_TXTRIG4 |        \
+                                 S5PV210_UFCON_RXTRIG4)
 
-struct s3c24xx_uart_clksrc {
-        const char      *name;
-        unsigned int     divisor;
-        unsigned int     min_baud;
-        unsigned int     max_baud;
-};
+#ifndef __ASSEMBLY__
 
 /* configuration structure for per-machine configurations for the
  * serial port
@@ -257,15 +258,13 @@ struct s3c2410_uartcfg {
         unsigned char      unused;
         unsigned short     flags;
         upf_t              uart_flags;   /* default uart flags */
+        unsigned int       clk_sel;
 
         unsigned int       has_fracval;
 
         unsigned long      ucon;         /* value of ucon for port */
         unsigned long      ulcon;        /* value of ulcon for port */
         unsigned long      ufcon;        /* value of ufcon for port */
-
-        struct s3c24xx_uart_clksrc *clocks;
-        unsigned int                clocks_size;
 };
 
 /* s3c24xx_uart_devs
diff --git a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
index 4c16fa3621bb..aea68b60ef98 100644
--- a/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
+++ b/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
@@ -31,7 +31,6 @@ struct s3c64xx_spi_csinfo {
 /**
  * struct s3c64xx_spi_info - SPI Controller defining structure
  * @src_clk_nr: Clock source index for the CLK_CFG[SPI_CLKSEL] field.
- * @src_clk_name: Platform name of the corresponding clock.
  * @clk_from_cmu: If the SPI clock/prescalar control block is present
  *     by the platform's clock-management-unit and not in SPI controller.
  * @num_cs: Number of CS this controller emulates.
@@ -43,7 +42,6 @@ struct s3c64xx_spi_csinfo {
  */
 struct s3c64xx_spi_info {
         int src_clk_nr;
-        char *src_clk_name;
         bool clk_from_cmu;
 
         int num_cs;
@@ -58,18 +56,28 @@ struct s3c64xx_spi_info {
 };
 
 /**
- * s3c64xx_spi_set_info - SPI Controller configure callback by the board
+ * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board
  *                              initialization code.
- * @cntrlr: SPI controller number the configuration is for.
+ * @pd: SPI platform data to set.
  * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.
  * @num_cs: Number of elements in the 'cs' array.
  *
  * Call this from machine init code for each SPI Controller that
  * has some chips attached to it.
  */
-extern void s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
+extern void s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd,
+                                      int src_clk_nr, int num_cs);
+extern void s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,
+                                      int src_clk_nr, int num_cs);
+extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,
+                                      int src_clk_nr, int num_cs);
 
+/* defined by architecture to configure gpio */
+extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev);
+extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev);
+extern int s3c64xx_spi2_cfg_gpio(struct platform_device *dev);
+
+extern struct s3c64xx_spi_info s3c64xx_spi0_pdata;
+extern struct s3c64xx_spi_info s3c64xx_spi1_pdata;
+extern struct s3c64xx_spi_info s3c64xx_spi2_pdata;
 #endif /* __S3C64XX_PLAT_SPI_H */
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index e7b3c752e919..656dc00d30ed 100644
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -66,8 +66,6 @@ struct s3c_sdhci_platdata {
         enum cd_types   cd_type;
         enum clk_types  clk_type;
 
-        char            **clocks;       /* set of clock sources */
-
         int             ext_cd_gpio;
         bool            ext_cd_gpio_invert;
         int     (*ext_cd_init)(void (*notify_func)(struct platform_device *,
@@ -125,16 +123,17 @@ extern void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
 extern void exynos4_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
 extern void exynos4_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
 extern void exynos4_setup_sdhci3_cfg_gpio(struct platform_device *, int w);
+extern void s5p64x0_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
+extern void s5p64x0_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
+extern void s5p6440_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
+extern void s5p6450_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
 
 /* S3C2416 SDHCI setup */
 
 #ifdef CONFIG_S3C2416_SETUP_SDHCI
-extern char *s3c2416_hsmmc_clksrcs[4];
-
 static inline void s3c2416_default_sdhci0(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.clocks = s3c2416_hsmmc_clksrcs;
         s3c_hsmmc0_def_platdata.cfg_gpio = s3c2416_setup_sdhci0_cfg_gpio;
 #endif /* CONFIG_S3C_DEV_HSMMC */
 }
@@ -142,7 +141,6 @@ static inline void s3c2416_default_sdhci0(void)
 static inline void s3c2416_default_sdhci1(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.clocks = s3c2416_hsmmc_clksrcs;
         s3c_hsmmc1_def_platdata.cfg_gpio = s3c2416_setup_sdhci1_cfg_gpio;
 #endif /* CONFIG_S3C_DEV_HSMMC1 */
 }
@@ -152,15 +150,13 @@ static inline void s3c2416_default_sdhci0(void) { }
 static inline void s3c2416_default_sdhci1(void) { }
 
 #endif /* CONFIG_S3C2416_SETUP_SDHCI */
+
 /* S3C64XX SDHCI setup */
 
 #ifdef CONFIG_S3C64XX_SETUP_SDHCI
-extern char *s3c64xx_hsmmc_clksrcs[4];
-
 static inline void s3c6400_default_sdhci0(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;
         s3c_hsmmc0_def_platdata.cfg_gpio = s3c64xx_setup_sdhci0_cfg_gpio;
 #endif
 }
@@ -168,7 +164,6 @@ static inline void s3c6400_default_sdhci0(void)
 static inline void s3c6400_default_sdhci1(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;
         s3c_hsmmc1_def_platdata.cfg_gpio = s3c64xx_setup_sdhci1_cfg_gpio;
 #endif
 }
@@ -176,7 +171,6 @@ static inline void s3c6400_default_sdhci1(void)
 static inline void s3c6400_default_sdhci2(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;
         s3c_hsmmc2_def_platdata.cfg_gpio = s3c64xx_setup_sdhci2_cfg_gpio;
 #endif
 }
@@ -184,7 +178,6 @@ static inline void s3c6400_default_sdhci2(void)
 static inline void s3c6410_default_sdhci0(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;
         s3c_hsmmc0_def_platdata.cfg_gpio = s3c64xx_setup_sdhci0_cfg_gpio;
 #endif
 }
@@ -192,7 +185,6 @@ static inline void s3c6410_default_sdhci0(void)
 static inline void s3c6410_default_sdhci1(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;
         s3c_hsmmc1_def_platdata.cfg_gpio = s3c64xx_setup_sdhci1_cfg_gpio;
 #endif
 }
@@ -200,7 +192,6 @@ static inline void s3c6410_default_sdhci1(void)
 static inline void s3c6410_default_sdhci2(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.clocks = s3c64xx_hsmmc_clksrcs;
         s3c_hsmmc2_def_platdata.cfg_gpio = s3c64xx_setup_sdhci2_cfg_gpio;
 #endif
 }
@@ -215,15 +206,51 @@ static inline void s3c6400_default_sdhci2(void) { }
 
 #endif /* CONFIG_S3C64XX_SETUP_SDHCI */
 
+/* S5P64X0 SDHCI setup */
+
+#ifdef CONFIG_S5P64X0_SETUP_SDHCI
+static inline void s5p64x0_default_sdhci0(void)
+{
+#ifdef CONFIG_S3C_DEV_HSMMC
+        s3c_hsmmc0_def_platdata.cfg_gpio = s5p64x0_setup_sdhci0_cfg_gpio;
+#endif
+}
+
+static inline void s5p64x0_default_sdhci1(void)
+{
+#ifdef CONFIG_S3C_DEV_HSMMC1
+        s3c_hsmmc1_def_platdata.cfg_gpio = s5p64x0_setup_sdhci1_cfg_gpio;
+#endif
+}
+
+static inline void s5p6440_default_sdhci2(void)
+{
+#ifdef CONFIG_S3C_DEV_HSMMC2
+        s3c_hsmmc2_def_platdata.cfg_gpio = s5p6440_setup_sdhci2_cfg_gpio;
+#endif
+}
+
+static inline void s5p6450_default_sdhci2(void)
+{
+#ifdef CONFIG_S3C_DEV_HSMMC2
+        s3c_hsmmc2_def_platdata.cfg_gpio = s5p6450_setup_sdhci2_cfg_gpio;
+#endif
+}
+
+#else
+static inline void s5p64x0_default_sdhci0(void) { }
+static inline void s5p64x0_default_sdhci1(void) { }
+static inline void s5p6440_default_sdhci2(void) { }
+static inline void s5p6450_default_sdhci2(void) { }
+
+#endif /* CONFIG_S5P64X0_SETUP_SDHCI */
+
 /* S5PC100 SDHCI setup */
 
 #ifdef CONFIG_S5PC100_SETUP_SDHCI
-extern char *s5pc100_hsmmc_clksrcs[4];
-
 static inline void s5pc100_default_sdhci0(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.clocks = s5pc100_hsmmc_clksrcs;
         s3c_hsmmc0_def_platdata.cfg_gpio = s5pc100_setup_sdhci0_cfg_gpio;
 #endif
 }
@@ -231,7 +258,6 @@ static inline void s5pc100_default_sdhci0(void)
 static inline void s5pc100_default_sdhci1(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.clocks = s5pc100_hsmmc_clksrcs;
         s3c_hsmmc1_def_platdata.cfg_gpio = s5pc100_setup_sdhci1_cfg_gpio;
 #endif
 }
@@ -239,7 +265,6 @@ static inline void s5pc100_default_sdhci1(void)
 static inline void s5pc100_default_sdhci2(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.clocks = s5pc100_hsmmc_clksrcs;
         s3c_hsmmc2_def_platdata.cfg_gpio = s5pc100_setup_sdhci2_cfg_gpio;
 #endif
 }
@@ -254,12 +279,9 @@ static inline void s5pc100_default_sdhci2(void) { }
 /* S5PV210 SDHCI setup */
 
 #ifdef CONFIG_S5PV210_SETUP_SDHCI
-extern char *s5pv210_hsmmc_clksrcs[4];
-
 static inline void s5pv210_default_sdhci0(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
         s3c_hsmmc0_def_platdata.cfg_gpio = s5pv210_setup_sdhci0_cfg_gpio;
 #endif
 }
@@ -267,7 +289,6 @@ static inline void s5pv210_default_sdhci0(void)
 static inline void s5pv210_default_sdhci1(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
         s3c_hsmmc1_def_platdata.cfg_gpio = s5pv210_setup_sdhci1_cfg_gpio;
 #endif
 }
@@ -275,7 +296,6 @@ static inline void s5pv210_default_sdhci1(void)
 static inline void s5pv210_default_sdhci2(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
         s3c_hsmmc2_def_platdata.cfg_gpio = s5pv210_setup_sdhci2_cfg_gpio;
 #endif
 }
@@ -283,7 +303,6 @@ static inline void s5pv210_default_sdhci2(void)
 static inline void s5pv210_default_sdhci3(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC3
-        s3c_hsmmc3_def_platdata.clocks = s5pv210_hsmmc_clksrcs;
         s3c_hsmmc3_def_platdata.cfg_gpio = s5pv210_setup_sdhci3_cfg_gpio;
 #endif
 }
@@ -298,12 +317,9 @@ static inline void s5pv210_default_sdhci3(void) { }
 
 /* EXYNOS4 SDHCI setup */
 #ifdef CONFIG_EXYNOS4_SETUP_SDHCI
-extern char *exynos4_hsmmc_clksrcs[4];
-
 static inline void exynos4_default_sdhci0(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.clocks = exynos4_hsmmc_clksrcs;
         s3c_hsmmc0_def_platdata.cfg_gpio = exynos4_setup_sdhci0_cfg_gpio;
 #endif
 }
@@ -311,7 +327,6 @@ static inline void exynos4_default_sdhci0(void)
 static inline void exynos4_default_sdhci1(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.clocks = exynos4_hsmmc_clksrcs;
         s3c_hsmmc1_def_platdata.cfg_gpio = exynos4_setup_sdhci1_cfg_gpio;
 #endif
 }
@@ -319,7 +334,6 @@ static inline void exynos4_default_sdhci1(void)
 static inline void exynos4_default_sdhci2(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.clocks = exynos4_hsmmc_clksrcs;
         s3c_hsmmc2_def_platdata.cfg_gpio = exynos4_setup_sdhci2_cfg_gpio;
 #endif
 }
@@ -327,7 +341,6 @@ static inline void exynos4_default_sdhci2(void)
 static inline void exynos4_default_sdhci3(void)
 {
 #ifdef CONFIG_S3C_DEV_HSMMC3
-        s3c_hsmmc3_def_platdata.clocks = exynos4_hsmmc_clksrcs;
         s3c_hsmmc3_def_platdata.cfg_gpio = exynos4_setup_sdhci3_cfg_gpio;
 #endif
 }
diff --git a/arch/arm/plat-samsung/include/plat/udc.h b/arch/arm/plat-samsung/include/plat/udc.h
index 8c22d586befb..de8e2288a509 100644
--- a/arch/arm/plat-samsung/include/plat/udc.h
+++ b/arch/arm/plat-samsung/include/plat/udc.h
@@ -37,20 +37,7 @@ struct s3c2410_udc_mach_info {
 
 extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);
 
-/**
- * s3c24xx_hsudc_platdata - Platform data for USB High-Speed gadget controller.
- * @epnum: Number of endpoints to be instantiated by the controller driver.
- * @gpio_init: Platform specific USB related GPIO initialization.
- * @gpio_uninit: Platform specific USB releted GPIO uninitialzation.
- *
- * Representation of platform data for the S3C24XX USB 2.0 High Speed gadget
- * controllers.
- */
-struct s3c24xx_hsudc_platdata {
-        unsigned int    epnum;
-        void            (*gpio_init)(void);
-        void            (*gpio_uninit)(void);
-};
+struct s3c24xx_hsudc_platdata;
 
 extern void __init s3c24xx_hsudc_set_platdata(struct s3c24xx_hsudc_platdata *pd);
 
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 1f17bde52cd4..7c756fb189f7 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -109,7 +109,7 @@ struct eth_addr {
         u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[2];
-static struct eth_platform_data __initdata eth_data[2];
+static struct macb_platform_data __initdata eth_data[2];
 
 static struct spi_board_info spi0_board_info[] __initdata = {
         {
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index 4643ff5107c9..c56ddac85d61 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -105,7 +105,7 @@ struct eth_addr {
 };
 
 static struct eth_addr __initdata hw_addr[2];
-static struct eth_platform_data __initdata eth_data[2] = {
+static struct macb_platform_data __initdata eth_data[2] = {
         {
                 /*
                  * The MDIO pullups on STK1000 are a bit too weak for
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 86fab77a5a00..27bd6fbe21cb 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -50,7 +50,7 @@ struct eth_addr {
         u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[1];
-static struct eth_platform_data __initdata eth_data[1] = {
+static struct macb_platform_data __initdata eth_data[1] = {
         {
                 .phy_mask       = ~(1U << 1),
         },
diff --git a/arch/avr32/boards/hammerhead/setup.c b/arch/avr32/boards/hammerhead/setup.c
index da14fbdd4e8e..9d1efd1cd425 100644
--- a/arch/avr32/boards/hammerhead/setup.c
+++ b/arch/avr32/boards/hammerhead/setup.c
@@ -102,7 +102,7 @@ struct eth_addr {
 };
 
 static struct eth_addr __initdata hw_addr[1];
-static struct eth_platform_data __initdata eth_data[1];
+static struct macb_platform_data __initdata eth_data[1];
 
 /*
  * The next two functions should go away as the boot loader is
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index e61bc948f959..ed137e335796 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -52,7 +52,7 @@ struct eth_addr {
 };
 
 static struct eth_addr __initdata hw_addr[2];
-static struct eth_platform_data __initdata eth_data[2];
+static struct macb_platform_data __initdata eth_data[2];
 
 static int ads7846_get_pendown_state_PB26(void)
 {
diff --git a/arch/avr32/boards/mimc200/setup.c b/arch/avr32/boards/mimc200/setup.c
index c4da5cba2dbf..05358aa5ef7d 100644
--- a/arch/avr32/boards/mimc200/setup.c
+++ b/arch/avr32/boards/mimc200/setup.c
@@ -86,7 +86,7 @@ struct eth_addr {
         u8 addr[6];
 };
 static struct eth_addr __initdata hw_addr[2];
-static struct eth_platform_data __initdata eth_data[2];
+static struct macb_platform_data __initdata eth_data[2];
 
 static struct spi_eeprom eeprom_25lc010 = {
                 .name = "25lc010",
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 7fbf0dcb9afe..402a7bb72669 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1067,7 +1067,7 @@ void __init at32_setup_serial_console(unsigned int usart_id)
  * -------------------------------------------------------------------- */
 
 #ifdef CONFIG_CPU_AT32AP7000
-static struct eth_platform_data macb0_data;
+static struct macb_platform_data macb0_data;
 static struct resource macb0_resource[] = {
         PBMEM(0xfff01800),
         IRQ(25),
@@ -1076,7 +1076,7 @@ DEFINE_DEV_DATA(macb, 0);
 DEV_CLK(hclk, macb0, hsb, 8);
 DEV_CLK(pclk, macb0, pbb, 6);
 
-static struct eth_platform_data macb1_data;
+static struct macb_platform_data macb1_data;
 static struct resource macb1_resource[] = {
         PBMEM(0xfff01c00),
         IRQ(26),
@@ -1086,7 +1086,7 @@ DEV_CLK(hclk, macb1, hsb, 9);
 DEV_CLK(pclk, macb1, pbb, 7);
 
 struct platform_device *__init
-at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
+at32_add_device_eth(unsigned int id, struct macb_platform_data *data)
 {
         struct platform_device *pdev;
         u32 pin_mask;
@@ -1163,7 +1163,7 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                 return NULL;
         }
 
-        memcpy(pdev->dev.platform_data, data, sizeof(struct eth_platform_data));
+        memcpy(pdev->dev.platform_data, data, sizeof(struct macb_platform_data));
         platform_device_register(pdev);
 
         return pdev;
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index 5d7ffca7d69f..67b111ce332d 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -6,6 +6,7 @@
 
 #include <linux/types.h>
 #include <linux/serial.h>
+#include <linux/platform_data/macb.h>
 
 #define GPIO_PIN_NONE   (-1)
 
@@ -42,12 +43,8 @@ struct atmel_uart_data {
 void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
 struct platform_device *at32_add_device_usart(unsigned int id);
 
-struct eth_platform_data {
-        u32     phy_mask;
-        u8      is_rmii;
-};
 struct platform_device *
-at32_add_device_eth(unsigned int id, struct eth_platform_data *data);
+at32_add_device_eth(unsigned int id, struct macb_platform_data *data);
 
 struct spi_board_info;
 struct platform_device *
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index c7b5afeecaf2..3fea3689527e 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -441,6 +441,9 @@ static void __init fixup_port_irq(int index,
                 return;
 
         port->irq = virq;
+
+        if (of_device_is_compatible(np, "fsl,ns16550"))
+                port->handle_irq = fsl8250_handle_irq;
 }
 
 static void __init fixup_port_pio(int index,
diff --git a/arch/s390/Kbuild b/arch/s390/Kbuild
index ae4b01060edd..9858476fa0fe 100644
--- a/arch/s390/Kbuild
+++ b/arch/s390/Kbuild
@@ -1,6 +1,7 @@
-obj-y += kernel/
-obj-y += mm/
-obj-y += crypto/
-obj-y += appldata/
-obj-y += hypfs/
-obj-y += kvm/
+obj-y                           += kernel/
+obj-y                           += mm/
+obj-$(CONFIG_KVM)               += kvm/
+obj-$(CONFIG_CRYPTO_HW)         += crypto/
+obj-$(CONFIG_S390_HYPFS_FS)     += hypfs/
+obj-$(CONFIG_APPLDATA_BASE)     += appldata/
+obj-$(CONFIG_MATHEMU)           += math-emu/
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 28d183c42751..d1727584230a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -193,18 +193,13 @@ config HOTPLUG_CPU
           Say N if you want to disable CPU hotplug.
 
 config SCHED_MC
-        def_bool y
-        prompt "Multi-core scheduler support"
-        depends on SMP
-        help
-          Multi-core scheduler support improves the CPU scheduler's decision
-          making when dealing with multi-core CPU chips at a cost of slightly
-          increased overhead in some places.
+        def_bool n
 
 config SCHED_BOOK
         def_bool y
         prompt "Book scheduler support"
-        depends on SMP && SCHED_MC
+        depends on SMP
+        select SCHED_MC
         help
           Book scheduler support improves the CPU scheduler's decision making
           when dealing with machines that have several books.
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 27a0b5df5ead..e9f353341693 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -99,7 +99,6 @@ core-y		+= arch/s390/
 
 libs-y          += arch/s390/lib/
 drivers-y       += drivers/s390/
-drivers-$(CONFIG_MATHEMU) += arch/s390/math-emu/
 
 # must be linked after kernel
 drivers-$(CONFIG_OPROFILE)      += arch/s390/oprofile/
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 635d677d3281..f2737a005afc 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -23,4 +23,4 @@ $(obj)/compressed/vmlinux: FORCE
 
 install: $(CONFIGURE) $(obj)/image
         sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
-              System.map Kerntypes "$(INSTALL_PATH)"
+              System.map "$(INSTALL_PATH)"
diff --git a/arch/s390/include/asm/kdebug.h b/arch/s390/include/asm/kdebug.h
index 40db27cd6e60..5c1abd47612a 100644
--- a/arch/s390/include/asm/kdebug.h
+++ b/arch/s390/include/asm/kdebug.h
@@ -22,6 +22,6 @@ enum die_val {
         DIE_NMI_IPI,
 };
 
-extern void die(const char *, struct pt_regs *, long);
+extern void die(struct pt_regs *, const char *);
 
 #endif
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 9e13c7d56cc1..707f2306725b 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -97,47 +97,52 @@ struct _lowcore {
         __u32   gpregs_save_area[16];           /* 0x0180 */
         __u32   cregs_save_area[16];            /* 0x01c0 */
 
+        /* Save areas. */
+        __u32   save_area_sync[8];              /* 0x0200 */
+        __u32   save_area_async[8];             /* 0x0220 */
+        __u32   save_area_restart[1];           /* 0x0240 */
+        __u8    pad_0x0244[0x0248-0x0244];      /* 0x0244 */
+
         /* Return psws. */
-        __u32   save_area[16];                  /* 0x0200 */
-        psw_t   return_psw;                     /* 0x0240 */
-        psw_t   return_mcck_psw;                /* 0x0248 */
+        psw_t   return_psw;                     /* 0x0248 */
+        psw_t   return_mcck_psw;                /* 0x0250 */
 
         /* CPU time accounting values */
-        __u64   sync_enter_timer;               /* 0x0250 */
-        __u64   async_enter_timer;              /* 0x0258 */
-        __u64   mcck_enter_timer;               /* 0x0260 */
-        __u64   exit_timer;                     /* 0x0268 */
-        __u64   user_timer;                     /* 0x0270 */
-        __u64   system_timer;                   /* 0x0278 */
-        __u64   steal_timer;                    /* 0x0280 */
-        __u64   last_update_timer;              /* 0x0288 */
-        __u64   last_update_clock;              /* 0x0290 */
+        __u64   sync_enter_timer;               /* 0x0258 */
+        __u64   async_enter_timer;              /* 0x0260 */
+        __u64   mcck_enter_timer;               /* 0x0268 */
+        __u64   exit_timer;                     /* 0x0270 */
+        __u64   user_timer;                     /* 0x0278 */
+        __u64   system_timer;                   /* 0x0280 */
+        __u64   steal_timer;                    /* 0x0288 */
+        __u64   last_update_timer;              /* 0x0290 */
+        __u64   last_update_clock;              /* 0x0298 */
 
         /* Current process. */
-        __u32   current_task;                   /* 0x0298 */
-        __u32   thread_info;                    /* 0x029c */
-        __u32   kernel_stack;                   /* 0x02a0 */
+        __u32   current_task;                   /* 0x02a0 */
+        __u32   thread_info;                    /* 0x02a4 */
+        __u32   kernel_stack;                   /* 0x02a8 */
 
         /* Interrupt and panic stack. */
-        __u32   async_stack;                    /* 0x02a4 */
-        __u32   panic_stack;                    /* 0x02a8 */
+        __u32   async_stack;                    /* 0x02ac */
+        __u32   panic_stack;                    /* 0x02b0 */
 
         /* Address space pointer. */
-        __u32   kernel_asce;                    /* 0x02ac */
-        __u32   user_asce;                      /* 0x02b0 */
-        __u32   current_pid;                    /* 0x02b4 */
+        __u32   kernel_asce;                    /* 0x02b4 */
+        __u32   user_asce;                      /* 0x02b8 */
+        __u32   current_pid;                    /* 0x02bc */
 
         /* SMP info area */
-        __u32   cpu_nr;                         /* 0x02b8 */
-        __u32   softirq_pending;                /* 0x02bc */
-        __u32   percpu_offset;                  /* 0x02c0 */
-        __u32   ext_call_fast;                  /* 0x02c4 */
-        __u64   int_clock;                      /* 0x02c8 */
-        __u64   mcck_clock;                     /* 0x02d0 */
-        __u64   clock_comparator;               /* 0x02d8 */
-        __u32   machine_flags;                  /* 0x02e0 */
-        __u32   ftrace_func;                    /* 0x02e4 */
-        __u8    pad_0x02e8[0x0300-0x02e8];      /* 0x02e8 */
+        __u32   cpu_nr;                         /* 0x02c0 */
+        __u32   softirq_pending;                /* 0x02c4 */
+        __u32   percpu_offset;                  /* 0x02c8 */
+        __u32   ext_call_fast;                  /* 0x02cc */
+        __u64   int_clock;                      /* 0x02d0 */
+        __u64   mcck_clock;                     /* 0x02d8 */
+        __u64   clock_comparator;               /* 0x02e0 */
+        __u32   machine_flags;                  /* 0x02e8 */
+        __u32   ftrace_func;                    /* 0x02ec */
+        __u8    pad_0x02f8[0x0300-0x02f0];      /* 0x02f0 */
 
         /* Interrupt response block */
         __u8    irb[64];                        /* 0x0300 */
@@ -229,57 +234,62 @@ struct _lowcore {
         psw_t   mcck_new_psw;                   /* 0x01e0 */
         psw_t   io_new_psw;                     /* 0x01f0 */
 
-        /* Entry/exit save area & return psws. */
-        __u64   save_area[16];                  /* 0x0200 */
-        psw_t   return_psw;                     /* 0x0280 */
-        psw_t   return_mcck_psw;                /* 0x0290 */
+        /* Save areas. */
+        __u64   save_area_sync[8];              /* 0x0200 */
+        __u64   save_area_async[8];             /* 0x0240 */
+        __u64   save_area_restart[1];           /* 0x0280 */
+        __u8    pad_0x0288[0x0290-0x0288];      /* 0x0288 */
+
+        /* Return psws. */
+        psw_t   return_psw;                     /* 0x0290 */
+        psw_t   return_mcck_psw;                /* 0x02a0 */
 
         /* CPU accounting and timing values. */
-        __u64   sync_enter_timer;               /* 0x02a0 */
-        __u64   async_enter_timer;              /* 0x02a8 */
-        __u64   mcck_enter_timer;               /* 0x02b0 */
-        __u64   exit_timer;                     /* 0x02b8 */
-        __u64   user_timer;                     /* 0x02c0 */
-        __u64   system_timer;                   /* 0x02c8 */
-        __u64   steal_timer;                    /* 0x02d0 */
-        __u64   last_update_timer;              /* 0x02d8 */
-        __u64   last_update_clock;              /* 0x02e0 */
+        __u64   sync_enter_timer;               /* 0x02b0 */
+        __u64   async_enter_timer;              /* 0x02b8 */
+        __u64   mcck_enter_timer;               /* 0x02c0 */
+        __u64   exit_timer;                     /* 0x02c8 */
+        __u64   user_timer;                     /* 0x02d0 */
+        __u64   system_timer;                   /* 0x02d8 */
+        __u64   steal_timer;                    /* 0x02e0 */
+        __u64   last_update_timer;              /* 0x02e8 */
+        __u64   last_update_clock;              /* 0x02f0 */
 
         /* Current process. */
-        __u64   current_task;                   /* 0x02e8 */
-        __u64   thread_info;                    /* 0x02f0 */
-        __u64   kernel_stack;                   /* 0x02f8 */
+        __u64   current_task;                   /* 0x02f8 */
+        __u64   thread_info;                    /* 0x0300 */
+        __u64   kernel_stack;                   /* 0x0308 */
 
         /* Interrupt and panic stack. */
-        __u64   async_stack;                    /* 0x0300 */
-        __u64   panic_stack;                    /* 0x0308 */
+        __u64   async_stack;                    /* 0x0310 */
+        __u64   panic_stack;                    /* 0x0318 */
 
         /* Address space pointer. */
-        __u64   kernel_asce;                    /* 0x0310 */
-        __u64   user_asce;                      /* 0x0318 */
-        __u64   current_pid;                    /* 0x0320 */
+        __u64   kernel_asce;                    /* 0x0320 */
+        __u64   user_asce;                      /* 0x0328 */
+        __u64   current_pid;                    /* 0x0330 */
 
         /* SMP info area */
-        __u32   cpu_nr;                         /* 0x0328 */
-        __u32   softirq_pending;                /* 0x032c */
-        __u64   percpu_offset;                  /* 0x0330 */
-        __u64   ext_call_fast;                  /* 0x0338 */
-        __u64   int_clock;                      /* 0x0340 */
-        __u64   mcck_clock;                     /* 0x0348 */
-        __u64   clock_comparator;               /* 0x0350 */
-        __u64   vdso_per_cpu_data;              /* 0x0358 */
-        __u64   machine_flags;                  /* 0x0360 */
-        __u64   ftrace_func;                    /* 0x0368 */
-        __u64   gmap;                           /* 0x0370 */
-        __u64   cmf_hpp;                        /* 0x0378 */
+        __u32   cpu_nr;                         /* 0x0338 */
+        __u32   softirq_pending;                /* 0x033c */
+        __u64   percpu_offset;                  /* 0x0340 */
+        __u64   ext_call_fast;                  /* 0x0348 */
+        __u64   int_clock;                      /* 0x0350 */
+        __u64   mcck_clock;                     /* 0x0358 */
+        __u64   clock_comparator;               /* 0x0360 */
+        __u64   vdso_per_cpu_data;              /* 0x0368 */
+        __u64   machine_flags;                  /* 0x0370 */
+        __u64   ftrace_func;                    /* 0x0378 */
+        __u64   gmap;                           /* 0x0380 */
+        __u8    pad_0x0388[0x0400-0x0388];      /* 0x0388 */
 
         /* Interrupt response block. */
-        __u8    irb[64];                        /* 0x0380 */
+        __u8    irb[64];                        /* 0x0400 */
 
         /* Per cpu primary space access list */
-        __u32   paste[16];                      /* 0x03c0 */
+        __u32   paste[16];                      /* 0x0440 */
 
-        __u8    pad_0x0400[0x0e00-0x0400];      /* 0x0400 */
+        __u8    pad_0x0480[0x0e00-0x0480];      /* 0x0480 */
 
         /*
          * 0xe00 contains the address of the IPL Parameter Information
diff --git a/arch/s390/include/asm/percpu.h b/arch/s390/include/asm/percpu.h
index 5325c89a5843..0fbd1899c7b0 100644
--- a/arch/s390/include/asm/percpu.h
+++ b/arch/s390/include/asm/percpu.h
@@ -19,7 +19,7 @@
 #define ARCH_NEEDS_WEAK_PER_CPU
 #endif
 
-#define arch_irqsafe_cpu_to_op(pcp, val, op)                            \
+#define arch_this_cpu_to_op(pcp, val, op)                               \
 do {                                                                    \
         typedef typeof(pcp) pcp_op_T__;                                 \
         pcp_op_T__ old__, new__, prev__;                                \
@@ -41,27 +41,27 @@ do {									\
         preempt_enable();                                               \
 } while (0)
 
-#define irqsafe_cpu_add_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
-#define irqsafe_cpu_add_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
-#define irqsafe_cpu_add_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
-#define irqsafe_cpu_add_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
+#define this_cpu_add_1(pcp, val) arch_this_cpu_to_op(pcp, val, +)
+#define this_cpu_add_2(pcp, val) arch_this_cpu_to_op(pcp, val, +)
+#define this_cpu_add_4(pcp, val) arch_this_cpu_to_op(pcp, val, +)
+#define this_cpu_add_8(pcp, val) arch_this_cpu_to_op(pcp, val, +)
 
-#define irqsafe_cpu_and_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
-#define irqsafe_cpu_and_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
-#define irqsafe_cpu_and_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
-#define irqsafe_cpu_and_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
+#define this_cpu_and_1(pcp, val) arch_this_cpu_to_op(pcp, val, &)
+#define this_cpu_and_2(pcp, val) arch_this_cpu_to_op(pcp, val, &)
+#define this_cpu_and_4(pcp, val) arch_this_cpu_to_op(pcp, val, &)
+#define this_cpu_and_8(pcp, val) arch_this_cpu_to_op(pcp, val, &)
 
-#define irqsafe_cpu_or_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
-#define irqsafe_cpu_or_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
-#define irqsafe_cpu_or_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
-#define irqsafe_cpu_or_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
+#define this_cpu_or_1(pcp, val) arch_this_cpu_to_op(pcp, val, |)
+#define this_cpu_or_2(pcp, val) arch_this_cpu_to_op(pcp, val, |)
+#define this_cpu_or_4(pcp, val) arch_this_cpu_to_op(pcp, val, |)
+#define this_cpu_or_8(pcp, val) arch_this_cpu_to_op(pcp, val, |)
 
-#define irqsafe_cpu_xor_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
-#define irqsafe_cpu_xor_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
-#define irqsafe_cpu_xor_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
-#define irqsafe_cpu_xor_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
+#define this_cpu_xor_1(pcp, val) arch_this_cpu_to_op(pcp, val, ^)
+#define this_cpu_xor_2(pcp, val) arch_this_cpu_to_op(pcp, val, ^)
+#define this_cpu_xor_4(pcp, val) arch_this_cpu_to_op(pcp, val, ^)
+#define this_cpu_xor_8(pcp, val) arch_this_cpu_to_op(pcp, val, ^)
 
-#define arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)                       \
+#define arch_this_cpu_cmpxchg(pcp, oval, nval)                  \
 ({                                                                      \
         typedef typeof(pcp) pcp_op_T__;                                 \
         pcp_op_T__ ret__;                                               \
@@ -79,10 +79,10 @@ do {									\
         ret__;                                                          \
 })
 
-#define irqsafe_cpu_cmpxchg_1(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
-#define irqsafe_cpu_cmpxchg_2(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
-#define irqsafe_cpu_cmpxchg_4(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
-#define irqsafe_cpu_cmpxchg_8(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
+#define this_cpu_cmpxchg_1(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)
+#define this_cpu_cmpxchg_2(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)
+#define this_cpu_cmpxchg_4(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)
+#define this_cpu_cmpxchg_8(pcp, oval, nval) arch_this_cpu_cmpxchg(pcp, oval, nval)
 
 #include <asm-generic/percpu.h>
 
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 4f289ff0b7fe..011358c1b18e 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -128,28 +128,11 @@ static inline int is_zero_pfn(unsigned long pfn)
  * effect, this also makes sure that 64 bit module code cannot be used
  * as system call address.
  */
-
 extern unsigned long VMALLOC_START;
+extern unsigned long VMALLOC_END;
+extern struct page *vmemmap;
 
-#ifndef __s390x__
-#define VMALLOC_SIZE    (96UL << 20)
-#define VMALLOC_END     0x7e000000UL
-#define VMEM_MAP_END    0x80000000UL
-#else /* __s390x__ */
-#define VMALLOC_SIZE    (128UL << 30)
-#define VMALLOC_END     0x3e000000000UL
-#define VMEM_MAP_END    0x40000000000UL
-#endif /* __s390x__ */
-
-/*
- * VMEM_MAX_PHYS is the highest physical address that can be added to the 1:1
- * mapping. This needs to be calculated at compile time since the size of the
- * VMEM_MAP is static but the size of struct page can change.
- */
-#define VMEM_MAX_PAGES  ((VMEM_MAP_END - VMALLOC_END) / sizeof(struct page))
-#define VMEM_MAX_PFN    min(VMALLOC_START >> PAGE_SHIFT, VMEM_MAX_PAGES)
-#define VMEM_MAX_PHYS   ((VMEM_MAX_PFN << PAGE_SHIFT) & ~((16 << 20) - 1))
-#define vmemmap         ((struct page *) VMALLOC_END)
+#define VMEM_MAX_PHYS ((unsigned long) vmemmap)
 
 /*
  * A 31 bit pagetable entry of S390 has following format:
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 5f33d37d032c..27272f6a14c2 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -80,8 +80,6 @@ struct thread_struct {
         unsigned int  acrs[NUM_ACRS];
         unsigned long ksp;              /* kernel stack pointer             */
         mm_segment_t mm_segment;
-        unsigned long prot_addr;        /* address of protection-excep.     */
-        unsigned int trap_no;
         unsigned long gmap_addr;        /* address of last gmap fault. */
         struct per_regs per_user;       /* User specified PER registers */
         struct per_event per_event;     /* Cause of the last PER trap */
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index a65846340d51..56da355678f4 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -324,7 +324,8 @@ struct pt_regs
         psw_t psw;
         unsigned long gprs[NUM_GPRS];
         unsigned long orig_gpr2;
-        unsigned int svc_code;
+        unsigned int int_code;
+        unsigned long int_parm_long;
 };
 
 /*
diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index e63d13dd3bf5..d75c8e78f7e3 100644
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -352,7 +352,7 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
  * @no_output_qs: number of output queues
  * @input_handler: handler to be called for input queues
  * @output_handler: handler to be called for output queues
- * @queue_start_poll: polling handlers (one per input queue or NULL)
+ * @queue_start_poll_array: polling handlers (one per input queue or NULL)
  * @int_parm: interruption parameter
  * @input_sbal_addr_array:  address of no_input_qs * 128 pointers
  * @output_sbal_addr_array: address of no_output_qs * 128 pointers
@@ -372,7 +372,8 @@ struct qdio_initialize {
         unsigned int no_output_qs;
         qdio_handler_t *input_handler;
         qdio_handler_t *output_handler;
-        void (**queue_start_poll) (struct ccw_device *, int, unsigned long);
+        void (**queue_start_poll_array) (struct ccw_device *, int,
+                                          unsigned long);
         int scan_threshold;
         unsigned long int_parm;
         void **input_sbal_addr_array;
diff --git a/arch/s390/include/asm/sigp.h b/arch/s390/include/asm/sigp.h
index e3bffd4e2d66..7040b8567cd0 100644
--- a/arch/s390/include/asm/sigp.h
+++ b/arch/s390/include/asm/sigp.h
@@ -56,6 +56,7 @@ enum {
         ec_schedule = 0,
         ec_call_function,
         ec_call_function_single,
+        ec_stop_cpu,
 };
 
 /*
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h
index ab47a69fdf07..c32e9123b40c 100644
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
@@ -23,7 +23,6 @@ extern void __cpu_die (unsigned int cpu);
 extern int __cpu_up (unsigned int cpu);
 
 extern struct mutex smp_cpu_state_mutex;
-extern int smp_cpu_polarization[];
 
 extern void arch_send_call_function_single_ipi(int cpu);
 extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
diff --git a/arch/s390/include/asm/sparsemem.h b/arch/s390/include/asm/sparsemem.h
index 545d219e6a2d..0fb34027d3f6 100644
--- a/arch/s390/include/asm/sparsemem.h
+++ b/arch/s390/include/asm/sparsemem.h
@@ -4,8 +4,8 @@
 #ifdef CONFIG_64BIT
 
 #define SECTION_SIZE_BITS       28
-#define MAX_PHYSADDR_BITS       42
-#define MAX_PHYSMEM_BITS        42
+#define MAX_PHYSADDR_BITS       46
+#define MAX_PHYSMEM_BITS        46
 
 #else
 
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index b239ff53b189..fb214dd9b7e0 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -27,7 +27,7 @@ static inline long syscall_get_nr(struct task_struct *task,
                                   struct pt_regs *regs)
 {
         return test_tsk_thread_flag(task, TIF_SYSCALL) ?
-                (regs->svc_code & 0xffff) : -1;
+                (regs->int_code & 0xffff) : -1;
 }
 
 static inline void syscall_rollback(struct task_struct *task,
diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
index ef573c1d71a7..d73cc6b60000 100644
--- a/arch/s390/include/asm/system.h
+++ b/arch/s390/include/asm/system.h
@@ -20,8 +20,6 @@
 
 struct task_struct;
 
-extern int sysctl_userprocess_debug;
-
 extern struct task_struct *__switch_to(void *, void *);
 extern void update_per_regs(struct task_struct *task);
 
diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index 005d77d8ae2a..0837de80c351 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -4,6 +4,10 @@
 #include <linux/cpumask.h>
 #include <asm/sysinfo.h>
 
+struct cpu;
+
+#ifdef CONFIG_SCHED_BOOK
+
 extern unsigned char cpu_core_id[NR_CPUS];
 extern cpumask_t cpu_core_map[NR_CPUS];
 
@@ -16,8 +20,6 @@ static inline const struct cpumask *cpu_coregroup_mask(int cpu)
 #define topology_core_cpumask(cpu)      (&cpu_core_map[cpu])
 #define mc_capable()                    (1)
 
-#ifdef CONFIG_SCHED_BOOK
-
 extern unsigned char cpu_book_id[NR_CPUS];
 extern cpumask_t cpu_book_map[NR_CPUS];
 
@@ -29,19 +31,45 @@ static inline const struct cpumask *cpu_book_mask(int cpu)
 #define topology_book_id(cpu)           (cpu_book_id[cpu])
 #define topology_book_cpumask(cpu)      (&cpu_book_map[cpu])
 
-#endif /* CONFIG_SCHED_BOOK */
-
+int topology_cpu_init(struct cpu *);
 int topology_set_cpu_management(int fc);
 void topology_schedule_update(void);
 void store_topology(struct sysinfo_15_1_x *info);
+void topology_expect_change(void);
+
+#else /* CONFIG_SCHED_BOOK */
+
+static inline void topology_schedule_update(void) { }
+static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
+static inline void topology_expect_change(void) { }
 
-#define POLARIZATION_UNKNWN     (-1)
+#endif /* CONFIG_SCHED_BOOK */
+
+#define POLARIZATION_UNKNOWN    (-1)
 #define POLARIZATION_HRZ        (0)
 #define POLARIZATION_VL         (1)
 #define POLARIZATION_VM         (2)
 #define POLARIZATION_VH         (3)
 
-#ifdef CONFIG_SMP
+extern int cpu_polarization[];
+
+static inline void cpu_set_polarization(int cpu, int val)
+{
+#ifdef CONFIG_SCHED_BOOK
+        cpu_polarization[cpu] = val;
+#endif
+}
+
+static inline int cpu_read_polarization(int cpu)
+{
+#ifdef CONFIG_SCHED_BOOK
+        return cpu_polarization[cpu];
+#else
+        return POLARIZATION_HRZ;
+#endif
+}
+
+#ifdef CONFIG_SCHED_BOOK
 void s390_init_cpu_topology(void);
 #else
 static inline void s390_init_cpu_topology(void)
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 58de4c91c333..8a8008fe7b8f 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -398,6 +398,7 @@
 #define __ARCH_WANT_SYS_SIGNAL
 #define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_SYS_SOCKETCALL
+#define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_FADVISE64
 #define __ARCH_WANT_SYS_GETPGRP
 #define __ARCH_WANT_SYS_LLSEEK
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index dd4f07640919..7d9ec924e7e7 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -32,7 +32,8 @@ extra-y				+= head.o init_task.o vmlinux.lds
 extra-y                         += $(if $(CONFIG_64BIT),head64.o,head31.o)
 
 obj-$(CONFIG_MODULES)           += s390_ksyms.o module.o
-obj-$(CONFIG_SMP)               += smp.o topology.o
+obj-$(CONFIG_SMP)               += smp.o
+obj-$(CONFIG_SCHED_BOOK)        += topology.o
 obj-$(CONFIG_SMP)               += $(if $(CONFIG_64BIT),switch_cpu64.o, \
                                                         switch_cpu.o)
 obj-$(CONFIG_HIBERNATION)       += suspend.o swsusp_asm64.o
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 751318765e2e..6e6a72e66d60 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -45,7 +45,8 @@ int main(void)
         DEFINE(__PT_PSW, offsetof(struct pt_regs, psw));
         DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));
         DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));
-        DEFINE(__PT_SVC_CODE, offsetof(struct pt_regs, svc_code));
+        DEFINE(__PT_INT_CODE, offsetof(struct pt_regs, int_code));
+        DEFINE(__PT_INT_PARM_LONG, offsetof(struct pt_regs, int_parm_long));
         DEFINE(__PT_SIZE, sizeof(struct pt_regs));
         BLANK();
         DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));
@@ -108,7 +109,9 @@ int main(void)
         DEFINE(__LC_PGM_NEW_PSW, offsetof(struct _lowcore, program_new_psw));
         DEFINE(__LC_MCK_NEW_PSW, offsetof(struct _lowcore, mcck_new_psw));
         DEFINE(__LC_IO_NEW_PSW, offsetof(struct _lowcore, io_new_psw));
-        DEFINE(__LC_SAVE_AREA, offsetof(struct _lowcore, save_area));
+        DEFINE(__LC_SAVE_AREA_SYNC, offsetof(struct _lowcore, save_area_sync));
+        DEFINE(__LC_SAVE_AREA_ASYNC, offsetof(struct _lowcore, save_area_async));
+        DEFINE(__LC_SAVE_AREA_RESTART, offsetof(struct _lowcore, save_area_restart));
         DEFINE(__LC_RETURN_PSW, offsetof(struct _lowcore, return_psw));
         DEFINE(__LC_RETURN_MCCK_PSW, offsetof(struct _lowcore, return_mcck_psw));
         DEFINE(__LC_SYNC_ENTER_TIMER, offsetof(struct _lowcore, sync_enter_timer));
@@ -150,7 +153,6 @@ int main(void)
         DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr));
         DEFINE(__LC_VDSO_PER_CPU, offsetof(struct _lowcore, vdso_per_cpu_data));
         DEFINE(__LC_GMAP, offsetof(struct _lowcore, gmap));
-        DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp));
         DEFINE(__GMAP_ASCE, offsetof(struct gmap, asce));
 #endif /* CONFIG_32BIT */
         return 0;
diff --git a/arch/s390/kernel/base.S b/arch/s390/kernel/base.S
index f8828d38fa6e..3aa4d00aaf50 100644
--- a/arch/s390/kernel/base.S
+++ b/arch/s390/kernel/base.S
@@ -33,7 +33,7 @@ s390_base_mcck_handler_fn:
         .previous
 
 ENTRY(s390_base_ext_handler)
-        stmg    %r0,%r15,__LC_SAVE_AREA
+        stmg    %r0,%r15,__LC_SAVE_AREA_ASYNC
         basr    %r13,0
 0:      aghi    %r15,-STACK_FRAME_OVERHEAD
         larl    %r1,s390_base_ext_handler_fn
@@ -41,7 +41,7 @@ ENTRY(s390_base_ext_handler)
         ltgr    %r1,%r1
         jz      1f
         basr    %r14,%r1
-1:      lmg     %r0,%r15,__LC_SAVE_AREA
+1:      lmg     %r0,%r15,__LC_SAVE_AREA_ASYNC
         ni      __LC_EXT_OLD_PSW+1,0xfd # clear wait state bit
         lpswe   __LC_EXT_OLD_PSW
 
@@ -53,7 +53,7 @@ s390_base_ext_handler_fn:
         .previous
 
 ENTRY(s390_base_pgm_handler)
-        stmg    %r0,%r15,__LC_SAVE_AREA
+        stmg    %r0,%r15,__LC_SAVE_AREA_SYNC
         basr    %r13,0
 0:      aghi    %r15,-STACK_FRAME_OVERHEAD
         larl    %r1,s390_base_pgm_handler_fn
@@ -61,7 +61,7 @@ ENTRY(s390_base_pgm_handler)
         ltgr    %r1,%r1
         jz      1f
         basr    %r14,%r1
-        lmg     %r0,%r15,__LC_SAVE_AREA
+        lmg     %r0,%r15,__LC_SAVE_AREA_SYNC
         lpswe   __LC_PGM_OLD_PSW
 1:      lpswe   disabled_wait_psw-0b(%r13)
 
@@ -142,7 +142,7 @@ s390_base_mcck_handler_fn:
         .previous
 
 ENTRY(s390_base_ext_handler)
-        stm     %r0,%r15,__LC_SAVE_AREA
+        stm     %r0,%r15,__LC_SAVE_AREA_ASYNC
         basr    %r13,0
 0:      ahi     %r15,-STACK_FRAME_OVERHEAD
         l       %r1,2f-0b(%r13)
@@ -150,7 +150,7 @@ ENTRY(s390_base_ext_handler)
         ltr     %r1,%r1
         jz      1f
         basr    %r14,%r1
-1:      lm      %r0,%r15,__LC_SAVE_AREA
+1:      lm      %r0,%r15,__LC_SAVE_AREA_ASYNC
         ni      __LC_EXT_OLD_PSW+1,0xfd # clear wait state bit
         lpsw    __LC_EXT_OLD_PSW
 
@@ -164,7 +164,7 @@ s390_base_ext_handler_fn:
         .previous
 
 ENTRY(s390_base_pgm_handler)
-        stm     %r0,%r15,__LC_SAVE_AREA
+        stm     %r0,%r15,__LC_SAVE_AREA_SYNC
         basr    %r13,0
 0:      ahi     %r15,-STACK_FRAME_OVERHEAD
         l       %r1,2f-0b(%r13)
@@ -172,7 +172,7 @@ ENTRY(s390_base_pgm_handler)
         ltr     %r1,%r1
         jz      1f
         basr    %r14,%r1
-        lm      %r0,%r15,__LC_SAVE_AREA
+        lm      %r0,%r15,__LC_SAVE_AREA_SYNC
         lpsw    __LC_PGM_OLD_PSW
 
 1:      lpsw    disabled_wait_psw-0b(%r13)
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 84a982898448..ab64bdbab2ae 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -278,9 +278,6 @@ asmlinkage long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)
 {
         if (call >> 16)         /* hack for backward compatibility */
                 return -EINVAL;
-
-        call &= 0xffff;
-
         switch (call) {
         case SEMTIMEDOP:
                 return compat_sys_semtimedop(first, compat_ptr(ptr),
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 4f68c81d3ffa..6fe78c2f95d9 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -501,8 +501,12 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
 
         /* We forgot to include these in the sigcontext.
            To avoid breaking binary compatibility, they are passed as args. */
-        regs->gprs[4] = current->thread.trap_no;
-        regs->gprs[5] = current->thread.prot_addr;
+        if (sig == SIGSEGV || sig == SIGBUS || sig == SIGILL ||
+            sig == SIGTRAP || sig == SIGFPE) {
+                /* set extra registers only for synchronous signals */
+                regs->gprs[4] = regs->int_code & 127;
+                regs->gprs[5] = regs->int_parm_long;
+        }
 
         /* Place signal number on stack to allow backtrace from handler.  */
         if (__put_user(regs->gprs[2], (int __force __user *) &frame->signo))
@@ -544,9 +548,9 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
         if (ka->sa.sa_flags & SA_RESTORER) {
-                regs->gprs[14] = (__u64) ka->sa.sa_restorer;
+                regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
         } else {
-                regs->gprs[14] = (__u64) frame->retcode;
+                regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;
                 err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
                                   (u16 __force __user *)(frame->retcode));
         }
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 45df6d456aa1..e2f847599c8e 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1578,10 +1578,15 @@ void show_code(struct pt_regs *regs)
         ptr += sprintf(ptr, "%s Code:", mode);
         hops = 0;
         while (start < end && hops < 8) {
-                *ptr++ = (start == 32) ? '>' : ' ';
+                opsize = insn_length(code[start]);
+                if  (start + opsize == 32)
+                        *ptr++ = '#';
+                else if (start == 32)
+                        *ptr++ = '>';
+                else
+                        *ptr++ = ' ';
                 addr = regs->psw.addr + start - 32;
                 ptr += sprintf(ptr, ONELONG, addr);
-                opsize = insn_length(code[start]);
                 if (start + opsize >= end)
                         break;
                 for (i = 0; i < opsize; i++)
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index c9ffe0025197..52098d6dfaa7 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -434,18 +434,22 @@ static void __init append_to_cmdline(size_t (*ipl_data)(char *, size_t))
         }
 }
 
-static void __init setup_boot_command_line(void)
+static inline int has_ebcdic_char(const char *str)
 {
         int i;
 
-        /* convert arch command line to ascii */
-        for (i = 0; i < ARCH_COMMAND_LINE_SIZE; i++)
-                if (COMMAND_LINE[i] & 0x80)
-                        break;
-        if (i < ARCH_COMMAND_LINE_SIZE)
-                EBCASC(COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);
-        COMMAND_LINE[ARCH_COMMAND_LINE_SIZE-1] = 0;
+        for (i = 0; str[i]; i++)
+                if (str[i] & 0x80)
+                        return 1;
+        return 0;
+}
 
+static void __init setup_boot_command_line(void)
+{
+        COMMAND_LINE[ARCH_COMMAND_LINE_SIZE - 1] = 0;
+        /* convert arch command line to ascii if necessary */
+        if (has_ebcdic_char(COMMAND_LINE))
+                EBCASC(COMMAND_LINE, ARCH_COMMAND_LINE_SIZE);
         /* copy arch command line */
         strlcpy(boot_command_line, strstrip(COMMAND_LINE),
                 ARCH_COMMAND_LINE_SIZE);
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index b13157057e02..3705700ed374 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -19,32 +19,22 @@
 #include <asm/unistd.h>
 #include <asm/page.h>
 
-/*
- * Stack layout for the system_call stack entry.
- * The first few entries are identical to the user_regs_struct.
- */
-SP_PTREGS    =  STACK_FRAME_OVERHEAD
-SP_ARGS      =  STACK_FRAME_OVERHEAD + __PT_ARGS
-SP_PSW       =  STACK_FRAME_OVERHEAD + __PT_PSW
-SP_R0        =  STACK_FRAME_OVERHEAD + __PT_GPRS
-SP_R1        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 4
-SP_R2        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 8
-SP_R3        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 12
-SP_R4        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 16
-SP_R5        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 20
-SP_R6        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 24
-SP_R7        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 28
-SP_R8        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 32
-SP_R9        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 36
-SP_R10       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 40
-SP_R11       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 44
-SP_R12       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 48
-SP_R13       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 52
-SP_R14       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 56
-SP_R15       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 60
-SP_ORIG_R2   =  STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2
-SP_SVC_CODE  =  STACK_FRAME_OVERHEAD + __PT_SVC_CODE
-SP_SIZE      =  STACK_FRAME_OVERHEAD + __PT_SIZE
+__PT_R0      =  __PT_GPRS
+__PT_R1      =  __PT_GPRS + 4
+__PT_R2      =  __PT_GPRS + 8
+__PT_R3      =  __PT_GPRS + 12
+__PT_R4      =  __PT_GPRS + 16
+__PT_R5      =  __PT_GPRS + 20
+__PT_R6      =  __PT_GPRS + 24
+__PT_R7      =  __PT_GPRS + 28
+__PT_R8      =  __PT_GPRS + 32
+__PT_R9      =  __PT_GPRS + 36
+__PT_R10     =  __PT_GPRS + 40
+__PT_R11     =  __PT_GPRS + 44
+__PT_R12     =  __PT_GPRS + 48
+__PT_R13     =  __PT_GPRS + 524
+__PT_R14     =  __PT_GPRS + 56
+__PT_R15     =  __PT_GPRS + 60
 
 _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING | _TIF_PER_TRAP )
@@ -58,133 +48,91 @@ STACK_SIZE  = 1 << STACK_SHIFT
 
 #define BASED(name) name-system_call(%r13)
 
-#ifdef CONFIG_TRACE_IRQFLAGS
         .macro  TRACE_IRQS_ON
+#ifdef CONFIG_TRACE_IRQFLAGS
         basr    %r2,%r0
-        l       %r1,BASED(.Ltrace_irq_on_caller)
-        basr    %r14,%r1
+        l       %r1,BASED(.Lhardirqs_on)
+        basr    %r14,%r1                # call trace_hardirqs_on_caller
+#endif
         .endm
 
         .macro  TRACE_IRQS_OFF
+#ifdef CONFIG_TRACE_IRQFLAGS
         basr    %r2,%r0
-        l       %r1,BASED(.Ltrace_irq_off_caller)
-        basr    %r14,%r1
-        .endm
-#else
-#define TRACE_IRQS_ON
-#define TRACE_IRQS_OFF
+        l       %r1,BASED(.Lhardirqs_off)
+        basr    %r14,%r1                # call trace_hardirqs_off_caller
 #endif
+        .endm
 
-#ifdef CONFIG_LOCKDEP
         .macro  LOCKDEP_SYS_EXIT
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
-        jz      0f
+#ifdef CONFIG_LOCKDEP
+        tm      __PT_PSW+1(%r11),0x01   # returning to user ?
+        jz      .+10
         l       %r1,BASED(.Llockdep_sys_exit)
-        basr    %r14,%r1
-0:
-        .endm
-#else
-#define LOCKDEP_SYS_EXIT
+        basr    %r14,%r1                # call lockdep_sys_exit
 #endif
-
-/*
- * Register usage in interrupt handlers:
- *    R9  - pointer to current task structure
- *    R13 - pointer to literal pool
- *    R14 - return register for function calls
- *    R15 - kernel stack pointer
- */
-
-        .macro  UPDATE_VTIME lc_from,lc_to,lc_sum
-        lm      %r10,%r11,\lc_from
-        sl      %r10,\lc_to
-        sl      %r11,\lc_to+4
-        bc      3,BASED(0f)
-        sl      %r10,BASED(.Lc_1)
-0:      al      %r10,\lc_sum
-        al      %r11,\lc_sum+4
-        bc      12,BASED(1f)
-        al      %r10,BASED(.Lc_1)
-1:      stm     %r10,%r11,\lc_sum
-        .endm
-
-        .macro  SAVE_ALL_SVC psworg,savearea
-        stm     %r12,%r15,\savearea
-        l       %r13,__LC_SVC_NEW_PSW+4 # load &system_call to %r13
-        l       %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-        s       %r15,BASED(.Lc_spsize)  # make room for registers & psw
-        .endm
-
-        .macro  SAVE_ALL_BASE savearea
-        stm     %r12,%r15,\savearea
-        l       %r13,__LC_SVC_NEW_PSW+4 # load &system_call to %r13
         .endm
 
-        .macro  SAVE_ALL_PGM psworg,savearea
-        tm      \psworg+1,0x01          # test problem state bit
+        .macro  CHECK_STACK stacksize,savearea
 #ifdef CONFIG_CHECK_STACK
-        bnz     BASED(1f)
-        tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
-        bnz     BASED(2f)
-        la      %r12,\psworg
-        b       BASED(stack_overflow)
-#else
-        bz      BASED(2f)
+        tml     %r15,\stacksize - CONFIG_STACK_GUARD
+        la      %r14,\savearea
+        jz      stack_overflow
 #endif
-1:      l       %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-2:      s       %r15,BASED(.Lc_spsize)  # make room for registers & psw
         .endm
 
-        .macro  SAVE_ALL_ASYNC psworg,savearea
-        stm     %r12,%r15,\savearea
-        l       %r13,__LC_SVC_NEW_PSW+4 # load &system_call to %r13
-        la      %r12,\psworg
-        tm      \psworg+1,0x01          # test problem state bit
-        bnz     BASED(1f)               # from user -> load async stack
-        clc     \psworg+4(4),BASED(.Lcritical_end)
-        bhe     BASED(0f)
-        clc     \psworg+4(4),BASED(.Lcritical_start)
-        bl      BASED(0f)
-        l       %r14,BASED(.Lcleanup_critical)
-        basr    %r14,%r14
-        tm      1(%r12),0x01            # retest problem state after cleanup
-        bnz     BASED(1f)
-0:      l       %r14,__LC_ASYNC_STACK   # are we already on the async stack ?
+        .macro  SWITCH_ASYNC savearea,stack,shift
+        tmh     %r8,0x0001              # interrupting from user ?
+        jnz     1f
+        lr      %r14,%r9
+        sl      %r14,BASED(.Lcritical_start)
+        cl      %r14,BASED(.Lcritical_length)
+        jhe     0f
+        la      %r11,\savearea          # inside critical section, do cleanup
+        bras    %r14,cleanup_critical
+        tmh     %r8,0x0001              # retest problem state after cleanup
+        jnz     1f
+0:      l       %r14,\stack             # are we already on the target stack?
         slr     %r14,%r15
-        sra     %r14,STACK_SHIFT
-#ifdef CONFIG_CHECK_STACK
-        bnz     BASED(1f)
-        tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
-        bnz     BASED(2f)
-        b       BASED(stack_overflow)
-#else
-        bz      BASED(2f)
-#endif
-1:      l       %r15,__LC_ASYNC_STACK
-2:      s       %r15,BASED(.Lc_spsize)  # make room for registers & psw
+        sra     %r14,\shift
+        jnz     1f
+        CHECK_STACK 1<<\shift,\savearea
+        j       2f
+1:      l       %r15,\stack             # load target stack
+2:      ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
         .endm
 
-        .macro  CREATE_STACK_FRAME savearea
-        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
-        st      %r2,SP_ORIG_R2(%r15)    # store original content of gpr 2
-        mvc     SP_R12(16,%r15),\savearea # move %r12-%r15 to stack
-        stm     %r0,%r11,SP_R0(%r15)    # store gprs %r0-%r11 to kernel stack
+        .macro  ADD64 high,low,timer
+        al      \high,\timer
+        al      \low,\timer+4
+        brc     12,.+8
+        ahi     \high,1
         .endm
 
-        .macro  RESTORE_ALL psworg,sync
-        mvc     \psworg(8),SP_PSW(%r15) # move user PSW to lowcore
-        .if !\sync
-        ni      \psworg+1,0xfd          # clear wait state bit
-        .endif
-        lm      %r0,%r15,SP_R0(%r15)    # load gprs 0-15 of user
-        stpt    __LC_EXIT_TIMER
-        lpsw    \psworg                 # back to caller
+        .macro  SUB64 high,low,timer
+        sl      \high,\timer
+        sl      \low,\timer+4
+        brc     3,.+8
+        ahi     \high,-1
+        .endm
+
+        .macro  UPDATE_VTIME high,low,enter_timer
+        lm      \high,\low,__LC_EXIT_TIMER
+        SUB64   \high,\low,\enter_timer
+        ADD64   \high,\low,__LC_USER_TIMER
+        stm     \high,\low,__LC_USER_TIMER
+        lm      \high,\low,__LC_LAST_UPDATE_TIMER
+        SUB64   \high,\low,__LC_EXIT_TIMER
+        ADD64   \high,\low,__LC_SYSTEM_TIMER
+        stm     \high,\low,__LC_SYSTEM_TIMER
+        mvc     __LC_LAST_UPDATE_TIMER(8),\enter_timer
         .endm
 
         .macro REENABLE_IRQS
-        mvc     __SF_EMPTY(1,%r15),SP_PSW(%r15)
-        ni      __SF_EMPTY(%r15),0xbf
-        ssm     __SF_EMPTY(%r15)
+        st      %r8,__LC_RETURN_PSW
+        ni      __LC_RETURN_PSW,0xbf
+        ssm     __LC_RETURN_PSW
         .endm
 
         .section .kprobes.text, "ax"
@@ -197,14 +145,13 @@ STACK_SIZE  = 1 << STACK_SHIFT
  *  gpr2 = prev
  */
 ENTRY(__switch_to)
-        basr    %r1,0
-0:      l       %r4,__THREAD_info(%r2)          # get thread_info of prev
+        l       %r4,__THREAD_info(%r2)          # get thread_info of prev
         l       %r5,__THREAD_info(%r3)          # get thread_info of next
         tm      __TI_flags+3(%r4),_TIF_MCCK_PENDING # machine check pending?
-        bz      1f-0b(%r1)
+        jz      0f
         ni      __TI_flags+3(%r4),255-_TIF_MCCK_PENDING # clear flag in prev
         oi      __TI_flags+3(%r5),_TIF_MCCK_PENDING     # set it in next
-1:      stm     %r6,%r15,__SF_GPRS(%r15)        # store gprs of prev task
+0:      stm     %r6,%r15,__SF_GPRS(%r15)        # store gprs of prev task
         st      %r15,__THREAD_ksp(%r2)          # store kernel stack of prev
         l       %r15,__THREAD_ksp(%r3)          # load kernel stack of next
         lctl    %c4,%c4,__TASK_pid(%r3)         # load pid to control reg. 4
@@ -224,48 +171,55 @@ __critical_start:
 
 ENTRY(system_call)
         stpt    __LC_SYNC_ENTER_TIMER
-sysc_saveall:
-        SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        mvc     SP_PSW(8,%r15),__LC_SVC_OLD_PSW
-        mvc     SP_SVC_CODE(4,%r15),__LC_SVC_ILC
-        oi      __TI_flags+3(%r12),_TIF_SYSCALL
+sysc_stm:
+        stm     %r8,%r15,__LC_SAVE_AREA_SYNC
+        l       %r12,__LC_THREAD_INFO
+        l       %r13,__LC_SVC_NEW_PSW+4
+sysc_per:
+        l       %r15,__LC_KERNEL_STACK
+        ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15) # pointer to pt_regs
 sysc_vtime:
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-sysc_stime:
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-sysc_update:
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
+        UPDATE_VTIME %r8,%r9,__LC_SYNC_ENTER_TIMER
+        stm     %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_SYNC
+        mvc     __PT_PSW(8,%r11),__LC_SVC_OLD_PSW
+        mvc     __PT_INT_CODE(4,%r11),__LC_SVC_ILC
 sysc_do_svc:
-        xr      %r7,%r7
-        icm     %r7,3,SP_SVC_CODE+2(%r15)# load svc number and test for svc 0
-        bnz     BASED(sysc_nr_ok)       # svc number > 0
+        oi      __TI_flags+3(%r12),_TIF_SYSCALL
+        lh      %r8,__PT_INT_CODE+2(%r11)
+        sla     %r8,2                           # shift and test for svc0
+        jnz     sysc_nr_ok
         # svc 0: system call number in %r1
         cl      %r1,BASED(.Lnr_syscalls)
-        bnl     BASED(sysc_nr_ok)
-        sth     %r1,SP_SVC_CODE+2(%r15)
-        lr      %r7,%r1           # copy svc number to %r7
+        jnl     sysc_nr_ok
+        sth     %r1,__PT_INT_CODE+2(%r11)
+        lr      %r8,%r1
+        sla     %r8,2
 sysc_nr_ok:
-        sll     %r7,2             # svc number *4
-        l       %r10,BASED(.Lsysc_table)
+        l       %r10,BASED(.Lsys_call_table)    # 31 bit system call table
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
+        st      %r2,__PT_ORIG_GPR2(%r11)
+        st      %r7,STACK_FRAME_OVERHEAD(%r15)
+        l       %r9,0(%r8,%r10)                 # get system call addr.
         tm      __TI_flags+2(%r12),_TIF_TRACE >> 8
-        mvc     SP_ARGS(4,%r15),SP_R7(%r15)
-        l       %r8,0(%r7,%r10)   # get system call addr.
-        bnz     BASED(sysc_tracesys)
-        basr    %r14,%r8          # call sys_xxxx
-        st      %r2,SP_R2(%r15)   # store return value (change R2 on stack)
+        jnz     sysc_tracesys
+        basr    %r14,%r9                        # call sys_xxxx
+        st      %r2,__PT_R2(%r11)               # store return value
 
 sysc_return:
         LOCKDEP_SYS_EXIT
 sysc_tif:
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
-        bno     BASED(sysc_restore)
+        tm      __PT_PSW+1(%r11),0x01           # returning to user ?
+        jno     sysc_restore
         tm      __TI_flags+3(%r12),_TIF_WORK_SVC
-        bnz     BASED(sysc_work)  # there is work to do (signals etc.)
+        jnz     sysc_work                       # check for work
         ni      __TI_flags+3(%r12),255-_TIF_SYSCALL
 sysc_restore:
-        RESTORE_ALL __LC_RETURN_PSW,1
+        mvc     __LC_RETURN_PSW(8),__PT_PSW(%r11)
+        stpt    __LC_EXIT_TIMER
+        lm      %r0,%r15,__PT_R0(%r11)
+        lpsw    __LC_RETURN_PSW
 sysc_done:
 
 #
@@ -273,16 +227,16 @@ sysc_done:
 #
 sysc_work:
         tm      __TI_flags+3(%r12),_TIF_MCCK_PENDING
-        bo      BASED(sysc_mcck_pending)
+        jo      sysc_mcck_pending
         tm      __TI_flags+3(%r12),_TIF_NEED_RESCHED
-        bo      BASED(sysc_reschedule)
+        jo      sysc_reschedule
         tm      __TI_flags+3(%r12),_TIF_SIGPENDING
-        bo      BASED(sysc_sigpending)
+        jo      sysc_sigpending
         tm      __TI_flags+3(%r12),_TIF_NOTIFY_RESUME
-        bo      BASED(sysc_notify_resume)
+        jo      sysc_notify_resume
         tm      __TI_flags+3(%r12),_TIF_PER_TRAP
-        bo      BASED(sysc_singlestep)
-        b       BASED(sysc_return)      # beware of critical section cleanup
+        jo      sysc_singlestep
+        j       sysc_return             # beware of critical section cleanup
 
 #
 # _TIF_NEED_RESCHED is set, call schedule
@@ -290,13 +244,13 @@ sysc_work:
 sysc_reschedule:
         l       %r1,BASED(.Lschedule)
         la      %r14,BASED(sysc_return)
-        br      %r1                     # call scheduler
+        br      %r1                     # call schedule
 
 #
 # _TIF_MCCK_PENDING is set, call handler
 #
 sysc_mcck_pending:
-        l       %r1,BASED(.Ls390_handle_mcck)
+        l       %r1,BASED(.Lhandle_mcck)
         la      %r14,BASED(sysc_return)
         br      %r1                     # TIF bit will be cleared by handler
 
@@ -305,23 +259,24 @@ sysc_mcck_pending:
 #
 sysc_sigpending:
         ni      __TI_flags+3(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        lr      %r2,%r11                # pass pointer to pt_regs
         l       %r1,BASED(.Ldo_signal)
         basr    %r14,%r1                # call do_signal
         tm      __TI_flags+3(%r12),_TIF_SYSCALL
-        bno     BASED(sysc_return)
-        lm      %r2,%r6,SP_R2(%r15)     # load svc arguments
-        xr      %r7,%r7                 # svc 0 returns -ENOSYS
-        clc     SP_SVC_CODE+2(2,%r15),BASED(.Lnr_syscalls+2)
-        bnl     BASED(sysc_nr_ok)       # invalid svc number -> do svc 0
-        icm     %r7,3,SP_SVC_CODE+2(%r15)# load new svc number
-        b       BASED(sysc_nr_ok)       # restart svc
+        jno     sysc_return
+        lm      %r2,%r7,__PT_R2(%r11)   # load svc arguments
+        xr      %r8,%r8                 # svc 0 returns -ENOSYS
+        clc     __PT_INT_CODE+2(2,%r11),BASED(.Lnr_syscalls+2)
+        jnl     sysc_nr_ok              # invalid svc number -> do svc 0
+        lh      %r8,__PT_INT_CODE+2(%r11)       # load new svc number
+        sla     %r8,2
+        j       sysc_nr_ok              # restart svc
 
 #
 # _TIF_NOTIFY_RESUME is set, call do_notify_resume
 #
 sysc_notify_resume:
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        lr      %r2,%r11                # pass pointer to pt_regs
         l       %r1,BASED(.Ldo_notify_resume)
         la      %r14,BASED(sysc_return)
         br      %r1                     # call do_notify_resume
@@ -331,56 +286,57 @@ sysc_notify_resume:
 #
 sysc_singlestep:
         ni      __TI_flags+3(%r12),255-(_TIF_SYSCALL | _TIF_PER_TRAP)
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        l       %r1,BASED(.Lhandle_per) # load adr. of per handler
-        la      %r14,BASED(sysc_return) # load adr. of system return
-        br      %r1                     # branch to do_per_trap
+        lr      %r2,%r11                # pass pointer to pt_regs
+        l       %r1,BASED(.Ldo_per_trap)
+        la      %r14,BASED(sysc_return)
+        br      %r1                     # call do_per_trap
 
 #
 # call tracehook_report_syscall_entry/tracehook_report_syscall_exit before
 # and after the system call
 #
 sysc_tracesys:
-        l       %r1,BASED(.Ltrace_entry)
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        l       %r1,BASED(.Ltrace_enter)
+        lr      %r2,%r11                # pass pointer to pt_regs
         la      %r3,0
         xr      %r0,%r0
-        icm     %r0,3,SP_SVC_CODE(%r15)
-        st      %r0,SP_R2(%r15)
-        basr    %r14,%r1
+        icm     %r0,3,__PT_INT_CODE+2(%r11)
+        st      %r0,__PT_R2(%r11)
+        basr    %r14,%r1                # call do_syscall_trace_enter
         cl      %r2,BASED(.Lnr_syscalls)
-        bnl     BASED(sysc_tracenogo)
-        lr      %r7,%r2
-        sll     %r7,2                   # svc number *4
-        l       %r8,0(%r7,%r10)
+        jnl     sysc_tracenogo
+        lr      %r8,%r2
+        sll     %r8,2
+        l       %r9,0(%r8,%r10)
 sysc_tracego:
-        lm      %r3,%r6,SP_R3(%r15)
-        mvc     SP_ARGS(4,%r15),SP_R7(%r15)
-        l       %r2,SP_ORIG_R2(%r15)
-        basr    %r14,%r8                # call sys_xxx
-        st      %r2,SP_R2(%r15)         # store return value
+        lm      %r3,%r7,__PT_R3(%r11)
+        st      %r7,STACK_FRAME_OVERHEAD(%r15)
+        l       %r2,__PT_ORIG_GPR2(%r11)
+        basr    %r14,%r9                # call sys_xxx
+        st      %r2,__PT_R2(%r11)       # store return value
 sysc_tracenogo:
         tm      __TI_flags+2(%r12),_TIF_TRACE >> 8
-        bz      BASED(sysc_return)
+        jz      sysc_return
         l       %r1,BASED(.Ltrace_exit)
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        lr      %r2,%r11                # pass pointer to pt_regs
         la      %r14,BASED(sysc_return)
-        br      %r1
+        br      %r1                     # call do_syscall_trace_exit
 
 #
 # a new process exits the kernel with ret_from_fork
 #
 ENTRY(ret_from_fork)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        l       %r12,__LC_THREAD_INFO
         l       %r13,__LC_SVC_NEW_PSW+4
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      SP_PSW+1(%r15),0x01     # forking a kernel thread ?
-        bo      BASED(0f)
-        st      %r15,SP_R15(%r15)       # store stack pointer for new kthread
-0:      l       %r1,BASED(.Lschedtail)
-        basr    %r14,%r1
+        tm      __PT_PSW+1(%r11),0x01   # forking a kernel thread ?
+        jo      0f
+        st      %r15,__PT_R15(%r11)     # store stack pointer for new kthread
+0:      l       %r1,BASED(.Lschedule_tail)
+        basr    %r14,%r1                # call schedule_tail
         TRACE_IRQS_ON
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        b       BASED(sysc_tracenogo)
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
+        j       sysc_tracenogo
 
 #
 # kernel_execve function needs to deal with pt_regs that is not
@@ -390,153 +346,98 @@ ENTRY(kernel_execve)
         stm     %r12,%r15,48(%r15)
         lr      %r14,%r15
         l       %r13,__LC_SVC_NEW_PSW+4
-        s       %r15,BASED(.Lc_spsize)
+        ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         st      %r14,__SF_BACKCHAIN(%r15)
-        la      %r12,SP_PTREGS(%r15)
+        la      %r12,STACK_FRAME_OVERHEAD(%r15)
         xc      0(__PT_SIZE,%r12),0(%r12)
         l       %r1,BASED(.Ldo_execve)
         lr      %r5,%r12
-        basr    %r14,%r1
+        basr    %r14,%r1                # call do_execve
         ltr     %r2,%r2
-        be      BASED(0f)
-        a       %r15,BASED(.Lc_spsize)
+        je      0f
+        ahi     %r15,(STACK_FRAME_OVERHEAD + __PT_SIZE)
         lm      %r12,%r15,48(%r15)
         br      %r14
         # execve succeeded.
-0:      stnsm   __SF_EMPTY(%r15),0xfc   # disable interrupts
+0:      ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         l       %r15,__LC_KERNEL_STACK  # load ksp
-        s       %r15,BASED(.Lc_spsize)  # make room for registers & psw
-        mvc     SP_PTREGS(__PT_SIZE,%r15),0(%r12)       # copy pt_regs
+        ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        mvc     0(__PT_SIZE,%r11),0(%r12)       # copy pt_regs
         l       %r12,__LC_THREAD_INFO
         xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
         l       %r1,BASED(.Lexecve_tail)
-        basr    %r14,%r1
-        b       BASED(sysc_return)
+        basr    %r14,%r1                # call execve_tail
+        j       sysc_return
 
 /*
  * Program check handler routine
  */
 
 ENTRY(pgm_check_handler)
-/*
- * First we need to check for a special case:
- * Single stepping an instruction that disables the PER event mask will
- * cause a PER event AFTER the mask has been set. Example: SVC or LPSW.
- * For a single stepped SVC the program check handler gets control after
- * the SVC new PSW has been loaded. But we want to execute the SVC first and
- * then handle the PER event. Therefore we update the SVC old PSW to point
- * to the pgm_check_handler and branch to the SVC handler after we checked
- * if we have to load the kernel stack register.
- * For every other possible cause for PER event without the PER mask set
- * we just ignore the PER event (FIXME: is there anything we have to do
- * for LPSW?).
- */
         stpt    __LC_SYNC_ENTER_TIMER
-        SAVE_ALL_BASE __LC_SAVE_AREA
-        tm      __LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception
-        bnz     BASED(pgm_per)          # got per exception -> special case
-        SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        mvc     SP_PSW(8,%r15),__LC_PGM_OLD_PSW
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        bz      BASED(pgm_no_vtime)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-pgm_no_vtime:
-        l       %r3,__LC_PGM_ILC        # load program interruption code
-        l       %r4,__LC_TRANS_EXC_CODE
-        REENABLE_IRQS
-        la      %r8,0x7f
-        nr      %r8,%r3
-        sll     %r8,2
-        l       %r1,BASED(.Ljump_table)
-        l       %r1,0(%r8,%r1)          # load address of handler routine
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        basr    %r14,%r1                # branch to interrupt-handler
-pgm_exit:
-        b       BASED(sysc_return)
-
-#
-# handle per exception
-#
-pgm_per:
-        tm      __LC_PGM_OLD_PSW,0x40   # test if per event recording is on
-        bnz     BASED(pgm_per_std)      # ok, normal per event from user space
-# ok its one of the special cases, now we need to find out which one
-        clc     __LC_PGM_OLD_PSW(8),__LC_SVC_NEW_PSW
-        be      BASED(pgm_svcper)
-# no interesting special case, ignore PER event
-        lm      %r12,%r15,__LC_SAVE_AREA
-        lpsw    0x28
-
-#
-# Normal per exception
-#
-pgm_per_std:
-        SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        mvc     SP_PSW(8,%r15),__LC_PGM_OLD_PSW
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        bz      BASED(pgm_no_vtime2)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-pgm_no_vtime2:
+        stm     %r8,%r15,__LC_SAVE_AREA_SYNC
+        l       %r12,__LC_THREAD_INFO
+        l       %r13,__LC_SVC_NEW_PSW+4
+        lm      %r8,%r9,__LC_PGM_OLD_PSW
+        tmh     %r8,0x0001              # test problem state bit
+        jnz     1f                      # -> fault in user space
+        tmh     %r8,0x4000              # PER bit set in old PSW ?
+        jnz     0f                      # -> enabled, can't be a double fault
+        tm      __LC_PGM_ILC+3,0x80     # check for per exception
+        jnz     pgm_svcper              # -> single stepped svc
+0:      CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC
+        j       2f
+1:      UPDATE_VTIME %r14,%r15,__LC_SYNC_ENTER_TIMER
+        l       %r15,__LC_KERNEL_STACK
+2:      ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        stm     %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_SYNC
+        stm     %r8,%r9,__PT_PSW(%r11)
+        mvc     __PT_INT_CODE(4,%r11),__LC_PGM_ILC
+        mvc     __PT_INT_PARM_LONG(4,%r11),__LC_TRANS_EXC_CODE
+        tm      __LC_PGM_ILC+3,0x80     # check for per exception
+        jz      0f
         l       %r1,__TI_task(%r12)
-        tm      SP_PSW+1(%r15),0x01     # kernel per event ?
-        bz      BASED(kernel_per)
-        mvc     __THREAD_per_cause(2,%r1),__LC_PER_CAUSE
+        tmh     %r8,0x0001              # kernel per event ?
+        jz      pgm_kprobe
+        oi      __TI_flags+3(%r12),_TIF_PER_TRAP
         mvc     __THREAD_per_address(4,%r1),__LC_PER_ADDRESS
+        mvc     __THREAD_per_cause(2,%r1),__LC_PER_CAUSE
         mvc     __THREAD_per_paid(1,%r1),__LC_PER_PAID
-        oi      __TI_flags+3(%r12),_TIF_PER_TRAP # set TIF_PER_TRAP
-        l       %r3,__LC_PGM_ILC        # load program interruption code
-        l       %r4,__LC_TRANS_EXC_CODE
-        REENABLE_IRQS
-        la      %r8,0x7f
-        nr      %r8,%r3                 # clear per-event-bit and ilc
-        be      BASED(pgm_exit2)        # only per or per+check ?
-        sll     %r8,2
+0:      REENABLE_IRQS
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
         l       %r1,BASED(.Ljump_table)
-        l       %r1,0(%r8,%r1)          # load address of handler routine
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
+        la      %r10,0x7f
+        n       %r10,__PT_INT_CODE(%r11)
+        je      sysc_return
+        sll     %r10,2
+        l       %r1,0(%r10,%r1)         # load address of handler routine
+        lr      %r2,%r11                # pass pointer to pt_regs
         basr    %r14,%r1                # branch to interrupt-handler
-pgm_exit2:
-        b       BASED(sysc_return)
+        j       sysc_return
 
 #
-# it was a single stepped SVC that is causing all the trouble
+# PER event in supervisor state, must be kprobes
 #
-pgm_svcper:
-        SAVE_ALL_PGM __LC_SVC_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        mvc     SP_PSW(8,%r15),__LC_SVC_OLD_PSW
-        mvc     SP_SVC_CODE(4,%r15),__LC_SVC_ILC
-        oi      __TI_flags+3(%r12),(_TIF_SYSCALL | _TIF_PER_TRAP)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        l       %r8,__TI_task(%r12)
-        mvc     __THREAD_per_cause(2,%r8),__LC_PER_CAUSE
-        mvc     __THREAD_per_address(4,%r8),__LC_PER_ADDRESS
-        mvc     __THREAD_per_paid(1,%r8),__LC_PER_PAID
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        lm      %r2,%r6,SP_R2(%r15)     # load svc arguments
-        b       BASED(sysc_do_svc)
+pgm_kprobe:
+        REENABLE_IRQS
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
+        l       %r1,BASED(.Ldo_per_trap)
+        lr      %r2,%r11                # pass pointer to pt_regs
+        basr    %r14,%r1                # call do_per_trap
+        j       sysc_return
 
 #
-# per was called from kernel, must be kprobes
+# single stepped system call
 #
-kernel_per:
-        REENABLE_IRQS
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        l       %r1,BASED(.Lhandle_per) # load adr. of per handler
-        basr    %r14,%r1                # branch to do_single_step
-        b       BASED(pgm_exit)
+pgm_svcper:
+        oi      __TI_flags+3(%r12),_TIF_PER_TRAP
+        mvc     __LC_RETURN_PSW(4),__LC_SVC_NEW_PSW
+        mvc     __LC_RETURN_PSW+4(4),BASED(.Lsysc_per)
+        lpsw    __LC_RETURN_PSW         # branch to sysc_per and enable irqs
 
 /*
  * IO interrupt handler routine
@@ -545,28 +446,35 @@ kernel_per:
 ENTRY(io_int_handler)
         stck    __LC_INT_CLOCK
         stpt    __LC_ASYNC_ENTER_TIMER
-        SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+16
-        CREATE_STACK_FRAME __LC_SAVE_AREA+16
-        mvc     SP_PSW(8,%r15),0(%r12)  # move user PSW to stack
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        bz      BASED(io_no_vtime)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
-io_no_vtime:
+        stm     %r8,%r15,__LC_SAVE_AREA_ASYNC
+        l       %r12,__LC_THREAD_INFO
+        l       %r13,__LC_SVC_NEW_PSW+4
+        lm      %r8,%r9,__LC_IO_OLD_PSW
+        tmh     %r8,0x0001              # interrupting from user ?
+        jz      io_skip
+        UPDATE_VTIME %r14,%r15,__LC_ASYNC_ENTER_TIMER
+io_skip:
+        SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT
+        stm     %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC
+        stm     %r8,%r9,__PT_PSW(%r11)
         TRACE_IRQS_OFF
-        l       %r1,BASED(.Ldo_IRQ)     # load address of do_IRQ
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        basr    %r14,%r1                # branch to standard irq handler
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
+        l       %r1,BASED(.Ldo_IRQ)
+        lr      %r2,%r11                # pass pointer to pt_regs
+        basr    %r14,%r1                # call do_IRQ
 io_return:
         LOCKDEP_SYS_EXIT
         TRACE_IRQS_ON
 io_tif:
         tm      __TI_flags+3(%r12),_TIF_WORK_INT
-        bnz     BASED(io_work)          # there is work to do (signals etc.)
+        jnz     io_work                 # there is work to do (signals etc.)
 io_restore:
-        RESTORE_ALL __LC_RETURN_PSW,0
+        mvc     __LC_RETURN_PSW(8),__PT_PSW(%r11)
+        ni      __LC_RETURN_PSW+1,0xfd  # clean wait state bit
+        stpt    __LC_EXIT_TIMER
+        lm      %r0,%r15,__PT_R0(%r11)
+        lpsw    __LC_RETURN_PSW
 io_done:
 
 #
@@ -577,28 +485,29 @@ io_done:
 # Before any work can be done, a switch to the kernel stack is required.
 #
 io_work:
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
-        bo      BASED(io_work_user)     # yes -> do resched & signal
+        tm      __PT_PSW+1(%r11),0x01   # returning to user ?
+        jo      io_work_user            # yes -> do resched & signal
 #ifdef CONFIG_PREEMPT
         # check for preemptive scheduling
         icm     %r0,15,__TI_precount(%r12)
-        bnz     BASED(io_restore)       # preemption disabled
+        jnz     io_restore              # preemption disabled
         tm      __TI_flags+3(%r12),_TIF_NEED_RESCHED
-        bno     BASED(io_restore)
+        jno     io_restore
         # switch to kernel stack
-        l       %r1,SP_R15(%r15)
-        s       %r1,BASED(.Lc_spsize)
-        mvc     SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
-        xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1) # clear back chain
+        l       %r1,__PT_R15(%r11)
+        ahi     %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
+        xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)
+        la      %r11,STACK_FRAME_OVERHEAD(%r1)
         lr      %r15,%r1
         # TRACE_IRQS_ON already done at io_return, call
         # TRACE_IRQS_OFF to keep things symmetrical
         TRACE_IRQS_OFF
-        l       %r1,BASED(.Lpreempt_schedule_irq)
+        l       %r1,BASED(.Lpreempt_irq)
         basr    %r14,%r1                # call preempt_schedule_irq
-        b       BASED(io_return)
+        j       io_return
 #else
-        b       BASED(io_restore)
+        j       io_restore
 #endif
 
 #
@@ -606,9 +515,10 @@ io_work:
 #
 io_work_user:
         l       %r1,__LC_KERNEL_STACK
-        s       %r1,BASED(.Lc_spsize)
-        mvc     SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
-        xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1) # clear back chain
+        ahi     %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
+        xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)
+        la      %r11,STACK_FRAME_OVERHEAD(%r1)
         lr      %r15,%r1
 
 #
@@ -618,24 +528,24 @@ io_work_user:
 #
 io_work_tif:
         tm      __TI_flags+3(%r12),_TIF_MCCK_PENDING
-        bo      BASED(io_mcck_pending)
+        jo      io_mcck_pending
         tm      __TI_flags+3(%r12),_TIF_NEED_RESCHED
-        bo      BASED(io_reschedule)
+        jo      io_reschedule
         tm      __TI_flags+3(%r12),_TIF_SIGPENDING
-        bo      BASED(io_sigpending)
+        jo      io_sigpending
         tm      __TI_flags+3(%r12),_TIF_NOTIFY_RESUME
-        bo      BASED(io_notify_resume)
-        b       BASED(io_return)        # beware of critical section cleanup
+        jo      io_notify_resume
+        j       io_return               # beware of critical section cleanup
 
 #
 # _TIF_MCCK_PENDING is set, call handler
 #
 io_mcck_pending:
         # TRACE_IRQS_ON already done at io_return
-        l       %r1,BASED(.Ls390_handle_mcck)
+        l       %r1,BASED(.Lhandle_mcck)
         basr    %r14,%r1                # TIF bit will be cleared by handler
         TRACE_IRQS_OFF
-        b       BASED(io_return)
+        j       io_return
 
 #
 # _TIF_NEED_RESCHED is set, call schedule
@@ -643,37 +553,37 @@ io_mcck_pending:
 io_reschedule:
         # TRACE_IRQS_ON already done at io_return
         l       %r1,BASED(.Lschedule)
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
         basr    %r14,%r1                # call scheduler
-        stnsm   __SF_EMPTY(%r15),0xfc   # disable I/O and ext. interrupts
+        ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         TRACE_IRQS_OFF
-        b       BASED(io_return)
+        j       io_return
 
 #
 # _TIF_SIGPENDING is set, call do_signal
 #
 io_sigpending:
         # TRACE_IRQS_ON already done at io_return
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
         l       %r1,BASED(.Ldo_signal)
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
+        lr      %r2,%r11                # pass pointer to pt_regs
         basr    %r14,%r1                # call do_signal
-        stnsm   __SF_EMPTY(%r15),0xfc   # disable I/O and ext. interrupts
+        ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         TRACE_IRQS_OFF
-        b       BASED(io_return)
+        j       io_return
 
 #
 # _TIF_SIGPENDING is set, call do_signal
 #
 io_notify_resume:
         # TRACE_IRQS_ON already done at io_return
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
         l       %r1,BASED(.Ldo_notify_resume)
-        basr    %r14,%r1                # call do_signal
-        stnsm   __SF_EMPTY(%r15),0xfc   # disable I/O and ext. interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
+        lr      %r2,%r11                # pass pointer to pt_regs
+        basr    %r14,%r1                # call do_notify_resume
+        ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         TRACE_IRQS_OFF
-        b       BASED(io_return)
+        j       io_return
 
 /*
  * External interrupt handler routine
@@ -682,23 +592,25 @@ io_notify_resume:
 ENTRY(ext_int_handler)
         stck    __LC_INT_CLOCK
         stpt    __LC_ASYNC_ENTER_TIMER
-        SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16
-        CREATE_STACK_FRAME __LC_SAVE_AREA+16
-        mvc     SP_PSW(8,%r15),0(%r12)  # move user PSW to stack
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        bz      BASED(ext_no_vtime)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
-ext_no_vtime:
+        stm     %r8,%r15,__LC_SAVE_AREA_ASYNC
+        l       %r12,__LC_THREAD_INFO
+        l       %r13,__LC_SVC_NEW_PSW+4
+        lm      %r8,%r9,__LC_EXT_OLD_PSW
+        tmh     %r8,0x0001              # interrupting from user ?
+        jz      ext_skip
+        UPDATE_VTIME %r14,%r15,__LC_ASYNC_ENTER_TIMER
+ext_skip:
+        SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT
+        stm     %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_ASYNC
+        stm     %r8,%r9,__PT_PSW(%r11)
         TRACE_IRQS_OFF
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
+        lr      %r2,%r11                # pass pointer to pt_regs
         l       %r3,__LC_CPU_ADDRESS    # get cpu address + interruption code
         l       %r4,__LC_EXT_PARAMS     # get external parameters
         l       %r1,BASED(.Ldo_extint)
-        basr    %r14,%r1
-        b       BASED(io_return)
+        basr    %r14,%r1                # call do_extint
+        j       io_return
 
 __critical_end:
 
@@ -710,82 +622,74 @@ ENTRY(mcck_int_handler)
         stck    __LC_MCCK_CLOCK
         spt     __LC_CPU_TIMER_SAVE_AREA        # revalidate cpu timer
         lm      %r0,%r15,__LC_GPREGS_SAVE_AREA  # revalidate gprs
-        SAVE_ALL_BASE __LC_SAVE_AREA+32
-        la      %r12,__LC_MCK_OLD_PSW
+        l       %r12,__LC_THREAD_INFO
+        l       %r13,__LC_SVC_NEW_PSW+4
+        lm      %r8,%r9,__LC_MCK_OLD_PSW
         tm      __LC_MCCK_CODE,0x80     # system damage?
-        bo      BASED(mcck_int_main)    # yes -> rest of mcck code invalid
-        mvc     __LC_MCCK_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA
+        jo      mcck_panic              # yes -> rest of mcck code invalid
+        la      %r14,__LC_CPU_TIMER_SAVE_AREA
+        mvc     __LC_MCCK_ENTER_TIMER(8),0(%r14)
         tm      __LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?
-        bo      BASED(1f)
+        jo      3f
         la      %r14,__LC_SYNC_ENTER_TIMER
         clc     0(8,%r14),__LC_ASYNC_ENTER_TIMER
-        bl      BASED(0f)
+        jl      0f
         la      %r14,__LC_ASYNC_ENTER_TIMER
 0:      clc     0(8,%r14),__LC_EXIT_TIMER
-        bl      BASED(0f)
+        jl      1f
         la      %r14,__LC_EXIT_TIMER
-0:      clc     0(8,%r14),__LC_LAST_UPDATE_TIMER
-        bl      BASED(0f)
+1:      clc     0(8,%r14),__LC_LAST_UPDATE_TIMER
+        jl      2f
         la      %r14,__LC_LAST_UPDATE_TIMER
-0:      spt     0(%r14)
+2:      spt     0(%r14)
         mvc     __LC_MCCK_ENTER_TIMER(8),0(%r14)
-1:      tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
-        bno     BASED(mcck_int_main)    # no -> skip cleanup critical
-        tm      __LC_MCK_OLD_PSW+1,0x01 # test problem state bit
-        bnz     BASED(mcck_int_main)    # from user -> load async stack
-        clc     __LC_MCK_OLD_PSW+4(4),BASED(.Lcritical_end)
-        bhe     BASED(mcck_int_main)
-        clc     __LC_MCK_OLD_PSW+4(4),BASED(.Lcritical_start)
-        bl      BASED(mcck_int_main)
-        l       %r14,BASED(.Lcleanup_critical)
-        basr    %r14,%r14
-mcck_int_main:
-        l       %r14,__LC_PANIC_STACK   # are we already on the panic stack?
-        slr     %r14,%r15
-        sra     %r14,PAGE_SHIFT
-        be      BASED(0f)
-        l       %r15,__LC_PANIC_STACK   # load panic stack
-0:      s       %r15,BASED(.Lc_spsize)  # make room for registers & psw
-        CREATE_STACK_FRAME __LC_SAVE_AREA+32
-        mvc     SP_PSW(8,%r15),0(%r12)
-        l       %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      __LC_MCCK_CODE+2,0x08   # mwp of old psw valid?
-        bno     BASED(mcck_no_vtime)    # no -> skip cleanup critical
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        bz      BASED(mcck_no_vtime)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_MCCK_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_MCCK_ENTER_TIMER
-mcck_no_vtime:
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
-        l       %r1,BASED(.Ls390_mcck)
-        basr    %r14,%r1                # call machine check handler
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
-        bno     BASED(mcck_return)
+3:      tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
+        jno     mcck_panic              # no -> skip cleanup critical
+        tm      %r8,0x0001              # interrupting from user ?
+        jz      mcck_skip
+        UPDATE_VTIME %r14,%r15,__LC_MCCK_ENTER_TIMER
+mcck_skip:
+        SWITCH_ASYNC __LC_GPREGS_SAVE_AREA+32,__LC_PANIC_STACK,PAGE_SHIFT
+        mvc     __PT_R0(64,%r11),__LC_GPREGS_SAVE_AREA
+        stm     %r8,%r9,__PT_PSW(%r11)
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
+        l       %r1,BASED(.Ldo_machine_check)
+        lr      %r2,%r11                # pass pointer to pt_regs
+        basr    %r14,%r1                # call s390_do_machine_check
+        tm      __PT_PSW+1(%r11),0x01   # returning to user ?
+        jno     mcck_return
         l       %r1,__LC_KERNEL_STACK   # switch to kernel stack
-        s       %r1,BASED(.Lc_spsize)
-        mvc     SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
-        xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1) # clear back chain
+        ahi     %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
+        xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
         lr      %r15,%r1
-        stosm   __SF_EMPTY(%r15),0x04   # turn dat on
+        ssm     __LC_PGM_NEW_PSW        # turn dat on, keep irqs off
         tm      __TI_flags+3(%r12),_TIF_MCCK_PENDING
-        bno     BASED(mcck_return)
+        jno     mcck_return
         TRACE_IRQS_OFF
-        l       %r1,BASED(.Ls390_handle_mcck)
-        basr    %r14,%r1                # call machine check handler
+        l       %r1,BASED(.Lhandle_mcck)
+        basr    %r14,%r1                # call s390_handle_mcck
         TRACE_IRQS_ON
 mcck_return:
-        mvc     __LC_RETURN_MCCK_PSW(8),SP_PSW(%r15) # move return PSW
+        mvc     __LC_RETURN_MCCK_PSW(8),__PT_PSW(%r11) # move return PSW
         ni      __LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit
         tm      __LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?
-        bno     BASED(0f)
-        lm      %r0,%r15,SP_R0(%r15)    # load gprs 0-15
+        jno     0f
+        lm      %r0,%r15,__PT_R0(%r11)
         stpt    __LC_EXIT_TIMER
-        lpsw    __LC_RETURN_MCCK_PSW    # back to caller
-0:      lm      %r0,%r15,SP_R0(%r15)    # load gprs 0-15
-        lpsw    __LC_RETURN_MCCK_PSW    # back to caller
+        lpsw    __LC_RETURN_MCCK_PSW
+0:      lm      %r0,%r15,__PT_R0(%r11)
+        lpsw    __LC_RETURN_MCCK_PSW
 
-        RESTORE_ALL __LC_RETURN_MCCK_PSW,0
+mcck_panic:
+        l       %r14,__LC_PANIC_STACK
+        slr     %r14,%r15
+        sra     %r14,PAGE_SHIFT
+        jz      0f
+        l       %r15,__LC_PANIC_STACK
+0:      ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        j       mcck_skip
 
 /*
  * Restart interruption handler, kick starter for additional CPUs
@@ -799,18 +703,18 @@ restart_base:
         stck    __LC_LAST_UPDATE_CLOCK
         mvc     __LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1)
         mvc     __LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1)
-        l       %r15,__LC_SAVE_AREA+60  # load ksp
+        l       %r15,__LC_GPREGS_SAVE_AREA+60 # load ksp
         lctl    %c0,%c15,__LC_CREGS_SAVE_AREA # get new ctl regs
         lam     %a0,%a15,__LC_AREGS_SAVE_AREA
-        lm      %r6,%r15,__SF_GPRS(%r15) # load registers from clone
+        lm      %r6,%r15,__SF_GPRS(%r15)# load registers from clone
         l       %r1,__LC_THREAD_INFO
         mvc     __LC_USER_TIMER(8),__TI_user_timer(%r1)
         mvc     __LC_SYSTEM_TIMER(8),__TI_system_timer(%r1)
         xc      __LC_STEAL_TIMER(8),__LC_STEAL_TIMER
-        stosm   __SF_EMPTY(%r15),0x04   # now we can turn dat on
+        ssm     __LC_PGM_NEW_PSW        # turn dat on, keep irqs off
         basr    %r14,0
         l       %r14,restart_addr-.(%r14)
-        basr    %r14,%r14               # branch to start_secondary
+        basr    %r14,%r14               # call start_secondary
 restart_addr:
         .long   start_secondary
         .align  8
@@ -835,19 +739,19 @@ restart_go:
 # PSW restart interrupt handler
 #
 ENTRY(psw_restart_int_handler)
-        st      %r15,__LC_SAVE_AREA+48(%r0)     # save r15
+        st      %r15,__LC_SAVE_AREA_RESTART
         basr    %r15,0
 0:      l       %r15,.Lrestart_stack-0b(%r15)   # load restart stack
         l       %r15,0(%r15)
-        ahi     %r15,-SP_SIZE                   # make room for pt_regs
-        stm     %r0,%r14,SP_R0(%r15)            # store gprs %r0-%r14 to stack
-        mvc     SP_R15(4,%r15),__LC_SAVE_AREA+48(%r0)# store saved %r15 to stack
-        mvc     SP_PSW(8,%r15),__LC_RST_OLD_PSW(%r0) # store restart old psw
-        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # set backchain to 0
+        ahi     %r15,-__PT_SIZE                 # create pt_regs on stack
+        stm     %r0,%r14,__PT_R0(%r15)
+        mvc     __PT_R15(4,%r15),__LC_SAVE_AREA_RESTART
+        mvc     __PT_PSW(8,%r15),__LC_RST_OLD_PSW # store restart old psw
+        ahi     %r15,-STACK_FRAME_OVERHEAD
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
         basr    %r14,0
 1:      l       %r14,.Ldo_restart-1b(%r14)
         basr    %r14,%r14
-
         basr    %r14,0                          # load disabled wait PSW if
 2:      lpsw    restart_psw_crash-2b(%r14)      # do_restart returns
         .align 4
@@ -869,215 +773,174 @@ restart_psw_crash:
  */
 stack_overflow:
         l       %r15,__LC_PANIC_STACK   # change to panic stack
-        sl      %r15,BASED(.Lc_spsize)
-        mvc     SP_PSW(8,%r15),0(%r12)  # move user PSW to stack
-        stm     %r0,%r11,SP_R0(%r15)    # store gprs %r0-%r11 to kernel stack
-        la      %r1,__LC_SAVE_AREA
-        ch      %r12,BASED(.L0x020)     # old psw addr == __LC_SVC_OLD_PSW ?
-        be      BASED(0f)
-        ch      %r12,BASED(.L0x028)     # old psw addr == __LC_PGM_OLD_PSW ?
-        be      BASED(0f)
-        la      %r1,__LC_SAVE_AREA+16
-0:      mvc     SP_R12(16,%r15),0(%r1)  # move %r12-%r15 to stack
-        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # clear back chain
-        l       %r1,BASED(1f)           # branch to kernel_stack_overflow
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
-        br      %r1
+        ahi     %r15,-__PT_SIZE         # create pt_regs
+        stm     %r0,%r7,__PT_R0(%r15)
+        stm     %r8,%r9,__PT_PSW(%r15)
+        mvc     __PT_R8(32,%r11),0(%r14)
+        lr      %r15,%r11
+        ahi     %r15,-STACK_FRAME_OVERHEAD
+        l       %r1,BASED(1f)
+        xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
+        lr      %r2,%r11                # pass pointer to pt_regs
+        br      %r1                     # branch to kernel_stack_overflow
 1:      .long   kernel_stack_overflow
 #endif
 
-cleanup_table_system_call:
-        .long   system_call + 0x80000000, sysc_do_svc + 0x80000000
-cleanup_table_sysc_tif:
-        .long   sysc_tif + 0x80000000, sysc_restore + 0x80000000
-cleanup_table_sysc_restore:
-        .long   sysc_restore + 0x80000000, sysc_done + 0x80000000
-cleanup_table_io_tif:
-        .long   io_tif + 0x80000000, io_restore + 0x80000000
-cleanup_table_io_restore:
-        .long   io_restore + 0x80000000, io_done + 0x80000000
+cleanup_table:
+        .long   system_call + 0x80000000
+        .long   sysc_do_svc + 0x80000000
+        .long   sysc_tif + 0x80000000
+        .long   sysc_restore + 0x80000000
+        .long   sysc_done + 0x80000000
+        .long   io_tif + 0x80000000
+        .long   io_restore + 0x80000000
+        .long   io_done + 0x80000000
 
 cleanup_critical:
-        clc     4(4,%r12),BASED(cleanup_table_system_call)
-        bl      BASED(0f)
-        clc     4(4,%r12),BASED(cleanup_table_system_call+4)
-        bl      BASED(cleanup_system_call)
-0:
-        clc     4(4,%r12),BASED(cleanup_table_sysc_tif)
-        bl      BASED(0f)
-        clc     4(4,%r12),BASED(cleanup_table_sysc_tif+4)
-        bl      BASED(cleanup_sysc_tif)
-0:
-        clc     4(4,%r12),BASED(cleanup_table_sysc_restore)
-        bl      BASED(0f)
-        clc     4(4,%r12),BASED(cleanup_table_sysc_restore+4)
-        bl      BASED(cleanup_sysc_restore)
-0:
-        clc     4(4,%r12),BASED(cleanup_table_io_tif)
-        bl      BASED(0f)
-        clc     4(4,%r12),BASED(cleanup_table_io_tif+4)
-        bl      BASED(cleanup_io_tif)
-0:
-        clc     4(4,%r12),BASED(cleanup_table_io_restore)
-        bl      BASED(0f)
-        clc     4(4,%r12),BASED(cleanup_table_io_restore+4)
-        bl      BASED(cleanup_io_restore)
-0:
-        br      %r14
+        cl      %r9,BASED(cleanup_table)        # system_call
+        jl      0f
+        cl      %r9,BASED(cleanup_table+4)      # sysc_do_svc
+        jl      cleanup_system_call
+        cl      %r9,BASED(cleanup_table+8)      # sysc_tif
+        jl      0f
+        cl      %r9,BASED(cleanup_table+12)     # sysc_restore
+        jl      cleanup_sysc_tif
+        cl      %r9,BASED(cleanup_table+16)     # sysc_done
+        jl      cleanup_sysc_restore
+        cl      %r9,BASED(cleanup_table+20)     # io_tif
+        jl      0f
+        cl      %r9,BASED(cleanup_table+24)     # io_restore
+        jl      cleanup_io_tif
+        cl      %r9,BASED(cleanup_table+28)     # io_done
+        jl      cleanup_io_restore
+0:      br      %r14
 
 cleanup_system_call:
-        mvc     __LC_RETURN_PSW(8),0(%r12)
-        clc     __LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+4)
-        bh      BASED(0f)
-        mvc     __LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER
-        c       %r12,BASED(.Lmck_old_psw)
-        be      BASED(0f)
+        # check if stpt has been executed
+        cl      %r9,BASED(cleanup_system_call_insn)
+        jh      0f
         mvc     __LC_SYNC_ENTER_TIMER(8),__LC_ASYNC_ENTER_TIMER
-0:      c       %r12,BASED(.Lmck_old_psw)
-        la      %r12,__LC_SAVE_AREA+32
-        be      BASED(0f)
-        la      %r12,__LC_SAVE_AREA+16
-0:      clc     __LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+8)
-        bhe     BASED(cleanup_vtime)
-        clc     __LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn)
-        bh      BASED(0f)
-        mvc     __LC_SAVE_AREA(16),0(%r12)
-0:      st      %r13,4(%r12)
-        l       %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-        s       %r15,BASED(.Lc_spsize)  # make room for registers & psw
-        st      %r15,12(%r12)
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        mvc     0(4,%r12),__LC_THREAD_INFO
-        l       %r12,__LC_THREAD_INFO
-        mvc     SP_PSW(8,%r15),__LC_SVC_OLD_PSW
-        mvc     SP_SVC_CODE(4,%r15),__LC_SVC_ILC
-        oi      __TI_flags+3(%r12),_TIF_SYSCALL
-cleanup_vtime:
-        clc     __LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+12)
-        bhe     BASED(cleanup_stime)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-cleanup_stime:
-        clc     __LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+16)
-        bh      BASED(cleanup_update)
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-cleanup_update:
+        chi     %r11,__LC_SAVE_AREA_ASYNC
+        je      0f
+        mvc     __LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER
+0:      # check if stm has been executed
+        cl      %r9,BASED(cleanup_system_call_insn+4)
+        jh      0f
+        mvc     __LC_SAVE_AREA_SYNC(32),0(%r11)
+0:      # set up saved registers r12, and r13
+        st      %r12,16(%r11)           # r12 thread-info pointer
+        st      %r13,20(%r11)           # r13 literal-pool pointer
+        # check if the user time calculation has been done
+        cl      %r9,BASED(cleanup_system_call_insn+8)
+        jh      0f
+        l       %r10,__LC_EXIT_TIMER
+        l       %r15,__LC_EXIT_TIMER+4
+        SUB64   %r10,%r15,__LC_SYNC_ENTER_TIMER
+        ADD64   %r10,%r15,__LC_USER_TIMER
+        st      %r10,__LC_USER_TIMER
+        st      %r15,__LC_USER_TIMER+4
+0:      # check if the system time calculation has been done
+        cl      %r9,BASED(cleanup_system_call_insn+12)
+        jh      0f
+        l       %r10,__LC_LAST_UPDATE_TIMER
+        l       %r15,__LC_LAST_UPDATE_TIMER+4
+        SUB64   %r10,%r15,__LC_EXIT_TIMER
+        ADD64   %r10,%r15,__LC_SYSTEM_TIMER
+        st      %r10,__LC_SYSTEM_TIMER
+        st      %r15,__LC_SYSTEM_TIMER+4
+0:      # update accounting time stamp
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        mvc     __LC_RETURN_PSW+4(4),BASED(cleanup_table_system_call+4)
-        la      %r12,__LC_RETURN_PSW
+        # set up saved register 11
+        l       %r15,__LC_KERNEL_STACK
+        ahi     %r15,-__PT_SIZE
+        st      %r15,12(%r11)           # r11 pt_regs pointer
+        # fill pt_regs
+        mvc     __PT_R8(32,%r15),__LC_SAVE_AREA_SYNC
+        stm     %r0,%r7,__PT_R0(%r15)
+        mvc     __PT_PSW(8,%r15),__LC_SVC_OLD_PSW
+        mvc     __PT_INT_CODE(4,%r15),__LC_SVC_ILC
+        # setup saved register 15
+        ahi     %r15,-STACK_FRAME_OVERHEAD
+        st      %r15,28(%r11)           # r15 stack pointer
+        # set new psw address and exit
+        l       %r9,BASED(cleanup_table+4)      # sysc_do_svc + 0x80000000
         br      %r14
 cleanup_system_call_insn:
-        .long   sysc_saveall + 0x80000000
         .long   system_call + 0x80000000
-        .long   sysc_vtime + 0x80000000
-        .long   sysc_stime + 0x80000000
-        .long   sysc_update + 0x80000000
+        .long   sysc_stm + 0x80000000
+        .long   sysc_vtime + 0x80000000 + 36
+        .long   sysc_vtime + 0x80000000 + 76
 
 cleanup_sysc_tif:
-        mvc     __LC_RETURN_PSW(4),0(%r12)
-        mvc     __LC_RETURN_PSW+4(4),BASED(cleanup_table_sysc_tif)
-        la      %r12,__LC_RETURN_PSW
+        l       %r9,BASED(cleanup_table+8)      # sysc_tif + 0x80000000
         br      %r14
 
 cleanup_sysc_restore:
-        clc     4(4,%r12),BASED(cleanup_sysc_restore_insn)
-        be      BASED(2f)
-        mvc     __LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER
-        c       %r12,BASED(.Lmck_old_psw)
-        be      BASED(0f)
-        mvc     __LC_EXIT_TIMER(8),__LC_ASYNC_ENTER_TIMER
-0:      clc     4(4,%r12),BASED(cleanup_sysc_restore_insn+4)
-        be      BASED(2f)
-        mvc     __LC_RETURN_PSW(8),SP_PSW(%r15)
-        c       %r12,BASED(.Lmck_old_psw)
-        la      %r12,__LC_SAVE_AREA+32
-        be      BASED(1f)
-        la      %r12,__LC_SAVE_AREA+16
-1:      mvc     0(16,%r12),SP_R12(%r15)
-        lm      %r0,%r11,SP_R0(%r15)
-        l       %r15,SP_R15(%r15)
-2:      la      %r12,__LC_RETURN_PSW
+        cl      %r9,BASED(cleanup_sysc_restore_insn)
+        jhe     0f
+        l       %r9,12(%r11)            # get saved pointer to pt_regs
+        mvc     __LC_RETURN_PSW(8),__PT_PSW(%r9)
+        mvc     0(32,%r11),__PT_R8(%r9)
+        lm      %r0,%r7,__PT_R0(%r9)
+0:      lm      %r8,%r9,__LC_RETURN_PSW
         br      %r14
 cleanup_sysc_restore_insn:
         .long   sysc_done - 4 + 0x80000000
-        .long   sysc_done - 8 + 0x80000000
 
 cleanup_io_tif:
-        mvc     __LC_RETURN_PSW(4),0(%r12)
-        mvc     __LC_RETURN_PSW+4(4),BASED(cleanup_table_io_tif)
-        la      %r12,__LC_RETURN_PSW
+        l       %r9,BASED(cleanup_table+20)     # io_tif + 0x80000000
         br      %r14
 
 cleanup_io_restore:
-        clc     4(4,%r12),BASED(cleanup_io_restore_insn)
-        be      BASED(1f)
-        mvc     __LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER
-        clc     4(4,%r12),BASED(cleanup_io_restore_insn+4)
-        be      BASED(1f)
-        mvc     __LC_RETURN_PSW(8),SP_PSW(%r15)
-        mvc     __LC_SAVE_AREA+32(16),SP_R12(%r15)
-        lm      %r0,%r11,SP_R0(%r15)
-        l       %r15,SP_R15(%r15)
-1:      la      %r12,__LC_RETURN_PSW
+        cl      %r9,BASED(cleanup_io_restore_insn)
+        jhe     0f
+        l       %r9,12(%r11)            # get saved r11 pointer to pt_regs
+        mvc     __LC_RETURN_PSW(8),__PT_PSW(%r9)
+        ni      __LC_RETURN_PSW+1,0xfd  # clear wait state bit
+        mvc     0(32,%r11),__PT_R8(%r9)
+        lm      %r0,%r7,__PT_R0(%r9)
+0:      lm      %r8,%r9,__LC_RETURN_PSW
         br      %r14
 cleanup_io_restore_insn:
         .long   io_done - 4 + 0x80000000
-        .long   io_done - 8 + 0x80000000
 
 /*
  * Integer constants
  */
-                .align  4
-.Lc_spsize:     .long   SP_SIZE
-.Lc_overhead:   .long   STACK_FRAME_OVERHEAD
-.Lnr_syscalls:  .long   NR_syscalls
-.L0x018:        .short  0x018
-.L0x020:        .short  0x020
-.L0x028:        .short  0x028
-.L0x030:        .short  0x030
-.L0x038:        .short  0x038
-.Lc_1:          .long   1
+        .align  4
+.Lnr_syscalls:          .long   NR_syscalls
 
 /*
  * Symbol constants
  */
-.Ls390_mcck:    .long   s390_do_machine_check
-.Ls390_handle_mcck:
-                .long   s390_handle_mcck
-.Lmck_old_psw:  .long   __LC_MCK_OLD_PSW
-.Ldo_IRQ:       .long   do_IRQ
-.Ldo_extint:    .long   do_extint
-.Ldo_signal:    .long   do_signal
-.Ldo_notify_resume:
-                .long   do_notify_resume
-.Lhandle_per:   .long   do_per_trap
-.Ldo_execve:    .long   do_execve
-.Lexecve_tail:  .long   execve_tail
-.Ljump_table:   .long   pgm_check_table
-.Lschedule:     .long   schedule
+.Ldo_machine_check:     .long   s390_do_machine_check
+.Lhandle_mcck:          .long   s390_handle_mcck
+.Ldo_IRQ:               .long   do_IRQ
+.Ldo_extint:            .long   do_extint
+.Ldo_signal:            .long   do_signal
+.Ldo_notify_resume:     .long   do_notify_resume
+.Ldo_per_trap:          .long   do_per_trap
+.Ldo_execve:            .long   do_execve
+.Lexecve_tail:          .long   execve_tail
+.Ljump_table:           .long   pgm_check_table
+.Lschedule:             .long   schedule
 #ifdef CONFIG_PREEMPT
-.Lpreempt_schedule_irq:
-                .long   preempt_schedule_irq
+.Lpreempt_irq:          .long   preempt_schedule_irq
 #endif
-.Ltrace_entry:  .long   do_syscall_trace_enter
-.Ltrace_exit:   .long   do_syscall_trace_exit
-.Lschedtail:    .long   schedule_tail
-.Lsysc_table:   .long   sys_call_table
+.Ltrace_enter:          .long   do_syscall_trace_enter
+.Ltrace_exit:           .long   do_syscall_trace_exit
+.Lschedule_tail:        .long   schedule_tail
+.Lsys_call_table:       .long   sys_call_table
+.Lsysc_per:             .long   sysc_per + 0x80000000
 #ifdef CONFIG_TRACE_IRQFLAGS
-.Ltrace_irq_on_caller:
-                .long   trace_hardirqs_on_caller
-.Ltrace_irq_off_caller:
-                .long   trace_hardirqs_off_caller
+.Lhardirqs_on:          .long   trace_hardirqs_on_caller
+.Lhardirqs_off:         .long   trace_hardirqs_off_caller
 #endif
 #ifdef CONFIG_LOCKDEP
-.Llockdep_sys_exit:
-                .long   lockdep_sys_exit
+.Llockdep_sys_exit:     .long   lockdep_sys_exit
 #endif
-.Lcritical_start:
-                .long   __critical_start + 0x80000000
-.Lcritical_end:
-                .long   __critical_end + 0x80000000
-.Lcleanup_critical:
-                .long   cleanup_critical
+.Lcritical_start:       .long   __critical_start + 0x80000000
+.Lcritical_length:      .long   __critical_end - __critical_start
 
                 .section .rodata, "a"
 #define SYSCALL(esa,esame,emu)  .long esa
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index ef8fb1d6e8d7..bf538aaf407d 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -6,15 +6,15 @@
 #include <asm/ptrace.h>
 
 
-extern void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);
+extern void (*pgm_check_table[128])(struct pt_regs *);
 extern void *restart_stack;
 
 asmlinkage long do_syscall_trace_enter(struct pt_regs *regs);
 asmlinkage void do_syscall_trace_exit(struct pt_regs *regs);
 
-void do_protection_exception(struct pt_regs *, long, unsigned long);
-void do_dat_exception(struct pt_regs *, long, unsigned long);
-void do_asce_exception(struct pt_regs *, long, unsigned long);
+void do_protection_exception(struct pt_regs *regs);
+void do_dat_exception(struct pt_regs *regs);
+void do_asce_exception(struct pt_regs *regs);
 
 void do_per_trap(struct pt_regs *regs);
 void syscall_trace(struct pt_regs *regs, int entryexit);
@@ -28,7 +28,7 @@ void do_extint(struct pt_regs *regs, unsigned int, unsigned int, unsigned long);
 void do_restart(void);
 int __cpuinit start_secondary(void *cpuvoid);
 void __init startup_init(void);
-void die(const char * str, struct pt_regs * regs, long err);
+void die(struct pt_regs *regs, const char *str);
 
 void __init time_init(void);
 
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 83a93747e2fd..412a7b8783d7 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -19,32 +19,22 @@
 #include <asm/unistd.h>
 #include <asm/page.h>
 
-/*
- * Stack layout for the system_call stack entry.
- * The first few entries are identical to the user_regs_struct.
- */
-SP_PTREGS    =  STACK_FRAME_OVERHEAD
-SP_ARGS      =  STACK_FRAME_OVERHEAD + __PT_ARGS
-SP_PSW       =  STACK_FRAME_OVERHEAD + __PT_PSW
-SP_R0        =  STACK_FRAME_OVERHEAD + __PT_GPRS
-SP_R1        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 8
-SP_R2        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 16
-SP_R3        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 24
-SP_R4        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 32
-SP_R5        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 40
-SP_R6        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 48
-SP_R7        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 56
-SP_R8        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 64
-SP_R9        =  STACK_FRAME_OVERHEAD + __PT_GPRS + 72
-SP_R10       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 80
-SP_R11       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 88
-SP_R12       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 96
-SP_R13       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 104
-SP_R14       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 112
-SP_R15       =  STACK_FRAME_OVERHEAD + __PT_GPRS + 120
-SP_ORIG_R2   =  STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2
-SP_SVC_CODE  =  STACK_FRAME_OVERHEAD + __PT_SVC_CODE
-SP_SIZE      =  STACK_FRAME_OVERHEAD + __PT_SIZE
+__PT_R0      =  __PT_GPRS
+__PT_R1      =  __PT_GPRS + 8
+__PT_R2      =  __PT_GPRS + 16
+__PT_R3      =  __PT_GPRS + 24
+__PT_R4      =  __PT_GPRS + 32
+__PT_R5      =  __PT_GPRS + 40
+__PT_R6      =  __PT_GPRS + 48
+__PT_R7      =  __PT_GPRS + 56
+__PT_R8      =  __PT_GPRS + 64
+__PT_R9      =  __PT_GPRS + 72
+__PT_R10     =  __PT_GPRS + 80
+__PT_R11     =  __PT_GPRS + 88
+__PT_R12     =  __PT_GPRS + 96
+__PT_R13     =  __PT_GPRS + 104
+__PT_R14     =  __PT_GPRS + 112
+__PT_R15     =  __PT_GPRS + 120
 
 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
 STACK_SIZE  = 1 << STACK_SHIFT
@@ -59,154 +49,103 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
 
 #define BASED(name) name-system_call(%r13)
 
-        .macro SPP newpp
-#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
-        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
-        jz      .+8
-        .insn   s,0xb2800000,\newpp
-#endif
-        .endm
-
-        .macro  HANDLE_SIE_INTERCEPT
-#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
-        tm      __TI_flags+6(%r12),_TIF_SIE>>8
-        jz      0f
-        SPP     __LC_CMF_HPP                    # set host id
-        clc     SP_PSW+8(8,%r15),BASED(.Lsie_loop)
-        jl      0f
-        clc     SP_PSW+8(8,%r15),BASED(.Lsie_done)
-        jhe     0f
-        mvc     SP_PSW+8(8,%r15),BASED(.Lsie_loop)
-0:
-#endif
-        .endm
-
-#ifdef CONFIG_TRACE_IRQFLAGS
         .macro  TRACE_IRQS_ON
+#ifdef CONFIG_TRACE_IRQFLAGS
         basr    %r2,%r0
         brasl   %r14,trace_hardirqs_on_caller
+#endif
         .endm
 
         .macro  TRACE_IRQS_OFF
+#ifdef CONFIG_TRACE_IRQFLAGS
         basr    %r2,%r0
         brasl   %r14,trace_hardirqs_off_caller
-        .endm
-#else
-#define TRACE_IRQS_ON
-#define TRACE_IRQS_OFF
 #endif
+        .endm
 
-#ifdef CONFIG_LOCKDEP
         .macro  LOCKDEP_SYS_EXIT
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
-        jz      0f
+#ifdef CONFIG_LOCKDEP
+        tm      __PT_PSW+1(%r11),0x01   # returning to user ?
+        jz      .+10
         brasl   %r14,lockdep_sys_exit
-0:
-        .endm
-#else
-#define LOCKDEP_SYS_EXIT
 #endif
-
-        .macro  UPDATE_VTIME lc_from,lc_to,lc_sum
-        lg      %r10,\lc_from
-        slg     %r10,\lc_to
-        alg     %r10,\lc_sum
-        stg     %r10,\lc_sum
         .endm
 
-/*
- * Register usage in interrupt handlers:
- *    R9  - pointer to current task structure
- *    R13 - pointer to literal pool
- *    R14 - return register for function calls
- *    R15 - kernel stack pointer
- */
+        .macro SPP newpp
+#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
+        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
+        jz      .+8
+        .insn   s,0xb2800000,\newpp
+#endif
+        .endm
 
-        .macro  SAVE_ALL_SVC psworg,savearea
-        stmg    %r11,%r15,\savearea
-        lg      %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-        aghi    %r15,-SP_SIZE           # make room for registers & psw
-        lg      %r11,__LC_LAST_BREAK
+        .macro  HANDLE_SIE_INTERCEPT scratch
+#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
+        tm      __TI_flags+6(%r12),_TIF_SIE>>8
+        jz      .+42
+        tm      __LC_MACHINE_FLAGS+6,0x20       # MACHINE_FLAG_SPP
+        jz      .+8
+        .insn   s,0xb2800000,BASED(.Lhost_id)   # set host id
+        lgr     \scratch,%r9
+        slg     \scratch,BASED(.Lsie_loop)
+        clg     \scratch,BASED(.Lsie_length)
+        jhe     .+10
+        lg      %r9,BASED(.Lsie_loop)
+#endif
         .endm
 
-        .macro  SAVE_ALL_PGM psworg,savearea
-        stmg    %r11,%r15,\savearea
-        tm      \psworg+1,0x01          # test problem state bit
+        .macro  CHECK_STACK stacksize,savearea
 #ifdef CONFIG_CHECK_STACK
-        jnz     1f
-        tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
-        jnz     2f
-        la      %r12,\psworg
-        j       stack_overflow
-#else
-        jz      2f
+        tml     %r15,\stacksize - CONFIG_STACK_GUARD
+        lghi    %r14,\savearea
+        jz      stack_overflow
 #endif
-1:      lg      %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-2:      aghi    %r15,-SP_SIZE           # make room for registers & psw
-        larl    %r13,system_call
-        lg      %r11,__LC_LAST_BREAK
         .endm
 
-        .macro  SAVE_ALL_ASYNC psworg,savearea
-        stmg    %r11,%r15,\savearea
-        larl    %r13,system_call
-        lg      %r11,__LC_LAST_BREAK
-        la      %r12,\psworg
-        tm      \psworg+1,0x01          # test problem state bit
-        jnz     1f                      # from user -> load kernel stack
-        clc     \psworg+8(8),BASED(.Lcritical_end)
+        .macro  SWITCH_ASYNC savearea,stack,shift
+        tmhh    %r8,0x0001              # interrupting from user ?
+        jnz     1f
+        lgr     %r14,%r9
+        slg     %r14,BASED(.Lcritical_start)
+        clg     %r14,BASED(.Lcritical_length)
         jhe     0f
-        clc     \psworg+8(8),BASED(.Lcritical_start)
-        jl      0f
+        lghi    %r11,\savearea          # inside critical section, do cleanup
         brasl   %r14,cleanup_critical
-        tm      1(%r12),0x01            # retest problem state after cleanup
+        tmhh    %r8,0x0001              # retest problem state after cleanup
         jnz     1f
-0:      lg      %r14,__LC_ASYNC_STACK   # are we already on the async. stack ?
+0:      lg      %r14,\stack             # are we already on the target stack?
         slgr    %r14,%r15
-        srag    %r14,%r14,STACK_SHIFT
-#ifdef CONFIG_CHECK_STACK
+        srag    %r14,%r14,\shift
         jnz     1f
-        tml     %r15,STACK_SIZE - CONFIG_STACK_GUARD
-        jnz     2f
-        j       stack_overflow
-#else
-        jz      2f
-#endif
-1:      lg      %r15,__LC_ASYNC_STACK   # load async stack
-2:      aghi    %r15,-SP_SIZE           # make room for registers & psw
-        .endm
-
-        .macro  CREATE_STACK_FRAME savearea
-        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
-        stg     %r2,SP_ORIG_R2(%r15)    # store original content of gpr 2
-        mvc     SP_R11(40,%r15),\savearea # move %r11-%r15 to stack
-        stmg    %r0,%r10,SP_R0(%r15)    # store gprs %r0-%r10 to kernel stack
+        CHECK_STACK 1<<\shift,\savearea
+        j       2f
+1:      lg      %r15,\stack             # load target stack
+2:      aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
         .endm
 
-        .macro  RESTORE_ALL psworg,sync
-        mvc     \psworg(16),SP_PSW(%r15) # move user PSW to lowcore
-        .if !\sync
-        ni      \psworg+1,0xfd          # clear wait state bit
-        .endif
-        lg      %r14,__LC_VDSO_PER_CPU
-        lmg     %r0,%r13,SP_R0(%r15)    # load gprs 0-13 of user
-        stpt    __LC_EXIT_TIMER
-        mvc     __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER
-        lmg     %r14,%r15,SP_R14(%r15)  # load grps 14-15 of user
-        lpswe   \psworg                 # back to caller
+        .macro UPDATE_VTIME scratch,enter_timer
+        lg      \scratch,__LC_EXIT_TIMER
+        slg     \scratch,\enter_timer
+        alg     \scratch,__LC_USER_TIMER
+        stg     \scratch,__LC_USER_TIMER
+        lg      \scratch,__LC_LAST_UPDATE_TIMER
+        slg     \scratch,__LC_EXIT_TIMER
+        alg     \scratch,__LC_SYSTEM_TIMER
+        stg     \scratch,__LC_SYSTEM_TIMER
+        mvc     __LC_LAST_UPDATE_TIMER(8),\enter_timer
         .endm
 
-        .macro  LAST_BREAK
-        srag    %r10,%r11,23
-        jz      0f
-        stg     %r11,__TI_last_break(%r12)
-0:
+        .macro  LAST_BREAK scratch
+        srag    \scratch,%r10,23
+        jz      .+10
+        stg     %r10,__TI_last_break(%r12)
         .endm
 
         .macro REENABLE_IRQS
-        mvc     __SF_EMPTY(1,%r15),SP_PSW(%r15)
-        ni      __SF_EMPTY(%r15),0xbf
-        ssm     __SF_EMPTY(%r15)
+        stg     %r8,__LC_RETURN_PSW
+        ni      __LC_RETURN_PSW,0xbf
+        ssm     __LC_RETURN_PSW
         .endm
 
         .section .kprobes.text, "ax"
@@ -245,55 +184,66 @@ __critical_start:
 
 ENTRY(system_call)
         stpt    __LC_SYNC_ENTER_TIMER
-sysc_saveall:
-        SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        mvc     SP_PSW(16,%r15),__LC_SVC_OLD_PSW
-        mvc     SP_SVC_CODE(4,%r15),__LC_SVC_ILC
-        oi      __TI_flags+7(%r12),_TIF_SYSCALL
+sysc_stmg:
+        stmg    %r8,%r15,__LC_SAVE_AREA_SYNC
+        lg      %r10,__LC_LAST_BREAK
+        lg      %r12,__LC_THREAD_INFO
+        larl    %r13,system_call
+sysc_per:
+        lg      %r15,__LC_KERNEL_STACK
+        aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15) # pointer to pt_regs
 sysc_vtime:
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-sysc_stime:
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-sysc_update:
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        LAST_BREAK
+        UPDATE_VTIME %r13,__LC_SYNC_ENTER_TIMER
+        LAST_BREAK %r13
+        stmg    %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_SYNC
+        mvc     __PT_PSW(16,%r11),__LC_SVC_OLD_PSW
+        mvc     __PT_INT_CODE(4,%r11),__LC_SVC_ILC
 sysc_do_svc:
-        llgh    %r7,SP_SVC_CODE+2(%r15)
-        slag    %r7,%r7,2       # shift and test for svc 0
+        oi      __TI_flags+7(%r12),_TIF_SYSCALL
+        llgh    %r8,__PT_INT_CODE+2(%r11)
+        slag    %r8,%r8,2                       # shift and test for svc 0
         jnz     sysc_nr_ok
         # svc 0: system call number in %r1
-        llgfr   %r1,%r1         # clear high word in r1
+        llgfr   %r1,%r1                         # clear high word in r1
         cghi    %r1,NR_syscalls
         jnl     sysc_nr_ok
-        sth     %r1,SP_SVC_CODE+2(%r15)
-        slag    %r7,%r1,2       # shift and test for svc 0
+        sth     %r1,__PT_INT_CODE+2(%r11)
+        slag    %r8,%r1,2
 sysc_nr_ok:
-        larl    %r10,sys_call_table
+        larl    %r10,sys_call_table             # 64 bit system call table
 #ifdef CONFIG_COMPAT
-        tm      __TI_flags+5(%r12),(_TIF_31BIT>>16)  # running in 31 bit mode ?
+        tm      __TI_flags+5(%r12),(_TIF_31BIT>>16)
         jno     sysc_noemu
-        larl    %r10,sys_call_table_emu  # use 31 bit emulation system calls
+        larl    %r10,sys_call_table_emu         # 31 bit system call table
 sysc_noemu:
 #endif
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+        stg     %r2,__PT_ORIG_GPR2(%r11)
+        stg     %r7,STACK_FRAME_OVERHEAD(%r15)
+        lgf     %r9,0(%r8,%r10)                 # get system call add.
         tm      __TI_flags+6(%r12),_TIF_TRACE >> 8
-        mvc     SP_ARGS(8,%r15),SP_R7(%r15)
-        lgf     %r8,0(%r7,%r10) # load address of system call routine
         jnz     sysc_tracesys
-        basr    %r14,%r8        # call sys_xxxx
-        stg     %r2,SP_R2(%r15) # store return value (change R2 on stack)
+        basr    %r14,%r9                        # call sys_xxxx
+        stg     %r2,__PT_R2(%r11)               # store return value
 
 sysc_return:
         LOCKDEP_SYS_EXIT
 sysc_tif:
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
+        tm      __PT_PSW+1(%r11),0x01           # returning to user ?
         jno     sysc_restore
         tm      __TI_flags+7(%r12),_TIF_WORK_SVC
-        jnz     sysc_work       # there is work to do (signals etc.)
+        jnz     sysc_work                       # check for work
         ni      __TI_flags+7(%r12),255-_TIF_SYSCALL
 sysc_restore:
-        RESTORE_ALL __LC_RETURN_PSW,1
+        lg      %r14,__LC_VDSO_PER_CPU
+        lmg     %r0,%r10,__PT_R0(%r11)
+        mvc     __LC_RETURN_PSW(16),__PT_PSW(%r11)
+        stpt    __LC_EXIT_TIMER
+        mvc     __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER
+        lmg     %r11,%r15,__PT_R11(%r11)
+        lpswe   __LC_RETURN_PSW
 sysc_done:
 
 #
@@ -317,7 +267,7 @@ sysc_work:
 #
 sysc_reschedule:
         larl    %r14,sysc_return
-        jg      schedule                # return point is sysc_return
+        jg      schedule
 
 #
 # _TIF_MCCK_PENDING is set, call handler
@@ -331,33 +281,33 @@ sysc_mcck_pending:
 #
 sysc_sigpending:
         ni      __TI_flags+7(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
-        brasl   %r14,do_signal          # call do_signal
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        brasl   %r14,do_signal
         tm      __TI_flags+7(%r12),_TIF_SYSCALL
         jno     sysc_return
-        lmg     %r2,%r6,SP_R2(%r15)     # load svc arguments
-        lghi    %r7,0                   # svc 0 returns -ENOSYS
-        lh      %r1,SP_SVC_CODE+2(%r15) # load new svc number
+        lmg     %r2,%r7,__PT_R2(%r11)   # load svc arguments
+        lghi    %r8,0                   # svc 0 returns -ENOSYS
+        lh      %r1,__PT_INT_CODE+2(%r11)       # load new svc number
         cghi    %r1,NR_syscalls
         jnl     sysc_nr_ok              # invalid svc number -> do svc 0
-        slag    %r7,%r1,2
+        slag    %r8,%r1,2
         j       sysc_nr_ok              # restart svc
 
 #
 # _TIF_NOTIFY_RESUME is set, call do_notify_resume
 #
 sysc_notify_resume:
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        lgr     %r2,%r11                # pass pointer to pt_regs
         larl    %r14,sysc_return
-        jg      do_notify_resume        # call do_notify_resume
+        jg      do_notify_resume
 
 #
 # _TIF_PER_TRAP is set, call do_per_trap
 #
 sysc_singlestep:
         ni      __TI_flags+7(%r12),255-(_TIF_SYSCALL | _TIF_PER_TRAP)
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        larl    %r14,sysc_return        # load adr. of system return
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        larl    %r14,sysc_return
         jg      do_per_trap
 
 #
@@ -365,41 +315,41 @@ sysc_singlestep:
 # and after the system call
 #
 sysc_tracesys:
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        lgr     %r2,%r11                # pass pointer to pt_regs
         la      %r3,0
-        llgh    %r0,SP_SVC_CODE+2(%r15)
-        stg     %r0,SP_R2(%r15)
+        llgh    %r0,__PT_INT_CODE+2(%r11)
+        stg     %r0,__PT_R2(%r11)
         brasl   %r14,do_syscall_trace_enter
         lghi    %r0,NR_syscalls
         clgr    %r0,%r2
         jnh     sysc_tracenogo
-        sllg    %r7,%r2,2               # svc number *4
-        lgf     %r8,0(%r7,%r10)
+        sllg    %r8,%r2,2
+        lgf     %r9,0(%r8,%r10)
 sysc_tracego:
-        lmg     %r3,%r6,SP_R3(%r15)
-        mvc     SP_ARGS(8,%r15),SP_R7(%r15)
-        lg      %r2,SP_ORIG_R2(%r15)
-        basr    %r14,%r8                # call sys_xxx
-        stg     %r2,SP_R2(%r15)         # store return value
+        lmg     %r3,%r7,__PT_R3(%r11)
+        stg     %r7,STACK_FRAME_OVERHEAD(%r15)
+        lg      %r2,__PT_ORIG_GPR2(%r11)
+        basr    %r14,%r9                # call sys_xxx
+        stg     %r2,__PT_R2(%r11)       # store return value
 sysc_tracenogo:
         tm      __TI_flags+6(%r12),_TIF_TRACE >> 8
         jz      sysc_return
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
-        larl    %r14,sysc_return        # return point is sysc_return
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        larl    %r14,sysc_return
         jg      do_syscall_trace_exit
 
 #
 # a new process exits the kernel with ret_from_fork
 #
 ENTRY(ret_from_fork)
-        lg      %r13,__LC_SVC_NEW_PSW+8
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      SP_PSW+1(%r15),0x01     # forking a kernel thread ?
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        lg      %r12,__LC_THREAD_INFO
+        tm      __PT_PSW+1(%r11),0x01   # forking a kernel thread ?
         jo      0f
-        stg     %r15,SP_R15(%r15)       # store stack pointer for new kthread
+        stg     %r15,__PT_R15(%r11)     # store stack pointer for new kthread
 0:      brasl   %r14,schedule_tail
         TRACE_IRQS_ON
-        stosm   24(%r15),0x03           # reenable interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
         j       sysc_tracenogo
 
 #
@@ -409,26 +359,26 @@ ENTRY(ret_from_fork)
 ENTRY(kernel_execve)
         stmg    %r12,%r15,96(%r15)
         lgr     %r14,%r15
-        aghi    %r15,-SP_SIZE
+        aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         stg     %r14,__SF_BACKCHAIN(%r15)
-        la      %r12,SP_PTREGS(%r15)
+        la      %r12,STACK_FRAME_OVERHEAD(%r15)
         xc      0(__PT_SIZE,%r12),0(%r12)
         lgr     %r5,%r12
         brasl   %r14,do_execve
         ltgfr   %r2,%r2
         je      0f
-        aghi    %r15,SP_SIZE
+        aghi    %r15,(STACK_FRAME_OVERHEAD + __PT_SIZE)
         lmg     %r12,%r15,96(%r15)
         br      %r14
         # execve succeeded.
-0:      stnsm   __SF_EMPTY(%r15),0xfc   # disable interrupts
+0:      ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         lg      %r15,__LC_KERNEL_STACK  # load ksp
-        aghi    %r15,-SP_SIZE           # make room for registers & psw
-        lg      %r13,__LC_SVC_NEW_PSW+8
-        mvc     SP_PTREGS(__PT_SIZE,%r15),0(%r12)       # copy pt_regs
+        aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        mvc     0(__PT_SIZE,%r11),0(%r12)       # copy pt_regs
         lg      %r12,__LC_THREAD_INFO
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
         brasl   %r14,execve_tail
         j       sysc_return
 
@@ -437,127 +387,72 @@ ENTRY(kernel_execve)
  */
 
 ENTRY(pgm_check_handler)
-/*
- * First we need to check for a special case:
- * Single stepping an instruction that disables the PER event mask will
- * cause a PER event AFTER the mask has been set. Example: SVC or LPSW.
- * For a single stepped SVC the program check handler gets control after
- * the SVC new PSW has been loaded. But we want to execute the SVC first and
- * then handle the PER event. Therefore we update the SVC old PSW to point
- * to the pgm_check_handler and branch to the SVC handler after we checked
- * if we have to load the kernel stack register.
- * For every other possible cause for PER event without the PER mask set
- * we just ignore the PER event (FIXME: is there anything we have to do
- * for LPSW?).
- */
         stpt    __LC_SYNC_ENTER_TIMER
-        tm      __LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception
-        jnz     pgm_per                  # got per exception -> special case
-        SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        mvc     SP_PSW(16,%r15),__LC_PGM_OLD_PSW
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        HANDLE_SIE_INTERCEPT
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        jz      pgm_no_vtime
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        LAST_BREAK
-pgm_no_vtime:
-        stg     %r11,SP_ARGS(%r15)
-        lgf     %r3,__LC_PGM_ILC        # load program interruption code
-        lg      %r4,__LC_TRANS_EXC_CODE
-        REENABLE_IRQS
-        lghi    %r8,0x7f
-        ngr     %r8,%r3
-        sll     %r8,3
-        larl    %r1,pgm_check_table
-        lg      %r1,0(%r8,%r1)          # load address of handler routine
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        basr    %r14,%r1                # branch to interrupt-handler
-pgm_exit:
-        j       sysc_return
-
-#
-# handle per exception
-#
-pgm_per:
-        tm      __LC_PGM_OLD_PSW,0x40   # test if per event recording is on
-        jnz     pgm_per_std             # ok, normal per event from user space
-# ok its one of the special cases, now we need to find out which one
-        clc     __LC_PGM_OLD_PSW(16),__LC_SVC_NEW_PSW
-        je      pgm_svcper
-# no interesting special case, ignore PER event
-        lpswe   __LC_PGM_OLD_PSW
-
-#
-# Normal per exception
-#
-pgm_per_std:
-        SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        mvc     SP_PSW(16,%r15),__LC_PGM_OLD_PSW
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        HANDLE_SIE_INTERCEPT
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        jz      pgm_no_vtime2
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        LAST_BREAK
-pgm_no_vtime2:
+        stmg    %r8,%r15,__LC_SAVE_AREA_SYNC
+        lg      %r10,__LC_LAST_BREAK
+        lg      %r12,__LC_THREAD_INFO
+        larl    %r13,system_call
+        lmg     %r8,%r9,__LC_PGM_OLD_PSW
+        HANDLE_SIE_INTERCEPT %r14
+        tmhh    %r8,0x0001              # test problem state bit
+        jnz     1f                      # -> fault in user space
+        tmhh    %r8,0x4000              # PER bit set in old PSW ?
+        jnz     0f                      # -> enabled, can't be a double fault
+        tm      __LC_PGM_ILC+3,0x80     # check for per exception
+        jnz     pgm_svcper              # -> single stepped svc
+0:      CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC
+        j       2f
+1:      UPDATE_VTIME %r14,__LC_SYNC_ENTER_TIMER
+        LAST_BREAK %r14
+        lg      %r15,__LC_KERNEL_STACK
+2:      aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        stmg    %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_SYNC
+        stmg    %r8,%r9,__PT_PSW(%r11)
+        mvc     __PT_INT_CODE(4,%r11),__LC_PGM_ILC
+        mvc     __PT_INT_PARM_LONG(8,%r11),__LC_TRANS_EXC_CODE
+        stg     %r10,__PT_ARGS(%r11)
+        tm      __LC_PGM_ILC+3,0x80     # check for per exception
+        jz      0f
         lg      %r1,__TI_task(%r12)
-        tm      SP_PSW+1(%r15),0x01     # kernel per event ?
-        jz      kernel_per
-        mvc     __THREAD_per_cause(2,%r1),__LC_PER_CAUSE
+        tmhh    %r8,0x0001              # kernel per event ?
+        jz      pgm_kprobe
+        oi      __TI_flags+7(%r12),_TIF_PER_TRAP
         mvc     __THREAD_per_address(8,%r1),__LC_PER_ADDRESS
+        mvc     __THREAD_per_cause(2,%r1),__LC_PER_CAUSE
         mvc     __THREAD_per_paid(1,%r1),__LC_PER_PAID
-        oi      __TI_flags+7(%r12),_TIF_PER_TRAP # set TIF_PER_TRAP
-        lgf     %r3,__LC_PGM_ILC        # load program interruption code
-        lg      %r4,__LC_TRANS_EXC_CODE
-        REENABLE_IRQS
-        lghi    %r8,0x7f
-        ngr     %r8,%r3                 # clear per-event-bit and ilc
-        je      pgm_exit2
-        sll     %r8,3
+0:      REENABLE_IRQS
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
         larl    %r1,pgm_check_table
-        lg      %r1,0(%r8,%r1)          # load address of handler routine
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
+        llgh    %r10,__PT_INT_CODE+2(%r11)
+        nill    %r10,0x007f
+        sll     %r10,3
+        je      sysc_return
+        lg      %r1,0(%r10,%r1)         # load address of handler routine
+        lgr     %r2,%r11                # pass pointer to pt_regs
         basr    %r14,%r1                # branch to interrupt-handler
-pgm_exit2:
         j       sysc_return
 
 #
-# it was a single stepped SVC that is causing all the trouble
+# PER event in supervisor state, must be kprobes
 #
-pgm_svcper:
-        SAVE_ALL_PGM __LC_SVC_OLD_PSW,__LC_SAVE_AREA
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        mvc     SP_PSW(16,%r15),__LC_SVC_OLD_PSW
-        mvc     SP_SVC_CODE(4,%r15),__LC_SVC_ILC
-        oi      __TI_flags+7(%r12),(_TIF_SYSCALL | _TIF_PER_TRAP)
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        LAST_BREAK
-        lg      %r8,__TI_task(%r12)
-        mvc     __THREAD_per_cause(2,%r8),__LC_PER_CAUSE
-        mvc     __THREAD_per_address(8,%r8),__LC_PER_ADDRESS
-        mvc     __THREAD_per_paid(1,%r8),__LC_PER_PAID
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        lmg     %r2,%r6,SP_R2(%r15)     # load svc arguments
-        j       sysc_do_svc
+pgm_kprobe:
+        REENABLE_IRQS
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        brasl   %r14,do_per_trap
+        j       sysc_return
 
 #
-# per was called from kernel, must be kprobes
+# single stepped system call
 #
-kernel_per:
-        REENABLE_IRQS
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        brasl   %r14,do_per_trap
-        j       pgm_exit
+pgm_svcper:
+        oi      __TI_flags+7(%r12),_TIF_PER_TRAP
+        mvc     __LC_RETURN_PSW(8),__LC_SVC_NEW_PSW
+        larl    %r14,sysc_per
+        stg     %r14,__LC_RETURN_PSW+8
+        lpswe   __LC_RETURN_PSW         # branch to sysc_per and enable irqs
 
 /*
  * IO interrupt handler routine
@@ -565,21 +460,25 @@ kernel_per:
 ENTRY(io_int_handler)
         stck    __LC_INT_CLOCK
         stpt    __LC_ASYNC_ENTER_TIMER
-        SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+40
-        CREATE_STACK_FRAME __LC_SAVE_AREA+40
-        mvc     SP_PSW(16,%r15),0(%r12) # move user PSW to stack
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        HANDLE_SIE_INTERCEPT
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        jz      io_no_vtime
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
-        LAST_BREAK
-io_no_vtime:
+        stmg    %r8,%r15,__LC_SAVE_AREA_ASYNC
+        lg      %r10,__LC_LAST_BREAK
+        lg      %r12,__LC_THREAD_INFO
+        larl    %r13,system_call
+        lmg     %r8,%r9,__LC_IO_OLD_PSW
+        HANDLE_SIE_INTERCEPT %r14
+        SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT
+        tmhh    %r8,0x0001              # interrupting from user?
+        jz      io_skip
+        UPDATE_VTIME %r14,__LC_ASYNC_ENTER_TIMER
+        LAST_BREAK %r14
+io_skip:
+        stmg    %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC
+        stmg    %r8,%r9,__PT_PSW(%r11)
         TRACE_IRQS_OFF
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
-        brasl   %r14,do_IRQ             # call standard irq handler
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        brasl   %r14,do_IRQ
 io_return:
         LOCKDEP_SYS_EXIT
         TRACE_IRQS_ON
@@ -587,7 +486,14 @@ io_tif:
         tm      __TI_flags+7(%r12),_TIF_WORK_INT
         jnz     io_work                 # there is work to do (signals etc.)
 io_restore:
-        RESTORE_ALL __LC_RETURN_PSW,0
+        lg      %r14,__LC_VDSO_PER_CPU
+        lmg     %r0,%r10,__PT_R0(%r11)
+        mvc     __LC_RETURN_PSW(16),__PT_PSW(%r11)
+        ni      __LC_RETURN_PSW+1,0xfd  # clear wait state bit
+        stpt    __LC_EXIT_TIMER
+        mvc     __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER
+        lmg     %r11,%r15,__PT_R11(%r11)
+        lpswe   __LC_RETURN_PSW
 io_done:
 
 #
@@ -600,7 +506,7 @@ io_done:
 # Before any work can be done, a switch to the kernel stack is required.
 #
 io_work:
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
+        tm      __PT_PSW+1(%r11),0x01   # returning to user ?
         jo      io_work_user            # yes -> do resched & signal
 #ifdef CONFIG_PREEMPT
         # check for preemptive scheduling
@@ -609,10 +515,11 @@ io_work:
         tm      __TI_flags+7(%r12),_TIF_NEED_RESCHED
         jno     io_restore
         # switch to kernel stack
-        lg      %r1,SP_R15(%r15)
-        aghi    %r1,-SP_SIZE
-        mvc     SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
-        xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1) # clear back chain
+        lg      %r1,__PT_R15(%r11)
+        aghi    %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
+        xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)
+        la      %r11,STACK_FRAME_OVERHEAD(%r1)
         lgr     %r15,%r1
         # TRACE_IRQS_ON already done at io_return, call
         # TRACE_IRQS_OFF to keep things symmetrical
@@ -628,9 +535,10 @@ io_work:
 #
 io_work_user:
         lg      %r1,__LC_KERNEL_STACK
-        aghi    %r1,-SP_SIZE
-        mvc     SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
-        xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1) # clear back chain
+        aghi    %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
+        xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)
+        la      %r11,STACK_FRAME_OVERHEAD(%r1)
         lgr     %r15,%r1
 
 #
@@ -663,9 +571,9 @@ io_mcck_pending:
 #
 io_reschedule:
         # TRACE_IRQS_ON already done at io_return
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
         brasl   %r14,schedule           # call scheduler
-        stnsm   __SF_EMPTY(%r15),0xfc   # disable I/O and ext. interrupts
+        ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         TRACE_IRQS_OFF
         j       io_return
 
@@ -674,10 +582,10 @@ io_reschedule:
 #
 io_sigpending:
         # TRACE_IRQS_ON already done at io_return
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
-        brasl   %r14,do_signal          # call do_signal
-        stnsm   __SF_EMPTY(%r15),0xfc   # disable I/O and ext. interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        brasl   %r14,do_signal
+        ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         TRACE_IRQS_OFF
         j       io_return
 
@@ -686,10 +594,10 @@ io_sigpending:
 #
 io_notify_resume:
         # TRACE_IRQS_ON already done at io_return
-        stosm   __SF_EMPTY(%r15),0x03   # reenable interrupts
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
-        brasl   %r14,do_notify_resume   # call do_notify_resume
-        stnsm   __SF_EMPTY(%r15),0xfc   # disable I/O and ext. interrupts
+        ssm     __LC_SVC_NEW_PSW        # reenable interrupts
+        lgr     %r2,%r11                # pass pointer to pt_regs
+        brasl   %r14,do_notify_resume
+        ssm     __LC_PGM_NEW_PSW        # disable I/O and ext. interrupts
         TRACE_IRQS_OFF
         j       io_return
 
@@ -699,21 +607,24 @@ io_notify_resume:
 ENTRY(ext_int_handler)
         stck    __LC_INT_CLOCK
         stpt    __LC_ASYNC_ENTER_TIMER
-        SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+40
-        CREATE_STACK_FRAME __LC_SAVE_AREA+40
-        mvc     SP_PSW(16,%r15),0(%r12) # move user PSW to stack
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        HANDLE_SIE_INTERCEPT
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        jz      ext_no_vtime
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER
-        LAST_BREAK
-ext_no_vtime:
+        stmg    %r8,%r15,__LC_SAVE_AREA_ASYNC
+        lg      %r10,__LC_LAST_BREAK
+        lg      %r12,__LC_THREAD_INFO
+        larl    %r13,system_call
+        lmg     %r8,%r9,__LC_EXT_OLD_PSW
+        HANDLE_SIE_INTERCEPT %r14
+        SWITCH_ASYNC __LC_SAVE_AREA_ASYNC,__LC_ASYNC_STACK,STACK_SHIFT
+        tmhh    %r8,0x0001              # interrupting from user ?
+        jz      ext_skip
+        UPDATE_VTIME %r14,__LC_ASYNC_ENTER_TIMER
+        LAST_BREAK %r14
+ext_skip:
+        stmg    %r0,%r7,__PT_R0(%r11)
+        mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_ASYNC
+        stmg    %r8,%r9,__PT_PSW(%r11)
         TRACE_IRQS_OFF
         lghi    %r1,4096
-        la      %r2,SP_PTREGS(%r15)     # address of register-save area
+        lgr     %r2,%r11                # pass pointer to pt_regs
         llgf    %r3,__LC_CPU_ADDRESS    # get cpu address + interruption code
         llgf    %r4,__LC_EXT_PARAMS     # get external parameter
         lg      %r5,__LC_EXT_PARAMS2-4096(%r1)  # get 64 bit external parameter
@@ -730,81 +641,77 @@ ENTRY(mcck_int_handler)
         la      %r1,4095                # revalidate r1
         spt     __LC_CPU_TIMER_SAVE_AREA-4095(%r1)      # revalidate cpu timer
         lmg     %r0,%r15,__LC_GPREGS_SAVE_AREA-4095(%r1)# revalidate gprs
-        stmg    %r11,%r15,__LC_SAVE_AREA+80
+        lg      %r10,__LC_LAST_BREAK
+        lg      %r12,__LC_THREAD_INFO
         larl    %r13,system_call
-        lg      %r11,__LC_LAST_BREAK
-        la      %r12,__LC_MCK_OLD_PSW
+        lmg     %r8,%r9,__LC_MCK_OLD_PSW
+        HANDLE_SIE_INTERCEPT %r14
         tm      __LC_MCCK_CODE,0x80     # system damage?
-        jo      mcck_int_main           # yes -> rest of mcck code invalid
-        la      %r14,4095
-        mvc     __LC_MCCK_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA-4095(%r14)
+        jo      mcck_panic              # yes -> rest of mcck code invalid
+        lghi    %r14,__LC_CPU_TIMER_SAVE_AREA
+        mvc     __LC_MCCK_ENTER_TIMER(8),0(%r14)
         tm      __LC_MCCK_CODE+5,0x02   # stored cpu timer value valid?
-        jo      1f
+        jo      3f
         la      %r14,__LC_SYNC_ENTER_TIMER
         clc     0(8,%r14),__LC_ASYNC_ENTER_TIMER
         jl      0f
         la      %r14,__LC_ASYNC_ENTER_TIMER
 0:      clc     0(8,%r14),__LC_EXIT_TIMER
-        jl      0f
+        jl      1f
         la      %r14,__LC_EXIT_TIMER
-0:      clc     0(8,%r14),__LC_LAST_UPDATE_TIMER
-        jl      0f
+1:      clc     0(8,%r14),__LC_LAST_UPDATE_TIMER
+        jl      2f
         la      %r14,__LC_LAST_UPDATE_TIMER
-0:      spt     0(%r14)
+2:      spt     0(%r14)
         mvc     __LC_MCCK_ENTER_TIMER(8),0(%r14)
-1:      tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
-        jno     mcck_int_main           # no -> skip cleanup critical
-        tm      __LC_MCK_OLD_PSW+1,0x01 # test problem state bit
-        jnz     mcck_int_main           # from user -> load kernel stack
-        clc     __LC_MCK_OLD_PSW+8(8),BASED(.Lcritical_end)
-        jhe     mcck_int_main
-        clc     __LC_MCK_OLD_PSW+8(8),BASED(.Lcritical_start)
-        jl      mcck_int_main
-        brasl   %r14,cleanup_critical
-mcck_int_main:
-        lg      %r14,__LC_PANIC_STACK   # are we already on the panic stack?
-        slgr    %r14,%r15
-        srag    %r14,%r14,PAGE_SHIFT
-        jz      0f
-        lg      %r15,__LC_PANIC_STACK   # load panic stack
-0:      aghi    %r15,-SP_SIZE           # make room for registers & psw
-        CREATE_STACK_FRAME __LC_SAVE_AREA+80
-        mvc     SP_PSW(16,%r15),0(%r12)
-        lg      %r12,__LC_THREAD_INFO   # load pointer to thread_info struct
-        tm      __LC_MCCK_CODE+2,0x08   # mwp of old psw valid?
-        jno     mcck_no_vtime           # no -> no timer update
-        HANDLE_SIE_INTERCEPT
-        tm      SP_PSW+1(%r15),0x01     # interrupting from user ?
-        jz      mcck_no_vtime
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_MCCK_ENTER_TIMER,__LC_USER_TIMER
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-        mvc     __LC_LAST_UPDATE_TIMER(8),__LC_MCCK_ENTER_TIMER
-        LAST_BREAK
-mcck_no_vtime:
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+3:      tm      __LC_MCCK_CODE+2,0x09   # mwp + ia of old psw valid?
+        jno     mcck_panic              # no -> skip cleanup critical
+        SWITCH_ASYNC __LC_GPREGS_SAVE_AREA+64,__LC_PANIC_STACK,PAGE_SHIFT
+        tm      %r8,0x0001              # interrupting from user ?
+        jz      mcck_skip
+        UPDATE_VTIME %r14,__LC_MCCK_ENTER_TIMER
+        LAST_BREAK %r14
+mcck_skip:
+        lghi    %r14,__LC_GPREGS_SAVE_AREA
+        mvc     __PT_R0(128,%r11),0(%r14)
+        stmg    %r8,%r9,__PT_PSW(%r11)
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+        lgr     %r2,%r11                # pass pointer to pt_regs
         brasl   %r14,s390_do_machine_check
-        tm      SP_PSW+1(%r15),0x01     # returning to user ?
+        tm      __PT_PSW+1(%r11),0x01   # returning to user ?
         jno     mcck_return
         lg      %r1,__LC_KERNEL_STACK   # switch to kernel stack
-        aghi    %r1,-SP_SIZE
-        mvc     SP_PTREGS(__PT_SIZE,%r1),SP_PTREGS(%r15)
-        xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1) # clear back chain
+        aghi    %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
+        xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)
+        la      %r11,STACK_FRAME_OVERHEAD(%r1)
         lgr     %r15,%r1
-        stosm   __SF_EMPTY(%r15),0x04   # turn dat on
+        ssm     __LC_PGM_NEW_PSW        # turn dat on, keep irqs off
         tm      __TI_flags+7(%r12),_TIF_MCCK_PENDING
         jno     mcck_return
         TRACE_IRQS_OFF
         brasl   %r14,s390_handle_mcck
         TRACE_IRQS_ON
 mcck_return:
-        mvc     __LC_RETURN_MCCK_PSW(16),SP_PSW(%r15) # move return PSW
+        lg      %r14,__LC_VDSO_PER_CPU
+        lmg     %r0,%r10,__PT_R0(%r11)
+        mvc     __LC_RETURN_MCCK_PSW(16),__PT_PSW(%r11) # move return PSW
         ni      __LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit
-        lmg     %r0,%r15,SP_R0(%r15)    # load gprs 0-15
         tm      __LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?
         jno     0f
         stpt    __LC_EXIT_TIMER
-0:      lpswe   __LC_RETURN_MCCK_PSW    # back to caller
-mcck_done:
+        mvc     __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER
+0:      lmg     %r11,%r15,__PT_R11(%r11)
+        lpswe   __LC_RETURN_MCCK_PSW
+
+mcck_panic:
+        lg      %r14,__LC_PANIC_STACK
+        slgr    %r14,%r15
+        srag    %r14,%r14,PAGE_SHIFT
+        jz      0f
+        lg      %r15,__LC_PANIC_STACK
+0:      aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
+        j       mcck_skip
 
 /*
  * Restart interruption handler, kick starter for additional CPUs
@@ -818,17 +725,18 @@ restart_base:
         stck    __LC_LAST_UPDATE_CLOCK
         mvc     __LC_LAST_UPDATE_TIMER(8),restart_vtime-restart_base(%r1)
         mvc     __LC_EXIT_TIMER(8),restart_vtime-restart_base(%r1)
-        lg      %r15,__LC_SAVE_AREA+120 # load ksp
+        lghi    %r10,__LC_GPREGS_SAVE_AREA
+        lg      %r15,120(%r10)          # load ksp
         lghi    %r10,__LC_CREGS_SAVE_AREA
-        lctlg   %c0,%c15,0(%r10) # get new ctl regs
+        lctlg   %c0,%c15,0(%r10)        # get new ctl regs
         lghi    %r10,__LC_AREGS_SAVE_AREA
         lam     %a0,%a15,0(%r10)
-        lmg     %r6,%r15,__SF_GPRS(%r15) # load registers from clone
+        lmg     %r6,%r15,__SF_GPRS(%r15)# load registers from clone
         lg      %r1,__LC_THREAD_INFO
         mvc     __LC_USER_TIMER(8),__TI_user_timer(%r1)
         mvc     __LC_SYSTEM_TIMER(8),__TI_system_timer(%r1)
         xc      __LC_STEAL_TIMER(8),__LC_STEAL_TIMER
-        stosm   __SF_EMPTY(%r15),0x04   # now we can turn dat on
+        ssm     __LC_PGM_NEW_PSW        # turn dat on, keep irqs off
         brasl   %r14,start_secondary
         .align  8
 restart_vtime:
@@ -852,16 +760,16 @@ restart_go:
 # PSW restart interrupt handler
 #
 ENTRY(psw_restart_int_handler)
-        stg     %r15,__LC_SAVE_AREA+120(%r0)    # save r15
+        stg     %r15,__LC_SAVE_AREA_RESTART
         larl    %r15,restart_stack              # load restart stack
         lg      %r15,0(%r15)
-        aghi    %r15,-SP_SIZE                   # make room for pt_regs
-        stmg    %r0,%r14,SP_R0(%r15)            # store gprs %r0-%r14 to stack
-        mvc     SP_R15(8,%r15),__LC_SAVE_AREA+120(%r0)# store saved %r15 to stack
-        mvc     SP_PSW(16,%r15),__LC_RST_OLD_PSW(%r0)# store restart old psw
-        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # set backchain to 0
+        aghi    %r15,-__PT_SIZE                 # create pt_regs on stack
+        stmg    %r0,%r14,__PT_R0(%r15)
+        mvc     __PT_R15(8,%r15),__LC_SAVE_AREA_RESTART
+        mvc     __PT_PSW(16,%r15),__LC_RST_OLD_PSW # store restart old psw
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
         brasl   %r14,do_restart
-
         larl    %r14,restart_psw_crash          # load disabled wait PSW if
         lpswe   0(%r14)                         # do_restart returns
         .align 8
@@ -877,172 +785,153 @@ restart_psw_crash:
  * Setup a pt_regs so that show_trace can provide a good call trace.
  */
 stack_overflow:
-        lg      %r15,__LC_PANIC_STACK   # change to panic stack
-        aghi    %r15,-SP_SIZE
-        mvc     SP_PSW(16,%r15),0(%r12) # move user PSW to stack
-        stmg    %r0,%r10,SP_R0(%r15)    # store gprs %r0-%r10 to kernel stack
-        la      %r1,__LC_SAVE_AREA
-        chi     %r12,__LC_SVC_OLD_PSW
-        je      0f
-        chi     %r12,__LC_PGM_OLD_PSW
-        je      0f
-        la      %r1,__LC_SAVE_AREA+40
-0:      mvc     SP_R11(40,%r15),0(%r1)  # move %r11-%r15 to stack
-        mvc     SP_ARGS(8,%r15),__LC_LAST_BREAK
-        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # clear back chain
-        la      %r2,SP_PTREGS(%r15)     # load pt_regs
+        lg      %r11,__LC_PANIC_STACK   # change to panic stack
+        aghi    %r11,-__PT_SIZE         # create pt_regs
+        stmg    %r0,%r7,__PT_R0(%r11)
+        stmg    %r8,%r9,__PT_PSW(%r11)
+        mvc     __PT_R8(64,%r11),0(%r14)
+        stg     %r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2
+        lgr     %r15,%r11
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
+        lgr     %r2,%r11                # pass pointer to pt_regs
         jg      kernel_stack_overflow
 #endif
 
-cleanup_table_system_call:
-        .quad   system_call, sysc_do_svc
-cleanup_table_sysc_tif:
-        .quad   sysc_tif, sysc_restore
-cleanup_table_sysc_restore:
-        .quad   sysc_restore, sysc_done
-cleanup_table_io_tif:
-        .quad   io_tif, io_restore
-cleanup_table_io_restore:
-        .quad   io_restore, io_done
+        .align  8
+cleanup_table:
+        .quad   system_call
+        .quad   sysc_do_svc
+        .quad   sysc_tif
+        .quad   sysc_restore
+        .quad   sysc_done
+        .quad   io_tif
+        .quad   io_restore
+        .quad   io_done
 
 cleanup_critical:
-        clc     8(8,%r12),BASED(cleanup_table_system_call)
+        clg     %r9,BASED(cleanup_table)        # system_call
         jl      0f
-        clc     8(8,%r12),BASED(cleanup_table_system_call+8)
+        clg     %r9,BASED(cleanup_table+8)      # sysc_do_svc
         jl      cleanup_system_call
-0:
-        clc     8(8,%r12),BASED(cleanup_table_sysc_tif)
+        clg     %r9,BASED(cleanup_table+16)     # sysc_tif
         jl      0f
-        clc     8(8,%r12),BASED(cleanup_table_sysc_tif+8)
+        clg     %r9,BASED(cleanup_table+24)     # sysc_restore
         jl      cleanup_sysc_tif
-0:
-        clc     8(8,%r12),BASED(cleanup_table_sysc_restore)
-        jl      0f
-        clc     8(8,%r12),BASED(cleanup_table_sysc_restore+8)
+        clg     %r9,BASED(cleanup_table+32)     # sysc_done
         jl      cleanup_sysc_restore
-0:
-        clc     8(8,%r12),BASED(cleanup_table_io_tif)
+        clg     %r9,BASED(cleanup_table+40)     # io_tif
         jl      0f
-        clc     8(8,%r12),BASED(cleanup_table_io_tif+8)
+        clg     %r9,BASED(cleanup_table+48)     # io_restore
         jl      cleanup_io_tif
-0:
-        clc     8(8,%r12),BASED(cleanup_table_io_restore)
-        jl      0f
-        clc     8(8,%r12),BASED(cleanup_table_io_restore+8)
+        clg     %r9,BASED(cleanup_table+56)     # io_done
         jl      cleanup_io_restore
-0:
-        br      %r14
+0:      br      %r14
+
 
 cleanup_system_call:
-        mvc     __LC_RETURN_PSW(16),0(%r12)
-        clc     __LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+8)
+        # check if stpt has been executed
+        clg     %r9,BASED(cleanup_system_call_insn)
         jh      0f
-        mvc     __LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER
-        cghi    %r12,__LC_MCK_OLD_PSW
-        je      0f
         mvc     __LC_SYNC_ENTER_TIMER(8),__LC_ASYNC_ENTER_TIMER
-0:      cghi    %r12,__LC_MCK_OLD_PSW
-        la      %r12,__LC_SAVE_AREA+80
+        cghi    %r11,__LC_SAVE_AREA_ASYNC
         je      0f
-        la      %r12,__LC_SAVE_AREA+40
-0:      clc     __LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+16)
-        jhe     cleanup_vtime
-        clc     __LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn)
+        mvc     __LC_SYNC_ENTER_TIMER(8),__LC_MCCK_ENTER_TIMER
+0:      # check if stmg has been executed
+        clg     %r9,BASED(cleanup_system_call_insn+8)
         jh      0f
-        mvc     __LC_SAVE_AREA(40),0(%r12)
-0:      lg      %r15,__LC_KERNEL_STACK  # problem state -> load ksp
-        aghi    %r15,-SP_SIZE           # make room for registers & psw
-        stg     %r15,32(%r12)
-        stg     %r11,0(%r12)
-        CREATE_STACK_FRAME __LC_SAVE_AREA
-        mvc     8(8,%r12),__LC_THREAD_INFO
-        lg      %r12,__LC_THREAD_INFO
-        mvc     SP_PSW(16,%r15),__LC_SVC_OLD_PSW
-        mvc     SP_SVC_CODE(4,%r15),__LC_SVC_ILC
-        oi      __TI_flags+7(%r12),_TIF_SYSCALL
-cleanup_vtime:
-        clc     __LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+24)
-        jhe     cleanup_stime
-        UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
-cleanup_stime:
-        clc     __LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+32)
-        jh      cleanup_update
-        UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
-cleanup_update:
+        mvc     __LC_SAVE_AREA_SYNC(64),0(%r11)
+0:      # check if base register setup + TIF bit load has been done
+        clg     %r9,BASED(cleanup_system_call_insn+16)
+        jhe     0f
+        # set up saved registers r10 and r12
+        stg     %r10,16(%r11)           # r10 last break
+        stg     %r12,32(%r11)           # r12 thread-info pointer
+0:      # check if the user time update has been done
+        clg     %r9,BASED(cleanup_system_call_insn+24)
+        jh      0f
+        lg      %r15,__LC_EXIT_TIMER
+        slg     %r15,__LC_SYNC_ENTER_TIMER
+        alg     %r15,__LC_USER_TIMER
+        stg     %r15,__LC_USER_TIMER
+0:      # check if the system time update has been done
+        clg     %r9,BASED(cleanup_system_call_insn+32)
+        jh      0f
+        lg      %r15,__LC_LAST_UPDATE_TIMER
+        slg     %r15,__LC_EXIT_TIMER
+        alg     %r15,__LC_SYSTEM_TIMER
+        stg     %r15,__LC_SYSTEM_TIMER
+0:      # update accounting time stamp
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
-        srag    %r12,%r11,23
-        lg      %r12,__LC_THREAD_INFO
+        # do LAST_BREAK
+        lg      %r9,16(%r11)
+        srag    %r9,%r9,23
         jz      0f
-        stg     %r11,__TI_last_break(%r12)
-0:      mvc     __LC_RETURN_PSW+8(8),BASED(cleanup_table_system_call+8)
-        la      %r12,__LC_RETURN_PSW
+        mvc     __TI_last_break(8,%r12),16(%r11)
+0:      # set up saved register r11
+        lg      %r15,__LC_KERNEL_STACK
+        aghi    %r15,-__PT_SIZE
+        stg     %r15,24(%r11)           # r11 pt_regs pointer
+        # fill pt_regs
+        mvc     __PT_R8(64,%r15),__LC_SAVE_AREA_SYNC
+        stmg    %r0,%r7,__PT_R0(%r15)
+        mvc     __PT_PSW(16,%r15),__LC_SVC_OLD_PSW
+        mvc     __PT_INT_CODE(4,%r15),__LC_SVC_ILC
+        # setup saved register r15
+        aghi    %r15,-STACK_FRAME_OVERHEAD
+        stg     %r15,56(%r11)           # r15 stack pointer
+        # set new psw address and exit
+        larl    %r9,sysc_do_svc
         br      %r14
 cleanup_system_call_insn:
-        .quad   sysc_saveall
         .quad   system_call
-        .quad   sysc_vtime
-        .quad   sysc_stime
-        .quad   sysc_update
+        .quad   sysc_stmg
+        .quad   sysc_per
+        .quad   sysc_vtime+18
+        .quad   sysc_vtime+42
 
 cleanup_sysc_tif:
-        mvc     __LC_RETURN_PSW(8),0(%r12)
-        mvc     __LC_RETURN_PSW+8(8),BASED(cleanup_table_sysc_tif)
-        la      %r12,__LC_RETURN_PSW
+        larl    %r9,sysc_tif
         br      %r14
 
 cleanup_sysc_restore:
-        clc     8(8,%r12),BASED(cleanup_sysc_restore_insn)
-        je      2f
-        clc     8(8,%r12),BASED(cleanup_sysc_restore_insn+8)
-        jhe     0f
-        mvc     __LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER
-        cghi    %r12,__LC_MCK_OLD_PSW
+        clg     %r9,BASED(cleanup_sysc_restore_insn)
         je      0f
-        mvc     __LC_EXIT_TIMER(8),__LC_ASYNC_ENTER_TIMER
-0:      mvc     __LC_RETURN_PSW(16),SP_PSW(%r15)
-        cghi    %r12,__LC_MCK_OLD_PSW
-        la      %r12,__LC_SAVE_AREA+80
-        je      1f
-        la      %r12,__LC_SAVE_AREA+40
-1:      mvc     0(40,%r12),SP_R11(%r15)
-        lmg     %r0,%r10,SP_R0(%r15)
-        lg      %r15,SP_R15(%r15)
-2:      la      %r12,__LC_RETURN_PSW
+        lg      %r9,24(%r11)            # get saved pointer to pt_regs
+        mvc     __LC_RETURN_PSW(16),__PT_PSW(%r9)
+        mvc     0(64,%r11),__PT_R8(%r9)
+        lmg     %r0,%r7,__PT_R0(%r9)
+0:      lmg     %r8,%r9,__LC_RETURN_PSW
         br      %r14
 cleanup_sysc_restore_insn:
         .quad   sysc_done - 4
-        .quad   sysc_done - 16
 
 cleanup_io_tif:
-        mvc     __LC_RETURN_PSW(8),0(%r12)
-        mvc     __LC_RETURN_PSW+8(8),BASED(cleanup_table_io_tif)
-        la      %r12,__LC_RETURN_PSW
+        larl    %r9,io_tif
         br      %r14
 
 cleanup_io_restore:
-        clc     8(8,%r12),BASED(cleanup_io_restore_insn)
-        je      1f
-        clc     8(8,%r12),BASED(cleanup_io_restore_insn+8)
-        jhe     0f
-        mvc     __LC_EXIT_TIMER(8),__LC_MCCK_ENTER_TIMER
-0:      mvc     __LC_RETURN_PSW(16),SP_PSW(%r15)
-        mvc     __LC_SAVE_AREA+80(40),SP_R11(%r15)
-        lmg     %r0,%r10,SP_R0(%r15)
-        lg      %r15,SP_R15(%r15)
-1:      la      %r12,__LC_RETURN_PSW
+        clg     %r9,BASED(cleanup_io_restore_insn)
+        je      0f
+        lg      %r9,24(%r11)            # get saved r11 pointer to pt_regs
+        mvc     __LC_RETURN_PSW(16),__PT_PSW(%r9)
+        ni      __LC_RETURN_PSW+1,0xfd  # clear wait state bit
+        mvc     0(64,%r11),__PT_R8(%r9)
+        lmg     %r0,%r7,__PT_R0(%r9)
+0:      lmg     %r8,%r9,__LC_RETURN_PSW
         br      %r14
 cleanup_io_restore_insn:
         .quad   io_done - 4
-        .quad   io_done - 16
 
 /*
  * Integer constants
  */
-                .align  4
+        .align  8
 .Lcritical_start:
-                .quad   __critical_start
-.Lcritical_end:
-                .quad   __critical_end
+        .quad   __critical_start
+.Lcritical_length:
+        .quad   __critical_end - __critical_start
+
 
 #if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)
 /*
@@ -1054,6 +943,7 @@ ENTRY(sie64a)
         stmg    %r6,%r14,__SF_GPRS(%r15)        # save kernel registers
         stg     %r2,__SF_EMPTY(%r15)            # save control block pointer
         stg     %r3,__SF_EMPTY+8(%r15)          # save guest register save area
+        xc      __SF_EMPTY+16(8,%r15),__SF_EMPTY+16(%r15) # host id == 0
         lmg     %r0,%r13,0(%r3)                 # load guest gprs 0-13
         lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
         oi      __TI_flags+6(%r14),_TIF_SIE>>8
@@ -1070,7 +960,7 @@ sie_gmap:
         SPP     __SF_EMPTY(%r15)                # set guest id
         sie     0(%r14)
 sie_done:
-        SPP     __LC_CMF_HPP                    # set host id
+        SPP     __SF_EMPTY+16(%r15)             # set host id
         lg      %r14,__LC_THREAD_INFO           # pointer thread_info struct
 sie_exit:
         lctlg   %c1,%c1,__LC_USER_ASCE          # load primary asce
@@ -1093,8 +983,10 @@ sie_fault:
         .align  8
 .Lsie_loop:
         .quad   sie_loop
-.Lsie_done:
-        .quad   sie_done
+.Lsie_length:
+        .quad   sie_done - sie_loop
+.Lhost_id:
+        .quad   0
 
         .section __ex_table,"a"
         .quad   sie_loop,sie_fault
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 900068d2bf92..c27a0727f930 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -329,8 +329,8 @@ iplstart:
 #
 # reset files in VM reader
 #
-        stidp   __LC_SAVE_AREA          # store cpuid
-        tm      __LC_SAVE_AREA,0xff     # running VM ?
+        stidp   __LC_SAVE_AREA_SYNC     # store cpuid
+        tm      __LC_SAVE_AREA_SYNC,0xff# running VM ?
         bno     .Lnoreset
         la      %r2,.Lreset
         lhi     %r3,26
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index 3cd0f25ab015..47b168fb29c4 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -208,6 +208,7 @@ void machine_kexec_cleanup(struct kimage *image)
 void arch_crash_save_vmcoreinfo(void)
 {
         VMCOREINFO_SYMBOL(lowcore_ptr);
+        VMCOREINFO_SYMBOL(high_memory);
         VMCOREINFO_LENGTH(lowcore_ptr, NR_CPUS);
 }
 
diff --git a/arch/s390/kernel/mem_detect.c b/arch/s390/kernel/mem_detect.c
index 19b4568f4cee..22d502e885ed 100644
--- a/arch/s390/kernel/mem_detect.c
+++ b/arch/s390/kernel/mem_detect.c
@@ -64,70 +64,82 @@ void detect_memory_layout(struct mem_chunk chunk[])
 EXPORT_SYMBOL(detect_memory_layout);
 
 /*
+ * Move memory chunks array from index "from" to index "to"
+ */
+static void mem_chunk_move(struct mem_chunk chunk[], int to, int from)
+{
+        int cnt = MEMORY_CHUNKS - to;
+
+        memmove(&chunk[to], &chunk[from], cnt * sizeof(struct mem_chunk));
+}
+
+/*
+ * Initialize memory chunk
+ */
+static void mem_chunk_init(struct mem_chunk *chunk, unsigned long addr,
+                           unsigned long size, int type)
+{
+        chunk->type = type;
+        chunk->addr = addr;
+        chunk->size = size;
+}
+
+/*
  * Create memory hole with given address, size, and type
  */
-void create_mem_hole(struct mem_chunk chunks[], unsigned long addr,
+void create_mem_hole(struct mem_chunk chunk[], unsigned long addr,
                      unsigned long size, int type)
 {
-        unsigned long start, end, new_size;
-        int i;
+        unsigned long lh_start, lh_end, lh_size, ch_start, ch_end, ch_size;
+        int i, ch_type;
 
         for (i = 0; i < MEMORY_CHUNKS; i++) {
-                if (chunks[i].size == 0)
-                        continue;
-                if (addr + size < chunks[i].addr)
-                        continue;
-                if (addr >= chunks[i].addr + chunks[i].size)
+                if (chunk[i].size == 0)
                         continue;
-                start = max(addr, chunks[i].addr);
-                end = min(addr + size, chunks[i].addr + chunks[i].size);
-                new_size = end - start;
-                if (new_size == 0)
-                        continue;
-                if (start == chunks[i].addr &&
-                    end == chunks[i].addr + chunks[i].size) {
-                        /* Remove chunk */
-                        chunks[i].type = type;
-                } else if (start == chunks[i].addr) {
-                        /* Make chunk smaller at start */
-                        if (i >= MEMORY_CHUNKS - 1)
-                                panic("Unable to create memory hole");
-                        memmove(&chunks[i + 1], &chunks[i],
-                                sizeof(struct mem_chunk) *
-                                (MEMORY_CHUNKS - (i + 1)));
-                        chunks[i + 1].addr = chunks[i].addr + new_size;
-                        chunks[i + 1].size = chunks[i].size - new_size;
-                        chunks[i].size = new_size;
-                        chunks[i].type = type;
-                        i += 1;
-                } else if (end == chunks[i].addr + chunks[i].size) {
-                        /* Make chunk smaller at end */
-                        if (i >= MEMORY_CHUNKS - 1)
-                                panic("Unable to create memory hole");
-                        memmove(&chunks[i + 1], &chunks[i],
-                                sizeof(struct mem_chunk) *
-                                (MEMORY_CHUNKS - (i + 1)));
-                        chunks[i + 1].addr = start;
-                        chunks[i + 1].size = new_size;
-                        chunks[i + 1].type = type;
-                        chunks[i].size -= new_size;
+
+                /* Define chunk properties */
+                ch_start = chunk[i].addr;
+                ch_size = chunk[i].size;
+                ch_end = ch_start + ch_size - 1;
+                ch_type = chunk[i].type;
+
+                /* Is memory chunk hit by memory hole? */
+                if (addr + size <= ch_start)
+                        continue; /* No: memory hole in front of chunk */
+                if (addr > ch_end)
+                        continue; /* No: memory hole after chunk */
+
+                /* Yes: Define local hole properties */
+                lh_start = max(addr, chunk[i].addr);
+                lh_end = min(addr + size - 1, ch_end);
+                lh_size = lh_end - lh_start + 1;
+
+                if (lh_start == ch_start && lh_end == ch_end) {
+                        /* Hole covers complete memory chunk */
+                        mem_chunk_init(&chunk[i], lh_start, lh_size, type);
+                } else if (lh_end == ch_end) {
+                        /* Hole starts in memory chunk and convers chunk end */
+                        mem_chunk_move(chunk, i + 1, i);
+                        mem_chunk_init(&chunk[i], ch_start, ch_size - lh_size,
+                                       ch_type);
+                        mem_chunk_init(&chunk[i + 1], lh_start, lh_size, type);
                         i += 1;
+                } else if (lh_start == ch_start) {
+                        /* Hole ends in memory chunk */
+                        mem_chunk_move(chunk, i + 1, i);
+                        mem_chunk_init(&chunk[i], lh_start, lh_size, type);
+                        mem_chunk_init(&chunk[i + 1], lh_end + 1,
+                                       ch_size - lh_size, ch_type);
+                        break;
                 } else {
-                        /* Create memory hole */
-                        if (i >= MEMORY_CHUNKS - 2)
-                                panic("Unable to create memory hole");
-                        memmove(&chunks[i + 2], &chunks[i],
-                                sizeof(struct mem_chunk) *
-                                (MEMORY_CHUNKS - (i + 2)));
-                        chunks[i + 1].addr = addr;
-                        chunks[i + 1].size = size;
-                        chunks[i + 1].type = type;
-                        chunks[i + 2].addr = addr + size;
-                        chunks[i + 2].size =
-                                chunks[i].addr + chunks[i].size - (addr + size);
-                        chunks[i + 2].type = chunks[i].type;
-                        chunks[i].size = addr - chunks[i].addr;
-                        i += 2;
+                        /* Hole splits memory chunk */
+                        mem_chunk_move(chunk, i + 2, i);
+                        mem_chunk_init(&chunk[i], ch_start,
+                                       lh_start - ch_start, ch_type);
+                        mem_chunk_init(&chunk[i + 1], lh_start, lh_size, type);
+                        mem_chunk_init(&chunk[i + 2], lh_end + 1,
+                                       ch_end - lh_end, ch_type);
+                        break;
                 }
         }
 }
diff --git a/arch/s390/kernel/reipl64.S b/arch/s390/kernel/reipl64.S
index 732a793ec53a..36b32658fb24 100644
--- a/arch/s390/kernel/reipl64.S
+++ b/arch/s390/kernel/reipl64.S
@@ -17,11 +17,11 @@
 #
 ENTRY(store_status)
         /* Save register one and load save area base */
-        stg     %r1,__LC_SAVE_AREA+120(%r0)
+        stg     %r1,__LC_SAVE_AREA_RESTART
         lghi    %r1,SAVE_AREA_BASE
         /* General purpose registers */
         stmg    %r0,%r15,__LC_GPREGS_SAVE_AREA-SAVE_AREA_BASE(%r1)
-        lg      %r2,__LC_SAVE_AREA+120(%r0)
+        lg      %r2,__LC_SAVE_AREA_RESTART
         stg     %r2,__LC_GPREGS_SAVE_AREA-SAVE_AREA_BASE+8(%r1)
         /* Control registers */
         stctg   %c0,%c15,__LC_CREGS_SAVE_AREA-SAVE_AREA_BASE(%r1)
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index f11d1b037c50..354de0763eff 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -95,6 +95,15 @@ struct mem_chunk __initdata memory_chunk[MEMORY_CHUNKS];
 int __initdata memory_end_set;
 unsigned long __initdata memory_end;
 
+unsigned long VMALLOC_START;
+EXPORT_SYMBOL(VMALLOC_START);
+
+unsigned long VMALLOC_END;
+EXPORT_SYMBOL(VMALLOC_END);
+
+struct page *vmemmap;
+EXPORT_SYMBOL(vmemmap);
+
 /* An array with a pointer to the lowcore of every CPU. */
 struct _lowcore *lowcore_ptr[NR_CPUS];
 EXPORT_SYMBOL(lowcore_ptr);
@@ -278,6 +287,15 @@ static int __init early_parse_mem(char *p)
 }
 early_param("mem", early_parse_mem);
 
+static int __init parse_vmalloc(char *arg)
+{
+        if (!arg)
+                return -EINVAL;
+        VMALLOC_END = (memparse(arg, &arg) + PAGE_SIZE - 1) & PAGE_MASK;
+        return 0;
+}
+early_param("vmalloc", parse_vmalloc);
+
 unsigned int user_mode = HOME_SPACE_MODE;
 EXPORT_SYMBOL_GPL(user_mode);
 
@@ -383,7 +401,6 @@ setup_lowcore(void)
                 __ctl_set_bit(14, 29);
         }
 #else
-        lc->cmf_hpp = -1ULL;
         lc->vdso_per_cpu_data = (unsigned long) &lc->paste[0];
 #endif
         lc->sync_enter_timer = S390_lowcore.sync_enter_timer;
@@ -479,8 +496,7 @@ EXPORT_SYMBOL_GPL(real_memory_size);
 
 static void __init setup_memory_end(void)
 {
-        unsigned long memory_size;
-        unsigned long max_mem;
+        unsigned long vmax, vmalloc_size, tmp;
         int i;
 
 
@@ -490,12 +506,9 @@ static void __init setup_memory_end(void)
                 memory_end_set = 1;
         }
 #endif
-        memory_size = 0;
+        real_memory_size = 0;
         memory_end &= PAGE_MASK;
 
-        max_mem = memory_end ? min(VMEM_MAX_PHYS, memory_end) : VMEM_MAX_PHYS;
-        memory_end = min(max_mem, memory_end);
-
         /*
          * Make sure all chunks are MAX_ORDER aligned so we don't need the
          * extra checks that HOLES_IN_ZONE would require.
@@ -515,23 +528,48 @@ static void __init setup_memory_end(void)
                         chunk->addr = start;
                         chunk->size = end - start;
                 }
+                real_memory_size = max(real_memory_size,
+                                       chunk->addr + chunk->size);
         }
 
+        /* Choose kernel address space layout: 2, 3, or 4 levels. */
+#ifdef CONFIG_64BIT
+        vmalloc_size = VMALLOC_END ?: 128UL << 30;
+        tmp = (memory_end ?: real_memory_size) / PAGE_SIZE;
+        tmp = tmp * (sizeof(struct page) + PAGE_SIZE) + vmalloc_size;
+        if (tmp <= (1UL << 42))
+                vmax = 1UL << 42;       /* 3-level kernel page table */
+        else
+                vmax = 1UL << 53;       /* 4-level kernel page table */
+#else
+        vmalloc_size = VMALLOC_END ?: 96UL << 20;
+        vmax = 1UL << 31;               /* 2-level kernel page table */
+#endif
+        /* vmalloc area is at the end of the kernel address space. */
+        VMALLOC_END = vmax;
+        VMALLOC_START = vmax - vmalloc_size;
+
+        /* Split remaining virtual space between 1:1 mapping & vmemmap array */
+        tmp = VMALLOC_START / (PAGE_SIZE + sizeof(struct page));
+        tmp = VMALLOC_START - tmp * sizeof(struct page);
+        tmp &= ~((vmax >> 11) - 1);     /* align to page table level */
+        tmp = min(tmp, 1UL << MAX_PHYSMEM_BITS);
+        vmemmap = (struct page *) tmp;
+
+        /* Take care that memory_end is set and <= vmemmap */
+        memory_end = min(memory_end ?: real_memory_size, tmp);
+
+        /* Fixup memory chunk array to fit into 0..memory_end */
         for (i = 0; i < MEMORY_CHUNKS; i++) {
                 struct mem_chunk *chunk = &memory_chunk[i];
 
-                real_memory_size = max(real_memory_size,
-                                       chunk->addr + chunk->size);
-                if (chunk->addr >= max_mem) {
+                if (chunk->addr >= memory_end) {
                         memset(chunk, 0, sizeof(*chunk));
                         continue;
                 }
-                if (chunk->addr + chunk->size > max_mem)
-                        chunk->size = max_mem - chunk->addr;
-                memory_size = max(memory_size, chunk->addr + chunk->size);
+                if (chunk->addr + chunk->size > memory_end)
+                        chunk->size = memory_end - chunk->addr;
         }
-        if (!memory_end)
-                memory_end = memory_size;
 }
 
 void *restart_stack __attribute__((__section__(".data")));
@@ -655,7 +693,6 @@ static int __init verify_crash_base(unsigned long crash_base,
 static void __init reserve_kdump_bootmem(unsigned long addr, unsigned long size,
                                          int type)
 {
-
         create_mem_hole(memory_chunk, addr, size, type);
 }
 
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 7f6f9f354545..a8ba840294ff 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -302,9 +302,13 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 
         /* We forgot to include these in the sigcontext.
            To avoid breaking binary compatibility, they are passed as args. */
-        regs->gprs[4] = current->thread.trap_no;
-        regs->gprs[5] = current->thread.prot_addr;
-        regs->gprs[6] = task_thread_info(current)->last_break;
+        if (sig == SIGSEGV || sig == SIGBUS || sig == SIGILL ||
+            sig == SIGTRAP || sig == SIGFPE) {
+                /* set extra registers only for synchronous signals */
+                regs->gprs[4] = regs->int_code & 127;
+                regs->gprs[5] = regs->int_parm_long;
+                regs->gprs[6] = task_thread_info(current)->last_break;
+        }
 
         /* Place signal number on stack to allow backtrace from handler.  */
         if (__put_user(regs->gprs[2], (int __user *) &frame->signo))
@@ -434,13 +438,13 @@ void do_signal(struct pt_regs *regs)
          * call information.
          */
         current_thread_info()->system_call =
-                test_thread_flag(TIF_SYSCALL) ? regs->svc_code : 0;
+                test_thread_flag(TIF_SYSCALL) ? regs->int_code : 0;
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
 
         if (signr > 0) {
                 /* Whee!  Actually deliver the signal.  */
                 if (current_thread_info()->system_call) {
-                        regs->svc_code = current_thread_info()->system_call;
+                        regs->int_code = current_thread_info()->system_call;
                         /* Check for system call restarting. */
                         switch (regs->gprs[2]) {
                         case -ERESTART_RESTARTBLOCK:
@@ -457,7 +461,7 @@ void do_signal(struct pt_regs *regs)
                                 regs->gprs[2] = regs->orig_gpr2;
                                 regs->psw.addr =
                                         __rewind_psw(regs->psw,
-                                                     regs->svc_code >> 16);
+                                                     regs->int_code >> 16);
                                 break;
                         }
                 }
@@ -488,11 +492,11 @@ void do_signal(struct pt_regs *regs)
         /* No handlers present - check for system call restart */
         clear_thread_flag(TIF_SYSCALL);
         if (current_thread_info()->system_call) {
-                regs->svc_code = current_thread_info()->system_call;
+                regs->int_code = current_thread_info()->system_call;
                 switch (regs->gprs[2]) {
                 case -ERESTART_RESTARTBLOCK:
                         /* Restart with sys_restart_syscall */
-                        regs->svc_code = __NR_restart_syscall;
+                        regs->int_code = __NR_restart_syscall;
                 /* fallthrough */
                 case -ERESTARTNOHAND:
                 case -ERESTARTSYS:
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 66cca03c0282..2398ce6b15ae 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -69,9 +69,7 @@ enum s390_cpu_state {
 };
 
 DEFINE_MUTEX(smp_cpu_state_mutex);
-int smp_cpu_polarization[NR_CPUS];
 static int smp_cpu_state[NR_CPUS];
-static int cpu_management;
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
@@ -149,29 +147,59 @@ void smp_switch_to_ipl_cpu(void (*func)(void *), void *data)
         sp -= sizeof(struct pt_regs);
         regs = (struct pt_regs *) sp;
         memcpy(&regs->gprs, &current_lc->gpregs_save_area, sizeof(regs->gprs));
-        regs->psw = lc->psw_save_area;
+        regs->psw = current_lc->psw_save_area;
         sp -= STACK_FRAME_OVERHEAD;
         sf = (struct stack_frame *) sp;
-        sf->back_chain = regs->gprs[15];
+        sf->back_chain = 0;
         smp_switch_to_cpu(func, data, sp, stap(), __cpu_logical_map[0]);
 }
 
+static void smp_stop_cpu(void)
+{
+        while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)
+                cpu_relax();
+}
+
 void smp_send_stop(void)
 {
-        int cpu, rc;
+        cpumask_t cpumask;
+        int cpu;
+        u64 end;
 
         /* Disable all interrupts/machine checks */
         __load_psw_mask(psw_kernel_bits | PSW_MASK_DAT);
         trace_hardirqs_off();
 
-        /* stop all processors */
-        for_each_online_cpu(cpu) {
-                if (cpu == smp_processor_id())
-                        continue;
-                do {
-                        rc = sigp(cpu, sigp_stop);
-                } while (rc == sigp_busy);
+        cpumask_copy(&cpumask, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &cpumask);
+
+        if (oops_in_progress) {
+                /*
+                 * Give the other cpus the opportunity to complete
+                 * outstanding interrupts before stopping them.
+                 */
+                end = get_clock() + (1000000UL << 12);
+                for_each_cpu(cpu, &cpumask) {
+                        set_bit(ec_stop_cpu, (unsigned long *)
+                                &lowcore_ptr[cpu]->ext_call_fast);
+                        while (sigp(cpu, sigp_emergency_signal) == sigp_busy &&
+                               get_clock() < end)
+                                cpu_relax();
+                }
+                while (get_clock() < end) {
+                        for_each_cpu(cpu, &cpumask)
+                                if (cpu_stopped(cpu))
+                                        cpumask_clear_cpu(cpu, &cpumask);
+                        if (cpumask_empty(&cpumask))
+                                break;
+                        cpu_relax();
+                }
+        }
 
+        /* stop all processors */
+        for_each_cpu(cpu, &cpumask) {
+                while (sigp(cpu, sigp_stop) == sigp_busy)
+                        cpu_relax();
                 while (!cpu_stopped(cpu))
                         cpu_relax();
         }
@@ -187,7 +215,7 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,
 {
         unsigned long bits;
 
-        if (ext_int_code == 0x1202)
+        if ((ext_int_code & 0xffff) == 0x1202)
                 kstat_cpu(smp_processor_id()).irqs[EXTINT_EXC]++;
         else
                 kstat_cpu(smp_processor_id()).irqs[EXTINT_EMS]++;
@@ -196,6 +224,9 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,
          */
         bits = xchg(&S390_lowcore.ext_call_fast, 0);
 
+        if (test_bit(ec_stop_cpu, &bits))
+                smp_stop_cpu();
+
         if (test_bit(ec_schedule, &bits))
                 scheduler_ipi();
 
@@ -204,6 +235,7 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,
 
         if (test_bit(ec_call_function_single, &bits))
                 generic_smp_call_function_single_interrupt();
+
 }
 
 /*
@@ -369,7 +401,7 @@ static int smp_rescan_cpus_sigp(cpumask_t avail)
                 if (cpu_known(cpu_id))
                         continue;
                 __cpu_logical_map[logical_cpu] = cpu_id;
-                smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;
+                cpu_set_polarization(logical_cpu, POLARIZATION_UNKNOWN);
                 if (!cpu_stopped(logical_cpu))
                         continue;
                 set_cpu_present(logical_cpu, true);
@@ -403,7 +435,7 @@ static int smp_rescan_cpus_sclp(cpumask_t avail)
                 if (cpu_known(cpu_id))
                         continue;
                 __cpu_logical_map[logical_cpu] = cpu_id;
-                smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;
+                cpu_set_polarization(logical_cpu, POLARIZATION_UNKNOWN);
                 set_cpu_present(logical_cpu, true);
                 if (cpu >= info->configured)
                         smp_cpu_state[logical_cpu] = CPU_STATE_STANDBY;
@@ -656,7 +688,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
                                      - sizeof(struct stack_frame));
         memset(sf, 0, sizeof(struct stack_frame));
         sf->gprs[9] = (unsigned long) sf;
-        cpu_lowcore->save_area[15] = (unsigned long) sf;
+        cpu_lowcore->gpregs_save_area[15] = (unsigned long) sf;
         __ctl_store(cpu_lowcore->cregs_save_area, 0, 15);
         atomic_inc(&init_mm.context.attach_count);
         asm volatile(
@@ -806,7 +838,7 @@ void __init smp_prepare_boot_cpu(void)
         S390_lowcore.percpu_offset = __per_cpu_offset[0];
         current_set[0] = current;
         smp_cpu_state[0] = CPU_STATE_CONFIGURED;
-        smp_cpu_polarization[0] = POLARIZATION_UNKNWN;
+        cpu_set_polarization(0, POLARIZATION_UNKNOWN);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
@@ -868,7 +900,8 @@ static ssize_t cpu_configure_store(struct device *dev,
                         rc = sclp_cpu_deconfigure(__cpu_logical_map[cpu]);
                         if (!rc) {
                                 smp_cpu_state[cpu] = CPU_STATE_STANDBY;
-                                smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
+                                cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
+                                topology_expect_change();
                         }
                 }
                 break;
@@ -877,7 +910,8 @@ static ssize_t cpu_configure_store(struct device *dev,
                         rc = sclp_cpu_configure(__cpu_logical_map[cpu]);
                         if (!rc) {
                                 smp_cpu_state[cpu] = CPU_STATE_CONFIGURED;
-                                smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
+                                cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
+                                topology_expect_change();
                         }
                 }
                 break;
@@ -892,35 +926,6 @@ out:
 static DEVICE_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t cpu_polarization_show(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
-{
-        int cpu = dev->id;
-        ssize_t count;
-
-        mutex_lock(&smp_cpu_state_mutex);
-        switch (smp_cpu_polarization[cpu]) {
-        case POLARIZATION_HRZ:
-                count = sprintf(buf, "horizontal\n");
-                break;
-        case POLARIZATION_VL:
-                count = sprintf(buf, "vertical:low\n");
-                break;
-        case POLARIZATION_VM:
-                count = sprintf(buf, "vertical:medium\n");
-                break;
-        case POLARIZATION_VH:
-                count = sprintf(buf, "vertical:high\n");
-                break;
-        default:
-                count = sprintf(buf, "unknown\n");
-                break;
-        }
-        mutex_unlock(&smp_cpu_state_mutex);
-        return count;
-}
-static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL);
-
 static ssize_t show_cpu_address(struct device *dev,
                                 struct device_attribute *attr, char *buf)
 {
@@ -928,13 +933,11 @@ static ssize_t show_cpu_address(struct device *dev,
 }
 static DEVICE_ATTR(address, 0444, show_cpu_address, NULL);
 
-
 static struct attribute *cpu_common_attrs[] = {
 #ifdef CONFIG_HOTPLUG_CPU
         &dev_attr_configure.attr,
 #endif
         &dev_attr_address.attr,
-        &dev_attr_polarization.attr,
         NULL,
 };
 
@@ -1055,11 +1058,20 @@ static int __devinit smp_add_present_cpu(int cpu)
         rc = sysfs_create_group(&s->kobj, &cpu_common_attr_group);
         if (rc)
                 goto out_cpu;
-        if (!cpu_online(cpu))
-                goto out;
-        rc = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
-        if (!rc)
-                return 0;
+        if (cpu_online(cpu)) {
+                rc = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
+                if (rc)
+                        goto out_online;
+        }
+        rc = topology_cpu_init(c);
+        if (rc)
+                goto out_topology;
+        return 0;
+
+out_topology:
+        if (cpu_online(cpu))
+                sysfs_remove_group(&s->kobj, &cpu_online_attr_group);
+out_online:
         sysfs_remove_group(&s->kobj, &cpu_common_attr_group);
 out_cpu:
 #ifdef CONFIG_HOTPLUG_CPU
@@ -1111,61 +1123,16 @@ static ssize_t __ref rescan_store(struct device *dev,
 static DEVICE_ATTR(rescan, 0200, NULL, rescan_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t dispatching_show(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
-{
-        ssize_t count;
-
-        mutex_lock(&smp_cpu_state_mutex);
-        count = sprintf(buf, "%d\n", cpu_management);
-        mutex_unlock(&smp_cpu_state_mutex);
-        return count;
-}
-
-static ssize_t dispatching_store(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf,
-                                 size_t count)
-{
-        int val, rc;
-        char delim;
-
-        if (sscanf(buf, "%d %c", &val, &delim) != 1)
-                return -EINVAL;
-        if (val != 0 && val != 1)
-                return -EINVAL;
-        rc = 0;
-        get_online_cpus();
-        mutex_lock(&smp_cpu_state_mutex);
-        if (cpu_management == val)
-                goto out;
-        rc = topology_set_cpu_management(val);
-        if (!rc)
-                cpu_management = val;
-out:
-        mutex_unlock(&smp_cpu_state_mutex);
-        put_online_cpus();
-        return rc ? rc : count;
-}
-static DEVICE_ATTR(dispatching, 0644, dispatching_show,
-                         dispatching_store);
-
-static int __init topology_init(void)
+static int __init s390_smp_init(void)
 {
-        int cpu;
-        int rc;
+        int cpu, rc;
 
         register_cpu_notifier(&smp_cpu_nb);
-
 #ifdef CONFIG_HOTPLUG_CPU
         rc = device_create_file(cpu_subsys.dev_root, &dev_attr_rescan);
         if (rc)
                 return rc;
 #endif
-        rc = device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
-        if (rc)
-                return rc;
         for_each_present_cpu(cpu) {
                 rc = smp_add_present_cpu(cpu);
                 if (rc)
@@ -1173,4 +1140,4 @@ static int __init topology_init(void)
         }
         return 0;
 }
-subsys_initcall(topology_init);
+subsys_initcall(s390_smp_init);
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 476081440df9..78ea1948ff51 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -60,74 +60,22 @@ out:
 }
 
 /*
- * sys_ipc() is the de-multiplexer for the SysV IPC calls..
- *
- * This is really horribly ugly.
+ * sys_ipc() is the de-multiplexer for the SysV IPC calls.
  */
 SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second,
                 unsigned long, third, void __user *, ptr)
 {
-        struct ipc_kludge tmp;
-        int ret;
-
-        switch (call) {
-        case SEMOP:
-                return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                       (unsigned)second, NULL);
-        case SEMTIMEDOP:
-                return sys_semtimedop(first, (struct sembuf __user *)ptr,
-                                       (unsigned)second,
-                                       (const struct timespec __user *) third);
-        case SEMGET:
-                return sys_semget(first, (int)second, third);
-        case SEMCTL: {
-                union semun fourth;
-                if (!ptr)
-                        return -EINVAL;
-                if (get_user(fourth.__pad, (void __user * __user *) ptr))
-                        return -EFAULT;
-                return sys_semctl(first, (int)second, third, fourth);
-        }
-        case MSGSND:
-                return sys_msgsnd (first, (struct msgbuf __user *) ptr,
-                                   (size_t)second, third);
-                break;
-        case MSGRCV:
-                if (!ptr)
-                        return -EINVAL;
-                if (copy_from_user (&tmp, (struct ipc_kludge __user *) ptr,
-                                    sizeof (struct ipc_kludge)))
-                        return -EFAULT;
-                return sys_msgrcv (first, tmp.msgp,
-                                   (size_t)second, tmp.msgtyp, third);
-        case MSGGET:
-                return sys_msgget((key_t)first, (int)second);
-        case MSGCTL:
-                return sys_msgctl(first, (int)second,
-                                   (struct msqid_ds __user *)ptr);
-
-        case SHMAT: {
-                ulong raddr;
-                ret = do_shmat(first, (char __user *)ptr,
-                                (int)second, &raddr);
-                if (ret)
-                        return ret;
-                return put_user (raddr, (ulong __user *) third);
-                break;
-        }
-        case SHMDT:
-                return sys_shmdt ((char __user *)ptr);
-        case SHMGET:
-                return sys_shmget(first, (size_t)second, third);
-        case SHMCTL:
-                return sys_shmctl(first, (int)second,
-                                   (struct shmid_ds __user *) ptr);
-        default:
-                return -ENOSYS;
-
-        }
-
-        return -EINVAL;
+        if (call >> 16)
+                return -EINVAL;
+        /* The s390 sys_ipc variant has only five parameters instead of six
+         * like the generic variant. The only difference is the handling of
+         * the SEMTIMEDOP subcall where on s390 the third parameter is used
+         * as a pointer to a struct timespec where the generic variant uses
+         * the fifth parameter.
+         * Therefore we can call the generic variant by simply passing the
+         * third parameter also as fifth parameter.
+         */
+        return sys_ipc(call, first, second, third, ptr, third);
 }
 
 #ifdef CONFIG_64BIT
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 6e0e29b29a7b..7370a41948ca 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -1,22 +1,22 @@
 /*
- *    Copyright IBM Corp. 2007
+ *    Copyright IBM Corp. 2007,2011
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
  */
 
 #define KMSG_COMPONENT "cpu"
 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
 
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <linux/device.h>
+#include <linux/workqueue.h>
 #include <linux/bootmem.h>
+#include <linux/cpuset.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/workqueue.h>
+#include <linux/init.h>
+#include <linux/delay.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
-#include <linux/cpuset.h>
-#include <asm/delay.h>
+#include <linux/mm.h>
 
 #define PTF_HORIZONTAL  (0UL)
 #define PTF_VERTICAL    (1UL)
@@ -31,7 +31,6 @@ struct mask_info {
 static int topology_enabled = 1;
 static void topology_work_fn(struct work_struct *work);
 static struct sysinfo_15_1_x *tl_info;
-static struct timer_list topology_timer;
 static void set_topology_timer(void);
 static DECLARE_WORK(topology_work, topology_work_fn);
 /* topology_lock protects the core linked list */
@@ -41,11 +40,12 @@ static struct mask_info core_info;
 cpumask_t cpu_core_map[NR_CPUS];
 unsigned char cpu_core_id[NR_CPUS];
 
-#ifdef CONFIG_SCHED_BOOK
 static struct mask_info book_info;
 cpumask_t cpu_book_map[NR_CPUS];
 unsigned char cpu_book_id[NR_CPUS];
-#endif
+
+/* smp_cpu_state_mutex must be held when accessing this array */
+int cpu_polarization[NR_CPUS];
 
 static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
 {
@@ -71,7 +71,7 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
 static struct mask_info *add_cpus_to_mask(struct topology_cpu *tl_cpu,
                                           struct mask_info *book,
                                           struct mask_info *core,
-                                          int z10)
+                                          int one_core_per_cpu)
 {
         unsigned int cpu;
 
@@ -85,18 +85,16 @@ static struct mask_info *add_cpus_to_mask(struct topology_cpu *tl_cpu,
                 for_each_present_cpu(lcpu) {
                         if (cpu_logical_map(lcpu) != rcpu)
                                 continue;
-#ifdef CONFIG_SCHED_BOOK
                         cpumask_set_cpu(lcpu, &book->mask);
                         cpu_book_id[lcpu] = book->id;
-#endif
                         cpumask_set_cpu(lcpu, &core->mask);
-                        if (z10) {
+                        if (one_core_per_cpu) {
                                 cpu_core_id[lcpu] = rcpu;
                                 core = core->next;
                         } else {
                                 cpu_core_id[lcpu] = core->id;
                         }
-                        smp_cpu_polarization[lcpu] = tl_cpu->pp;
+                        cpu_set_polarization(lcpu, tl_cpu->pp);
                 }
         }
         return core;
@@ -111,13 +109,11 @@ static void clear_masks(void)
                 cpumask_clear(&info->mask);
                 info = info->next;
         }
-#ifdef CONFIG_SCHED_BOOK
         info = &book_info;
         while (info) {
                 cpumask_clear(&info->mask);
                 info = info->next;
         }
-#endif
 }
 
 static union topology_entry *next_tle(union topology_entry *tle)
@@ -127,66 +123,75 @@ static union topology_entry *next_tle(union topology_entry *tle)
         return (union topology_entry *)((struct topology_container *)tle + 1);
 }
 
-static void tl_to_cores(struct sysinfo_15_1_x *info)
+static void __tl_to_cores_generic(struct sysinfo_15_1_x *info)
 {
-#ifdef CONFIG_SCHED_BOOK
-        struct mask_info *book = &book_info;
-        struct cpuid cpu_id;
-#else
-        struct mask_info *book = NULL;
-#endif
         struct mask_info *core = &core_info;
+        struct mask_info *book = &book_info;
         union topology_entry *tle, *end;
-        int z10 = 0;
 
-#ifdef CONFIG_SCHED_BOOK
-        get_cpu_id(&cpu_id);
-        z10 = cpu_id.machine == 0x2097 || cpu_id.machine == 0x2098;
-#endif
-        spin_lock_irq(&topology_lock);
-        clear_masks();
         tle = info->tle;
         end = (union topology_entry *)((unsigned long)info + info->length);
         while (tle < end) {
-#ifdef CONFIG_SCHED_BOOK
-                if (z10) {
-                        switch (tle->nl) {
-                        case 1:
-                                book = book->next;
-                                book->id = tle->container.id;
-                                break;
-                        case 0:
-                                core = add_cpus_to_mask(&tle->cpu, book, core, z10);
-                                break;
-                        default:
-                                clear_masks();
-                                goto out;
-                        }
-                        tle = next_tle(tle);
-                        continue;
-                }
-#endif
                 switch (tle->nl) {
-#ifdef CONFIG_SCHED_BOOK
                 case 2:
                         book = book->next;
                         book->id = tle->container.id;
                         break;
-#endif
                 case 1:
                         core = core->next;
                         core->id = tle->container.id;
                         break;
                 case 0:
-                        add_cpus_to_mask(&tle->cpu, book, core, z10);
+                        add_cpus_to_mask(&tle->cpu, book, core, 0);
                         break;
                 default:
                         clear_masks();
-                        goto out;
+                        return;
                 }
                 tle = next_tle(tle);
         }
-out:
+}
+
+static void __tl_to_cores_z10(struct sysinfo_15_1_x *info)
+{
+        struct mask_info *core = &core_info;
+        struct mask_info *book = &book_info;
+        union topology_entry *tle, *end;
+
+        tle = info->tle;
+        end = (union topology_entry *)((unsigned long)info + info->length);
+        while (tle < end) {
+                switch (tle->nl) {
+                case 1:
+                        book = book->next;
+                        book->id = tle->container.id;
+                        break;
+                case 0:
+                        core = add_cpus_to_mask(&tle->cpu, book, core, 1);
+                        break;
+                default:
+                        clear_masks();
+                        return;
+                }
+                tle = next_tle(tle);
+        }
+}
+
+static void tl_to_cores(struct sysinfo_15_1_x *info)
+{
+        struct cpuid cpu_id;
+
+        get_cpu_id(&cpu_id);
+        spin_lock_irq(&topology_lock);
+        clear_masks();
+        switch (cpu_id.machine) {
+        case 0x2097:
+        case 0x2098:
+                __tl_to_cores_z10(info);
+                break;
+        default:
+                __tl_to_cores_generic(info);
+        }
         spin_unlock_irq(&topology_lock);
 }
 
@@ -196,7 +201,7 @@ static void topology_update_polarization_simple(void)
 
         mutex_lock(&smp_cpu_state_mutex);
         for_each_possible_cpu(cpu)
-                smp_cpu_polarization[cpu] = POLARIZATION_HRZ;
+                cpu_set_polarization(cpu, POLARIZATION_HRZ);
         mutex_unlock(&smp_cpu_state_mutex);
 }
 
@@ -215,8 +220,7 @@ static int ptf(unsigned long fc)
 
 int topology_set_cpu_management(int fc)
 {
-        int cpu;
-        int rc;
+        int cpu, rc;
 
         if (!MACHINE_HAS_TOPOLOGY)
                 return -EOPNOTSUPP;
@@ -227,7 +231,7 @@ int topology_set_cpu_management(int fc)
         if (rc)
                 return -EBUSY;
         for_each_possible_cpu(cpu)
-                smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
+                cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
         return rc;
 }
 
@@ -239,22 +243,18 @@ static void update_cpu_core_map(void)
         spin_lock_irqsave(&topology_lock, flags);
         for_each_possible_cpu(cpu) {
                 cpu_core_map[cpu] = cpu_group_map(&core_info, cpu);
-#ifdef CONFIG_SCHED_BOOK
                 cpu_book_map[cpu] = cpu_group_map(&book_info, cpu);
-#endif
         }
         spin_unlock_irqrestore(&topology_lock, flags);
 }
 
 void store_topology(struct sysinfo_15_1_x *info)
 {
-#ifdef CONFIG_SCHED_BOOK
         int rc;
 
         rc = stsi(info, 15, 1, 3);
         if (rc != -ENOSYS)
                 return;
-#endif
         stsi(info, 15, 1, 2);
 }
 
@@ -296,12 +296,30 @@ static void topology_timer_fn(unsigned long ignored)
         set_topology_timer();
 }
 
+static struct timer_list topology_timer =
+        TIMER_DEFERRED_INITIALIZER(topology_timer_fn, 0, 0);
+
+static atomic_t topology_poll = ATOMIC_INIT(0);
+
 static void set_topology_timer(void)
 {
-        topology_timer.function = topology_timer_fn;
-        topology_timer.data = 0;
-        topology_timer.expires = jiffies + 60 * HZ;
-        add_timer(&topology_timer);
+        if (atomic_add_unless(&topology_poll, -1, 0))
+                mod_timer(&topology_timer, jiffies + HZ / 10);
+        else
+                mod_timer(&topology_timer, jiffies + HZ * 60);
+}
+
+void topology_expect_change(void)
+{
+        if (!MACHINE_HAS_TOPOLOGY)
+                return;
+        /* This is racy, but it doesn't matter since it is just a heuristic.
+         * Worst case is that we poll in a higher frequency for a bit longer.
+         */
+        if (atomic_read(&topology_poll) > 60)
+                return;
+        atomic_add(60, &topology_poll);
+        set_topology_timer();
 }
 
 static int __init early_parse_topology(char *p)
@@ -313,23 +331,6 @@ static int __init early_parse_topology(char *p)
 }
 early_param("topology", early_parse_topology);
 
-static int __init init_topology_update(void)
-{
-        int rc;
-
-        rc = 0;
-        if (!MACHINE_HAS_TOPOLOGY) {
-                topology_update_polarization_simple();
-                goto out;
-        }
-        init_timer_deferrable(&topology_timer);
-        set_topology_timer();
-out:
-        update_cpu_core_map();
-        return rc;
-}
-__initcall(init_topology_update);
-
 static void __init alloc_masks(struct sysinfo_15_1_x *info,
                                struct mask_info *mask, int offset)
 {
@@ -357,10 +358,108 @@ void __init s390_init_cpu_topology(void)
         store_topology(info);
         pr_info("The CPU configuration topology of the machine is:");
         for (i = 0; i < TOPOLOGY_NR_MAG; i++)
-                printk(" %d", info->mag[i]);
-        printk(" / %d\n", info->mnest);
+                printk(KERN_CONT " %d", info->mag[i]);
+        printk(KERN_CONT " / %d\n", info->mnest);
         alloc_masks(info, &core_info, 1);
-#ifdef CONFIG_SCHED_BOOK
         alloc_masks(info, &book_info, 2);
-#endif
 }
+
+static int cpu_management;
+
+static ssize_t dispatching_show(struct device *dev,
+                                struct device_attribute *attr,
+                                char *buf)
+{
+        ssize_t count;
+
+        mutex_lock(&smp_cpu_state_mutex);
+        count = sprintf(buf, "%d\n", cpu_management);
+        mutex_unlock(&smp_cpu_state_mutex);
+        return count;
+}
+
+static ssize_t dispatching_store(struct device *dev,
+                                 struct device_attribute *attr,
+                                 const char *buf,
+                                 size_t count)
+{
+        int val, rc;
+        char delim;
+
+        if (sscanf(buf, "%d %c", &val, &delim) != 1)
+                return -EINVAL;
+        if (val != 0 && val != 1)
+                return -EINVAL;
+        rc = 0;
+        get_online_cpus();
+        mutex_lock(&smp_cpu_state_mutex);
+        if (cpu_management == val)
+                goto out;
+        rc = topology_set_cpu_management(val);
+        if (rc)
+                goto out;
+        cpu_management = val;
+        topology_expect_change();
+out:
+        mutex_unlock(&smp_cpu_state_mutex);
+        put_online_cpus();
+        return rc ? rc : count;
+}
+static DEVICE_ATTR(dispatching, 0644, dispatching_show,
+                         dispatching_store);
+
+static ssize_t cpu_polarization_show(struct device *dev,
+                                     struct device_attribute *attr, char *buf)
+{
+        int cpu = dev->id;
+        ssize_t count;
+
+        mutex_lock(&smp_cpu_state_mutex);
+        switch (cpu_read_polarization(cpu)) {
+        case POLARIZATION_HRZ:
+                count = sprintf(buf, "horizontal\n");
+                break;
+        case POLARIZATION_VL:
+                count = sprintf(buf, "vertical:low\n");
+                break;
+        case POLARIZATION_VM:
+                count = sprintf(buf, "vertical:medium\n");
+                break;
+        case POLARIZATION_VH:
+                count = sprintf(buf, "vertical:high\n");
+                break;
+        default:
+                count = sprintf(buf, "unknown\n");
+                break;
+        }
+        mutex_unlock(&smp_cpu_state_mutex);
+        return count;
+}
+static DEVICE_ATTR(polarization, 0444, cpu_polarization_show, NULL);
+
+static struct attribute *topology_cpu_attrs[] = {
+        &dev_attr_polarization.attr,
+        NULL,
+};
+
+static struct attribute_group topology_cpu_attr_group = {
+        .attrs = topology_cpu_attrs,
+};
+
+int topology_cpu_init(struct cpu *cpu)
+{
+        return sysfs_create_group(&cpu->dev.kobj, &topology_cpu_attr_group);
+}
+
+static int __init topology_init(void)
+{
+        if (!MACHINE_HAS_TOPOLOGY) {
+                topology_update_polarization_simple();
+                goto out;
+        }
+        set_topology_timer();
+out:
+        update_cpu_core_map();
+        return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
+}
+device_initcall(topology_init);
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index a9807dd86276..5ce3750b181f 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -43,9 +43,9 @@
 #include <asm/debug.h>
 #include "entry.h"
 
-void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);
+void (*pgm_check_table[128])(struct pt_regs *regs);
 
-int show_unhandled_signals;
+int show_unhandled_signals = 1;
 
 #define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })
 
@@ -234,7 +234,7 @@ void show_regs(struct pt_regs *regs)
 
 static DEFINE_SPINLOCK(die_lock);
 
-void die(const char * str, struct pt_regs * regs, long err)
+void die(struct pt_regs *regs, const char *str)
 {
         static int die_counter;
 
@@ -243,7 +243,7 @@ void die(const char * str, struct pt_regs * regs, long err)
         console_verbose();
         spin_lock_irq(&die_lock);
         bust_spinlocks(1);
-        printk("%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
+        printk("%s: %04x [#%d] ", str, regs->int_code & 0xffff, ++die_counter);
 #ifdef CONFIG_PREEMPT
         printk("PREEMPT ");
 #endif
@@ -254,7 +254,7 @@ void die(const char * str, struct pt_regs * regs, long err)
         printk("DEBUG_PAGEALLOC");
 #endif
         printk("\n");
-        notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV);
+        notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV);
         show_regs(regs);
         bust_spinlocks(0);
         add_taint(TAINT_DIE);
@@ -267,8 +267,7 @@ void die(const char * str, struct pt_regs * regs, long err)
         do_exit(SIGSEGV);
 }
 
-static void inline report_user_fault(struct pt_regs *regs, long int_code,
-                                     int signr)
+static inline void report_user_fault(struct pt_regs *regs, int signr)
 {
         if ((task_pid_nr(current) > 1) && !show_unhandled_signals)
                 return;
@@ -276,7 +275,7 @@ static void inline report_user_fault(struct pt_regs *regs, long int_code,
                 return;
         if (!printk_ratelimit())
                 return;
-        printk("User process fault: interruption code 0x%lX ", int_code);
+        printk("User process fault: interruption code 0x%X ", regs->int_code);
         print_vma_addr("in ", regs->psw.addr & PSW_ADDR_INSN);
         printk("\n");
         show_regs(regs);
@@ -287,19 +286,28 @@ int is_valid_bugaddr(unsigned long addr)
         return 1;
 }
 
-static inline void __kprobes do_trap(long pgm_int_code, int signr, char *str,
-                                     struct pt_regs *regs, siginfo_t *info)
+static inline void __user *get_psw_address(struct pt_regs *regs)
 {
-        if (notify_die(DIE_TRAP, str, regs, pgm_int_code,
-                       pgm_int_code, signr) == NOTIFY_STOP)
+        return (void __user *)
+                ((regs->psw.addr - (regs->int_code >> 16)) & PSW_ADDR_INSN);
+}
+
+static void __kprobes do_trap(struct pt_regs *regs,
+                              int si_signo, int si_code, char *str)
+{
+        siginfo_t info;
+
+        if (notify_die(DIE_TRAP, str, regs, 0,
+                       regs->int_code, si_signo) == NOTIFY_STOP)
                 return;
 
         if (regs->psw.mask & PSW_MASK_PSTATE) {
-                struct task_struct *tsk = current;
-
-                tsk->thread.trap_no = pgm_int_code & 0xffff;
-                force_sig_info(signr, info, tsk);
-                report_user_fault(regs, pgm_int_code, signr);
+                info.si_signo = si_signo;
+                info.si_errno = 0;
+                info.si_code = si_code;
+                info.si_addr = get_psw_address(regs);
+                force_sig_info(si_signo, &info, current);
+                report_user_fault(regs, si_signo);
         } else {
                 const struct exception_table_entry *fixup;
                 fixup = search_exception_tables(regs->psw.addr & PSW_ADDR_INSN);
@@ -311,18 +319,11 @@ static inline void __kprobes do_trap(long pgm_int_code, int signr, char *str,
                         btt = report_bug(regs->psw.addr & PSW_ADDR_INSN, regs);
                         if (btt == BUG_TRAP_TYPE_WARN)
                                 return;
-                        die(str, regs, pgm_int_code);
+                        die(regs, str);
                 }
         }
 }
 
-static inline void __user *get_psw_address(struct pt_regs *regs,
-                                           long pgm_int_code)
-{
-        return (void __user *)
-                ((regs->psw.addr - (pgm_int_code >> 16)) & PSW_ADDR_INSN);
-}
-
 void __kprobes do_per_trap(struct pt_regs *regs)
 {
         siginfo_t info;
@@ -339,26 +340,19 @@ void __kprobes do_per_trap(struct pt_regs *regs)
         force_sig_info(SIGTRAP, &info, current);
 }
 
-static void default_trap_handler(struct pt_regs *regs, long pgm_int_code,
-                                 unsigned long trans_exc_code)
+static void default_trap_handler(struct pt_regs *regs)
 {
         if (regs->psw.mask & PSW_MASK_PSTATE) {
-                report_user_fault(regs, pgm_int_code, SIGSEGV);
+                report_user_fault(regs, SIGSEGV);
                 do_exit(SIGSEGV);
         } else
-                die("Unknown program exception", regs, pgm_int_code);
+                die(regs, "Unknown program exception");
 }
 
 #define DO_ERROR_INFO(name, signr, sicode, str) \
-static void name(struct pt_regs *regs, long pgm_int_code, \
-                 unsigned long trans_exc_code) \
+static void name(struct pt_regs *regs) \
 { \
-        siginfo_t info; \
-        info.si_signo = signr; \
-        info.si_errno = 0; \
-        info.si_code = sicode; \
-        info.si_addr = get_psw_address(regs, pgm_int_code); \
-        do_trap(pgm_int_code, signr, str, regs, &info);     \
+        do_trap(regs, signr, sicode, str); \
 }
 
 DO_ERROR_INFO(addressing_exception, SIGILL, ILL_ILLADR,
@@ -388,42 +382,34 @@ DO_ERROR_INFO(special_op_exception, SIGILL, ILL_ILLOPN,
 DO_ERROR_INFO(translation_exception, SIGILL, ILL_ILLOPN,
               "translation exception")
 
-static inline void do_fp_trap(struct pt_regs *regs, void __user *location,
-                              int fpc, long pgm_int_code)
+static inline void do_fp_trap(struct pt_regs *regs, int fpc)
 {
-        siginfo_t si;
-
-        si.si_signo = SIGFPE;
-        si.si_errno = 0;
-        si.si_addr = location;
-        si.si_code = 0;
+        int si_code = 0;
         /* FPC[2] is Data Exception Code */
         if ((fpc & 0x00000300) == 0) {
                 /* bits 6 and 7 of DXC are 0 iff IEEE exception */
                 if (fpc & 0x8000) /* invalid fp operation */
-                        si.si_code = FPE_FLTINV;
+                        si_code = FPE_FLTINV;
                 else if (fpc & 0x4000) /* div by 0 */
-                        si.si_code = FPE_FLTDIV;
+                        si_code = FPE_FLTDIV;
                 else if (fpc & 0x2000) /* overflow */
-                        si.si_code = FPE_FLTOVF;
+                        si_code = FPE_FLTOVF;
                 else if (fpc & 0x1000) /* underflow */
-                        si.si_code = FPE_FLTUND;
+                        si_code = FPE_FLTUND;
                 else if (fpc & 0x0800) /* inexact */
-                        si.si_code = FPE_FLTRES;
+                        si_code = FPE_FLTRES;
         }
-        do_trap(pgm_int_code, SIGFPE,
-                "floating point exception", regs, &si);
+        do_trap(regs, SIGFPE, si_code, "floating point exception");
 }
 
-static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
-                                 unsigned long trans_exc_code)
+static void __kprobes illegal_op(struct pt_regs *regs)
 {
         siginfo_t info;
         __u8 opcode[6];
         __u16 __user *location;
         int signal = 0;
 
-        location = get_psw_address(regs, pgm_int_code);
+        location = get_psw_address(regs);
 
         if (regs->psw.mask & PSW_MASK_PSTATE) {
                 if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
@@ -467,44 +453,31 @@ static void __kprobes illegal_op(struct pt_regs *regs, long pgm_int_code,
                  * If we get an illegal op in kernel mode, send it through the
                  * kprobes notifier. If kprobes doesn't pick it up, SIGILL
                  */
-                if (notify_die(DIE_BPT, "bpt", regs, pgm_int_code,
+                if (notify_die(DIE_BPT, "bpt", regs, 0,
                                3, SIGTRAP) != NOTIFY_STOP)
                         signal = SIGILL;
         }
 
 #ifdef CONFIG_MATHEMU
         if (signal == SIGFPE)
-                do_fp_trap(regs, location,
-                           current->thread.fp_regs.fpc, pgm_int_code);
-        else if (signal == SIGSEGV) {
-                info.si_signo = signal;
-                info.si_errno = 0;
-                info.si_code = SEGV_MAPERR;
-                info.si_addr = (void __user *) location;
-                do_trap(pgm_int_code, signal,
-                        "user address fault", regs, &info);
-        } else
+                do_fp_trap(regs, current->thread.fp_regs.fpc);
+        else if (signal == SIGSEGV)
+                do_trap(regs, signal, SEGV_MAPERR, "user address fault");
+        else
 #endif
-        if (signal) {
-                info.si_signo = signal;
-                info.si_errno = 0;
-                info.si_code = ILL_ILLOPC;
-                info.si_addr = (void __user *) location;
-                do_trap(pgm_int_code, signal,
-                        "illegal operation", regs, &info);
-        }
+        if (signal)
+                do_trap(regs, signal, ILL_ILLOPC, "illegal operation");
 }
 
 
 #ifdef CONFIG_MATHEMU
-void specification_exception(struct pt_regs *regs, long pgm_int_code,
-                             unsigned long trans_exc_code)
+void specification_exception(struct pt_regs *regs)
 {
         __u8 opcode[6];
         __u16 __user *location = NULL;
         int signal = 0;
 
-        location = (__u16 __user *) get_psw_address(regs, pgm_int_code);
+        location = (__u16 __user *) get_psw_address(regs);
 
         if (regs->psw.mask & PSW_MASK_PSTATE) {
                 get_user(*((__u16 *) opcode), location);
@@ -539,30 +512,21 @@ void specification_exception(struct pt_regs *regs, long pgm_int_code,
                 signal = SIGILL;
 
         if (signal == SIGFPE)
-                do_fp_trap(regs, location,
-                           current->thread.fp_regs.fpc, pgm_int_code);
-        else if (signal) {
-                siginfo_t info;
-                info.si_signo = signal;
-                info.si_errno = 0;
-                info.si_code = ILL_ILLOPN;
-                info.si_addr = location;
-                do_trap(pgm_int_code, signal,
-                        "specification exception", regs, &info);
-        }
+                do_fp_trap(regs, current->thread.fp_regs.fpc);
+        else if (signal)
+                do_trap(regs, signal, ILL_ILLOPN, "specification exception");
 }
 #else
 DO_ERROR_INFO(specification_exception, SIGILL, ILL_ILLOPN,
               "specification exception");
 #endif
 
-static void data_exception(struct pt_regs *regs, long pgm_int_code,
-                           unsigned long trans_exc_code)
+static void data_exception(struct pt_regs *regs)
 {
         __u16 __user *location;
         int signal = 0;
 
-        location = get_psw_address(regs, pgm_int_code);
+        location = get_psw_address(regs);
 
         if (MACHINE_HAS_IEEE)
                 asm volatile("stfpc %0" : "=m" (current->thread.fp_regs.fpc));
@@ -627,32 +591,18 @@ static void data_exception(struct pt_regs *regs, long pgm_int_code,
         else
                 signal = SIGILL;
         if (signal == SIGFPE)
-                do_fp_trap(regs, location,
-                           current->thread.fp_regs.fpc, pgm_int_code);
-        else if (signal) {
-                siginfo_t info;
-                info.si_signo = signal;
-                info.si_errno = 0;
-                info.si_code = ILL_ILLOPN;
-                info.si_addr = location;
-                do_trap(pgm_int_code, signal, "data exception", regs, &info);
-        }
+                do_fp_trap(regs, current->thread.fp_regs.fpc);
+        else if (signal)
+                do_trap(regs, signal, ILL_ILLOPN, "data exception");
 }
 
-static void space_switch_exception(struct pt_regs *regs, long pgm_int_code,
-                                   unsigned long trans_exc_code)
+static void space_switch_exception(struct pt_regs *regs)
 {
-        siginfo_t info;
-
         /* Set user psw back to home space mode. */
         if (regs->psw.mask & PSW_MASK_PSTATE)
                 regs->psw.mask |= PSW_ASC_HOME;
         /* Send SIGILL. */
-        info.si_signo = SIGILL;
-        info.si_errno = 0;
-        info.si_code = ILL_PRVOPC;
-        info.si_addr = get_psw_address(regs, pgm_int_code);
-        do_trap(pgm_int_code, SIGILL, "space switch event", regs, &info);
+        do_trap(regs, SIGILL, ILL_PRVOPC, "space switch event");
 }
 
 void __kprobes kernel_stack_overflow(struct pt_regs * regs)
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index a9a301866b3c..354dd39073ef 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -125,8 +125,7 @@ static inline int user_space_fault(unsigned long trans_exc_code)
         return trans_exc_code != 3;
 }
 
-static inline void report_user_fault(struct pt_regs *regs, long int_code,
-                                     int signr, unsigned long address)
+static inline void report_user_fault(struct pt_regs *regs, long signr)
 {
         if ((task_pid_nr(current) > 1) && !show_unhandled_signals)
                 return;
@@ -134,10 +133,12 @@ static inline void report_user_fault(struct pt_regs *regs, long int_code,
                 return;
         if (!printk_ratelimit())
                 return;
-        printk("User process fault: interruption code 0x%lX ", int_code);
+        printk(KERN_ALERT "User process fault: interruption code 0x%X ",
+               regs->int_code);
         print_vma_addr(KERN_CONT "in ", regs->psw.addr & PSW_ADDR_INSN);
-        printk("\n");
-        printk("failing address: %lX\n", address);
+        printk(KERN_CONT "\n");
+        printk(KERN_ALERT "failing address: %lX\n",
+               regs->int_parm_long & __FAIL_ADDR_MASK);
         show_regs(regs);
 }
 
@@ -145,24 +146,18 @@ static inline void report_user_fault(struct pt_regs *regs, long int_code,
  * Send SIGSEGV to task.  This is an external routine
  * to keep the stack usage of do_page_fault small.
  */
-static noinline void do_sigsegv(struct pt_regs *regs, long int_code,
-                                int si_code, unsigned long trans_exc_code)
+static noinline void do_sigsegv(struct pt_regs *regs, int si_code)
 {
         struct siginfo si;
-        unsigned long address;
 
-        address = trans_exc_code & __FAIL_ADDR_MASK;
-        current->thread.prot_addr = address;
-        current->thread.trap_no = int_code;
-        report_user_fault(regs, int_code, SIGSEGV, address);
+        report_user_fault(regs, SIGSEGV);
         si.si_signo = SIGSEGV;
         si.si_code = si_code;
-        si.si_addr = (void __user *) address;
+        si.si_addr = (void __user *)(regs->int_parm_long & __FAIL_ADDR_MASK);
         force_sig_info(SIGSEGV, &si, current);
 }
 
-static noinline void do_no_context(struct pt_regs *regs, long int_code,
-                                   unsigned long trans_exc_code)
+static noinline void do_no_context(struct pt_regs *regs)
 {
         const struct exception_table_entry *fixup;
         unsigned long address;
@@ -178,55 +173,48 @@ static noinline void do_no_context(struct pt_regs *regs, long int_code,
          * Oops. The kernel tried to access some bad page. We'll have to
          * terminate things with extreme prejudice.
          */
-        address = trans_exc_code & __FAIL_ADDR_MASK;
-        if (!user_space_fault(trans_exc_code))
+        address = regs->int_parm_long & __FAIL_ADDR_MASK;
+        if (!user_space_fault(regs->int_parm_long))
                 printk(KERN_ALERT "Unable to handle kernel pointer dereference"
                        " at virtual kernel address %p\n", (void *)address);
         else
                 printk(KERN_ALERT "Unable to handle kernel paging request"
                        " at virtual user address %p\n", (void *)address);
 
-        die("Oops", regs, int_code);
+        die(regs, "Oops");
         do_exit(SIGKILL);
 }
 
-static noinline void do_low_address(struct pt_regs *regs, long int_code,
-                                    unsigned long trans_exc_code)
+static noinline void do_low_address(struct pt_regs *regs)
 {
         /* Low-address protection hit in kernel mode means
            NULL pointer write access in kernel mode.  */
         if (regs->psw.mask & PSW_MASK_PSTATE) {
                 /* Low-address protection hit in user mode 'cannot happen'. */
-                die ("Low-address protection", regs, int_code);
+                die (regs, "Low-address protection");
                 do_exit(SIGKILL);
         }
 
-        do_no_context(regs, int_code, trans_exc_code);
+        do_no_context(regs);
 }
 
-static noinline void do_sigbus(struct pt_regs *regs, long int_code,
-                               unsigned long trans_exc_code)
+static noinline void do_sigbus(struct pt_regs *regs)
 {
         struct task_struct *tsk = current;
-        unsigned long address;
         struct siginfo si;
 
         /*
          * Send a sigbus, regardless of whether we were in kernel
          * or user mode.
          */
-        address = trans_exc_code & __FAIL_ADDR_MASK;
-        tsk->thread.prot_addr = address;
-        tsk->thread.trap_no = int_code;
         si.si_signo = SIGBUS;
         si.si_errno = 0;
         si.si_code = BUS_ADRERR;
-        si.si_addr = (void __user *) address;
+        si.si_addr = (void __user *)(regs->int_parm_long & __FAIL_ADDR_MASK);
         force_sig_info(SIGBUS, &si, tsk);
 }
 
-static noinline void do_fault_error(struct pt_regs *regs, long int_code,
-                                    unsigned long trans_exc_code, int fault)
+static noinline void do_fault_error(struct pt_regs *regs, int fault)
 {
         int si_code;
 
@@ -238,24 +226,24 @@ static noinline void do_fault_error(struct pt_regs *regs, long int_code,
                         /* User mode accesses just cause a SIGSEGV */
                         si_code = (fault == VM_FAULT_BADMAP) ?
                                 SEGV_MAPERR : SEGV_ACCERR;
-                        do_sigsegv(regs, int_code, si_code, trans_exc_code);
+                        do_sigsegv(regs, si_code);
                         return;
                 }
         case VM_FAULT_BADCONTEXT:
-                do_no_context(regs, int_code, trans_exc_code);
+                do_no_context(regs);
                 break;
         default: /* fault & VM_FAULT_ERROR */
                 if (fault & VM_FAULT_OOM) {
                         if (!(regs->psw.mask & PSW_MASK_PSTATE))
-                                do_no_context(regs, int_code, trans_exc_code);
+                                do_no_context(regs);
                         else
                                 pagefault_out_of_memory();
                 } else if (fault & VM_FAULT_SIGBUS) {
                         /* Kernel mode? Handle exceptions or die */
                         if (!(regs->psw.mask & PSW_MASK_PSTATE))
-                                do_no_context(regs, int_code, trans_exc_code);
+                                do_no_context(regs);
                         else
-                                do_sigbus(regs, int_code, trans_exc_code);
+                                do_sigbus(regs);
                 } else
                         BUG();
                 break;
@@ -273,12 +261,12 @@ static noinline void do_fault_error(struct pt_regs *regs, long int_code,
  *   11       Page translation     ->  Not present       (nullification)
  *   3b       Region third trans.  ->  Not present       (nullification)
  */
-static inline int do_exception(struct pt_regs *regs, int access,
-                               unsigned long trans_exc_code)
+static inline int do_exception(struct pt_regs *regs, int access)
 {
         struct task_struct *tsk;
         struct mm_struct *mm;
         struct vm_area_struct *vma;
+        unsigned long trans_exc_code;
         unsigned long address;
         unsigned int flags;
         int fault;
@@ -288,6 +276,7 @@ static inline int do_exception(struct pt_regs *regs, int access,
 
         tsk = current;
         mm = tsk->mm;
+        trans_exc_code = regs->int_parm_long;
 
         /*
          * Verify that the fault happened in user space, that
@@ -387,45 +376,46 @@ out:
         return fault;
 }
 
-void __kprobes do_protection_exception(struct pt_regs *regs, long pgm_int_code,
-                                       unsigned long trans_exc_code)
+void __kprobes do_protection_exception(struct pt_regs *regs)
 {
+        unsigned long trans_exc_code;
         int fault;
 
+        trans_exc_code = regs->int_parm_long;
         /* Protection exception is suppressing, decrement psw address. */
-        regs->psw.addr = __rewind_psw(regs->psw, pgm_int_code >> 16);
+        regs->psw.addr = __rewind_psw(regs->psw, regs->int_code >> 16);
         /*
          * Check for low-address protection.  This needs to be treated
          * as a special case because the translation exception code
          * field is not guaranteed to contain valid data in this case.
          */
         if (unlikely(!(trans_exc_code & 4))) {
-                do_low_address(regs, pgm_int_code, trans_exc_code);
+                do_low_address(regs);
                 return;
         }
-        fault = do_exception(regs, VM_WRITE, trans_exc_code);
+        fault = do_exception(regs, VM_WRITE);
         if (unlikely(fault))
-                do_fault_error(regs, 4, trans_exc_code, fault);
+                do_fault_error(regs, fault);
 }
 
-void __kprobes do_dat_exception(struct pt_regs *regs, long pgm_int_code,
-                                unsigned long trans_exc_code)
+void __kprobes do_dat_exception(struct pt_regs *regs)
 {
         int access, fault;
 
         access = VM_READ | VM_EXEC | VM_WRITE;
-        fault = do_exception(regs, access, trans_exc_code);
+        fault = do_exception(regs, access);
         if (unlikely(fault))
-                do_fault_error(regs, pgm_int_code & 255, trans_exc_code, fault);
+                do_fault_error(regs, fault);
 }
 
 #ifdef CONFIG_64BIT
-void __kprobes do_asce_exception(struct pt_regs *regs, long pgm_int_code,
-                                 unsigned long trans_exc_code)
+void __kprobes do_asce_exception(struct pt_regs *regs)
 {
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;
+        unsigned long trans_exc_code;
 
+        trans_exc_code = regs->int_parm_long;
         if (unlikely(!user_space_fault(trans_exc_code) || in_atomic() || !mm))
                 goto no_context;
 
@@ -440,12 +430,12 @@ void __kprobes do_asce_exception(struct pt_regs *regs, long pgm_int_code,
 
         /* User mode accesses just cause a SIGSEGV */
         if (regs->psw.mask & PSW_MASK_PSTATE) {
-                do_sigsegv(regs, pgm_int_code, SEGV_MAPERR, trans_exc_code);
+                do_sigsegv(regs, SEGV_MAPERR);
                 return;
         }
 
 no_context:
-        do_no_context(regs, pgm_int_code, trans_exc_code);
+        do_no_context(regs);
 }
 #endif
 
@@ -459,14 +449,15 @@ int __handle_fault(unsigned long uaddr, unsigned long pgm_int_code, int write)
                 regs.psw.mask |= PSW_MASK_IO | PSW_MASK_EXT;
         regs.psw.addr = (unsigned long) __builtin_return_address(0);
         regs.psw.addr |= PSW_ADDR_AMODE;
-        uaddr &= PAGE_MASK;
+        regs.int_code = pgm_int_code;
+        regs.int_parm_long = (uaddr & PAGE_MASK) | 2;
         access = write ? VM_WRITE : VM_READ;
-        fault = do_exception(&regs, access, uaddr | 2);
+        fault = do_exception(&regs, access);
         if (unlikely(fault)) {
                 if (fault & VM_FAULT_OOM)
                         return -EFAULT;
                 else if (fault & VM_FAULT_SIGBUS)
-                        do_sigbus(&regs, pgm_int_code, uaddr);
+                        do_sigbus(&regs);
         }
         return fault ? -EFAULT : 0;
 }
@@ -509,7 +500,7 @@ int pfault_init(void)
                 .reserved = __PF_RES_FIELD };
         int rc;
 
-        if (!MACHINE_IS_VM || pfault_disable)
+        if (pfault_disable)
                 return -1;
         asm volatile(
                 "       diag    %1,%0,0x258\n"
@@ -530,7 +521,7 @@ void pfault_fini(void)
                 .refversn = 2,
         };
 
-        if (!MACHINE_IS_VM || pfault_disable)
+        if (pfault_disable)
                 return;
         asm volatile(
                 "       diag    %0,0,0x258\n"
@@ -643,8 +634,6 @@ static int __init pfault_irq_init(void)
 {
         int rc;
 
-        if (!MACHINE_IS_VM)
-                return 0;
         rc = register_external_interrupt(0x2603, pfault_interrupt);
         if (rc)
                 goto out_extint;
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index d4b9fb4d0042..5d633019d8f3 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -93,18 +93,22 @@ static unsigned long setup_zero_pages(void)
 void __init paging_init(void)
 {
         unsigned long max_zone_pfns[MAX_NR_ZONES];
-        unsigned long pgd_type;
+        unsigned long pgd_type, asce_bits;
 
         init_mm.pgd = swapper_pg_dir;
-        S390_lowcore.kernel_asce = __pa(init_mm.pgd) & PAGE_MASK;
 #ifdef CONFIG_64BIT
-        /* A three level page table (4TB) is enough for the kernel space. */
-        S390_lowcore.kernel_asce |= _ASCE_TYPE_REGION3 | _ASCE_TABLE_LENGTH;
-        pgd_type = _REGION3_ENTRY_EMPTY;
+        if (VMALLOC_END > (1UL << 42)) {
+                asce_bits = _ASCE_TYPE_REGION2 | _ASCE_TABLE_LENGTH;
+                pgd_type = _REGION2_ENTRY_EMPTY;
+        } else {
+                asce_bits = _ASCE_TYPE_REGION3 | _ASCE_TABLE_LENGTH;
+                pgd_type = _REGION3_ENTRY_EMPTY;
+        }
 #else
-        S390_lowcore.kernel_asce |= _ASCE_TABLE_LENGTH;
+        asce_bits = _ASCE_TABLE_LENGTH;
         pgd_type = _SEGMENT_ENTRY_EMPTY;
 #endif
+        S390_lowcore.kernel_asce = (__pa(init_mm.pgd) & PAGE_MASK) | asce_bits;
         clear_table((unsigned long *) init_mm.pgd, pgd_type,
                     sizeof(unsigned long)*2048);
         vmem_map_init();
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 301c84d3b542..9a4d02f64f16 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -33,17 +33,6 @@
 #define FRAG_MASK       0x03
 #endif
 
-unsigned long VMALLOC_START = VMALLOC_END - VMALLOC_SIZE;
-EXPORT_SYMBOL(VMALLOC_START);
-
-static int __init parse_vmalloc(char *arg)
-{
-        if (!arg)
-                return -EINVAL;
-        VMALLOC_START = (VMALLOC_END - memparse(arg, &arg)) & PAGE_MASK;
-        return 0;
-}
-early_param("vmalloc", parse_vmalloc);
 
 unsigned long *crst_table_alloc(struct mm_struct *mm)
 {
@@ -267,7 +256,10 @@ static int gmap_alloc_table(struct gmap *gmap,
         struct page *page;
         unsigned long *new;
 
+        /* since we dont free the gmap table until gmap_free we can unlock */
+        spin_unlock(&gmap->mm->page_table_lock);
         page = alloc_pages(GFP_KERNEL, ALLOC_ORDER);
+        spin_lock(&gmap->mm->page_table_lock);
         if (!page)
                 return -ENOMEM;
         new = (unsigned long *) page_to_phys(page);
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 70ae9d81870e..868ea08dff0b 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -31,6 +31,7 @@ config SPARC
 
 config SPARC32
         def_bool !64BIT
+        select GENERIC_ATOMIC64
 
 config SPARC64
         def_bool 64BIT
@@ -383,9 +384,7 @@ config SCHED_MC
           making when dealing with multi-core CPU chips at a cost of slightly
           increased overhead in some places. If unsure say N here.
 
-if SPARC64
 source "kernel/Kconfig.preempt"
-endif
 
 config CMDLINE_BOOL
         bool "Default bootloader kernel arguments"
diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
index 5c3c8b69884d..9dd0a769fa18 100644
--- a/arch/sparc/include/asm/atomic_32.h
+++ b/arch/sparc/include/asm/atomic_32.h
@@ -13,7 +13,7 @@
 
 #include <linux/types.h>
 
-#ifdef __KERNEL__
+#include <asm-generic/atomic64.h>
 
 #include <asm/system.h>
 
@@ -52,112 +52,10 @@ extern void atomic_set(atomic_t *, int);
 #define atomic_dec_and_test(v) (atomic_dec_return(v) == 0)
 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
 
-
-/* This is the old 24-bit implementation.  It's still used internally
- * by some sparc-specific code, notably the semaphore implementation.
- */
-typedef struct { volatile int counter; } atomic24_t;
-
-#ifndef CONFIG_SMP
-
-#define ATOMIC24_INIT(i)  { (i) }
-#define atomic24_read(v)          ((v)->counter)
-#define atomic24_set(v, i)        (((v)->counter) = i)
-
-#else
-/* We do the bulk of the actual work out of line in two common
- * routines in assembler, see arch/sparc/lib/atomic.S for the
- * "fun" details.
- *
- * For SMP the trick is you embed the spin lock byte within
- * the word, use the low byte so signedness is easily retained
- * via a quick arithmetic shift.  It looks like this:
- *
- *      ----------------------------------------
- *      | signed 24-bit counter value |  lock  |  atomic_t
- *      ----------------------------------------
- *       31                          8 7      0
- */
-
-#define ATOMIC24_INIT(i)        { ((i) << 8) }
-
-static inline int atomic24_read(const atomic24_t *v)
-{
-        int ret = v->counter;
-
-        while(ret & 0xff)
-                ret = v->counter;
-
-        return ret >> 8;
-}
-
-#define atomic24_set(v, i)      (((v)->counter) = ((i) << 8))
-#endif
-
-static inline int __atomic24_add(int i, atomic24_t *v)
-{
-        register volatile int *ptr asm("g1");
-        register int increment asm("g2");
-        register int tmp1 asm("g3");
-        register int tmp2 asm("g4");
-        register int tmp3 asm("g7");
-
-        ptr = &v->counter;
-        increment = i;
-
-        __asm__ __volatile__(
-        "mov    %%o7, %%g4\n\t"
-        "call   ___atomic24_add\n\t"
-        " add   %%o7, 8, %%o7\n"
-        : "=&r" (increment), "=r" (tmp1), "=r" (tmp2), "=r" (tmp3)
-        : "0" (increment), "r" (ptr)
-        : "memory", "cc");
-
-        return increment;
-}
-
-static inline int __atomic24_sub(int i, atomic24_t *v)
-{
-        register volatile int *ptr asm("g1");
-        register int increment asm("g2");
-        register int tmp1 asm("g3");
-        register int tmp2 asm("g4");
-        register int tmp3 asm("g7");
-
-        ptr = &v->counter;
-        increment = i;
-
-        __asm__ __volatile__(
-        "mov    %%o7, %%g4\n\t"
-        "call   ___atomic24_sub\n\t"
-        " add   %%o7, 8, %%o7\n"
-        : "=&r" (increment), "=r" (tmp1), "=r" (tmp2), "=r" (tmp3)
-        : "0" (increment), "r" (ptr)
-        : "memory", "cc");
-
-        return increment;
-}
-
-#define atomic24_add(i, v) ((void)__atomic24_add((i), (v)))
-#define atomic24_sub(i, v) ((void)__atomic24_sub((i), (v)))
-
-#define atomic24_dec_return(v) __atomic24_sub(1, (v))
-#define atomic24_inc_return(v) __atomic24_add(1, (v))
-
-#define atomic24_sub_and_test(i, v) (__atomic24_sub((i), (v)) == 0)
-#define atomic24_dec_and_test(v) (__atomic24_sub(1, (v)) == 0)
-
-#define atomic24_inc(v) ((void)__atomic24_add(1, (v)))
-#define atomic24_dec(v) ((void)__atomic24_sub(1, (v)))
-
-#define atomic24_add_negative(i, v) (__atomic24_add((i), (v)) < 0)
-
 /* Atomic operations are already serializing */
 #define smp_mb__before_atomic_dec()     barrier()
 #define smp_mb__after_atomic_dec()      barrier()
 #define smp_mb__before_atomic_inc()     barrier()
 #define smp_mb__after_atomic_inc()      barrier()
 
-#endif /* !(__KERNEL__) */
-
 #endif /* !(__ARCH_SPARC_ATOMIC__) */
diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
index 156707b0f18d..bb5c2ac4055d 100644
--- a/arch/sparc/include/asm/page_32.h
+++ b/arch/sparc/include/asm/page_32.h
@@ -8,14 +8,10 @@
 #ifndef _SPARC_PAGE_H
 #define _SPARC_PAGE_H
 
-#define PAGE_SHIFT   12
+#include <linux/const.h>
 
-#ifndef __ASSEMBLY__
-/* I have my suspicions... -DaveM */
-#define PAGE_SIZE    (1UL << PAGE_SHIFT)
-#else
-#define PAGE_SIZE    (1 << PAGE_SHIFT)
-#endif
+#define PAGE_SHIFT   12
+#define PAGE_SIZE    (_AC(1, UL) << PAGE_SHIFT)
 #define PAGE_MASK    (~(PAGE_SIZE-1))
 
 #include <asm/btfixup.h>
diff --git a/arch/sparc/include/asm/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h
deleted file mode 100644
index 5a0d661fb82e..000000000000
--- a/arch/sparc/include/asm/pgtsun4.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * pgtsun4.h:  Sun4 specific pgtable.h defines and code.
- *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
- */
-#ifndef _SPARC_PGTSUN4C_H
-#define _SPARC_PGTSUN4C_H
-
-#include <asm/contregs.h>
-
-/* PMD_SHIFT determines the size of the area a second-level page table can map */
-#define SUN4C_PMD_SHIFT       23
-
-/* PGDIR_SHIFT determines what a third-level page table entry can map */
-#define SUN4C_PGDIR_SHIFT       23
-#define SUN4C_PGDIR_SIZE        (1UL << SUN4C_PGDIR_SHIFT)
-#define SUN4C_PGDIR_MASK        (~(SUN4C_PGDIR_SIZE-1))
-#define SUN4C_PGDIR_ALIGN(addr) (((addr)+SUN4C_PGDIR_SIZE-1)&SUN4C_PGDIR_MASK)
-
-/* To represent how the sun4c mmu really lays things out. */
-#define SUN4C_REAL_PGDIR_SHIFT       18
-#define SUN4C_REAL_PGDIR_SIZE        (1UL << SUN4C_REAL_PGDIR_SHIFT)
-#define SUN4C_REAL_PGDIR_MASK        (~(SUN4C_REAL_PGDIR_SIZE-1))
-#define SUN4C_REAL_PGDIR_ALIGN(addr) (((addr)+SUN4C_REAL_PGDIR_SIZE-1)&SUN4C_REAL_PGDIR_MASK)
-
-/* 19 bit PFN on sun4 */
-#define SUN4C_PFN_MASK 0x7ffff
- 
-/* Don't increase these unless the structures in sun4c.c are fixed */
-#define SUN4C_MAX_SEGMAPS 256
-#define SUN4C_MAX_CONTEXTS 16
-
-/*
- * To be efficient, and not have to worry about allocating such
- * a huge pgd, we make the kernel sun4c tables each hold 1024
- * entries and the pgd similarly just like the i386 tables.
- */
-#define SUN4C_PTRS_PER_PTE    1024
-#define SUN4C_PTRS_PER_PMD    1
-#define SUN4C_PTRS_PER_PGD    1024
-
-/*
- * Sparc SUN4C pte fields.
- */
-#define _SUN4C_PAGE_VALID        0x80000000
-#define _SUN4C_PAGE_SILENT_READ  0x80000000   /* synonym */
-#define _SUN4C_PAGE_DIRTY        0x40000000
-#define _SUN4C_PAGE_SILENT_WRITE 0x40000000   /* synonym */
-#define _SUN4C_PAGE_PRIV         0x20000000   /* privileged page */
-#define _SUN4C_PAGE_NOCACHE      0x10000000   /* non-cacheable page */
-#define _SUN4C_PAGE_PRESENT      0x08000000   /* implemented in software */
-#define _SUN4C_PAGE_IO           0x04000000   /* I/O page */
-#define _SUN4C_PAGE_FILE         0x02000000   /* implemented in software */
-#define _SUN4C_PAGE_READ         0x00800000   /* implemented in software */
-#define _SUN4C_PAGE_WRITE        0x00400000   /* implemented in software */
-#define _SUN4C_PAGE_ACCESSED     0x00200000   /* implemented in software */
-#define _SUN4C_PAGE_MODIFIED     0x00100000   /* implemented in software */
-
-#define _SUN4C_READABLE         (_SUN4C_PAGE_READ|_SUN4C_PAGE_SILENT_READ|\
-                                 _SUN4C_PAGE_ACCESSED)
-#define _SUN4C_WRITEABLE        (_SUN4C_PAGE_WRITE|_SUN4C_PAGE_SILENT_WRITE|\
-                                 _SUN4C_PAGE_MODIFIED)
-
-#define _SUN4C_PAGE_CHG_MASK    (0xffff|_SUN4C_PAGE_ACCESSED|_SUN4C_PAGE_MODIFIED)
-
-#define SUN4C_PAGE_NONE         __pgprot(_SUN4C_PAGE_PRESENT)
-#define SUN4C_PAGE_SHARED       __pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE|\
-                                         _SUN4C_PAGE_WRITE)
-#define SUN4C_PAGE_COPY         __pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE)
-#define SUN4C_PAGE_READONLY     __pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE)
-#define SUN4C_PAGE_KERNEL       __pgprot(_SUN4C_READABLE|_SUN4C_WRITEABLE|\
-                                         _SUN4C_PAGE_DIRTY|_SUN4C_PAGE_PRIV)
-
-/* SUN4C swap entry encoding
- *
- * We use 5 bits for the type and 19 for the offset.  This gives us
- * 32 swapfiles of 4GB each.  Encoding looks like:
- *
- * RRRRRRRRooooooooooooooooooottttt
- * fedcba9876543210fedcba9876543210
- *
- * The top 8 bits are reserved for protection and status bits, especially
- * FILE and PRESENT.
- */
-#define SUN4C_SWP_TYPE_MASK     0x1f
-#define SUN4C_SWP_OFF_MASK      0x7ffff
-#define SUN4C_SWP_OFF_SHIFT     5
-
-#ifndef __ASSEMBLY__
-
-static inline unsigned long sun4c_get_synchronous_error(void)
-{
-        unsigned long sync_err;
-
-        __asm__ __volatile__("lda [%1] %2, %0\n\t" :
-                             "=r" (sync_err) :
-                             "r" (AC_SYNC_ERR), "i" (ASI_CONTROL));
-        return sync_err;
-}
-
-static inline unsigned long sun4c_get_synchronous_address(void)
-{
-        unsigned long sync_addr;
-
-        __asm__ __volatile__("lda [%1] %2, %0\n\t" :
-                             "=r" (sync_addr) :
-                             "r" (AC_SYNC_VA), "i" (ASI_CONTROL));
-        return sync_addr;
-}
-
-/* SUN4 pte, segmap, and context manipulation */
-static inline unsigned long sun4c_get_segmap(unsigned long addr)
-{
-  register unsigned long entry;
-
-  __asm__ __volatile__("\n\tlduha [%1] %2, %0\n\t" : 
-                       "=r" (entry) :
-                       "r" (addr), "i" (ASI_SEGMAP));
-  return entry;
-}
-
-static inline void sun4c_put_segmap(unsigned long addr, unsigned long entry)
-{
-  __asm__ __volatile__("\n\tstha %1, [%0] %2; nop; nop; nop;\n\t" : :
-                       "r" (addr), "r" (entry),
-                       "i" (ASI_SEGMAP)
-                       : "memory");
-}
-
-static inline unsigned long sun4c_get_pte(unsigned long addr)
-{
-  register unsigned long entry;
-
-  __asm__ __volatile__("\n\tlda [%1] %2, %0\n\t" : 
-                       "=r" (entry) :
-                       "r" (addr), "i" (ASI_PTE));
-  return entry;
-}
-
-static inline void sun4c_put_pte(unsigned long addr, unsigned long entry)
-{
-  __asm__ __volatile__("\n\tsta %1, [%0] %2; nop; nop; nop;\n\t" : :
-                       "r" (addr), 
-                       "r" ((entry & ~(_SUN4C_PAGE_PRESENT))), "i" (ASI_PTE)
-                       : "memory");
-}
-
-static inline int sun4c_get_context(void)
-{
-  register int ctx;
-
-  __asm__ __volatile__("\n\tlduba [%1] %2, %0\n\t" :
-                       "=r" (ctx) :
-                       "r" (AC_CONTEXT), "i" (ASI_CONTROL));
-
-  return ctx;
-}
-
-static inline int sun4c_set_context(int ctx)
-{
-  __asm__ __volatile__("\n\tstba %0, [%1] %2; nop; nop; nop;\n\t" : :
-                       "r" (ctx), "r" (AC_CONTEXT), "i" (ASI_CONTROL)
-                       : "memory");
-
-  return ctx;
-}
-
-#endif /* !(__ASSEMBLY__) */
-
-#endif /* !(_SPARC_PGTSUN4_H) */
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index 5cc5888ad5a3..c2a1080cdd3b 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -95,7 +95,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *)
  * Observe the order of get_free_pages() in alloc_thread_info_node().
  * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste.
  */
-#define THREAD_SIZE             8192
+#define THREAD_SIZE             (2 * PAGE_SIZE)
 
 /*
  * Offsets in thread_info structure, used in assembly code
diff --git a/arch/sparc/lib/atomic_32.S b/arch/sparc/lib/atomic_32.S
index 178cbb8ae1b9..eb6c7359cbd1 100644
--- a/arch/sparc/lib/atomic_32.S
+++ b/arch/sparc/lib/atomic_32.S
@@ -40,60 +40,5 @@ ___xchg32_sun4md:
          mov    %g4, %o7
 #endif
 
-        /* Read asm-sparc/atomic.h carefully to understand how this works for SMP.
-         * Really, some things here for SMP are overly clever, go read the header.
-         */
-        .globl  ___atomic24_add
-___atomic24_add:
-        rd      %psr, %g3               ! Keep the code small, old way was stupid
-        nop; nop; nop;                  ! Let the bits set
-        or      %g3, PSR_PIL, %g7       ! Disable interrupts
-        wr      %g7, 0x0, %psr          ! Set %psr
-        nop; nop; nop;                  ! Let the bits set
-#ifdef CONFIG_SMP
-1:      ldstub  [%g1 + 3], %g7          ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     1b                      ! Nope...
-         ld     [%g1], %g7              ! Load locked atomic24_t
-        sra     %g7, 8, %g7             ! Get signed 24-bit integer
-        add     %g7, %g2, %g2           ! Add in argument
-        sll     %g2, 8, %g7             ! Transpose back to atomic24_t
-        st      %g7, [%g1]              ! Clever: This releases the lock as well.
-#else
-        ld      [%g1], %g7              ! Load locked atomic24_t
-        add     %g7, %g2, %g2           ! Add in argument
-        st      %g2, [%g1]              ! Store it back
-#endif
-        wr      %g3, 0x0, %psr          ! Restore original PSR_PIL
-        nop; nop; nop;                  ! Let the bits set
-        jmpl    %o7, %g0                ! NOTE: not + 8, see callers in atomic.h
-         mov    %g4, %o7                ! Restore %o7
-
-        .globl  ___atomic24_sub
-___atomic24_sub:
-        rd      %psr, %g3               ! Keep the code small, old way was stupid
-        nop; nop; nop;                  ! Let the bits set
-        or      %g3, PSR_PIL, %g7       ! Disable interrupts
-        wr      %g7, 0x0, %psr          ! Set %psr
-        nop; nop; nop;                  ! Let the bits set
-#ifdef CONFIG_SMP
-1:      ldstub  [%g1 + 3], %g7          ! Spin on the byte lock for SMP.
-        orcc    %g7, 0x0, %g0           ! Did we get it?
-        bne     1b                      ! Nope...
-         ld     [%g1], %g7              ! Load locked atomic24_t
-        sra     %g7, 8, %g7             ! Get signed 24-bit integer
-        sub     %g7, %g2, %g2           ! Subtract argument
-        sll     %g2, 8, %g7             ! Transpose back to atomic24_t
-        st      %g7, [%g1]              ! Clever: This releases the lock as well
-#else
-        ld      [%g1], %g7              ! Load locked atomic24_t
-        sub     %g7, %g2, %g2           ! Subtract argument
-        st      %g2, [%g1]              ! Store it back
-#endif
-        wr      %g3, 0x0, %psr          ! Restore original PSR_PIL
-        nop; nop; nop;                  ! Let the bits set
-        jmpl    %o7, %g0                ! NOTE: not + 8, see callers in atomic.h
-         mov    %g4, %o7                ! Restore %o7
-
         .globl  __atomic_end
 __atomic_end:
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
index 1b30bb3bfdb1..f73c2240fe60 100644
--- a/arch/sparc/lib/ksyms.c
+++ b/arch/sparc/lib/ksyms.c
@@ -62,8 +62,6 @@ extern void ___rw_read_enter(void);
 extern void ___rw_read_try(void);
 extern void ___rw_read_exit(void);
 extern void ___rw_write_enter(void);
-extern void ___atomic24_add(void);
-extern void ___atomic24_sub(void);
 
 /* Alias functions whose names begin with "." and export the aliases.
  * The module references will be fixed up by module_frob_arch_sections.
@@ -97,10 +95,6 @@ EXPORT_SYMBOL(___rw_read_exit);
 EXPORT_SYMBOL(___rw_write_enter);
 #endif
 
-/* Atomic operations. */
-EXPORT_SYMBOL(___atomic24_add);
-EXPORT_SYMBOL(___atomic24_sub);
-
 EXPORT_SYMBOL(__ashrdi3);
 EXPORT_SYMBOL(__ashldi3);
 EXPORT_SYMBOL(__lshrdi3);
diff --git a/arch/x86/include/asm/mrst.h b/arch/x86/include/asm/mrst.h
index 93f79094c224..0a0a95460434 100644
--- a/arch/x86/include/asm/mrst.h
+++ b/arch/x86/include/asm/mrst.h
@@ -67,7 +67,7 @@ extern struct console early_mrst_console;
 extern void mrst_early_console_init(void);
 
 extern struct console early_hsu_console;
-extern void hsu_early_console_init(void);
+extern void hsu_early_console_init(const char *);
 
 extern void intel_scu_devices_create(void);
 extern void intel_scu_devices_destroy(void);
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index 529bf07e8067..7a11910a63c4 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -414,22 +414,6 @@ do {									\
 #define this_cpu_xchg_2(pcp, nval)      percpu_xchg_op(pcp, nval)
 #define this_cpu_xchg_4(pcp, nval)      percpu_xchg_op(pcp, nval)
 
-#define irqsafe_cpu_add_1(pcp, val)     percpu_add_op((pcp), val)
-#define irqsafe_cpu_add_2(pcp, val)     percpu_add_op((pcp), val)
-#define irqsafe_cpu_add_4(pcp, val)     percpu_add_op((pcp), val)
-#define irqsafe_cpu_and_1(pcp, val)     percpu_to_op("and", (pcp), val)
-#define irqsafe_cpu_and_2(pcp, val)     percpu_to_op("and", (pcp), val)
-#define irqsafe_cpu_and_4(pcp, val)     percpu_to_op("and", (pcp), val)
-#define irqsafe_cpu_or_1(pcp, val)      percpu_to_op("or", (pcp), val)
-#define irqsafe_cpu_or_2(pcp, val)      percpu_to_op("or", (pcp), val)
-#define irqsafe_cpu_or_4(pcp, val)      percpu_to_op("or", (pcp), val)
-#define irqsafe_cpu_xor_1(pcp, val)     percpu_to_op("xor", (pcp), val)
-#define irqsafe_cpu_xor_2(pcp, val)     percpu_to_op("xor", (pcp), val)
-#define irqsafe_cpu_xor_4(pcp, val)     percpu_to_op("xor", (pcp), val)
-#define irqsafe_cpu_xchg_1(pcp, nval)   percpu_xchg_op(pcp, nval)
-#define irqsafe_cpu_xchg_2(pcp, nval)   percpu_xchg_op(pcp, nval)
-#define irqsafe_cpu_xchg_4(pcp, nval)   percpu_xchg_op(pcp, nval)
-
 #ifndef CONFIG_M386
 #define __this_cpu_add_return_1(pcp, val) percpu_add_return_op(pcp, val)
 #define __this_cpu_add_return_2(pcp, val) percpu_add_return_op(pcp, val)
@@ -445,9 +429,6 @@ do {									\
 #define this_cpu_cmpxchg_2(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
 #define this_cpu_cmpxchg_4(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
 
-#define irqsafe_cpu_cmpxchg_1(pcp, oval, nval)  percpu_cmpxchg_op(pcp, oval, nval)
-#define irqsafe_cpu_cmpxchg_2(pcp, oval, nval)  percpu_cmpxchg_op(pcp, oval, nval)
-#define irqsafe_cpu_cmpxchg_4(pcp, oval, nval)  percpu_cmpxchg_op(pcp, oval, nval)
 #endif /* !CONFIG_M386 */
 
 #ifdef CONFIG_X86_CMPXCHG64
@@ -464,7 +445,6 @@ do {									\
 
 #define __this_cpu_cmpxchg_double_4     percpu_cmpxchg8b_double
 #define this_cpu_cmpxchg_double_4       percpu_cmpxchg8b_double
-#define irqsafe_cpu_cmpxchg_double_4    percpu_cmpxchg8b_double
 #endif /* CONFIG_X86_CMPXCHG64 */
 
 /*
@@ -492,13 +472,6 @@ do {									\
 #define this_cpu_xchg_8(pcp, nval)      percpu_xchg_op(pcp, nval)
 #define this_cpu_cmpxchg_8(pcp, oval, nval)     percpu_cmpxchg_op(pcp, oval, nval)
 
-#define irqsafe_cpu_add_8(pcp, val)     percpu_add_op((pcp), val)
-#define irqsafe_cpu_and_8(pcp, val)     percpu_to_op("and", (pcp), val)
-#define irqsafe_cpu_or_8(pcp, val)      percpu_to_op("or", (pcp), val)
-#define irqsafe_cpu_xor_8(pcp, val)     percpu_to_op("xor", (pcp), val)
-#define irqsafe_cpu_xchg_8(pcp, nval)   percpu_xchg_op(pcp, nval)
-#define irqsafe_cpu_cmpxchg_8(pcp, oval, nval)  percpu_cmpxchg_op(pcp, oval, nval)
-
 /*
  * Pretty complex macro to generate cmpxchg16 instruction.  The instruction
  * is not supported on early AMD64 processors so we must be able to emulate
@@ -521,7 +494,6 @@ do {									\
 
 #define __this_cpu_cmpxchg_double_8     percpu_cmpxchg16b_double
 #define this_cpu_cmpxchg_double_8       percpu_cmpxchg16b_double
-#define irqsafe_cpu_cmpxchg_double_8    percpu_cmpxchg16b_double
 
 #endif
 
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index cd28a350f7f9..9d42a52d2331 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -247,7 +247,7 @@ static int __init setup_early_printk(char *buf)
                 }
 
                 if (!strncmp(buf, "hsu", 3)) {
-                        hsu_early_console_init();
+                        hsu_early_console_init(buf + 3);
                         early_console_register(&early_hsu_console, keep);
                 }
 #endif
diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/mrst/early_printk_mrst.c
index 25bfdbb5b130..3c6e328483c7 100644
--- a/arch/x86/platform/mrst/early_printk_mrst.c
+++ b/arch/x86/platform/mrst/early_printk_mrst.c
@@ -245,16 +245,24 @@ struct console early_mrst_console = {
  * Following is the early console based on Medfield HSU (High
  * Speed UART) device.
  */
-#define HSU_PORT2_PADDR         0xffa28180
+#define HSU_PORT_BASE           0xffa28080
 
 static void __iomem *phsu;
 
-void hsu_early_console_init(void)
+void hsu_early_console_init(const char *s)
 {
+        unsigned long paddr, port = 0;
         u8 lcr;
 
-        phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE,
-                                                        HSU_PORT2_PADDR);
+        /*
+         * Select the early HSU console port if specified by user in the
+         * kernel command line.
+         */
+        if (*s && !kstrtoul(s, 10, &port))
+                port = clamp_val(port, 0, 2);
+
+        paddr = HSU_PORT_BASE + port * 0x80;
+        phsu = (void *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE, paddr);
 
         /* Disable FIFO */
         writeb(0x0, phsu + UART_FCR);
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 8f630cec906e..b8c143d68ee0 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -30,8 +30,10 @@ EXPORT_SYMBOL_GPL(blkio_root_cgroup);
 
 static struct cgroup_subsys_state *blkiocg_create(struct cgroup_subsys *,
                                                   struct cgroup *);
-static int blkiocg_can_attach_task(struct cgroup *, struct task_struct *);
-static void blkiocg_attach_task(struct cgroup *, struct task_struct *);
+static int blkiocg_can_attach(struct cgroup_subsys *, struct cgroup *,
+                              struct cgroup_taskset *);
+static void blkiocg_attach(struct cgroup_subsys *, struct cgroup *,
+                           struct cgroup_taskset *);
 static void blkiocg_destroy(struct cgroup_subsys *, struct cgroup *);
 static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);
 
@@ -44,8 +46,8 @@ static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *);
 struct cgroup_subsys blkio_subsys = {
         .name = "blkio",
         .create = blkiocg_create,
-        .can_attach_task = blkiocg_can_attach_task,
-        .attach_task = blkiocg_attach_task,
+        .can_attach = blkiocg_can_attach,
+        .attach = blkiocg_attach,
         .destroy = blkiocg_destroy,
         .populate = blkiocg_populate,
 #ifdef CONFIG_BLK_CGROUP
@@ -1626,30 +1628,39 @@ done:
  * of the main cic data structures.  For now we allow a task to change
  * its cgroup only if it's the only owner of its ioc.
  */
-static int blkiocg_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+static int blkiocg_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                              struct cgroup_taskset *tset)
 {
+        struct task_struct *task;
         struct io_context *ioc;
         int ret = 0;
 
         /* task_lock() is needed to avoid races with exit_io_context() */
-        task_lock(tsk);
-        ioc = tsk->io_context;
-        if (ioc && atomic_read(&ioc->nr_tasks) > 1)
-                ret = -EINVAL;
-        task_unlock(tsk);
-
+        cgroup_taskset_for_each(task, cgrp, tset) {
+                task_lock(task);
+                ioc = task->io_context;
+                if (ioc && atomic_read(&ioc->nr_tasks) > 1)
+                        ret = -EINVAL;
+                task_unlock(task);
+                if (ret)
+                        break;
+        }
         return ret;
 }
 
-static void blkiocg_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+static void blkiocg_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                           struct cgroup_taskset *tset)
 {
+        struct task_struct *task;
         struct io_context *ioc;
 
-        task_lock(tsk);
-        ioc = tsk->io_context;
-        if (ioc)
-                ioc->cgroup_changed = 1;
-        task_unlock(tsk);
+        cgroup_taskset_for_each(task, cgrp, tset) {
+                task_lock(task);
+                ioc = task->io_context;
+                if (ioc)
+                        ioc->cgroup_changed = 1;
+                task_unlock(task);
+        }
 }
 
 void blkio_policy_register(struct blkio_policy_type *blkiop)
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index a76f24a8e5db..5249e6d918a3 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -360,7 +360,7 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)
         ap->flags |= ATA_FLAG_SLAVE_POSS;
         ap->pio_mask = ATA_PIO4;
 
-        if (!irq) {
+        if (!gpio_is_valid(irq)) {
                 ap->flags |= ATA_FLAG_PIO_POLLING;
                 ata_port_desc(ap, "no IRQ, using PIO polling");
         }
@@ -414,8 +414,8 @@ static int __devinit pata_at91_probe(struct platform_device *pdev)
 
         host->private_data = info;
 
-        ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
-                        irq ? ata_sff_interrupt : NULL,
+        return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
+                        gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
                         irq_flags, &pata_at91_sht);
 
         if (!ret)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 0b8b8b488ee8..38950ea8398a 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -3988,7 +3988,7 @@ static int mv_create_dma_pools(struct mv_host_priv *hpriv, struct device *dev)
 }
 
 static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,
-                                 struct mbus_dram_target_info *dram)
+                                 const struct mbus_dram_target_info *dram)
 {
         int i;
 
@@ -3998,7 +3998,7 @@ static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,
         }
 
         for (i = 0; i < dram->num_cs; i++) {
-                struct mbus_dram_window *cs = dram->cs + i;
+                const struct mbus_dram_window *cs = dram->cs + i;
 
                 writel(((cs->size - 1) & 0xffff0000) |
                         (cs->mbus_attr << 8) |
@@ -4019,6 +4019,7 @@ static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,
 static int mv_platform_probe(struct platform_device *pdev)
 {
         const struct mv_sata_platform_data *mv_platform_data;
+        const struct mbus_dram_target_info *dram;
         const struct ata_port_info *ppi[] =
             { &mv_port_info[chip_soc], NULL };
         struct ata_host *host;
@@ -4072,8 +4073,9 @@ static int mv_platform_probe(struct platform_device *pdev)
         /*
          * (Re-)program MBUS remapping windows if we are asked to.
          */
-        if (mv_platform_data->dram != NULL)
-                mv_conf_mbus_windows(hpriv, mv_platform_data->dram);
+        dram = mv_mbus_dram_info();
+        if (dram)
+                mv_conf_mbus_windows(hpriv, dram);
 
         rc = mv_create_dma_pools(hpriv, &pdev->dev);
         if (rc)
@@ -4141,17 +4143,18 @@ static int mv_platform_suspend(struct platform_device *pdev, pm_message_t state)
 static int mv_platform_resume(struct platform_device *pdev)
 {
         struct ata_host *host = platform_get_drvdata(pdev);
+        const struct mbus_dram_target_info *dram;
         int ret;
 
         if (host) {
                 struct mv_host_priv *hpriv = host->private_data;
-                const struct mv_sata_platform_data *mv_platform_data = \
-                        pdev->dev.platform_data;
+
                 /*
                  * (Re-)program MBUS remapping windows if we are asked to.
                  */
-                if (mv_platform_data->dram != NULL)
-                        mv_conf_mbus_windows(hpriv, mv_platform_data->dram);
+                dram = mv_mbus_dram_info();
+                if (dram)
+                        mv_conf_mbus_windows(hpriv, dram);
 
                 /* initialize adapter */
                 ret = mv_init_host(host);
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index 35309274ad68..9b3cd08cd0ed 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -3,5 +3,8 @@ config CLKDEV_LOOKUP
         bool
         select HAVE_CLK
 
+config HAVE_CLK_PREPARE
+        bool
+
 config HAVE_MACH_CLKDEV
         bool
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 9a353c2216d0..e779b434af45 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1250,7 +1250,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev)
 
 static void
 mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,
-                         struct mbus_dram_target_info *dram)
+                         const struct mbus_dram_target_info *dram)
 {
         void __iomem *base = msp->xor_base;
         u32 win_enable = 0;
@@ -1264,7 +1264,7 @@ mv_xor_conf_mbus_windows(struct mv_xor_shared_private *msp,
         }
 
         for (i = 0; i < dram->num_cs; i++) {
-                struct mbus_dram_window *cs = dram->cs + i;
+                const struct mbus_dram_window *cs = dram->cs + i;
 
                 writel((cs->base & 0xffff0000) |
                        (cs->mbus_attr << 8) |
@@ -1290,7 +1290,7 @@ static struct platform_driver mv_xor_driver = {
 
 static int mv_xor_shared_probe(struct platform_device *pdev)
 {
-        struct mv_xor_platform_shared_data *msd = pdev->dev.platform_data;
+        const struct mbus_dram_target_info *dram;
         struct mv_xor_shared_private *msp;
         struct resource *res;
 
@@ -1323,8 +1323,9 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
         /*
          * (Re-)program MBUS remapping windows if we are asked to.
          */
-        if (msd != NULL && msd->dram != NULL)
-                mv_xor_conf_mbus_windows(msp, msd->dram);
+        dram = mv_mbus_dram_info();
+        if (dram)
+                mv_xor_conf_mbus_windows(msp, dram);
 
         return 0;
 }
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index b4588bdd98bb..fc903c0ed234 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -334,7 +334,7 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan)
                         goto err_irq;
         }
 
-        ret = clk_enable(mxs_dma->clk);
+        ret = clk_prepare_enable(mxs_dma->clk);
         if (ret)
                 goto err_clk;
 
@@ -372,7 +372,7 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan)
         dma_free_coherent(mxs_dma->dma_device.dev, PAGE_SIZE,
                         mxs_chan->ccw, mxs_chan->ccw_phys);
 
-        clk_disable(mxs_dma->clk);
+        clk_disable_unprepare(mxs_dma->clk);
 }
 
 static struct dma_async_tx_descriptor *mxs_dma_prep_slave_sg(
@@ -578,7 +578,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
 {
         int ret;
 
-        ret = clk_enable(mxs_dma->clk);
+        ret = clk_prepare_enable(mxs_dma->clk);
         if (ret)
                 goto err_out;
 
@@ -604,7 +604,7 @@ static int __init mxs_dma_init(struct mxs_dma_engine *mxs_dma)
         writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS,
                 mxs_dma->base + HW_APBHX_CTRL1 + MXS_SET_ADDR);
 
-        clk_disable(mxs_dma->clk);
+        clk_disable_unprepare(mxs_dma->clk);
 
         return 0;
 
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 2d8d1b041d95..09adcfcd953e 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -19,6 +19,7 @@
 #include <linux/amba/pl330.h>
 #include <linux/pm_runtime.h>
 #include <linux/scatterlist.h>
+#include <linux/of.h>
 
 #define NR_DEFAULT_DESC 16
 
@@ -116,6 +117,9 @@ struct dma_pl330_desc {
         struct dma_pl330_chan *pchan;
 };
 
+/* forward declaration */
+static struct amba_driver pl330_driver;
+
 static inline struct dma_pl330_chan *
 to_pchan(struct dma_chan *ch)
 {
@@ -267,6 +271,32 @@ static void dma_pl330_rqcb(void *token, enum pl330_op_err err)
         tasklet_schedule(&pch->task);
 }
 
+bool pl330_filter(struct dma_chan *chan, void *param)
+{
+        u8 *peri_id;
+
+        if (chan->device->dev->driver != &pl330_driver.drv)
+                return false;
+
+#ifdef CONFIG_OF
+        if (chan->device->dev->of_node) {
+                const __be32 *prop_value;
+                phandle phandle;
+                struct device_node *node;
+
+                prop_value = ((struct property *)param)->value;
+                phandle = be32_to_cpup(prop_value++);
+                node = of_find_node_by_phandle(phandle);
+                return ((chan->private == node) &&
+                                (chan->chan_id == be32_to_cpup(prop_value)));
+        }
+#endif
+
+        peri_id = chan->private;
+        return *peri_id == (unsigned)param;
+}
+EXPORT_SYMBOL(pl330_filter);
+
 static int pl330_alloc_chan_resources(struct dma_chan *chan)
 {
         struct dma_pl330_chan *pch = to_pchan(chan);
@@ -497,7 +527,7 @@ pluck_desc(struct dma_pl330_dmac *pdmac)
 static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
 {
         struct dma_pl330_dmac *pdmac = pch->dmac;
-        struct dma_pl330_peri *peri = pch->chan.private;
+        u8 *peri_id = pch->chan.private;
         struct dma_pl330_desc *desc;
 
         /* Pluck one desc from the pool of DMAC */
@@ -522,13 +552,7 @@ static struct dma_pl330_desc *pl330_get_desc(struct dma_pl330_chan *pch)
         desc->txd.cookie = 0;
         async_tx_ack(&desc->txd);
 
-        if (peri) {
-                desc->req.rqtype = peri->rqtype;
-                desc->req.peri = pch->chan.chan_id;
-        } else {
-                desc->req.rqtype = MEMTOMEM;
-                desc->req.peri = 0;
-        }
+        desc->req.peri = peri_id ? pch->chan.chan_id : 0;
 
         dma_async_tx_descriptor_init(&desc->txd, &pch->chan);
 
@@ -615,12 +639,14 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
         case DMA_TO_DEVICE:
                 desc->rqcfg.src_inc = 1;
                 desc->rqcfg.dst_inc = 0;
+                desc->req.rqtype = MEMTODEV;
                 src = dma_addr;
                 dst = pch->fifo_addr;
                 break;
         case DMA_FROM_DEVICE:
                 desc->rqcfg.src_inc = 0;
                 desc->rqcfg.dst_inc = 1;
+                desc->req.rqtype = DEVTOMEM;
                 src = pch->fifo_addr;
                 dst = dma_addr;
                 break;
@@ -646,16 +672,12 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 {
         struct dma_pl330_desc *desc;
         struct dma_pl330_chan *pch = to_pchan(chan);
-        struct dma_pl330_peri *peri = chan->private;
         struct pl330_info *pi;
         int burst;
 
         if (unlikely(!pch || !len))
                 return NULL;
 
-        if (peri && peri->rqtype != MEMTOMEM)
-                return NULL;
-
         pi = &pch->dmac->pif;
 
         desc = __pl330_prep_dma_memcpy(pch, dst, src, len);
@@ -664,6 +686,7 @@ pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
 
         desc->rqcfg.src_inc = 1;
         desc->rqcfg.dst_inc = 1;
+        desc->req.rqtype = MEMTOMEM;
 
         /* Select max possible burst size */
         burst = pi->pcfg.data_bus_width / 8;
@@ -692,25 +715,14 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 {
         struct dma_pl330_desc *first, *desc = NULL;
         struct dma_pl330_chan *pch = to_pchan(chan);
-        struct dma_pl330_peri *peri = chan->private;
         struct scatterlist *sg;
         unsigned long flags;
         int i;
         dma_addr_t addr;
 
-        if (unlikely(!pch || !sgl || !sg_len || !peri))
+        if (unlikely(!pch || !sgl || !sg_len))
                 return NULL;
 
-        /* Make sure the direction is consistent */
-        if ((direction == DMA_TO_DEVICE &&
-                                peri->rqtype != MEMTODEV) ||
-                        (direction == DMA_FROM_DEVICE &&
-                                peri->rqtype != DEVTOMEM)) {
-                dev_err(pch->dmac->pif.dev, "%s:%d Invalid Direction\n",
-                                __func__, __LINE__);
-                return NULL;
-        }
-
         addr = pch->fifo_addr;
 
         first = NULL;
@@ -750,11 +762,13 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
                 if (direction == DMA_TO_DEVICE) {
                         desc->rqcfg.src_inc = 1;
                         desc->rqcfg.dst_inc = 0;
+                        desc->req.rqtype = MEMTODEV;
                         fill_px(&desc->px,
                                 addr, sg_dma_address(sg), sg_dma_len(sg));
                 } else {
                         desc->rqcfg.src_inc = 0;
                         desc->rqcfg.dst_inc = 1;
+                        desc->req.rqtype = DEVTOMEM;
                         fill_px(&desc->px,
                                 sg_dma_address(sg), addr, sg_dma_len(sg));
                 }
@@ -856,32 +870,16 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
         INIT_LIST_HEAD(&pd->channels);
 
         /* Initialize channel parameters */
-        num_chan = max(pdat ? pdat->nr_valid_peri : 0, (u8)pi->pcfg.num_chan);
+        num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
+                        (u8)pi->pcfg.num_chan);
         pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
 
         for (i = 0; i < num_chan; i++) {
                 pch = &pdmac->peripherals[i];
-                if (pdat) {
-                        struct dma_pl330_peri *peri = &pdat->peri[i];
-
-                        switch (peri->rqtype) {
-                        case MEMTOMEM:
-                                dma_cap_set(DMA_MEMCPY, pd->cap_mask);
-                                break;
-                        case MEMTODEV:
-                        case DEVTOMEM:
-                                dma_cap_set(DMA_SLAVE, pd->cap_mask);
-                                dma_cap_set(DMA_CYCLIC, pd->cap_mask);
-                                break;
-                        default:
-                                dev_err(&adev->dev, "DEVTODEV Not Supported\n");
-                                continue;
-                        }
-                        pch->chan.private = peri;
-                } else {
-                        dma_cap_set(DMA_MEMCPY, pd->cap_mask);
-                        pch->chan.private = NULL;
-                }
+                if (!adev->dev.of_node)
+                        pch->chan.private = pdat ? &pdat->peri_id[i] : NULL;
+                else
+                        pch->chan.private = adev->dev.of_node;
 
                 INIT_LIST_HEAD(&pch->work_list);
                 spin_lock_init(&pch->lock);
@@ -894,6 +892,15 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
         }
 
         pd->dev = &adev->dev;
+        if (pdat) {
+                pd->cap_mask = pdat->cap_mask;
+        } else {
+                dma_cap_set(DMA_MEMCPY, pd->cap_mask);
+                if (pi->pcfg.num_peri) {
+                        dma_cap_set(DMA_SLAVE, pd->cap_mask);
+                        dma_cap_set(DMA_CYCLIC, pd->cap_mask);
+                }
+        }
 
         pd->device_alloc_chan_resources = pl330_alloc_chan_resources;
         pd->device_free_chan_resources = pl330_free_chan_resources;
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 5099681cf503..e3380137b05b 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -141,6 +141,12 @@ config GPIO_PL061
         help
           Say yes here to support the PrimeCell PL061 GPIO device
 
+config GPIO_PXA
+        bool "PXA GPIO support"
+        depends on ARCH_PXA || ARCH_MMP
+        help
+          Say yes here to support the PXA GPIO device
+
 config GPIO_XILINX
         bool "Xilinx GPIO support"
         depends on PPC_OF || MICROBLAZE
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 4e018d6a7639..8ef9e9abe970 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -40,7 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X)	+= gpio-pca953x.o
 obj-$(CONFIG_GPIO_PCF857X)      += gpio-pcf857x.o
 obj-$(CONFIG_GPIO_PCH)          += gpio-pch.o
 obj-$(CONFIG_GPIO_PL061)        += gpio-pl061.o
-obj-$(CONFIG_PLAT_PXA)          += gpio-pxa.o
+obj-$(CONFIG_GPIO_PXA)          += gpio-pxa.o
 obj-$(CONFIG_GPIO_RDC321X)      += gpio-rdc321x.o
 obj-$(CONFIG_PLAT_SAMSUNG)      += gpio-samsung.o
 obj-$(CONFIG_ARCH_SA1100)       += gpio-sa1100.o
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index ee137712f9db..b2d3ee1d183a 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -11,14 +11,46 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
+#include <linux/clk.h>
+#include <linux/err.h>
 #include <linux/gpio.h>
+#include <linux/gpio-pxa.h>
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
 #include <linux/syscore_ops.h>
 #include <linux/slab.h>
 
-#include <mach/gpio-pxa.h>
+/*
+ * We handle the GPIOs by banks, each bank covers up to 32 GPIOs with
+ * one set of registers. The register offsets are organized below:
+ *
+ *           GPLR    GPDR    GPSR    GPCR    GRER    GFER    GEDR
+ * BANK 0 - 0x0000  0x000C  0x0018  0x0024  0x0030  0x003C  0x0048
+ * BANK 1 - 0x0004  0x0010  0x001C  0x0028  0x0034  0x0040  0x004C
+ * BANK 2 - 0x0008  0x0014  0x0020  0x002C  0x0038  0x0044  0x0050
+ *
+ * BANK 3 - 0x0100  0x010C  0x0118  0x0124  0x0130  0x013C  0x0148
+ * BANK 4 - 0x0104  0x0110  0x011C  0x0128  0x0134  0x0140  0x014C
+ * BANK 5 - 0x0108  0x0114  0x0120  0x012C  0x0138  0x0144  0x0150
+ *
+ * NOTE:
+ *   BANK 3 is only available on PXA27x and later processors.
+ *   BANK 4 and 5 are only available on PXA935
+ */
+
+#define GPLR_OFFSET     0x00
+#define GPDR_OFFSET     0x0C
+#define GPSR_OFFSET     0x18
+#define GPCR_OFFSET     0x24
+#define GRER_OFFSET     0x30
+#define GFER_OFFSET     0x3C
+#define GEDR_OFFSET     0x48
+#define GAFR_OFFSET     0x54
+#define ED_MASK_OFFSET  0x9C    /* GPIO edge detection for AP side */
+
+#define BANK_OFF(n)     (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
 
 int pxa_last_gpio;
 
@@ -39,8 +71,20 @@ struct pxa_gpio_chip {
 #endif
 };
 
+enum {
+        PXA25X_GPIO = 0,
+        PXA26X_GPIO,
+        PXA27X_GPIO,
+        PXA3XX_GPIO,
+        PXA93X_GPIO,
+        MMP_GPIO = 0x10,
+        MMP2_GPIO,
+};
+
 static DEFINE_SPINLOCK(gpio_lock);
 static struct pxa_gpio_chip *pxa_gpio_chips;
+static int gpio_type;
+static void __iomem *gpio_reg_base;
 
 #define for_each_gpio_chip(i, c)                        \
         for (i = 0, c = &pxa_gpio_chips[0]; i <= pxa_last_gpio; i += 32, c++)
@@ -55,6 +99,122 @@ static inline struct pxa_gpio_chip *gpio_to_pxachip(unsigned gpio)
         return &pxa_gpio_chips[gpio_to_bank(gpio)];
 }
 
+static inline int gpio_is_pxa_type(int type)
+{
+        return (type & MMP_GPIO) == 0;
+}
+
+static inline int gpio_is_mmp_type(int type)
+{
+        return (type & MMP_GPIO) != 0;
+}
+
+/* GPIO86/87/88/89 on PXA26x have their direction bits in PXA_GPDR(2 inverted,
+ * as well as their Alternate Function value being '1' for GPIO in GAFRx.
+ */
+static inline int __gpio_is_inverted(int gpio)
+{
+        if ((gpio_type == PXA26X_GPIO) && (gpio > 85))
+                return 1;
+        return 0;
+}
+
+/*
+ * On PXA25x and PXA27x, GAFRx and GPDRx together decide the alternate
+ * function of a GPIO, and GPDRx cannot be altered once configured. It
+ * is attributed as "occupied" here (I know this terminology isn't
+ * accurate, you are welcome to propose a better one :-)
+ */
+static inline int __gpio_is_occupied(unsigned gpio)
+{
+        struct pxa_gpio_chip *pxachip;
+        void __iomem *base;
+        unsigned long gafr = 0, gpdr = 0;
+        int ret, af = 0, dir = 0;
+
+        pxachip = gpio_to_pxachip(gpio);
+        base = gpio_chip_base(&pxachip->chip);
+        gpdr = readl_relaxed(base + GPDR_OFFSET);
+
+        switch (gpio_type) {
+        case PXA25X_GPIO:
+        case PXA26X_GPIO:
+        case PXA27X_GPIO:
+                gafr = readl_relaxed(base + GAFR_OFFSET);
+                af = (gafr >> ((gpio & 0xf) * 2)) & 0x3;
+                dir = gpdr & GPIO_bit(gpio);
+
+                if (__gpio_is_inverted(gpio))
+                        ret = (af != 1) || (dir == 0);
+                else
+                        ret = (af != 0) || (dir != 0);
+                break;
+        default:
+                ret = gpdr & GPIO_bit(gpio);
+                break;
+        }
+        return ret;
+}
+
+#ifdef CONFIG_ARCH_PXA
+static inline int __pxa_gpio_to_irq(int gpio)
+{
+        if (gpio_is_pxa_type(gpio_type))
+                return PXA_GPIO_TO_IRQ(gpio);
+        return -1;
+}
+
+static inline int __pxa_irq_to_gpio(int irq)
+{
+        if (gpio_is_pxa_type(gpio_type))
+                return irq - PXA_GPIO_TO_IRQ(0);
+        return -1;
+}
+#else
+static inline int __pxa_gpio_to_irq(int gpio) { return -1; }
+static inline int __pxa_irq_to_gpio(int irq) { return -1; }
+#endif
+
+#ifdef CONFIG_ARCH_MMP
+static inline int __mmp_gpio_to_irq(int gpio)
+{
+        if (gpio_is_mmp_type(gpio_type))
+                return MMP_GPIO_TO_IRQ(gpio);
+        return -1;
+}
+
+static inline int __mmp_irq_to_gpio(int irq)
+{
+        if (gpio_is_mmp_type(gpio_type))
+                return irq - MMP_GPIO_TO_IRQ(0);
+        return -1;
+}
+#else
+static inline int __mmp_gpio_to_irq(int gpio) { return -1; }
+static inline int __mmp_irq_to_gpio(int irq) { return -1; }
+#endif
+
+static int pxa_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+        int gpio, ret;
+
+        gpio = chip->base + offset;
+        ret = __pxa_gpio_to_irq(gpio);
+        if (ret >= 0)
+                return ret;
+        return __mmp_gpio_to_irq(gpio);
+}
+
+int pxa_irq_to_gpio(int irq)
+{
+        int ret;
+
+        ret = __pxa_irq_to_gpio(irq);
+        if (ret >= 0)
+                return ret;
+        return __mmp_irq_to_gpio(irq);
+}
+
 static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
         void __iomem *base = gpio_chip_base(chip);
@@ -63,12 +223,12 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        value = __raw_readl(base + GPDR_OFFSET);
+        value = readl_relaxed(base + GPDR_OFFSET);
         if (__gpio_is_inverted(chip->base + offset))
                 value |= mask;
         else
                 value &= ~mask;
-        __raw_writel(value, base + GPDR_OFFSET);
+        writel_relaxed(value, base + GPDR_OFFSET);
 
         spin_unlock_irqrestore(&gpio_lock, flags);
         return 0;
@@ -81,16 +241,16 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
         uint32_t tmp, mask = 1 << offset;
         unsigned long flags;
 
-        __raw_writel(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
+        writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
 
         spin_lock_irqsave(&gpio_lock, flags);
 
-        tmp = __raw_readl(base + GPDR_OFFSET);
+        tmp = readl_relaxed(base + GPDR_OFFSET);
         if (__gpio_is_inverted(chip->base + offset))
                 tmp &= ~mask;
         else
                 tmp |= mask;
-        __raw_writel(tmp, base + GPDR_OFFSET);
+        writel_relaxed(tmp, base + GPDR_OFFSET);
 
         spin_unlock_irqrestore(&gpio_lock, flags);
         return 0;
@@ -98,16 +258,16 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
 
 static int pxa_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-        return __raw_readl(gpio_chip_base(chip) + GPLR_OFFSET) & (1 << offset);
+        return readl_relaxed(gpio_chip_base(chip) + GPLR_OFFSET) & (1 << offset);
 }
 
 static void pxa_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-        __raw_writel(1 << offset, gpio_chip_base(chip) +
+        writel_relaxed(1 << offset, gpio_chip_base(chip) +
                                 (value ? GPSR_OFFSET : GPCR_OFFSET));
 }
 
-static int __init pxa_init_gpio_chip(int gpio_end)
+static int __devinit pxa_init_gpio_chip(int gpio_end)
 {
         int i, gpio, nbanks = gpio_to_bank(gpio_end) + 1;
         struct pxa_gpio_chip *chips;
@@ -122,7 +282,7 @@ static int __init pxa_init_gpio_chip(int gpio_end)
                 struct gpio_chip *c = &chips[i].chip;
 
                 sprintf(chips[i].label, "gpio-%d", i);
-                chips[i].regbase = GPIO_BANK(i);
+                chips[i].regbase = gpio_reg_base + BANK_OFF(i);
 
                 c->base  = gpio;
                 c->label = chips[i].label;
@@ -131,6 +291,7 @@ static int __init pxa_init_gpio_chip(int gpio_end)
                 c->direction_output = pxa_gpio_direction_output;
                 c->get = pxa_gpio_get;
                 c->set = pxa_gpio_set;
+                c->to_irq = pxa_gpio_to_irq;
 
                 /* number of GPIOs on last bank may be less than 32 */
                 c->ngpio = (gpio + 31 > gpio_end) ? (gpio_end - gpio + 1) : 32;
@@ -147,18 +308,18 @@ static inline void update_edge_detect(struct pxa_gpio_chip *c)
 {
         uint32_t grer, gfer;
 
-        grer = __raw_readl(c->regbase + GRER_OFFSET) & ~c->irq_mask;
-        gfer = __raw_readl(c->regbase + GFER_OFFSET) & ~c->irq_mask;
+        grer = readl_relaxed(c->regbase + GRER_OFFSET) & ~c->irq_mask;
+        gfer = readl_relaxed(c->regbase + GFER_OFFSET) & ~c->irq_mask;
         grer |= c->irq_edge_rise & c->irq_mask;
         gfer |= c->irq_edge_fall & c->irq_mask;
-        __raw_writel(grer, c->regbase + GRER_OFFSET);
-        __raw_writel(gfer, c->regbase + GFER_OFFSET);
+        writel_relaxed(grer, c->regbase + GRER_OFFSET);
+        writel_relaxed(gfer, c->regbase + GFER_OFFSET);
 }
 
 static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)
 {
         struct pxa_gpio_chip *c;
-        int gpio = irq_to_gpio(d->irq);
+        int gpio = pxa_irq_to_gpio(d->irq);
         unsigned long gpdr, mask = GPIO_bit(gpio);
 
         c = gpio_to_pxachip(gpio);
@@ -176,12 +337,12 @@ static int pxa_gpio_irq_type(struct irq_data *d, unsigned int type)
                 type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
         }
 
-        gpdr = __raw_readl(c->regbase + GPDR_OFFSET);
+        gpdr = readl_relaxed(c->regbase + GPDR_OFFSET);
 
         if (__gpio_is_inverted(gpio))
-                __raw_writel(gpdr | mask,  c->regbase + GPDR_OFFSET);
+                writel_relaxed(gpdr | mask,  c->regbase + GPDR_OFFSET);
         else
-                __raw_writel(gpdr & ~mask, c->regbase + GPDR_OFFSET);
+                writel_relaxed(gpdr & ~mask, c->regbase + GPDR_OFFSET);
 
         if (type & IRQ_TYPE_EDGE_RISING)
                 c->irq_edge_rise |= mask;
@@ -212,9 +373,9 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
                 for_each_gpio_chip(gpio, c) {
                         gpio_base = c->chip.base;
 
-                        gedr = __raw_readl(c->regbase + GEDR_OFFSET);
+                        gedr = readl_relaxed(c->regbase + GEDR_OFFSET);
                         gedr = gedr & c->irq_mask;
-                        __raw_writel(gedr, c->regbase + GEDR_OFFSET);
+                        writel_relaxed(gedr, c->regbase + GEDR_OFFSET);
 
                         n = find_first_bit(&gedr, BITS_PER_LONG);
                         while (n < BITS_PER_LONG) {
@@ -229,29 +390,29 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
 
 static void pxa_ack_muxed_gpio(struct irq_data *d)
 {
-        int gpio = irq_to_gpio(d->irq);
+        int gpio = pxa_irq_to_gpio(d->irq);
         struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
 
-        __raw_writel(GPIO_bit(gpio), c->regbase + GEDR_OFFSET);
+        writel_relaxed(GPIO_bit(gpio), c->regbase + GEDR_OFFSET);
 }
 
 static void pxa_mask_muxed_gpio(struct irq_data *d)
 {
-        int gpio = irq_to_gpio(d->irq);
+        int gpio = pxa_irq_to_gpio(d->irq);
         struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
         uint32_t grer, gfer;
 
         c->irq_mask &= ~GPIO_bit(gpio);
 
-        grer = __raw_readl(c->regbase + GRER_OFFSET) & ~GPIO_bit(gpio);
-        gfer = __raw_readl(c->regbase + GFER_OFFSET) & ~GPIO_bit(gpio);
-        __raw_writel(grer, c->regbase + GRER_OFFSET);
-        __raw_writel(gfer, c->regbase + GFER_OFFSET);
+        grer = readl_relaxed(c->regbase + GRER_OFFSET) & ~GPIO_bit(gpio);
+        gfer = readl_relaxed(c->regbase + GFER_OFFSET) & ~GPIO_bit(gpio);
+        writel_relaxed(grer, c->regbase + GRER_OFFSET);
+        writel_relaxed(gfer, c->regbase + GFER_OFFSET);
 }
 
 static void pxa_unmask_muxed_gpio(struct irq_data *d)
 {
-        int gpio = irq_to_gpio(d->irq);
+        int gpio = pxa_irq_to_gpio(d->irq);
         struct pxa_gpio_chip *c = gpio_to_pxachip(gpio);
 
         c->irq_mask |= GPIO_bit(gpio);
@@ -266,34 +427,143 @@ static struct irq_chip pxa_muxed_gpio_chip = {
         .irq_set_type   = pxa_gpio_irq_type,
 };
 
-void __init pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn)
+static int pxa_gpio_nums(void)
 {
-        struct pxa_gpio_chip *c;
-        int gpio, irq;
+        int count = 0;
+
+#ifdef CONFIG_ARCH_PXA
+        if (cpu_is_pxa25x()) {
+#ifdef CONFIG_CPU_PXA26x
+                count = 89;
+                gpio_type = PXA26X_GPIO;
+#elif defined(CONFIG_PXA25x)
+                count = 84;
+                gpio_type = PXA26X_GPIO;
+#endif /* CONFIG_CPU_PXA26x */
+        } else if (cpu_is_pxa27x()) {
+                count = 120;
+                gpio_type = PXA27X_GPIO;
+        } else if (cpu_is_pxa93x() || cpu_is_pxa95x()) {
+                count = 191;
+                gpio_type = PXA93X_GPIO;
+        } else if (cpu_is_pxa3xx()) {
+                count = 127;
+                gpio_type = PXA3XX_GPIO;
+        }
+#endif /* CONFIG_ARCH_PXA */
+
+#ifdef CONFIG_ARCH_MMP
+        if (cpu_is_pxa168() || cpu_is_pxa910()) {
+                count = 127;
+                gpio_type = MMP_GPIO;
+        } else if (cpu_is_mmp2()) {
+                count = 191;
+                gpio_type = MMP2_GPIO;
+        }
+#endif /* CONFIG_ARCH_MMP */
+        return count;
+}
 
-        pxa_last_gpio = end;
+static int __devinit pxa_gpio_probe(struct platform_device *pdev)
+{
+        struct pxa_gpio_chip *c;
+        struct resource *res;
+        struct clk *clk;
+        int gpio, irq, ret;
+        int irq0 = 0, irq1 = 0, irq_mux, gpio_offset = 0;
+
+        pxa_last_gpio = pxa_gpio_nums();
+        if (!pxa_last_gpio)
+                return -EINVAL;
+
+        irq0 = platform_get_irq_byname(pdev, "gpio0");
+        irq1 = platform_get_irq_byname(pdev, "gpio1");
+        irq_mux = platform_get_irq_byname(pdev, "gpio_mux");
+        if ((irq0 > 0 && irq1 <= 0) || (irq0 <= 0 && irq1 > 0)
+                || (irq_mux <= 0))
+                return -EINVAL;
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -EINVAL;
+        gpio_reg_base = ioremap(res->start, resource_size(res));
+        if (!gpio_reg_base)
+                return -EINVAL;
+
+        if (irq0 > 0)
+                gpio_offset = 2;
+
+        clk = clk_get(&pdev->dev, NULL);
+        if (IS_ERR(clk)) {
+                dev_err(&pdev->dev, "Error %ld to get gpio clock\n",
+                        PTR_ERR(clk));
+                iounmap(gpio_reg_base);
+                return PTR_ERR(clk);
+        }
+        ret = clk_prepare(clk);
+        if (ret) {
+                clk_put(clk);
+                iounmap(gpio_reg_base);
+                return ret;
+        }
+        ret = clk_enable(clk);
+        if (ret) {
+                clk_unprepare(clk);
+                clk_put(clk);
+                iounmap(gpio_reg_base);
+                return ret;
+        }
 
         /* Initialize GPIO chips */
-        pxa_init_gpio_chip(end);
+        pxa_init_gpio_chip(pxa_last_gpio);
 
         /* clear all GPIO edge detects */
         for_each_gpio_chip(gpio, c) {
-                __raw_writel(0, c->regbase + GFER_OFFSET);
-                __raw_writel(0, c->regbase + GRER_OFFSET);
-                __raw_writel(~0,c->regbase + GEDR_OFFSET);
+                writel_relaxed(0, c->regbase + GFER_OFFSET);
+                writel_relaxed(0, c->regbase + GRER_OFFSET);
+                writel_relaxed(~0,c->regbase + GEDR_OFFSET);
+                /* unmask GPIO edge detect for AP side */
+                if (gpio_is_mmp_type(gpio_type))
+                        writel_relaxed(~0, c->regbase + ED_MASK_OFFSET);
         }
 
-        for (irq  = gpio_to_irq(start); irq <= gpio_to_irq(end); irq++) {
+#ifdef CONFIG_ARCH_PXA
+        irq = gpio_to_irq(0);
+        irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
+                                 handle_edge_irq);
+        set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+        irq_set_chained_handler(IRQ_GPIO0, pxa_gpio_demux_handler);
+
+        irq = gpio_to_irq(1);
+        irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
+                                 handle_edge_irq);
+        set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+        irq_set_chained_handler(IRQ_GPIO1, pxa_gpio_demux_handler);
+#endif
+
+        for (irq  = gpio_to_irq(gpio_offset);
+                irq <= gpio_to_irq(pxa_last_gpio); irq++) {
                 irq_set_chip_and_handler(irq, &pxa_muxed_gpio_chip,
                                          handle_edge_irq);
                 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
         }
 
-        /* Install handler for GPIO>=2 edge detect interrupts */
-        irq_set_chained_handler(mux_irq, pxa_gpio_demux_handler);
-        pxa_muxed_gpio_chip.irq_set_wake = fn;
+        irq_set_chained_handler(irq_mux, pxa_gpio_demux_handler);
+        return 0;
 }
 
+static struct platform_driver pxa_gpio_driver = {
+        .probe          = pxa_gpio_probe,
+        .driver         = {
+                .name   = "pxa-gpio",
+        },
+};
+
+static int __init pxa_gpio_init(void)
+{
+        return platform_driver_register(&pxa_gpio_driver);
+}
+postcore_initcall(pxa_gpio_init);
+
 #ifdef CONFIG_PM
 static int pxa_gpio_suspend(void)
 {
@@ -301,13 +571,13 @@ static int pxa_gpio_suspend(void)
         int gpio;
 
         for_each_gpio_chip(gpio, c) {
-                c->saved_gplr = __raw_readl(c->regbase + GPLR_OFFSET);
-                c->saved_gpdr = __raw_readl(c->regbase + GPDR_OFFSET);
-                c->saved_grer = __raw_readl(c->regbase + GRER_OFFSET);
-                c->saved_gfer = __raw_readl(c->regbase + GFER_OFFSET);
+                c->saved_gplr = readl_relaxed(c->regbase + GPLR_OFFSET);
+                c->saved_gpdr = readl_relaxed(c->regbase + GPDR_OFFSET);
+                c->saved_grer = readl_relaxed(c->regbase + GRER_OFFSET);
+                c->saved_gfer = readl_relaxed(c->regbase + GFER_OFFSET);
 
                 /* Clear GPIO transition detect bits */
-                __raw_writel(0xffffffff, c->regbase + GEDR_OFFSET);
+                writel_relaxed(0xffffffff, c->regbase + GEDR_OFFSET);
         }
         return 0;
 }
@@ -319,12 +589,12 @@ static void pxa_gpio_resume(void)
 
         for_each_gpio_chip(gpio, c) {
                 /* restore level with set/clear */
-                __raw_writel( c->saved_gplr, c->regbase + GPSR_OFFSET);
-                __raw_writel(~c->saved_gplr, c->regbase + GPCR_OFFSET);
+                writel_relaxed( c->saved_gplr, c->regbase + GPSR_OFFSET);
+                writel_relaxed(~c->saved_gplr, c->regbase + GPCR_OFFSET);
 
-                __raw_writel(c->saved_grer, c->regbase + GRER_OFFSET);
-                __raw_writel(c->saved_gfer, c->regbase + GFER_OFFSET);
-                __raw_writel(c->saved_gpdr, c->regbase + GPDR_OFFSET);
+                writel_relaxed(c->saved_grer, c->regbase + GRER_OFFSET);
+                writel_relaxed(c->saved_gfer, c->regbase + GFER_OFFSET);
+                writel_relaxed(c->saved_gpdr, c->regbase + GPDR_OFFSET);
         }
 }
 #else
@@ -336,3 +606,10 @@ struct syscore_ops pxa_gpio_syscore_ops = {
         .suspend        = pxa_gpio_suspend,
         .resume         = pxa_gpio_resume,
 };
+
+static int __init pxa_gpio_sysinit(void)
+{
+        register_syscore_ops(&pxa_gpio_syscore_ops);
+        return 0;
+}
+postcore_initcall(pxa_gpio_sysinit);
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index ab098ba9f1dd..a7661773c052 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -24,6 +24,9 @@
 #include <linux/interrupt.h>
 #include <linux/device.h>
 #include <linux/ioport.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/of_address.h>
 
 #include <asm/irq.h>
 
@@ -2383,6 +2386,63 @@ static struct samsung_gpio_chip exynos4_gpios_3[] = {
 #endif
 };
 
+#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)
+{
+        const __be32 *gpio = gpio_spec;
+        const u32 n = be32_to_cpup(gpio);
+        unsigned int pin = gc->base + be32_to_cpu(gpio[0]);
+
+        if (WARN_ON(gc->of_gpio_n_cells < 4))
+                return -EINVAL;
+
+        if (n > gc->ngpio)
+                return -EINVAL;
+
+        if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(be32_to_cpu(gpio[1]))))
+                pr_warn("gpio_xlate: failed to set pin function\n");
+        if (s3c_gpio_setpull(pin, be32_to_cpu(gpio[2])))
+                pr_warn("gpio_xlate: failed to set pin pull up/down\n");
+        if (s5p_gpio_set_drvstr(pin, be32_to_cpu(gpio[3])))
+                pr_warn("gpio_xlate: failed to set pin drive strength\n");
+
+        return n;
+}
+
+static const struct of_device_id exynos4_gpio_dt_match[] __initdata = {
+        { .compatible = "samsung,exynos4-gpio", },
+        {}
+};
+
+static __init void exynos4_gpiolib_attach_ofnode(struct samsung_gpio_chip *chip,
+                                                 u64 base, u64 offset)
+{
+        struct gpio_chip *gc =  &chip->chip;
+        u64 address;
+
+        if (!of_have_populated_dt())
+                return;
+
+        address = chip->base ? base + ((u32)chip->base & 0xfff) : base + offset;
+        gc->of_node = of_find_matching_node_by_address(NULL,
+                        exynos4_gpio_dt_match, address);
+        if (!gc->of_node) {
+                pr_info("gpio: device tree node not found for gpio controller"
+                        " with base address %08llx\n", address);
+                return;
+        }
+        gc->of_gpio_n_cells = 4;
+        gc->of_xlate = exynos4_gpio_xlate;
+}
+#elif defined(CONFIG_ARCH_EXYNOS4)
+static __init void exynos4_gpiolib_attach_ofnode(struct samsung_gpio_chip *chip,
+                                                 u64 base, u64 offset)
+{
+        return;
+}
+#endif /* defined(CONFIG_ARCH_EXYNOS4) && defined(CONFIG_OF) */
+
 /* TODO: cleanup soc_is_* */
 static __init int samsung_gpiolib_init(void)
 {
@@ -2464,6 +2524,10 @@ static __init int samsung_gpiolib_init(void)
                                 chip->config = &exynos4_gpio_cfg;
                                 chip->group = group++;
                         }
+#ifdef CONFIG_CPU_EXYNOS4210
+                        exynos4_gpiolib_attach_ofnode(chip,
+                                        EXYNOS4_PA_GPIO1, i * 0x20);
+#endif
                 }
                 samsung_gpiolib_add_4bit_chips(exynos4_gpios_1, nr_chips, S5P_VA_GPIO1);
 
@@ -2476,6 +2540,10 @@ static __init int samsung_gpiolib_init(void)
                                 chip->config = &exynos4_gpio_cfg;
                                 chip->group = group++;
                         }
+#ifdef CONFIG_CPU_EXYNOS4210
+                        exynos4_gpiolib_attach_ofnode(chip,
+                                        EXYNOS4_PA_GPIO2, i * 0x20);
+#endif
                 }
                 samsung_gpiolib_add_4bit_chips(exynos4_gpios_2, nr_chips, S5P_VA_GPIO2);
 
@@ -2488,6 +2556,10 @@ static __init int samsung_gpiolib_init(void)
                                 chip->config = &exynos4_gpio_cfg;
                                 chip->group = group++;
                         }
+#ifdef CONFIG_CPU_EXYNOS4210
+                        exynos4_gpiolib_attach_ofnode(chip,
+                                        EXYNOS4_PA_GPIO3, i * 0x20);
+#endif
                 }
                 samsung_gpiolib_add_4bit_chips(exynos4_gpios_3, nr_chips, S5P_VA_GPIO3);
 
diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
index 89f52440fcf4..0e8343f585bb 100644
--- a/drivers/hv/hv_kvp.c
+++ b/drivers/hv/hv_kvp.c
@@ -212,11 +212,13 @@ kvp_respond_to_host(char *key, char *value, int error)
          * The windows host expects the key/value pair to be encoded
          * in utf16.
          */
-        keylen = utf8s_to_utf16s(key_name, strlen(key_name),
-                                (wchar_t *)kvp_data->data.key);
+        keylen = utf8s_to_utf16s(key_name, strlen(key_name), UTF16_HOST_ENDIAN,
+                                (wchar_t *) kvp_data->data.key,
+                                HV_KVP_EXCHANGE_MAX_KEY_SIZE / 2);
         kvp_data->data.key_size = 2*(keylen + 1); /* utf16 encoding */
-        valuelen = utf8s_to_utf16s(value, strlen(value),
-                                (wchar_t *)kvp_data->data.value);
+        valuelen = utf8s_to_utf16s(value, strlen(value), UTF16_HOST_ENDIAN,
+                                (wchar_t *) kvp_data->data.value,
+                                HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2);
         kvp_data->data.value_size = 2*(valuelen + 1); /* utf16 encoding */
 
         kvp_data->data.value_type = REG_SZ; /* all our values are strings */
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 46b6500c5478..6381604696d3 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -558,7 +558,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {
         .functionality  = tegra_i2c_func,
 };
 
-static int tegra_i2c_probe(struct platform_device *pdev)
+static int __devinit tegra_i2c_probe(struct platform_device *pdev)
 {
         struct tegra_i2c_dev *i2c_dev;
         struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data;
@@ -636,7 +636,10 @@ static int tegra_i2c_probe(struct platform_device *pdev)
                         i2c_dev->bus_clk_rate = be32_to_cpup(prop);
         }
 
-        if (pdev->id == 3)
+        if (pdev->dev.of_node)
+                i2c_dev->is_dvc = of_device_is_compatible(pdev->dev.of_node,
+                                                "nvidia,tegra20-i2c-dvc");
+        else if (pdev->id == 3)
                 i2c_dev->is_dvc = 1;
         init_completion(&i2c_dev->msg_complete);
 
@@ -690,7 +693,7 @@ err_iounmap:
         return ret;
 }
 
-static int tegra_i2c_remove(struct platform_device *pdev)
+static int __devexit tegra_i2c_remove(struct platform_device *pdev)
 {
         struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
         i2c_del_adapter(&i2c_dev->adapter);
@@ -742,6 +745,7 @@ static int tegra_i2c_resume(struct platform_device *pdev)
 /* Match table for of_platform binding */
 static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {
         { .compatible = "nvidia,tegra20-i2c", },
+        { .compatible = "nvidia,tegra20-i2c-dvc", },
         {},
 };
 MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 6dede8f366c5..41d415529479 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -314,7 +314,7 @@ static int __init at91_ide_probe(struct platform_device *pdev)
         apply_timings(board->chipselect, 0, ide_timing_find_mode(XFER_PIO_0), 0);
 
         /* with GPIO interrupt we have to do quirks in handler */
-        if (board->irq_pin >= PIN_BASE)
+        if (gpio_is_valid(board->irq_pin))
                 host->irq_handler = at91_irq_handler;
 
         host->ports[0]->select_data = board->chipselect;
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index f689f49e3109..8a0060cd3982 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -21,6 +21,8 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/sched.h>
 #include <plat/keypad.h>
 
@@ -68,31 +70,26 @@ struct samsung_keypad {
         wait_queue_head_t wait;
         bool stopped;
         int irq;
+        enum samsung_keypad_type type;
         unsigned int row_shift;
         unsigned int rows;
         unsigned int cols;
         unsigned int row_state[SAMSUNG_MAX_COLS];
+#ifdef CONFIG_OF
+        int row_gpios[SAMSUNG_MAX_ROWS];
+        int col_gpios[SAMSUNG_MAX_COLS];
+#endif
         unsigned short keycodes[];
 };
 
-static int samsung_keypad_is_s5pv210(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        enum samsung_keypad_type type =
-                platform_get_device_id(pdev)->driver_data;
-
-        return type == KEYPAD_TYPE_S5PV210;
-}
-
 static void samsung_keypad_scan(struct samsung_keypad *keypad,
                                 unsigned int *row_state)
 {
-        struct device *dev = keypad->input_dev->dev.parent;
         unsigned int col;
         unsigned int val;
 
         for (col = 0; col < keypad->cols; col++) {
-                if (samsung_keypad_is_s5pv210(dev)) {
+                if (keypad->type == KEYPAD_TYPE_S5PV210) {
                         val = S5PV210_KEYIFCOLEN_MASK;
                         val &= ~(1 << col) << 8;
                 } else {
@@ -235,6 +232,126 @@ static void samsung_keypad_close(struct input_dev *input_dev)
         samsung_keypad_stop(keypad);
 }
 
+#ifdef CONFIG_OF
+static struct samsung_keypad_platdata *samsung_keypad_parse_dt(
+                                struct device *dev)
+{
+        struct samsung_keypad_platdata *pdata;
+        struct matrix_keymap_data *keymap_data;
+        uint32_t *keymap, num_rows = 0, num_cols = 0;
+        struct device_node *np = dev->of_node, *key_np;
+        unsigned int key_count = 0;
+
+        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata) {
+                dev_err(dev, "could not allocate memory for platform data\n");
+                return NULL;
+        }
+
+        of_property_read_u32(np, "samsung,keypad-num-rows", &num_rows);
+        of_property_read_u32(np, "samsung,keypad-num-columns", &num_cols);
+        if (!num_rows || !num_cols) {
+                dev_err(dev, "number of keypad rows/columns not specified\n");
+                return NULL;
+        }
+        pdata->rows = num_rows;
+        pdata->cols = num_cols;
+
+        keymap_data = devm_kzalloc(dev, sizeof(*keymap_data), GFP_KERNEL);
+        if (!keymap_data) {
+                dev_err(dev, "could not allocate memory for keymap data\n");
+                return NULL;
+        }
+        pdata->keymap_data = keymap_data;
+
+        for_each_child_of_node(np, key_np)
+                key_count++;
+
+        keymap_data->keymap_size = key_count;
+        keymap = devm_kzalloc(dev, sizeof(uint32_t) * key_count, GFP_KERNEL);
+        if (!keymap) {
+                dev_err(dev, "could not allocate memory for keymap\n");
+                return NULL;
+        }
+        keymap_data->keymap = keymap;
+
+        for_each_child_of_node(np, key_np) {
+                u32 row, col, key_code;
+                of_property_read_u32(key_np, "keypad,row", &row);
+                of_property_read_u32(key_np, "keypad,column", &col);
+                of_property_read_u32(key_np, "linux,code", &key_code);
+                *keymap++ = KEY(row, col, key_code);
+        }
+
+        if (of_get_property(np, "linux,input-no-autorepeat", NULL))
+                pdata->no_autorepeat = true;
+        if (of_get_property(np, "linux,input-wakeup", NULL))
+                pdata->wakeup = true;
+
+        return pdata;
+}
+
+static void samsung_keypad_parse_dt_gpio(struct device *dev,
+                                struct samsung_keypad *keypad)
+{
+        struct device_node *np = dev->of_node;
+        int gpio, ret, row, col;
+
+        for (row = 0; row < keypad->rows; row++) {
+                gpio = of_get_named_gpio(np, "row-gpios", row);
+                keypad->row_gpios[row] = gpio;
+                if (!gpio_is_valid(gpio)) {
+                        dev_err(dev, "keypad row[%d]: invalid gpio %d\n",
+                                        row, gpio);
+                        continue;
+                }
+
+                ret = gpio_request(gpio, "keypad-row");
+                if (ret)
+                        dev_err(dev, "keypad row[%d] gpio request failed\n",
+                                        row);
+        }
+
+        for (col = 0; col < keypad->cols; col++) {
+                gpio = of_get_named_gpio(np, "col-gpios", col);
+                keypad->col_gpios[col] = gpio;
+                if (!gpio_is_valid(gpio)) {
+                        dev_err(dev, "keypad column[%d]: invalid gpio %d\n",
+                                        col, gpio);
+                        continue;
+                }
+
+                ret = gpio_request(gpio, "keypad-col");
+                if (ret)
+                        dev_err(dev, "keypad column[%d] gpio request failed\n",
+                                        col);
+        }
+}
+
+static void samsung_keypad_dt_gpio_free(struct samsung_keypad *keypad)
+{
+        int cnt;
+
+        for (cnt = 0; cnt < keypad->rows; cnt++)
+                if (gpio_is_valid(keypad->row_gpios[cnt]))
+                        gpio_free(keypad->row_gpios[cnt]);
+
+        for (cnt = 0; cnt < keypad->cols; cnt++)
+                if (gpio_is_valid(keypad->col_gpios[cnt]))
+                        gpio_free(keypad->col_gpios[cnt]);
+}
+#else
+static
+struct samsung_keypad_platdata *samsung_keypad_parse_dt(struct device *dev)
+{
+        return NULL;
+}
+
+static void samsung_keypad_dt_gpio_free(struct samsung_keypad *keypad)
+{
+}
+#endif
+
 static int __devinit samsung_keypad_probe(struct platform_device *pdev)
 {
         const struct samsung_keypad_platdata *pdata;
@@ -246,7 +363,10 @@ static int __devinit samsung_keypad_probe(struct platform_device *pdev)
         unsigned int keymap_size;
         int error;
 
-        pdata = pdev->dev.platform_data;
+        if (pdev->dev.of_node)
+                pdata = samsung_keypad_parse_dt(&pdev->dev);
+        else
+                pdata = pdev->dev.platform_data;
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data defined\n");
                 return -EINVAL;
@@ -303,6 +423,16 @@ static int __devinit samsung_keypad_probe(struct platform_device *pdev)
         keypad->cols = pdata->cols;
         init_waitqueue_head(&keypad->wait);
 
+        if (pdev->dev.of_node) {
+#ifdef CONFIG_OF
+                samsung_keypad_parse_dt_gpio(&pdev->dev, keypad);
+                keypad->type = of_device_is_compatible(pdev->dev.of_node,
+                                        "samsung,s5pv210-keypad");
+#endif
+        } else {
+                keypad->type = platform_get_device_id(pdev)->driver_data;
+        }
+
         input_dev->name = pdev->name;
         input_dev->id.bustype = BUS_HOST;
         input_dev->dev.parent = &pdev->dev;
@@ -343,12 +473,19 @@ static int __devinit samsung_keypad_probe(struct platform_device *pdev)
 
         device_init_wakeup(&pdev->dev, pdata->wakeup);
         platform_set_drvdata(pdev, keypad);
+
+        if (pdev->dev.of_node) {
+                devm_kfree(&pdev->dev, (void *)pdata->keymap_data->keymap);
+                devm_kfree(&pdev->dev, (void *)pdata->keymap_data);
+                devm_kfree(&pdev->dev, (void *)pdata);
+        }
         return 0;
 
 err_free_irq:
         free_irq(keypad->irq, keypad);
 err_put_clk:
         clk_put(keypad->clk);
+        samsung_keypad_dt_gpio_free(keypad);
 err_unmap_base:
         iounmap(keypad->base);
 err_free_mem:
@@ -374,6 +511,7 @@ static int __devexit samsung_keypad_remove(struct platform_device *pdev)
         free_irq(keypad->irq, keypad);
 
         clk_put(keypad->clk);
+        samsung_keypad_dt_gpio_free(keypad);
 
         iounmap(keypad->base);
         kfree(keypad);
@@ -447,6 +585,17 @@ static const struct dev_pm_ops samsung_keypad_pm_ops = {
 };
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id samsung_keypad_dt_match[] = {
+        { .compatible = "samsung,s3c6410-keypad" },
+        { .compatible = "samsung,s5pv210-keypad" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
+#else
+#define samsung_keypad_dt_match NULL
+#endif
+
 static struct platform_device_id samsung_keypad_driver_ids[] = {
         {
                 .name           = "samsung-keypad",
@@ -465,6 +614,7 @@ static struct platform_driver samsung_keypad_driver = {
         .driver         = {
                 .name   = "samsung-keypad",
                 .owner  = THIS_MODULE,
+                .of_match_table = samsung_keypad_dt_match,
 #ifdef CONFIG_PM
                 .pm     = &samsung_keypad_pm_ops,
 #endif
diff --git a/drivers/input/touchscreen/zylonite-wm97xx.c b/drivers/input/touchscreen/zylonite-wm97xx.c
index f6328c0cded6..0a707bbbbea6 100644
--- a/drivers/input/touchscreen/zylonite-wm97xx.c
+++ b/drivers/input/touchscreen/zylonite-wm97xx.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
@@ -192,8 +193,8 @@ static int zylonite_wm97xx_probe(struct platform_device *pdev)
         else
                 gpio_touch_irq = mfp_to_gpio(MFP_PIN_GPIO26);
 
-        wm->pen_irq = IRQ_GPIO(gpio_touch_irq);
-        irq_set_irq_type(IRQ_GPIO(gpio_touch_irq), IRQ_TYPE_EDGE_BOTH);
+        wm->pen_irq = gpio_to_irq(gpio_touch_irq);
+        irq_set_irq_type(wm->pen_irq, IRQ_TYPE_EDGE_BOTH);
 
         wm97xx_config_gpio(wm, WM97XX_GPIO_13, WM97XX_GPIO_IN,
                            WM97XX_GPIO_POL_HIGH,
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index 10550bd93b06..25036cb11bea 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -20,6 +20,7 @@
 #include <linux/videodev2.h>
 #include <mach/hardware.h>
 #include <mach/dm646x.h>
+#include <media/davinci/vpif_types.h>
 
 /* Maximum channel allowed */
 #define VPIF_NUM_CHANNELS               (4)
diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h
index 064550f5ce4a..a693d4ebda55 100644
--- a/drivers/media/video/davinci/vpif_capture.h
+++ b/drivers/media/video/davinci/vpif_capture.h
@@ -27,7 +27,7 @@
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf-dma-contig.h>
-#include <mach/dm646x.h>
+#include <media/davinci/vpif_types.h>
 
 #include "vpif.h"
 
diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h
index 5d1936dafed2..56879d1a0684 100644
--- a/drivers/media/video/davinci/vpif_display.h
+++ b/drivers/media/video/davinci/vpif_display.h
@@ -22,6 +22,7 @@
 #include <media/v4l2-device.h>
 #include <media/videobuf-core.h>
 #include <media/videobuf-dma-contig.h>
+#include <media/davinci/vpif_types.h>
 
 #include "vpif.h"
 
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index a25ab9c6b5af..af8e0efedbe4 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2102,14 +2102,11 @@ static struct irq_chip prcmu_irq_chip = {
 void __init db8500_prcmu_early_init(void)
 {
         unsigned int i;
-
-        if (cpu_is_u8500v1()) {
-                tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE_V1);
-        } else if (cpu_is_u8500v2()) {
+        if (cpu_is_u8500v2()) {
                 void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
 
                 if (tcpm_base != NULL) {
-                        int version;
+                        u32 version;
                         version = readl(tcpm_base + PRCMU_FW_VERSION_OFFSET);
                         prcmu_version.project_number = version & 0xFF;
                         prcmu_version.api_version = (version >> 8) & 0xFF;
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 86e14583a082..3f565ef3e149 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -27,8 +27,9 @@
 #include <linux/spinlock.h>
 #include <linux/gpio.h>
 #include <plat/usb.h>
+#include <linux/pm_runtime.h>
 
-#define USBHS_DRIVER_NAME       "usbhs-omap"
+#define USBHS_DRIVER_NAME       "usbhs_omap"
 #define OMAP_EHCI_DEVICE        "ehci-omap"
 #define OMAP_OHCI_DEVICE        "ohci-omap3"
 
@@ -147,9 +148,6 @@
 
 
 struct usbhs_hcd_omap {
-        struct clk                      *usbhost_ick;
-        struct clk                      *usbhost_hs_fck;
-        struct clk                      *usbhost_fs_fck;
         struct clk                      *xclk60mhsp1_ck;
         struct clk                      *xclk60mhsp2_ck;
         struct clk                      *utmi_p1_fck;
@@ -159,8 +157,7 @@ struct usbhs_hcd_omap {
         struct clk                      *usbhost_p2_fck;
         struct clk                      *usbtll_p2_fck;
         struct clk                      *init_60m_fclk;
-        struct clk                      *usbtll_fck;
-        struct clk                      *usbtll_ick;
+        struct clk                      *ehci_logic_fck;
 
         void __iomem                    *uhh_base;
         void __iomem                    *tll_base;
@@ -169,7 +166,6 @@ struct usbhs_hcd_omap {
 
         u32                             usbhs_rev;
         spinlock_t                      lock;
-        int                             count;
 };
 /*-------------------------------------------------------------------------*/
 
@@ -319,269 +315,6 @@ err_end:
         return ret;
 }
 
-/**
- * usbhs_omap_probe - initialize TI-based HCDs
- *
- * Allocates basic resources for this USB host controller.
- */
-static int __devinit usbhs_omap_probe(struct platform_device *pdev)
-{
-        struct device                   *dev =  &pdev->dev;
-        struct usbhs_omap_platform_data *pdata = dev->platform_data;
-        struct usbhs_hcd_omap           *omap;
-        struct resource                 *res;
-        int                             ret = 0;
-        int                             i;
-
-        if (!pdata) {
-                dev_err(dev, "Missing platform data\n");
-                ret = -ENOMEM;
-                goto end_probe;
-        }
-
-        omap = kzalloc(sizeof(*omap), GFP_KERNEL);
-        if (!omap) {
-                dev_err(dev, "Memory allocation failed\n");
-                ret = -ENOMEM;
-                goto end_probe;
-        }
-
-        spin_lock_init(&omap->lock);
-
-        for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
-                omap->platdata.port_mode[i] = pdata->port_mode[i];
-
-        omap->platdata.ehci_data = pdata->ehci_data;
-        omap->platdata.ohci_data = pdata->ohci_data;
-
-        omap->usbhost_ick = clk_get(dev, "usbhost_ick");
-        if (IS_ERR(omap->usbhost_ick)) {
-                ret =  PTR_ERR(omap->usbhost_ick);
-                dev_err(dev, "usbhost_ick failed error:%d\n", ret);
-                goto err_end;
-        }
-
-        omap->usbhost_hs_fck = clk_get(dev, "hs_fck");
-        if (IS_ERR(omap->usbhost_hs_fck)) {
-                ret = PTR_ERR(omap->usbhost_hs_fck);
-                dev_err(dev, "usbhost_hs_fck failed error:%d\n", ret);
-                goto err_usbhost_ick;
-        }
-
-        omap->usbhost_fs_fck = clk_get(dev, "fs_fck");
-        if (IS_ERR(omap->usbhost_fs_fck)) {
-                ret = PTR_ERR(omap->usbhost_fs_fck);
-                dev_err(dev, "usbhost_fs_fck failed error:%d\n", ret);
-                goto err_usbhost_hs_fck;
-        }
-
-        omap->usbtll_fck = clk_get(dev, "usbtll_fck");
-        if (IS_ERR(omap->usbtll_fck)) {
-                ret = PTR_ERR(omap->usbtll_fck);
-                dev_err(dev, "usbtll_fck failed error:%d\n", ret);
-                goto err_usbhost_fs_fck;
-        }
-
-        omap->usbtll_ick = clk_get(dev, "usbtll_ick");
-        if (IS_ERR(omap->usbtll_ick)) {
-                ret = PTR_ERR(omap->usbtll_ick);
-                dev_err(dev, "usbtll_ick failed error:%d\n", ret);
-                goto err_usbtll_fck;
-        }
-
-        omap->utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
-        if (IS_ERR(omap->utmi_p1_fck)) {
-                ret = PTR_ERR(omap->utmi_p1_fck);
-                dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
-                goto err_usbtll_ick;
-        }
-
-        omap->xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
-        if (IS_ERR(omap->xclk60mhsp1_ck)) {
-                ret = PTR_ERR(omap->xclk60mhsp1_ck);
-                dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
-                goto err_utmi_p1_fck;
-        }
-
-        omap->utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
-        if (IS_ERR(omap->utmi_p2_fck)) {
-                ret = PTR_ERR(omap->utmi_p2_fck);
-                dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
-                goto err_xclk60mhsp1_ck;
-        }
-
-        omap->xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
-        if (IS_ERR(omap->xclk60mhsp2_ck)) {
-                ret = PTR_ERR(omap->xclk60mhsp2_ck);
-                dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
-                goto err_utmi_p2_fck;
-        }
-
-        omap->usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
-        if (IS_ERR(omap->usbhost_p1_fck)) {
-                ret = PTR_ERR(omap->usbhost_p1_fck);
-                dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
-                goto err_xclk60mhsp2_ck;
-        }
-
-        omap->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
-        if (IS_ERR(omap->usbtll_p1_fck)) {
-                ret = PTR_ERR(omap->usbtll_p1_fck);
-                dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
-                goto err_usbhost_p1_fck;
-        }
-
-        omap->usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
-        if (IS_ERR(omap->usbhost_p2_fck)) {
-                ret = PTR_ERR(omap->usbhost_p2_fck);
-                dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
-                goto err_usbtll_p1_fck;
-        }
-
-        omap->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
-        if (IS_ERR(omap->usbtll_p2_fck)) {
-                ret = PTR_ERR(omap->usbtll_p2_fck);
-                dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
-                goto err_usbhost_p2_fck;
-        }
-
-        omap->init_60m_fclk = clk_get(dev, "init_60m_fclk");
-        if (IS_ERR(omap->init_60m_fclk)) {
-                ret = PTR_ERR(omap->init_60m_fclk);
-                dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
-                goto err_usbtll_p2_fck;
-        }
-
-        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
-        if (!res) {
-                dev_err(dev, "UHH EHCI get resource failed\n");
-                ret = -ENODEV;
-                goto err_init_60m_fclk;
-        }
-
-        omap->uhh_base = ioremap(res->start, resource_size(res));
-        if (!omap->uhh_base) {
-                dev_err(dev, "UHH ioremap failed\n");
-                ret = -ENOMEM;
-                goto err_init_60m_fclk;
-        }
-
-        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
-        if (!res) {
-                dev_err(dev, "UHH EHCI get resource failed\n");
-                ret = -ENODEV;
-                goto err_tll;
-        }
-
-        omap->tll_base = ioremap(res->start, resource_size(res));
-        if (!omap->tll_base) {
-                dev_err(dev, "TLL ioremap failed\n");
-                ret = -ENOMEM;
-                goto err_tll;
-        }
-
-        platform_set_drvdata(pdev, omap);
-
-        ret = omap_usbhs_alloc_children(pdev);
-        if (ret) {
-                dev_err(dev, "omap_usbhs_alloc_children failed\n");
-                goto err_alloc;
-        }
-
-        goto end_probe;
-
-err_alloc:
-        iounmap(omap->tll_base);
-
-err_tll:
-        iounmap(omap->uhh_base);
-
-err_init_60m_fclk:
-        clk_put(omap->init_60m_fclk);
-
-err_usbtll_p2_fck:
-        clk_put(omap->usbtll_p2_fck);
-
-err_usbhost_p2_fck:
-        clk_put(omap->usbhost_p2_fck);
-
-err_usbtll_p1_fck:
-        clk_put(omap->usbtll_p1_fck);
-
-err_usbhost_p1_fck:
-        clk_put(omap->usbhost_p1_fck);
-
-err_xclk60mhsp2_ck:
-        clk_put(omap->xclk60mhsp2_ck);
-
-err_utmi_p2_fck:
-        clk_put(omap->utmi_p2_fck);
-
-err_xclk60mhsp1_ck:
-        clk_put(omap->xclk60mhsp1_ck);
-
-err_utmi_p1_fck:
-        clk_put(omap->utmi_p1_fck);
-
-err_usbtll_ick:
-        clk_put(omap->usbtll_ick);
-
-err_usbtll_fck:
-        clk_put(omap->usbtll_fck);
-
-err_usbhost_fs_fck:
-        clk_put(omap->usbhost_fs_fck);
-
-err_usbhost_hs_fck:
-        clk_put(omap->usbhost_hs_fck);
-
-err_usbhost_ick:
-        clk_put(omap->usbhost_ick);
-
-err_end:
-        kfree(omap);
-
-end_probe:
-        return ret;
-}
-
-/**
- * usbhs_omap_remove - shutdown processing for UHH & TLL HCDs
- * @pdev: USB Host Controller being removed
- *
- * Reverses the effect of usbhs_omap_probe().
- */
-static int __devexit usbhs_omap_remove(struct platform_device *pdev)
-{
-        struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
-
-        if (omap->count != 0) {
-                dev_err(&pdev->dev,
-                        "Either EHCI or OHCI is still using usbhs core\n");
-                return -EBUSY;
-        }
-
-        iounmap(omap->tll_base);
-        iounmap(omap->uhh_base);
-        clk_put(omap->init_60m_fclk);
-        clk_put(omap->usbtll_p2_fck);
-        clk_put(omap->usbhost_p2_fck);
-        clk_put(omap->usbtll_p1_fck);
-        clk_put(omap->usbhost_p1_fck);
-        clk_put(omap->xclk60mhsp2_ck);
-        clk_put(omap->utmi_p2_fck);
-        clk_put(omap->xclk60mhsp1_ck);
-        clk_put(omap->utmi_p1_fck);
-        clk_put(omap->usbtll_ick);
-        clk_put(omap->usbtll_fck);
-        clk_put(omap->usbhost_fs_fck);
-        clk_put(omap->usbhost_hs_fck);
-        clk_put(omap->usbhost_ick);
-        kfree(omap);
-
-        return 0;
-}
-
 static bool is_ohci_port(enum usbhs_omap_port_mode pmode)
 {
         switch (pmode) {
@@ -689,30 +422,85 @@ static void usbhs_omap_tll_init(struct device *dev, u8 tll_channel_count)
         }
 }
 
-static int usbhs_enable(struct device *dev)
+static int usbhs_runtime_resume(struct device *dev)
 {
         struct usbhs_hcd_omap           *omap = dev_get_drvdata(dev);
         struct usbhs_omap_platform_data *pdata = &omap->platdata;
-        unsigned long                   flags = 0;
-        int                             ret = 0;
-        unsigned long                   timeout;
-        unsigned                        reg;
+        unsigned long                   flags;
+
+        dev_dbg(dev, "usbhs_runtime_resume\n");
 
-        dev_dbg(dev, "starting TI HSUSB Controller\n");
         if (!pdata) {
                 dev_dbg(dev, "missing platform_data\n");
                 return  -ENODEV;
         }
 
         spin_lock_irqsave(&omap->lock, flags);
-        if (omap->count > 0)
-                goto end_count;
 
-        clk_enable(omap->usbhost_ick);
-        clk_enable(omap->usbhost_hs_fck);
-        clk_enable(omap->usbhost_fs_fck);
-        clk_enable(omap->usbtll_fck);
-        clk_enable(omap->usbtll_ick);
+        if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck))
+                clk_enable(omap->ehci_logic_fck);
+
+        if (is_ehci_tll_mode(pdata->port_mode[0])) {
+                clk_enable(omap->usbhost_p1_fck);
+                clk_enable(omap->usbtll_p1_fck);
+        }
+        if (is_ehci_tll_mode(pdata->port_mode[1])) {
+                clk_enable(omap->usbhost_p2_fck);
+                clk_enable(omap->usbtll_p2_fck);
+        }
+        clk_enable(omap->utmi_p1_fck);
+        clk_enable(omap->utmi_p2_fck);
+
+        spin_unlock_irqrestore(&omap->lock, flags);
+
+        return 0;
+}
+
+static int usbhs_runtime_suspend(struct device *dev)
+{
+        struct usbhs_hcd_omap           *omap = dev_get_drvdata(dev);
+        struct usbhs_omap_platform_data *pdata = &omap->platdata;
+        unsigned long                   flags;
+
+        dev_dbg(dev, "usbhs_runtime_suspend\n");
+
+        if (!pdata) {
+                dev_dbg(dev, "missing platform_data\n");
+                return  -ENODEV;
+        }
+
+        spin_lock_irqsave(&omap->lock, flags);
+
+        if (is_ehci_tll_mode(pdata->port_mode[0])) {
+                clk_disable(omap->usbhost_p1_fck);
+                clk_disable(omap->usbtll_p1_fck);
+        }
+        if (is_ehci_tll_mode(pdata->port_mode[1])) {
+                clk_disable(omap->usbhost_p2_fck);
+                clk_disable(omap->usbtll_p2_fck);
+        }
+        clk_disable(omap->utmi_p2_fck);
+        clk_disable(omap->utmi_p1_fck);
+
+        if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck))
+                clk_disable(omap->ehci_logic_fck);
+
+        spin_unlock_irqrestore(&omap->lock, flags);
+
+        return 0;
+}
+
+static void omap_usbhs_init(struct device *dev)
+{
+        struct usbhs_hcd_omap           *omap = dev_get_drvdata(dev);
+        struct usbhs_omap_platform_data *pdata = &omap->platdata;
+        unsigned long                   flags;
+        unsigned                        reg;
+
+        dev_dbg(dev, "starting TI HSUSB Controller\n");
+
+        pm_runtime_get_sync(dev);
+        spin_lock_irqsave(&omap->lock, flags);
 
         if (pdata->ehci_data->phy_reset) {
                 if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0])) {
@@ -736,50 +524,6 @@ static int usbhs_enable(struct device *dev)
         omap->usbhs_rev = usbhs_read(omap->uhh_base, OMAP_UHH_REVISION);
         dev_dbg(dev, "OMAP UHH_REVISION 0x%x\n", omap->usbhs_rev);
 
-        /* perform TLL soft reset, and wait until reset is complete */
-        usbhs_write(omap->tll_base, OMAP_USBTLL_SYSCONFIG,
-                        OMAP_USBTLL_SYSCONFIG_SOFTRESET);
-
-        /* Wait for TLL reset to complete */
-        timeout = jiffies + msecs_to_jiffies(1000);
-        while (!(usbhs_read(omap->tll_base, OMAP_USBTLL_SYSSTATUS)
-                        & OMAP_USBTLL_SYSSTATUS_RESETDONE)) {
-                cpu_relax();
-
-                if (time_after(jiffies, timeout)) {
-                        dev_dbg(dev, "operation timed out\n");
-                        ret = -EINVAL;
-                        goto err_tll;
-                }
-        }
-
-        dev_dbg(dev, "TLL RESET DONE\n");
-
-        /* (1<<3) = no idle mode only for initial debugging */
-        usbhs_write(omap->tll_base, OMAP_USBTLL_SYSCONFIG,
-                        OMAP_USBTLL_SYSCONFIG_ENAWAKEUP |
-                        OMAP_USBTLL_SYSCONFIG_SIDLEMODE |
-                        OMAP_USBTLL_SYSCONFIG_AUTOIDLE);
-
-        /* Put UHH in NoIdle/NoStandby mode */
-        reg = usbhs_read(omap->uhh_base, OMAP_UHH_SYSCONFIG);
-        if (is_omap_usbhs_rev1(omap)) {
-                reg |= (OMAP_UHH_SYSCONFIG_ENAWAKEUP
-                                | OMAP_UHH_SYSCONFIG_SIDLEMODE
-                                | OMAP_UHH_SYSCONFIG_CACTIVITY
-                                | OMAP_UHH_SYSCONFIG_MIDLEMODE);
-                reg &= ~OMAP_UHH_SYSCONFIG_AUTOIDLE;
-
-
-        } else if (is_omap_usbhs_rev2(omap)) {
-                reg &= ~OMAP4_UHH_SYSCONFIG_IDLEMODE_CLEAR;
-                reg |= OMAP4_UHH_SYSCONFIG_NOIDLE;
-                reg &= ~OMAP4_UHH_SYSCONFIG_STDBYMODE_CLEAR;
-                reg |= OMAP4_UHH_SYSCONFIG_NOSTDBY;
-        }
-
-        usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG, reg);
-
         reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG);
         /* setup ULPI bypass and burst configurations */
         reg |= (OMAP_UHH_HOSTCONFIG_INCR4_BURST_EN
@@ -825,49 +569,6 @@ static int usbhs_enable(struct device *dev)
                 reg &= ~OMAP4_P1_MODE_CLEAR;
                 reg &= ~OMAP4_P2_MODE_CLEAR;
 
-                if (is_ehci_phy_mode(pdata->port_mode[0])) {
-                        ret = clk_set_parent(omap->utmi_p1_fck,
-                                                omap->xclk60mhsp1_ck);
-                        if (ret != 0) {
-                                dev_err(dev, "xclk60mhsp1_ck set parent"
-                                "failed error:%d\n", ret);
-                                goto err_tll;
-                        }
-                } else if (is_ehci_tll_mode(pdata->port_mode[0])) {
-                        ret = clk_set_parent(omap->utmi_p1_fck,
-                                                omap->init_60m_fclk);
-                        if (ret != 0) {
-                                dev_err(dev, "init_60m_fclk set parent"
-                                "failed error:%d\n", ret);
-                                goto err_tll;
-                        }
-                        clk_enable(omap->usbhost_p1_fck);
-                        clk_enable(omap->usbtll_p1_fck);
-                }
-
-                if (is_ehci_phy_mode(pdata->port_mode[1])) {
-                        ret = clk_set_parent(omap->utmi_p2_fck,
-                                                omap->xclk60mhsp2_ck);
-                        if (ret != 0) {
-                                dev_err(dev, "xclk60mhsp1_ck set parent"
-                                        "failed error:%d\n", ret);
-                                goto err_tll;
-                        }
-                } else if (is_ehci_tll_mode(pdata->port_mode[1])) {
-                        ret = clk_set_parent(omap->utmi_p2_fck,
-                                                omap->init_60m_fclk);
-                        if (ret != 0) {
-                                dev_err(dev, "init_60m_fclk set parent"
-                                "failed error:%d\n", ret);
-                                goto err_tll;
-                        }
-                        clk_enable(omap->usbhost_p2_fck);
-                        clk_enable(omap->usbtll_p2_fck);
-                }
-
-                clk_enable(omap->utmi_p1_fck);
-                clk_enable(omap->utmi_p2_fck);
-
                 if (is_ehci_tll_mode(pdata->port_mode[0]) ||
                         (is_ohci_port(pdata->port_mode[0])))
                         reg |= OMAP4_P1_MODE_TLL;
@@ -913,12 +614,15 @@ static int usbhs_enable(struct device *dev)
                                 (pdata->ehci_data->reset_gpio_port[1], 1);
         }
 
-end_count:
-        omap->count++;
         spin_unlock_irqrestore(&omap->lock, flags);
-        return 0;
+        pm_runtime_put_sync(dev);
+}
+
+static void omap_usbhs_deinit(struct device *dev)
+{
+        struct usbhs_hcd_omap           *omap = dev_get_drvdata(dev);
+        struct usbhs_omap_platform_data *pdata = &omap->platdata;
 
-err_tll:
         if (pdata->ehci_data->phy_reset) {
                 if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
                         gpio_free(pdata->ehci_data->reset_gpio_port[0]);
@@ -926,123 +630,272 @@ err_tll:
                 if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
                         gpio_free(pdata->ehci_data->reset_gpio_port[1]);
         }
-
-        clk_disable(omap->usbtll_ick);
-        clk_disable(omap->usbtll_fck);
-        clk_disable(omap->usbhost_fs_fck);
-        clk_disable(omap->usbhost_hs_fck);
-        clk_disable(omap->usbhost_ick);
-        spin_unlock_irqrestore(&omap->lock, flags);
-        return ret;
 }
 
-static void usbhs_disable(struct device *dev)
+
+/**
+ * usbhs_omap_probe - initialize TI-based HCDs
+ *
+ * Allocates basic resources for this USB host controller.
+ */
+static int __devinit usbhs_omap_probe(struct platform_device *pdev)
 {
-        struct usbhs_hcd_omap           *omap = dev_get_drvdata(dev);
-        struct usbhs_omap_platform_data *pdata = &omap->platdata;
-        unsigned long                   flags = 0;
-        unsigned long                   timeout;
+        struct device                   *dev =  &pdev->dev;
+        struct usbhs_omap_platform_data *pdata = dev->platform_data;
+        struct usbhs_hcd_omap           *omap;
+        struct resource                 *res;
+        int                             ret = 0;
+        int                             i;
 
-        dev_dbg(dev, "stopping TI HSUSB Controller\n");
+        if (!pdata) {
+                dev_err(dev, "Missing platform data\n");
+                ret = -ENOMEM;
+                goto end_probe;
+        }
 
-        spin_lock_irqsave(&omap->lock, flags);
+        omap = kzalloc(sizeof(*omap), GFP_KERNEL);
+        if (!omap) {
+                dev_err(dev, "Memory allocation failed\n");
+                ret = -ENOMEM;
+                goto end_probe;
+        }
 
-        if (omap->count == 0)
-                goto end_disble;
+        spin_lock_init(&omap->lock);
 
-        omap->count--;
+        for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
+                omap->platdata.port_mode[i] = pdata->port_mode[i];
+
+        omap->platdata.ehci_data = pdata->ehci_data;
+        omap->platdata.ohci_data = pdata->ohci_data;
 
-        if (omap->count != 0)
-                goto end_disble;
+        pm_runtime_enable(dev);
 
-        /* Reset OMAP modules for insmod/rmmod to work */
-        usbhs_write(omap->uhh_base, OMAP_UHH_SYSCONFIG,
-                        is_omap_usbhs_rev2(omap) ?
-                        OMAP4_UHH_SYSCONFIG_SOFTRESET :
-                        OMAP_UHH_SYSCONFIG_SOFTRESET);
 
-        timeout = jiffies + msecs_to_jiffies(100);
-        while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
-                                & (1 << 0))) {
-                cpu_relax();
+        for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
+                if (is_ehci_phy_mode(i) || is_ehci_tll_mode(i) ||
+                        is_ehci_hsic_mode(i)) {
+                        omap->ehci_logic_fck = clk_get(dev, "ehci_logic_fck");
+                        if (IS_ERR(omap->ehci_logic_fck)) {
+                                ret = PTR_ERR(omap->ehci_logic_fck);
+                                dev_warn(dev, "ehci_logic_fck failed:%d\n",
+                                         ret);
+                        }
+                        break;
+                }
 
-                if (time_after(jiffies, timeout))
-                        dev_dbg(dev, "operation timed out\n");
+        omap->utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
+        if (IS_ERR(omap->utmi_p1_fck)) {
+                ret = PTR_ERR(omap->utmi_p1_fck);
+                dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
+                goto err_end;
         }
 
-        while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
-                                & (1 << 1))) {
-                cpu_relax();
+        omap->xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
+        if (IS_ERR(omap->xclk60mhsp1_ck)) {
+                ret = PTR_ERR(omap->xclk60mhsp1_ck);
+                dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
+                goto err_utmi_p1_fck;
+        }
 
-                if (time_after(jiffies, timeout))
-                        dev_dbg(dev, "operation timed out\n");
+        omap->utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
+        if (IS_ERR(omap->utmi_p2_fck)) {
+                ret = PTR_ERR(omap->utmi_p2_fck);
+                dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
+                goto err_xclk60mhsp1_ck;
         }
 
-        while (!(usbhs_read(omap->uhh_base, OMAP_UHH_SYSSTATUS)
-                                & (1 << 2))) {
-                cpu_relax();
+        omap->xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
+        if (IS_ERR(omap->xclk60mhsp2_ck)) {
+                ret = PTR_ERR(omap->xclk60mhsp2_ck);
+                dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
+                goto err_utmi_p2_fck;
+        }
 
-                if (time_after(jiffies, timeout))
-                        dev_dbg(dev, "operation timed out\n");
+        omap->usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
+        if (IS_ERR(omap->usbhost_p1_fck)) {
+                ret = PTR_ERR(omap->usbhost_p1_fck);
+                dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
+                goto err_xclk60mhsp2_ck;
         }
 
-        usbhs_write(omap->tll_base, OMAP_USBTLL_SYSCONFIG, (1 << 1));
+        omap->usbtll_p1_fck = clk_get(dev, "usb_tll_hs_usb_ch0_clk");
+        if (IS_ERR(omap->usbtll_p1_fck)) {
+                ret = PTR_ERR(omap->usbtll_p1_fck);
+                dev_err(dev, "usbtll_p1_fck failed error:%d\n", ret);
+                goto err_usbhost_p1_fck;
+        }
 
-        while (!(usbhs_read(omap->tll_base, OMAP_USBTLL_SYSSTATUS)
-                                & (1 << 0))) {
-                cpu_relax();
+        omap->usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
+        if (IS_ERR(omap->usbhost_p2_fck)) {
+                ret = PTR_ERR(omap->usbhost_p2_fck);
+                dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
+                goto err_usbtll_p1_fck;
+        }
 
-                if (time_after(jiffies, timeout))
-                        dev_dbg(dev, "operation timed out\n");
+        omap->usbtll_p2_fck = clk_get(dev, "usb_tll_hs_usb_ch1_clk");
+        if (IS_ERR(omap->usbtll_p2_fck)) {
+                ret = PTR_ERR(omap->usbtll_p2_fck);
+                dev_err(dev, "usbtll_p2_fck failed error:%d\n", ret);
+                goto err_usbhost_p2_fck;
         }
 
-        if (is_omap_usbhs_rev2(omap)) {
-                if (is_ehci_tll_mode(pdata->port_mode[0]))
-                        clk_disable(omap->usbtll_p1_fck);
-                if (is_ehci_tll_mode(pdata->port_mode[1]))
-                        clk_disable(omap->usbtll_p2_fck);
-                clk_disable(omap->utmi_p2_fck);
-                clk_disable(omap->utmi_p1_fck);
+        omap->init_60m_fclk = clk_get(dev, "init_60m_fclk");
+        if (IS_ERR(omap->init_60m_fclk)) {
+                ret = PTR_ERR(omap->init_60m_fclk);
+                dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
+                goto err_usbtll_p2_fck;
         }
 
-        clk_disable(omap->usbtll_ick);
-        clk_disable(omap->usbtll_fck);
-        clk_disable(omap->usbhost_fs_fck);
-        clk_disable(omap->usbhost_hs_fck);
-        clk_disable(omap->usbhost_ick);
+        if (is_ehci_phy_mode(pdata->port_mode[0])) {
+                /* for OMAP3 , the clk set paretn fails */
+                ret = clk_set_parent(omap->utmi_p1_fck,
+                                        omap->xclk60mhsp1_ck);
+                if (ret != 0)
+                        dev_err(dev, "xclk60mhsp1_ck set parent"
+                                "failed error:%d\n", ret);
+        } else if (is_ehci_tll_mode(pdata->port_mode[0])) {
+                ret = clk_set_parent(omap->utmi_p1_fck,
+                                        omap->init_60m_fclk);
+                if (ret != 0)
+                        dev_err(dev, "init_60m_fclk set parent"
+                                "failed error:%d\n", ret);
+        }
 
-        /* The gpio_free migh sleep; so unlock the spinlock */
-        spin_unlock_irqrestore(&omap->lock, flags);
+        if (is_ehci_phy_mode(pdata->port_mode[1])) {
+                ret = clk_set_parent(omap->utmi_p2_fck,
+                                        omap->xclk60mhsp2_ck);
+                if (ret != 0)
+                        dev_err(dev, "xclk60mhsp2_ck set parent"
+                                        "failed error:%d\n", ret);
+        } else if (is_ehci_tll_mode(pdata->port_mode[1])) {
+                ret = clk_set_parent(omap->utmi_p2_fck,
+                                                omap->init_60m_fclk);
+                if (ret != 0)
+                        dev_err(dev, "init_60m_fclk set parent"
+                                "failed error:%d\n", ret);
+        }
 
-        if (pdata->ehci_data->phy_reset) {
-                if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
-                        gpio_free(pdata->ehci_data->reset_gpio_port[0]);
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "uhh");
+        if (!res) {
+                dev_err(dev, "UHH EHCI get resource failed\n");
+                ret = -ENODEV;
+                goto err_init_60m_fclk;
+        }
 
-                if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[1]))
-                        gpio_free(pdata->ehci_data->reset_gpio_port[1]);
+        omap->uhh_base = ioremap(res->start, resource_size(res));
+        if (!omap->uhh_base) {
+                dev_err(dev, "UHH ioremap failed\n");
+                ret = -ENOMEM;
+                goto err_init_60m_fclk;
         }
-        return;
 
-end_disble:
-        spin_unlock_irqrestore(&omap->lock, flags);
-}
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tll");
+        if (!res) {
+                dev_err(dev, "UHH EHCI get resource failed\n");
+                ret = -ENODEV;
+                goto err_tll;
+        }
 
-int omap_usbhs_enable(struct device *dev)
-{
-        return  usbhs_enable(dev->parent);
+        omap->tll_base = ioremap(res->start, resource_size(res));
+        if (!omap->tll_base) {
+                dev_err(dev, "TLL ioremap failed\n");
+                ret = -ENOMEM;
+                goto err_tll;
+        }
+
+        platform_set_drvdata(pdev, omap);
+
+        ret = omap_usbhs_alloc_children(pdev);
+        if (ret) {
+                dev_err(dev, "omap_usbhs_alloc_children failed\n");
+                goto err_alloc;
+        }
+
+        omap_usbhs_init(dev);
+
+        goto end_probe;
+
+err_alloc:
+        iounmap(omap->tll_base);
+
+err_tll:
+        iounmap(omap->uhh_base);
+
+err_init_60m_fclk:
+        clk_put(omap->init_60m_fclk);
+
+err_usbtll_p2_fck:
+        clk_put(omap->usbtll_p2_fck);
+
+err_usbhost_p2_fck:
+        clk_put(omap->usbhost_p2_fck);
+
+err_usbtll_p1_fck:
+        clk_put(omap->usbtll_p1_fck);
+
+err_usbhost_p1_fck:
+        clk_put(omap->usbhost_p1_fck);
+
+err_xclk60mhsp2_ck:
+        clk_put(omap->xclk60mhsp2_ck);
+
+err_utmi_p2_fck:
+        clk_put(omap->utmi_p2_fck);
+
+err_xclk60mhsp1_ck:
+        clk_put(omap->xclk60mhsp1_ck);
+
+err_utmi_p1_fck:
+        clk_put(omap->utmi_p1_fck);
+
+err_end:
+        clk_put(omap->ehci_logic_fck);
+        pm_runtime_disable(dev);
+        kfree(omap);
+
+end_probe:
+        return ret;
 }
-EXPORT_SYMBOL_GPL(omap_usbhs_enable);
 
-void omap_usbhs_disable(struct device *dev)
+/**
+ * usbhs_omap_remove - shutdown processing for UHH & TLL HCDs
+ * @pdev: USB Host Controller being removed
+ *
+ * Reverses the effect of usbhs_omap_probe().
+ */
+static int __devexit usbhs_omap_remove(struct platform_device *pdev)
 {
-        usbhs_disable(dev->parent);
+        struct usbhs_hcd_omap *omap = platform_get_drvdata(pdev);
+
+        omap_usbhs_deinit(&pdev->dev);
+        iounmap(omap->tll_base);
+        iounmap(omap->uhh_base);
+        clk_put(omap->init_60m_fclk);
+        clk_put(omap->usbtll_p2_fck);
+        clk_put(omap->usbhost_p2_fck);
+        clk_put(omap->usbtll_p1_fck);
+        clk_put(omap->usbhost_p1_fck);
+        clk_put(omap->xclk60mhsp2_ck);
+        clk_put(omap->utmi_p2_fck);
+        clk_put(omap->xclk60mhsp1_ck);
+        clk_put(omap->utmi_p1_fck);
+        clk_put(omap->ehci_logic_fck);
+        pm_runtime_disable(&pdev->dev);
+        kfree(omap);
+
+        return 0;
 }
-EXPORT_SYMBOL_GPL(omap_usbhs_disable);
+
+static const struct dev_pm_ops usbhsomap_dev_pm_ops = {
+        .runtime_suspend        = usbhs_runtime_suspend,
+        .runtime_resume         = usbhs_runtime_resume,
+};
 
 static struct platform_driver usbhs_omap_driver = {
         .driver = {
                 .name           = (char *)usbhs_driver_name,
                 .owner          = THIS_MODULE,
+                .pm             = &usbhsomap_dev_pm_ops,
         },
         .remove         = __exit_p(usbhs_omap_remove),
 };
diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c
index a39e0555df63..83adab69bfd4 100644
--- a/drivers/misc/ad525x_dpot-i2c.c
+++ b/drivers/misc/ad525x_dpot-i2c.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the Analog Devices digital potentiometers (I2C bus)
  *
- * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.
+ * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -11,7 +11,6 @@
 
 #include "ad525x_dpot.h"
 
-/* ------------------------------------------------------------------------- */
 /* I2C bus functions */
 static int write_d8(void *client, u8 val)
 {
@@ -60,18 +59,13 @@ static int __devinit ad_dpot_i2c_probe(struct i2c_client *client,
                 .bops = &bops,
         };
 
-        struct ad_dpot_id dpot_id = {
-                .name = (char *) &id->name,
-                .devid = id->driver_data,
-        };
-
         if (!i2c_check_functionality(client->adapter,
                                      I2C_FUNC_SMBUS_WORD_DATA)) {
                 dev_err(&client->dev, "SMBUS Word Data not Supported\n");
                 return -EIO;
         }
 
-        return ad_dpot_probe(&client->dev, &bdata, &dpot_id);
+        return ad_dpot_probe(&client->dev, &bdata, id->driver_data, id->name);
 }
 
 static int __devexit ad_dpot_i2c_remove(struct i2c_client *client)
diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c
index 7f9a55afe05d..822749e41fea 100644
--- a/drivers/misc/ad525x_dpot-spi.c
+++ b/drivers/misc/ad525x_dpot-spi.c
@@ -1,7 +1,7 @@
 /*
  * Driver for the Analog Devices digital potentiometers (SPI bus)
  *
- * Copyright (C) 2010 Michael Hennerich, Analog Devices Inc.
+ * Copyright (C) 2010-2011 Michael Hennerich, Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -11,40 +11,6 @@
 
 #include "ad525x_dpot.h"
 
-static const struct ad_dpot_id ad_dpot_spi_devlist[] = {
-        {.name = "ad5160", .devid = AD5160_ID},
-        {.name = "ad5161", .devid = AD5161_ID},
-        {.name = "ad5162", .devid = AD5162_ID},
-        {.name = "ad5165", .devid = AD5165_ID},
-        {.name = "ad5200", .devid = AD5200_ID},
-        {.name = "ad5201", .devid = AD5201_ID},
-        {.name = "ad5203", .devid = AD5203_ID},
-        {.name = "ad5204", .devid = AD5204_ID},
-        {.name = "ad5206", .devid = AD5206_ID},
-        {.name = "ad5207", .devid = AD5207_ID},
-        {.name = "ad5231", .devid = AD5231_ID},
-        {.name = "ad5232", .devid = AD5232_ID},
-        {.name = "ad5233", .devid = AD5233_ID},
-        {.name = "ad5235", .devid = AD5235_ID},
-        {.name = "ad5260", .devid = AD5260_ID},
-        {.name = "ad5262", .devid = AD5262_ID},
-        {.name = "ad5263", .devid = AD5263_ID},
-        {.name = "ad5290", .devid = AD5290_ID},
-        {.name = "ad5291", .devid = AD5291_ID},
-        {.name = "ad5292", .devid = AD5292_ID},
-        {.name = "ad5293", .devid = AD5293_ID},
-        {.name = "ad7376", .devid = AD7376_ID},
-        {.name = "ad8400", .devid = AD8400_ID},
-        {.name = "ad8402", .devid = AD8402_ID},
-        {.name = "ad8403", .devid = AD8403_ID},
-        {.name = "adn2850", .devid = ADN2850_ID},
-        {.name = "ad5270", .devid = AD5270_ID},
-        {.name = "ad5271", .devid = AD5271_ID},
-        {}
-};
-
-/* ------------------------------------------------------------------------- */
-
 /* SPI bus functions */
 static int write8(void *client, u8 val)
 {
@@ -109,36 +75,16 @@ static const struct ad_dpot_bus_ops bops = {
         .write_r8d8     = write16,
         .write_r8d16    = write24,
 };
-
-static const struct ad_dpot_id *dpot_match_id(const struct ad_dpot_id *id,
-                                                char *name)
-{
-        while (id->name && id->name[0]) {
-                if (strcmp(name, id->name) == 0)
-                        return id;
-                id++;
-        }
-        return NULL;
-}
-
 static int __devinit ad_dpot_spi_probe(struct spi_device *spi)
 {
-        char *name = spi->dev.platform_data;
-        const struct ad_dpot_id *dpot_id;
-
         struct ad_dpot_bus_data bdata = {
                 .client = spi,
                 .bops = &bops,
         };
 
-        dpot_id = dpot_match_id(ad_dpot_spi_devlist, name);
-
-        if (dpot_id == NULL) {
-                dev_err(&spi->dev, "%s not in supported device list", name);
-                return -ENODEV;
-        }
-
-        return ad_dpot_probe(&spi->dev, &bdata, dpot_id);
+        return ad_dpot_probe(&spi->dev, &bdata,
+                             spi_get_device_id(spi)->driver_data,
+                             spi_get_device_id(spi)->name);
 }
 
 static int __devexit ad_dpot_spi_remove(struct spi_device *spi)
@@ -146,14 +92,47 @@ static int __devexit ad_dpot_spi_remove(struct spi_device *spi)
         return ad_dpot_remove(&spi->dev);
 }
 
+static const struct spi_device_id ad_dpot_spi_id[] = {
+        {"ad5160", AD5160_ID},
+        {"ad5161", AD5161_ID},
+        {"ad5162", AD5162_ID},
+        {"ad5165", AD5165_ID},
+        {"ad5200", AD5200_ID},
+        {"ad5201", AD5201_ID},
+        {"ad5203", AD5203_ID},
+        {"ad5204", AD5204_ID},
+        {"ad5206", AD5206_ID},
+        {"ad5207", AD5207_ID},
+        {"ad5231", AD5231_ID},
+        {"ad5232", AD5232_ID},
+        {"ad5233", AD5233_ID},
+        {"ad5235", AD5235_ID},
+        {"ad5260", AD5260_ID},
+        {"ad5262", AD5262_ID},
+        {"ad5263", AD5263_ID},
+        {"ad5290", AD5290_ID},
+        {"ad5291", AD5291_ID},
+        {"ad5292", AD5292_ID},
+        {"ad5293", AD5293_ID},
+        {"ad7376", AD7376_ID},
+        {"ad8400", AD8400_ID},
+        {"ad8402", AD8402_ID},
+        {"ad8403", AD8403_ID},
+        {"adn2850", ADN2850_ID},
+        {"ad5270", AD5270_ID},
+        {"ad5271", AD5271_ID},
+        {}
+};
+MODULE_DEVICE_TABLE(spi, ad_dpot_spi_id);
+
 static struct spi_driver ad_dpot_spi_driver = {
         .driver = {
                 .name   = "ad_dpot",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad_dpot_spi_probe,
         .remove         = __devexit_p(ad_dpot_spi_remove),
+        .id_table       = ad_dpot_spi_id,
 };
 
 static int __init ad_dpot_spi_init(void)
diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c
index 7cb911028d09..1d1d42615915 100644
--- a/drivers/misc/ad525x_dpot.c
+++ b/drivers/misc/ad525x_dpot.c
@@ -64,7 +64,7 @@
  * Author: Chris Verges <chrisv@cyberswitching.com>
  *
  * derived from ad5252.c
- * Copyright (c) 2006 Michael Hennerich <hennerich@blackfin.uclinux.org>
+ * Copyright (c) 2006-2011 Michael Hennerich <hennerich@blackfin.uclinux.org>
  *
  * Licensed under the GPL-2 or later.
  */
@@ -76,8 +76,6 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 
-#define DRIVER_VERSION                  "0.2"
-
 #include "ad525x_dpot.h"
 
 /*
@@ -687,8 +685,9 @@ inline void ad_dpot_remove_files(struct device *dev,
         }
 }
 
-__devinit int ad_dpot_probe(struct device *dev,
-                struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id)
+int __devinit ad_dpot_probe(struct device *dev,
+                struct ad_dpot_bus_data *bdata, unsigned long devid,
+                            const char *name)
 {
 
         struct dpot_data *data;
@@ -704,13 +703,13 @@ __devinit int ad_dpot_probe(struct device *dev,
         mutex_init(&data->update_lock);
 
         data->bdata = *bdata;
-        data->devid = id->devid;
+        data->devid = devid;
 
-        data->max_pos = 1 << DPOT_MAX_POS(data->devid);
+        data->max_pos = 1 << DPOT_MAX_POS(devid);
         data->rdac_mask = data->max_pos - 1;
-        data->feat = DPOT_FEAT(data->devid);
-        data->uid = DPOT_UID(data->devid);
-        data->wipers = DPOT_WIPERS(data->devid);
+        data->feat = DPOT_FEAT(devid);
+        data->uid = DPOT_UID(devid);
+        data->wipers = DPOT_WIPERS(devid);
 
         for (i = DPOT_RDAC0; i < MAX_RDACS; i++)
                 if (data->wipers & (1 << i)) {
@@ -731,7 +730,7 @@ __devinit int ad_dpot_probe(struct device *dev,
         }
 
         dev_info(dev, "%s %d-Position Digital Potentiometer registered\n",
-                 id->name, data->max_pos);
+                 name, data->max_pos);
 
         return 0;
 
@@ -745,7 +744,7 @@ exit_free:
         dev_set_drvdata(dev, NULL);
 exit:
         dev_err(dev, "failed to create client for %s ID 0x%lX\n",
-                        id->name, id->devid);
+                name, devid);
         return err;
 }
 EXPORT_SYMBOL(ad_dpot_probe);
@@ -770,4 +769,3 @@ MODULE_AUTHOR("Chris Verges <chrisv@cyberswitching.com>, "
               "Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Digital potentiometer driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRIVER_VERSION);
diff --git a/drivers/misc/ad525x_dpot.h b/drivers/misc/ad525x_dpot.h
index 82b2cb77ae19..6bd1eba23bc0 100644
--- a/drivers/misc/ad525x_dpot.h
+++ b/drivers/misc/ad525x_dpot.h
@@ -208,12 +208,8 @@ struct ad_dpot_bus_data {
         const struct ad_dpot_bus_ops *bops;
 };
 
-struct ad_dpot_id {
-        char *name;
-        unsigned long devid;
-};
-
-int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, const struct ad_dpot_id *id);
+int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata,
+                  unsigned long devid, const char *name);
 int ad_dpot_remove(struct device *dev);
 
 #endif
diff --git a/drivers/misc/bmp085.c b/drivers/misc/bmp085.c
index 5f898cb706a6..b29a2be24591 100644
--- a/drivers/misc/bmp085.c
+++ b/drivers/misc/bmp085.c
@@ -216,7 +216,7 @@ static s32 bmp085_get_temperature(struct bmp085_data *data, int *temperature)
                 *temperature = (x1+x2+8) >> 4;
 
 exit:
-        return status;;
+        return status;
 }
 
 /*
diff --git a/drivers/misc/isl29020.c b/drivers/misc/isl29020.c
index 307aada5fffe..3d6cce663bea 100644
--- a/drivers/misc/isl29020.c
+++ b/drivers/misc/isl29020.c
@@ -158,7 +158,7 @@ static int als_set_default_config(struct i2c_client *client)
                 dev_err(&client->dev, "default write failed.");
                 return retval;
         }
-        return 0;;
+        return 0;
 }
 
 static int  isl29020_probe(struct i2c_client *client,
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index ba168a7d54d4..2b62232c2c6a 100644
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -137,6 +137,8 @@ void st_send_frame(unsigned char chnl_id, struct st_data_s *st_gdata)
  * st_reg_complete -
  * to call registration complete callbacks
  * of all protocol stack drivers
+ * This function is being called with spin lock held, protocol drivers are
+ * only expected to complete their waits and do nothing more than that.
  */
 void st_reg_complete(struct st_data_s *st_gdata, char err)
 {
@@ -538,11 +540,12 @@ long st_register(struct st_proto_s *new_proto)
                 set_bit(ST_REG_IN_PROGRESS, &st_gdata->st_state);
                 st_recv = st_kim_recv;
 
+                /* enable the ST LL - to set default chip state */
+                st_ll_enable(st_gdata);
+
                 /* release lock previously held - re-locked below */
                 spin_unlock_irqrestore(&st_gdata->lock, flags);
 
-                /* enable the ST LL - to set default chip state */
-                st_ll_enable(st_gdata);
                 /* this may take a while to complete
                  * since it involves BT fw download
                  */
@@ -553,10 +556,13 @@ long st_register(struct st_proto_s *new_proto)
                             (test_bit(ST_REG_PENDING, &st_gdata->st_state))) {
                                 pr_err(" KIM failure complete callback ");
                                 st_reg_complete(st_gdata, err);
+                                clear_bit(ST_REG_PENDING, &st_gdata->st_state);
                         }
                         return -EINVAL;
                 }
 
+                spin_lock_irqsave(&st_gdata->lock, flags);
+
                 clear_bit(ST_REG_IN_PROGRESS, &st_gdata->st_state);
                 st_recv = st_int_recv;
 
@@ -576,10 +582,10 @@ long st_register(struct st_proto_s *new_proto)
                 if (st_gdata->is_registered[new_proto->chnl_id] == true) {
                         pr_err(" proto %d already registered ",
                                    new_proto->chnl_id);
+                        spin_unlock_irqrestore(&st_gdata->lock, flags);
                         return -EALREADY;
                 }
 
-                spin_lock_irqsave(&st_gdata->lock, flags);
                 add_channel_to_table(st_gdata, new_proto);
                 st_gdata->protos_registered++;
                 new_proto->write = st_write;
@@ -619,7 +625,7 @@ long st_unregister(struct st_proto_s *proto)
 
         spin_lock_irqsave(&st_gdata->lock, flags);
 
-        if (st_gdata->list[proto->chnl_id] == NULL) {
+        if (st_gdata->is_registered[proto->chnl_id] == false) {
                 pr_err(" chnl_id %d not registered", proto->chnl_id);
                 spin_unlock_irqrestore(&st_gdata->lock, flags);
                 return -EPROTONOSUPPORT;
@@ -629,6 +635,10 @@ long st_unregister(struct st_proto_s *proto)
         remove_channel_from_table(st_gdata, proto);
         spin_unlock_irqrestore(&st_gdata->lock, flags);
 
+        /* paranoid check */
+        if (st_gdata->protos_registered < ST_EMPTY)
+                st_gdata->protos_registered = ST_EMPTY;
+
         if ((st_gdata->protos_registered == ST_EMPTY) &&
             (!test_bit(ST_REG_PENDING, &st_gdata->st_state))) {
                 pr_info(" all chnl_ids unregistered ");
diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 43ef8d162f2d..a7a861ceee2d 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
@@ -469,37 +469,21 @@ long st_kim_start(void *kim_data)
                 /* wait for ldisc to be installed */
                 err = wait_for_completion_timeout(&kim_gdata->ldisc_installed,
                                 msecs_to_jiffies(LDISC_TIME));
-                if (!err) {     /* timeout */
-                        pr_err("line disc installation timed out ");
-                        kim_gdata->ldisc_install = 0;
-                        pr_info("ldisc_install = 0");
-                        sysfs_notify(&kim_gdata->kim_pdev->dev.kobj,
-                                        NULL, "install");
-                        /* the following wait is never going to be completed,
-                         * since the ldisc was never installed, hence serving
-                         * as a mdelay of LDISC_TIME msecs */
-                        err = wait_for_completion_timeout
-                                (&kim_gdata->ldisc_installed,
-                                 msecs_to_jiffies(LDISC_TIME));
-                        err = -ETIMEDOUT;
+                if (!err) {
+                        /* ldisc installation timeout,
+                         * flush uart, power cycle BT_EN */
+                        pr_err("ldisc installation timeout");
+                        err = st_kim_stop(kim_gdata);
                         continue;
                 } else {
                         /* ldisc installed now */
-                        pr_info(" line discipline installed ");
+                        pr_info("line discipline installed");
                         err = download_firmware(kim_gdata);
                         if (err != 0) {
+                                /* ldisc installed but fw download failed,
+                                 * flush uart & power cycle BT_EN */
                                 pr_err("download firmware failed");
-                                kim_gdata->ldisc_install = 0;
-                                pr_info("ldisc_install = 0");
-                                sysfs_notify(&kim_gdata->kim_pdev->dev.kobj,
-                                                NULL, "install");
-                                /* this wait might be completed, though in the
-                                 * tty_close() since the ldisc is already
-                                 * installed */
-                                err = wait_for_completion_timeout
-                                        (&kim_gdata->ldisc_installed,
-                                         msecs_to_jiffies(LDISC_TIME));
-                                err = -EINVAL;
+                                err = st_kim_stop(kim_gdata);
                                 continue;
                         } else {        /* on success don't retry */
                                 break;
@@ -510,8 +494,14 @@ long st_kim_start(void *kim_data)
 }
 
 /**
- * st_kim_stop - called from ST Core, on the last un-registration
- *      toggle low the chip enable gpio
+ * st_kim_stop - stop communication with chip.
+ *      This can be called from ST Core/KIM, on the-
+ *      (a) last un-register when chip need not be powered there-after,
+ *      (b) upon failure to either install ldisc or download firmware.
+ *      The function is responsible to (a) notify UIM about un-installation,
+ *      (b) flush UART if the ldisc was installed.
+ *      (c) reset BT_EN - pull down nshutdown at the end.
+ *      (d) invoke platform's chip disabling routine.
  */
 long st_kim_stop(void *kim_data)
 {
@@ -519,12 +509,16 @@ long st_kim_stop(void *kim_data)
         struct kim_data_s       *kim_gdata = (struct kim_data_s *)kim_data;
         struct ti_st_plat_data  *pdata =
                 kim_gdata->kim_pdev->dev.platform_data;
+        struct tty_struct       *tty = kim_gdata->core_data->tty;
 
         INIT_COMPLETION(kim_gdata->ldisc_installed);
 
-        /* Flush any pending characters in the driver and discipline. */
-        tty_ldisc_flush(kim_gdata->core_data->tty);
-        tty_driver_flush_buffer(kim_gdata->core_data->tty);
+        if (tty) {      /* can be called before ldisc is installed */
+                /* Flush any pending characters in the driver and discipline. */
+                tty_ldisc_flush(tty);
+                tty_driver_flush_buffer(tty);
+                tty->ops->flush_buffer(tty);
+        }
 
         /* send uninstall notification to UIM */
         pr_info("ldisc_install = 0");
@@ -579,6 +573,28 @@ static ssize_t show_install(struct device *dev,
         return sprintf(buf, "%d\n", kim_data->ldisc_install);
 }
 
+#ifdef DEBUG
+static ssize_t store_dev_name(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct kim_data_s *kim_data = dev_get_drvdata(dev);
+        pr_debug("storing dev name >%s<", buf);
+        strncpy(kim_data->dev_name, buf, count);
+        pr_debug("stored dev name >%s<", kim_data->dev_name);
+        return count;
+}
+
+static ssize_t store_baud_rate(struct device *dev,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct kim_data_s *kim_data = dev_get_drvdata(dev);
+        pr_debug("storing baud rate >%s<", buf);
+        sscanf(buf, "%ld", &kim_data->baud_rate);
+        pr_debug("stored baud rate >%ld<", kim_data->baud_rate);
+        return count;
+}
+#endif  /* if DEBUG */
+
 static ssize_t show_dev_name(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
@@ -605,10 +621,18 @@ static struct kobj_attribute ldisc_install =
 __ATTR(install, 0444, (void *)show_install, NULL);
 
 static struct kobj_attribute uart_dev_name =
+#ifdef DEBUG    /* TODO: move this to debug-fs if possible */
+__ATTR(dev_name, 0644, (void *)show_dev_name, (void *)store_dev_name);
+#else
 __ATTR(dev_name, 0444, (void *)show_dev_name, NULL);
+#endif
 
 static struct kobj_attribute uart_baud_rate =
+#ifdef DEBUG    /* TODO: move to debugfs */
+__ATTR(baud_rate, 0644, (void *)show_baud_rate, (void *)store_baud_rate);
+#else
 __ATTR(baud_rate, 0444, (void *)show_baud_rate, NULL);
+#endif
 
 static struct kobj_attribute uart_flow_cntrl =
 __ATTR(flow_cntrl, 0444, (void *)show_flow_cntrl, NULL);
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index a8b4d2aa18e5..f437c3e6f3aa 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -741,7 +741,7 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
         at91_mci_write(host, AT91_MCI_MR, (at91_mci_read(host, AT91_MCI_MR) & ~AT91_MCI_CLKDIV) | clkdiv);
 
         /* maybe switch power to the card */
-        if (host->board->vcc_pin) {
+        if (gpio_is_valid(host->board->vcc_pin)) {
                 switch (ios->power_mode) {
                         case MMC_POWER_OFF:
                                 gpio_set_value(host->board->vcc_pin, 0);
@@ -897,7 +897,7 @@ static int at91_mci_get_ro(struct mmc_host *mmc)
 {
         struct at91mci_host *host = mmc_priv(mmc);
 
-        if (host->board->wp_pin)
+        if (gpio_is_valid(host->board->wp_pin))
                 return !!gpio_get_value(host->board->wp_pin);
         /*
          * Board doesn't support read only detection; let the mmc core
@@ -991,21 +991,21 @@ static int __init at91_mci_probe(struct platform_device *pdev)
          * Reserve GPIOs ... board init code makes sure these pins are set
          * up as GPIOs with the right direction (input, except for vcc)
          */
-        if (host->board->det_pin) {
+        if (gpio_is_valid(host->board->det_pin)) {
                 ret = gpio_request(host->board->det_pin, "mmc_detect");
                 if (ret < 0) {
                         dev_dbg(&pdev->dev, "couldn't claim card detect pin\n");
                         goto fail4b;
                 }
         }
-        if (host->board->wp_pin) {
+        if (gpio_is_valid(host->board->wp_pin)) {
                 ret = gpio_request(host->board->wp_pin, "mmc_wp");
                 if (ret < 0) {
                         dev_dbg(&pdev->dev, "couldn't claim wp sense pin\n");
                         goto fail4;
                 }
         }
-        if (host->board->vcc_pin) {
+        if (gpio_is_valid(host->board->vcc_pin)) {
                 ret = gpio_request(host->board->vcc_pin, "mmc_vcc");
                 if (ret < 0) {
                         dev_dbg(&pdev->dev, "couldn't claim vcc switch pin\n");
@@ -1057,7 +1057,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
         /*
          * Add host to MMC layer
          */
-        if (host->board->det_pin) {
+        if (gpio_is_valid(host->board->det_pin)) {
                 host->present = !gpio_get_value(host->board->det_pin);
         }
         else
@@ -1068,7 +1068,7 @@ static int __init at91_mci_probe(struct platform_device *pdev)
         /*
          * monitor card insertion/removal if we can
          */
-        if (host->board->det_pin) {
+        if (gpio_is_valid(host->board->det_pin)) {
                 ret = request_irq(gpio_to_irq(host->board->det_pin),
                                 at91_mmc_det_irq, 0, mmc_hostname(mmc), host);
                 if (ret)
@@ -1087,13 +1087,13 @@ fail0:
 fail1:
         clk_put(host->mci_clk);
 fail2:
-        if (host->board->vcc_pin)
+        if (gpio_is_valid(host->board->vcc_pin))
                 gpio_free(host->board->vcc_pin);
 fail3:
-        if (host->board->wp_pin)
+        if (gpio_is_valid(host->board->wp_pin))
                 gpio_free(host->board->wp_pin);
 fail4:
-        if (host->board->det_pin)
+        if (gpio_is_valid(host->board->det_pin))
                 gpio_free(host->board->det_pin);
 fail4b:
         if (host->buffer)
@@ -1125,7 +1125,7 @@ static int __exit at91_mci_remove(struct platform_device *pdev)
                 dma_free_coherent(&pdev->dev, MCI_BUFSIZE,
                                 host->buffer, host->physical_address);
 
-        if (host->board->det_pin) {
+        if (gpio_is_valid(host->board->det_pin)) {
                 if (device_can_wakeup(&pdev->dev))
                         free_irq(gpio_to_irq(host->board->det_pin), host);
                 device_init_wakeup(&pdev->dev, 0);
@@ -1140,9 +1140,9 @@ static int __exit at91_mci_remove(struct platform_device *pdev)
         clk_disable(host->mci_clk);                     /* Disable the peripheral clock */
         clk_put(host->mci_clk);
 
-        if (host->board->vcc_pin)
+        if (gpio_is_valid(host->board->vcc_pin))
                 gpio_free(host->board->vcc_pin);
-        if (host->board->wp_pin)
+        if (gpio_is_valid(host->board->wp_pin))
                 gpio_free(host->board->wp_pin);
 
         iounmap(host->baseaddr);
@@ -1163,7 +1163,7 @@ static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
         struct at91mci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        if (host->board->det_pin && device_may_wakeup(&pdev->dev))
+        if (gpio_is_valid(host->board->det_pin) && device_may_wakeup(&pdev->dev))
                 enable_irq_wake(host->board->det_pin);
 
         if (mmc)
@@ -1178,7 +1178,7 @@ static int at91_mci_resume(struct platform_device *pdev)
         struct at91mci_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        if (host->board->det_pin && device_may_wakeup(&pdev->dev))
+        if (gpio_is_valid(host->board->det_pin) && device_may_wakeup(&pdev->dev))
                 disable_irq_wake(host->board->det_pin);
 
         if (mmc)
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 211a4959c293..eeb8cd125b0c 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -679,8 +679,9 @@ static const struct mmc_host_ops mvsd_ops = {
         .enable_sdio_irq        = mvsd_enable_sdio_irq,
 };
 
-static void __init mv_conf_mbus_windows(struct mvsd_host *host,
-                                        struct mbus_dram_target_info *dram)
+static void __init
+mv_conf_mbus_windows(struct mvsd_host *host,
+                     const struct mbus_dram_target_info *dram)
 {
         void __iomem *iobase = host->base;
         int i;
@@ -691,7 +692,7 @@ static void __init mv_conf_mbus_windows(struct mvsd_host *host,
         }
 
         for (i = 0; i < dram->num_cs; i++) {
-                struct mbus_dram_window *cs = dram->cs + i;
+                const struct mbus_dram_window *cs = dram->cs + i;
                 writel(((cs->size - 1) & 0xffff0000) |
                        (cs->mbus_attr << 8) |
                        (dram->mbus_dram_target_id << 4) | 1,
@@ -705,6 +706,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
         struct mmc_host *mmc = NULL;
         struct mvsd_host *host = NULL;
         const struct mvsdio_platform_data *mvsd_data;
+        const struct mbus_dram_target_info *dram;
         struct resource *r;
         int ret, irq;
 
@@ -755,8 +757,9 @@ static int __init mvsd_probe(struct platform_device *pdev)
         }
 
         /* (Re-)program MBUS remapping windows if we are asked to. */
-        if (mvsd_data->dram != NULL)
-                mv_conf_mbus_windows(host, mvsd_data->dram);
+        dram = mv_mbus_dram_info();
+        if (dram)
+                mv_conf_mbus_windows(host, dram);
 
         mvsd_power_down(host);
 
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 99b449d26a4d..973011f9a298 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -713,7 +713,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
                 ret = PTR_ERR(host->clk);
                 goto out_iounmap;
         }
-        clk_enable(host->clk);
+        clk_prepare_enable(host->clk);
 
         mxs_mmc_reset(host);
 
@@ -772,7 +772,7 @@ out_free_dma:
         if (host->dmach)
                 dma_release_channel(host->dmach);
 out_clk_put:
-        clk_disable(host->clk);
+        clk_disable_unprepare(host->clk);
         clk_put(host->clk);
 out_iounmap:
         iounmap(host->base);
@@ -798,7 +798,7 @@ static int mxs_mmc_remove(struct platform_device *pdev)
         if (host->dmach)
                 dma_release_channel(host->dmach);
 
-        clk_disable(host->clk);
+        clk_disable_unprepare(host->clk);
         clk_put(host->clk);
 
         iounmap(host->base);
@@ -819,7 +819,7 @@ static int mxs_mmc_suspend(struct device *dev)
 
         ret = mmc_suspend_host(mmc);
 
-        clk_disable(host->clk);
+        clk_disable_unprepare(host->clk);
 
         return ret;
 }
@@ -830,7 +830,7 @@ static int mxs_mmc_resume(struct device *dev)
         struct mxs_mmc_host *host = mmc_priv(mmc);
         int ret = 0;
 
-        clk_enable(host->clk);
+        clk_prepare_enable(host->clk);
 
         ret = mmc_resume_host(mmc);
 
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index d5fe43d53c51..d1fb561e089d 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1991,6 +1991,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
         if (mmc_slot(host).nonremovable)
                 mmc->caps |= MMC_CAP_NONREMOVABLE;
 
+        mmc->pm_caps = mmc_slot(host).pm_caps;
+
         omap_hsmmc_conf_bus_power(host);
 
         /* Select DMA lines */
@@ -2179,13 +2181,7 @@ static int omap_hsmmc_suspend(struct device *dev)
                 cancel_work_sync(&host->mmc_carddetect_work);
                 ret = mmc_suspend_host(host->mmc);
 
-                if (ret == 0) {
-                        omap_hsmmc_disable_irq(host);
-                        OMAP_HSMMC_WRITE(host->base, HCTL,
-                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
-                        if (host->got_dbclk)
-                                clk_disable(host->dbclk);
-                } else {
+                if (ret) {
                         host->suspended = 0;
                         if (host->pdata->resume) {
                                 ret = host->pdata->resume(&pdev->dev,
@@ -2194,9 +2190,20 @@ static int omap_hsmmc_suspend(struct device *dev)
                                         dev_dbg(mmc_dev(host->mmc),
                                                 "Unmask interrupt failed\n");
                         }
+                        goto err;
                 }
-                pm_runtime_put_sync(host->dev);
+
+                if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER)) {
+                        omap_hsmmc_disable_irq(host);
+                        OMAP_HSMMC_WRITE(host->base, HCTL,
+                                OMAP_HSMMC_READ(host->base, HCTL) & ~SDBP);
+                }
+                if (host->got_dbclk)
+                        clk_disable(host->dbclk);
+
         }
+err:
+        pm_runtime_put_sync(host->dev);
         return ret;
 }
 
@@ -2216,7 +2223,8 @@ static int omap_hsmmc_resume(struct device *dev)
                 if (host->got_dbclk)
                         clk_enable(host->dbclk);
 
-                omap_hsmmc_conf_bus_power(host);
+                if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER))
+                        omap_hsmmc_conf_bus_power(host);
 
                 if (host->pdata->resume) {
                         ret = host->pdata->resume(&pdev->dev, host->slot_id);
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 0d33ff0d67fb..9a20d1f55bb7 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -435,14 +435,11 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 
         for (clks = 0, ptr = 0; ptr < MAX_BUS_CLK; ptr++) {
                 struct clk *clk;
-                char *name = pdata->clocks[ptr];
-
-                if (name == NULL)
-                        continue;
+                char name[14];
 
+                snprintf(name, 14, "mmc_busclk.%d", ptr);
                 clk = clk_get(dev, name);
                 if (IS_ERR(clk)) {
-                        dev_err(dev, "failed to get clock %s\n", name);
                         continue;
                 }
 
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 23e5d77c39fc..4dd056e2e16a 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -113,7 +113,7 @@ static int cpu_has_dma(void)
  */
 static void atmel_nand_enable(struct atmel_nand_host *host)
 {
-        if (host->board->enable_pin)
+        if (gpio_is_valid(host->board->enable_pin))
                 gpio_set_value(host->board->enable_pin, 0);
 }
 
@@ -122,7 +122,7 @@ static void atmel_nand_enable(struct atmel_nand_host *host)
  */
 static void atmel_nand_disable(struct atmel_nand_host *host)
 {
-        if (host->board->enable_pin)
+        if (gpio_is_valid(host->board->enable_pin))
                 gpio_set_value(host->board->enable_pin, 1);
 }
 
@@ -492,7 +492,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
         nand_chip->IO_ADDR_W = host->io_base;
         nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl;
 
-        if (host->board->rdy_pin)
+        if (gpio_is_valid(host->board->rdy_pin))
                 nand_chip->dev_ready = atmel_nand_device_ready;
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@@ -530,7 +530,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, host);
         atmel_nand_enable(host);
 
-        if (host->board->det_pin) {
+        if (gpio_is_valid(host->board->det_pin)) {
                 if (gpio_get_value(host->board->det_pin)) {
                         printk(KERN_INFO "No SmartMedia card inserted.\n");
                         res = -ENXIO;
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index de4db7604a3f..2a56fc6f399a 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -126,7 +126,7 @@ int gpmi_init(struct gpmi_nand_data *this)
         struct resources *r = &this->resources;
         int ret;
 
-        ret = clk_enable(r->clock);
+        ret = clk_prepare_enable(r->clock);
         if (ret)
                 goto err_out;
         ret = gpmi_reset_block(r->gpmi_regs, false);
@@ -146,7 +146,7 @@ int gpmi_init(struct gpmi_nand_data *this)
         /* Select BCH ECC. */
         writel(BM_GPMI_CTRL1_BCH_MODE, r->gpmi_regs + HW_GPMI_CTRL1_SET);
 
-        clk_disable(r->clock);
+        clk_disable_unprepare(r->clock);
         return 0;
 err_out:
         return ret;
@@ -202,7 +202,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
         ecc_strength  = bch_geo->ecc_strength >> 1;
         page_size     = bch_geo->page_size;
 
-        ret = clk_enable(r->clock);
+        ret = clk_prepare_enable(r->clock);
         if (ret)
                 goto err_out;
 
@@ -229,7 +229,7 @@ int bch_set_geometry(struct gpmi_nand_data *this)
         writel(BM_BCH_CTRL_COMPLETE_IRQ_EN,
                                 r->bch_regs + HW_BCH_CTRL_SET);
 
-        clk_disable(r->clock);
+        clk_disable_unprepare(r->clock);
         return 0;
 err_out:
         return ret;
@@ -704,7 +704,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
         int ret;
 
         /* Enable the clock. */
-        ret = clk_enable(r->clock);
+        ret = clk_prepare_enable(r->clock);
         if (ret) {
                 pr_err("We failed in enable the clk\n");
                 goto err_out;
@@ -773,7 +773,7 @@ err_out:
 void gpmi_end(struct gpmi_nand_data *this)
 {
         struct resources *r = &this->resources;
-        clk_disable(r->clock);
+        clk_disable_unprepare(r->clock);
 }
 
 /* Clears a BCH interrupt. */
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9845afb37cc8..b98285446a5a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -342,4 +342,6 @@ config VMXNET3
           To compile this driver as a module, choose M here: the
           module will be called vmxnet3.
 
+source "drivers/net/hyperv/Kconfig"
+
 endif # NETDEVICES
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1988881853ab..a6b8ce11a22f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -68,3 +68,5 @@ obj-$(CONFIG_USB_USBNET)        += usb/
 obj-$(CONFIG_USB_ZD1201)        += usb/
 obj-$(CONFIG_USB_IPHETH)        += usb/
 obj-$(CONFIG_USB_CDC_PHONET)   += usb/
+
+obj-$(CONFIG_HYPERV_NET) += hyperv/
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 165a4c798025..7fd8089946fb 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -802,7 +802,7 @@ static int flexcan_open(struct net_device *dev)
         struct flexcan_priv *priv = netdev_priv(dev);
         int err;
 
-        clk_enable(priv->clk);
+        clk_prepare_enable(priv->clk);
 
         err = open_candev(dev);
         if (err)
@@ -824,7 +824,7 @@ static int flexcan_open(struct net_device *dev)
  out_close:
         close_candev(dev);
  out:
-        clk_disable(priv->clk);
+        clk_disable_unprepare(priv->clk);
 
         return err;
 }
@@ -838,7 +838,7 @@ static int flexcan_close(struct net_device *dev)
         flexcan_chip_stop(dev);
 
         free_irq(dev->irq, dev);
-        clk_disable(priv->clk);
+        clk_disable_unprepare(priv->clk);
 
         close_candev(dev);
 
@@ -877,7 +877,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
         struct flexcan_regs __iomem *regs = priv->base;
         u32 reg, err;
 
-        clk_enable(priv->clk);
+        clk_prepare_enable(priv->clk);
 
         /* select "bus clock", chip must be disabled */
         flexcan_chip_disable(priv);
@@ -911,7 +911,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
  out:
         /* disable core and turn off clocks */
         flexcan_chip_disable(priv);
-        clk_disable(priv->clk);
+        clk_disable_unprepare(priv->clk);
 
         return err;
 }
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index cd6d69a6a7d2..08d5f0388877 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
 obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
-obj-$(CONFIG_NET_ATMEL) += cadence/
+obj-$(CONFIG_NET_CADENCE) += cadence/
 obj-$(CONFIG_NET_BFIN) += adi/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index a11a8ad94226..d44331eb07fe 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1469,7 +1469,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev,
         return 0;
 }
 
-static struct ethtool_ops bcm_enet_ethtool_ops = {
+static const struct ethtool_ops bcm_enet_ethtool_ops = {
         .get_strings            = bcm_enet_get_strings,
         .get_sset_count         = bcm_enet_get_sset_count,
         .get_ethtool_stats      = bcm_enet_get_ethtool_stats,
diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index b48378a41e49..db931916da08 100644
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -5,8 +5,8 @@
 config HAVE_NET_MACB
         bool
 
-config NET_ATMEL
-        bool "Atmel devices"
+config NET_CADENCE
+        bool "Cadence devices"
         default y
         depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
         ---help---
@@ -21,7 +21,7 @@ config NET_ATMEL
           the remaining Atmel network card questions. If you say Y, you will be
           asked for your specific card in the following questions.
 
-if NET_ATMEL
+if NET_CADENCE
 
 config ARM_AT91_ETHER
         tristate "AT91RM9200 Ethernet support"
@@ -33,14 +33,16 @@ config ARM_AT91_ETHER
           ethernet support, then you should always answer Y to this.
 
 config MACB
-        tristate "Atmel MACB support"
+        tristate "Cadence MACB/GEM support"
         depends on HAVE_NET_MACB
         select PHYLIB
         ---help---
-          The Atmel MACB ethernet interface is found on many AT32 and AT91
-          parts. Say Y to include support for the MACB chip.
+          The Cadence MACB ethernet interface is found on many Atmel AT32 and
+          AT91 parts.  This driver also supports the Cadence GEM (Gigabit
+          Ethernet MAC found in some ARM SoC devices).  Note: the Gigabit mode
+          is not yet supported.  Say Y to include support for the MACB/GEM chip.
 
           To compile this driver as a module, choose M here: the module
           will be called macb.
 
-endif # NET_ATMEL
+endif # NET_CADENCE
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 56624d303487..1a5b6efa0120 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -26,6 +26,7 @@
 #include <linux/skbuff.h>
 #include <linux/dma-mapping.h>
 #include <linux/ethtool.h>
+#include <linux/platform_data/macb.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <linux/gfp.h>
@@ -255,8 +256,7 @@ static void enable_phyirq(struct net_device *dev)
         unsigned int dsintr, irq_number;
         int status;
 
-        irq_number = lp->board_data.phy_irq_pin;
-        if (!irq_number) {
+        if (!gpio_is_valid(lp->board_data.phy_irq_pin)) {
                 /*
                  * PHY doesn't have an IRQ pin (RTL8201, DP83847, AC101L),
                  * or board does not have it connected.
@@ -265,6 +265,7 @@ static void enable_phyirq(struct net_device *dev)
                 return;
         }
 
+        irq_number = lp->board_data.phy_irq_pin;
         status = request_irq(irq_number, at91ether_phy_interrupt, 0, dev->name, dev);
         if (status) {
                 printk(KERN_ERR "at91_ether: PHY IRQ %d request failed - status %d!\n", irq_number, status);
@@ -319,8 +320,7 @@ static void disable_phyirq(struct net_device *dev)
         unsigned int dsintr;
         unsigned int irq_number;
 
-        irq_number = lp->board_data.phy_irq_pin;
-        if (!irq_number) {
+        if (!gpio_is_valid(lp->board_data.phy_irq_pin)) {
                 del_timer_sync(&lp->check_timer);
                 return;
         }
@@ -365,6 +365,7 @@ static void disable_phyirq(struct net_device *dev)
         disable_mdi();
         spin_unlock_irq(&lp->lock);
 
+        irq_number = lp->board_data.phy_irq_pin;
         free_irq(irq_number, dev);                      /* Free interrupt handler */
 }
 
@@ -984,7 +985,7 @@ static const struct net_device_ops at91ether_netdev_ops = {
 static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_address,
                         struct platform_device *pdev, struct clk *ether_clk)
 {
-        struct at91_eth_data *board_data = pdev->dev.platform_data;
+        struct macb_platform_data *board_data = pdev->dev.platform_data;
         struct net_device *dev;
         struct at91_private *lp;
         unsigned int val;
@@ -1077,7 +1078,7 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         netif_carrier_off(dev);         /* will be enabled in open() */
 
         /* If board has no PHY IRQ, use a timer to poll the PHY */
-        if (!lp->board_data.phy_irq_pin) {
+        if (!gpio_is_valid(lp->board_data.phy_irq_pin)) {
                 init_timer(&lp->check_timer);
                 lp->check_timer.data = (unsigned long)dev;
                 lp->check_timer.function = at91ether_check_link;
@@ -1169,7 +1170,8 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
         struct net_device *dev = platform_get_drvdata(pdev);
         struct at91_private *lp = netdev_priv(dev);
 
-        if (lp->board_data.phy_irq_pin >= 32)
+        if (gpio_is_valid(lp->board_data.phy_irq_pin) &&
+            lp->board_data.phy_irq_pin >= 32)
                 gpio_free(lp->board_data.phy_irq_pin);
 
         unregister_netdev(dev);
@@ -1188,11 +1190,12 @@ static int at91ether_suspend(struct platform_device *pdev, pm_message_t mesg)
 {
         struct net_device *net_dev = platform_get_drvdata(pdev);
         struct at91_private *lp = netdev_priv(net_dev);
-        int phy_irq = lp->board_data.phy_irq_pin;
 
         if (netif_running(net_dev)) {
-                if (phy_irq)
+                if (gpio_is_valid(lp->board_data.phy_irq_pin)) {
+                        int phy_irq = lp->board_data.phy_irq_pin;
                         disable_irq(phy_irq);
+                }
 
                 netif_stop_queue(net_dev);
                 netif_device_detach(net_dev);
@@ -1206,7 +1209,6 @@ static int at91ether_resume(struct platform_device *pdev)
 {
         struct net_device *net_dev = platform_get_drvdata(pdev);
         struct at91_private *lp = netdev_priv(net_dev);
-        int phy_irq = lp->board_data.phy_irq_pin;
 
         if (netif_running(net_dev)) {
                 clk_enable(lp->ether_clk);
@@ -1214,8 +1216,10 @@ static int at91ether_resume(struct platform_device *pdev)
                 netif_device_attach(net_dev);
                 netif_start_queue(net_dev);
 
-                if (phy_irq)
+                if (gpio_is_valid(lp->board_data.phy_irq_pin)) {
+                        int phy_irq = lp->board_data.phy_irq_pin;
                         enable_irq(phy_irq);
+                }
         }
         return 0;
 }
diff --git a/drivers/net/ethernet/cadence/at91_ether.h b/drivers/net/ethernet/cadence/at91_ether.h
index 353f4dab62be..3725fbb0defe 100644
--- a/drivers/net/ethernet/cadence/at91_ether.h
+++ b/drivers/net/ethernet/cadence/at91_ether.h
@@ -85,7 +85,9 @@ struct recv_desc_bufs
 struct at91_private
 {
         struct mii_if_info mii;                 /* ethtool support */
-        struct at91_eth_data board_data;        /* board-specific configuration */
+        struct macb_platform_data board_data;   /* board-specific
+                                                 * configuration (shared with
+                                                 * macb for common data */
         struct clk *ether_clk;                  /* clock */
 
         /* PHY */
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index a437b46e5490..f3d5c65d99cf 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1,5 +1,5 @@
 /*
- * Atmel MACB Ethernet Controller driver
+ * Cadence MACB/GEM Ethernet Controller driver
  *
  * Copyright (C) 2004-2006 Atmel Corporation
  *
@@ -8,6 +8,7 @@
  * published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/clk.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
@@ -19,11 +20,12 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/dma-mapping.h>
+#include <linux/platform_data/macb.h>
 #include <linux/platform_device.h>
 #include <linux/phy.h>
-
-#include <mach/board.h>
-#include <mach/cpu.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_net.h>
 
 #include "macb.h"
 
@@ -60,9 +62,9 @@ static void __macb_set_hwaddr(struct macb *bp)
         u16 top;
 
         bottom = cpu_to_le32(*((u32 *)bp->dev->dev_addr));
-        macb_writel(bp, SA1B, bottom);
+        macb_or_gem_writel(bp, SA1B, bottom);
         top = cpu_to_le16(*((u16 *)(bp->dev->dev_addr + 4)));
-        macb_writel(bp, SA1T, top);
+        macb_or_gem_writel(bp, SA1T, top);
 }
 
 static void __init macb_get_hwaddr(struct macb *bp)
@@ -71,8 +73,8 @@ static void __init macb_get_hwaddr(struct macb *bp)
         u16 top;
         u8 addr[6];
 
-        bottom = macb_readl(bp, SA1B);
-        top = macb_readl(bp, SA1T);
+        bottom = macb_or_gem_readl(bp, SA1B);
+        top = macb_or_gem_readl(bp, SA1T);
 
         addr[0] = bottom & 0xff;
         addr[1] = (bottom >> 8) & 0xff;
@@ -84,7 +86,7 @@ static void __init macb_get_hwaddr(struct macb *bp)
         if (is_valid_ether_addr(addr)) {
                 memcpy(bp->dev->dev_addr, addr, sizeof(addr));
         } else {
-                dev_info(&bp->pdev->dev, "invalid hw address, using random\n");
+                netdev_info(bp->dev, "invalid hw address, using random\n");
                 random_ether_addr(bp->dev->dev_addr);
         }
 }
@@ -178,11 +180,12 @@ static void macb_handle_link_change(struct net_device *dev)
 
         if (status_change) {
                 if (phydev->link)
-                        printk(KERN_INFO "%s: link up (%d/%s)\n",
-                               dev->name, phydev->speed,
-                               DUPLEX_FULL == phydev->duplex ? "Full":"Half");
+                        netdev_info(dev, "link up (%d/%s)\n",
+                                    phydev->speed,
+                                    phydev->duplex == DUPLEX_FULL ?
+                                    "Full" : "Half");
                 else
-                        printk(KERN_INFO "%s: link down\n", dev->name);
+                        netdev_info(dev, "link down\n");
         }
 }
 
@@ -191,25 +194,21 @@ static int macb_mii_probe(struct net_device *dev)
 {
         struct macb *bp = netdev_priv(dev);
         struct phy_device *phydev;
-        struct eth_platform_data *pdata;
         int ret;
 
         phydev = phy_find_first(bp->mii_bus);
         if (!phydev) {
-                printk (KERN_ERR "%s: no PHY found\n", dev->name);
+                netdev_err(dev, "no PHY found\n");
                 return -1;
         }
 
-        pdata = bp->pdev->dev.platform_data;
         /* TODO : add pin_irq */
 
         /* attach the mac to the phy */
         ret = phy_connect_direct(dev, phydev, &macb_handle_link_change, 0,
-                                 pdata && pdata->is_rmii ?
-                                 PHY_INTERFACE_MODE_RMII :
-                                 PHY_INTERFACE_MODE_MII);
+                                 bp->phy_interface);
         if (ret) {
-                printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
+                netdev_err(dev, "Could not attach to PHY\n");
                 return ret;
         }
 
@@ -228,7 +227,7 @@ static int macb_mii_probe(struct net_device *dev)
 
 static int macb_mii_init(struct macb *bp)
 {
-        struct eth_platform_data *pdata;
+        struct macb_platform_data *pdata;
         int err = -ENXIO, i;
 
         /* Enable management port */
@@ -285,8 +284,8 @@ err_out:
 static void macb_update_stats(struct macb *bp)
 {
         u32 __iomem *reg = bp->regs + MACB_PFR;
-        u32 *p = &bp->hw_stats.rx_pause_frames;
-        u32 *end = &bp->hw_stats.tx_pause_frames + 1;
+        u32 *p = &bp->hw_stats.macb.rx_pause_frames;
+        u32 *end = &bp->hw_stats.macb.tx_pause_frames + 1;
 
         WARN_ON((unsigned long)(end - p - 1) != (MACB_TPF - MACB_PFR) / 4);
 
@@ -303,14 +302,13 @@ static void macb_tx(struct macb *bp)
         status = macb_readl(bp, TSR);
         macb_writel(bp, TSR, status);
 
-        dev_dbg(&bp->pdev->dev, "macb_tx status = %02lx\n",
-                (unsigned long)status);
+        netdev_dbg(bp->dev, "macb_tx status = %02lx\n", (unsigned long)status);
 
         if (status & (MACB_BIT(UND) | MACB_BIT(TSR_RLE))) {
                 int i;
-                printk(KERN_ERR "%s: TX %s, resetting buffers\n",
-                        bp->dev->name, status & MACB_BIT(UND) ?
-                        "underrun" : "retry limit exceeded");
+                netdev_err(bp->dev, "TX %s, resetting buffers\n",
+                           status & MACB_BIT(UND) ?
+                           "underrun" : "retry limit exceeded");
 
                 /* Transfer ongoing, disable transmitter, to avoid confusion */
                 if (status & MACB_BIT(TGO))
@@ -369,8 +367,8 @@ static void macb_tx(struct macb *bp)
                 if (!(bufstat & MACB_BIT(TX_USED)))
                         break;
 
-                dev_dbg(&bp->pdev->dev, "skb %u (data %p) TX complete\n",
-                        tail, skb->data);
+                netdev_dbg(bp->dev, "skb %u (data %p) TX complete\n",
+                           tail, skb->data);
                 dma_unmap_single(&bp->pdev->dev, rp->mapping, skb->len,
                                  DMA_TO_DEVICE);
                 bp->stats.tx_packets++;
@@ -395,8 +393,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
 
         len = MACB_BFEXT(RX_FRMLEN, bp->rx_ring[last_frag].ctrl);
 
-        dev_dbg(&bp->pdev->dev, "macb_rx_frame frags %u - %u (len %u)\n",
-                first_frag, last_frag, len);
+        netdev_dbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",
+                   first_frag, last_frag, len);
 
         skb = dev_alloc_skb(len + RX_OFFSET);
         if (!skb) {
@@ -437,8 +435,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
 
         bp->stats.rx_packets++;
         bp->stats.rx_bytes += len;
-        dev_dbg(&bp->pdev->dev, "received skb of length %u, csum: %08x\n",
-                skb->len, skb->csum);
+        netdev_dbg(bp->dev, "received skb of length %u, csum: %08x\n",
+                   skb->len, skb->csum);
         netif_receive_skb(skb);
 
         return 0;
@@ -515,8 +513,8 @@ static int macb_poll(struct napi_struct *napi, int budget)
 
         work_done = 0;
 
-        dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n",
-                (unsigned long)status, budget);
+        netdev_dbg(bp->dev, "poll: status = %08lx, budget = %d\n",
+                   (unsigned long)status, budget);
 
         work_done = macb_rx(bp, budget);
         if (work_done < budget) {
@@ -565,8 +563,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
                         macb_writel(bp, IDR, MACB_RX_INT_FLAGS);
 
                         if (napi_schedule_prep(&bp->napi)) {
-                                dev_dbg(&bp->pdev->dev,
-                                        "scheduling RX softirq\n");
+                                netdev_dbg(bp->dev, "scheduling RX softirq\n");
                                 __napi_schedule(&bp->napi);
                         }
                 }
@@ -582,16 +579,19 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id)
 
                 if (status & MACB_BIT(ISR_ROVR)) {
                         /* We missed at least one packet */
-                        bp->hw_stats.rx_overruns++;
+                        if (macb_is_gem(bp))
+                                bp->hw_stats.gem.rx_overruns++;
+                        else
+                                bp->hw_stats.macb.rx_overruns++;
                 }
 
                 if (status & MACB_BIT(HRESP)) {
                         /*
-                         * TODO: Reset the hardware, and maybe move the printk
-                         * to a lower-priority context as well (work queue?)
+                         * TODO: Reset the hardware, and maybe move the
+                         * netdev_err to a lower-priority context as well
+                         * (work queue?)
                          */
-                        printk(KERN_ERR "%s: DMA bus error: HRESP not OK\n",
-                               dev->name);
+                        netdev_err(dev, "DMA bus error: HRESP not OK\n");
                 }
 
                 status = macb_readl(bp, ISR);
@@ -626,16 +626,12 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long flags;
 
 #ifdef DEBUG
-        int i;
-        dev_dbg(&bp->pdev->dev,
-                "start_xmit: len %u head %p data %p tail %p end %p\n",
-                skb->len, skb->head, skb->data,
-                skb_tail_pointer(skb), skb_end_pointer(skb));
-        dev_dbg(&bp->pdev->dev,
-                "data:");
-        for (i = 0; i < 16; i++)
-                printk(" %02x", (unsigned int)skb->data[i]);
-        printk("\n");
+        netdev_dbg(bp->dev,
+                   "start_xmit: len %u head %p data %p tail %p end %p\n",
+                   skb->len, skb->head, skb->data,
+                   skb_tail_pointer(skb), skb_end_pointer(skb));
+        print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_OFFSET, 16, 1,
+                       skb->data, 16, true);
 #endif
 
         len = skb->len;
@@ -645,21 +641,20 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
         if (TX_BUFFS_AVAIL(bp) < 1) {
                 netif_stop_queue(dev);
                 spin_unlock_irqrestore(&bp->lock, flags);
-                dev_err(&bp->pdev->dev,
-                        "BUG! Tx Ring full when queue awake!\n");
-                dev_dbg(&bp->pdev->dev, "tx_head = %u, tx_tail = %u\n",
-                        bp->tx_head, bp->tx_tail);
+                netdev_err(bp->dev, "BUG! Tx Ring full when queue awake!\n");
+                netdev_dbg(bp->dev, "tx_head = %u, tx_tail = %u\n",
+                           bp->tx_head, bp->tx_tail);
                 return NETDEV_TX_BUSY;
         }
 
         entry = bp->tx_head;
-        dev_dbg(&bp->pdev->dev, "Allocated ring entry %u\n", entry);
+        netdev_dbg(bp->dev, "Allocated ring entry %u\n", entry);
         mapping = dma_map_single(&bp->pdev->dev, skb->data,
                                  len, DMA_TO_DEVICE);
         bp->tx_skb[entry].skb = skb;
         bp->tx_skb[entry].mapping = mapping;
-        dev_dbg(&bp->pdev->dev, "Mapped skb data %p to DMA addr %08lx\n",
-                skb->data, (unsigned long)mapping);
+        netdev_dbg(bp->dev, "Mapped skb data %p to DMA addr %08lx\n",
+                   skb->data, (unsigned long)mapping);
 
         ctrl = MACB_BF(TX_FRMLEN, len);
         ctrl |= MACB_BIT(TX_LAST);
@@ -723,27 +718,27 @@ static int macb_alloc_consistent(struct macb *bp)
                                          &bp->rx_ring_dma, GFP_KERNEL);
         if (!bp->rx_ring)
                 goto out_err;
-        dev_dbg(&bp->pdev->dev,
-                "Allocated RX ring of %d bytes at %08lx (mapped %p)\n",
-                size, (unsigned long)bp->rx_ring_dma, bp->rx_ring);
+        netdev_dbg(bp->dev,
+                   "Allocated RX ring of %d bytes at %08lx (mapped %p)\n",
+                   size, (unsigned long)bp->rx_ring_dma, bp->rx_ring);
 
         size = TX_RING_BYTES;
         bp->tx_ring = dma_alloc_coherent(&bp->pdev->dev, size,
                                          &bp->tx_ring_dma, GFP_KERNEL);
         if (!bp->tx_ring)
                 goto out_err;
-        dev_dbg(&bp->pdev->dev,
-                "Allocated TX ring of %d bytes at %08lx (mapped %p)\n",
-                size, (unsigned long)bp->tx_ring_dma, bp->tx_ring);
+        netdev_dbg(bp->dev,
+                   "Allocated TX ring of %d bytes at %08lx (mapped %p)\n",
+                   size, (unsigned long)bp->tx_ring_dma, bp->tx_ring);
 
         size = RX_RING_SIZE * RX_BUFFER_SIZE;
         bp->rx_buffers = dma_alloc_coherent(&bp->pdev->dev, size,
                                             &bp->rx_buffers_dma, GFP_KERNEL);
         if (!bp->rx_buffers)
                 goto out_err;
-        dev_dbg(&bp->pdev->dev,
-                "Allocated RX buffers of %d bytes at %08lx (mapped %p)\n",
-                size, (unsigned long)bp->rx_buffers_dma, bp->rx_buffers);
+        netdev_dbg(bp->dev,
+                   "Allocated RX buffers of %d bytes at %08lx (mapped %p)\n",
+                   size, (unsigned long)bp->rx_buffers_dma, bp->rx_buffers);
 
         return 0;
 
@@ -797,6 +792,84 @@ static void macb_reset_hw(struct macb *bp)
         macb_readl(bp, ISR);
 }
 
+static u32 gem_mdc_clk_div(struct macb *bp)
+{
+        u32 config;
+        unsigned long pclk_hz = clk_get_rate(bp->pclk);
+
+        if (pclk_hz <= 20000000)
+                config = GEM_BF(CLK, GEM_CLK_DIV8);
+        else if (pclk_hz <= 40000000)
+                config = GEM_BF(CLK, GEM_CLK_DIV16);
+        else if (pclk_hz <= 80000000)
+                config = GEM_BF(CLK, GEM_CLK_DIV32);
+        else if (pclk_hz <= 120000000)
+                config = GEM_BF(CLK, GEM_CLK_DIV48);
+        else if (pclk_hz <= 160000000)
+                config = GEM_BF(CLK, GEM_CLK_DIV64);
+        else
+                config = GEM_BF(CLK, GEM_CLK_DIV96);
+
+        return config;
+}
+
+static u32 macb_mdc_clk_div(struct macb *bp)
+{
+        u32 config;
+        unsigned long pclk_hz;
+
+        if (macb_is_gem(bp))
+                return gem_mdc_clk_div(bp);
+
+        pclk_hz = clk_get_rate(bp->pclk);
+        if (pclk_hz <= 20000000)
+                config = MACB_BF(CLK, MACB_CLK_DIV8);
+        else if (pclk_hz <= 40000000)
+                config = MACB_BF(CLK, MACB_CLK_DIV16);
+        else if (pclk_hz <= 80000000)
+                config = MACB_BF(CLK, MACB_CLK_DIV32);
+        else
+                config = MACB_BF(CLK, MACB_CLK_DIV64);
+
+        return config;
+}
+
+/*
+ * Get the DMA bus width field of the network configuration register that we
+ * should program.  We find the width from decoding the design configuration
+ * register to find the maximum supported data bus width.
+ */
+static u32 macb_dbw(struct macb *bp)
+{
+        if (!macb_is_gem(bp))
+                return 0;
+
+        switch (GEM_BFEXT(DBWDEF, gem_readl(bp, DCFG1))) {
+        case 4:
+                return GEM_BF(DBW, GEM_DBW128);
+        case 2:
+                return GEM_BF(DBW, GEM_DBW64);
+        case 1:
+        default:
+                return GEM_BF(DBW, GEM_DBW32);
+        }
+}
+
+/*
+ * Configure the receive DMA engine to use the correct receive buffer size.
+ * This is a configurable parameter for GEM.
+ */
+static void macb_configure_dma(struct macb *bp)
+{
+        u32 dmacfg;
+
+        if (macb_is_gem(bp)) {
+                dmacfg = gem_readl(bp, DMACFG) & ~GEM_BF(RXBS, -1L);
+                dmacfg |= GEM_BF(RXBS, RX_BUFFER_SIZE / 64);
+                gem_writel(bp, DMACFG, dmacfg);
+        }
+}
+
 static void macb_init_hw(struct macb *bp)
 {
         u32 config;
@@ -804,7 +877,7 @@ static void macb_init_hw(struct macb *bp)
         macb_reset_hw(bp);
         __macb_set_hwaddr(bp);
 
-        config = macb_readl(bp, NCFGR) & MACB_BF(CLK, -1L);
+        config = macb_mdc_clk_div(bp);
         config |= MACB_BIT(PAE);                /* PAuse Enable */
         config |= MACB_BIT(DRFCS);              /* Discard Rx FCS */
         config |= MACB_BIT(BIG);                /* Receive oversized frames */
@@ -812,8 +885,11 @@ static void macb_init_hw(struct macb *bp)
                 config |= MACB_BIT(CAF);        /* Copy All Frames */
         if (!(bp->dev->flags & IFF_BROADCAST))
                 config |= MACB_BIT(NBC);        /* No BroadCast */
+        config |= macb_dbw(bp);
         macb_writel(bp, NCFGR, config);
 
+        macb_configure_dma(bp);
+
         /* Initialize TX and RX buffers */
         macb_writel(bp, RBQP, bp->rx_ring_dma);
         macb_writel(bp, TBQP, bp->tx_ring_dma);
@@ -909,8 +985,8 @@ static void macb_sethashtable(struct net_device *dev)
                 mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
         }
 
-        macb_writel(bp, HRB, mc_filter[0]);
-        macb_writel(bp, HRT, mc_filter[1]);
+        macb_or_gem_writel(bp, HRB, mc_filter[0]);
+        macb_or_gem_writel(bp, HRT, mc_filter[1]);
 }
 
 /*
@@ -932,8 +1008,8 @@ static void macb_set_rx_mode(struct net_device *dev)
 
         if (dev->flags & IFF_ALLMULTI) {
                 /* Enable all multicast mode */
-                macb_writel(bp, HRB, -1);
-                macb_writel(bp, HRT, -1);
+                macb_or_gem_writel(bp, HRB, -1);
+                macb_or_gem_writel(bp, HRT, -1);
                 cfg |= MACB_BIT(NCFGR_MTI);
         } else if (!netdev_mc_empty(dev)) {
                 /* Enable specific multicasts */
@@ -941,8 +1017,8 @@ static void macb_set_rx_mode(struct net_device *dev)
                 cfg |= MACB_BIT(NCFGR_MTI);
         } else if (dev->flags & (~IFF_ALLMULTI)) {
                 /* Disable all multicast mode */
-                macb_writel(bp, HRB, 0);
-                macb_writel(bp, HRT, 0);
+                macb_or_gem_writel(bp, HRB, 0);
+                macb_or_gem_writel(bp, HRT, 0);
                 cfg &= ~MACB_BIT(NCFGR_MTI);
         }
 
@@ -954,7 +1030,7 @@ static int macb_open(struct net_device *dev)
         struct macb *bp = netdev_priv(dev);
         int err;
 
-        dev_dbg(&bp->pdev->dev, "open\n");
+        netdev_dbg(bp->dev, "open\n");
 
         /* if the phy is not yet register, retry later*/
         if (!bp->phy_dev)
@@ -965,9 +1041,8 @@ static int macb_open(struct net_device *dev)
 
         err = macb_alloc_consistent(bp);
         if (err) {
-                printk(KERN_ERR
-                       "%s: Unable to allocate DMA memory (error %d)\n",
-                       dev->name, err);
+                netdev_err(dev, "Unable to allocate DMA memory (error %d)\n",
+                           err);
                 return err;
         }
 
@@ -1005,11 +1080,62 @@ static int macb_close(struct net_device *dev)
         return 0;
 }
 
+static void gem_update_stats(struct macb *bp)
+{
+        u32 __iomem *reg = bp->regs + GEM_OTX;
+        u32 *p = &bp->hw_stats.gem.tx_octets_31_0;
+        u32 *end = &bp->hw_stats.gem.rx_udp_checksum_errors + 1;
+
+        for (; p < end; p++, reg++)
+                *p += __raw_readl(reg);
+}
+
+static struct net_device_stats *gem_get_stats(struct macb *bp)
+{
+        struct gem_stats *hwstat = &bp->hw_stats.gem;
+        struct net_device_stats *nstat = &bp->stats;
+
+        gem_update_stats(bp);
+
+        nstat->rx_errors = (hwstat->rx_frame_check_sequence_errors +
+                            hwstat->rx_alignment_errors +
+                            hwstat->rx_resource_errors +
+                            hwstat->rx_overruns +
+                            hwstat->rx_oversize_frames +
+                            hwstat->rx_jabbers +
+                            hwstat->rx_undersized_frames +
+                            hwstat->rx_length_field_frame_errors);
+        nstat->tx_errors = (hwstat->tx_late_collisions +
+                            hwstat->tx_excessive_collisions +
+                            hwstat->tx_underrun +
+                            hwstat->tx_carrier_sense_errors);
+        nstat->multicast = hwstat->rx_multicast_frames;
+        nstat->collisions = (hwstat->tx_single_collision_frames +
+                             hwstat->tx_multiple_collision_frames +
+                             hwstat->tx_excessive_collisions);
+        nstat->rx_length_errors = (hwstat->rx_oversize_frames +
+                                   hwstat->rx_jabbers +
+                                   hwstat->rx_undersized_frames +
+                                   hwstat->rx_length_field_frame_errors);
+        nstat->rx_over_errors = hwstat->rx_resource_errors;
+        nstat->rx_crc_errors = hwstat->rx_frame_check_sequence_errors;
+        nstat->rx_frame_errors = hwstat->rx_alignment_errors;
+        nstat->rx_fifo_errors = hwstat->rx_overruns;
+        nstat->tx_aborted_errors = hwstat->tx_excessive_collisions;
+        nstat->tx_carrier_errors = hwstat->tx_carrier_sense_errors;
+        nstat->tx_fifo_errors = hwstat->tx_underrun;
+
+        return nstat;
+}
+
 static struct net_device_stats *macb_get_stats(struct net_device *dev)
 {
         struct macb *bp = netdev_priv(dev);
         struct net_device_stats *nstat = &bp->stats;
-        struct macb_stats *hwstat = &bp->hw_stats;
+        struct macb_stats *hwstat = &bp->hw_stats.macb;
+
+        if (macb_is_gem(bp))
+                return gem_get_stats(bp);
 
         /* read stats from hardware */
         macb_update_stats(bp);
@@ -1117,14 +1243,59 @@ static const struct net_device_ops macb_netdev_ops = {
 #endif
 };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id macb_dt_ids[] = {
+        { .compatible = "cdns,at32ap7000-macb" },
+        { .compatible = "cdns,at91sam9260-macb" },
+        { .compatible = "cdns,macb" },
+        { .compatible = "cdns,pc302-gem" },
+        { .compatible = "cdns,gem" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, macb_dt_ids);
+
+static int __devinit macb_get_phy_mode_dt(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+
+        if (np)
+                return of_get_phy_mode(np);
+
+        return -ENODEV;
+}
+
+static int __devinit macb_get_hwaddr_dt(struct macb *bp)
+{
+        struct device_node *np = bp->pdev->dev.of_node;
+        if (np) {
+                const char *mac = of_get_mac_address(np);
+                if (mac) {
+                        memcpy(bp->dev->dev_addr, mac, ETH_ALEN);
+                        return 0;
+                }
+        }
+
+        return -ENODEV;
+}
+#else
+static int __devinit macb_get_phy_mode_dt(struct platform_device *pdev)
+{
+        return -ENODEV;
+}
+static int __devinit macb_get_hwaddr_dt(struct macb *bp)
+{
+        return -ENODEV;
+}
+#endif
+
 static int __init macb_probe(struct platform_device *pdev)
 {
-        struct eth_platform_data *pdata;
+        struct macb_platform_data *pdata;
         struct resource *regs;
         struct net_device *dev;
         struct macb *bp;
         struct phy_device *phydev;
-        unsigned long pclk_hz;
         u32 config;
         int err = -ENXIO;
 
@@ -1152,28 +1323,19 @@ static int __init macb_probe(struct platform_device *pdev)
 
         spin_lock_init(&bp->lock);
 
-#if defined(CONFIG_ARCH_AT91)
-        bp->pclk = clk_get(&pdev->dev, "macb_clk");
+        bp->pclk = clk_get(&pdev->dev, "pclk");
         if (IS_ERR(bp->pclk)) {
                 dev_err(&pdev->dev, "failed to get macb_clk\n");
                 goto err_out_free_dev;
         }
         clk_enable(bp->pclk);
-#else
-        bp->pclk = clk_get(&pdev->dev, "pclk");
-        if (IS_ERR(bp->pclk)) {
-                dev_err(&pdev->dev, "failed to get pclk\n");
-                goto err_out_free_dev;
-        }
+
         bp->hclk = clk_get(&pdev->dev, "hclk");
         if (IS_ERR(bp->hclk)) {
                 dev_err(&pdev->dev, "failed to get hclk\n");
                 goto err_out_put_pclk;
         }
-
-        clk_enable(bp->pclk);
         clk_enable(bp->hclk);
-#endif
 
         bp->regs = ioremap(regs->start, resource_size(regs));
         if (!bp->regs) {
@@ -1185,9 +1347,8 @@ static int __init macb_probe(struct platform_device *pdev)
         dev->irq = platform_get_irq(pdev, 0);
         err = request_irq(dev->irq, macb_interrupt, 0, dev->name, dev);
         if (err) {
-                printk(KERN_ERR
-                       "%s: Unable to request IRQ %d (error %d)\n",
-                       dev->name, dev->irq, err);
+                dev_err(&pdev->dev, "Unable to request IRQ %d (error %d)\n",
+                        dev->irq, err);
                 goto err_out_iounmap;
         }
 
@@ -1198,31 +1359,37 @@ static int __init macb_probe(struct platform_device *pdev)
         dev->base_addr = regs->start;
 
         /* Set MII management clock divider */
-        pclk_hz = clk_get_rate(bp->pclk);
-        if (pclk_hz <= 20000000)
-                config = MACB_BF(CLK, MACB_CLK_DIV8);
-        else if (pclk_hz <= 40000000)
-                config = MACB_BF(CLK, MACB_CLK_DIV16);
-        else if (pclk_hz <= 80000000)
-                config = MACB_BF(CLK, MACB_CLK_DIV32);
-        else
-                config = MACB_BF(CLK, MACB_CLK_DIV64);
+        config = macb_mdc_clk_div(bp);
+        config |= macb_dbw(bp);
         macb_writel(bp, NCFGR, config);
 
-        macb_get_hwaddr(bp);
-        pdata = pdev->dev.platform_data;
+        err = macb_get_hwaddr_dt(bp);
+        if (err < 0)
+                macb_get_hwaddr(bp);
+
+        err = macb_get_phy_mode_dt(pdev);
+        if (err < 0) {
+                pdata = pdev->dev.platform_data;
+                if (pdata && pdata->is_rmii)
+                        bp->phy_interface = PHY_INTERFACE_MODE_RMII;
+                else
+                        bp->phy_interface = PHY_INTERFACE_MODE_MII;
+        } else {
+                bp->phy_interface = err;
+        }
 
-        if (pdata && pdata->is_rmii)
+        if (bp->phy_interface == PHY_INTERFACE_MODE_RMII)
 #if defined(CONFIG_ARCH_AT91)
-                macb_writel(bp, USRIO, (MACB_BIT(RMII) | MACB_BIT(CLKEN)) );
+                macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) |
+                                               MACB_BIT(CLKEN)));
 #else
-                macb_writel(bp, USRIO, 0);
+                macb_or_gem_writel(bp, USRIO, 0);
 #endif
         else
 #if defined(CONFIG_ARCH_AT91)
-                macb_writel(bp, USRIO, MACB_BIT(CLKEN));
+                macb_or_gem_writel(bp, USRIO, MACB_BIT(CLKEN));
 #else
-                macb_writel(bp, USRIO, MACB_BIT(MII));
+                macb_or_gem_writel(bp, USRIO, MACB_BIT(MII));
 #endif
 
         bp->tx_pending = DEF_TX_RING_PENDING;
@@ -1239,13 +1406,13 @@ static int __init macb_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n",
-               dev->name, dev->base_addr, dev->irq, dev->dev_addr);
+        netdev_info(dev, "Cadence %s at 0x%08lx irq %d (%pM)\n",
+                    macb_is_gem(bp) ? "GEM" : "MACB", dev->base_addr,
+                    dev->irq, dev->dev_addr);
 
         phydev = bp->phy_dev;
-        printk(KERN_INFO "%s: attached PHY driver [%s] "
-                "(mii_bus:phy_addr=%s, irq=%d)\n", dev->name,
-                phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
+        netdev_info(dev, "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",
+                    phydev->drv->name, dev_name(&phydev->dev), phydev->irq);
 
         return 0;
 
@@ -1256,14 +1423,10 @@ err_out_free_irq:
 err_out_iounmap:
         iounmap(bp->regs);
 err_out_disable_clocks:
-#ifndef CONFIG_ARCH_AT91
         clk_disable(bp->hclk);
         clk_put(bp->hclk);
-#endif
         clk_disable(bp->pclk);
-#ifndef CONFIG_ARCH_AT91
 err_out_put_pclk:
-#endif
         clk_put(bp->pclk);
 err_out_free_dev:
         free_netdev(dev);
@@ -1289,10 +1452,8 @@ static int __exit macb_remove(struct platform_device *pdev)
                 unregister_netdev(dev);
                 free_irq(dev->irq, dev);
                 iounmap(bp->regs);
-#ifndef CONFIG_ARCH_AT91
                 clk_disable(bp->hclk);
                 clk_put(bp->hclk);
-#endif
                 clk_disable(bp->pclk);
                 clk_put(bp->pclk);
                 free_netdev(dev);
@@ -1310,9 +1471,7 @@ static int macb_suspend(struct platform_device *pdev, pm_message_t state)
 
         netif_device_detach(netdev);
 
-#ifndef CONFIG_ARCH_AT91
         clk_disable(bp->hclk);
-#endif
         clk_disable(bp->pclk);
 
         return 0;
@@ -1324,9 +1483,7 @@ static int macb_resume(struct platform_device *pdev)
         struct macb *bp = netdev_priv(netdev);
 
         clk_enable(bp->pclk);
-#ifndef CONFIG_ARCH_AT91
         clk_enable(bp->hclk);
-#endif
 
         netif_device_attach(netdev);
 
@@ -1344,6 +1501,7 @@ static struct platform_driver macb_driver = {
         .driver         = {
                 .name           = "macb",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(macb_dt_ids),
         },
 };
 
@@ -1361,6 +1519,6 @@ module_init(macb_init);
 module_exit(macb_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Atmel MACB Ethernet driver");
+MODULE_DESCRIPTION("Cadence MACB/GEM Ethernet driver");
 MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
 MODULE_ALIAS("platform:macb");
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index d3212f6db703..335e288f5314 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -59,6 +59,24 @@
 #define MACB_TPQ                                0x00bc
 #define MACB_USRIO                              0x00c0
 #define MACB_WOL                                0x00c4
+#define MACB_MID                                0x00fc
+
+/* GEM register offsets. */
+#define GEM_NCFGR                               0x0004
+#define GEM_USRIO                               0x000c
+#define GEM_DMACFG                              0x0010
+#define GEM_HRB                                 0x0080
+#define GEM_HRT                                 0x0084
+#define GEM_SA1B                                0x0088
+#define GEM_SA1T                                0x008C
+#define GEM_OTX                                 0x0100
+#define GEM_DCFG1                               0x0280
+#define GEM_DCFG2                               0x0284
+#define GEM_DCFG3                               0x0288
+#define GEM_DCFG4                               0x028c
+#define GEM_DCFG5                               0x0290
+#define GEM_DCFG6                               0x0294
+#define GEM_DCFG7                               0x0298
 
 /* Bitfields in NCR */
 #define MACB_LB_OFFSET                          0
@@ -126,6 +144,21 @@
 #define MACB_IRXFCS_OFFSET                      19
 #define MACB_IRXFCS_SIZE                        1
 
+/* GEM specific NCFGR bitfields. */
+#define GEM_CLK_OFFSET                          18
+#define GEM_CLK_SIZE                            3
+#define GEM_DBW_OFFSET                          21
+#define GEM_DBW_SIZE                            2
+
+/* Constants for data bus width. */
+#define GEM_DBW32                               0
+#define GEM_DBW64                               1
+#define GEM_DBW128                              2
+
+/* Bitfields in DMACFG. */
+#define GEM_RXBS_OFFSET                         16
+#define GEM_RXBS_SIZE                           8
+
 /* Bitfields in NSR */
 #define MACB_NSR_LINK_OFFSET                    0
 #define MACB_NSR_LINK_SIZE                      1
@@ -228,12 +261,30 @@
 #define MACB_WOL_MTI_OFFSET                     19
 #define MACB_WOL_MTI_SIZE                       1
 
+/* Bitfields in MID */
+#define MACB_IDNUM_OFFSET                       16
+#define MACB_IDNUM_SIZE                         16
+#define MACB_REV_OFFSET                         0
+#define MACB_REV_SIZE                           16
+
+/* Bitfields in DCFG1. */
+#define GEM_DBWDEF_OFFSET                       25
+#define GEM_DBWDEF_SIZE                         3
+
 /* Constants for CLK */
 #define MACB_CLK_DIV8                           0
 #define MACB_CLK_DIV16                          1
 #define MACB_CLK_DIV32                          2
 #define MACB_CLK_DIV64                          3
 
+/* GEM specific constants for CLK. */
+#define GEM_CLK_DIV8                            0
+#define GEM_CLK_DIV16                           1
+#define GEM_CLK_DIV32                           2
+#define GEM_CLK_DIV48                           3
+#define GEM_CLK_DIV64                           4
+#define GEM_CLK_DIV96                           5
+
 /* Constants for MAN register */
 #define MACB_MAN_SOF                            1
 #define MACB_MAN_WRITE                          1
@@ -254,11 +305,52 @@
                     << MACB_##name##_OFFSET))           \
          | MACB_BF(name,value))
 
+#define GEM_BIT(name)                                   \
+        (1 << GEM_##name##_OFFSET)
+#define GEM_BF(name, value)                             \
+        (((value) & ((1 << GEM_##name##_SIZE) - 1))     \
+         << GEM_##name##_OFFSET)
+#define GEM_BFEXT(name, value)\
+        (((value) >> GEM_##name##_OFFSET)               \
+         & ((1 << GEM_##name##_SIZE) - 1))
+#define GEM_BFINS(name, value, old)                     \
+        (((old) & ~(((1 << GEM_##name##_SIZE) - 1)      \
+                    << GEM_##name##_OFFSET))            \
+         | GEM_BF(name, value))
+
 /* Register access macros */
 #define macb_readl(port,reg)                            \
         __raw_readl((port)->regs + MACB_##reg)
 #define macb_writel(port,reg,value)                     \
         __raw_writel((value), (port)->regs + MACB_##reg)
+#define gem_readl(port, reg)                            \
+        __raw_readl((port)->regs + GEM_##reg)
+#define gem_writel(port, reg, value)                    \
+        __raw_writel((value), (port)->regs + GEM_##reg)
+
+/*
+ * Conditional GEM/MACB macros.  These perform the operation to the correct
+ * register dependent on whether the device is a GEM or a MACB.  For registers
+ * and bitfields that are common across both devices, use macb_{read,write}l
+ * to avoid the cost of the conditional.
+ */
+#define macb_or_gem_writel(__bp, __reg, __value) \
+        ({ \
+                if (macb_is_gem((__bp))) \
+                        gem_writel((__bp), __reg, __value); \
+                else \
+                        macb_writel((__bp), __reg, __value); \
+        })
+
+#define macb_or_gem_readl(__bp, __reg) \
+        ({ \
+                u32 __v; \
+                if (macb_is_gem((__bp))) \
+                        __v = gem_readl((__bp), __reg); \
+                else \
+                        __v = macb_readl((__bp), __reg); \
+                __v; \
+        })
 
 struct dma_desc {
         u32     addr;
@@ -358,6 +450,54 @@ struct macb_stats {
         u32     tx_pause_frames;
 };
 
+struct gem_stats {
+        u32     tx_octets_31_0;
+        u32     tx_octets_47_32;
+        u32     tx_frames;
+        u32     tx_broadcast_frames;
+        u32     tx_multicast_frames;
+        u32     tx_pause_frames;
+        u32     tx_64_byte_frames;
+        u32     tx_65_127_byte_frames;
+        u32     tx_128_255_byte_frames;
+        u32     tx_256_511_byte_frames;
+        u32     tx_512_1023_byte_frames;
+        u32     tx_1024_1518_byte_frames;
+        u32     tx_greater_than_1518_byte_frames;
+        u32     tx_underrun;
+        u32     tx_single_collision_frames;
+        u32     tx_multiple_collision_frames;
+        u32     tx_excessive_collisions;
+        u32     tx_late_collisions;
+        u32     tx_deferred_frames;
+        u32     tx_carrier_sense_errors;
+        u32     rx_octets_31_0;
+        u32     rx_octets_47_32;
+        u32     rx_frames;
+        u32     rx_broadcast_frames;
+        u32     rx_multicast_frames;
+        u32     rx_pause_frames;
+        u32     rx_64_byte_frames;
+        u32     rx_65_127_byte_frames;
+        u32     rx_128_255_byte_frames;
+        u32     rx_256_511_byte_frames;
+        u32     rx_512_1023_byte_frames;
+        u32     rx_1024_1518_byte_frames;
+        u32     rx_greater_than_1518_byte_frames;
+        u32     rx_undersized_frames;
+        u32     rx_oversize_frames;
+        u32     rx_jabbers;
+        u32     rx_frame_check_sequence_errors;
+        u32     rx_length_field_frame_errors;
+        u32     rx_symbol_errors;
+        u32     rx_alignment_errors;
+        u32     rx_resource_errors;
+        u32     rx_overruns;
+        u32     rx_ip_header_checksum_errors;
+        u32     rx_tcp_checksum_errors;
+        u32     rx_udp_checksum_errors;
+};
+
 struct macb {
         void __iomem            *regs;
 
@@ -376,7 +516,10 @@ struct macb {
         struct net_device       *dev;
         struct napi_struct      napi;
         struct net_device_stats stats;
-        struct macb_stats       hw_stats;
+        union {
+                struct macb_stats       macb;
+                struct gem_stats        gem;
+        }                       hw_stats;
 
         dma_addr_t              rx_ring_dma;
         dma_addr_t              tx_ring_dma;
@@ -389,6 +532,13 @@ struct macb {
         unsigned int            link;
         unsigned int            speed;
         unsigned int            duplex;
+
+        phy_interface_t         phy_interface;
 };
 
+static inline bool macb_is_gem(struct macb *bp)
+{
+        return MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2;
+}
+
 #endif /* _MACB_H */
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 6c46753aeb43..a6bcdb5cd2be 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3080,7 +3080,7 @@ fw_exit:
         return status;
 }
 
-static struct net_device_ops be_netdev_ops = {
+static const struct net_device_ops be_netdev_ops = {
         .ndo_open               = be_open,
         .ndo_stop               = be_close,
         .ndo_start_xmit         = be_xmit,
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 20c2e3f3e18a..ddcbbb34d1b9 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1610,7 +1610,7 @@ fec_probe(struct platform_device *pdev)
                 ret = PTR_ERR(fep->clk);
                 goto failed_clk;
         }
-        clk_enable(fep->clk);
+        clk_prepare_enable(fep->clk);
 
         ret = fec_enet_init(ndev);
         if (ret)
@@ -1633,7 +1633,7 @@ failed_register:
         fec_enet_mii_remove(fep);
 failed_mii_init:
 failed_init:
-        clk_disable(fep->clk);
+        clk_disable_unprepare(fep->clk);
         clk_put(fep->clk);
 failed_clk:
         for (i = 0; i < FEC_IRQ_NUM; i++) {
@@ -1666,7 +1666,7 @@ fec_drv_remove(struct platform_device *pdev)
                 if (irq > 0)
                         free_irq(irq, ndev);
         }
-        clk_disable(fep->clk);
+        clk_disable_unprepare(fep->clk);
         clk_put(fep->clk);
         iounmap(fep->hwp);
         free_netdev(ndev);
@@ -1691,7 +1691,7 @@ fec_suspend(struct device *dev)
                 fec_stop(ndev);
                 netif_device_detach(ndev);
         }
-        clk_disable(fep->clk);
+        clk_disable_unprepare(fep->clk);
 
         return 0;
 }
@@ -1702,7 +1702,7 @@ fec_resume(struct device *dev)
         struct net_device *ndev = dev_get_drvdata(dev);
         struct fec_enet_private *fep = netdev_priv(ndev);
 
-        clk_enable(fep->clk);
+        clk_prepare_enable(fep->clk);
         if (netif_running(ndev)) {
                 fec_restart(ndev, fep->full_duplex);
                 netif_device_attach(ndev);
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index e87847e32ddb..80aab4e5d695 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2511,7 +2511,7 @@ static void mv643xx_eth_netpoll(struct net_device *dev)
 /* platform glue ************************************************************/
 static void
 mv643xx_eth_conf_mbus_windows(struct mv643xx_eth_shared_private *msp,
-                              struct mbus_dram_target_info *dram)
+                              const struct mbus_dram_target_info *dram)
 {
         void __iomem *base = msp->base;
         u32 win_enable;
@@ -2529,7 +2529,7 @@ mv643xx_eth_conf_mbus_windows(struct mv643xx_eth_shared_private *msp,
         win_protect = 0;
 
         for (i = 0; i < dram->num_cs; i++) {
-                struct mbus_dram_window *cs = dram->cs + i;
+                const struct mbus_dram_window *cs = dram->cs + i;
 
                 writel((cs->base & 0xffff0000) |
                         (cs->mbus_attr << 8) |
@@ -2579,6 +2579,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
         static int mv643xx_eth_version_printed;
         struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data;
         struct mv643xx_eth_shared_private *msp;
+        const struct mbus_dram_target_info *dram;
         struct resource *res;
         int ret;
 
@@ -2643,8 +2644,9 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
         /*
          * (Re-)program MBUS remapping windows if we are asked to.
          */
-        if (pd != NULL && pd->dram != NULL)
-                mv643xx_eth_conf_mbus_windows(msp, pd->dram);
+        dram = mv_mbus_dram_info();
+        if (dram)
+                mv643xx_eth_conf_mbus_windows(msp, dram);
 
         /*
          * Detect hardware parameters.
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index 87aa43935070..cb0eca807852 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1160,7 +1160,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         lp->dev = dev;
 
         /* Init RDC private data */
-        lp->mcr0 = MCR0_XMTEN | MCR0;
+        lp->mcr0 = MCR0_XMTEN | MCR0_RCVEN;
 
         /* The RDC-specific entries in the device structure. */
         dev->netdev_ops = &r6040_netdev_ops;
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index cc6b391479ca..abc79076f867 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -563,6 +563,7 @@ rx_next:
                 if (cpr16(IntrStatus) & cp_rx_intr_mask)
                         goto rx_status_loop;
 
+                napi_gro_flush(napi);
                 spin_lock_irqsave(&cp->lock, flags);
                 __napi_complete(napi);
                 cpw16_f(IntrMask, cp_intr_mask);
diff --git a/drivers/net/ethernet/smsc/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
index 938ecf290813..9ad5e5d39a03 100644
--- a/drivers/net/ethernet/smsc/smsc911x.h
+++ b/drivers/net/ethernet/smsc/smsc911x.h
@@ -401,8 +401,6 @@
 #include <asm/smsc911x.h>
 #endif
 
-#ifdef CONFIG_SMSC_PHY
 #include <linux/smscphy.h>
-#endif
 
 #endif                          /* __SMSC911X_H__ */
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index 6b75063988ec..d9951afb9269 100644
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -2260,8 +2260,7 @@ static int tile_net_get_mac(struct net_device *dev)
         return 0;
 }
 
-
-static struct net_device_ops tile_net_ops = {
+static const struct net_device_ops tile_net_ops = {
         .ndo_open = tile_net_open,
         .ndo_stop = tile_net_stop,
         .ndo_start_xmit = tile_net_tx,
diff --git a/drivers/net/hyperv/Kconfig b/drivers/net/hyperv/Kconfig
new file mode 100644
index 000000000000..936968d23559
--- /dev/null
+++ b/drivers/net/hyperv/Kconfig
@@ -0,0 +1,5 @@
+config HYPERV_NET
+        tristate "Microsoft Hyper-V virtual network driver"
+        depends on HYPERV
+        help
+          Select this option to enable the Hyper-V virtual network driver.
diff --git a/drivers/net/hyperv/Makefile b/drivers/net/hyperv/Makefile
new file mode 100644
index 000000000000..c8a66827100c
--- /dev/null
+++ b/drivers/net/hyperv/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_HYPERV_NET) += hv_netvsc.o
+
+hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
diff --git a/drivers/staging/hv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index ac1ec8405124..dec5836ae075 100644
--- a/drivers/staging/hv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -39,9 +39,6 @@ struct xferpage_packet {
         u32 count;
 };
 
-/* The number of pages which are enough to cover jumbo frame buffer. */
-#define NETVSC_PACKET_MAXPAGE           4
-
 /*
  * Represent netvsc packet which contains 1 RNDIS and 1 ethernet frame
  * within the RNDIS
@@ -77,8 +74,9 @@ struct hv_netvsc_packet {
 
         u32 total_data_buflen;
         /* Points to the send/receive buffer where the ethernet frame is */
+        void *data;
         u32 page_buf_cnt;
-        struct hv_page_buffer page_buf[NETVSC_PACKET_MAXPAGE];
+        struct hv_page_buffer page_buf[0];
 };
 
 struct netvsc_device_info {
@@ -87,6 +85,27 @@ struct netvsc_device_info {
         int  ring_size;
 };
 
+enum rndis_device_state {
+        RNDIS_DEV_UNINITIALIZED = 0,
+        RNDIS_DEV_INITIALIZING,
+        RNDIS_DEV_INITIALIZED,
+        RNDIS_DEV_DATAINITIALIZED,
+};
+
+struct rndis_device {
+        struct netvsc_device *net_dev;
+
+        enum rndis_device_state state;
+        bool link_state;
+        atomic_t new_req_id;
+
+        spinlock_t request_lock;
+        struct list_head req_list;
+
+        unsigned char hw_mac_adr[ETH_ALEN];
+};
+
+
 /* Interface */
 int netvsc_device_add(struct hv_device *device, void *additional_info);
 int netvsc_device_remove(struct hv_device *device);
@@ -109,11 +128,13 @@ int rndis_filter_receive(struct hv_device *dev,
 int rndis_filter_send(struct hv_device *dev,
                         struct hv_netvsc_packet *pkt);
 
+int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter);
+
+
 #define NVSP_INVALID_PROTOCOL_VERSION   ((u32)0xFFFFFFFF)
 
 #define NVSP_PROTOCOL_VERSION_1         2
-#define NVSP_MIN_PROTOCOL_VERSION       NVSP_PROTOCOL_VERSION_1
-#define NVSP_MAX_PROTOCOL_VERSION       NVSP_PROTOCOL_VERSION_1
+#define NVSP_PROTOCOL_VERSION_2         0x30002
 
 enum {
         NVSP_MSG_TYPE_NONE = 0,
@@ -138,11 +159,36 @@ enum {
         NVSP_MSG1_TYPE_SEND_RNDIS_PKT,
         NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE,
 
-        /*
-         * This should be set to the number of messages for the version with
-         * the maximum number of messages.
-         */
-        NVSP_NUM_MSG_PER_VERSION                = 9,
+        /* Version 2 messages */
+        NVSP_MSG2_TYPE_SEND_CHIMNEY_DELEGATED_BUF,
+        NVSP_MSG2_TYPE_SEND_CHIMNEY_DELEGATED_BUF_COMP,
+        NVSP_MSG2_TYPE_REVOKE_CHIMNEY_DELEGATED_BUF,
+
+        NVSP_MSG2_TYPE_RESUME_CHIMNEY_RX_INDICATION,
+
+        NVSP_MSG2_TYPE_TERMINATE_CHIMNEY,
+        NVSP_MSG2_TYPE_TERMINATE_CHIMNEY_COMP,
+
+        NVSP_MSG2_TYPE_INDICATE_CHIMNEY_EVENT,
+
+        NVSP_MSG2_TYPE_SEND_CHIMNEY_PKT,
+        NVSP_MSG2_TYPE_SEND_CHIMNEY_PKT_COMP,
+
+        NVSP_MSG2_TYPE_POST_CHIMNEY_RECV_REQ,
+        NVSP_MSG2_TYPE_POST_CHIMNEY_RECV_REQ_COMP,
+
+        NVSP_MSG2_TYPE_ALLOC_RXBUF,
+        NVSP_MSG2_TYPE_ALLOC_RXBUF_COMP,
+
+        NVSP_MSG2_TYPE_FREE_RXBUF,
+
+        NVSP_MSG2_TYPE_SEND_VMQ_RNDIS_PKT,
+        NVSP_MSG2_TYPE_SEND_VMQ_RNDIS_PKT_COMP,
+
+        NVSP_MSG2_TYPE_SEND_NDIS_CONFIG,
+
+        NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE,
+        NVSP_MSG2_TYPE_ALLOC_CHIMNEY_HANDLE_COMP,
 };
 
 enum {
@@ -153,6 +199,7 @@ enum {
         NVSP_STAT_PROTOCOL_TOO_OLD,
         NVSP_STAT_INVALID_RNDIS_PKT,
         NVSP_STAT_BUSY,
+        NVSP_STAT_PROTOCOL_UNSUPPORTED,
         NVSP_STAT_MAX,
 };
 
@@ -337,9 +384,69 @@ union nvsp_1_message_uber {
                                                 send_rndis_pkt_complete;
 } __packed;
 
+
+/*
+ * Network VSP protocol version 2 messages:
+ */
+struct nvsp_2_vsc_capability {
+        union {
+                u64 data;
+                struct {
+                        u64 vmq:1;
+                        u64 chimney:1;
+                        u64 sriov:1;
+                        u64 ieee8021q:1;
+                        u64 correlation_id:1;
+                };
+        };
+} __packed;
+
+struct nvsp_2_send_ndis_config {
+        u32 mtu;
+        u32 reserved;
+        struct nvsp_2_vsc_capability capability;
+} __packed;
+
+/* Allocate receive buffer */
+struct nvsp_2_alloc_rxbuf {
+        /* Allocation ID to match the allocation request and response */
+        u32 alloc_id;
+
+        /* Length of the VM shared memory receive buffer that needs to
+         * be allocated
+         */
+        u32 len;
+} __packed;
+
+/* Allocate receive buffer complete */
+struct nvsp_2_alloc_rxbuf_comp {
+        /* The NDIS_STATUS code for buffer allocation */
+        u32 status;
+
+        u32 alloc_id;
+
+        /* GPADL handle for the allocated receive buffer */
+        u32 gpadl_handle;
+
+        /* Receive buffer ID */
+        u64 recv_buf_id;
+} __packed;
+
+struct nvsp_2_free_rxbuf {
+        u64 recv_buf_id;
+} __packed;
+
+union nvsp_2_message_uber {
+        struct nvsp_2_send_ndis_config send_ndis_config;
+        struct nvsp_2_alloc_rxbuf alloc_rxbuf;
+        struct nvsp_2_alloc_rxbuf_comp alloc_rxbuf_comp;
+        struct nvsp_2_free_rxbuf free_rxbuf;
+} __packed;
+
 union nvsp_all_messages {
         union nvsp_message_init_uber init_msg;
         union nvsp_1_message_uber v1_msg;
+        union nvsp_2_message_uber v2_msg;
 } __packed;
 
 /* ALL Messages */
@@ -349,12 +456,9 @@ struct nvsp_message {
 } __packed;
 
 
+#define NETVSC_MTU 65536
 
-
-/* #define NVSC_MIN_PROTOCOL_VERSION            1 */
-/* #define NVSC_MAX_PROTOCOL_VERSION            1 */
-
-#define NETVSC_RECEIVE_BUFFER_SIZE              (1024*1024)     /* 1MB */
+#define NETVSC_RECEIVE_BUFFER_SIZE              (1024*1024*2)   /* 2MB */
 
 #define NETVSC_RECEIVE_BUFFER_ID                0xcafe
 
@@ -369,7 +473,10 @@ struct nvsp_message {
 struct netvsc_device {
         struct hv_device *dev;
 
+        u32 nvsp_version;
+
         atomic_t num_outstanding_sends;
+        bool start_remove;
         bool destroy;
         /*
          * List of free preallocated hv_netvsc_packet to represent receive
diff --git a/drivers/staging/hv/netvsc.c b/drivers/net/hyperv/netvsc.c
index b902579c7fe6..8965b45ce5a5 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -28,6 +28,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/netdevice.h>
+#include <linux/if_ether.h>
 
 #include "hyperv_net.h"
 
@@ -41,7 +42,7 @@ static struct netvsc_device *alloc_net_device(struct hv_device *device)
         if (!net_device)
                 return NULL;
 
-
+        net_device->start_remove = false;
         net_device->destroy = false;
         net_device->dev = device;
         net_device->ndev = ndev;
@@ -230,19 +231,16 @@ static int netvsc_init_recv_buf(struct hv_device *device)
         net_device->recv_section_cnt = init_packet->msg.
                 v1_msg.send_recv_buf_complete.num_sections;
 
-        net_device->recv_section = kmalloc(net_device->recv_section_cnt
-                * sizeof(struct nvsp_1_receive_buffer_section), GFP_KERNEL);
+        net_device->recv_section = kmemdup(
+                init_packet->msg.v1_msg.send_recv_buf_complete.sections,
+                net_device->recv_section_cnt *
+                sizeof(struct nvsp_1_receive_buffer_section),
+                GFP_KERNEL);
         if (net_device->recv_section == NULL) {
                 ret = -EINVAL;
                 goto cleanup;
         }
 
-        memcpy(net_device->recv_section,
-                init_packet->msg.v1_msg.
-               send_recv_buf_complete.sections,
-                net_device->recv_section_cnt *
-               sizeof(struct nvsp_1_receive_buffer_section));
-
         /*
          * For 1st release, there should only be 1 section that represents the
          * entire receive buffer
@@ -263,27 +261,18 @@ exit:
 }
 
 
-static int netvsc_connect_vsp(struct hv_device *device)
+/* Negotiate NVSP protocol version */
+static int negotiate_nvsp_ver(struct hv_device *device,
+                              struct netvsc_device *net_device,
+                              struct nvsp_message *init_packet,
+                              u32 nvsp_ver)
 {
         int ret, t;
-        struct netvsc_device *net_device;
-        struct nvsp_message *init_packet;
-        int ndis_version;
-        struct net_device *ndev;
-
-        net_device = get_outbound_net_device(device);
-        if (!net_device)
-                return -ENODEV;
-        ndev = net_device->ndev;
-
-        init_packet = &net_device->channel_init_pkt;
 
         memset(init_packet, 0, sizeof(struct nvsp_message));
         init_packet->hdr.msg_type = NVSP_MSG_TYPE_INIT;
-        init_packet->msg.init_msg.init.min_protocol_ver =
-                NVSP_MIN_PROTOCOL_VERSION;
-        init_packet->msg.init_msg.init.max_protocol_ver =
-                NVSP_MAX_PROTOCOL_VERSION;
+        init_packet->msg.init_msg.init.min_protocol_ver = nvsp_ver;
+        init_packet->msg.init_msg.init.max_protocol_ver = nvsp_ver;
 
         /* Send the init request */
         ret = vmbus_sendpacket(device->channel, init_packet,
@@ -293,26 +282,62 @@ static int netvsc_connect_vsp(struct hv_device *device)
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
 
         if (ret != 0)
-                goto cleanup;
+                return ret;
 
         t = wait_for_completion_timeout(&net_device->channel_init_wait, 5*HZ);
 
-        if (t == 0) {
-                ret = -ETIMEDOUT;
-                goto cleanup;
-        }
+        if (t == 0)
+                return -ETIMEDOUT;
 
         if (init_packet->msg.init_msg.init_complete.status !=
-            NVSP_STAT_SUCCESS) {
-                ret = -EINVAL;
-                goto cleanup;
-        }
+            NVSP_STAT_SUCCESS)
+                return -EINVAL;
 
-        if (init_packet->msg.init_msg.init_complete.
-            negotiated_protocol_ver != NVSP_PROTOCOL_VERSION_1) {
+        if (nvsp_ver != NVSP_PROTOCOL_VERSION_2)
+                return 0;
+
+        /* NVSPv2 only: Send NDIS config */
+        memset(init_packet, 0, sizeof(struct nvsp_message));
+        init_packet->hdr.msg_type = NVSP_MSG2_TYPE_SEND_NDIS_CONFIG;
+        init_packet->msg.v2_msg.send_ndis_config.mtu = net_device->ndev->mtu;
+
+        ret = vmbus_sendpacket(device->channel, init_packet,
+                                sizeof(struct nvsp_message),
+                                (unsigned long)init_packet,
+                                VM_PKT_DATA_INBAND, 0);
+
+        return ret;
+}
+
+static int netvsc_connect_vsp(struct hv_device *device)
+{
+        int ret;
+        struct netvsc_device *net_device;
+        struct nvsp_message *init_packet;
+        int ndis_version;
+        struct net_device *ndev;
+
+        net_device = get_outbound_net_device(device);
+        if (!net_device)
+                return -ENODEV;
+        ndev = net_device->ndev;
+
+        init_packet = &net_device->channel_init_pkt;
+
+        /* Negotiate the latest NVSP protocol supported */
+        if (negotiate_nvsp_ver(device, net_device, init_packet,
+                               NVSP_PROTOCOL_VERSION_2) == 0) {
+                net_device->nvsp_version = NVSP_PROTOCOL_VERSION_2;
+        } else if (negotiate_nvsp_ver(device, net_device, init_packet,
+                                    NVSP_PROTOCOL_VERSION_1) == 0) {
+                net_device->nvsp_version = NVSP_PROTOCOL_VERSION_1;
+        } else {
                 ret = -EPROTO;
                 goto cleanup;
         }
+
+        pr_debug("Negotiated NVSP version:%x\n", net_device->nvsp_version);
+
         /* Send the ndis version */
         memset(init_packet, 0, sizeof(struct nvsp_message));
 
@@ -438,6 +463,9 @@ static void netvsc_send_completion(struct hv_device *device,
                         nvsc_packet->completion.send.send_completion_ctx);
 
                 atomic_dec(&net_device->num_outstanding_sends);
+
+                if (netif_queue_stopped(ndev) && !net_device->start_remove)
+                        netif_wake_queue(ndev);
         } else {
                 netdev_err(ndev, "Unknown send completion packet type- "
                            "%d received!!\n", nvsp_packet->hdr.msg_type);
@@ -488,11 +516,16 @@ int netvsc_send(struct hv_device *device,
 
         }
 
-        if (ret != 0)
+        if (ret == 0) {
+                atomic_inc(&net_device->num_outstanding_sends);
+        } else if (ret == -EAGAIN) {
+                netif_stop_queue(ndev);
+                if (atomic_read(&net_device->num_outstanding_sends) < 1)
+                        netif_wake_queue(ndev);
+        } else {
                 netdev_err(ndev, "Unable to send packet %p ret %d\n",
                            packet, ret);
-        else
-                atomic_inc(&net_device->num_outstanding_sends);
+        }
 
         return ret;
 }
@@ -598,12 +631,10 @@ static void netvsc_receive(struct hv_device *device,
         struct vmtransfer_page_packet_header *vmxferpage_packet;
         struct nvsp_message *nvsp_packet;
         struct hv_netvsc_packet *netvsc_packet = NULL;
-        unsigned long start;
-        unsigned long end, end_virtual;
         /* struct netvsc_driver *netvscDriver; */
         struct xferpage_packet *xferpage_packet = NULL;
-        int i, j;
-        int count = 0, bytes_remain = 0;
+        int i;
+        int count = 0;
         unsigned long flags;
         struct net_device *ndev;
 
@@ -712,53 +743,10 @@ static void netvsc_receive(struct hv_device *device,
                 netvsc_packet->completion.recv.recv_completion_tid =
                                         vmxferpage_packet->d.trans_id;
 
+                netvsc_packet->data = (void *)((unsigned long)net_device->
+                        recv_buf + vmxferpage_packet->ranges[i].byte_offset);
                 netvsc_packet->total_data_buflen =
                                         vmxferpage_packet->ranges[i].byte_count;
-                netvsc_packet->page_buf_cnt = 1;
-
-                netvsc_packet->page_buf[0].len =
-                                        vmxferpage_packet->ranges[i].byte_count;
-
-                start = virt_to_phys((void *)((unsigned long)net_device->
-                recv_buf + vmxferpage_packet->ranges[i].byte_offset));
-
-                netvsc_packet->page_buf[0].pfn = start >> PAGE_SHIFT;
-                end_virtual = (unsigned long)net_device->recv_buf
-                    + vmxferpage_packet->ranges[i].byte_offset
-                    + vmxferpage_packet->ranges[i].byte_count - 1;
-                end = virt_to_phys((void *)end_virtual);
-
-                /* Calculate the page relative offset */
-                netvsc_packet->page_buf[0].offset =
-                        vmxferpage_packet->ranges[i].byte_offset &
-                        (PAGE_SIZE - 1);
-                if ((end >> PAGE_SHIFT) != (start >> PAGE_SHIFT)) {
-                        /* Handle frame across multiple pages: */
-                        netvsc_packet->page_buf[0].len =
-                                (netvsc_packet->page_buf[0].pfn <<
-                                 PAGE_SHIFT)
-                                + PAGE_SIZE - start;
-                        bytes_remain = netvsc_packet->total_data_buflen -
-                                        netvsc_packet->page_buf[0].len;
-                        for (j = 1; j < NETVSC_PACKET_MAXPAGE; j++) {
-                                netvsc_packet->page_buf[j].offset = 0;
-                                if (bytes_remain <= PAGE_SIZE) {
-                                        netvsc_packet->page_buf[j].len =
-                                                bytes_remain;
-                                        bytes_remain = 0;
-                                } else {
-                                        netvsc_packet->page_buf[j].len =
-                                                PAGE_SIZE;
-                                        bytes_remain -= PAGE_SIZE;
-                                }
-                                netvsc_packet->page_buf[j].pfn =
-                                    virt_to_phys((void *)(end_virtual -
-                                                bytes_remain)) >> PAGE_SHIFT;
-                                netvsc_packet->page_buf_cnt++;
-                                if (bytes_remain == 0)
-                                        break;
-                        }
-                }
 
                 /* Pass it to the upper layer */
                 rndis_filter_receive(device, netvsc_packet);
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index 93b0e91cbf98..462d05f05e84 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -43,24 +43,59 @@
 struct net_device_context {
         /* point back to our device context */
         struct hv_device *device_ctx;
-        atomic_t avail;
         struct delayed_work dwork;
 };
 
 
-#define PACKET_PAGES_LOWATER  8
-/* Need this many pages to handle worst case fragmented packet */
-#define PACKET_PAGES_HIWATER  (MAX_SKB_FRAGS + 2)
-
 static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
 
-/* no-op so the netdev core doesn't return -EINVAL when modifying the the
- * multicast address list in SIOCADDMULTI. hv is setup to get all multicast
- * when it calls RndisFilterOnOpen() */
+struct set_multicast_work {
+        struct work_struct work;
+        struct net_device *net;
+};
+
+static void do_set_multicast(struct work_struct *w)
+{
+        struct set_multicast_work *swk =
+                container_of(w, struct set_multicast_work, work);
+        struct net_device *net = swk->net;
+
+        struct net_device_context *ndevctx = netdev_priv(net);
+        struct netvsc_device *nvdev;
+        struct rndis_device *rdev;
+
+        nvdev = hv_get_drvdata(ndevctx->device_ctx);
+        if (nvdev == NULL)
+                return;
+
+        rdev = nvdev->extension;
+        if (rdev == NULL)
+                return;
+
+        if (net->flags & IFF_PROMISC)
+                rndis_filter_set_packet_filter(rdev,
+                        NDIS_PACKET_TYPE_PROMISCUOUS);
+        else
+                rndis_filter_set_packet_filter(rdev,
+                        NDIS_PACKET_TYPE_BROADCAST |
+                        NDIS_PACKET_TYPE_ALL_MULTICAST |
+                        NDIS_PACKET_TYPE_DIRECTED);
+
+        kfree(w);
+}
+
 static void netvsc_set_multicast_list(struct net_device *net)
 {
+        struct set_multicast_work *swk =
+                kmalloc(sizeof(struct set_multicast_work), GFP_ATOMIC);
+        if (swk == NULL)
+                return;
+
+        swk->net = net;
+        INIT_WORK(&swk->work, do_set_multicast);
+        schedule_work(&swk->work);
 }
 
 static int netvsc_open(struct net_device *net)
@@ -104,18 +139,8 @@ static void netvsc_xmit_completion(void *context)
 
         kfree(packet);
 
-        if (skb) {
-                struct net_device *net = skb->dev;
-                struct net_device_context *net_device_ctx = netdev_priv(net);
-                unsigned int num_pages = skb_shinfo(skb)->nr_frags + 2;
-
+        if (skb)
                 dev_kfree_skb_any(skb);
-
-                atomic_add(num_pages, &net_device_ctx->avail);
-                if (atomic_read(&net_device_ctx->avail) >=
-                                PACKET_PAGES_HIWATER)
-                        netif_wake_queue(net);
-        }
 }
 
 static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
@@ -123,12 +148,12 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         struct net_device_context *net_device_ctx = netdev_priv(net);
         struct hv_netvsc_packet *packet;
         int ret;
-        unsigned int i, num_pages;
+        unsigned int i, num_pages, npg_data;
 
-        /* Add 1 for skb->data and additional one for RNDIS */
-        num_pages = skb_shinfo(skb)->nr_frags + 1 + 1;
-        if (num_pages > atomic_read(&net_device_ctx->avail))
-                return NETDEV_TX_BUSY;
+        /* Add multipage for skb->data and additional one 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;
 
         /* Allocate a netvsc packet based on # of frags. */
         packet = kzalloc(sizeof(struct hv_netvsc_packet) +
@@ -151,21 +176,36 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         packet->page_buf_cnt = num_pages;
 
         /* Initialize it from the skb */
-        packet->total_data_buflen       = skb->len;
+        packet->total_data_buflen = skb->len;
 
         /* Start filling in the page buffers starting after RNDIS buffer. */
         packet->page_buf[1].pfn = virt_to_phys(skb->data) >> PAGE_SHIFT;
         packet->page_buf[1].offset
                 = (unsigned long)skb->data & (PAGE_SIZE - 1);
-        packet->page_buf[1].len = skb_headlen(skb);
+        if (npg_data == 1)
+                packet->page_buf[1].len = skb_headlen(skb);
+        else
+                packet->page_buf[1].len = PAGE_SIZE
+                        - packet->page_buf[1].offset;
+
+        for (i = 2; i <= npg_data; i++) {
+                packet->page_buf[i].pfn = virt_to_phys(skb->data
+                        + PAGE_SIZE * (i-1)) >> PAGE_SHIFT;
+                packet->page_buf[i].offset = 0;
+                packet->page_buf[i].len = PAGE_SIZE;
+        }
+        if (npg_data > 1)
+                packet->page_buf[npg_data].len = (((unsigned long)skb->data
+                        + skb_headlen(skb) - 1) & (PAGE_SIZE - 1)) + 1;
 
         /* Additional fragments are after SKB data */
         for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
                 const skb_frag_t *f = &skb_shinfo(skb)->frags[i];
 
-                packet->page_buf[i+2].pfn = page_to_pfn(skb_frag_page(f));
-                packet->page_buf[i+2].offset = f->page_offset;
-                packet->page_buf[i+2].len = skb_frag_size(f);
+                packet->page_buf[i+npg_data+1].pfn =
+                        page_to_pfn(skb_frag_page(f));
+                packet->page_buf[i+npg_data+1].offset = f->page_offset;
+                packet->page_buf[i+npg_data+1].len = skb_frag_size(f);
         }
 
         /* Set the completion routine */
@@ -178,10 +218,6 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
         if (ret == 0) {
                 net->stats.tx_bytes += skb->len;
                 net->stats.tx_packets++;
-
-                atomic_sub(num_pages, &net_device_ctx->avail);
-                if (atomic_read(&net_device_ctx->avail) < PACKET_PAGES_LOWATER)
-                        netif_stop_queue(net);
         } else {
                 /* we are shutting down or bus overloaded, just drop packet */
                 net->stats.tx_dropped++;
@@ -232,9 +268,6 @@ int netvsc_recv_callback(struct hv_device *device_obj,
 {
         struct net_device *net = dev_get_drvdata(&device_obj->device);
         struct sk_buff *skb;
-        void *data;
-        int i;
-        unsigned long flags;
         struct netvsc_device *net_device;
 
         net_device = hv_get_drvdata(device_obj);
@@ -253,27 +286,12 @@ int netvsc_recv_callback(struct hv_device *device_obj,
                 return 0;
         }
 
-        /* for kmap_atomic */
-        local_irq_save(flags);
-
         /*
          * Copy to skb. This copy is needed here since the memory pointed by
          * hv_netvsc_packet cannot be deallocated
          */
-        for (i = 0; i < packet->page_buf_cnt; i++) {
-                data = kmap_atomic(pfn_to_page(packet->page_buf[i].pfn),
-                                               KM_IRQ1);
-                data = (void *)(unsigned long)data +
-                                packet->page_buf[i].offset;
-
-                memcpy(skb_put(skb, packet->page_buf[i].len), data,
-                       packet->page_buf[i].len);
-
-                kunmap_atomic((void *)((unsigned long)data -
-                                       packet->page_buf[i].offset), KM_IRQ1);
-        }
-
-        local_irq_restore(flags);
+        memcpy(skb_put(skb, packet->total_data_buflen), packet->data,
+                packet->total_data_buflen);
 
         skb->protocol = eth_type_trans(skb, net);
         skb->ip_summed = CHECKSUM_NONE;
@@ -299,6 +317,39 @@ static void netvsc_get_drvinfo(struct net_device *net,
         strcpy(info->fw_version, "N/A");
 }
 
+static int netvsc_change_mtu(struct net_device *ndev, int mtu)
+{
+        struct net_device_context *ndevctx = netdev_priv(ndev);
+        struct hv_device *hdev =  ndevctx->device_ctx;
+        struct netvsc_device *nvdev = hv_get_drvdata(hdev);
+        struct netvsc_device_info device_info;
+        int limit = ETH_DATA_LEN;
+
+        if (nvdev == NULL || nvdev->destroy)
+                return -ENODEV;
+
+        if (nvdev->nvsp_version == NVSP_PROTOCOL_VERSION_2)
+                limit = NETVSC_MTU;
+
+        if (mtu < 68 || mtu > limit)
+                return -EINVAL;
+
+        nvdev->start_remove = true;
+        cancel_delayed_work_sync(&ndevctx->dwork);
+        netif_stop_queue(ndev);
+        rndis_filter_device_remove(hdev);
+
+        ndev->mtu = mtu;
+
+        ndevctx->device_ctx = hdev;
+        hv_set_drvdata(hdev, ndev);
+        device_info.ring_size = ring_size;
+        rndis_filter_device_add(hdev, &device_info);
+        netif_wake_queue(ndev);
+
+        return 0;
+}
+
 static const struct ethtool_ops ethtool_ops = {
         .get_drvinfo    = netvsc_get_drvinfo,
         .get_link       = ethtool_op_get_link,
@@ -309,7 +360,7 @@ static const struct net_device_ops device_ops = {
         .ndo_stop =                     netvsc_close,
         .ndo_start_xmit =               netvsc_start_xmit,
         .ndo_set_rx_mode =              netvsc_set_multicast_list,
-        .ndo_change_mtu =               eth_change_mtu,
+        .ndo_change_mtu =               netvsc_change_mtu,
         .ndo_validate_addr =            eth_validate_addr,
         .ndo_set_mac_address =          eth_mac_addr,
 };
@@ -351,7 +402,6 @@ static int netvsc_probe(struct hv_device *dev,
 
         net_device_ctx = netdev_priv(net);
         net_device_ctx->device_ctx = dev;
-        atomic_set(&net_device_ctx->avail, ring_size);
         hv_set_drvdata(dev, net);
         INIT_DELAYED_WORK(&net_device_ctx->dwork, netvsc_send_garp);
 
@@ -403,6 +453,8 @@ static int netvsc_remove(struct hv_device *dev)
                 return 0;
         }
 
+        net_device->start_remove = true;
+
         ndev_ctx = netdev_priv(net);
         cancel_delayed_work_sync(&ndev_ctx->dwork);
 
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index bafccb360041..da181f9a49d1 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -30,26 +30,6 @@
 #include "hyperv_net.h"
 
 
-enum rndis_device_state {
-        RNDIS_DEV_UNINITIALIZED = 0,
-        RNDIS_DEV_INITIALIZING,
-        RNDIS_DEV_INITIALIZED,
-        RNDIS_DEV_DATAINITIALIZED,
-};
-
-struct rndis_device {
-        struct netvsc_device *net_dev;
-
-        enum rndis_device_state state;
-        bool link_state;
-        atomic_t new_req_id;
-
-        spinlock_t request_lock;
-        struct list_head req_list;
-
-        unsigned char hw_mac_adr[ETH_ALEN];
-};
-
 struct rndis_request {
         struct list_head list_ent;
         struct completion  wait_event;
@@ -329,7 +309,6 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
 {
         struct rndis_packet *rndis_pkt;
         u32 data_offset;
-        int i;
 
         rndis_pkt = &msg->msg.pkt;
 
@@ -342,17 +321,7 @@ 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;
-        pkt->page_buf[0].offset += data_offset;
-        pkt->page_buf[0].len -= data_offset;
-
-        /* Drop the 0th page, if rndis data go beyond page boundary */
-        if (pkt->page_buf[0].offset >= PAGE_SIZE) {
-                pkt->page_buf[1].offset = pkt->page_buf[0].offset - PAGE_SIZE;
-                pkt->page_buf[1].len -= pkt->page_buf[1].offset;
-                pkt->page_buf_cnt--;
-                for (i = 0; i < pkt->page_buf_cnt; i++)
-                        pkt->page_buf[i] = pkt->page_buf[i+1];
-        }
+        pkt->data = (void *)((unsigned long)pkt->data + data_offset);
 
         pkt->is_data_pkt = true;
 
@@ -387,11 +356,7 @@ int rndis_filter_receive(struct hv_device *dev,
                 return -ENODEV;
         }
 
-        rndis_hdr = (struct rndis_message *)kmap_atomic(
-                        pfn_to_page(pkt->page_buf[0].pfn), KM_IRQ0);
-
-        rndis_hdr = (void *)((unsigned long)rndis_hdr +
-                        pkt->page_buf[0].offset);
+        rndis_hdr = pkt->data;
 
         /* Make sure we got a valid rndis message */
         if ((rndis_hdr->ndis_msg_type != REMOTE_NDIS_PACKET_MSG) &&
@@ -407,8 +372,6 @@ int rndis_filter_receive(struct hv_device *dev,
                         sizeof(struct rndis_message) :
                         rndis_hdr->msg_len);
 
-        kunmap_atomic(rndis_hdr - pkt->page_buf[0].offset, KM_IRQ0);
-
         dump_rndis_message(dev, &rndis_msg);
 
         switch (rndis_msg.ndis_msg_type) {
@@ -522,8 +485,7 @@ static int rndis_filter_query_device_link_status(struct rndis_device *dev)
         return ret;
 }
 
-static int rndis_filter_set_packet_filter(struct rndis_device *dev,
-                                      u32 new_filter)
+int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
 {
         struct rndis_request *request;
         struct rndis_set_request *set;
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 1ff7163bc348..d0937c4634c9 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -376,7 +376,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                 skb_pull(skb, (size + 1) & 0xfffe);
 
-                if (skb->len == 0)
+                if (skb->len < sizeof(header))
                         break;
 
                 head = (u8 *) skb->data;
@@ -1152,7 +1152,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
         return 0;
 }
 
-static struct ethtool_ops ax88178_ethtool_ops = {
+static const struct ethtool_ops ax88178_ethtool_ops = {
         .get_drvinfo            = asix_get_drvinfo,
         .get_link               = asix_get_link,
         .get_msglevel           = usbnet_get_msglevel,
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index cb8e595c5021..3a539a9cac54 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -138,7 +138,7 @@ struct cdc_ncm_ctx {
 static void cdc_ncm_tx_timeout(unsigned long arg);
 static const struct driver_info cdc_ncm_info;
 static struct usb_driver cdc_ncm_driver;
-static struct ethtool_ops cdc_ncm_ethtool_ops;
+static const struct ethtool_ops cdc_ncm_ethtool_ops;
 
 static const struct usb_device_id cdc_devs[] = {
         { USB_INTERFACE_INFO(USB_CLASS_COMM,
@@ -1220,7 +1220,7 @@ static struct usb_driver cdc_ncm_driver = {
         .supports_autosuspend = 1,
 };
 
-static struct ethtool_ops cdc_ncm_ethtool_ops = {
+static const struct ethtool_ops cdc_ncm_ethtool_ops = {
         .get_drvinfo = cdc_ncm_get_drvinfo,
         .get_link = usbnet_get_link,
         .get_msglevel = usbnet_get_msglevel,
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 08a4df238796..e84662db51cc 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -420,7 +420,7 @@ static u32 ipheth_ethtool_op_get_link(struct net_device *net)
         return netif_carrier_ok(dev->net);
 }
 
-static struct ethtool_ops ops = {
+static const struct ethtool_ops ops = {
         .get_link = ipheth_ethtool_op_get_link
 };
 
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index e45dfdcb8718..b59cf20c7817 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -618,7 +618,7 @@ static u32 sierra_net_get_link(struct net_device *net)
         return sierra_net_get_private(dev)->link_up && netif_running(net);
 }
 
-static struct ethtool_ops sierra_net_ethtool_ops = {
+static const struct ethtool_ops sierra_net_ethtool_ops = {
         .get_drvinfo = sierra_net_get_drvinfo,
         .get_link = sierra_net_get_link,
         .get_msglevel = usbnet_get_msglevel,
diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c
index 844f6137970a..7c5d86696eed 100644
--- a/drivers/parport/parport_ax88796.c
+++ b/drivers/parport/parport_ax88796.c
@@ -420,18 +420,7 @@ static struct platform_driver axdrv = {
         .resume         = parport_ax88796_resume,
 };
 
-static int __init parport_ax88796_init(void)
-{
-        return platform_driver_register(&axdrv);
-}
-
-static void __exit parport_ax88796_exit(void)
-{
-        platform_driver_unregister(&axdrv);
-}
-
-module_init(parport_ax88796_init)
-module_exit(parport_ax88796_exit)
+module_platform_driver(axdrv);
 
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_DESCRIPTION("AX88796 Parport parallel port driver");
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 910c5a26e347..9390a534a2b2 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -391,21 +391,10 @@ static struct platform_driver bpp_sbus_driver = {
         .remove         = __devexit_p(bpp_remove),
 };
 
-static int __init parport_sunbpp_init(void)
-{
-        return platform_driver_register(&bpp_sbus_driver);
-}
-
-static void __exit parport_sunbpp_exit(void)
-{
-        platform_driver_unregister(&bpp_sbus_driver);
-}
+module_platform_driver(bpp_sbus_driver);
 
 MODULE_AUTHOR("Derrick J Brashear");
 MODULE_DESCRIPTION("Parport Driver for Sparc bidirectional Port");
 MODULE_SUPPORTED_DEVICE("Sparc Bidirectional Parallel Port");
 MODULE_VERSION("2.0");
 MODULE_LICENSE("GPL");
-
-module_init(parport_sunbpp_init)
-module_exit(parport_sunbpp_exit)
diff --git a/drivers/pcmcia/pxa2xx_cm_x255.c b/drivers/pcmcia/pxa2xx_cm_x255.c
index 0b4f946cf13a..31ab6ddf52c9 100644
--- a/drivers/pcmcia/pxa2xx_cm_x255.c
+++ b/drivers/pcmcia/pxa2xx_cm_x255.c
@@ -16,8 +16,6 @@
 #include <linux/gpio.h>
 #include <linux/export.h>
 
-#include <asm/mach-types.h>
-
 #include "soc_common.h"
 
 #define GPIO_PCMCIA_SKTSEL      (54)
@@ -27,15 +25,15 @@
 #define GPIO_PCMCIA_S1_RDYINT   (8)
 #define GPIO_PCMCIA_RESET       (9)
 
-#define PCMCIA_S0_CD_VALID      IRQ_GPIO(GPIO_PCMCIA_S0_CD_VALID)
-#define PCMCIA_S1_CD_VALID      IRQ_GPIO(GPIO_PCMCIA_S1_CD_VALID)
-#define PCMCIA_S0_RDYINT        IRQ_GPIO(GPIO_PCMCIA_S0_RDYINT)
-#define PCMCIA_S1_RDYINT        IRQ_GPIO(GPIO_PCMCIA_S1_RDYINT)
+#define PCMCIA_S0_CD_VALID      gpio_to_irq(GPIO_PCMCIA_S0_CD_VALID)
+#define PCMCIA_S1_CD_VALID      gpio_to_irq(GPIO_PCMCIA_S1_CD_VALID)
+#define PCMCIA_S0_RDYINT        gpio_to_irq(GPIO_PCMCIA_S0_RDYINT)
+#define PCMCIA_S1_RDYINT        gpio_to_irq(GPIO_PCMCIA_S1_RDYINT)
 
 
 static struct pcmcia_irqs irqs[] = {
-        { 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },
-        { 1, PCMCIA_S1_CD_VALID, "PCMCIA1 CD" },
+        { .sock = 0, .str = "PCMCIA0 CD" },
+        { .sock = 1, .str = "PCMCIA1 CD" },
 };
 
 static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
@@ -46,6 +44,8 @@ static int cmx255_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         gpio_direction_output(GPIO_PCMCIA_RESET, 0);
 
         skt->socket.pci_irq = skt->nr == 0 ? PCMCIA_S0_RDYINT : PCMCIA_S1_RDYINT;
+        irqs[0].irq = PCMCIA_S0_CD_VALID;
+        irqs[1].irq = PCMCIA_S1_CD_VALID;
         ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
         if (!ret)
                 gpio_free(GPIO_PCMCIA_RESET);
diff --git a/drivers/pcmcia/pxa2xx_cm_x270.c b/drivers/pcmcia/pxa2xx_cm_x270.c
index 923f315926ef..3dc7621a0767 100644
--- a/drivers/pcmcia/pxa2xx_cm_x270.c
+++ b/drivers/pcmcia/pxa2xx_cm_x270.c
@@ -16,20 +16,18 @@
 #include <linux/gpio.h>
 #include <linux/export.h>
 
-#include <asm/mach-types.h>
-
 #include "soc_common.h"
 
 #define GPIO_PCMCIA_S0_CD_VALID (84)
 #define GPIO_PCMCIA_S0_RDYINT   (82)
 #define GPIO_PCMCIA_RESET       (53)
 
-#define PCMCIA_S0_CD_VALID      IRQ_GPIO(GPIO_PCMCIA_S0_CD_VALID)
-#define PCMCIA_S0_RDYINT        IRQ_GPIO(GPIO_PCMCIA_S0_RDYINT)
+#define PCMCIA_S0_CD_VALID      gpio_to_irq(GPIO_PCMCIA_S0_CD_VALID)
+#define PCMCIA_S0_RDYINT        gpio_to_irq(GPIO_PCMCIA_S0_RDYINT)
 
 
 static struct pcmcia_irqs irqs[] = {
-        { 0, PCMCIA_S0_CD_VALID, "PCMCIA0 CD" },
+        { .sock = 0, .str = "PCMCIA0 CD" },
 };
 
 static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
@@ -40,6 +38,7 @@ static int cmx270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         gpio_direction_output(GPIO_PCMCIA_RESET, 0);
 
         skt->socket.pci_irq = PCMCIA_S0_RDYINT;
+        irqs[0].irq = PCMCIA_S0_CD_VALID;
         ret = soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
         if (!ret)
                 gpio_free(GPIO_PCMCIA_RESET);
diff --git a/drivers/pcmcia/pxa2xx_e740.c b/drivers/pcmcia/pxa2xx_e740.c
index 8bfbd4dca131..17cd2ce7428f 100644
--- a/drivers/pcmcia/pxa2xx_e740.c
+++ b/drivers/pcmcia/pxa2xx_e740.c
@@ -26,20 +26,23 @@
 static struct pcmcia_irqs cd_irqs[] = {
         {
                 .sock = 0,
-                .irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD0),
                 .str  = "CF card detect"
         },
         {
                 .sock = 1,
-                .irq  = IRQ_GPIO(GPIO_E740_PCMCIA_CD1),
                 .str  = "Wifi switch"
         },
 };
 
 static int e740_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-        skt->socket.pci_irq = skt->nr == 0 ? IRQ_GPIO(GPIO_E740_PCMCIA_RDY0) :
-                                IRQ_GPIO(GPIO_E740_PCMCIA_RDY1);
+        if (skt->nr == 0)
+                skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY0);
+        else
+                skt->socket.pci_irq = gpio_to_irq(GPIO_E740_PCMCIA_RDY1);
+
+        cd_irqs[0].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD0);
+        cd_irqs[1].irq = gpio_to_irq(GPIO_E740_PCMCIA_CD1);
 
         return soc_pcmcia_request_irqs(skt, &cd_irqs[skt->nr], 1);
 }
diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c
index d589ad1dcd4c..6a8e011a8c13 100644
--- a/drivers/pcmcia/pxa2xx_palmld.c
+++ b/drivers/pcmcia/pxa2xx_palmld.c
@@ -33,7 +33,7 @@ static int palmld_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         ret = gpio_request_array(palmld_pcmcia_gpios,
                                 ARRAY_SIZE(palmld_pcmcia_gpios));
 
-        skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMLD_PCMCIA_READY);
+        skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMLD_PCMCIA_READY);
 
         return ret;
 }
diff --git a/drivers/pcmcia/pxa2xx_palmtc.c b/drivers/pcmcia/pxa2xx_palmtc.c
index 9c6a04b2f71b..9e38de769ba3 100644
--- a/drivers/pcmcia/pxa2xx_palmtc.c
+++ b/drivers/pcmcia/pxa2xx_palmtc.c
@@ -37,7 +37,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         ret = gpio_request_array(palmtc_pcmcia_gpios,
                                 ARRAY_SIZE(palmtc_pcmcia_gpios));
 
-        skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);
+        skt->socket.pci_irq = gpio_to_irq(GPIO_NR_PALMTC_PCMCIA_READY);
 
         return ret;
 }
diff --git a/drivers/pcmcia/pxa2xx_stargate2.c b/drivers/pcmcia/pxa2xx_stargate2.c
index 939622251dfb..6c2366b74a35 100644
--- a/drivers/pcmcia/pxa2xx_stargate2.c
+++ b/drivers/pcmcia/pxa2xx_stargate2.c
@@ -34,7 +34,7 @@
 #define SG2_S0_GPIO_READY       81
 
 static struct pcmcia_irqs irqs[] = {
-        { 0, IRQ_GPIO(SG2_S0_GPIO_DETECT), "PCMCIA0 CD" },
+        {.sock = 0, .str = "PCMCIA0 CD" },
 };
 
 static struct gpio sg2_pcmcia_gpios[] = {
@@ -44,7 +44,9 @@ static struct gpio sg2_pcmcia_gpios[] = {
 
 static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-        skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);
+        skt->socket.pci_irq = gpio_to_irq(SG2_S0_GPIO_READY);
+        irqs[0].irq = gpio_to_irq(SG2_S0_GPIO_DETECT);
+
         return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 }
 
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index 57ddb969d888..7c33f898135a 100644
--- a/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -30,7 +30,7 @@
 extern void board_pcmcia_power(int power);
 
 static struct pcmcia_irqs irqs[] = {
-        { 0, IRQ_GPIO(GPIO_PCD), "cs0_cd" }
+        { .sock = 0, .str = "cs0_cd" }
         /* on other baseboards we can have more inputs */
 };
 
@@ -53,7 +53,8 @@ static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                         gpio_free(GPIO_PRDY);
                         return -EINVAL;
                 }
-                skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
+                skt->socket.pci_irq = gpio_to_irq(GPIO_PRDY);
+                irqs[0].irq = gpio_to_irq(GPIO_PCD);
                 break;
         default:
                 break;
diff --git a/drivers/pcmcia/pxa2xx_vpac270.c b/drivers/pcmcia/pxa2xx_vpac270.c
index 66ab92cf3105..61b17d235dbe 100644
--- a/drivers/pcmcia/pxa2xx_vpac270.c
+++ b/drivers/pcmcia/pxa2xx_vpac270.c
@@ -38,12 +38,10 @@ static struct gpio vpac270_cf_gpios[] = {
 static struct pcmcia_irqs cd_irqs[] = {
         {
                 .sock = 0,
-                .irq  = IRQ_GPIO(GPIO84_VPAC270_PCMCIA_CD),
                 .str  = "PCMCIA CD"
         },
         {
                 .sock = 1,
-                .irq  = IRQ_GPIO(GPIO17_VPAC270_CF_CD),
                 .str  = "CF CD"
         },
 };
@@ -57,6 +55,7 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                                 ARRAY_SIZE(vpac270_pcmcia_gpios));
 
                 skt->socket.pci_irq = gpio_to_irq(GPIO35_VPAC270_PCMCIA_RDY);
+                cd_irqs[0].irq = gpio_to_irq(GPIO84_VPAC270_PCMCIA_CD);
 
                 if (!ret)
                         ret = soc_pcmcia_request_irqs(skt, &cd_irqs[0], 1);
@@ -65,6 +64,7 @@ static int vpac270_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                                 ARRAY_SIZE(vpac270_cf_gpios));
 
                 skt->socket.pci_irq = gpio_to_irq(GPIO12_VPAC270_CF_RDY);
+                cd_irqs[1].irq = gpio_to_irq(GPIO17_VPAC270_CF_CD);
 
                 if (!ret)
                         ret = soc_pcmcia_request_irqs(skt, &cd_irqs[1], 1);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 53eb4e55b289..877cf6fdcf24 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
+        depends on ARCH_SA1100 || ARCH_PXA || ARCH_MMP
         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-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index e39b77a4609a..dc474bc6522d 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -32,11 +32,17 @@
 
 #include <mach/at91_rtc.h>
 
+#define at91_rtc_read(field) \
+        __raw_readl(at91_rtc_regs + field)
+#define at91_rtc_write(field, val) \
+        __raw_writel((val), at91_rtc_regs + field)
 
 #define AT91_RTC_EPOCH          1900UL  /* just like arch/arm/common/rtctime.c */
 
 static DECLARE_COMPLETION(at91_rtc_updated);
 static unsigned int at91_alarm_year = AT91_RTC_EPOCH;
+static void __iomem *at91_rtc_regs;
+static int irq;
 
 /*
  * Decode time/date into rtc_time structure
@@ -48,10 +54,10 @@ static void at91_rtc_decodetime(unsigned int timereg, unsigned int calreg,
 
         /* must read twice in case it changes */
         do {
-                time = at91_sys_read(timereg);
-                date = at91_sys_read(calreg);
-        } while ((time != at91_sys_read(timereg)) ||
-                        (date != at91_sys_read(calreg)));
+                time = at91_rtc_read(timereg);
+                date = at91_rtc_read(calreg);
+        } while ((time != at91_rtc_read(timereg)) ||
+                        (date != at91_rtc_read(calreg)));
 
         tm->tm_sec  = bcd2bin((time & AT91_RTC_SEC) >> 0);
         tm->tm_min  = bcd2bin((time & AT91_RTC_MIN) >> 8);
@@ -98,19 +104,19 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 
         /* Stop Time/Calendar from counting */
-        cr = at91_sys_read(AT91_RTC_CR);
-        at91_sys_write(AT91_RTC_CR, cr | AT91_RTC_UPDCAL | AT91_RTC_UPDTIM);
+        cr = at91_rtc_read(AT91_RTC_CR);
+        at91_rtc_write(AT91_RTC_CR, cr | AT91_RTC_UPDCAL | AT91_RTC_UPDTIM);
 
-        at91_sys_write(AT91_RTC_IER, AT91_RTC_ACKUPD);
+        at91_rtc_write(AT91_RTC_IER, AT91_RTC_ACKUPD);
         wait_for_completion(&at91_rtc_updated); /* wait for ACKUPD interrupt */
-        at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD);
+        at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ACKUPD);
 
-        at91_sys_write(AT91_RTC_TIMR,
+        at91_rtc_write(AT91_RTC_TIMR,
                           bin2bcd(tm->tm_sec) << 0
                         | bin2bcd(tm->tm_min) << 8
                         | bin2bcd(tm->tm_hour) << 16);
 
-        at91_sys_write(AT91_RTC_CALR,
+        at91_rtc_write(AT91_RTC_CALR,
                           bin2bcd((tm->tm_year + 1900) / 100)   /* century */
                         | bin2bcd(tm->tm_year % 100) << 8       /* year */
                         | bin2bcd(tm->tm_mon + 1) << 16         /* tm_mon starts at zero */
@@ -118,8 +124,8 @@ static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)
                         | bin2bcd(tm->tm_mday) << 24);
 
         /* Restart Time/Calendar */
-        cr = at91_sys_read(AT91_RTC_CR);
-        at91_sys_write(AT91_RTC_CR, cr & ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM));
+        cr = at91_rtc_read(AT91_RTC_CR);
+        at91_rtc_write(AT91_RTC_CR, cr & ~(AT91_RTC_UPDCAL | AT91_RTC_UPDTIM));
 
         return 0;
 }
@@ -135,7 +141,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
         tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year);
         tm->tm_year = at91_alarm_year - 1900;
 
-        alrm->enabled = (at91_sys_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
+        alrm->enabled = (at91_rtc_read(AT91_RTC_IMR) & AT91_RTC_ALARM)
                         ? 1 : 0;
 
         pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
@@ -160,20 +166,20 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         tm.tm_min = alrm->time.tm_min;
         tm.tm_sec = alrm->time.tm_sec;
 
-        at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);
-        at91_sys_write(AT91_RTC_TIMALR,
+        at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ALARM);
+        at91_rtc_write(AT91_RTC_TIMALR,
                   bin2bcd(tm.tm_sec) << 0
                 | bin2bcd(tm.tm_min) << 8
                 | bin2bcd(tm.tm_hour) << 16
                 | AT91_RTC_HOUREN | AT91_RTC_MINEN | AT91_RTC_SECEN);
-        at91_sys_write(AT91_RTC_CALALR,
+        at91_rtc_write(AT91_RTC_CALALR,
                   bin2bcd(tm.tm_mon + 1) << 16          /* tm_mon starts at zero */
                 | bin2bcd(tm.tm_mday) << 24
                 | AT91_RTC_DATEEN | AT91_RTC_MTHEN);
 
         if (alrm->enabled) {
-                at91_sys_write(AT91_RTC_SCCR, AT91_RTC_ALARM);
-                at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);
+                at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM);
+                at91_rtc_write(AT91_RTC_IER, AT91_RTC_ALARM);
         }
 
         pr_debug("%s(): %4d-%02d-%02d %02d:%02d:%02d\n", __func__,
@@ -188,10 +194,10 @@ static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
         pr_debug("%s(): cmd=%08x\n", __func__, enabled);
 
         if (enabled) {
-                at91_sys_write(AT91_RTC_SCCR, AT91_RTC_ALARM);
-                at91_sys_write(AT91_RTC_IER, AT91_RTC_ALARM);
+                at91_rtc_write(AT91_RTC_SCCR, AT91_RTC_ALARM);
+                at91_rtc_write(AT91_RTC_IER, AT91_RTC_ALARM);
         } else
-                at91_sys_write(AT91_RTC_IDR, AT91_RTC_ALARM);
+                at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ALARM);
 
         return 0;
 }
@@ -200,7 +206,7 @@ static int at91_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
  */
 static int at91_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        unsigned long imr = at91_sys_read(AT91_RTC_IMR);
+        unsigned long imr = at91_rtc_read(AT91_RTC_IMR);
 
         seq_printf(seq, "update_IRQ\t: %s\n",
                         (imr & AT91_RTC_ACKUPD) ? "yes" : "no");
@@ -220,7 +226,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
         unsigned int rtsr;
         unsigned long events = 0;
 
-        rtsr = at91_sys_read(AT91_RTC_SR) & at91_sys_read(AT91_RTC_IMR);
+        rtsr = at91_rtc_read(AT91_RTC_SR) & at91_rtc_read(AT91_RTC_IMR);
         if (rtsr) {             /* this interrupt is shared!  Is it ours? */
                 if (rtsr & AT91_RTC_ALARM)
                         events |= (RTC_AF | RTC_IRQF);
@@ -229,7 +235,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *dev_id)
                 if (rtsr & AT91_RTC_ACKUPD)
                         complete(&at91_rtc_updated);
 
-                at91_sys_write(AT91_RTC_SCCR, rtsr);    /* clear status reg */
+                at91_rtc_write(AT91_RTC_SCCR, rtsr);    /* clear status reg */
 
                 rtc_update_irq(rtc, 1, events);
 
@@ -256,22 +262,41 @@ static const struct rtc_class_ops at91_rtc_ops = {
 static int __init at91_rtc_probe(struct platform_device *pdev)
 {
         struct rtc_device *rtc;
-        int ret;
+        struct resource *regs;
+        int ret = 0;
 
-        at91_sys_write(AT91_RTC_CR, 0);
-        at91_sys_write(AT91_RTC_MR, 0);         /* 24 hour mode */
+        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!regs) {
+                dev_err(&pdev->dev, "no mmio resource defined\n");
+                return -ENXIO;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq < 0) {
+                dev_err(&pdev->dev, "no irq resource defined\n");
+                return -ENXIO;
+        }
+
+        at91_rtc_regs = ioremap(regs->start, resource_size(regs));
+        if (!at91_rtc_regs) {
+                dev_err(&pdev->dev, "failed to map registers, aborting.\n");
+                return -ENOMEM;
+        }
+
+        at91_rtc_write(AT91_RTC_CR, 0);
+        at91_rtc_write(AT91_RTC_MR, 0);         /* 24 hour mode */
 
         /* Disable all interrupts */
-        at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |
+        at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |
                                         AT91_RTC_SECEV | AT91_RTC_TIMEV |
                                         AT91_RTC_CALEV);
 
-        ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,
+        ret = request_irq(irq, at91_rtc_interrupt,
                                 IRQF_SHARED,
                                 "at91_rtc", pdev);
         if (ret) {
                 printk(KERN_ERR "at91_rtc: IRQ %d already in use.\n",
-                                AT91_ID_SYS);
+                                irq);
                 return ret;
         }
 
@@ -284,7 +309,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
         rtc = rtc_device_register(pdev->name, &pdev->dev,
                                 &at91_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
-                free_irq(AT91_ID_SYS, pdev);
+                free_irq(irq, pdev);
                 return PTR_ERR(rtc);
         }
         platform_set_drvdata(pdev, rtc);
@@ -301,10 +326,10 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)
         struct rtc_device *rtc = platform_get_drvdata(pdev);
 
         /* Disable all interrupts */
-        at91_sys_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |
+        at91_rtc_write(AT91_RTC_IDR, AT91_RTC_ACKUPD | AT91_RTC_ALARM |
                                         AT91_RTC_SECEV | AT91_RTC_TIMEV |
                                         AT91_RTC_CALEV);
-        free_irq(AT91_ID_SYS, pdev);
+        free_irq(irq, pdev);
 
         rtc_device_unregister(rtc);
         platform_set_drvdata(pdev, NULL);
@@ -323,13 +348,13 @@ static int at91_rtc_suspend(struct device *dev)
         /* this IRQ is shared with DBGU and other hardware which isn't
          * necessarily doing PM like we are...
          */
-        at91_rtc_imr = at91_sys_read(AT91_RTC_IMR)
+        at91_rtc_imr = at91_rtc_read(AT91_RTC_IMR)
                         & (AT91_RTC_ALARM|AT91_RTC_SECEV);
         if (at91_rtc_imr) {
                 if (device_may_wakeup(dev))
-                        enable_irq_wake(AT91_ID_SYS);
+                        enable_irq_wake(irq);
                 else
-                        at91_sys_write(AT91_RTC_IDR, at91_rtc_imr);
+                        at91_rtc_write(AT91_RTC_IDR, at91_rtc_imr);
         }
         return 0;
 }
@@ -338,9 +363,9 @@ static int at91_rtc_resume(struct device *dev)
 {
         if (at91_rtc_imr) {
                 if (device_may_wakeup(dev))
-                        disable_irq_wake(AT91_ID_SYS);
+                        disable_irq_wake(irq);
                 else
-                        at91_sys_write(AT91_RTC_IER, at91_rtc_imr);
+                        at91_rtc_write(AT91_RTC_IER, at91_rtc_imr);
         }
         return 0;
 }
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 5b979d9cc332..175067a17c46 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -25,6 +25,7 @@
 #include <linux/clk.h>
 #include <linux/log2.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <mach/hardware.h>
 #include <asm/uaccess.h>
@@ -507,7 +508,13 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
                 goto err_nortc;
         }
 
-        s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
+#ifdef CONFIG_OF
+        if (pdev->dev.of_node)
+                s3c_rtc_cpu_type = of_device_is_compatible(pdev->dev.of_node,
+                        "samsung,s3c6410-rtc") ? TYPE_S3C64XX : TYPE_S3C2410;
+        else
+#endif
+                s3c_rtc_cpu_type = platform_get_device_id(pdev)->driver_data;
 
         /* Check RTC Time */
 
@@ -629,6 +636,17 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 #define s3c_rtc_resume  NULL
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id s3c_rtc_dt_match[] = {
+        { .compatible = "samsung,s3c2410-rtc" },
+        { .compatible = "samsung,s3c6410-rtc" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, s3c_rtc_dt_match);
+#else
+#define s3c_rtc_dt_match NULL
+#endif
+
 static struct platform_device_id s3c_rtc_driver_ids[] = {
         {
                 .name           = "s3c2410-rtc",
@@ -651,6 +669,7 @@ static struct platform_driver s3c_rtc_driver = {
         .driver         = {
                 .name   = "s3c-rtc",
                 .owner  = THIS_MODULE,
+                .of_match_table = s3c_rtc_dt_match,
         },
 };
 
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 0b40bb88a884..fc1ffe97fca1 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -27,35 +27,42 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
-#include <linux/string.h>
 #include <linux/pm.h>
-#include <linux/bitops.h>
+#include <linux/slab.h>
+#include <linux/clk.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
 #include <asm/irq.h>
 
-#ifdef CONFIG_ARCH_PXA
-#include <mach/regs-rtc.h>
-#include <mach/regs-ost.h>
-#endif
-
 #define RTC_DEF_DIVIDER         (32768 - 1)
 #define RTC_DEF_TRIM            0
-
-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);
-}
-
+#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 */
+};
 /*
  * Calculate the next alarm time given the requested alarm time mask
  * and the current time.
@@ -83,46 +90,26 @@ 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 rtc_device *rtc = platform_get_drvdata(pdev);
+        struct sa1100_rtc *sa1100_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 = 0;
+        rtsr = rtc_readl(sa1100_rtc, RTSR);
+        rtc_writel(sa1100_rtc, 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. */
-                RTSR = (RTSR_AL | RTSR_HZ) & (rtsr >> 2);
+                rtc_writel(sa1100_rtc, 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
@@ -131,13 +118,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(). */
-                RTSR = RTSR_AL | RTSR_HZ;
+                rtc_writel(sa1100_rtc, RTSR, (RTSR_AL | RTSR_HZ));
         }
 
         /* clear alarm interrupt if it has occurred */
         if (rtsr & RTSR_AL)
                 rtsr &= ~RTSR_ALE;
-        RTSR = rtsr & (RTSR_ALE | RTSR_HZE);
+        rtc_writel(sa1100_rtc, RTSR, rtsr & (RTSR_ALE | RTSR_HZE));
 
         /* update irq data & counter */
         if (rtsr & RTSR_AL)
@@ -145,91 +132,100 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id)
         if (rtsr & RTSR_HZ)
                 events |= RTC_UF | RTC_IRQF;
 
-        rtc_update_irq(rtc, 1, events);
+        rtc_update_irq(sa1100_rtc->rtc, 1, events);
 
-        if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm))
-                rtc_update_alarm(&rtc_alarm);
-
-        spin_unlock(&sa1100_rtc_lock);
+        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(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
-                "rtc 1Hz", dev);
+        ret = request_irq(sa1100_rtc->irq_1Hz, sa1100_rtc_interrupt,
+                                IRQF_DISABLED, "rtc 1Hz", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
+                dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_1Hz);
                 goto fail_ui;
         }
-        ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,
-                "rtc Alrm", dev);
+        ret = request_irq(sa1100_rtc->irq_Alrm, sa1100_rtc_interrupt,
+                                IRQF_DISABLED, "rtc Alrm", dev);
         if (ret) {
-                dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
+                dev_err(dev, "IRQ %d already in use.\n", sa1100_rtc->irq_Alrm);
                 goto fail_ai;
         }
-        rtc->max_user_freq = RTC_FREQ;
-        rtc_irq_set_freq(rtc, NULL, RTC_FREQ);
+        sa1100_rtc->rtc->max_user_freq = RTC_FREQ;
+        rtc_irq_set_freq(sa1100_rtc->rtc, NULL, RTC_FREQ);
 
         return 0;
 
  fail_ai:
-        free_irq(IRQ_RTC1Hz, dev);
+        free_irq(sa1100_rtc->irq_1Hz, dev);
  fail_ui:
         return ret;
 }
 
 static void sa1100_rtc_release(struct device *dev)
 {
-        spin_lock_irq(&sa1100_rtc_lock);
-        RTSR = 0;
-        OIER &= ~OIER_E1;
-        OSSR = OSSR_M1;
-        spin_unlock_irq(&sa1100_rtc_lock);
-
-        free_irq(IRQ_RTCAlrm, dev);
-        free_irq(IRQ_RTC1Hz, 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);
+
+        free_irq(sa1100_rtc->irq_Alrm, dev);
+        free_irq(sa1100_rtc->irq_1Hz, dev);
 }
 
 static int sa1100_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
-        spin_lock_irq(&sa1100_rtc_lock);
+        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
+        unsigned int rtsr;
+
+        spin_lock_irq(&sa1100_rtc->lock);
+
+        rtsr = rtc_readl(sa1100_rtc, RTSR);
         if (enabled)
-                RTSR |= RTSR_ALE;
+                rtsr |= RTSR_ALE;
         else
-                RTSR &= ~RTSR_ALE;
-        spin_unlock_irq(&sa1100_rtc_lock);
+                rtsr &= ~RTSR_ALE;
+        rtc_writel(sa1100_rtc, RTSR, rtsr);
+
+        spin_unlock_irq(&sa1100_rtc->lock);
         return 0;
 }
 
 static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-        rtc_time_to_tm(RCNR, tm);
+        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
+
+        rtc_time_to_tm(rtc_readl(sa1100_rtc, 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)
-                RCNR = time;
+                rtc_writel(sa1100_rtc, RCNR, time);
         return ret;
 }
 
 static int sa1100_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-        u32     rtsr;
+        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
+        unsigned long time;
+        unsigned int rtsr;
 
-        memcpy(&alrm->time, &rtc_alarm, sizeof(struct rtc_time));
-        rtsr = RTSR;
+        time = rtc_readl(sa1100_rtc, RCNR);
+        rtc_time_to_tm(time, &alrm->time);
+        rtsr = rtc_readl(sa1100_rtc, RTSR);
         alrm->enabled = (rtsr & RTSR_ALE) ? 1 : 0;
         alrm->pending = (rtsr & RTSR_AL) ? 1 : 0;
         return 0;
@@ -237,26 +233,39 @@ 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)
 {
-        int ret;
+        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);
-        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);
+        spin_lock_irq(&sa1100_rtc->lock);
 
-        return ret;
+        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);
+
+        spin_unlock_irq(&sa1100_rtc->lock);
+
+        return 0;
 }
 
 static int sa1100_rtc_proc(struct device *dev, struct seq_file *seq)
 {
-        seq_printf(seq, "trim/divider\t\t: 0x%08x\n", (u32) RTTR);
-        seq_printf(seq, "RTSR\t\t\t: 0x%08x\n", (u32)RTSR);
+        struct sa1100_rtc *sa1100_rtc = dev_get_drvdata(dev);
 
+        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;
 }
 
@@ -273,7 +282,51 @@ static const struct rtc_class_ops sa1100_rtc_ops = {
 
 static int sa1100_rtc_probe(struct platform_device *pdev)
 {
-        struct rtc_device *rtc;
+        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);
 
         /*
          * According to the manual we should be able to let RTTR be zero
@@ -282,24 +335,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 (RTTR == 0) {
-                RTTR = RTC_DEF_DIVIDER + (RTC_DEF_TRIM << 16);
-                dev_warn(&pdev->dev, "warning: "
-                        "initializing default clock divider/trim value\n");
+        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");
                 /* The current RTC value probably doesn't make sense either */
-                RCNR = 0;
+                rtc_writel(sa1100_rtc, RCNR, 0);
         }
 
         device_init_wakeup(&pdev->dev, 1);
 
-        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);
-
+        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;
+        }
         /* Fix for a nasty initialization problem the in SA11xx RTSR register.
          * See also the comments in sa1100_rtc_interrupt().
          *
@@ -322,33 +375,46 @@ 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. */
-        RTSR = RTSR_AL | RTSR_HZ;
+        rtc_writel(sa1100_rtc, 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 rtc_device *rtc = platform_get_drvdata(pdev);
-
-        if (rtc)
-                rtc_device_unregister(rtc);
+        struct sa1100_rtc *sa1100_rtc = platform_get_drvdata(pdev);
 
+        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(IRQ_RTCAlrm);
+                enable_irq_wake(sa1100_rtc->irq_Alrm);
         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(IRQ_RTCAlrm);
+                disable_irq_wake(sa1100_rtc->irq_Alrm);
         return 0;
 }
 
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 87a0cf160fe5..0326571e7ffa 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1718,7 +1718,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
         erp->startdev = device;
         erp->memdev = device;
         erp->magic = default_erp->magic;
-        erp->expires = 0;
+        erp->expires = default_erp->expires;
         erp->retries = 256;
         erp->buildclk = get_clock();
         erp->status = DASD_CQR_FILLED;
@@ -2363,7 +2363,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
         erp->memdev   = device;
         erp->block    = cqr->block;
         erp->magic    = cqr->magic;
-        erp->expires  = 0;
+        erp->expires  = cqr->expires;
         erp->retries  = 256;
         erp->buildclk = get_clock();
         erp->status = DASD_CQR_FILLED;
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index c388eda1e2b1..553b3c5abb0a 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -705,6 +705,16 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device)
         if (lcu->pav == NO_PAV ||
             lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING))
                 return NULL;
+        if (unlikely(!(private->features.feature[8] & 0x01))) {
+                /*
+                 * PAV enabled but prefix not, very unlikely
+                 * seems to be a lost pathgroup
+                 * use base device to do IO
+                 */
+                DBF_DEV_EVENT(DBF_ERR, base_device, "%s",
+                              "Prefix not enabled with PAV enabled\n");
+                return NULL;
+        }
 
         spin_lock_irqsave(&lcu->lock, flags);
         alias_device = group->next;
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 6ab29680586a..bbcd5e9206ee 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -752,24 +752,13 @@ dasd_eckd_cdl_reclen(int recid)
                 return sizes_trk0[recid];
         return LABEL_SIZE;
 }
-
-/*
- * Generate device unique id that specifies the physical device.
- */
-static int dasd_eckd_generate_uid(struct dasd_device *device)
+/* create unique id from private structure. */
+static void create_uid(struct dasd_eckd_private *private)
 {
-        struct dasd_eckd_private *private;
-        struct dasd_uid *uid;
         int count;
-        unsigned long flags;
+        struct dasd_uid *uid;
 
-        private = (struct dasd_eckd_private *) device->private;
-        if (!private)
-                return -ENODEV;
-        if (!private->ned || !private->gneq)
-                return -ENODEV;
         uid = &private->uid;
-        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
         memset(uid, 0, sizeof(struct dasd_uid));
         memcpy(uid->vendor, private->ned->HDA_manufacturer,
                sizeof(uid->vendor) - 1);
@@ -792,6 +781,23 @@ static int dasd_eckd_generate_uid(struct dasd_device *device)
                                 private->vdsneq->uit[count]);
                 }
         }
+}
+
+/*
+ * Generate device unique id that specifies the physical device.
+ */
+static int dasd_eckd_generate_uid(struct dasd_device *device)
+{
+        struct dasd_eckd_private *private;
+        unsigned long flags;
+
+        private = (struct dasd_eckd_private *) device->private;
+        if (!private)
+                return -ENODEV;
+        if (!private->ned || !private->gneq)
+                return -ENODEV;
+        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
+        create_uid(private);
         spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
         return 0;
 }
@@ -811,6 +817,21 @@ static int dasd_eckd_get_uid(struct dasd_device *device, struct dasd_uid *uid)
         return -EINVAL;
 }
 
+/*
+ * compare device UID with data of a given dasd_eckd_private structure
+ * return 0 for match
+ */
+static int dasd_eckd_compare_path_uid(struct dasd_device *device,
+                                      struct dasd_eckd_private *private)
+{
+        struct dasd_uid device_uid;
+
+        create_uid(private);
+        dasd_eckd_get_uid(device, &device_uid);
+
+        return memcmp(&device_uid, &private->uid, sizeof(struct dasd_uid));
+}
+
 static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device,
                                    struct dasd_ccw_req *cqr,
                                    __u8 *rcd_buffer,
@@ -1005,59 +1026,120 @@ static int dasd_eckd_read_conf(struct dasd_device *device)
         int conf_len, conf_data_saved;
         int rc;
         __u8 lpm, opm;
-        struct dasd_eckd_private *private;
+        struct dasd_eckd_private *private, path_private;
         struct dasd_path *path_data;
+        struct dasd_uid *uid;
+        char print_path_uid[60], print_device_uid[60];
 
         private = (struct dasd_eckd_private *) device->private;
         path_data = &device->path_data;
         opm = ccw_device_get_path_mask(device->cdev);
-        lpm = 0x80;
         conf_data_saved = 0;
         /* get configuration data per operational path */
         for (lpm = 0x80; lpm; lpm>>= 1) {
-                if (lpm & opm) {
-                        rc = dasd_eckd_read_conf_lpm(device, &conf_data,
-                                                     &conf_len, lpm);
-                        if (rc && rc != -EOPNOTSUPP) {  /* -EOPNOTSUPP is ok */
-                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
-                                          "Read configuration data returned "
-                                          "error %d", rc);
-                                return rc;
-                        }
-                        if (conf_data == NULL) {
-                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
-                                                "No configuration data "
-                                                "retrieved");
-                                /* no further analysis possible */
-                                path_data->opm |= lpm;
-                                continue;       /* no error */
+                if (!(lpm & opm))
+                        continue;
+                rc = dasd_eckd_read_conf_lpm(device, &conf_data,
+                                             &conf_len, lpm);
+                if (rc && rc != -EOPNOTSUPP) {  /* -EOPNOTSUPP is ok */
+                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
+                                        "Read configuration data returned "
+                                        "error %d", rc);
+                        return rc;
+                }
+                if (conf_data == NULL) {
+                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                                        "No configuration data "
+                                        "retrieved");
+                        /* no further analysis possible */
+                        path_data->opm |= lpm;
+                        continue;       /* no error */
+                }
+                /* save first valid configuration data */
+                if (!conf_data_saved) {
+                        kfree(private->conf_data);
+                        private->conf_data = conf_data;
+                        private->conf_len = conf_len;
+                        if (dasd_eckd_identify_conf_parts(private)) {
+                                private->conf_data = NULL;
+                                private->conf_len = 0;
+                                kfree(conf_data);
+                                continue;
                         }
-                        /* save first valid configuration data */
-                        if (!conf_data_saved) {
-                                kfree(private->conf_data);
-                                private->conf_data = conf_data;
-                                private->conf_len = conf_len;
-                                if (dasd_eckd_identify_conf_parts(private)) {
-                                        private->conf_data = NULL;
-                                        private->conf_len = 0;
-                                        kfree(conf_data);
-                                        continue;
-                                }
-                                conf_data_saved++;
+                        /*
+                         * build device UID that other path data
+                         * can be compared to it
+                         */
+                        dasd_eckd_generate_uid(device);
+                        conf_data_saved++;
+                } else {
+                        path_private.conf_data = conf_data;
+                        path_private.conf_len = DASD_ECKD_RCD_DATA_SIZE;
+                        if (dasd_eckd_identify_conf_parts(
+                                    &path_private)) {
+                                path_private.conf_data = NULL;
+                                path_private.conf_len = 0;
+                                kfree(conf_data);
+                                continue;
                         }
-                        switch (dasd_eckd_path_access(conf_data, conf_len)) {
-                        case 0x02:
-                                path_data->npm |= lpm;
-                                break;
-                        case 0x03:
-                                path_data->ppm |= lpm;
-                                break;
+
+                        if (dasd_eckd_compare_path_uid(
+                                    device, &path_private)) {
+                                uid = &path_private.uid;
+                                if (strlen(uid->vduit) > 0)
+                                        snprintf(print_path_uid,
+                                                 sizeof(print_path_uid),
+                                                 "%s.%s.%04x.%02x.%s",
+                                                 uid->vendor, uid->serial,
+                                                 uid->ssid, uid->real_unit_addr,
+                                                 uid->vduit);
+                                else
+                                        snprintf(print_path_uid,
+                                                 sizeof(print_path_uid),
+                                                 "%s.%s.%04x.%02x",
+                                                 uid->vendor, uid->serial,
+                                                 uid->ssid,
+                                                 uid->real_unit_addr);
+                                uid = &private->uid;
+                                if (strlen(uid->vduit) > 0)
+                                        snprintf(print_device_uid,
+                                                 sizeof(print_device_uid),
+                                                 "%s.%s.%04x.%02x.%s",
+                                                 uid->vendor, uid->serial,
+                                                 uid->ssid, uid->real_unit_addr,
+                                                 uid->vduit);
+                                else
+                                        snprintf(print_device_uid,
+                                                 sizeof(print_device_uid),
+                                                 "%s.%s.%04x.%02x",
+                                                 uid->vendor, uid->serial,
+                                                 uid->ssid,
+                                                 uid->real_unit_addr);
+                                dev_err(&device->cdev->dev,
+                                        "Not all channel paths lead to "
+                                        "the same device, path %02X leads to "
+                                        "device %s instead of %s\n", lpm,
+                                        print_path_uid, print_device_uid);
+                                return -EINVAL;
                         }
-                        path_data->opm |= lpm;
-                        if (conf_data != private->conf_data)
-                                kfree(conf_data);
+
+                        path_private.conf_data = NULL;
+                        path_private.conf_len = 0;
                 }
+                switch (dasd_eckd_path_access(conf_data, conf_len)) {
+                case 0x02:
+                        path_data->npm |= lpm;
+                        break;
+                case 0x03:
+                        path_data->ppm |= lpm;
+                        break;
+                }
+                path_data->opm |= lpm;
+
+                if (conf_data != private->conf_data)
+                        kfree(conf_data);
         }
+
         return 0;
 }
 
@@ -1090,12 +1172,61 @@ static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm)
         return 0;
 }
 
+static int rebuild_device_uid(struct dasd_device *device,
+                              struct path_verification_work_data *data)
+{
+        struct dasd_eckd_private *private;
+        struct dasd_path *path_data;
+        __u8 lpm, opm;
+        int rc;
+
+        rc = -ENODEV;
+        private = (struct dasd_eckd_private *) device->private;
+        path_data = &device->path_data;
+        opm = device->path_data.opm;
+
+        for (lpm = 0x80; lpm; lpm >>= 1) {
+                if (!(lpm & opm))
+                        continue;
+                memset(&data->rcd_buffer, 0, sizeof(data->rcd_buffer));
+                memset(&data->cqr, 0, sizeof(data->cqr));
+                data->cqr.cpaddr = &data->ccw;
+                rc = dasd_eckd_read_conf_immediately(device, &data->cqr,
+                                                     data->rcd_buffer,
+                                                     lpm);
+
+                if (rc) {
+                        if (rc == -EOPNOTSUPP) /* -EOPNOTSUPP is ok */
+                                continue;
+                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
+                                        "Read configuration data "
+                                        "returned error %d", rc);
+                        break;
+                }
+                memcpy(private->conf_data, data->rcd_buffer,
+                       DASD_ECKD_RCD_DATA_SIZE);
+                if (dasd_eckd_identify_conf_parts(private)) {
+                        rc = -ENODEV;
+                } else /* first valid path is enough */
+                        break;
+        }
+
+        if (!rc)
+                rc = dasd_eckd_generate_uid(device);
+
+        return rc;
+}
+
 static void do_path_verification_work(struct work_struct *work)
 {
         struct path_verification_work_data *data;
         struct dasd_device *device;
+        struct dasd_eckd_private path_private;
+        struct dasd_uid *uid;
+        __u8 path_rcd_buf[DASD_ECKD_RCD_DATA_SIZE];
         __u8 lpm, opm, npm, ppm, epm;
         unsigned long flags;
+        char print_uid[60];
         int rc;
 
         data = container_of(work, struct path_verification_work_data, worker);
@@ -1112,64 +1243,129 @@ static void do_path_verification_work(struct work_struct *work)
         ppm = 0;
         epm = 0;
         for (lpm = 0x80; lpm; lpm >>= 1) {
-                if (lpm & data->tbvpm) {
-                        memset(data->rcd_buffer, 0, sizeof(data->rcd_buffer));
-                        memset(&data->cqr, 0, sizeof(data->cqr));
-                        data->cqr.cpaddr = &data->ccw;
-                        rc = dasd_eckd_read_conf_immediately(device, &data->cqr,
-                                                             data->rcd_buffer,
-                                                             lpm);
-                        if (!rc) {
-                                switch (dasd_eckd_path_access(data->rcd_buffer,
-                                                     DASD_ECKD_RCD_DATA_SIZE)) {
-                                case 0x02:
-                                        npm |= lpm;
-                                        break;
-                                case 0x03:
-                                        ppm |= lpm;
-                                        break;
-                                }
-                                opm |= lpm;
-                        } else if (rc == -EOPNOTSUPP) {
-                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
-                                       "path verification: No configuration "
-                                       "data retrieved");
-                                opm |= lpm;
-                        } else if (rc == -EAGAIN) {
-                                DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                if (!(lpm & data->tbvpm))
+                        continue;
+                memset(&data->rcd_buffer, 0, sizeof(data->rcd_buffer));
+                memset(&data->cqr, 0, sizeof(data->cqr));
+                data->cqr.cpaddr = &data->ccw;
+                rc = dasd_eckd_read_conf_immediately(device, &data->cqr,
+                                                     data->rcd_buffer,
+                                                     lpm);
+                if (!rc) {
+                        switch (dasd_eckd_path_access(data->rcd_buffer,
+                                                      DASD_ECKD_RCD_DATA_SIZE)
+                                ) {
+                        case 0x02:
+                                npm |= lpm;
+                                break;
+                        case 0x03:
+                                ppm |= lpm;
+                                break;
+                        }
+                        opm |= lpm;
+                } else if (rc == -EOPNOTSUPP) {
+                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
+                                        "path verification: No configuration "
+                                        "data retrieved");
+                        opm |= lpm;
+                } else if (rc == -EAGAIN) {
+                        DBF_EVENT_DEVID(DBF_WARNING, device->cdev, "%s",
                                         "path verification: device is stopped,"
                                         " try again later");
-                                epm |= lpm;
-                        } else {
-                                dev_warn(&device->cdev->dev,
-                                         "Reading device feature codes failed "
-                                         "(rc=%d) for new path %x\n", rc, lpm);
-                                continue;
-                        }
-                        if (verify_fcx_max_data(device, lpm)) {
+                        epm |= lpm;
+                } else {
+                        dev_warn(&device->cdev->dev,
+                                 "Reading device feature codes failed "
+                                 "(rc=%d) for new path %x\n", rc, lpm);
+                        continue;
+                }
+                if (verify_fcx_max_data(device, lpm)) {
+                        opm &= ~lpm;
+                        npm &= ~lpm;
+                        ppm &= ~lpm;
+                        continue;
+                }
+
+                /*
+                 * save conf_data for comparison after
+                 * rebuild_device_uid may have changed
+                 * the original data
+                 */
+                memcpy(&path_rcd_buf, data->rcd_buffer,
+                       DASD_ECKD_RCD_DATA_SIZE);
+                path_private.conf_data = (void *) &path_rcd_buf;
+                path_private.conf_len = DASD_ECKD_RCD_DATA_SIZE;
+                if (dasd_eckd_identify_conf_parts(&path_private)) {
+                        path_private.conf_data = NULL;
+                        path_private.conf_len = 0;
+                        continue;
+                }
+
+                /*
+                 * compare path UID with device UID only if at least
+                 * one valid path is left
+                 * in other case the device UID may have changed and
+                 * the first working path UID will be used as device UID
+                 */
+                if (device->path_data.opm &&
+                    dasd_eckd_compare_path_uid(device, &path_private)) {
+                        /*
+                         * the comparison was not successful
+                         * rebuild the device UID with at least one
+                         * known path in case a z/VM hyperswap command
+                         * has changed the device
+                         *
+                         * after this compare again
+                         *
+                         * if either the rebuild or the recompare fails
+                         * the path can not be used
+                         */
+                        if (rebuild_device_uid(device, data) ||
+                            dasd_eckd_compare_path_uid(
+                                    device, &path_private)) {
+                                uid = &path_private.uid;
+                                if (strlen(uid->vduit) > 0)
+                                        snprintf(print_uid, sizeof(print_uid),
+                                                 "%s.%s.%04x.%02x.%s",
+                                                 uid->vendor, uid->serial,
+                                                 uid->ssid, uid->real_unit_addr,
+                                                 uid->vduit);
+                                else
+                                        snprintf(print_uid, sizeof(print_uid),
+                                                 "%s.%s.%04x.%02x",
+                                                 uid->vendor, uid->serial,
+                                                 uid->ssid,
+                                                 uid->real_unit_addr);
+                                dev_err(&device->cdev->dev,
+                                        "The newly added channel path %02X "
+                                        "will not be used because it leads "
+                                        "to a different device %s\n",
+                                        lpm, print_uid);
                                 opm &= ~lpm;
                                 npm &= ~lpm;
                                 ppm &= ~lpm;
+                                continue;
                         }
                 }
+
+                /*
+                 * There is a small chance that a path is lost again between
+                 * above path verification and the following modification of
+                 * the device opm mask. We could avoid that race here by using
+                 * yet another path mask, but we rather deal with this unlikely
+                 * situation in dasd_start_IO.
+                 */
+                spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
+                if (!device->path_data.opm && opm) {
+                        device->path_data.opm = opm;
+                        dasd_generic_path_operational(device);
+                } else
+                        device->path_data.opm |= opm;
+                device->path_data.npm |= npm;
+                device->path_data.ppm |= ppm;
+                device->path_data.tbvpm |= epm;
+                spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
         }
-        /*
-         * There is a small chance that a path is lost again between
-         * above path verification and the following modification of
-         * the device opm mask. We could avoid that race here by using
-         * yet another path mask, but we rather deal with this unlikely
-         * situation in dasd_start_IO.
-         */
-        spin_lock_irqsave(get_ccwdev_lock(device->cdev), flags);
-        if (!device->path_data.opm && opm) {
-                device->path_data.opm = opm;
-                dasd_generic_path_operational(device);
-        } else
-                device->path_data.opm |= opm;
-        device->path_data.npm |= npm;
-        device->path_data.ppm |= ppm;
-        device->path_data.tbvpm |= epm;
-        spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags);
 
         dasd_put_device(device);
         if (data->isglobal)
@@ -1441,11 +1637,6 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
                         device->default_expires = value;
         }
 
-        /* Generate device unique id */
-        rc = dasd_eckd_generate_uid(device);
-        if (rc)
-                goto out_err1;
-
         dasd_eckd_get_uid(device, &temp_uid);
         if (temp_uid.type == UA_BASE_DEVICE) {
                 block = dasd_alloc_block();
@@ -2206,7 +2397,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
                                            sizeof(struct PFX_eckd_data));
         } else {
                 if (define_extent(ccw++, cqr->data, first_trk,
-                                  last_trk, cmd, startdev) == -EAGAIN) {
+                                  last_trk, cmd, basedev) == -EAGAIN) {
                         /* Clock not in sync and XRC is enabled.
                          * Try again later.
                          */
diff --git a/drivers/s390/char/tape_class.h b/drivers/s390/char/tape_class.h
index 9e32780c317f..ba2092f741d5 100644
--- a/drivers/s390/char/tape_class.h
+++ b/drivers/s390/char/tape_class.h
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/major.h>
-#include <linux/kobj_map.h>
 #include <linux/cdev.h>
 
 #include <linux/device.h>
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 2acc01f90a6a..452989a7ec13 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -22,12 +22,9 @@
 static struct kmem_cache *qdio_q_cache;
 static struct kmem_cache *qdio_aob_cache;
 
-struct qaob *qdio_allocate_aob()
+struct qaob *qdio_allocate_aob(void)
 {
-        struct qaob *aob;
-
-        aob = kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);
-        return aob;
+        return kmem_cache_zalloc(qdio_aob_cache, GFP_ATOMIC);
 }
 EXPORT_SYMBOL_GPL(qdio_allocate_aob);
 
@@ -180,7 +177,8 @@ static void setup_queues(struct qdio_irq *irq_ptr,
                 setup_queues_misc(q, irq_ptr, qdio_init->input_handler, i);
 
                 q->is_input_q = 1;
-                q->u.in.queue_start_poll = qdio_init->queue_start_poll[i];
+                q->u.in.queue_start_poll = qdio_init->queue_start_poll_array ?
+                                qdio_init->queue_start_poll_array[i] : NULL;
 
                 setup_storage_lists(q, irq_ptr, input_sbal_array, i);
                 input_sbal_array += QDIO_MAX_BUFFERS_PER_Q;
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index dd4737808e06..077b7d109fde 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -56,11 +56,6 @@
 #define PCIXCC_MAX_ICA_RESPONSE_SIZE 0x77c /* max size type86 v2 reply      */
 
 #define PCIXCC_MAX_XCRB_MESSAGE_SIZE (12*1024)
-#define PCIXCC_MAX_XCRB_RESPONSE_SIZE PCIXCC_MAX_XCRB_MESSAGE_SIZE
-#define PCIXCC_MAX_XCRB_DATA_SIZE (11*1024)
-#define PCIXCC_MAX_XCRB_REPLY_SIZE (5*1024)
-
-#define PCIXCC_MAX_RESPONSE_SIZE PCIXCC_MAX_XCRB_RESPONSE_SIZE
 
 #define PCIXCC_CLEANUP_TIME     (15*HZ)
 
@@ -265,7 +260,7 @@ static int ICACRT_msg_to_type6CRT_msgX(struct zcrypt_device *zdev,
  * @ap_msg: pointer to AP message
  * @xcRB: pointer to user input data
  *
- * Returns 0 on success or -EFAULT.
+ * Returns 0 on success or -EFAULT, -EINVAL.
  */
 struct type86_fmt2_msg {
         struct type86_hdr hdr;
@@ -295,19 +290,12 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,
                 CEIL4(xcRB->request_control_blk_length) +
                 xcRB->request_data_length;
         if (ap_msg->length > PCIXCC_MAX_XCRB_MESSAGE_SIZE)
-                return -EFAULT;
-        if (CEIL4(xcRB->reply_control_blk_length) > PCIXCC_MAX_XCRB_REPLY_SIZE)
-                return -EFAULT;
-        if (CEIL4(xcRB->reply_data_length) > PCIXCC_MAX_XCRB_DATA_SIZE)
-                return -EFAULT;
-        replylen = CEIL4(xcRB->reply_control_blk_length) +
-                CEIL4(xcRB->reply_data_length) +
-                sizeof(struct type86_fmt2_msg);
-        if (replylen > PCIXCC_MAX_XCRB_RESPONSE_SIZE) {
-                xcRB->reply_control_blk_length = PCIXCC_MAX_XCRB_RESPONSE_SIZE -
-                        (sizeof(struct type86_fmt2_msg) +
-                            CEIL4(xcRB->reply_data_length));
-        }
+                return -EINVAL;
+        replylen = sizeof(struct type86_fmt2_msg) +
+                CEIL4(xcRB->reply_control_blk_length) +
+                xcRB->reply_data_length;
+        if (replylen > PCIXCC_MAX_XCRB_MESSAGE_SIZE)
+                return -EINVAL;
 
         /* prepare type6 header */
         msg->hdr = static_type6_hdrX;
@@ -326,7 +314,7 @@ static int XCRB_msg_to_type6CPRB_msgX(struct zcrypt_device *zdev,
                 return -EFAULT;
         if (msg->cprbx.cprb_len + sizeof(msg->hdr.function_code) >
             xcRB->request_control_blk_length)
-                return -EFAULT;
+                return -EINVAL;
         function_code = ((unsigned char *)&msg->cprbx) + msg->cprbx.cprb_len;
         memcpy(msg->hdr.function_code, function_code, sizeof(msg->hdr.function_code));
 
@@ -678,7 +666,7 @@ static void zcrypt_pcixcc_receive(struct ap_device *ap_dev,
                         break;
                 case PCIXCC_RESPONSE_TYPE_XCRB:
                         length = t86r->fmt2.offset2 + t86r->fmt2.count2;
-                        length = min(PCIXCC_MAX_XCRB_RESPONSE_SIZE, length);
+                        length = min(PCIXCC_MAX_XCRB_MESSAGE_SIZE, length);
                         memcpy(msg->message, reply->message, length);
                         break;
                 default:
@@ -1043,7 +1031,7 @@ static int zcrypt_pcixcc_probe(struct ap_device *ap_dev)
         struct zcrypt_device *zdev;
         int rc = 0;
 
-        zdev = zcrypt_device_alloc(PCIXCC_MAX_RESPONSE_SIZE);
+        zdev = zcrypt_device_alloc(PCIXCC_MAX_XCRB_MESSAGE_SIZE);
         if (!zdev)
                 return -ENOMEM;
         zdev->ap_dev = ap_dev;
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 4fae1dc19951..9c3f38da4c01 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -4552,7 +4552,7 @@ static int qeth_qdio_establish(struct qeth_card *card)
         init_data.no_output_qs           = card->qdio.no_out_queues;
         init_data.input_handler          = card->discipline.input_handler;
         init_data.output_handler         = card->discipline.output_handler;
-        init_data.queue_start_poll       = queue_start_poll;
+        init_data.queue_start_poll_array = queue_start_poll;
         init_data.int_parm               = (unsigned long) card;
         init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;
         init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 8a0b33033177..0bd38da4ada0 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -650,6 +650,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
                                      AAC_OPT_NEW_COMM) ?
                                       (dev->scsi_host_ptr->max_sectors << 9) :
                                       65536)) {
+                                        kfree(usg);
                                         rcode = -EINVAL;
                                         goto cleanup;
                                 }
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 019a7163572f..dcf7e1006426 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -971,6 +971,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
         struct s3c64xx_spi_info *sci;
         struct spi_master *master;
         int ret;
+        char clk_name[16];
 
         if (pdev->id < 0) {
                 dev_err(&pdev->dev,
@@ -984,11 +985,6 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
         }
 
         sci = pdev->dev.platform_data;
-        if (!sci->src_clk_name) {
-                dev_err(&pdev->dev,
-                        "Board init must call s3c64xx_spi_set_info()\n");
-                return -EINVAL;
-        }
 
         /* Check for availability of necessary resource */
 
@@ -1073,17 +1069,17 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
                 goto err4;
         }
 
-        sdd->src_clk = clk_get(&pdev->dev, sci->src_clk_name);
+        sprintf(clk_name, "spi_busclk%d", sci->src_clk_nr);
+        sdd->src_clk = clk_get(&pdev->dev, clk_name);
         if (IS_ERR(sdd->src_clk)) {
                 dev_err(&pdev->dev,
-                        "Unable to acquire clock '%s'\n", sci->src_clk_name);
+                        "Unable to acquire clock '%s'\n", clk_name);
                 ret = PTR_ERR(sdd->src_clk);
                 goto err5;
         }
 
         if (clk_enable(sdd->src_clk)) {
-                dev_err(&pdev->dev, "Couldn't enable clock '%s'\n",
-                                                        sci->src_clk_name);
+                dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);
                 ret = -EBUSY;
                 goto err6;
         }
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 25cdff36a78a..21e2f4b87f14 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -72,8 +72,6 @@ source "drivers/staging/octeon/Kconfig"
 
 source "drivers/staging/serqt_usb2/Kconfig"
 
-source "drivers/staging/spectra/Kconfig"
-
 source "drivers/staging/quatech_usb2/Kconfig"
 
 source "drivers/staging/vt6655/Kconfig"
@@ -116,8 +114,6 @@ source "drivers/staging/bcm/Kconfig"
 
 source "drivers/staging/ft1000/Kconfig"
 
-source "drivers/staging/intel_sst/Kconfig"
-
 source "drivers/staging/speakup/Kconfig"
 
 source "drivers/staging/cptm1217/Kconfig"
@@ -132,4 +128,8 @@ source "drivers/staging/nvec/Kconfig"
 
 source "drivers/staging/media/Kconfig"
 
+source "drivers/staging/omapdrm/Kconfig"
+
+source "drivers/staging/android/Kconfig"
+
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index a25f3f26c7ff..7c5808d7212d 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_RTL8192E)		+= rtl8192e/
 obj-$(CONFIG_R8712U)            += rtl8712/
 obj-$(CONFIG_RTS_PSTOR)         += rts_pstor/
 obj-$(CONFIG_RTS5139)           += rts5139/
-obj-$(CONFIG_SPECTRA)           += spectra/
 obj-$(CONFIG_TRANZPORT)         += frontier/
 obj-$(CONFIG_POHMELFS)          += pohmelfs/
 obj-$(CONFIG_IDE_PHISON)        += phison/
@@ -50,10 +49,11 @@ obj-$(CONFIG_SBE_2T3E3)		+= sbe-2t3e3/
 obj-$(CONFIG_USB_ENESTORAGE)    += keucr/
 obj-$(CONFIG_BCM_WIMAX)         += bcm/
 obj-$(CONFIG_FT1000)            += ft1000/
-obj-$(CONFIG_SND_INTEL_SST)     += intel_sst/
 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/
+obj-$(CONFIG_ANDROID)           += android/
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
new file mode 100644
index 000000000000..becf711117ef
--- /dev/null
+++ b/drivers/staging/android/Kconfig
@@ -0,0 +1,110 @@
+menu "Android"
+
+config ANDROID
+        bool "Android Drivers"
+        default N
+        ---help---
+          Enable support for various drivers needed on the Android platform
+
+if ANDROID
+
+config ANDROID_BINDER_IPC
+        bool "Android Binder IPC Driver"
+        default n
+
+config ASHMEM
+        bool "Enable the Anonymous Shared Memory Subsystem"
+        default n
+        depends on SHMEM || TINY_SHMEM
+        help
+          The ashmem subsystem is a new shared memory allocator, similar to
+          POSIX SHM but with different behavior and sporting a simpler
+          file-based API.
+
+config ANDROID_LOGGER
+        tristate "Android log driver"
+        default n
+
+config ANDROID_RAM_CONSOLE
+        bool "Android RAM buffer console"
+        default n
+
+config ANDROID_RAM_CONSOLE_ENABLE_VERBOSE
+        bool "Enable verbose console messages on Android RAM console"
+        default y
+        depends on ANDROID_RAM_CONSOLE
+
+menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        bool "Android RAM Console Enable error correction"
+        default n
+        depends on ANDROID_RAM_CONSOLE
+        depends on !ANDROID_RAM_CONSOLE_EARLY_INIT
+        select REED_SOLOMON
+        select REED_SOLOMON_ENC8
+        select REED_SOLOMON_DEC8
+
+if ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+
+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE
+        int "Android RAM Console Data data size"
+        default 128
+        help
+          Must be a power of 2.
+
+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE
+        int "Android RAM Console ECC size"
+        default 16
+
+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE
+        int "Android RAM Console Symbol size"
+        default 8
+
+config ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL
+        hex "Android RAM Console Polynomial"
+        default 0x19 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 4)
+        default 0x29 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 5)
+        default 0x61 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 6)
+        default 0x89 if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 7)
+        default 0x11d if (ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE = 8)
+
+endif # ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+
+config ANDROID_RAM_CONSOLE_EARLY_INIT
+        bool "Start Android RAM console early"
+        default n
+        depends on ANDROID_RAM_CONSOLE
+
+config ANDROID_RAM_CONSOLE_EARLY_ADDR
+        hex "Android RAM console virtual address"
+        default 0
+        depends on ANDROID_RAM_CONSOLE_EARLY_INIT
+
+config ANDROID_RAM_CONSOLE_EARLY_SIZE
+        hex "Android RAM console buffer size"
+        default 0
+        depends on ANDROID_RAM_CONSOLE_EARLY_INIT
+
+config ANDROID_TIMED_OUTPUT
+        bool "Timed output class driver"
+        default y
+
+config ANDROID_TIMED_GPIO
+        tristate "Android timed gpio driver"
+        depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT
+        default n
+
+config ANDROID_LOW_MEMORY_KILLER
+        bool "Android Low Memory Killer"
+        default N
+        ---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
+
+endmenu
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
new file mode 100644
index 000000000000..eaed1ff64f0f
--- /dev/null
+++ b/drivers/staging/android/Makefile
@@ -0,0 +1,9 @@
+obj-$(CONFIG_ANDROID_BINDER_IPC)        += binder.o
+obj-$(CONFIG_ASHMEM)                    += ashmem.o
+obj-$(CONFIG_ANDROID_LOGGER)            += logger.o
+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/TODO b/drivers/staging/android/TODO
new file mode 100644
index 000000000000..e59c5be4be2b
--- /dev/null
+++ b/drivers/staging/android/TODO
@@ -0,0 +1,10 @@
+TODO:
+        - checkpatch.pl cleanups
+        - sparse fixes
+        - rename files to be not so "generic"
+        - make sure things build as modules properly
+        - add proper arch dependancies as needed
+        - audit userspace interfaces to make sure they are sane
+
+Please send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc:
+Brian Swetland <swetland@google.com>
diff --git a/drivers/staging/android/android_pmem.h b/drivers/staging/android/android_pmem.h
new file mode 100644
index 000000000000..f633621f5be3
--- /dev/null
+++ b/drivers/staging/android/android_pmem.h
@@ -0,0 +1,93 @@
+/* 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/ashmem.c b/drivers/staging/android/ashmem.c
new file mode 100644
index 000000000000..99052bfd3a2d
--- /dev/null
+++ b/drivers/staging/android/ashmem.c
@@ -0,0 +1,752 @@
+/* mm/ashmem.c
+**
+** Anonymous Shared Memory Subsystem, ashmem
+**
+** Copyright (C) 2008 Google, Inc.
+**
+** Robert Love <rlove@google.com>
+**
+** 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/module.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/security.h>
+#include <linux/mm.h>
+#include <linux/mman.h>
+#include <linux/uaccess.h>
+#include <linux/personality.h>
+#include <linux/bitops.h>
+#include <linux/mutex.h>
+#include <linux/shmem_fs.h>
+#include "ashmem.h"
+
+#define ASHMEM_NAME_PREFIX "dev/ashmem/"
+#define ASHMEM_NAME_PREFIX_LEN (sizeof(ASHMEM_NAME_PREFIX) - 1)
+#define ASHMEM_FULL_NAME_LEN (ASHMEM_NAME_LEN + ASHMEM_NAME_PREFIX_LEN)
+
+/*
+ * ashmem_area - anonymous shared memory area
+ * Lifecycle: From our parent file's open() until its release()
+ * Locking: Protected by `ashmem_mutex'
+ * Big Note: Mappings do NOT pin this structure; it dies on close()
+ */
+struct ashmem_area {
+        char name[ASHMEM_FULL_NAME_LEN]; /* optional name in /proc/pid/maps */
+        struct list_head unpinned_list;  /* list of all ashmem areas */
+        struct file *file;               /* the shmem-based backing file */
+        size_t size;                     /* size of the mapping, in bytes */
+        unsigned long prot_mask;         /* allowed prot bits, as vm_flags */
+};
+
+/*
+ * ashmem_range - represents an interval of unpinned (evictable) pages
+ * Lifecycle: From unpin to pin
+ * Locking: Protected by `ashmem_mutex'
+ */
+struct ashmem_range {
+        struct list_head lru;           /* entry in LRU list */
+        struct list_head unpinned;      /* entry in its area's unpinned list */
+        struct ashmem_area *asma;       /* associated area */
+        size_t pgstart;                 /* starting page, inclusive */
+        size_t pgend;                   /* ending page, inclusive */
+        unsigned int purged;            /* ASHMEM_NOT or ASHMEM_WAS_PURGED */
+};
+
+/* LRU list of unpinned pages, protected by ashmem_mutex */
+static LIST_HEAD(ashmem_lru_list);
+
+/* Count of pages on our LRU list, protected by ashmem_mutex */
+static unsigned long lru_count;
+
+/*
+ * ashmem_mutex - protects the list of and each individual ashmem_area
+ *
+ * Lock Ordering: ashmex_mutex -> i_mutex -> i_alloc_sem
+ */
+static DEFINE_MUTEX(ashmem_mutex);
+
+static struct kmem_cache *ashmem_area_cachep __read_mostly;
+static struct kmem_cache *ashmem_range_cachep __read_mostly;
+
+#define range_size(range) \
+        ((range)->pgend - (range)->pgstart + 1)
+
+#define range_on_lru(range) \
+        ((range)->purged == ASHMEM_NOT_PURGED)
+
+#define page_range_subsumes_range(range, start, end) \
+        (((range)->pgstart >= (start)) && ((range)->pgend <= (end)))
+
+#define page_range_subsumed_by_range(range, start, end) \
+        (((range)->pgstart <= (start)) && ((range)->pgend >= (end)))
+
+#define page_in_range(range, page) \
+        (((range)->pgstart <= (page)) && ((range)->pgend >= (page)))
+
+#define page_range_in_range(range, start, end) \
+        (page_in_range(range, start) || page_in_range(range, end) || \
+                page_range_subsumes_range(range, start, end))
+
+#define range_before_page(range, page) \
+        ((range)->pgend < (page))
+
+#define PROT_MASK               (PROT_EXEC | PROT_READ | PROT_WRITE)
+
+static inline void lru_add(struct ashmem_range *range)
+{
+        list_add_tail(&range->lru, &ashmem_lru_list);
+        lru_count += range_size(range);
+}
+
+static inline void lru_del(struct ashmem_range *range)
+{
+        list_del(&range->lru);
+        lru_count -= range_size(range);
+}
+
+/*
+ * range_alloc - allocate and initialize a new ashmem_range structure
+ *
+ * 'asma' - associated ashmem_area
+ * 'prev_range' - the previous ashmem_range in the sorted asma->unpinned list
+ * 'purged' - initial purge value (ASMEM_NOT_PURGED or ASHMEM_WAS_PURGED)
+ * 'start' - starting page, inclusive
+ * 'end' - ending page, inclusive
+ *
+ * Caller must hold ashmem_mutex.
+ */
+static int range_alloc(struct ashmem_area *asma,
+                       struct ashmem_range *prev_range, unsigned int purged,
+                       size_t start, size_t end)
+{
+        struct ashmem_range *range;
+
+        range = kmem_cache_zalloc(ashmem_range_cachep, GFP_KERNEL);
+        if (unlikely(!range))
+                return -ENOMEM;
+
+        range->asma = asma;
+        range->pgstart = start;
+        range->pgend = end;
+        range->purged = purged;
+
+        list_add_tail(&range->unpinned, &prev_range->unpinned);
+
+        if (range_on_lru(range))
+                lru_add(range);
+
+        return 0;
+}
+
+static void range_del(struct ashmem_range *range)
+{
+        list_del(&range->unpinned);
+        if (range_on_lru(range))
+                lru_del(range);
+        kmem_cache_free(ashmem_range_cachep, range);
+}
+
+/*
+ * range_shrink - shrinks a range
+ *
+ * Caller must hold ashmem_mutex.
+ */
+static inline void range_shrink(struct ashmem_range *range,
+                                size_t start, size_t end)
+{
+        size_t pre = range_size(range);
+
+        range->pgstart = start;
+        range->pgend = end;
+
+        if (range_on_lru(range))
+                lru_count -= pre - range_size(range);
+}
+
+static int ashmem_open(struct inode *inode, struct file *file)
+{
+        struct ashmem_area *asma;
+        int ret;
+
+        ret = generic_file_open(inode, file);
+        if (unlikely(ret))
+                return ret;
+
+        asma = kmem_cache_zalloc(ashmem_area_cachep, GFP_KERNEL);
+        if (unlikely(!asma))
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&asma->unpinned_list);
+        memcpy(asma->name, ASHMEM_NAME_PREFIX, ASHMEM_NAME_PREFIX_LEN);
+        asma->prot_mask = PROT_MASK;
+        file->private_data = asma;
+
+        return 0;
+}
+
+static int ashmem_release(struct inode *ignored, struct file *file)
+{
+        struct ashmem_area *asma = file->private_data;
+        struct ashmem_range *range, *next;
+
+        mutex_lock(&ashmem_mutex);
+        list_for_each_entry_safe(range, next, &asma->unpinned_list, unpinned)
+                range_del(range);
+        mutex_unlock(&ashmem_mutex);
+
+        if (asma->file)
+                fput(asma->file);
+        kmem_cache_free(ashmem_area_cachep, asma);
+
+        return 0;
+}
+
+static ssize_t ashmem_read(struct file *file, char __user *buf,
+                           size_t len, loff_t *pos)
+{
+        struct ashmem_area *asma = file->private_data;
+        int ret = 0;
+
+        mutex_lock(&ashmem_mutex);
+
+        /* If size is not set, or set to 0, always return EOF. */
+        if (asma->size == 0)
+                goto out;
+
+        if (!asma->file) {
+                ret = -EBADF;
+                goto out;
+        }
+
+        ret = asma->file->f_op->read(asma->file, buf, len, pos);
+        if (ret < 0)
+                goto out;
+
+        /** Update backing file pos, since f_ops->read() doesn't */
+        asma->file->f_pos = *pos;
+
+out:
+        mutex_unlock(&ashmem_mutex);
+        return ret;
+}
+
+static loff_t ashmem_llseek(struct file *file, loff_t offset, int origin)
+{
+        struct ashmem_area *asma = file->private_data;
+        int ret;
+
+        mutex_lock(&ashmem_mutex);
+
+        if (asma->size == 0) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (!asma->file) {
+                ret = -EBADF;
+                goto out;
+        }
+
+        ret = asma->file->f_op->llseek(asma->file, offset, origin);
+        if (ret < 0)
+                goto out;
+
+        /** Copy f_pos from backing file, since f_ops->llseek() sets it */
+        file->f_pos = asma->file->f_pos;
+
+out:
+        mutex_unlock(&ashmem_mutex);
+        return ret;
+}
+
+static inline unsigned long calc_vm_may_flags(unsigned long prot)
+{
+        return _calc_vm_trans(prot, PROT_READ,  VM_MAYREAD) |
+               _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) |
+               _calc_vm_trans(prot, PROT_EXEC,  VM_MAYEXEC);
+}
+
+static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct ashmem_area *asma = file->private_data;
+        int ret = 0;
+
+        mutex_lock(&ashmem_mutex);
+
+        /* user needs to SET_SIZE before mapping */
+        if (unlikely(!asma->size)) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* requested protection bits must match our allowed protection mask */
+        if (unlikely((vma->vm_flags & ~calc_vm_prot_bits(asma->prot_mask)) &
+                     calc_vm_prot_bits(PROT_MASK))) {
+                ret = -EPERM;
+                goto out;
+        }
+        vma->vm_flags &= ~calc_vm_may_flags(~asma->prot_mask);
+
+        if (!asma->file) {
+                char *name = ASHMEM_NAME_DEF;
+                struct file *vmfile;
+
+                if (asma->name[ASHMEM_NAME_PREFIX_LEN] != '\0')
+                        name = asma->name;
+
+                /* ... and allocate the backing shmem file */
+                vmfile = shmem_file_setup(name, asma->size, vma->vm_flags);
+                if (unlikely(IS_ERR(vmfile))) {
+                        ret = PTR_ERR(vmfile);
+                        goto out;
+                }
+                asma->file = vmfile;
+        }
+        get_file(asma->file);
+
+        /*
+         * XXX - Reworked to use shmem_zero_setup() instead of 
+         * shmem_set_file while we're in staging. -jstultz
+         */
+        if (vma->vm_flags & VM_SHARED) {
+                ret = shmem_zero_setup(vma);
+                if (ret) {
+                        fput(asma->file);
+                        goto out;
+                }
+        }
+
+        if (vma->vm_file)
+                fput(vma->vm_file);
+        vma->vm_file = asma->file;
+        vma->vm_flags |= VM_CAN_NONLINEAR;
+
+out:
+        mutex_unlock(&ashmem_mutex);
+        return ret;
+}
+
+/*
+ * ashmem_shrink - our cache shrinker, called from mm/vmscan.c :: shrink_slab
+ *
+ * 'nr_to_scan' is the number of objects (pages) to prune, or 0 to query how
+ * many objects (pages) we have in total.
+ *
+ * 'gfp_mask' is the mask of the allocation that got us into this mess.
+ *
+ * Return value is the number of objects (pages) remaining, or -1 if we cannot
+ * proceed without risk of deadlock (due to gfp_mask).
+ *
+ * We approximate LRU via least-recently-unpinned, jettisoning unpinned partial
+ * chunks of ashmem regions LRU-wise one-at-a-time until we hit 'nr_to_scan'
+ * pages freed.
+ */
+static int ashmem_shrink(struct shrinker *s, struct shrink_control *sc)
+{
+        struct ashmem_range *range, *next;
+
+        /* We might recurse into filesystem code, so bail out if necessary */
+        if (sc->nr_to_scan && !(sc->gfp_mask & __GFP_FS))
+                return -1;
+        if (!sc->nr_to_scan)
+                return lru_count;
+
+        mutex_lock(&ashmem_mutex);
+        list_for_each_entry_safe(range, next, &ashmem_lru_list, lru) {
+                struct inode *inode = range->asma->file->f_dentry->d_inode;
+                loff_t start = range->pgstart * PAGE_SIZE;
+                loff_t end = (range->pgend + 1) * PAGE_SIZE - 1;
+
+                vmtruncate_range(inode, start, end);
+                range->purged = ASHMEM_WAS_PURGED;
+                lru_del(range);
+
+                sc->nr_to_scan -= range_size(range);
+                if (sc->nr_to_scan <= 0)
+                        break;
+        }
+        mutex_unlock(&ashmem_mutex);
+
+        return lru_count;
+}
+
+static struct shrinker ashmem_shrinker = {
+        .shrink = ashmem_shrink,
+        .seeks = DEFAULT_SEEKS * 4,
+};
+
+static int set_prot_mask(struct ashmem_area *asma, unsigned long prot)
+{
+        int ret = 0;
+
+        mutex_lock(&ashmem_mutex);
+
+        /* the user can only remove, not add, protection bits */
+        if (unlikely((asma->prot_mask & prot) != prot)) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* does the application expect PROT_READ to imply PROT_EXEC? */
+        if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
+                prot |= PROT_EXEC;
+
+        asma->prot_mask = prot;
+
+out:
+        mutex_unlock(&ashmem_mutex);
+        return ret;
+}
+
+static int set_name(struct ashmem_area *asma, void __user *name)
+{
+        int ret = 0;
+
+        mutex_lock(&ashmem_mutex);
+
+        /* cannot change an existing mapping's name */
+        if (unlikely(asma->file)) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (unlikely(copy_from_user(asma->name + ASHMEM_NAME_PREFIX_LEN,
+                                    name, ASHMEM_NAME_LEN)))
+                ret = -EFAULT;
+        asma->name[ASHMEM_FULL_NAME_LEN-1] = '\0';
+
+out:
+        mutex_unlock(&ashmem_mutex);
+
+        return ret;
+}
+
+static int get_name(struct ashmem_area *asma, void __user *name)
+{
+        int ret = 0;
+
+        mutex_lock(&ashmem_mutex);
+        if (asma->name[ASHMEM_NAME_PREFIX_LEN] != '\0') {
+                size_t len;
+
+                /*
+                 * Copying only `len', instead of ASHMEM_NAME_LEN, bytes
+                 * prevents us from revealing one user's stack to another.
+                 */
+                len = strlen(asma->name + ASHMEM_NAME_PREFIX_LEN) + 1;
+                if (unlikely(copy_to_user(name,
+                                asma->name + ASHMEM_NAME_PREFIX_LEN, len)))
+                        ret = -EFAULT;
+        } else {
+                if (unlikely(copy_to_user(name, ASHMEM_NAME_DEF,
+                                          sizeof(ASHMEM_NAME_DEF))))
+                        ret = -EFAULT;
+        }
+        mutex_unlock(&ashmem_mutex);
+
+        return ret;
+}
+
+/*
+ * ashmem_pin - pin the given ashmem region, returning whether it was
+ * previously purged (ASHMEM_WAS_PURGED) or not (ASHMEM_NOT_PURGED).
+ *
+ * Caller must hold ashmem_mutex.
+ */
+static int ashmem_pin(struct ashmem_area *asma, size_t pgstart, size_t pgend)
+{
+        struct ashmem_range *range, *next;
+        int ret = ASHMEM_NOT_PURGED;
+
+        list_for_each_entry_safe(range, next, &asma->unpinned_list, unpinned) {
+                /* moved past last applicable page; we can short circuit */
+                if (range_before_page(range, pgstart))
+                        break;
+
+                /*
+                 * The user can ask us to pin pages that span multiple ranges,
+                 * or to pin pages that aren't even unpinned, so this is messy.
+                 *
+                 * Four cases:
+                 * 1. The requested range subsumes an existing range, so we
+                 *    just remove the entire matching range.
+                 * 2. The requested range overlaps the start of an existing
+                 *    range, so we just update that range.
+                 * 3. The requested range overlaps the end of an existing
+                 *    range, so we just update that range.
+                 * 4. The requested range punches a hole in an existing range,
+                 *    so we have to update one side of the range and then
+                 *    create a new range for the other side.
+                 */
+                if (page_range_in_range(range, pgstart, pgend)) {
+                        ret |= range->purged;
+
+                        /* Case #1: Easy. Just nuke the whole thing. */
+                        if (page_range_subsumes_range(range, pgstart, pgend)) {
+                                range_del(range);
+                                continue;
+                        }
+
+                        /* Case #2: We overlap from the start, so adjust it */
+                        if (range->pgstart >= pgstart) {
+                                range_shrink(range, pgend + 1, range->pgend);
+                                continue;
+                        }
+
+                        /* Case #3: We overlap from the rear, so adjust it */
+                        if (range->pgend <= pgend) {
+                                range_shrink(range, range->pgstart, pgstart-1);
+                                continue;
+                        }
+
+                        /*
+                         * Case #4: We eat a chunk out of the middle. A bit
+                         * more complicated, we allocate a new range for the
+                         * second half and adjust the first chunk's endpoint.
+                         */
+                        range_alloc(asma, range, range->purged,
+                                    pgend + 1, range->pgend);
+                        range_shrink(range, range->pgstart, pgstart - 1);
+                        break;
+                }
+        }
+
+        return ret;
+}
+
+/*
+ * ashmem_unpin - unpin the given range of pages. Returns zero on success.
+ *
+ * Caller must hold ashmem_mutex.
+ */
+static int ashmem_unpin(struct ashmem_area *asma, size_t pgstart, size_t pgend)
+{
+        struct ashmem_range *range, *next;
+        unsigned int purged = ASHMEM_NOT_PURGED;
+
+restart:
+        list_for_each_entry_safe(range, next, &asma->unpinned_list, unpinned) {
+                /* short circuit: this is our insertion point */
+                if (range_before_page(range, pgstart))
+                        break;
+
+                /*
+                 * The user can ask us to unpin pages that are already entirely
+                 * or partially pinned. We handle those two cases here.
+                 */
+                if (page_range_subsumed_by_range(range, pgstart, pgend))
+                        return 0;
+                if (page_range_in_range(range, pgstart, pgend)) {
+                        pgstart = min_t(size_t, range->pgstart, pgstart),
+                        pgend = max_t(size_t, range->pgend, pgend);
+                        purged |= range->purged;
+                        range_del(range);
+                        goto restart;
+                }
+        }
+
+        return range_alloc(asma, range, purged, pgstart, pgend);
+}
+
+/*
+ * ashmem_get_pin_status - Returns ASHMEM_IS_UNPINNED if _any_ pages in the
+ * given interval are unpinned and ASHMEM_IS_PINNED otherwise.
+ *
+ * Caller must hold ashmem_mutex.
+ */
+static int ashmem_get_pin_status(struct ashmem_area *asma, size_t pgstart,
+                                 size_t pgend)
+{
+        struct ashmem_range *range;
+        int ret = ASHMEM_IS_PINNED;
+
+        list_for_each_entry(range, &asma->unpinned_list, unpinned) {
+                if (range_before_page(range, pgstart))
+                        break;
+                if (page_range_in_range(range, pgstart, pgend)) {
+                        ret = ASHMEM_IS_UNPINNED;
+                        break;
+                }
+        }
+
+        return ret;
+}
+
+static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd,
+                            void __user *p)
+{
+        struct ashmem_pin pin;
+        size_t pgstart, pgend;
+        int ret = -EINVAL;
+
+        if (unlikely(!asma->file))
+                return -EINVAL;
+
+        if (unlikely(copy_from_user(&pin, p, sizeof(pin))))
+                return -EFAULT;
+
+        /* per custom, you can pass zero for len to mean "everything onward" */
+        if (!pin.len)
+                pin.len = PAGE_ALIGN(asma->size) - pin.offset;
+
+        if (unlikely((pin.offset | pin.len) & ~PAGE_MASK))
+                return -EINVAL;
+
+        if (unlikely(((__u32) -1) - pin.offset < pin.len))
+                return -EINVAL;
+
+        if (unlikely(PAGE_ALIGN(asma->size) < pin.offset + pin.len))
+                return -EINVAL;
+
+        pgstart = pin.offset / PAGE_SIZE;
+        pgend = pgstart + (pin.len / PAGE_SIZE) - 1;
+
+        mutex_lock(&ashmem_mutex);
+
+        switch (cmd) {
+        case ASHMEM_PIN:
+                ret = ashmem_pin(asma, pgstart, pgend);
+                break;
+        case ASHMEM_UNPIN:
+                ret = ashmem_unpin(asma, pgstart, pgend);
+                break;
+        case ASHMEM_GET_PIN_STATUS:
+                ret = ashmem_get_pin_status(asma, pgstart, pgend);
+                break;
+        }
+
+        mutex_unlock(&ashmem_mutex);
+
+        return ret;
+}
+
+static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct ashmem_area *asma = file->private_data;
+        long ret = -ENOTTY;
+
+        switch (cmd) {
+        case ASHMEM_SET_NAME:
+                ret = set_name(asma, (void __user *) arg);
+                break;
+        case ASHMEM_GET_NAME:
+                ret = get_name(asma, (void __user *) arg);
+                break;
+        case ASHMEM_SET_SIZE:
+                ret = -EINVAL;
+                if (!asma->file) {
+                        ret = 0;
+                        asma->size = (size_t) arg;
+                }
+                break;
+        case ASHMEM_GET_SIZE:
+                ret = asma->size;
+                break;
+        case ASHMEM_SET_PROT_MASK:
+                ret = set_prot_mask(asma, arg);
+                break;
+        case ASHMEM_GET_PROT_MASK:
+                ret = asma->prot_mask;
+                break;
+        case ASHMEM_PIN:
+        case ASHMEM_UNPIN:
+        case ASHMEM_GET_PIN_STATUS:
+                ret = ashmem_pin_unpin(asma, cmd, (void __user *) arg);
+                break;
+        case ASHMEM_PURGE_ALL_CACHES:
+                ret = -EPERM;
+                if (capable(CAP_SYS_ADMIN)) {
+                        struct shrink_control sc = {
+                                .gfp_mask = GFP_KERNEL,
+                                .nr_to_scan = 0,
+                        };
+                        ret = ashmem_shrink(&ashmem_shrinker, &sc);
+                        sc.nr_to_scan = ret;
+                        ashmem_shrink(&ashmem_shrinker, &sc);
+                }
+                break;
+        }
+
+        return ret;
+}
+
+static struct file_operations ashmem_fops = {
+        .owner = THIS_MODULE,
+        .open = ashmem_open,
+        .release = ashmem_release,
+        .read = ashmem_read,
+        .llseek = ashmem_llseek,
+        .mmap = ashmem_mmap,
+        .unlocked_ioctl = ashmem_ioctl,
+        .compat_ioctl = ashmem_ioctl,
+};
+
+static struct miscdevice ashmem_misc = {
+        .minor = MISC_DYNAMIC_MINOR,
+        .name = "ashmem",
+        .fops = &ashmem_fops,
+};
+
+static int __init ashmem_init(void)
+{
+        int ret;
+
+        ashmem_area_cachep = kmem_cache_create("ashmem_area_cache",
+                                          sizeof(struct ashmem_area),
+                                          0, 0, NULL);
+        if (unlikely(!ashmem_area_cachep)) {
+                printk(KERN_ERR "ashmem: failed to create slab cache\n");
+                return -ENOMEM;
+        }
+
+        ashmem_range_cachep = kmem_cache_create("ashmem_range_cache",
+                                          sizeof(struct ashmem_range),
+                                          0, 0, NULL);
+        if (unlikely(!ashmem_range_cachep)) {
+                printk(KERN_ERR "ashmem: failed to create slab cache\n");
+                return -ENOMEM;
+        }
+
+        ret = misc_register(&ashmem_misc);
+        if (unlikely(ret)) {
+                printk(KERN_ERR "ashmem: failed to register misc device!\n");
+                return ret;
+        }
+
+        register_shrinker(&ashmem_shrinker);
+
+        printk(KERN_INFO "ashmem: initialized\n");
+
+        return 0;
+}
+
+static void __exit ashmem_exit(void)
+{
+        int ret;
+
+        unregister_shrinker(&ashmem_shrinker);
+
+        ret = misc_deregister(&ashmem_misc);
+        if (unlikely(ret))
+                printk(KERN_ERR "ashmem: failed to unregister misc device!\n");
+
+        kmem_cache_destroy(ashmem_range_cachep);
+        kmem_cache_destroy(ashmem_area_cachep);
+
+        printk(KERN_INFO "ashmem: unloaded\n");
+}
+
+module_init(ashmem_init);
+module_exit(ashmem_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/android/ashmem.h b/drivers/staging/android/ashmem.h
new file mode 100644
index 000000000000..1976b10ef93e
--- /dev/null
+++ b/drivers/staging/android/ashmem.h
@@ -0,0 +1,48 @@
+/*
+ * include/linux/ashmem.h
+ *
+ * Copyright 2008 Google Inc.
+ * Author: Robert Love
+ *
+ * This file is dual licensed.  It may be redistributed and/or modified
+ * under the terms of the Apache 2.0 License OR version 2 of the GNU
+ * General Public License.
+ */
+
+#ifndef _LINUX_ASHMEM_H
+#define _LINUX_ASHMEM_H
+
+#include <linux/limits.h>
+#include <linux/ioctl.h>
+
+#define ASHMEM_NAME_LEN         256
+
+#define ASHMEM_NAME_DEF         "dev/ashmem"
+
+/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */
+#define ASHMEM_NOT_PURGED       0
+#define ASHMEM_WAS_PURGED       1
+
+/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */
+#define ASHMEM_IS_UNPINNED      0
+#define ASHMEM_IS_PINNED        1
+
+struct ashmem_pin {
+        __u32 offset;   /* offset into region, in bytes, page-aligned */
+        __u32 len;      /* length forward from offset, in bytes, page-aligned */
+};
+
+#define __ASHMEMIOC             0x77
+
+#define ASHMEM_SET_NAME         _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN])
+#define ASHMEM_GET_NAME         _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN])
+#define ASHMEM_SET_SIZE         _IOW(__ASHMEMIOC, 3, size_t)
+#define ASHMEM_GET_SIZE         _IO(__ASHMEMIOC, 4)
+#define ASHMEM_SET_PROT_MASK    _IOW(__ASHMEMIOC, 5, unsigned long)
+#define ASHMEM_GET_PROT_MASK    _IO(__ASHMEMIOC, 6)
+#define ASHMEM_PIN              _IOW(__ASHMEMIOC, 7, struct ashmem_pin)
+#define ASHMEM_UNPIN            _IOW(__ASHMEMIOC, 8, struct ashmem_pin)
+#define ASHMEM_GET_PIN_STATUS   _IO(__ASHMEMIOC, 9)
+#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10)
+
+#endif  /* _LINUX_ASHMEM_H */
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
new file mode 100644
index 000000000000..7491801a661c
--- /dev/null
+++ b/drivers/staging/android/binder.c
@@ -0,0 +1,3600 @@
+/* binder.c
+ *
+ * Android IPC Subsystem
+ *
+ * Copyright (C) 2007-2008 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 <asm/cacheflush.h>
+#include <linux/fdtable.h>
+#include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/list.h>
+#include <linux/miscdevice.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/mutex.h>
+#include <linux/nsproxy.h>
+#include <linux/poll.h>
+#include <linux/debugfs.h>
+#include <linux/rbtree.h>
+#include <linux/sched.h>
+#include <linux/seq_file.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+#include <linux/slab.h>
+
+#include "binder.h"
+
+static DEFINE_MUTEX(binder_lock);
+static DEFINE_MUTEX(binder_deferred_lock);
+
+static HLIST_HEAD(binder_procs);
+static HLIST_HEAD(binder_deferred_list);
+static HLIST_HEAD(binder_dead_nodes);
+
+static struct dentry *binder_debugfs_dir_entry_root;
+static struct dentry *binder_debugfs_dir_entry_proc;
+static struct binder_node *binder_context_mgr_node;
+static uid_t binder_context_mgr_uid = -1;
+static int binder_last_id;
+static struct workqueue_struct *binder_deferred_workqueue;
+
+#define BINDER_DEBUG_ENTRY(name) \
+static int binder_##name##_open(struct inode *inode, struct file *file) \
+{ \
+        return single_open(file, binder_##name##_show, inode->i_private); \
+} \
+\
+static const struct file_operations binder_##name##_fops = { \
+        .owner = THIS_MODULE, \
+        .open = binder_##name##_open, \
+        .read = seq_read, \
+        .llseek = seq_lseek, \
+        .release = single_release, \
+}
+
+static int binder_proc_show(struct seq_file *m, void *unused);
+BINDER_DEBUG_ENTRY(proc);
+
+/* This is only defined in include/asm-arm/sizes.h */
+#ifndef SZ_1K
+#define SZ_1K                               0x400
+#endif
+
+#ifndef SZ_4M
+#define SZ_4M                               0x400000
+#endif
+
+#define FORBIDDEN_MMAP_FLAGS                (VM_WRITE)
+
+#define BINDER_SMALL_BUF_SIZE (PAGE_SIZE * 64)
+
+enum {
+        BINDER_DEBUG_USER_ERROR             = 1U << 0,
+        BINDER_DEBUG_FAILED_TRANSACTION     = 1U << 1,
+        BINDER_DEBUG_DEAD_TRANSACTION       = 1U << 2,
+        BINDER_DEBUG_OPEN_CLOSE             = 1U << 3,
+        BINDER_DEBUG_DEAD_BINDER            = 1U << 4,
+        BINDER_DEBUG_DEATH_NOTIFICATION     = 1U << 5,
+        BINDER_DEBUG_READ_WRITE             = 1U << 6,
+        BINDER_DEBUG_USER_REFS              = 1U << 7,
+        BINDER_DEBUG_THREADS                = 1U << 8,
+        BINDER_DEBUG_TRANSACTION            = 1U << 9,
+        BINDER_DEBUG_TRANSACTION_COMPLETE   = 1U << 10,
+        BINDER_DEBUG_FREE_BUFFER            = 1U << 11,
+        BINDER_DEBUG_INTERNAL_REFS          = 1U << 12,
+        BINDER_DEBUG_BUFFER_ALLOC           = 1U << 13,
+        BINDER_DEBUG_PRIORITY_CAP           = 1U << 14,
+        BINDER_DEBUG_BUFFER_ALLOC_ASYNC     = 1U << 15,
+};
+static uint32_t binder_debug_mask = BINDER_DEBUG_USER_ERROR |
+        BINDER_DEBUG_FAILED_TRANSACTION | BINDER_DEBUG_DEAD_TRANSACTION;
+module_param_named(debug_mask, binder_debug_mask, uint, S_IWUSR | S_IRUGO);
+
+static int binder_debug_no_lock;
+module_param_named(proc_no_lock, binder_debug_no_lock, bool, S_IWUSR | S_IRUGO);
+
+static DECLARE_WAIT_QUEUE_HEAD(binder_user_error_wait);
+static int binder_stop_on_user_error;
+
+static int binder_set_stop_on_user_error(const char *val,
+                                         struct kernel_param *kp)
+{
+        int ret;
+        ret = param_set_int(val, kp);
+        if (binder_stop_on_user_error < 2)
+                wake_up(&binder_user_error_wait);
+        return ret;
+}
+module_param_call(stop_on_user_error, binder_set_stop_on_user_error,
+        param_get_int, &binder_stop_on_user_error, S_IWUSR | S_IRUGO);
+
+#define binder_debug(mask, x...) \
+        do { \
+                if (binder_debug_mask & mask) \
+                        printk(KERN_INFO x); \
+        } while (0)
+
+#define binder_user_error(x...) \
+        do { \
+                if (binder_debug_mask & BINDER_DEBUG_USER_ERROR) \
+                        printk(KERN_INFO x); \
+                if (binder_stop_on_user_error) \
+                        binder_stop_on_user_error = 2; \
+        } while (0)
+
+enum binder_stat_types {
+        BINDER_STAT_PROC,
+        BINDER_STAT_THREAD,
+        BINDER_STAT_NODE,
+        BINDER_STAT_REF,
+        BINDER_STAT_DEATH,
+        BINDER_STAT_TRANSACTION,
+        BINDER_STAT_TRANSACTION_COMPLETE,
+        BINDER_STAT_COUNT
+};
+
+struct binder_stats {
+        int br[_IOC_NR(BR_FAILED_REPLY) + 1];
+        int bc[_IOC_NR(BC_DEAD_BINDER_DONE) + 1];
+        int obj_created[BINDER_STAT_COUNT];
+        int obj_deleted[BINDER_STAT_COUNT];
+};
+
+static struct binder_stats binder_stats;
+
+static inline void binder_stats_deleted(enum binder_stat_types type)
+{
+        binder_stats.obj_deleted[type]++;
+}
+
+static inline void binder_stats_created(enum binder_stat_types type)
+{
+        binder_stats.obj_created[type]++;
+}
+
+struct binder_transaction_log_entry {
+        int debug_id;
+        int call_type;
+        int from_proc;
+        int from_thread;
+        int target_handle;
+        int to_proc;
+        int to_thread;
+        int to_node;
+        int data_size;
+        int offsets_size;
+};
+struct binder_transaction_log {
+        int next;
+        int full;
+        struct binder_transaction_log_entry entry[32];
+};
+static struct binder_transaction_log binder_transaction_log;
+static struct binder_transaction_log binder_transaction_log_failed;
+
+static struct binder_transaction_log_entry *binder_transaction_log_add(
+        struct binder_transaction_log *log)
+{
+        struct binder_transaction_log_entry *e;
+        e = &log->entry[log->next];
+        memset(e, 0, sizeof(*e));
+        log->next++;
+        if (log->next == ARRAY_SIZE(log->entry)) {
+                log->next = 0;
+                log->full = 1;
+        }
+        return e;
+}
+
+struct binder_work {
+        struct list_head entry;
+        enum {
+                BINDER_WORK_TRANSACTION = 1,
+                BINDER_WORK_TRANSACTION_COMPLETE,
+                BINDER_WORK_NODE,
+                BINDER_WORK_DEAD_BINDER,
+                BINDER_WORK_DEAD_BINDER_AND_CLEAR,
+                BINDER_WORK_CLEAR_DEATH_NOTIFICATION,
+        } type;
+};
+
+struct binder_node {
+        int debug_id;
+        struct binder_work work;
+        union {
+                struct rb_node rb_node;
+                struct hlist_node dead_node;
+        };
+        struct binder_proc *proc;
+        struct hlist_head refs;
+        int internal_strong_refs;
+        int local_weak_refs;
+        int local_strong_refs;
+        void __user *ptr;
+        void __user *cookie;
+        unsigned has_strong_ref:1;
+        unsigned pending_strong_ref:1;
+        unsigned has_weak_ref:1;
+        unsigned pending_weak_ref:1;
+        unsigned has_async_transaction:1;
+        unsigned accept_fds:1;
+        unsigned min_priority:8;
+        struct list_head async_todo;
+};
+
+struct binder_ref_death {
+        struct binder_work work;
+        void __user *cookie;
+};
+
+struct binder_ref {
+        /* Lookups needed: */
+        /*   node + proc => ref (transaction) */
+        /*   desc + proc => ref (transaction, inc/dec ref) */
+        /*   node => refs + procs (proc exit) */
+        int debug_id;
+        struct rb_node rb_node_desc;
+        struct rb_node rb_node_node;
+        struct hlist_node node_entry;
+        struct binder_proc *proc;
+        struct binder_node *node;
+        uint32_t desc;
+        int strong;
+        int weak;
+        struct binder_ref_death *death;
+};
+
+struct binder_buffer {
+        struct list_head entry; /* free and allocated entries by addesss */
+        struct rb_node rb_node; /* free entry by size or allocated entry */
+                                /* by address */
+        unsigned free:1;
+        unsigned allow_user_free:1;
+        unsigned async_transaction:1;
+        unsigned debug_id:29;
+
+        struct binder_transaction *transaction;
+
+        struct binder_node *target_node;
+        size_t data_size;
+        size_t offsets_size;
+        uint8_t data[0];
+};
+
+enum binder_deferred_state {
+        BINDER_DEFERRED_PUT_FILES    = 0x01,
+        BINDER_DEFERRED_FLUSH        = 0x02,
+        BINDER_DEFERRED_RELEASE      = 0x04,
+};
+
+struct binder_proc {
+        struct hlist_node proc_node;
+        struct rb_root threads;
+        struct rb_root nodes;
+        struct rb_root refs_by_desc;
+        struct rb_root refs_by_node;
+        int pid;
+        struct vm_area_struct *vma;
+        struct task_struct *tsk;
+        struct files_struct *files;
+        struct hlist_node deferred_work_node;
+        int deferred_work;
+        void *buffer;
+        ptrdiff_t user_buffer_offset;
+
+        struct list_head buffers;
+        struct rb_root free_buffers;
+        struct rb_root allocated_buffers;
+        size_t free_async_space;
+
+        struct page **pages;
+        size_t buffer_size;
+        uint32_t buffer_free;
+        struct list_head todo;
+        wait_queue_head_t wait;
+        struct binder_stats stats;
+        struct list_head delivered_death;
+        int max_threads;
+        int requested_threads;
+        int requested_threads_started;
+        int ready_threads;
+        long default_priority;
+        struct dentry *debugfs_entry;
+};
+
+enum {
+        BINDER_LOOPER_STATE_REGISTERED  = 0x01,
+        BINDER_LOOPER_STATE_ENTERED     = 0x02,
+        BINDER_LOOPER_STATE_EXITED      = 0x04,
+        BINDER_LOOPER_STATE_INVALID     = 0x08,
+        BINDER_LOOPER_STATE_WAITING     = 0x10,
+        BINDER_LOOPER_STATE_NEED_RETURN = 0x20
+};
+
+struct binder_thread {
+        struct binder_proc *proc;
+        struct rb_node rb_node;
+        int pid;
+        int looper;
+        struct binder_transaction *transaction_stack;
+        struct list_head todo;
+        uint32_t return_error; /* Write failed, return error code in read buf */
+        uint32_t return_error2; /* Write failed, return error code in read */
+                /* buffer. Used when sending a reply to a dead process that */
+                /* we are also waiting on */
+        wait_queue_head_t wait;
+        struct binder_stats stats;
+};
+
+struct binder_transaction {
+        int debug_id;
+        struct binder_work work;
+        struct binder_thread *from;
+        struct binder_transaction *from_parent;
+        struct binder_proc *to_proc;
+        struct binder_thread *to_thread;
+        struct binder_transaction *to_parent;
+        unsigned need_reply:1;
+        /* unsigned is_dead:1; */       /* not used at the moment */
+
+        struct binder_buffer *buffer;
+        unsigned int    code;
+        unsigned int    flags;
+        long    priority;
+        long    saved_priority;
+        uid_t   sender_euid;
+};
+
+static void
+binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);
+
+/*
+ * copied from get_unused_fd_flags
+ */
+int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
+{
+        struct files_struct *files = proc->files;
+        int fd, error;
+        struct fdtable *fdt;
+        unsigned long rlim_cur;
+        unsigned long irqs;
+
+        if (files == NULL)
+                return -ESRCH;
+
+        error = -EMFILE;
+        spin_lock(&files->file_lock);
+
+repeat:
+        fdt = files_fdtable(files);
+        fd = find_next_zero_bit(fdt->open_fds->fds_bits, fdt->max_fds,
+                                files->next_fd);
+
+        /*
+         * N.B. For clone tasks sharing a files structure, this test
+         * will limit the total number of files that can be opened.
+         */
+        rlim_cur = 0;
+        if (lock_task_sighand(proc->tsk, &irqs)) {
+                rlim_cur = proc->tsk->signal->rlim[RLIMIT_NOFILE].rlim_cur;
+                unlock_task_sighand(proc->tsk, &irqs);
+        }
+        if (fd >= rlim_cur)
+                goto out;
+
+        /* Do we need to expand the fd array or fd set?  */
+        error = expand_files(files, fd);
+        if (error < 0)
+                goto out;
+
+        if (error) {
+                /*
+                 * If we needed to expand the fs array we
+                 * might have blocked - try again.
+                 */
+                error = -EMFILE;
+                goto repeat;
+        }
+
+        FD_SET(fd, fdt->open_fds);
+        if (flags & O_CLOEXEC)
+                FD_SET(fd, fdt->close_on_exec);
+        else
+                FD_CLR(fd, fdt->close_on_exec);
+        files->next_fd = fd + 1;
+#if 1
+        /* Sanity check */
+        if (fdt->fd[fd] != NULL) {
+                printk(KERN_WARNING "get_unused_fd: slot %d not NULL!\n", fd);
+                fdt->fd[fd] = NULL;
+        }
+#endif
+        error = fd;
+
+out:
+        spin_unlock(&files->file_lock);
+        return error;
+}
+
+/*
+ * copied from fd_install
+ */
+static void task_fd_install(
+        struct binder_proc *proc, unsigned int fd, struct file *file)
+{
+        struct files_struct *files = proc->files;
+        struct fdtable *fdt;
+
+        if (files == NULL)
+                return;
+
+        spin_lock(&files->file_lock);
+        fdt = files_fdtable(files);
+        BUG_ON(fdt->fd[fd] != NULL);
+        rcu_assign_pointer(fdt->fd[fd], file);
+        spin_unlock(&files->file_lock);
+}
+
+/*
+ * copied from __put_unused_fd in open.c
+ */
+static void __put_unused_fd(struct files_struct *files, unsigned int fd)
+{
+        struct fdtable *fdt = files_fdtable(files);
+        __FD_CLR(fd, fdt->open_fds);
+        if (fd < files->next_fd)
+                files->next_fd = fd;
+}
+
+/*
+ * copied from sys_close
+ */
+static long task_close_fd(struct binder_proc *proc, unsigned int fd)
+{
+        struct file *filp;
+        struct files_struct *files = proc->files;
+        struct fdtable *fdt;
+        int retval;
+
+        if (files == NULL)
+                return -ESRCH;
+
+        spin_lock(&files->file_lock);
+        fdt = files_fdtable(files);
+        if (fd >= fdt->max_fds)
+                goto out_unlock;
+        filp = fdt->fd[fd];
+        if (!filp)
+                goto out_unlock;
+        rcu_assign_pointer(fdt->fd[fd], NULL);
+        FD_CLR(fd, fdt->close_on_exec);
+        __put_unused_fd(files, fd);
+        spin_unlock(&files->file_lock);
+        retval = filp_close(filp, files);
+
+        /* can't restart close syscall because file table entry was cleared */
+        if (unlikely(retval == -ERESTARTSYS ||
+                     retval == -ERESTARTNOINTR ||
+                     retval == -ERESTARTNOHAND ||
+                     retval == -ERESTART_RESTARTBLOCK))
+                retval = -EINTR;
+
+        return retval;
+
+out_unlock:
+        spin_unlock(&files->file_lock);
+        return -EBADF;
+}
+
+static void binder_set_nice(long nice)
+{
+        long min_nice;
+        if (can_nice(current, nice)) {
+                set_user_nice(current, nice);
+                return;
+        }
+        min_nice = 20 - current->signal->rlim[RLIMIT_NICE].rlim_cur;
+        binder_debug(BINDER_DEBUG_PRIORITY_CAP,
+                     "binder: %d: nice value %ld not allowed use "
+                     "%ld instead\n", current->pid, nice, min_nice);
+        set_user_nice(current, min_nice);
+        if (min_nice < 20)
+                return;
+        binder_user_error("binder: %d RLIMIT_NICE not set\n", current->pid);
+}
+
+static size_t binder_buffer_size(struct binder_proc *proc,
+                                 struct binder_buffer *buffer)
+{
+        if (list_is_last(&buffer->entry, &proc->buffers))
+                return proc->buffer + proc->buffer_size - (void *)buffer->data;
+        else
+                return (size_t)list_entry(buffer->entry.next,
+                        struct binder_buffer, entry) - (size_t)buffer->data;
+}
+
+static void binder_insert_free_buffer(struct binder_proc *proc,
+                                      struct binder_buffer *new_buffer)
+{
+        struct rb_node **p = &proc->free_buffers.rb_node;
+        struct rb_node *parent = NULL;
+        struct binder_buffer *buffer;
+        size_t buffer_size;
+        size_t new_buffer_size;
+
+        BUG_ON(!new_buffer->free);
+
+        new_buffer_size = binder_buffer_size(proc, new_buffer);
+
+        binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                     "binder: %d: add free buffer, size %zd, "
+                     "at %p\n", proc->pid, new_buffer_size, new_buffer);
+
+        while (*p) {
+                parent = *p;
+                buffer = rb_entry(parent, struct binder_buffer, rb_node);
+                BUG_ON(!buffer->free);
+
+                buffer_size = binder_buffer_size(proc, buffer);
+
+                if (new_buffer_size < buffer_size)
+                        p = &parent->rb_left;
+                else
+                        p = &parent->rb_right;
+        }
+        rb_link_node(&new_buffer->rb_node, parent, p);
+        rb_insert_color(&new_buffer->rb_node, &proc->free_buffers);
+}
+
+static void binder_insert_allocated_buffer(struct binder_proc *proc,
+                                           struct binder_buffer *new_buffer)
+{
+        struct rb_node **p = &proc->allocated_buffers.rb_node;
+        struct rb_node *parent = NULL;
+        struct binder_buffer *buffer;
+
+        BUG_ON(new_buffer->free);
+
+        while (*p) {
+                parent = *p;
+                buffer = rb_entry(parent, struct binder_buffer, rb_node);
+                BUG_ON(buffer->free);
+
+                if (new_buffer < buffer)
+                        p = &parent->rb_left;
+                else if (new_buffer > buffer)
+                        p = &parent->rb_right;
+                else
+                        BUG();
+        }
+        rb_link_node(&new_buffer->rb_node, parent, p);
+        rb_insert_color(&new_buffer->rb_node, &proc->allocated_buffers);
+}
+
+static struct binder_buffer *binder_buffer_lookup(struct binder_proc *proc,
+                                                  void __user *user_ptr)
+{
+        struct rb_node *n = proc->allocated_buffers.rb_node;
+        struct binder_buffer *buffer;
+        struct binder_buffer *kern_ptr;
+
+        kern_ptr = user_ptr - proc->user_buffer_offset
+                - offsetof(struct binder_buffer, data);
+
+        while (n) {
+                buffer = rb_entry(n, struct binder_buffer, rb_node);
+                BUG_ON(buffer->free);
+
+                if (kern_ptr < buffer)
+                        n = n->rb_left;
+                else if (kern_ptr > buffer)
+                        n = n->rb_right;
+                else
+                        return buffer;
+        }
+        return NULL;
+}
+
+static int binder_update_page_range(struct binder_proc *proc, int allocate,
+                                    void *start, void *end,
+                                    struct vm_area_struct *vma)
+{
+        void *page_addr;
+        unsigned long user_page_addr;
+        struct vm_struct tmp_area;
+        struct page **page;
+        struct mm_struct *mm;
+
+        binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                     "binder: %d: %s pages %p-%p\n", proc->pid,
+                     allocate ? "allocate" : "free", start, end);
+
+        if (end <= start)
+                return 0;
+
+        if (vma)
+                mm = NULL;
+        else
+                mm = get_task_mm(proc->tsk);
+
+        if (mm) {
+                down_write(&mm->mmap_sem);
+                vma = proc->vma;
+        }
+
+        if (allocate == 0)
+                goto free_range;
+
+        if (vma == NULL) {
+                printk(KERN_ERR "binder: %d: binder_alloc_buf failed to "
+                       "map pages in userspace, no vma\n", proc->pid);
+                goto err_no_vma;
+        }
+
+        for (page_addr = start; page_addr < end; page_addr += PAGE_SIZE) {
+                int ret;
+                struct page **page_array_ptr;
+                page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];
+
+                BUG_ON(*page);
+                *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+                if (*page == NULL) {
+                        printk(KERN_ERR "binder: %d: binder_alloc_buf failed "
+                               "for page at %p\n", proc->pid, page_addr);
+                        goto err_alloc_page_failed;
+                }
+                tmp_area.addr = page_addr;
+                tmp_area.size = PAGE_SIZE + PAGE_SIZE /* guard page? */;
+                page_array_ptr = page;
+                ret = map_vm_area(&tmp_area, PAGE_KERNEL, &page_array_ptr);
+                if (ret) {
+                        printk(KERN_ERR "binder: %d: binder_alloc_buf failed "
+                               "to map page at %p in kernel\n",
+                               proc->pid, page_addr);
+                        goto err_map_kernel_failed;
+                }
+                user_page_addr =
+                        (uintptr_t)page_addr + proc->user_buffer_offset;
+                ret = vm_insert_page(vma, user_page_addr, page[0]);
+                if (ret) {
+                        printk(KERN_ERR "binder: %d: binder_alloc_buf failed "
+                               "to map page at %lx in userspace\n",
+                               proc->pid, user_page_addr);
+                        goto err_vm_insert_page_failed;
+                }
+                /* vm_insert_page does not seem to increment the refcount */
+        }
+        if (mm) {
+                up_write(&mm->mmap_sem);
+                mmput(mm);
+        }
+        return 0;
+
+free_range:
+        for (page_addr = end - PAGE_SIZE; page_addr >= start;
+             page_addr -= PAGE_SIZE) {
+                page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];
+                if (vma)
+                        zap_page_range(vma, (uintptr_t)page_addr +
+                                proc->user_buffer_offset, PAGE_SIZE, NULL);
+err_vm_insert_page_failed:
+                unmap_kernel_range((unsigned long)page_addr, PAGE_SIZE);
+err_map_kernel_failed:
+                __free_page(*page);
+                *page = NULL;
+err_alloc_page_failed:
+                ;
+        }
+err_no_vma:
+        if (mm) {
+                up_write(&mm->mmap_sem);
+                mmput(mm);
+        }
+        return -ENOMEM;
+}
+
+static struct binder_buffer *binder_alloc_buf(struct binder_proc *proc,
+                                              size_t data_size,
+                                              size_t offsets_size, int is_async)
+{
+        struct rb_node *n = proc->free_buffers.rb_node;
+        struct binder_buffer *buffer;
+        size_t buffer_size;
+        struct rb_node *best_fit = NULL;
+        void *has_page_addr;
+        void *end_page_addr;
+        size_t size;
+
+        if (proc->vma == NULL) {
+                printk(KERN_ERR "binder: %d: binder_alloc_buf, no vma\n",
+                       proc->pid);
+                return NULL;
+        }
+
+        size = ALIGN(data_size, sizeof(void *)) +
+                ALIGN(offsets_size, sizeof(void *));
+
+        if (size < data_size || size < offsets_size) {
+                binder_user_error("binder: %d: got transaction with invalid "
+                        "size %zd-%zd\n", proc->pid, data_size, offsets_size);
+                return NULL;
+        }
+
+        if (is_async &&
+            proc->free_async_space < size + sizeof(struct binder_buffer)) {
+                binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                             "binder: %d: binder_alloc_buf size %zd"
+                             "failed, no async space left\n", proc->pid, size);
+                return NULL;
+        }
+
+        while (n) {
+                buffer = rb_entry(n, struct binder_buffer, rb_node);
+                BUG_ON(!buffer->free);
+                buffer_size = binder_buffer_size(proc, buffer);
+
+                if (size < buffer_size) {
+                        best_fit = n;
+                        n = n->rb_left;
+                } else if (size > buffer_size)
+                        n = n->rb_right;
+                else {
+                        best_fit = n;
+                        break;
+                }
+        }
+        if (best_fit == NULL) {
+                printk(KERN_ERR "binder: %d: binder_alloc_buf size %zd failed, "
+                       "no address space\n", proc->pid, size);
+                return NULL;
+        }
+        if (n == NULL) {
+                buffer = rb_entry(best_fit, struct binder_buffer, rb_node);
+                buffer_size = binder_buffer_size(proc, buffer);
+        }
+
+        binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                     "binder: %d: binder_alloc_buf size %zd got buff"
+                     "er %p size %zd\n", proc->pid, size, buffer, buffer_size);
+
+        has_page_addr =
+                (void *)(((uintptr_t)buffer->data + buffer_size) & PAGE_MASK);
+        if (n == NULL) {
+                if (size + sizeof(struct binder_buffer) + 4 >= buffer_size)
+                        buffer_size = size; /* no room for other buffers */
+                else
+                        buffer_size = size + sizeof(struct binder_buffer);
+        }
+        end_page_addr =
+                (void *)PAGE_ALIGN((uintptr_t)buffer->data + buffer_size);
+        if (end_page_addr > has_page_addr)
+                end_page_addr = has_page_addr;
+        if (binder_update_page_range(proc, 1,
+            (void *)PAGE_ALIGN((uintptr_t)buffer->data), end_page_addr, NULL))
+                return NULL;
+
+        rb_erase(best_fit, &proc->free_buffers);
+        buffer->free = 0;
+        binder_insert_allocated_buffer(proc, buffer);
+        if (buffer_size != size) {
+                struct binder_buffer *new_buffer = (void *)buffer->data + size;
+                list_add(&new_buffer->entry, &buffer->entry);
+                new_buffer->free = 1;
+                binder_insert_free_buffer(proc, new_buffer);
+        }
+        binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                     "binder: %d: binder_alloc_buf size %zd got "
+                     "%p\n", proc->pid, size, buffer);
+        buffer->data_size = data_size;
+        buffer->offsets_size = offsets_size;
+        buffer->async_transaction = is_async;
+        if (is_async) {
+                proc->free_async_space -= size + sizeof(struct binder_buffer);
+                binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
+                             "binder: %d: binder_alloc_buf size %zd "
+                             "async free %zd\n", proc->pid, size,
+                             proc->free_async_space);
+        }
+
+        return buffer;
+}
+
+static void *buffer_start_page(struct binder_buffer *buffer)
+{
+        return (void *)((uintptr_t)buffer & PAGE_MASK);
+}
+
+static void *buffer_end_page(struct binder_buffer *buffer)
+{
+        return (void *)(((uintptr_t)(buffer + 1) - 1) & PAGE_MASK);
+}
+
+static void binder_delete_free_buffer(struct binder_proc *proc,
+                                      struct binder_buffer *buffer)
+{
+        struct binder_buffer *prev, *next = NULL;
+        int free_page_end = 1;
+        int free_page_start = 1;
+
+        BUG_ON(proc->buffers.next == &buffer->entry);
+        prev = list_entry(buffer->entry.prev, struct binder_buffer, entry);
+        BUG_ON(!prev->free);
+        if (buffer_end_page(prev) == buffer_start_page(buffer)) {
+                free_page_start = 0;
+                if (buffer_end_page(prev) == buffer_end_page(buffer))
+                        free_page_end = 0;
+                binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                             "binder: %d: merge free, buffer %p "
+                             "share page with %p\n", proc->pid, buffer, prev);
+        }
+
+        if (!list_is_last(&buffer->entry, &proc->buffers)) {
+                next = list_entry(buffer->entry.next,
+                                  struct binder_buffer, entry);
+                if (buffer_start_page(next) == buffer_end_page(buffer)) {
+                        free_page_end = 0;
+                        if (buffer_start_page(next) ==
+                            buffer_start_page(buffer))
+                                free_page_start = 0;
+                        binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                                     "binder: %d: merge free, buffer"
+                                     " %p share page with %p\n", proc->pid,
+                                     buffer, prev);
+                }
+        }
+        list_del(&buffer->entry);
+        if (free_page_start || free_page_end) {
+                binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                             "binder: %d: merge free, buffer %p do "
+                             "not share page%s%s with with %p or %p\n",
+                             proc->pid, buffer, free_page_start ? "" : " end",
+                             free_page_end ? "" : " start", prev, next);
+                binder_update_page_range(proc, 0, free_page_start ?
+                        buffer_start_page(buffer) : buffer_end_page(buffer),
+                        (free_page_end ? buffer_end_page(buffer) :
+                        buffer_start_page(buffer)) + PAGE_SIZE, NULL);
+        }
+}
+
+static void binder_free_buf(struct binder_proc *proc,
+                            struct binder_buffer *buffer)
+{
+        size_t size, buffer_size;
+
+        buffer_size = binder_buffer_size(proc, buffer);
+
+        size = ALIGN(buffer->data_size, sizeof(void *)) +
+                ALIGN(buffer->offsets_size, sizeof(void *));
+
+        binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                     "binder: %d: binder_free_buf %p size %zd buffer"
+                     "_size %zd\n", proc->pid, buffer, size, buffer_size);
+
+        BUG_ON(buffer->free);
+        BUG_ON(size > buffer_size);
+        BUG_ON(buffer->transaction != NULL);
+        BUG_ON((void *)buffer < proc->buffer);
+        BUG_ON((void *)buffer > proc->buffer + proc->buffer_size);
+
+        if (buffer->async_transaction) {
+                proc->free_async_space += size + sizeof(struct binder_buffer);
+
+                binder_debug(BINDER_DEBUG_BUFFER_ALLOC_ASYNC,
+                             "binder: %d: binder_free_buf size %zd "
+                             "async free %zd\n", proc->pid, size,
+                             proc->free_async_space);
+        }
+
+        binder_update_page_range(proc, 0,
+                (void *)PAGE_ALIGN((uintptr_t)buffer->data),
+                (void *)(((uintptr_t)buffer->data + buffer_size) & PAGE_MASK),
+                NULL);
+        rb_erase(&buffer->rb_node, &proc->allocated_buffers);
+        buffer->free = 1;
+        if (!list_is_last(&buffer->entry, &proc->buffers)) {
+                struct binder_buffer *next = list_entry(buffer->entry.next,
+                                                struct binder_buffer, entry);
+                if (next->free) {
+                        rb_erase(&next->rb_node, &proc->free_buffers);
+                        binder_delete_free_buffer(proc, next);
+                }
+        }
+        if (proc->buffers.next != &buffer->entry) {
+                struct binder_buffer *prev = list_entry(buffer->entry.prev,
+                                                struct binder_buffer, entry);
+                if (prev->free) {
+                        binder_delete_free_buffer(proc, buffer);
+                        rb_erase(&prev->rb_node, &proc->free_buffers);
+                        buffer = prev;
+                }
+        }
+        binder_insert_free_buffer(proc, buffer);
+}
+
+static struct binder_node *binder_get_node(struct binder_proc *proc,
+                                           void __user *ptr)
+{
+        struct rb_node *n = proc->nodes.rb_node;
+        struct binder_node *node;
+
+        while (n) {
+                node = rb_entry(n, struct binder_node, rb_node);
+
+                if (ptr < node->ptr)
+                        n = n->rb_left;
+                else if (ptr > node->ptr)
+                        n = n->rb_right;
+                else
+                        return node;
+        }
+        return NULL;
+}
+
+static struct binder_node *binder_new_node(struct binder_proc *proc,
+                                           void __user *ptr,
+                                           void __user *cookie)
+{
+        struct rb_node **p = &proc->nodes.rb_node;
+        struct rb_node *parent = NULL;
+        struct binder_node *node;
+
+        while (*p) {
+                parent = *p;
+                node = rb_entry(parent, struct binder_node, rb_node);
+
+                if (ptr < node->ptr)
+                        p = &(*p)->rb_left;
+                else if (ptr > node->ptr)
+                        p = &(*p)->rb_right;
+                else
+                        return NULL;
+        }
+
+        node = kzalloc(sizeof(*node), GFP_KERNEL);
+        if (node == NULL)
+                return NULL;
+        binder_stats_created(BINDER_STAT_NODE);
+        rb_link_node(&node->rb_node, parent, p);
+        rb_insert_color(&node->rb_node, &proc->nodes);
+        node->debug_id = ++binder_last_id;
+        node->proc = proc;
+        node->ptr = ptr;
+        node->cookie = cookie;
+        node->work.type = BINDER_WORK_NODE;
+        INIT_LIST_HEAD(&node->work.entry);
+        INIT_LIST_HEAD(&node->async_todo);
+        binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                     "binder: %d:%d node %d u%p c%p created\n",
+                     proc->pid, current->pid, node->debug_id,
+                     node->ptr, node->cookie);
+        return node;
+}
+
+static int binder_inc_node(struct binder_node *node, int strong, int internal,
+                           struct list_head *target_list)
+{
+        if (strong) {
+                if (internal) {
+                        if (target_list == NULL &&
+                            node->internal_strong_refs == 0 &&
+                            !(node == binder_context_mgr_node &&
+                            node->has_strong_ref)) {
+                                printk(KERN_ERR "binder: invalid inc strong "
+                                        "node for %d\n", node->debug_id);
+                                return -EINVAL;
+                        }
+                        node->internal_strong_refs++;
+                } else
+                        node->local_strong_refs++;
+                if (!node->has_strong_ref && target_list) {
+                        list_del_init(&node->work.entry);
+                        list_add_tail(&node->work.entry, target_list);
+                }
+        } else {
+                if (!internal)
+                        node->local_weak_refs++;
+                if (!node->has_weak_ref && list_empty(&node->work.entry)) {
+                        if (target_list == NULL) {
+                                printk(KERN_ERR "binder: invalid inc weak node "
+                                        "for %d\n", node->debug_id);
+                                return -EINVAL;
+                        }
+                        list_add_tail(&node->work.entry, target_list);
+                }
+        }
+        return 0;
+}
+
+static int binder_dec_node(struct binder_node *node, int strong, int internal)
+{
+        if (strong) {
+                if (internal)
+                        node->internal_strong_refs--;
+                else
+                        node->local_strong_refs--;
+                if (node->local_strong_refs || node->internal_strong_refs)
+                        return 0;
+        } else {
+                if (!internal)
+                        node->local_weak_refs--;
+                if (node->local_weak_refs || !hlist_empty(&node->refs))
+                        return 0;
+        }
+        if (node->proc && (node->has_strong_ref || node->has_weak_ref)) {
+                if (list_empty(&node->work.entry)) {
+                        list_add_tail(&node->work.entry, &node->proc->todo);
+                        wake_up_interruptible(&node->proc->wait);
+                }
+        } else {
+                if (hlist_empty(&node->refs) && !node->local_strong_refs &&
+                    !node->local_weak_refs) {
+                        list_del_init(&node->work.entry);
+                        if (node->proc) {
+                                rb_erase(&node->rb_node, &node->proc->nodes);
+                                binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                                             "binder: refless node %d deleted\n",
+                                             node->debug_id);
+                        } else {
+                                hlist_del(&node->dead_node);
+                                binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                                             "binder: dead node %d deleted\n",
+                                             node->debug_id);
+                        }
+                        kfree(node);
+                        binder_stats_deleted(BINDER_STAT_NODE);
+                }
+        }
+
+        return 0;
+}
+
+
+static struct binder_ref *binder_get_ref(struct binder_proc *proc,
+                                         uint32_t desc)
+{
+        struct rb_node *n = proc->refs_by_desc.rb_node;
+        struct binder_ref *ref;
+
+        while (n) {
+                ref = rb_entry(n, struct binder_ref, rb_node_desc);
+
+                if (desc < ref->desc)
+                        n = n->rb_left;
+                else if (desc > ref->desc)
+                        n = n->rb_right;
+                else
+                        return ref;
+        }
+        return NULL;
+}
+
+static struct binder_ref *binder_get_ref_for_node(struct binder_proc *proc,
+                                                  struct binder_node *node)
+{
+        struct rb_node *n;
+        struct rb_node **p = &proc->refs_by_node.rb_node;
+        struct rb_node *parent = NULL;
+        struct binder_ref *ref, *new_ref;
+
+        while (*p) {
+                parent = *p;
+                ref = rb_entry(parent, struct binder_ref, rb_node_node);
+
+                if (node < ref->node)
+                        p = &(*p)->rb_left;
+                else if (node > ref->node)
+                        p = &(*p)->rb_right;
+                else
+                        return ref;
+        }
+        new_ref = kzalloc(sizeof(*ref), GFP_KERNEL);
+        if (new_ref == NULL)
+                return NULL;
+        binder_stats_created(BINDER_STAT_REF);
+        new_ref->debug_id = ++binder_last_id;
+        new_ref->proc = proc;
+        new_ref->node = node;
+        rb_link_node(&new_ref->rb_node_node, parent, p);
+        rb_insert_color(&new_ref->rb_node_node, &proc->refs_by_node);
+
+        new_ref->desc = (node == binder_context_mgr_node) ? 0 : 1;
+        for (n = rb_first(&proc->refs_by_desc); n != NULL; n = rb_next(n)) {
+                ref = rb_entry(n, struct binder_ref, rb_node_desc);
+                if (ref->desc > new_ref->desc)
+                        break;
+                new_ref->desc = ref->desc + 1;
+        }
+
+        p = &proc->refs_by_desc.rb_node;
+        while (*p) {
+                parent = *p;
+                ref = rb_entry(parent, struct binder_ref, rb_node_desc);
+
+                if (new_ref->desc < ref->desc)
+                        p = &(*p)->rb_left;
+                else if (new_ref->desc > ref->desc)
+                        p = &(*p)->rb_right;
+                else
+                        BUG();
+        }
+        rb_link_node(&new_ref->rb_node_desc, parent, p);
+        rb_insert_color(&new_ref->rb_node_desc, &proc->refs_by_desc);
+        if (node) {
+                hlist_add_head(&new_ref->node_entry, &node->refs);
+
+                binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                             "binder: %d new ref %d desc %d for "
+                             "node %d\n", proc->pid, new_ref->debug_id,
+                             new_ref->desc, node->debug_id);
+        } else {
+                binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                             "binder: %d new ref %d desc %d for "
+                             "dead node\n", proc->pid, new_ref->debug_id,
+                              new_ref->desc);
+        }
+        return new_ref;
+}
+
+static void binder_delete_ref(struct binder_ref *ref)
+{
+        binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                     "binder: %d delete ref %d desc %d for "
+                     "node %d\n", ref->proc->pid, ref->debug_id,
+                     ref->desc, ref->node->debug_id);
+
+        rb_erase(&ref->rb_node_desc, &ref->proc->refs_by_desc);
+        rb_erase(&ref->rb_node_node, &ref->proc->refs_by_node);
+        if (ref->strong)
+                binder_dec_node(ref->node, 1, 1);
+        hlist_del(&ref->node_entry);
+        binder_dec_node(ref->node, 0, 1);
+        if (ref->death) {
+                binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                             "binder: %d delete ref %d desc %d "
+                             "has death notification\n", ref->proc->pid,
+                             ref->debug_id, ref->desc);
+                list_del(&ref->death->work.entry);
+                kfree(ref->death);
+                binder_stats_deleted(BINDER_STAT_DEATH);
+        }
+        kfree(ref);
+        binder_stats_deleted(BINDER_STAT_REF);
+}
+
+static int binder_inc_ref(struct binder_ref *ref, int strong,
+                          struct list_head *target_list)
+{
+        int ret;
+        if (strong) {
+                if (ref->strong == 0) {
+                        ret = binder_inc_node(ref->node, 1, 1, target_list);
+                        if (ret)
+                                return ret;
+                }
+                ref->strong++;
+        } else {
+                if (ref->weak == 0) {
+                        ret = binder_inc_node(ref->node, 0, 1, target_list);
+                        if (ret)
+                                return ret;
+                }
+                ref->weak++;
+        }
+        return 0;
+}
+
+
+static int binder_dec_ref(struct binder_ref *ref, int strong)
+{
+        if (strong) {
+                if (ref->strong == 0) {
+                        binder_user_error("binder: %d invalid dec strong, "
+                                          "ref %d desc %d s %d w %d\n",
+                                          ref->proc->pid, ref->debug_id,
+                                          ref->desc, ref->strong, ref->weak);
+                        return -EINVAL;
+                }
+                ref->strong--;
+                if (ref->strong == 0) {
+                        int ret;
+                        ret = binder_dec_node(ref->node, strong, 1);
+                        if (ret)
+                                return ret;
+                }
+        } else {
+                if (ref->weak == 0) {
+                        binder_user_error("binder: %d invalid dec weak, "
+                                          "ref %d desc %d s %d w %d\n",
+                                          ref->proc->pid, ref->debug_id,
+                                          ref->desc, ref->strong, ref->weak);
+                        return -EINVAL;
+                }
+                ref->weak--;
+        }
+        if (ref->strong == 0 && ref->weak == 0)
+                binder_delete_ref(ref);
+        return 0;
+}
+
+static void binder_pop_transaction(struct binder_thread *target_thread,
+                                   struct binder_transaction *t)
+{
+        if (target_thread) {
+                BUG_ON(target_thread->transaction_stack != t);
+                BUG_ON(target_thread->transaction_stack->from != target_thread);
+                target_thread->transaction_stack =
+                        target_thread->transaction_stack->from_parent;
+                t->from = NULL;
+        }
+        t->need_reply = 0;
+        if (t->buffer)
+                t->buffer->transaction = NULL;
+        kfree(t);
+        binder_stats_deleted(BINDER_STAT_TRANSACTION);
+}
+
+static void binder_send_failed_reply(struct binder_transaction *t,
+                                     uint32_t error_code)
+{
+        struct binder_thread *target_thread;
+        BUG_ON(t->flags & TF_ONE_WAY);
+        while (1) {
+                target_thread = t->from;
+                if (target_thread) {
+                        if (target_thread->return_error != BR_OK &&
+                           target_thread->return_error2 == BR_OK) {
+                                target_thread->return_error2 =
+                                        target_thread->return_error;
+                                target_thread->return_error = BR_OK;
+                        }
+                        if (target_thread->return_error == BR_OK) {
+                                binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
+                                             "binder: send failed reply for "
+                                             "transaction %d to %d:%d\n",
+                                              t->debug_id, target_thread->proc->pid,
+                                              target_thread->pid);
+
+                                binder_pop_transaction(target_thread, t);
+                                target_thread->return_error = error_code;
+                                wake_up_interruptible(&target_thread->wait);
+                        } else {
+                                printk(KERN_ERR "binder: reply failed, target "
+                                        "thread, %d:%d, has error code %d "
+                                        "already\n", target_thread->proc->pid,
+                                        target_thread->pid,
+                                        target_thread->return_error);
+                        }
+                        return;
+                } else {
+                        struct binder_transaction *next = t->from_parent;
+
+                        binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
+                                     "binder: send failed reply "
+                                     "for transaction %d, target dead\n",
+                                     t->debug_id);
+
+                        binder_pop_transaction(target_thread, t);
+                        if (next == NULL) {
+                                binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                                             "binder: reply failed,"
+                                             " no target thread at root\n");
+                                return;
+                        }
+                        t = next;
+                        binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                                     "binder: reply failed, no target "
+                                     "thread -- retry %d\n", t->debug_id);
+                }
+        }
+}
+
+static void binder_transaction_buffer_release(struct binder_proc *proc,
+                                              struct binder_buffer *buffer,
+                                              size_t *failed_at)
+{
+        size_t *offp, *off_end;
+        int debug_id = buffer->debug_id;
+
+        binder_debug(BINDER_DEBUG_TRANSACTION,
+                     "binder: %d buffer release %d, size %zd-%zd, failed at %p\n",
+                     proc->pid, buffer->debug_id,
+                     buffer->data_size, buffer->offsets_size, failed_at);
+
+        if (buffer->target_node)
+                binder_dec_node(buffer->target_node, 1, 0);
+
+        offp = (size_t *)(buffer->data + ALIGN(buffer->data_size, sizeof(void *)));
+        if (failed_at)
+                off_end = failed_at;
+        else
+                off_end = (void *)offp + buffer->offsets_size;
+        for (; offp < off_end; offp++) {
+                struct flat_binder_object *fp;
+                if (*offp > buffer->data_size - sizeof(*fp) ||
+                    buffer->data_size < sizeof(*fp) ||
+                    !IS_ALIGNED(*offp, sizeof(void *))) {
+                        printk(KERN_ERR "binder: transaction release %d bad"
+                                        "offset %zd, size %zd\n", debug_id,
+                                        *offp, buffer->data_size);
+                        continue;
+                }
+                fp = (struct flat_binder_object *)(buffer->data + *offp);
+                switch (fp->type) {
+                case BINDER_TYPE_BINDER:
+                case BINDER_TYPE_WEAK_BINDER: {
+                        struct binder_node *node = binder_get_node(proc, fp->binder);
+                        if (node == NULL) {
+                                printk(KERN_ERR "binder: transaction release %d"
+                                       " bad node %p\n", debug_id, fp->binder);
+                                break;
+                        }
+                        binder_debug(BINDER_DEBUG_TRANSACTION,
+                                     "        node %d u%p\n",
+                                     node->debug_id, node->ptr);
+                        binder_dec_node(node, fp->type == BINDER_TYPE_BINDER, 0);
+                } break;
+                case BINDER_TYPE_HANDLE:
+                case BINDER_TYPE_WEAK_HANDLE: {
+                        struct binder_ref *ref = binder_get_ref(proc, fp->handle);
+                        if (ref == NULL) {
+                                printk(KERN_ERR "binder: transaction release %d"
+                                       " bad handle %ld\n", debug_id,
+                                       fp->handle);
+                                break;
+                        }
+                        binder_debug(BINDER_DEBUG_TRANSACTION,
+                                     "        ref %d desc %d (node %d)\n",
+                                     ref->debug_id, ref->desc, ref->node->debug_id);
+                        binder_dec_ref(ref, fp->type == BINDER_TYPE_HANDLE);
+                } break;
+
+                case BINDER_TYPE_FD:
+                        binder_debug(BINDER_DEBUG_TRANSACTION,
+                                     "        fd %ld\n", fp->handle);
+                        if (failed_at)
+                                task_close_fd(proc, fp->handle);
+                        break;
+
+                default:
+                        printk(KERN_ERR "binder: transaction release %d bad "
+                               "object type %lx\n", debug_id, fp->type);
+                        break;
+                }
+        }
+}
+
+static void binder_transaction(struct binder_proc *proc,
+                               struct binder_thread *thread,
+                               struct binder_transaction_data *tr, int reply)
+{
+        struct binder_transaction *t;
+        struct binder_work *tcomplete;
+        size_t *offp, *off_end;
+        struct binder_proc *target_proc;
+        struct binder_thread *target_thread = NULL;
+        struct binder_node *target_node = NULL;
+        struct list_head *target_list;
+        wait_queue_head_t *target_wait;
+        struct binder_transaction *in_reply_to = NULL;
+        struct binder_transaction_log_entry *e;
+        uint32_t return_error;
+
+        e = binder_transaction_log_add(&binder_transaction_log);
+        e->call_type = reply ? 2 : !!(tr->flags & TF_ONE_WAY);
+        e->from_proc = proc->pid;
+        e->from_thread = thread->pid;
+        e->target_handle = tr->target.handle;
+        e->data_size = tr->data_size;
+        e->offsets_size = tr->offsets_size;
+
+        if (reply) {
+                in_reply_to = thread->transaction_stack;
+                if (in_reply_to == NULL) {
+                        binder_user_error("binder: %d:%d got reply transaction "
+                                          "with no transaction stack\n",
+                                          proc->pid, thread->pid);
+                        return_error = BR_FAILED_REPLY;
+                        goto err_empty_call_stack;
+                }
+                binder_set_nice(in_reply_to->saved_priority);
+                if (in_reply_to->to_thread != thread) {
+                        binder_user_error("binder: %d:%d got reply transaction "
+                                "with bad transaction stack,"
+                                " transaction %d has target %d:%d\n",
+                                proc->pid, thread->pid, in_reply_to->debug_id,
+                                in_reply_to->to_proc ?
+                                in_reply_to->to_proc->pid : 0,
+                                in_reply_to->to_thread ?
+                                in_reply_to->to_thread->pid : 0);
+                        return_error = BR_FAILED_REPLY;
+                        in_reply_to = NULL;
+                        goto err_bad_call_stack;
+                }
+                thread->transaction_stack = in_reply_to->to_parent;
+                target_thread = in_reply_to->from;
+                if (target_thread == NULL) {
+                        return_error = BR_DEAD_REPLY;
+                        goto err_dead_binder;
+                }
+                if (target_thread->transaction_stack != in_reply_to) {
+                        binder_user_error("binder: %d:%d got reply transaction "
+                                "with bad target transaction stack %d, "
+                                "expected %d\n",
+                                proc->pid, thread->pid,
+                                target_thread->transaction_stack ?
+                                target_thread->transaction_stack->debug_id : 0,
+                                in_reply_to->debug_id);
+                        return_error = BR_FAILED_REPLY;
+                        in_reply_to = NULL;
+                        target_thread = NULL;
+                        goto err_dead_binder;
+                }
+                target_proc = target_thread->proc;
+        } else {
+                if (tr->target.handle) {
+                        struct binder_ref *ref;
+                        ref = binder_get_ref(proc, tr->target.handle);
+                        if (ref == NULL) {
+                                binder_user_error("binder: %d:%d got "
+                                        "transaction to invalid handle\n",
+                                        proc->pid, thread->pid);
+                                return_error = BR_FAILED_REPLY;
+                                goto err_invalid_target_handle;
+                        }
+                        target_node = ref->node;
+                } else {
+                        target_node = binder_context_mgr_node;
+                        if (target_node == NULL) {
+                                return_error = BR_DEAD_REPLY;
+                                goto err_no_context_mgr_node;
+                        }
+                }
+                e->to_node = target_node->debug_id;
+                target_proc = target_node->proc;
+                if (target_proc == NULL) {
+                        return_error = BR_DEAD_REPLY;
+                        goto err_dead_binder;
+                }
+                if (!(tr->flags & TF_ONE_WAY) && thread->transaction_stack) {
+                        struct binder_transaction *tmp;
+                        tmp = thread->transaction_stack;
+                        if (tmp->to_thread != thread) {
+                                binder_user_error("binder: %d:%d got new "
+                                        "transaction with bad transaction stack"
+                                        ", transaction %d has target %d:%d\n",
+                                        proc->pid, thread->pid, tmp->debug_id,
+                                        tmp->to_proc ? tmp->to_proc->pid : 0,
+                                        tmp->to_thread ?
+                                        tmp->to_thread->pid : 0);
+                                return_error = BR_FAILED_REPLY;
+                                goto err_bad_call_stack;
+                        }
+                        while (tmp) {
+                                if (tmp->from && tmp->from->proc == target_proc)
+                                        target_thread = tmp->from;
+                                tmp = tmp->from_parent;
+                        }
+                }
+        }
+        if (target_thread) {
+                e->to_thread = target_thread->pid;
+                target_list = &target_thread->todo;
+                target_wait = &target_thread->wait;
+        } else {
+                target_list = &target_proc->todo;
+                target_wait = &target_proc->wait;
+        }
+        e->to_proc = target_proc->pid;
+
+        /* TODO: reuse incoming transaction for reply */
+        t = kzalloc(sizeof(*t), GFP_KERNEL);
+        if (t == NULL) {
+                return_error = BR_FAILED_REPLY;
+                goto err_alloc_t_failed;
+        }
+        binder_stats_created(BINDER_STAT_TRANSACTION);
+
+        tcomplete = kzalloc(sizeof(*tcomplete), GFP_KERNEL);
+        if (tcomplete == NULL) {
+                return_error = BR_FAILED_REPLY;
+                goto err_alloc_tcomplete_failed;
+        }
+        binder_stats_created(BINDER_STAT_TRANSACTION_COMPLETE);
+
+        t->debug_id = ++binder_last_id;
+        e->debug_id = t->debug_id;
+
+        if (reply)
+                binder_debug(BINDER_DEBUG_TRANSACTION,
+                             "binder: %d:%d BC_REPLY %d -> %d:%d, "
+                             "data %p-%p size %zd-%zd\n",
+                             proc->pid, thread->pid, t->debug_id,
+                             target_proc->pid, target_thread->pid,
+                             tr->data.ptr.buffer, tr->data.ptr.offsets,
+                             tr->data_size, tr->offsets_size);
+        else
+                binder_debug(BINDER_DEBUG_TRANSACTION,
+                             "binder: %d:%d BC_TRANSACTION %d -> "
+                             "%d - node %d, data %p-%p size %zd-%zd\n",
+                             proc->pid, thread->pid, t->debug_id,
+                             target_proc->pid, target_node->debug_id,
+                             tr->data.ptr.buffer, tr->data.ptr.offsets,
+                             tr->data_size, tr->offsets_size);
+
+        if (!reply && !(tr->flags & TF_ONE_WAY))
+                t->from = thread;
+        else
+                t->from = NULL;
+        t->sender_euid = proc->tsk->cred->euid;
+        t->to_proc = target_proc;
+        t->to_thread = target_thread;
+        t->code = tr->code;
+        t->flags = tr->flags;
+        t->priority = task_nice(current);
+        t->buffer = binder_alloc_buf(target_proc, tr->data_size,
+                tr->offsets_size, !reply && (t->flags & TF_ONE_WAY));
+        if (t->buffer == NULL) {
+                return_error = BR_FAILED_REPLY;
+                goto err_binder_alloc_buf_failed;
+        }
+        t->buffer->allow_user_free = 0;
+        t->buffer->debug_id = t->debug_id;
+        t->buffer->transaction = t;
+        t->buffer->target_node = target_node;
+        if (target_node)
+                binder_inc_node(target_node, 1, 0, NULL);
+
+        offp = (size_t *)(t->buffer->data + ALIGN(tr->data_size, sizeof(void *)));
+
+        if (copy_from_user(t->buffer->data, tr->data.ptr.buffer, tr->data_size)) {
+                binder_user_error("binder: %d:%d got transaction with invalid "
+                        "data ptr\n", proc->pid, thread->pid);
+                return_error = BR_FAILED_REPLY;
+                goto err_copy_data_failed;
+        }
+        if (copy_from_user(offp, tr->data.ptr.offsets, tr->offsets_size)) {
+                binder_user_error("binder: %d:%d got transaction with invalid "
+                        "offsets ptr\n", proc->pid, thread->pid);
+                return_error = BR_FAILED_REPLY;
+                goto err_copy_data_failed;
+        }
+        if (!IS_ALIGNED(tr->offsets_size, sizeof(size_t))) {
+                binder_user_error("binder: %d:%d got transaction with "
+                        "invalid offsets size, %zd\n",
+                        proc->pid, thread->pid, tr->offsets_size);
+                return_error = BR_FAILED_REPLY;
+                goto err_bad_offset;
+        }
+        off_end = (void *)offp + tr->offsets_size;
+        for (; offp < off_end; offp++) {
+                struct flat_binder_object *fp;
+                if (*offp > t->buffer->data_size - sizeof(*fp) ||
+                    t->buffer->data_size < sizeof(*fp) ||
+                    !IS_ALIGNED(*offp, sizeof(void *))) {
+                        binder_user_error("binder: %d:%d got transaction with "
+                                "invalid offset, %zd\n",
+                                proc->pid, thread->pid, *offp);
+                        return_error = BR_FAILED_REPLY;
+                        goto err_bad_offset;
+                }
+                fp = (struct flat_binder_object *)(t->buffer->data + *offp);
+                switch (fp->type) {
+                case BINDER_TYPE_BINDER:
+                case BINDER_TYPE_WEAK_BINDER: {
+                        struct binder_ref *ref;
+                        struct binder_node *node = binder_get_node(proc, fp->binder);
+                        if (node == NULL) {
+                                node = binder_new_node(proc, fp->binder, fp->cookie);
+                                if (node == NULL) {
+                                        return_error = BR_FAILED_REPLY;
+                                        goto err_binder_new_node_failed;
+                                }
+                                node->min_priority = fp->flags & FLAT_BINDER_FLAG_PRIORITY_MASK;
+                                node->accept_fds = !!(fp->flags & FLAT_BINDER_FLAG_ACCEPTS_FDS);
+                        }
+                        if (fp->cookie != node->cookie) {
+                                binder_user_error("binder: %d:%d sending u%p "
+                                        "node %d, cookie mismatch %p != %p\n",
+                                        proc->pid, thread->pid,
+                                        fp->binder, node->debug_id,
+                                        fp->cookie, node->cookie);
+                                goto err_binder_get_ref_for_node_failed;
+                        }
+                        ref = binder_get_ref_for_node(target_proc, node);
+                        if (ref == NULL) {
+                                return_error = BR_FAILED_REPLY;
+                                goto err_binder_get_ref_for_node_failed;
+                        }
+                        if (fp->type == BINDER_TYPE_BINDER)
+                                fp->type = BINDER_TYPE_HANDLE;
+                        else
+                                fp->type = BINDER_TYPE_WEAK_HANDLE;
+                        fp->handle = ref->desc;
+                        binder_inc_ref(ref, fp->type == BINDER_TYPE_HANDLE,
+                                       &thread->todo);
+
+                        binder_debug(BINDER_DEBUG_TRANSACTION,
+                                     "        node %d u%p -> ref %d desc %d\n",
+                                     node->debug_id, node->ptr, ref->debug_id,
+                                     ref->desc);
+                } break;
+                case BINDER_TYPE_HANDLE:
+                case BINDER_TYPE_WEAK_HANDLE: {
+                        struct binder_ref *ref = binder_get_ref(proc, fp->handle);
+                        if (ref == NULL) {
+                                binder_user_error("binder: %d:%d got "
+                                        "transaction with invalid "
+                                        "handle, %ld\n", proc->pid,
+                                        thread->pid, fp->handle);
+                                return_error = BR_FAILED_REPLY;
+                                goto err_binder_get_ref_failed;
+                        }
+                        if (ref->node->proc == target_proc) {
+                                if (fp->type == BINDER_TYPE_HANDLE)
+                                        fp->type = BINDER_TYPE_BINDER;
+                                else
+                                        fp->type = BINDER_TYPE_WEAK_BINDER;
+                                fp->binder = ref->node->ptr;
+                                fp->cookie = ref->node->cookie;
+                                binder_inc_node(ref->node, fp->type == BINDER_TYPE_BINDER, 0, NULL);
+                                binder_debug(BINDER_DEBUG_TRANSACTION,
+                                             "        ref %d desc %d -> node %d u%p\n",
+                                             ref->debug_id, ref->desc, ref->node->debug_id,
+                                             ref->node->ptr);
+                        } else {
+                                struct binder_ref *new_ref;
+                                new_ref = binder_get_ref_for_node(target_proc, ref->node);
+                                if (new_ref == NULL) {
+                                        return_error = BR_FAILED_REPLY;
+                                        goto err_binder_get_ref_for_node_failed;
+                                }
+                                fp->handle = new_ref->desc;
+                                binder_inc_ref(new_ref, fp->type == BINDER_TYPE_HANDLE, NULL);
+                                binder_debug(BINDER_DEBUG_TRANSACTION,
+                                             "        ref %d desc %d -> ref %d desc %d (node %d)\n",
+                                             ref->debug_id, ref->desc, new_ref->debug_id,
+                                             new_ref->desc, ref->node->debug_id);
+                        }
+                } break;
+
+                case BINDER_TYPE_FD: {
+                        int target_fd;
+                        struct file *file;
+
+                        if (reply) {
+                                if (!(in_reply_to->flags & TF_ACCEPT_FDS)) {
+                                        binder_user_error("binder: %d:%d got reply with fd, %ld, but target does not allow fds\n",
+                                                proc->pid, thread->pid, fp->handle);
+                                        return_error = BR_FAILED_REPLY;
+                                        goto err_fd_not_allowed;
+                                }
+                        } else if (!target_node->accept_fds) {
+                                binder_user_error("binder: %d:%d got transaction with fd, %ld, but target does not allow fds\n",
+                                        proc->pid, thread->pid, fp->handle);
+                                return_error = BR_FAILED_REPLY;
+                                goto err_fd_not_allowed;
+                        }
+
+                        file = fget(fp->handle);
+                        if (file == NULL) {
+                                binder_user_error("binder: %d:%d got transaction with invalid fd, %ld\n",
+                                        proc->pid, thread->pid, fp->handle);
+                                return_error = BR_FAILED_REPLY;
+                                goto err_fget_failed;
+                        }
+                        target_fd = task_get_unused_fd_flags(target_proc, O_CLOEXEC);
+                        if (target_fd < 0) {
+                                fput(file);
+                                return_error = BR_FAILED_REPLY;
+                                goto err_get_unused_fd_failed;
+                        }
+                        task_fd_install(target_proc, target_fd, file);
+                        binder_debug(BINDER_DEBUG_TRANSACTION,
+                                     "        fd %ld -> %d\n", fp->handle, target_fd);
+                        /* TODO: fput? */
+                        fp->handle = target_fd;
+                } break;
+
+                default:
+                        binder_user_error("binder: %d:%d got transactio"
+                                "n with invalid object type, %lx\n",
+                                proc->pid, thread->pid, fp->type);
+                        return_error = BR_FAILED_REPLY;
+                        goto err_bad_object_type;
+                }
+        }
+        if (reply) {
+                BUG_ON(t->buffer->async_transaction != 0);
+                binder_pop_transaction(target_thread, in_reply_to);
+        } else if (!(t->flags & TF_ONE_WAY)) {
+                BUG_ON(t->buffer->async_transaction != 0);
+                t->need_reply = 1;
+                t->from_parent = thread->transaction_stack;
+                thread->transaction_stack = t;
+        } else {
+                BUG_ON(target_node == NULL);
+                BUG_ON(t->buffer->async_transaction != 1);
+                if (target_node->has_async_transaction) {
+                        target_list = &target_node->async_todo;
+                        target_wait = NULL;
+                } else
+                        target_node->has_async_transaction = 1;
+        }
+        t->work.type = BINDER_WORK_TRANSACTION;
+        list_add_tail(&t->work.entry, target_list);
+        tcomplete->type = BINDER_WORK_TRANSACTION_COMPLETE;
+        list_add_tail(&tcomplete->entry, &thread->todo);
+        if (target_wait)
+                wake_up_interruptible(target_wait);
+        return;
+
+err_get_unused_fd_failed:
+err_fget_failed:
+err_fd_not_allowed:
+err_binder_get_ref_for_node_failed:
+err_binder_get_ref_failed:
+err_binder_new_node_failed:
+err_bad_object_type:
+err_bad_offset:
+err_copy_data_failed:
+        binder_transaction_buffer_release(target_proc, t->buffer, offp);
+        t->buffer->transaction = NULL;
+        binder_free_buf(target_proc, t->buffer);
+err_binder_alloc_buf_failed:
+        kfree(tcomplete);
+        binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
+err_alloc_tcomplete_failed:
+        kfree(t);
+        binder_stats_deleted(BINDER_STAT_TRANSACTION);
+err_alloc_t_failed:
+err_bad_call_stack:
+err_empty_call_stack:
+err_dead_binder:
+err_invalid_target_handle:
+err_no_context_mgr_node:
+        binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
+                     "binder: %d:%d transaction failed %d, size %zd-%zd\n",
+                     proc->pid, thread->pid, return_error,
+                     tr->data_size, tr->offsets_size);
+
+        {
+                struct binder_transaction_log_entry *fe;
+                fe = binder_transaction_log_add(&binder_transaction_log_failed);
+                *fe = *e;
+        }
+
+        BUG_ON(thread->return_error != BR_OK);
+        if (in_reply_to) {
+                thread->return_error = BR_TRANSACTION_COMPLETE;
+                binder_send_failed_reply(in_reply_to, return_error);
+        } else
+                thread->return_error = return_error;
+}
+
+int binder_thread_write(struct binder_proc *proc, struct binder_thread *thread,
+                        void __user *buffer, int size, signed long *consumed)
+{
+        uint32_t cmd;
+        void __user *ptr = buffer + *consumed;
+        void __user *end = buffer + size;
+
+        while (ptr < end && thread->return_error == BR_OK) {
+                if (get_user(cmd, (uint32_t __user *)ptr))
+                        return -EFAULT;
+                ptr += sizeof(uint32_t);
+                if (_IOC_NR(cmd) < ARRAY_SIZE(binder_stats.bc)) {
+                        binder_stats.bc[_IOC_NR(cmd)]++;
+                        proc->stats.bc[_IOC_NR(cmd)]++;
+                        thread->stats.bc[_IOC_NR(cmd)]++;
+                }
+                switch (cmd) {
+                case BC_INCREFS:
+                case BC_ACQUIRE:
+                case BC_RELEASE:
+                case BC_DECREFS: {
+                        uint32_t target;
+                        struct binder_ref *ref;
+                        const char *debug_string;
+
+                        if (get_user(target, (uint32_t __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(uint32_t);
+                        if (target == 0 && binder_context_mgr_node &&
+                            (cmd == BC_INCREFS || cmd == BC_ACQUIRE)) {
+                                ref = binder_get_ref_for_node(proc,
+                                               binder_context_mgr_node);
+                                if (ref->desc != target) {
+                                        binder_user_error("binder: %d:"
+                                                "%d tried to acquire "
+                                                "reference to desc 0, "
+                                                "got %d instead\n",
+                                                proc->pid, thread->pid,
+                                                ref->desc);
+                                }
+                        } else
+                                ref = binder_get_ref(proc, target);
+                        if (ref == NULL) {
+                                binder_user_error("binder: %d:%d refcou"
+                                        "nt change on invalid ref %d\n",
+                                        proc->pid, thread->pid, target);
+                                break;
+                        }
+                        switch (cmd) {
+                        case BC_INCREFS:
+                                debug_string = "IncRefs";
+                                binder_inc_ref(ref, 0, NULL);
+                                break;
+                        case BC_ACQUIRE:
+                                debug_string = "Acquire";
+                                binder_inc_ref(ref, 1, NULL);
+                                break;
+                        case BC_RELEASE:
+                                debug_string = "Release";
+                                binder_dec_ref(ref, 1);
+                                break;
+                        case BC_DECREFS:
+                        default:
+                                debug_string = "DecRefs";
+                                binder_dec_ref(ref, 0);
+                                break;
+                        }
+                        binder_debug(BINDER_DEBUG_USER_REFS,
+                                     "binder: %d:%d %s ref %d desc %d s %d w %d for node %d\n",
+                                     proc->pid, thread->pid, debug_string, ref->debug_id,
+                                     ref->desc, ref->strong, ref->weak, ref->node->debug_id);
+                        break;
+                }
+                case BC_INCREFS_DONE:
+                case BC_ACQUIRE_DONE: {
+                        void __user *node_ptr;
+                        void *cookie;
+                        struct binder_node *node;
+
+                        if (get_user(node_ptr, (void * __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(void *);
+                        if (get_user(cookie, (void * __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(void *);
+                        node = binder_get_node(proc, node_ptr);
+                        if (node == NULL) {
+                                binder_user_error("binder: %d:%d "
+                                        "%s u%p no match\n",
+                                        proc->pid, thread->pid,
+                                        cmd == BC_INCREFS_DONE ?
+                                        "BC_INCREFS_DONE" :
+                                        "BC_ACQUIRE_DONE",
+                                        node_ptr);
+                                break;
+                        }
+                        if (cookie != node->cookie) {
+                                binder_user_error("binder: %d:%d %s u%p node %d"
+                                        " cookie mismatch %p != %p\n",
+                                        proc->pid, thread->pid,
+                                        cmd == BC_INCREFS_DONE ?
+                                        "BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",
+                                        node_ptr, node->debug_id,
+                                        cookie, node->cookie);
+                                break;
+                        }
+                        if (cmd == BC_ACQUIRE_DONE) {
+                                if (node->pending_strong_ref == 0) {
+                                        binder_user_error("binder: %d:%d "
+                                                "BC_ACQUIRE_DONE node %d has "
+                                                "no pending acquire request\n",
+                                                proc->pid, thread->pid,
+                                                node->debug_id);
+                                        break;
+                                }
+                                node->pending_strong_ref = 0;
+                        } else {
+                                if (node->pending_weak_ref == 0) {
+                                        binder_user_error("binder: %d:%d "
+                                                "BC_INCREFS_DONE node %d has "
+                                                "no pending increfs request\n",
+                                                proc->pid, thread->pid,
+                                                node->debug_id);
+                                        break;
+                                }
+                                node->pending_weak_ref = 0;
+                        }
+                        binder_dec_node(node, cmd == BC_ACQUIRE_DONE, 0);
+                        binder_debug(BINDER_DEBUG_USER_REFS,
+                                     "binder: %d:%d %s node %d ls %d lw %d\n",
+                                     proc->pid, thread->pid,
+                                     cmd == BC_INCREFS_DONE ? "BC_INCREFS_DONE" : "BC_ACQUIRE_DONE",
+                                     node->debug_id, node->local_strong_refs, node->local_weak_refs);
+                        break;
+                }
+                case BC_ATTEMPT_ACQUIRE:
+                        printk(KERN_ERR "binder: BC_ATTEMPT_ACQUIRE not supported\n");
+                        return -EINVAL;
+                case BC_ACQUIRE_RESULT:
+                        printk(KERN_ERR "binder: BC_ACQUIRE_RESULT not supported\n");
+                        return -EINVAL;
+
+                case BC_FREE_BUFFER: {
+                        void __user *data_ptr;
+                        struct binder_buffer *buffer;
+
+                        if (get_user(data_ptr, (void * __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(void *);
+
+                        buffer = binder_buffer_lookup(proc, data_ptr);
+                        if (buffer == NULL) {
+                                binder_user_error("binder: %d:%d "
+                                        "BC_FREE_BUFFER u%p no match\n",
+                                        proc->pid, thread->pid, data_ptr);
+                                break;
+                        }
+                        if (!buffer->allow_user_free) {
+                                binder_user_error("binder: %d:%d "
+                                        "BC_FREE_BUFFER u%p matched "
+                                        "unreturned buffer\n",
+                                        proc->pid, thread->pid, data_ptr);
+                                break;
+                        }
+                        binder_debug(BINDER_DEBUG_FREE_BUFFER,
+                                     "binder: %d:%d BC_FREE_BUFFER u%p found buffer %d for %s transaction\n",
+                                     proc->pid, thread->pid, data_ptr, buffer->debug_id,
+                                     buffer->transaction ? "active" : "finished");
+
+                        if (buffer->transaction) {
+                                buffer->transaction->buffer = NULL;
+                                buffer->transaction = NULL;
+                        }
+                        if (buffer->async_transaction && buffer->target_node) {
+                                BUG_ON(!buffer->target_node->has_async_transaction);
+                                if (list_empty(&buffer->target_node->async_todo))
+                                        buffer->target_node->has_async_transaction = 0;
+                                else
+                                        list_move_tail(buffer->target_node->async_todo.next, &thread->todo);
+                        }
+                        binder_transaction_buffer_release(proc, buffer, NULL);
+                        binder_free_buf(proc, buffer);
+                        break;
+                }
+
+                case BC_TRANSACTION:
+                case BC_REPLY: {
+                        struct binder_transaction_data tr;
+
+                        if (copy_from_user(&tr, ptr, sizeof(tr)))
+                                return -EFAULT;
+                        ptr += sizeof(tr);
+                        binder_transaction(proc, thread, &tr, cmd == BC_REPLY);
+                        break;
+                }
+
+                case BC_REGISTER_LOOPER:
+                        binder_debug(BINDER_DEBUG_THREADS,
+                                     "binder: %d:%d BC_REGISTER_LOOPER\n",
+                                     proc->pid, thread->pid);
+                        if (thread->looper & BINDER_LOOPER_STATE_ENTERED) {
+                                thread->looper |= BINDER_LOOPER_STATE_INVALID;
+                                binder_user_error("binder: %d:%d ERROR:"
+                                        " BC_REGISTER_LOOPER called "
+                                        "after BC_ENTER_LOOPER\n",
+                                        proc->pid, thread->pid);
+                        } else if (proc->requested_threads == 0) {
+                                thread->looper |= BINDER_LOOPER_STATE_INVALID;
+                                binder_user_error("binder: %d:%d ERROR:"
+                                        " BC_REGISTER_LOOPER called "
+                                        "without request\n",
+                                        proc->pid, thread->pid);
+                        } else {
+                                proc->requested_threads--;
+                                proc->requested_threads_started++;
+                        }
+                        thread->looper |= BINDER_LOOPER_STATE_REGISTERED;
+                        break;
+                case BC_ENTER_LOOPER:
+                        binder_debug(BINDER_DEBUG_THREADS,
+                                     "binder: %d:%d BC_ENTER_LOOPER\n",
+                                     proc->pid, thread->pid);
+                        if (thread->looper & BINDER_LOOPER_STATE_REGISTERED) {
+                                thread->looper |= BINDER_LOOPER_STATE_INVALID;
+                                binder_user_error("binder: %d:%d ERROR:"
+                                        " BC_ENTER_LOOPER called after "
+                                        "BC_REGISTER_LOOPER\n",
+                                        proc->pid, thread->pid);
+                        }
+                        thread->looper |= BINDER_LOOPER_STATE_ENTERED;
+                        break;
+                case BC_EXIT_LOOPER:
+                        binder_debug(BINDER_DEBUG_THREADS,
+                                     "binder: %d:%d BC_EXIT_LOOPER\n",
+                                     proc->pid, thread->pid);
+                        thread->looper |= BINDER_LOOPER_STATE_EXITED;
+                        break;
+
+                case BC_REQUEST_DEATH_NOTIFICATION:
+                case BC_CLEAR_DEATH_NOTIFICATION: {
+                        uint32_t target;
+                        void __user *cookie;
+                        struct binder_ref *ref;
+                        struct binder_ref_death *death;
+
+                        if (get_user(target, (uint32_t __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(uint32_t);
+                        if (get_user(cookie, (void __user * __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(void *);
+                        ref = binder_get_ref(proc, target);
+                        if (ref == NULL) {
+                                binder_user_error("binder: %d:%d %s "
+                                        "invalid ref %d\n",
+                                        proc->pid, thread->pid,
+                                        cmd == BC_REQUEST_DEATH_NOTIFICATION ?
+                                        "BC_REQUEST_DEATH_NOTIFICATION" :
+                                        "BC_CLEAR_DEATH_NOTIFICATION",
+                                        target);
+                                break;
+                        }
+
+                        binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,
+                                     "binder: %d:%d %s %p ref %d desc %d s %d w %d for node %d\n",
+                                     proc->pid, thread->pid,
+                                     cmd == BC_REQUEST_DEATH_NOTIFICATION ?
+                                     "BC_REQUEST_DEATH_NOTIFICATION" :
+                                     "BC_CLEAR_DEATH_NOTIFICATION",
+                                     cookie, ref->debug_id, ref->desc,
+                                     ref->strong, ref->weak, ref->node->debug_id);
+
+                        if (cmd == BC_REQUEST_DEATH_NOTIFICATION) {
+                                if (ref->death) {
+                                        binder_user_error("binder: %d:%"
+                                                "d BC_REQUEST_DEATH_NOTI"
+                                                "FICATION death notific"
+                                                "ation already set\n",
+                                                proc->pid, thread->pid);
+                                        break;
+                                }
+                                death = kzalloc(sizeof(*death), GFP_KERNEL);
+                                if (death == NULL) {
+                                        thread->return_error = BR_ERROR;
+                                        binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
+                                                     "binder: %d:%d "
+                                                     "BC_REQUEST_DEATH_NOTIFICATION failed\n",
+                                                     proc->pid, thread->pid);
+                                        break;
+                                }
+                                binder_stats_created(BINDER_STAT_DEATH);
+                                INIT_LIST_HEAD(&death->work.entry);
+                                death->cookie = cookie;
+                                ref->death = death;
+                                if (ref->node->proc == NULL) {
+                                        ref->death->work.type = BINDER_WORK_DEAD_BINDER;
+                                        if (thread->looper & (BINDER_LOOPER_STATE_REGISTERED | BINDER_LOOPER_STATE_ENTERED)) {
+                                                list_add_tail(&ref->death->work.entry, &thread->todo);
+                                        } else {
+                                                list_add_tail(&ref->death->work.entry, &proc->todo);
+                                                wake_up_interruptible(&proc->wait);
+                                        }
+                                }
+                        } else {
+                                if (ref->death == NULL) {
+                                        binder_user_error("binder: %d:%"
+                                                "d BC_CLEAR_DEATH_NOTIFI"
+                                                "CATION death notificat"
+                                                "ion not active\n",
+                                                proc->pid, thread->pid);
+                                        break;
+                                }
+                                death = ref->death;
+                                if (death->cookie != cookie) {
+                                        binder_user_error("binder: %d:%"
+                                                "d BC_CLEAR_DEATH_NOTIFI"
+                                                "CATION death notificat"
+                                                "ion cookie mismatch "
+                                                "%p != %p\n",
+                                                proc->pid, thread->pid,
+                                                death->cookie, cookie);
+                                        break;
+                                }
+                                ref->death = NULL;
+                                if (list_empty(&death->work.entry)) {
+                                        death->work.type = BINDER_WORK_CLEAR_DEATH_NOTIFICATION;
+                                        if (thread->looper & (BINDER_LOOPER_STATE_REGISTERED | BINDER_LOOPER_STATE_ENTERED)) {
+                                                list_add_tail(&death->work.entry, &thread->todo);
+                                        } else {
+                                                list_add_tail(&death->work.entry, &proc->todo);
+                                                wake_up_interruptible(&proc->wait);
+                                        }
+                                } else {
+                                        BUG_ON(death->work.type != BINDER_WORK_DEAD_BINDER);
+                                        death->work.type = BINDER_WORK_DEAD_BINDER_AND_CLEAR;
+                                }
+                        }
+                } break;
+                case BC_DEAD_BINDER_DONE: {
+                        struct binder_work *w;
+                        void __user *cookie;
+                        struct binder_ref_death *death = NULL;
+                        if (get_user(cookie, (void __user * __user *)ptr))
+                                return -EFAULT;
+
+                        ptr += sizeof(void *);
+                        list_for_each_entry(w, &proc->delivered_death, entry) {
+                                struct binder_ref_death *tmp_death = container_of(w, struct binder_ref_death, work);
+                                if (tmp_death->cookie == cookie) {
+                                        death = tmp_death;
+                                        break;
+                                }
+                        }
+                        binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                                     "binder: %d:%d BC_DEAD_BINDER_DONE %p found %p\n",
+                                     proc->pid, thread->pid, cookie, death);
+                        if (death == NULL) {
+                                binder_user_error("binder: %d:%d BC_DEAD"
+                                        "_BINDER_DONE %p not found\n",
+                                        proc->pid, thread->pid, cookie);
+                                break;
+                        }
+
+                        list_del_init(&death->work.entry);
+                        if (death->work.type == BINDER_WORK_DEAD_BINDER_AND_CLEAR) {
+                                death->work.type = BINDER_WORK_CLEAR_DEATH_NOTIFICATION;
+                                if (thread->looper & (BINDER_LOOPER_STATE_REGISTERED | BINDER_LOOPER_STATE_ENTERED)) {
+                                        list_add_tail(&death->work.entry, &thread->todo);
+                                } else {
+                                        list_add_tail(&death->work.entry, &proc->todo);
+                                        wake_up_interruptible(&proc->wait);
+                                }
+                        }
+                } break;
+
+                default:
+                        printk(KERN_ERR "binder: %d:%d unknown command %d\n",
+                               proc->pid, thread->pid, cmd);
+                        return -EINVAL;
+                }
+                *consumed = ptr - buffer;
+        }
+        return 0;
+}
+
+void binder_stat_br(struct binder_proc *proc, struct binder_thread *thread,
+                    uint32_t cmd)
+{
+        if (_IOC_NR(cmd) < ARRAY_SIZE(binder_stats.br)) {
+                binder_stats.br[_IOC_NR(cmd)]++;
+                proc->stats.br[_IOC_NR(cmd)]++;
+                thread->stats.br[_IOC_NR(cmd)]++;
+        }
+}
+
+static int binder_has_proc_work(struct binder_proc *proc,
+                                struct binder_thread *thread)
+{
+        return !list_empty(&proc->todo) ||
+                (thread->looper & BINDER_LOOPER_STATE_NEED_RETURN);
+}
+
+static int binder_has_thread_work(struct binder_thread *thread)
+{
+        return !list_empty(&thread->todo) || thread->return_error != BR_OK ||
+                (thread->looper & BINDER_LOOPER_STATE_NEED_RETURN);
+}
+
+static int binder_thread_read(struct binder_proc *proc,
+                              struct binder_thread *thread,
+                              void  __user *buffer, int size,
+                              signed long *consumed, int non_block)
+{
+        void __user *ptr = buffer + *consumed;
+        void __user *end = buffer + size;
+
+        int ret = 0;
+        int wait_for_proc_work;
+
+        if (*consumed == 0) {
+                if (put_user(BR_NOOP, (uint32_t __user *)ptr))
+                        return -EFAULT;
+                ptr += sizeof(uint32_t);
+        }
+
+retry:
+        wait_for_proc_work = thread->transaction_stack == NULL &&
+                                list_empty(&thread->todo);
+
+        if (thread->return_error != BR_OK && ptr < end) {
+                if (thread->return_error2 != BR_OK) {
+                        if (put_user(thread->return_error2, (uint32_t __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(uint32_t);
+                        if (ptr == end)
+                                goto done;
+                        thread->return_error2 = BR_OK;
+                }
+                if (put_user(thread->return_error, (uint32_t __user *)ptr))
+                        return -EFAULT;
+                ptr += sizeof(uint32_t);
+                thread->return_error = BR_OK;
+                goto done;
+        }
+
+
+        thread->looper |= BINDER_LOOPER_STATE_WAITING;
+        if (wait_for_proc_work)
+                proc->ready_threads++;
+        mutex_unlock(&binder_lock);
+        if (wait_for_proc_work) {
+                if (!(thread->looper & (BINDER_LOOPER_STATE_REGISTERED |
+                                        BINDER_LOOPER_STATE_ENTERED))) {
+                        binder_user_error("binder: %d:%d ERROR: Thread waiting "
+                                "for process work before calling BC_REGISTER_"
+                                "LOOPER or BC_ENTER_LOOPER (state %x)\n",
+                                proc->pid, thread->pid, thread->looper);
+                        wait_event_interruptible(binder_user_error_wait,
+                                                 binder_stop_on_user_error < 2);
+                }
+                binder_set_nice(proc->default_priority);
+                if (non_block) {
+                        if (!binder_has_proc_work(proc, thread))
+                                ret = -EAGAIN;
+                } else
+                        ret = wait_event_interruptible_exclusive(proc->wait, binder_has_proc_work(proc, thread));
+        } else {
+                if (non_block) {
+                        if (!binder_has_thread_work(thread))
+                                ret = -EAGAIN;
+                } else
+                        ret = wait_event_interruptible(thread->wait, binder_has_thread_work(thread));
+        }
+        mutex_lock(&binder_lock);
+        if (wait_for_proc_work)
+                proc->ready_threads--;
+        thread->looper &= ~BINDER_LOOPER_STATE_WAITING;
+
+        if (ret)
+                return ret;
+
+        while (1) {
+                uint32_t cmd;
+                struct binder_transaction_data tr;
+                struct binder_work *w;
+                struct binder_transaction *t = NULL;
+
+                if (!list_empty(&thread->todo))
+                        w = list_first_entry(&thread->todo, struct binder_work, entry);
+                else if (!list_empty(&proc->todo) && wait_for_proc_work)
+                        w = list_first_entry(&proc->todo, struct binder_work, entry);
+                else {
+                        if (ptr - buffer == 4 && !(thread->looper & BINDER_LOOPER_STATE_NEED_RETURN)) /* no data added */
+                                goto retry;
+                        break;
+                }
+
+                if (end - ptr < sizeof(tr) + 4)
+                        break;
+
+                switch (w->type) {
+                case BINDER_WORK_TRANSACTION: {
+                        t = container_of(w, struct binder_transaction, work);
+                } break;
+                case BINDER_WORK_TRANSACTION_COMPLETE: {
+                        cmd = BR_TRANSACTION_COMPLETE;
+                        if (put_user(cmd, (uint32_t __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(uint32_t);
+
+                        binder_stat_br(proc, thread, cmd);
+                        binder_debug(BINDER_DEBUG_TRANSACTION_COMPLETE,
+                                     "binder: %d:%d BR_TRANSACTION_COMPLETE\n",
+                                     proc->pid, thread->pid);
+
+                        list_del(&w->entry);
+                        kfree(w);
+                        binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
+                } break;
+                case BINDER_WORK_NODE: {
+                        struct binder_node *node = container_of(w, struct binder_node, work);
+                        uint32_t cmd = BR_NOOP;
+                        const char *cmd_name;
+                        int strong = node->internal_strong_refs || node->local_strong_refs;
+                        int weak = !hlist_empty(&node->refs) || node->local_weak_refs || strong;
+                        if (weak && !node->has_weak_ref) {
+                                cmd = BR_INCREFS;
+                                cmd_name = "BR_INCREFS";
+                                node->has_weak_ref = 1;
+                                node->pending_weak_ref = 1;
+                                node->local_weak_refs++;
+                        } else if (strong && !node->has_strong_ref) {
+                                cmd = BR_ACQUIRE;
+                                cmd_name = "BR_ACQUIRE";
+                                node->has_strong_ref = 1;
+                                node->pending_strong_ref = 1;
+                                node->local_strong_refs++;
+                        } else if (!strong && node->has_strong_ref) {
+                                cmd = BR_RELEASE;
+                                cmd_name = "BR_RELEASE";
+                                node->has_strong_ref = 0;
+                        } else if (!weak && node->has_weak_ref) {
+                                cmd = BR_DECREFS;
+                                cmd_name = "BR_DECREFS";
+                                node->has_weak_ref = 0;
+                        }
+                        if (cmd != BR_NOOP) {
+                                if (put_user(cmd, (uint32_t __user *)ptr))
+                                        return -EFAULT;
+                                ptr += sizeof(uint32_t);
+                                if (put_user(node->ptr, (void * __user *)ptr))
+                                        return -EFAULT;
+                                ptr += sizeof(void *);
+                                if (put_user(node->cookie, (void * __user *)ptr))
+                                        return -EFAULT;
+                                ptr += sizeof(void *);
+
+                                binder_stat_br(proc, thread, cmd);
+                                binder_debug(BINDER_DEBUG_USER_REFS,
+                                             "binder: %d:%d %s %d u%p c%p\n",
+                                             proc->pid, thread->pid, cmd_name, node->debug_id, node->ptr, node->cookie);
+                        } else {
+                                list_del_init(&w->entry);
+                                if (!weak && !strong) {
+                                        binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                                                     "binder: %d:%d node %d u%p c%p deleted\n",
+                                                     proc->pid, thread->pid, node->debug_id,
+                                                     node->ptr, node->cookie);
+                                        rb_erase(&node->rb_node, &proc->nodes);
+                                        kfree(node);
+                                        binder_stats_deleted(BINDER_STAT_NODE);
+                                } else {
+                                        binder_debug(BINDER_DEBUG_INTERNAL_REFS,
+                                                     "binder: %d:%d node %d u%p c%p state unchanged\n",
+                                                     proc->pid, thread->pid, node->debug_id, node->ptr,
+                                                     node->cookie);
+                                }
+                        }
+                } break;
+                case BINDER_WORK_DEAD_BINDER:
+                case BINDER_WORK_DEAD_BINDER_AND_CLEAR:
+                case BINDER_WORK_CLEAR_DEATH_NOTIFICATION: {
+                        struct binder_ref_death *death;
+                        uint32_t cmd;
+
+                        death = container_of(w, struct binder_ref_death, work);
+                        if (w->type == BINDER_WORK_CLEAR_DEATH_NOTIFICATION)
+                                cmd = BR_CLEAR_DEATH_NOTIFICATION_DONE;
+                        else
+                                cmd = BR_DEAD_BINDER;
+                        if (put_user(cmd, (uint32_t __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(uint32_t);
+                        if (put_user(death->cookie, (void * __user *)ptr))
+                                return -EFAULT;
+                        ptr += sizeof(void *);
+                        binder_debug(BINDER_DEBUG_DEATH_NOTIFICATION,
+                                     "binder: %d:%d %s %p\n",
+                                      proc->pid, thread->pid,
+                                      cmd == BR_DEAD_BINDER ?
+                                      "BR_DEAD_BINDER" :
+                                      "BR_CLEAR_DEATH_NOTIFICATION_DONE",
+                                      death->cookie);
+
+                        if (w->type == BINDER_WORK_CLEAR_DEATH_NOTIFICATION) {
+                                list_del(&w->entry);
+                                kfree(death);
+                                binder_stats_deleted(BINDER_STAT_DEATH);
+                        } else
+                                list_move(&w->entry, &proc->delivered_death);
+                        if (cmd == BR_DEAD_BINDER)
+                                goto done; /* DEAD_BINDER notifications can cause transactions */
+                } break;
+                }
+
+                if (!t)
+                        continue;
+
+                BUG_ON(t->buffer == NULL);
+                if (t->buffer->target_node) {
+                        struct binder_node *target_node = t->buffer->target_node;
+                        tr.target.ptr = target_node->ptr;
+                        tr.cookie =  target_node->cookie;
+                        t->saved_priority = task_nice(current);
+                        if (t->priority < target_node->min_priority &&
+                            !(t->flags & TF_ONE_WAY))
+                                binder_set_nice(t->priority);
+                        else if (!(t->flags & TF_ONE_WAY) ||
+                                 t->saved_priority > target_node->min_priority)
+                                binder_set_nice(target_node->min_priority);
+                        cmd = BR_TRANSACTION;
+                } else {
+                        tr.target.ptr = NULL;
+                        tr.cookie = NULL;
+                        cmd = BR_REPLY;
+                }
+                tr.code = t->code;
+                tr.flags = t->flags;
+                tr.sender_euid = t->sender_euid;
+
+                if (t->from) {
+                        struct task_struct *sender = t->from->proc->tsk;
+                        tr.sender_pid = task_tgid_nr_ns(sender,
+                                                        current->nsproxy->pid_ns);
+                } else {
+                        tr.sender_pid = 0;
+                }
+
+                tr.data_size = t->buffer->data_size;
+                tr.offsets_size = t->buffer->offsets_size;
+                tr.data.ptr.buffer = (void *)t->buffer->data +
+                                        proc->user_buffer_offset;
+                tr.data.ptr.offsets = tr.data.ptr.buffer +
+                                        ALIGN(t->buffer->data_size,
+                                            sizeof(void *));
+
+                if (put_user(cmd, (uint32_t __user *)ptr))
+                        return -EFAULT;
+                ptr += sizeof(uint32_t);
+                if (copy_to_user(ptr, &tr, sizeof(tr)))
+                        return -EFAULT;
+                ptr += sizeof(tr);
+
+                binder_stat_br(proc, thread, cmd);
+                binder_debug(BINDER_DEBUG_TRANSACTION,
+                             "binder: %d:%d %s %d %d:%d, cmd %d"
+                             "size %zd-%zd ptr %p-%p\n",
+                             proc->pid, thread->pid,
+                             (cmd == BR_TRANSACTION) ? "BR_TRANSACTION" :
+                             "BR_REPLY",
+                             t->debug_id, t->from ? t->from->proc->pid : 0,
+                             t->from ? t->from->pid : 0, cmd,
+                             t->buffer->data_size, t->buffer->offsets_size,
+                             tr.data.ptr.buffer, tr.data.ptr.offsets);
+
+                list_del(&t->work.entry);
+                t->buffer->allow_user_free = 1;
+                if (cmd == BR_TRANSACTION && !(t->flags & TF_ONE_WAY)) {
+                        t->to_parent = thread->transaction_stack;
+                        t->to_thread = thread;
+                        thread->transaction_stack = t;
+                } else {
+                        t->buffer->transaction = NULL;
+                        kfree(t);
+                        binder_stats_deleted(BINDER_STAT_TRANSACTION);
+                }
+                break;
+        }
+
+done:
+
+        *consumed = ptr - buffer;
+        if (proc->requested_threads + proc->ready_threads == 0 &&
+            proc->requested_threads_started < proc->max_threads &&
+            (thread->looper & (BINDER_LOOPER_STATE_REGISTERED |
+             BINDER_LOOPER_STATE_ENTERED)) /* the user-space code fails to */
+             /*spawn a new thread if we leave this out */) {
+                proc->requested_threads++;
+                binder_debug(BINDER_DEBUG_THREADS,
+                             "binder: %d:%d BR_SPAWN_LOOPER\n",
+                             proc->pid, thread->pid);
+                if (put_user(BR_SPAWN_LOOPER, (uint32_t __user *)buffer))
+                        return -EFAULT;
+        }
+        return 0;
+}
+
+static void binder_release_work(struct list_head *list)
+{
+        struct binder_work *w;
+        while (!list_empty(list)) {
+                w = list_first_entry(list, struct binder_work, entry);
+                list_del_init(&w->entry);
+                switch (w->type) {
+                case BINDER_WORK_TRANSACTION: {
+                        struct binder_transaction *t;
+
+                        t = container_of(w, struct binder_transaction, work);
+                        if (t->buffer->target_node && !(t->flags & TF_ONE_WAY))
+                                binder_send_failed_reply(t, BR_DEAD_REPLY);
+                } break;
+                case BINDER_WORK_TRANSACTION_COMPLETE: {
+                        kfree(w);
+                        binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);
+                } break;
+                default:
+                        break;
+                }
+        }
+
+}
+
+static struct binder_thread *binder_get_thread(struct binder_proc *proc)
+{
+        struct binder_thread *thread = NULL;
+        struct rb_node *parent = NULL;
+        struct rb_node **p = &proc->threads.rb_node;
+
+        while (*p) {
+                parent = *p;
+                thread = rb_entry(parent, struct binder_thread, rb_node);
+
+                if (current->pid < thread->pid)
+                        p = &(*p)->rb_left;
+                else if (current->pid > thread->pid)
+                        p = &(*p)->rb_right;
+                else
+                        break;
+        }
+        if (*p == NULL) {
+                thread = kzalloc(sizeof(*thread), GFP_KERNEL);
+                if (thread == NULL)
+                        return NULL;
+                binder_stats_created(BINDER_STAT_THREAD);
+                thread->proc = proc;
+                thread->pid = current->pid;
+                init_waitqueue_head(&thread->wait);
+                INIT_LIST_HEAD(&thread->todo);
+                rb_link_node(&thread->rb_node, parent, p);
+                rb_insert_color(&thread->rb_node, &proc->threads);
+                thread->looper |= BINDER_LOOPER_STATE_NEED_RETURN;
+                thread->return_error = BR_OK;
+                thread->return_error2 = BR_OK;
+        }
+        return thread;
+}
+
+static int binder_free_thread(struct binder_proc *proc,
+                              struct binder_thread *thread)
+{
+        struct binder_transaction *t;
+        struct binder_transaction *send_reply = NULL;
+        int active_transactions = 0;
+
+        rb_erase(&thread->rb_node, &proc->threads);
+        t = thread->transaction_stack;
+        if (t && t->to_thread == thread)
+                send_reply = t;
+        while (t) {
+                active_transactions++;
+                binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,
+                             "binder: release %d:%d transaction %d "
+                             "%s, still active\n", proc->pid, thread->pid,
+                             t->debug_id,
+                             (t->to_thread == thread) ? "in" : "out");
+
+                if (t->to_thread == thread) {
+                        t->to_proc = NULL;
+                        t->to_thread = NULL;
+                        if (t->buffer) {
+                                t->buffer->transaction = NULL;
+                                t->buffer = NULL;
+                        }
+                        t = t->to_parent;
+                } else if (t->from == thread) {
+                        t->from = NULL;
+                        t = t->from_parent;
+                } else
+                        BUG();
+        }
+        if (send_reply)
+                binder_send_failed_reply(send_reply, BR_DEAD_REPLY);
+        binder_release_work(&thread->todo);
+        kfree(thread);
+        binder_stats_deleted(BINDER_STAT_THREAD);
+        return active_transactions;
+}
+
+static unsigned int binder_poll(struct file *filp,
+                                struct poll_table_struct *wait)
+{
+        struct binder_proc *proc = filp->private_data;
+        struct binder_thread *thread = NULL;
+        int wait_for_proc_work;
+
+        mutex_lock(&binder_lock);
+        thread = binder_get_thread(proc);
+
+        wait_for_proc_work = thread->transaction_stack == NULL &&
+                list_empty(&thread->todo) && thread->return_error == BR_OK;
+        mutex_unlock(&binder_lock);
+
+        if (wait_for_proc_work) {
+                if (binder_has_proc_work(proc, thread))
+                        return POLLIN;
+                poll_wait(filp, &proc->wait, wait);
+                if (binder_has_proc_work(proc, thread))
+                        return POLLIN;
+        } else {
+                if (binder_has_thread_work(thread))
+                        return POLLIN;
+                poll_wait(filp, &thread->wait, wait);
+                if (binder_has_thread_work(thread))
+                        return POLLIN;
+        }
+        return 0;
+}
+
+static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
+{
+        int ret;
+        struct binder_proc *proc = filp->private_data;
+        struct binder_thread *thread;
+        unsigned int size = _IOC_SIZE(cmd);
+        void __user *ubuf = (void __user *)arg;
+
+        /*printk(KERN_INFO "binder_ioctl: %d:%d %x %lx\n", proc->pid, current->pid, cmd, arg);*/
+
+        ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
+        if (ret)
+                return ret;
+
+        mutex_lock(&binder_lock);
+        thread = binder_get_thread(proc);
+        if (thread == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        switch (cmd) {
+        case BINDER_WRITE_READ: {
+                struct binder_write_read bwr;
+                if (size != sizeof(struct binder_write_read)) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+                if (copy_from_user(&bwr, ubuf, sizeof(bwr))) {
+                        ret = -EFAULT;
+                        goto err;
+                }
+                binder_debug(BINDER_DEBUG_READ_WRITE,
+                             "binder: %d:%d write %ld at %08lx, read %ld at %08lx\n",
+                             proc->pid, thread->pid, bwr.write_size, bwr.write_buffer,
+                             bwr.read_size, bwr.read_buffer);
+
+                if (bwr.write_size > 0) {
+                        ret = binder_thread_write(proc, thread, (void __user *)bwr.write_buffer, bwr.write_size, &bwr.write_consumed);
+                        if (ret < 0) {
+                                bwr.read_consumed = 0;
+                                if (copy_to_user(ubuf, &bwr, sizeof(bwr)))
+                                        ret = -EFAULT;
+                                goto err;
+                        }
+                }
+                if (bwr.read_size > 0) {
+                        ret = binder_thread_read(proc, thread, (void __user *)bwr.read_buffer, bwr.read_size, &bwr.read_consumed, filp->f_flags & O_NONBLOCK);
+                        if (!list_empty(&proc->todo))
+                                wake_up_interruptible(&proc->wait);
+                        if (ret < 0) {
+                                if (copy_to_user(ubuf, &bwr, sizeof(bwr)))
+                                        ret = -EFAULT;
+                                goto err;
+                        }
+                }
+                binder_debug(BINDER_DEBUG_READ_WRITE,
+                             "binder: %d:%d wrote %ld of %ld, read return %ld of %ld\n",
+                             proc->pid, thread->pid, bwr.write_consumed, bwr.write_size,
+                             bwr.read_consumed, bwr.read_size);
+                if (copy_to_user(ubuf, &bwr, sizeof(bwr))) {
+                        ret = -EFAULT;
+                        goto err;
+                }
+                break;
+        }
+        case BINDER_SET_MAX_THREADS:
+                if (copy_from_user(&proc->max_threads, ubuf, sizeof(proc->max_threads))) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+                break;
+        case BINDER_SET_CONTEXT_MGR:
+                if (binder_context_mgr_node != NULL) {
+                        printk(KERN_ERR "binder: BINDER_SET_CONTEXT_MGR already set\n");
+                        ret = -EBUSY;
+                        goto err;
+                }
+                if (binder_context_mgr_uid != -1) {
+                        if (binder_context_mgr_uid != current->cred->euid) {
+                                printk(KERN_ERR "binder: BINDER_SET_"
+                                       "CONTEXT_MGR bad uid %d != %d\n",
+                                       current->cred->euid,
+                                       binder_context_mgr_uid);
+                                ret = -EPERM;
+                                goto err;
+                        }
+                } else
+                        binder_context_mgr_uid = current->cred->euid;
+                binder_context_mgr_node = binder_new_node(proc, NULL, NULL);
+                if (binder_context_mgr_node == NULL) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+                binder_context_mgr_node->local_weak_refs++;
+                binder_context_mgr_node->local_strong_refs++;
+                binder_context_mgr_node->has_strong_ref = 1;
+                binder_context_mgr_node->has_weak_ref = 1;
+                break;
+        case BINDER_THREAD_EXIT:
+                binder_debug(BINDER_DEBUG_THREADS, "binder: %d:%d exit\n",
+                             proc->pid, thread->pid);
+                binder_free_thread(proc, thread);
+                thread = NULL;
+                break;
+        case BINDER_VERSION:
+                if (size != sizeof(struct binder_version)) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+                if (put_user(BINDER_CURRENT_PROTOCOL_VERSION, &((struct binder_version *)ubuf)->protocol_version)) {
+                        ret = -EINVAL;
+                        goto err;
+                }
+                break;
+        default:
+                ret = -EINVAL;
+                goto err;
+        }
+        ret = 0;
+err:
+        if (thread)
+                thread->looper &= ~BINDER_LOOPER_STATE_NEED_RETURN;
+        mutex_unlock(&binder_lock);
+        wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
+        if (ret && ret != -ERESTARTSYS)
+                printk(KERN_INFO "binder: %d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret);
+        return ret;
+}
+
+static void binder_vma_open(struct vm_area_struct *vma)
+{
+        struct binder_proc *proc = vma->vm_private_data;
+        binder_debug(BINDER_DEBUG_OPEN_CLOSE,
+                     "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",
+                     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)
+{
+        struct binder_proc *proc = vma->vm_private_data;
+        binder_debug(BINDER_DEBUG_OPEN_CLOSE,
+                     "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n",
+                     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));
+        proc->vma = NULL;
+        binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
+}
+
+static struct vm_operations_struct binder_vm_ops = {
+        .open = binder_vma_open,
+        .close = binder_vma_close,
+};
+
+static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        int ret;
+        struct vm_struct *area;
+        struct binder_proc *proc = filp->private_data;
+        const char *failure_string;
+        struct binder_buffer *buffer;
+
+        if ((vma->vm_end - vma->vm_start) > SZ_4M)
+                vma->vm_end = vma->vm_start + SZ_4M;
+
+        binder_debug(BINDER_DEBUG_OPEN_CLOSE,
+                     "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n",
+                     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));
+
+        if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) {
+                ret = -EPERM;
+                failure_string = "bad vm_flags";
+                goto err_bad_arg;
+        }
+        vma->vm_flags = (vma->vm_flags | VM_DONTCOPY) & ~VM_MAYWRITE;
+
+        if (proc->buffer) {
+                ret = -EBUSY;
+                failure_string = "already mapped";
+                goto err_already_mapped;
+        }
+
+        area = get_vm_area(vma->vm_end - vma->vm_start, VM_IOREMAP);
+        if (area == NULL) {
+                ret = -ENOMEM;
+                failure_string = "get_vm_area";
+                goto err_get_vm_area_failed;
+        }
+        proc->buffer = area->addr;
+        proc->user_buffer_offset = vma->vm_start - (uintptr_t)proc->buffer;
+
+#ifdef CONFIG_CPU_CACHE_VIPT
+        if (cache_is_vipt_aliasing()) {
+                while (CACHE_COLOUR((vma->vm_start ^ (uint32_t)proc->buffer))) {
+                        printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p bad alignment\n", proc->pid, vma->vm_start, vma->vm_end, proc->buffer);
+                        vma->vm_start += PAGE_SIZE;
+                }
+        }
+#endif
+        proc->pages = kzalloc(sizeof(proc->pages[0]) * ((vma->vm_end - vma->vm_start) / PAGE_SIZE), GFP_KERNEL);
+        if (proc->pages == NULL) {
+                ret = -ENOMEM;
+                failure_string = "alloc page array";
+                goto err_alloc_pages_failed;
+        }
+        proc->buffer_size = vma->vm_end - vma->vm_start;
+
+        vma->vm_ops = &binder_vm_ops;
+        vma->vm_private_data = proc;
+
+        if (binder_update_page_range(proc, 1, proc->buffer, proc->buffer + PAGE_SIZE, vma)) {
+                ret = -ENOMEM;
+                failure_string = "alloc small buf";
+                goto err_alloc_small_buf_failed;
+        }
+        buffer = proc->buffer;
+        INIT_LIST_HEAD(&proc->buffers);
+        list_add(&buffer->entry, &proc->buffers);
+        buffer->free = 1;
+        binder_insert_free_buffer(proc, buffer);
+        proc->free_async_space = proc->buffer_size / 2;
+        barrier();
+        proc->files = get_files_struct(current);
+        proc->vma = vma;
+
+        /*printk(KERN_INFO "binder_mmap: %d %lx-%lx maps %p\n",
+                 proc->pid, vma->vm_start, vma->vm_end, proc->buffer);*/
+        return 0;
+
+err_alloc_small_buf_failed:
+        kfree(proc->pages);
+        proc->pages = NULL;
+err_alloc_pages_failed:
+        vfree(proc->buffer);
+        proc->buffer = NULL;
+err_get_vm_area_failed:
+err_already_mapped:
+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);
+        return ret;
+}
+
+static int binder_open(struct inode *nodp, struct file *filp)
+{
+        struct binder_proc *proc;
+
+        binder_debug(BINDER_DEBUG_OPEN_CLOSE, "binder_open: %d:%d\n",
+                     current->group_leader->pid, current->pid);
+
+        proc = kzalloc(sizeof(*proc), GFP_KERNEL);
+        if (proc == NULL)
+                return -ENOMEM;
+        get_task_struct(current);
+        proc->tsk = current;
+        INIT_LIST_HEAD(&proc->todo);
+        init_waitqueue_head(&proc->wait);
+        proc->default_priority = task_nice(current);
+        mutex_lock(&binder_lock);
+        binder_stats_created(BINDER_STAT_PROC);
+        hlist_add_head(&proc->proc_node, &binder_procs);
+        proc->pid = current->group_leader->pid;
+        INIT_LIST_HEAD(&proc->delivered_death);
+        filp->private_data = proc;
+        mutex_unlock(&binder_lock);
+
+        if (binder_debugfs_dir_entry_proc) {
+                char strbuf[11];
+                snprintf(strbuf, sizeof(strbuf), "%u", proc->pid);
+                proc->debugfs_entry = debugfs_create_file(strbuf, S_IRUGO,
+                        binder_debugfs_dir_entry_proc, proc, &binder_proc_fops);
+        }
+
+        return 0;
+}
+
+static int binder_flush(struct file *filp, fl_owner_t id)
+{
+        struct binder_proc *proc = filp->private_data;
+
+        binder_defer_work(proc, BINDER_DEFERRED_FLUSH);
+
+        return 0;
+}
+
+static void binder_deferred_flush(struct binder_proc *proc)
+{
+        struct rb_node *n;
+        int wake_count = 0;
+        for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n)) {
+                struct binder_thread *thread = rb_entry(n, struct binder_thread, rb_node);
+                thread->looper |= BINDER_LOOPER_STATE_NEED_RETURN;
+                if (thread->looper & BINDER_LOOPER_STATE_WAITING) {
+                        wake_up_interruptible(&thread->wait);
+                        wake_count++;
+                }
+        }
+        wake_up_interruptible_all(&proc->wait);
+
+        binder_debug(BINDER_DEBUG_OPEN_CLOSE,
+                     "binder_flush: %d woke %d threads\n", proc->pid,
+                     wake_count);
+}
+
+static int binder_release(struct inode *nodp, struct file *filp)
+{
+        struct binder_proc *proc = filp->private_data;
+        debugfs_remove(proc->debugfs_entry);
+        binder_defer_work(proc, BINDER_DEFERRED_RELEASE);
+
+        return 0;
+}
+
+static void binder_deferred_release(struct binder_proc *proc)
+{
+        struct hlist_node *pos;
+        struct binder_transaction *t;
+        struct rb_node *n;
+        int threads, nodes, incoming_refs, outgoing_refs, buffers, active_transactions, page_count;
+
+        BUG_ON(proc->vma);
+        BUG_ON(proc->files);
+
+        hlist_del(&proc->proc_node);
+        if (binder_context_mgr_node && binder_context_mgr_node->proc == proc) {
+                binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                             "binder_release: %d context_mgr_node gone\n",
+                             proc->pid);
+                binder_context_mgr_node = NULL;
+        }
+
+        threads = 0;
+        active_transactions = 0;
+        while ((n = rb_first(&proc->threads))) {
+                struct binder_thread *thread = rb_entry(n, struct binder_thread, rb_node);
+                threads++;
+                active_transactions += binder_free_thread(proc, thread);
+        }
+        nodes = 0;
+        incoming_refs = 0;
+        while ((n = rb_first(&proc->nodes))) {
+                struct binder_node *node = rb_entry(n, struct binder_node, rb_node);
+
+                nodes++;
+                rb_erase(&node->rb_node, &proc->nodes);
+                list_del_init(&node->work.entry);
+                if (hlist_empty(&node->refs)) {
+                        kfree(node);
+                        binder_stats_deleted(BINDER_STAT_NODE);
+                } else {
+                        struct binder_ref *ref;
+                        int death = 0;
+
+                        node->proc = NULL;
+                        node->local_strong_refs = 0;
+                        node->local_weak_refs = 0;
+                        hlist_add_head(&node->dead_node, &binder_dead_nodes);
+
+                        hlist_for_each_entry(ref, pos, &node->refs, node_entry) {
+                                incoming_refs++;
+                                if (ref->death) {
+                                        death++;
+                                        if (list_empty(&ref->death->work.entry)) {
+                                                ref->death->work.type = BINDER_WORK_DEAD_BINDER;
+                                                list_add_tail(&ref->death->work.entry, &ref->proc->todo);
+                                                wake_up_interruptible(&ref->proc->wait);
+                                        } else
+                                                BUG();
+                                }
+                        }
+                        binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                                     "binder: node %d now dead, "
+                                     "refs %d, death %d\n", node->debug_id,
+                                     incoming_refs, death);
+                }
+        }
+        outgoing_refs = 0;
+        while ((n = rb_first(&proc->refs_by_desc))) {
+                struct binder_ref *ref = rb_entry(n, struct binder_ref,
+                                                  rb_node_desc);
+                outgoing_refs++;
+                binder_delete_ref(ref);
+        }
+        binder_release_work(&proc->todo);
+        buffers = 0;
+
+        while ((n = rb_first(&proc->allocated_buffers))) {
+                struct binder_buffer *buffer = rb_entry(n, struct binder_buffer,
+                                                        rb_node);
+                t = buffer->transaction;
+                if (t) {
+                        t->buffer = NULL;
+                        buffer->transaction = NULL;
+                        printk(KERN_ERR "binder: release proc %d, "
+                               "transaction %d, not freed\n",
+                               proc->pid, t->debug_id);
+                        /*BUG();*/
+                }
+                binder_free_buf(proc, buffer);
+                buffers++;
+        }
+
+        binder_stats_deleted(BINDER_STAT_PROC);
+
+        page_count = 0;
+        if (proc->pages) {
+                int i;
+                for (i = 0; i < proc->buffer_size / PAGE_SIZE; i++) {
+                        if (proc->pages[i]) {
+                                void *page_addr = proc->buffer + i * PAGE_SIZE;
+                                binder_debug(BINDER_DEBUG_BUFFER_ALLOC,
+                                             "binder_release: %d: "
+                                             "page %d at %p not freed\n",
+                                             proc->pid, i,
+                                             page_addr);
+                                unmap_kernel_range((unsigned long)page_addr,
+                                        PAGE_SIZE);
+                                __free_page(proc->pages[i]);
+                                page_count++;
+                        }
+                }
+                kfree(proc->pages);
+                vfree(proc->buffer);
+        }
+
+        put_task_struct(proc->tsk);
+
+        binder_debug(BINDER_DEBUG_OPEN_CLOSE,
+                     "binder_release: %d threads %d, nodes %d (ref %d), "
+                     "refs %d, active transactions %d, buffers %d, "
+                     "pages %d\n",
+                     proc->pid, threads, nodes, incoming_refs, outgoing_refs,
+                     active_transactions, buffers, page_count);
+
+        kfree(proc);
+}
+
+static void binder_deferred_func(struct work_struct *work)
+{
+        struct binder_proc *proc;
+        struct files_struct *files;
+
+        int defer;
+        do {
+                mutex_lock(&binder_lock);
+                mutex_lock(&binder_deferred_lock);
+                if (!hlist_empty(&binder_deferred_list)) {
+                        proc = hlist_entry(binder_deferred_list.first,
+                                        struct binder_proc, deferred_work_node);
+                        hlist_del_init(&proc->deferred_work_node);
+                        defer = proc->deferred_work;
+                        proc->deferred_work = 0;
+                } else {
+                        proc = NULL;
+                        defer = 0;
+                }
+                mutex_unlock(&binder_deferred_lock);
+
+                files = NULL;
+                if (defer & BINDER_DEFERRED_PUT_FILES) {
+                        files = proc->files;
+                        if (files)
+                                proc->files = NULL;
+                }
+
+                if (defer & BINDER_DEFERRED_FLUSH)
+                        binder_deferred_flush(proc);
+
+                if (defer & BINDER_DEFERRED_RELEASE)
+                        binder_deferred_release(proc); /* frees proc */
+
+                mutex_unlock(&binder_lock);
+                if (files)
+                        put_files_struct(files);
+        } while (proc);
+}
+static DECLARE_WORK(binder_deferred_work, binder_deferred_func);
+
+static void
+binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
+{
+        mutex_lock(&binder_deferred_lock);
+        proc->deferred_work |= defer;
+        if (hlist_unhashed(&proc->deferred_work_node)) {
+                hlist_add_head(&proc->deferred_work_node,
+                                &binder_deferred_list);
+                queue_work(binder_deferred_workqueue, &binder_deferred_work);
+        }
+        mutex_unlock(&binder_deferred_lock);
+}
+
+static void print_binder_transaction(struct seq_file *m, const char *prefix,
+                                     struct binder_transaction *t)
+{
+        seq_printf(m,
+                   "%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d",
+                   prefix, t->debug_id, t,
+                   t->from ? t->from->proc->pid : 0,
+                   t->from ? t->from->pid : 0,
+                   t->to_proc ? t->to_proc->pid : 0,
+                   t->to_thread ? t->to_thread->pid : 0,
+                   t->code, t->flags, t->priority, t->need_reply);
+        if (t->buffer == NULL) {
+                seq_puts(m, " buffer free\n");
+                return;
+        }
+        if (t->buffer->target_node)
+                seq_printf(m, " node %d",
+                           t->buffer->target_node->debug_id);
+        seq_printf(m, " size %zd:%zd data %p\n",
+                   t->buffer->data_size, t->buffer->offsets_size,
+                   t->buffer->data);
+}
+
+static void print_binder_buffer(struct seq_file *m, const char *prefix,
+                                struct binder_buffer *buffer)
+{
+        seq_printf(m, "%s %d: %p size %zd:%zd %s\n",
+                   prefix, buffer->debug_id, buffer->data,
+                   buffer->data_size, buffer->offsets_size,
+                   buffer->transaction ? "active" : "delivered");
+}
+
+static void print_binder_work(struct seq_file *m, const char *prefix,
+                              const char *transaction_prefix,
+                              struct binder_work *w)
+{
+        struct binder_node *node;
+        struct binder_transaction *t;
+
+        switch (w->type) {
+        case BINDER_WORK_TRANSACTION:
+                t = container_of(w, struct binder_transaction, work);
+                print_binder_transaction(m, transaction_prefix, t);
+                break;
+        case BINDER_WORK_TRANSACTION_COMPLETE:
+                seq_printf(m, "%stransaction complete\n", prefix);
+                break;
+        case BINDER_WORK_NODE:
+                node = container_of(w, struct binder_node, work);
+                seq_printf(m, "%snode work %d: u%p c%p\n",
+                           prefix, node->debug_id, node->ptr, node->cookie);
+                break;
+        case BINDER_WORK_DEAD_BINDER:
+                seq_printf(m, "%shas dead binder\n", prefix);
+                break;
+        case BINDER_WORK_DEAD_BINDER_AND_CLEAR:
+                seq_printf(m, "%shas cleared dead binder\n", prefix);
+                break;
+        case BINDER_WORK_CLEAR_DEATH_NOTIFICATION:
+                seq_printf(m, "%shas cleared death notification\n", prefix);
+                break;
+        default:
+                seq_printf(m, "%sunknown work: type %d\n", prefix, w->type);
+                break;
+        }
+}
+
+static void print_binder_thread(struct seq_file *m,
+                                struct binder_thread *thread,
+                                int print_always)
+{
+        struct binder_transaction *t;
+        struct binder_work *w;
+        size_t start_pos = m->count;
+        size_t header_pos;
+
+        seq_printf(m, "  thread %d: l %02x\n", thread->pid, thread->looper);
+        header_pos = m->count;
+        t = thread->transaction_stack;
+        while (t) {
+                if (t->from == thread) {
+                        print_binder_transaction(m,
+                                                 "    outgoing transaction", t);
+                        t = t->from_parent;
+                } else if (t->to_thread == thread) {
+                        print_binder_transaction(m,
+                                                 "    incoming transaction", t);
+                        t = t->to_parent;
+                } else {
+                        print_binder_transaction(m, "    bad transaction", t);
+                        t = NULL;
+                }
+        }
+        list_for_each_entry(w, &thread->todo, entry) {
+                print_binder_work(m, "    ", "    pending transaction", w);
+        }
+        if (!print_always && m->count == header_pos)
+                m->count = start_pos;
+}
+
+static void print_binder_node(struct seq_file *m, struct binder_node *node)
+{
+        struct binder_ref *ref;
+        struct hlist_node *pos;
+        struct binder_work *w;
+        int count;
+
+        count = 0;
+        hlist_for_each_entry(ref, pos, &node->refs, node_entry)
+                count++;
+
+        seq_printf(m, "  node %d: u%p c%p hs %d hw %d ls %d lw %d is %d iw %d",
+                   node->debug_id, node->ptr, node->cookie,
+                   node->has_strong_ref, node->has_weak_ref,
+                   node->local_strong_refs, node->local_weak_refs,
+                   node->internal_strong_refs, count);
+        if (count) {
+                seq_puts(m, " proc");
+                hlist_for_each_entry(ref, pos, &node->refs, node_entry)
+                        seq_printf(m, " %d", ref->proc->pid);
+        }
+        seq_puts(m, "\n");
+        list_for_each_entry(w, &node->async_todo, entry)
+                print_binder_work(m, "    ",
+                                  "    pending async transaction", w);
+}
+
+static void print_binder_ref(struct seq_file *m, struct binder_ref *ref)
+{
+        seq_printf(m, "  ref %d: desc %d %snode %d s %d w %d d %p\n",
+                   ref->debug_id, ref->desc, ref->node->proc ? "" : "dead ",
+                   ref->node->debug_id, ref->strong, ref->weak, ref->death);
+}
+
+static void print_binder_proc(struct seq_file *m,
+                              struct binder_proc *proc, int print_all)
+{
+        struct binder_work *w;
+        struct rb_node *n;
+        size_t start_pos = m->count;
+        size_t header_pos;
+
+        seq_printf(m, "proc %d\n", proc->pid);
+        header_pos = m->count;
+
+        for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n))
+                print_binder_thread(m, rb_entry(n, struct binder_thread,
+                                                rb_node), print_all);
+        for (n = rb_first(&proc->nodes); n != NULL; n = rb_next(n)) {
+                struct binder_node *node = rb_entry(n, struct binder_node,
+                                                    rb_node);
+                if (print_all || node->has_async_transaction)
+                        print_binder_node(m, node);
+        }
+        if (print_all) {
+                for (n = rb_first(&proc->refs_by_desc);
+                     n != NULL;
+                     n = rb_next(n))
+                        print_binder_ref(m, rb_entry(n, struct binder_ref,
+                                                     rb_node_desc));
+        }
+        for (n = rb_first(&proc->allocated_buffers); n != NULL; n = rb_next(n))
+                print_binder_buffer(m, "  buffer",
+                                    rb_entry(n, struct binder_buffer, rb_node));
+        list_for_each_entry(w, &proc->todo, entry)
+                print_binder_work(m, "  ", "  pending transaction", w);
+        list_for_each_entry(w, &proc->delivered_death, entry) {
+                seq_puts(m, "  has delivered dead binder\n");
+                break;
+        }
+        if (!print_all && m->count == header_pos)
+                m->count = start_pos;
+}
+
+static const char *binder_return_strings[] = {
+        "BR_ERROR",
+        "BR_OK",
+        "BR_TRANSACTION",
+        "BR_REPLY",
+        "BR_ACQUIRE_RESULT",
+        "BR_DEAD_REPLY",
+        "BR_TRANSACTION_COMPLETE",
+        "BR_INCREFS",
+        "BR_ACQUIRE",
+        "BR_RELEASE",
+        "BR_DECREFS",
+        "BR_ATTEMPT_ACQUIRE",
+        "BR_NOOP",
+        "BR_SPAWN_LOOPER",
+        "BR_FINISHED",
+        "BR_DEAD_BINDER",
+        "BR_CLEAR_DEATH_NOTIFICATION_DONE",
+        "BR_FAILED_REPLY"
+};
+
+static const char *binder_command_strings[] = {
+        "BC_TRANSACTION",
+        "BC_REPLY",
+        "BC_ACQUIRE_RESULT",
+        "BC_FREE_BUFFER",
+        "BC_INCREFS",
+        "BC_ACQUIRE",
+        "BC_RELEASE",
+        "BC_DECREFS",
+        "BC_INCREFS_DONE",
+        "BC_ACQUIRE_DONE",
+        "BC_ATTEMPT_ACQUIRE",
+        "BC_REGISTER_LOOPER",
+        "BC_ENTER_LOOPER",
+        "BC_EXIT_LOOPER",
+        "BC_REQUEST_DEATH_NOTIFICATION",
+        "BC_CLEAR_DEATH_NOTIFICATION",
+        "BC_DEAD_BINDER_DONE"
+};
+
+static const char *binder_objstat_strings[] = {
+        "proc",
+        "thread",
+        "node",
+        "ref",
+        "death",
+        "transaction",
+        "transaction_complete"
+};
+
+static void print_binder_stats(struct seq_file *m, const char *prefix,
+                               struct binder_stats *stats)
+{
+        int i;
+
+        BUILD_BUG_ON(ARRAY_SIZE(stats->bc) !=
+                     ARRAY_SIZE(binder_command_strings));
+        for (i = 0; i < ARRAY_SIZE(stats->bc); i++) {
+                if (stats->bc[i])
+                        seq_printf(m, "%s%s: %d\n", prefix,
+                                   binder_command_strings[i], stats->bc[i]);
+        }
+
+        BUILD_BUG_ON(ARRAY_SIZE(stats->br) !=
+                     ARRAY_SIZE(binder_return_strings));
+        for (i = 0; i < ARRAY_SIZE(stats->br); i++) {
+                if (stats->br[i])
+                        seq_printf(m, "%s%s: %d\n", prefix,
+                                   binder_return_strings[i], stats->br[i]);
+        }
+
+        BUILD_BUG_ON(ARRAY_SIZE(stats->obj_created) !=
+                     ARRAY_SIZE(binder_objstat_strings));
+        BUILD_BUG_ON(ARRAY_SIZE(stats->obj_created) !=
+                     ARRAY_SIZE(stats->obj_deleted));
+        for (i = 0; i < ARRAY_SIZE(stats->obj_created); i++) {
+                if (stats->obj_created[i] || stats->obj_deleted[i])
+                        seq_printf(m, "%s%s: active %d total %d\n", prefix,
+                                binder_objstat_strings[i],
+                                stats->obj_created[i] - stats->obj_deleted[i],
+                                stats->obj_created[i]);
+        }
+}
+
+static void print_binder_proc_stats(struct seq_file *m,
+                                    struct binder_proc *proc)
+{
+        struct binder_work *w;
+        struct rb_node *n;
+        int count, strong, weak;
+
+        seq_printf(m, "proc %d\n", proc->pid);
+        count = 0;
+        for (n = rb_first(&proc->threads); n != NULL; n = rb_next(n))
+                count++;
+        seq_printf(m, "  threads: %d\n", count);
+        seq_printf(m, "  requested threads: %d+%d/%d\n"
+                        "  ready threads %d\n"
+                        "  free async space %zd\n", proc->requested_threads,
+                        proc->requested_threads_started, proc->max_threads,
+                        proc->ready_threads, proc->free_async_space);
+        count = 0;
+        for (n = rb_first(&proc->nodes); n != NULL; n = rb_next(n))
+                count++;
+        seq_printf(m, "  nodes: %d\n", count);
+        count = 0;
+        strong = 0;
+        weak = 0;
+        for (n = rb_first(&proc->refs_by_desc); n != NULL; n = rb_next(n)) {
+                struct binder_ref *ref = rb_entry(n, struct binder_ref,
+                                                  rb_node_desc);
+                count++;
+                strong += ref->strong;
+                weak += ref->weak;
+        }
+        seq_printf(m, "  refs: %d s %d w %d\n", count, strong, weak);
+
+        count = 0;
+        for (n = rb_first(&proc->allocated_buffers); n != NULL; n = rb_next(n))
+                count++;
+        seq_printf(m, "  buffers: %d\n", count);
+
+        count = 0;
+        list_for_each_entry(w, &proc->todo, entry) {
+                switch (w->type) {
+                case BINDER_WORK_TRANSACTION:
+                        count++;
+                        break;
+                default:
+                        break;
+                }
+        }
+        seq_printf(m, "  pending transactions: %d\n", count);
+
+        print_binder_stats(m, "  ", &proc->stats);
+}
+
+
+static int binder_state_show(struct seq_file *m, void *unused)
+{
+        struct binder_proc *proc;
+        struct hlist_node *pos;
+        struct binder_node *node;
+        int do_lock = !binder_debug_no_lock;
+
+        if (do_lock)
+                mutex_lock(&binder_lock);
+
+        seq_puts(m, "binder state:\n");
+
+        if (!hlist_empty(&binder_dead_nodes))
+                seq_puts(m, "dead nodes:\n");
+        hlist_for_each_entry(node, pos, &binder_dead_nodes, dead_node)
+                print_binder_node(m, node);
+
+        hlist_for_each_entry(proc, pos, &binder_procs, proc_node)
+                print_binder_proc(m, proc, 1);
+        if (do_lock)
+                mutex_unlock(&binder_lock);
+        return 0;
+}
+
+static int binder_stats_show(struct seq_file *m, void *unused)
+{
+        struct binder_proc *proc;
+        struct hlist_node *pos;
+        int do_lock = !binder_debug_no_lock;
+
+        if (do_lock)
+                mutex_lock(&binder_lock);
+
+        seq_puts(m, "binder stats:\n");
+
+        print_binder_stats(m, "", &binder_stats);
+
+        hlist_for_each_entry(proc, pos, &binder_procs, proc_node)
+                print_binder_proc_stats(m, proc);
+        if (do_lock)
+                mutex_unlock(&binder_lock);
+        return 0;
+}
+
+static int binder_transactions_show(struct seq_file *m, void *unused)
+{
+        struct binder_proc *proc;
+        struct hlist_node *pos;
+        int do_lock = !binder_debug_no_lock;
+
+        if (do_lock)
+                mutex_lock(&binder_lock);
+
+        seq_puts(m, "binder transactions:\n");
+        hlist_for_each_entry(proc, pos, &binder_procs, proc_node)
+                print_binder_proc(m, proc, 0);
+        if (do_lock)
+                mutex_unlock(&binder_lock);
+        return 0;
+}
+
+static int binder_proc_show(struct seq_file *m, void *unused)
+{
+        struct binder_proc *proc = m->private;
+        int do_lock = !binder_debug_no_lock;
+
+        if (do_lock)
+                mutex_lock(&binder_lock);
+        seq_puts(m, "binder proc state:\n");
+        print_binder_proc(m, proc, 1);
+        if (do_lock)
+                mutex_unlock(&binder_lock);
+        return 0;
+}
+
+static void print_binder_transaction_log_entry(struct seq_file *m,
+                                        struct binder_transaction_log_entry *e)
+{
+        seq_printf(m,
+                   "%d: %s from %d:%d to %d:%d node %d handle %d size %d:%d\n",
+                   e->debug_id, (e->call_type == 2) ? "reply" :
+                   ((e->call_type == 1) ? "async" : "call "), e->from_proc,
+                   e->from_thread, e->to_proc, e->to_thread, e->to_node,
+                   e->target_handle, e->data_size, e->offsets_size);
+}
+
+static int binder_transaction_log_show(struct seq_file *m, void *unused)
+{
+        struct binder_transaction_log *log = m->private;
+        int i;
+
+        if (log->full) {
+                for (i = log->next; i < ARRAY_SIZE(log->entry); i++)
+                        print_binder_transaction_log_entry(m, &log->entry[i]);
+        }
+        for (i = 0; i < log->next; i++)
+                print_binder_transaction_log_entry(m, &log->entry[i]);
+        return 0;
+}
+
+static const struct file_operations binder_fops = {
+        .owner = THIS_MODULE,
+        .poll = binder_poll,
+        .unlocked_ioctl = binder_ioctl,
+        .mmap = binder_mmap,
+        .open = binder_open,
+        .flush = binder_flush,
+        .release = binder_release,
+};
+
+static struct miscdevice binder_miscdev = {
+        .minor = MISC_DYNAMIC_MINOR,
+        .name = "binder",
+        .fops = &binder_fops
+};
+
+BINDER_DEBUG_ENTRY(state);
+BINDER_DEBUG_ENTRY(stats);
+BINDER_DEBUG_ENTRY(transactions);
+BINDER_DEBUG_ENTRY(transaction_log);
+
+static int __init binder_init(void)
+{
+        int ret;
+
+        binder_deferred_workqueue = create_singlethread_workqueue("binder");
+        if (!binder_deferred_workqueue)
+                return -ENOMEM;
+
+        binder_debugfs_dir_entry_root = debugfs_create_dir("binder", NULL);
+        if (binder_debugfs_dir_entry_root)
+                binder_debugfs_dir_entry_proc = debugfs_create_dir("proc",
+                                                 binder_debugfs_dir_entry_root);
+        ret = misc_register(&binder_miscdev);
+        if (binder_debugfs_dir_entry_root) {
+                debugfs_create_file("state",
+                                    S_IRUGO,
+                                    binder_debugfs_dir_entry_root,
+                                    NULL,
+                                    &binder_state_fops);
+                debugfs_create_file("stats",
+                                    S_IRUGO,
+                                    binder_debugfs_dir_entry_root,
+                                    NULL,
+                                    &binder_stats_fops);
+                debugfs_create_file("transactions",
+                                    S_IRUGO,
+                                    binder_debugfs_dir_entry_root,
+                                    NULL,
+                                    &binder_transactions_fops);
+                debugfs_create_file("transaction_log",
+                                    S_IRUGO,
+                                    binder_debugfs_dir_entry_root,
+                                    &binder_transaction_log,
+                                    &binder_transaction_log_fops);
+                debugfs_create_file("failed_transaction_log",
+                                    S_IRUGO,
+                                    binder_debugfs_dir_entry_root,
+                                    &binder_transaction_log_failed,
+                                    &binder_transaction_log_fops);
+        }
+        return ret;
+}
+
+device_initcall(binder_init);
+
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/android/binder.h b/drivers/staging/android/binder.h
new file mode 100644
index 000000000000..25ab6f2759e9
--- /dev/null
+++ b/drivers/staging/android/binder.h
@@ -0,0 +1,330 @@
+/*
+ * Copyright (C) 2008 Google, Inc.
+ *
+ * Based on, but no longer compatible with, the original
+ * OpenBinder.org binder driver interface, which is:
+ *
+ * Copyright (c) 2005 Palmsource, 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 _LINUX_BINDER_H
+#define _LINUX_BINDER_H
+
+#include <linux/ioctl.h>
+
+#define B_PACK_CHARS(c1, c2, c3, c4) \
+        ((((c1)<<24)) | (((c2)<<16)) | (((c3)<<8)) | (c4))
+#define B_TYPE_LARGE 0x85
+
+enum {
+        BINDER_TYPE_BINDER      = B_PACK_CHARS('s', 'b', '*', B_TYPE_LARGE),
+        BINDER_TYPE_WEAK_BINDER = B_PACK_CHARS('w', 'b', '*', B_TYPE_LARGE),
+        BINDER_TYPE_HANDLE      = B_PACK_CHARS('s', 'h', '*', B_TYPE_LARGE),
+        BINDER_TYPE_WEAK_HANDLE = B_PACK_CHARS('w', 'h', '*', B_TYPE_LARGE),
+        BINDER_TYPE_FD          = B_PACK_CHARS('f', 'd', '*', B_TYPE_LARGE),
+};
+
+enum {
+        FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,
+        FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,
+};
+
+/*
+ * This is the flattened representation of a Binder object for transfer
+ * between processes.  The 'offsets' supplied as part of a binder transaction
+ * contains offsets into the data where these structures occur.  The Binder
+ * driver takes care of re-writing the structure type and data as it moves
+ * between processes.
+ */
+struct flat_binder_object {
+        /* 8 bytes for large_flat_header. */
+        unsigned long           type;
+        unsigned long           flags;
+
+        /* 8 bytes of data. */
+        union {
+                void            *binder;        /* local object */
+                signed long     handle;         /* remote object */
+        };
+
+        /* extra data associated with local object */
+        void                    *cookie;
+};
+
+/*
+ * On 64-bit platforms where user code may run in 32-bits the driver must
+ * translate the buffer (and local binder) addresses apropriately.
+ */
+
+struct binder_write_read {
+        signed long     write_size;     /* bytes to write */
+        signed long     write_consumed; /* bytes consumed by driver */
+        unsigned long   write_buffer;
+        signed long     read_size;      /* bytes to read */
+        signed long     read_consumed;  /* bytes consumed by driver */
+        unsigned long   read_buffer;
+};
+
+/* Use with BINDER_VERSION, driver fills in fields. */
+struct binder_version {
+        /* driver protocol version -- increment with incompatible change */
+        signed long     protocol_version;
+};
+
+/* This is the current protocol version. */
+#define BINDER_CURRENT_PROTOCOL_VERSION 7
+
+#define BINDER_WRITE_READ               _IOWR('b', 1, struct binder_write_read)
+#define BINDER_SET_IDLE_TIMEOUT         _IOW('b', 3, int64_t)
+#define BINDER_SET_MAX_THREADS          _IOW('b', 5, size_t)
+#define BINDER_SET_IDLE_PRIORITY        _IOW('b', 6, int)
+#define BINDER_SET_CONTEXT_MGR          _IOW('b', 7, int)
+#define BINDER_THREAD_EXIT              _IOW('b', 8, int)
+#define BINDER_VERSION                  _IOWR('b', 9, struct binder_version)
+
+/*
+ * NOTE: Two special error codes you should check for when calling
+ * in to the driver are:
+ *
+ * EINTR -- The operation has been interupted.  This should be
+ * handled by retrying the ioctl() until a different error code
+ * is returned.
+ *
+ * ECONNREFUSED -- The driver is no longer accepting operations
+ * from your process.  That is, the process is being destroyed.
+ * You should handle this by exiting from your process.  Note
+ * that once this error code is returned, all further calls to
+ * the driver from any thread will return this same code.
+ */
+
+enum transaction_flags {
+        TF_ONE_WAY      = 0x01, /* this is a one-way call: async, no return */
+        TF_ROOT_OBJECT  = 0x04, /* contents are the component's root object */
+        TF_STATUS_CODE  = 0x08, /* contents are a 32-bit status code */
+        TF_ACCEPT_FDS   = 0x10, /* allow replies with file descriptors */
+};
+
+struct binder_transaction_data {
+        /* The first two are only used for bcTRANSACTION and brTRANSACTION,
+         * identifying the target and contents of the transaction.
+         */
+        union {
+                size_t  handle; /* target descriptor of command transaction */
+                void    *ptr;   /* target descriptor of return transaction */
+        } target;
+        void            *cookie;        /* target object cookie */
+        unsigned int    code;           /* transaction command */
+
+        /* General information about the transaction. */
+        unsigned int    flags;
+        pid_t           sender_pid;
+        uid_t           sender_euid;
+        size_t          data_size;      /* number of bytes of data */
+        size_t          offsets_size;   /* number of bytes of offsets */
+
+        /* If this transaction is inline, the data immediately
+         * follows here; otherwise, it ends with a pointer to
+         * the data buffer.
+         */
+        union {
+                struct {
+                        /* transaction data */
+                        const void      *buffer;
+                        /* offsets from buffer to flat_binder_object structs */
+                        const void      *offsets;
+                } ptr;
+                uint8_t buf[8];
+        } data;
+};
+
+struct binder_ptr_cookie {
+        void *ptr;
+        void *cookie;
+};
+
+struct binder_pri_desc {
+        int priority;
+        int desc;
+};
+
+struct binder_pri_ptr_cookie {
+        int priority;
+        void *ptr;
+        void *cookie;
+};
+
+enum BinderDriverReturnProtocol {
+        BR_ERROR = _IOR('r', 0, int),
+        /*
+         * int: error code
+         */
+
+        BR_OK = _IO('r', 1),
+        /* No parameters! */
+
+        BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),
+        BR_REPLY = _IOR('r', 3, struct binder_transaction_data),
+        /*
+         * binder_transaction_data: the received command.
+         */
+
+        BR_ACQUIRE_RESULT = _IOR('r', 4, int),
+        /*
+         * not currently supported
+         * int: 0 if the last bcATTEMPT_ACQUIRE was not successful.
+         * Else the remote object has acquired a primary reference.
+         */
+
+        BR_DEAD_REPLY = _IO('r', 5),
+        /*
+         * The target of the last transaction (either a bcTRANSACTION or
+         * a bcATTEMPT_ACQUIRE) is no longer with us.  No parameters.
+         */
+
+        BR_TRANSACTION_COMPLETE = _IO('r', 6),
+        /*
+         * No parameters... always refers to the last transaction requested
+         * (including replies).  Note that this will be sent even for
+         * asynchronous transactions.
+         */
+
+        BR_INCREFS = _IOR('r', 7, struct binder_ptr_cookie),
+        BR_ACQUIRE = _IOR('r', 8, struct binder_ptr_cookie),
+        BR_RELEASE = _IOR('r', 9, struct binder_ptr_cookie),
+        BR_DECREFS = _IOR('r', 10, struct binder_ptr_cookie),
+        /*
+         * void *:      ptr to binder
+         * void *: cookie for binder
+         */
+
+        BR_ATTEMPT_ACQUIRE = _IOR('r', 11, struct binder_pri_ptr_cookie),
+        /*
+         * not currently supported
+         * int: priority
+         * void *: ptr to binder
+         * void *: cookie for binder
+         */
+
+        BR_NOOP = _IO('r', 12),
+        /*
+         * No parameters.  Do nothing and examine the next command.  It exists
+         * primarily so that we can replace it with a BR_SPAWN_LOOPER command.
+         */
+
+        BR_SPAWN_LOOPER = _IO('r', 13),
+        /*
+         * No parameters.  The driver has determined that a process has no
+         * threads waiting to service incomming transactions.  When a process
+         * receives this command, it must spawn a new service thread and
+         * register it via bcENTER_LOOPER.
+         */
+
+        BR_FINISHED = _IO('r', 14),
+        /*
+         * not currently supported
+         * stop threadpool thread
+         */
+
+        BR_DEAD_BINDER = _IOR('r', 15, void *),
+        /*
+         * void *: cookie
+         */
+        BR_CLEAR_DEATH_NOTIFICATION_DONE = _IOR('r', 16, void *),
+        /*
+         * void *: cookie
+         */
+
+        BR_FAILED_REPLY = _IO('r', 17),
+        /*
+         * The the last transaction (either a bcTRANSACTION or
+         * a bcATTEMPT_ACQUIRE) failed (e.g. out of memory).  No parameters.
+         */
+};
+
+enum BinderDriverCommandProtocol {
+        BC_TRANSACTION = _IOW('c', 0, struct binder_transaction_data),
+        BC_REPLY = _IOW('c', 1, struct binder_transaction_data),
+        /*
+         * binder_transaction_data: the sent command.
+         */
+
+        BC_ACQUIRE_RESULT = _IOW('c', 2, int),
+        /*
+         * not currently supported
+         * int:  0 if the last BR_ATTEMPT_ACQUIRE was not successful.
+         * Else you have acquired a primary reference on the object.
+         */
+
+        BC_FREE_BUFFER = _IOW('c', 3, int),
+        /*
+         * void *: ptr to transaction data received on a read
+         */
+
+        BC_INCREFS = _IOW('c', 4, int),
+        BC_ACQUIRE = _IOW('c', 5, int),
+        BC_RELEASE = _IOW('c', 6, int),
+        BC_DECREFS = _IOW('c', 7, int),
+        /*
+         * int: descriptor
+         */
+
+        BC_INCREFS_DONE = _IOW('c', 8, struct binder_ptr_cookie),
+        BC_ACQUIRE_DONE = _IOW('c', 9, struct binder_ptr_cookie),
+        /*
+         * void *: ptr to binder
+         * void *: cookie for binder
+         */
+
+        BC_ATTEMPT_ACQUIRE = _IOW('c', 10, struct binder_pri_desc),
+        /*
+         * not currently supported
+         * int: priority
+         * int: descriptor
+         */
+
+        BC_REGISTER_LOOPER = _IO('c', 11),
+        /*
+         * No parameters.
+         * Register a spawned looper thread with the device.
+         */
+
+        BC_ENTER_LOOPER = _IO('c', 12),
+        BC_EXIT_LOOPER = _IO('c', 13),
+        /*
+         * No parameters.
+         * These two commands are sent as an application-level thread
+         * enters and exits the binder loop, respectively.  They are
+         * used so the binder can have an accurate count of the number
+         * of looping threads it has available.
+         */
+
+        BC_REQUEST_DEATH_NOTIFICATION = _IOW('c', 14, struct binder_ptr_cookie),
+        /*
+         * void *: ptr to binder
+         * void *: cookie
+         */
+
+        BC_CLEAR_DEATH_NOTIFICATION = _IOW('c', 15, struct binder_ptr_cookie),
+        /*
+         * void *: ptr to binder
+         * void *: cookie
+         */
+
+        BC_DEAD_BINDER_DONE = _IOW('c', 16, void *),
+        /*
+         * void *: cookie
+         */
+};
+
+#endif /* _LINUX_BINDER_H */
+
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c
new file mode 100644
index 000000000000..ffc2d043dd8e
--- /dev/null
+++ b/drivers/staging/android/logger.c
@@ -0,0 +1,616 @@
+/*
+ * drivers/misc/logger.c
+ *
+ * A Logging Subsystem
+ *
+ * Copyright (C) 2007-2008 Google, Inc.
+ *
+ * Robert Love <rlove@google.com>
+ *
+ * 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/sched.h>
+#include <linux/module.h>
+#include <linux/fs.h>
+#include <linux/miscdevice.h>
+#include <linux/uaccess.h>
+#include <linux/poll.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include "logger.h"
+
+#include <asm/ioctls.h>
+
+/*
+ * struct logger_log - represents a specific log, such as 'main' or 'radio'
+ *
+ * This structure lives from module insertion until module removal, so it does
+ * not need additional reference counting. The structure is protected by the
+ * mutex 'mutex'.
+ */
+struct logger_log {
+        unsigned char           *buffer;/* the ring buffer itself */
+        struct miscdevice       misc;   /* misc device representing the log */
+        wait_queue_head_t       wq;     /* wait queue for readers */
+        struct list_head        readers; /* this log's readers */
+        struct mutex            mutex;  /* mutex protecting buffer */
+        size_t                  w_off;  /* current write head offset */
+        size_t                  head;   /* new readers start here */
+        size_t                  size;   /* size of the log */
+};
+
+/*
+ * struct logger_reader - a logging device open for reading
+ *
+ * This object lives from open to release, so we don't need additional
+ * reference counting. The structure is protected by log->mutex.
+ */
+struct logger_reader {
+        struct logger_log       *log;   /* associated log */
+        struct list_head        list;   /* entry in logger_log's list */
+        size_t                  r_off;  /* current read head offset */
+};
+
+/* logger_offset - returns index 'n' into the log via (optimized) modulus */
+#define logger_offset(n)        ((n) & (log->size - 1))
+
+/*
+ * file_get_log - Given a file structure, return the associated log
+ *
+ * This isn't aesthetic. We have several goals:
+ *
+ *      1) Need to quickly obtain the associated log during an I/O operation
+ *      2) Readers need to maintain state (logger_reader)
+ *      3) Writers need to be very fast (open() should be a near no-op)
+ *
+ * In the reader case, we can trivially go file->logger_reader->logger_log.
+ * For a writer, we don't want to maintain a logger_reader, so we just go
+ * file->logger_log. Thus what file->private_data points at depends on whether
+ * or not the file was opened for reading. This function hides that dirtiness.
+ */
+static inline struct logger_log *file_get_log(struct file *file)
+{
+        if (file->f_mode & FMODE_READ) {
+                struct logger_reader *reader = file->private_data;
+                return reader->log;
+        } else
+                return file->private_data;
+}
+
+/*
+ * get_entry_len - Grabs the length of the payload of the next entry starting
+ * from 'off'.
+ *
+ * Caller needs to hold log->mutex.
+ */
+static __u32 get_entry_len(struct logger_log *log, size_t off)
+{
+        __u16 val;
+
+        switch (log->size - off) {
+        case 1:
+                memcpy(&val, log->buffer + off, 1);
+                memcpy(((char *) &val) + 1, log->buffer, 1);
+                break;
+        default:
+                memcpy(&val, log->buffer + off, 2);
+        }
+
+        return sizeof(struct logger_entry) + val;
+}
+
+/*
+ * do_read_log_to_user - reads exactly 'count' bytes from 'log' into the
+ * user-space buffer 'buf'. Returns 'count' on success.
+ *
+ * Caller must hold log->mutex.
+ */
+static ssize_t do_read_log_to_user(struct logger_log *log,
+                                   struct logger_reader *reader,
+                                   char __user *buf,
+                                   size_t count)
+{
+        size_t len;
+
+        /*
+         * We read from the log in two disjoint operations. First, we read from
+         * the current read head offset up to 'count' bytes or to the end of
+         * the log, whichever comes first.
+         */
+        len = min(count, log->size - reader->r_off);
+        if (copy_to_user(buf, log->buffer + reader->r_off, len))
+                return -EFAULT;
+
+        /*
+         * Second, we read any remaining bytes, starting back at the head of
+         * the log.
+         */
+        if (count != len)
+                if (copy_to_user(buf + len, log->buffer, count - len))
+                        return -EFAULT;
+
+        reader->r_off = logger_offset(reader->r_off + count);
+
+        return count;
+}
+
+/*
+ * logger_read - our log's read() method
+ *
+ * Behavior:
+ *
+ *      - O_NONBLOCK works
+ *      - If there are no log entries to read, blocks until log is written to
+ *      - Atomically reads exactly one log entry
+ *
+ * Optimal read size is LOGGER_ENTRY_MAX_LEN. Will set errno to EINVAL if read
+ * buffer is insufficient to hold next entry.
+ */
+static ssize_t logger_read(struct file *file, char __user *buf,
+                           size_t count, loff_t *pos)
+{
+        struct logger_reader *reader = file->private_data;
+        struct logger_log *log = reader->log;
+        ssize_t ret;
+        DEFINE_WAIT(wait);
+
+start:
+        while (1) {
+                prepare_to_wait(&log->wq, &wait, TASK_INTERRUPTIBLE);
+
+                mutex_lock(&log->mutex);
+                ret = (log->w_off == reader->r_off);
+                mutex_unlock(&log->mutex);
+                if (!ret)
+                        break;
+
+                if (file->f_flags & O_NONBLOCK) {
+                        ret = -EAGAIN;
+                        break;
+                }
+
+                if (signal_pending(current)) {
+                        ret = -EINTR;
+                        break;
+                }
+
+                schedule();
+        }
+
+        finish_wait(&log->wq, &wait);
+        if (ret)
+                return ret;
+
+        mutex_lock(&log->mutex);
+
+        /* is there still something to read or did we race? */
+        if (unlikely(log->w_off == reader->r_off)) {
+                mutex_unlock(&log->mutex);
+                goto start;
+        }
+
+        /* get the size of the next entry */
+        ret = get_entry_len(log, reader->r_off);
+        if (count < ret) {
+                ret = -EINVAL;
+                goto out;
+        }
+
+        /* get exactly one entry from the log */
+        ret = do_read_log_to_user(log, reader, buf, ret);
+
+out:
+        mutex_unlock(&log->mutex);
+
+        return ret;
+}
+
+/*
+ * get_next_entry - return the offset of the first valid entry at least 'len'
+ * bytes after 'off'.
+ *
+ * Caller must hold log->mutex.
+ */
+static size_t get_next_entry(struct logger_log *log, size_t off, size_t len)
+{
+        size_t count = 0;
+
+        do {
+                size_t nr = get_entry_len(log, off);
+                off = logger_offset(off + nr);
+                count += nr;
+        } while (count < len);
+
+        return off;
+}
+
+/*
+ * clock_interval - is a < c < b in mod-space? Put another way, does the line
+ * from a to b cross c?
+ */
+static inline int clock_interval(size_t a, size_t b, size_t c)
+{
+        if (b < a) {
+                if (a < c || b >= c)
+                        return 1;
+        } else {
+                if (a < c && b >= c)
+                        return 1;
+        }
+
+        return 0;
+}
+
+/*
+ * fix_up_readers - walk the list of all readers and "fix up" any who were
+ * lapped by the writer; also do the same for the default "start head".
+ * We do this by "pulling forward" the readers and start head to the first
+ * entry after the new write head.
+ *
+ * The caller needs to hold log->mutex.
+ */
+static void fix_up_readers(struct logger_log *log, size_t len)
+{
+        size_t old = log->w_off;
+        size_t new = logger_offset(old + len);
+        struct logger_reader *reader;
+
+        if (clock_interval(old, new, log->head))
+                log->head = get_next_entry(log, log->head, len);
+
+        list_for_each_entry(reader, &log->readers, list)
+                if (clock_interval(old, new, reader->r_off))
+                        reader->r_off = get_next_entry(log, reader->r_off, len);
+}
+
+/*
+ * do_write_log - writes 'len' bytes from 'buf' to 'log'
+ *
+ * The caller needs to hold log->mutex.
+ */
+static void do_write_log(struct logger_log *log, const void *buf, size_t count)
+{
+        size_t len;
+
+        len = min(count, log->size - log->w_off);
+        memcpy(log->buffer + log->w_off, buf, len);
+
+        if (count != len)
+                memcpy(log->buffer, buf + len, count - len);
+
+        log->w_off = logger_offset(log->w_off + count);
+
+}
+
+/*
+ * do_write_log_user - writes 'len' bytes from the user-space buffer 'buf' to
+ * the log 'log'
+ *
+ * The caller needs to hold log->mutex.
+ *
+ * Returns 'count' on success, negative error code on failure.
+ */
+static ssize_t do_write_log_from_user(struct logger_log *log,
+                                      const void __user *buf, size_t count)
+{
+        size_t len;
+
+        len = min(count, log->size - log->w_off);
+        if (len && copy_from_user(log->buffer + log->w_off, buf, len))
+                return -EFAULT;
+
+        if (count != len)
+                if (copy_from_user(log->buffer, buf + len, count - len))
+                        return -EFAULT;
+
+        log->w_off = logger_offset(log->w_off + count);
+
+        return count;
+}
+
+/*
+ * logger_aio_write - our write method, implementing support for write(),
+ * writev(), and aio_write(). Writes are our fast path, and we try to optimize
+ * them above all else.
+ */
+ssize_t logger_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                         unsigned long nr_segs, loff_t ppos)
+{
+        struct logger_log *log = file_get_log(iocb->ki_filp);
+        size_t orig = log->w_off;
+        struct logger_entry header;
+        struct timespec now;
+        ssize_t ret = 0;
+
+        now = current_kernel_time();
+
+        header.pid = current->tgid;
+        header.tid = current->pid;
+        header.sec = now.tv_sec;
+        header.nsec = now.tv_nsec;
+        header.len = min_t(size_t, iocb->ki_left, LOGGER_ENTRY_MAX_PAYLOAD);
+
+        /* null writes succeed, return zero */
+        if (unlikely(!header.len))
+                return 0;
+
+        mutex_lock(&log->mutex);
+
+        /*
+         * Fix up any readers, pulling them forward to the first readable
+         * entry after (what will be) the new write offset. We do this now
+         * because if we partially fail, we can end up with clobbered log
+         * entries that encroach on readable buffer.
+         */
+        fix_up_readers(log, sizeof(struct logger_entry) + header.len);
+
+        do_write_log(log, &header, sizeof(struct logger_entry));
+
+        while (nr_segs-- > 0) {
+                size_t len;
+                ssize_t nr;
+
+                /* figure out how much of this vector we can keep */
+                len = min_t(size_t, iov->iov_len, header.len - ret);
+
+                /* write out this segment's payload */
+                nr = do_write_log_from_user(log, iov->iov_base, len);
+                if (unlikely(nr < 0)) {
+                        log->w_off = orig;
+                        mutex_unlock(&log->mutex);
+                        return nr;
+                }
+
+                iov++;
+                ret += nr;
+        }
+
+        mutex_unlock(&log->mutex);
+
+        /* wake up any blocked readers */
+        wake_up_interruptible(&log->wq);
+
+        return ret;
+}
+
+static struct logger_log *get_log_from_minor(int);
+
+/*
+ * logger_open - the log's open() file operation
+ *
+ * Note how near a no-op this is in the write-only case. Keep it that way!
+ */
+static int logger_open(struct inode *inode, struct file *file)
+{
+        struct logger_log *log;
+        int ret;
+
+        ret = nonseekable_open(inode, file);
+        if (ret)
+                return ret;
+
+        log = get_log_from_minor(MINOR(inode->i_rdev));
+        if (!log)
+                return -ENODEV;
+
+        if (file->f_mode & FMODE_READ) {
+                struct logger_reader *reader;
+
+                reader = kmalloc(sizeof(struct logger_reader), GFP_KERNEL);
+                if (!reader)
+                        return -ENOMEM;
+
+                reader->log = log;
+                INIT_LIST_HEAD(&reader->list);
+
+                mutex_lock(&log->mutex);
+                reader->r_off = log->head;
+                list_add_tail(&reader->list, &log->readers);
+                mutex_unlock(&log->mutex);
+
+                file->private_data = reader;
+        } else
+                file->private_data = log;
+
+        return 0;
+}
+
+/*
+ * logger_release - the log's release file operation
+ *
+ * Note this is a total no-op in the write-only case. Keep it that way!
+ */
+static int logger_release(struct inode *ignored, struct file *file)
+{
+        if (file->f_mode & FMODE_READ) {
+                struct logger_reader *reader = file->private_data;
+                list_del(&reader->list);
+                kfree(reader);
+        }
+
+        return 0;
+}
+
+/*
+ * logger_poll - the log's poll file operation, for poll/select/epoll
+ *
+ * Note we always return POLLOUT, because you can always write() to the log.
+ * Note also that, strictly speaking, a return value of POLLIN does not
+ * guarantee that the log is readable without blocking, as there is a small
+ * chance that the writer can lap the reader in the interim between poll()
+ * returning and the read() request.
+ */
+static unsigned int logger_poll(struct file *file, poll_table *wait)
+{
+        struct logger_reader *reader;
+        struct logger_log *log;
+        unsigned int ret = POLLOUT | POLLWRNORM;
+
+        if (!(file->f_mode & FMODE_READ))
+                return ret;
+
+        reader = file->private_data;
+        log = reader->log;
+
+        poll_wait(file, &log->wq, wait);
+
+        mutex_lock(&log->mutex);
+        if (log->w_off != reader->r_off)
+                ret |= POLLIN | POLLRDNORM;
+        mutex_unlock(&log->mutex);
+
+        return ret;
+}
+
+static long logger_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+{
+        struct logger_log *log = file_get_log(file);
+        struct logger_reader *reader;
+        long ret = -ENOTTY;
+
+        mutex_lock(&log->mutex);
+
+        switch (cmd) {
+        case LOGGER_GET_LOG_BUF_SIZE:
+                ret = log->size;
+                break;
+        case LOGGER_GET_LOG_LEN:
+                if (!(file->f_mode & FMODE_READ)) {
+                        ret = -EBADF;
+                        break;
+                }
+                reader = file->private_data;
+                if (log->w_off >= reader->r_off)
+                        ret = log->w_off - reader->r_off;
+                else
+                        ret = (log->size - reader->r_off) + log->w_off;
+                break;
+        case LOGGER_GET_NEXT_ENTRY_LEN:
+                if (!(file->f_mode & FMODE_READ)) {
+                        ret = -EBADF;
+                        break;
+                }
+                reader = file->private_data;
+                if (log->w_off != reader->r_off)
+                        ret = get_entry_len(log, reader->r_off);
+                else
+                        ret = 0;
+                break;
+        case LOGGER_FLUSH_LOG:
+                if (!(file->f_mode & FMODE_WRITE)) {
+                        ret = -EBADF;
+                        break;
+                }
+                list_for_each_entry(reader, &log->readers, list)
+                        reader->r_off = log->w_off;
+                log->head = log->w_off;
+                ret = 0;
+                break;
+        }
+
+        mutex_unlock(&log->mutex);
+
+        return ret;
+}
+
+static const struct file_operations logger_fops = {
+        .owner = THIS_MODULE,
+        .read = logger_read,
+        .aio_write = logger_aio_write,
+        .poll = logger_poll,
+        .unlocked_ioctl = logger_ioctl,
+        .compat_ioctl = logger_ioctl,
+        .open = logger_open,
+        .release = logger_release,
+};
+
+/*
+ * Defines a log structure with name 'NAME' and a size of 'SIZE' bytes, which
+ * must be a power of two, greater than LOGGER_ENTRY_MAX_LEN, and less than
+ * LONG_MAX minus LOGGER_ENTRY_MAX_LEN.
+ */
+#define DEFINE_LOGGER_DEVICE(VAR, NAME, SIZE) \
+static unsigned char _buf_ ## VAR[SIZE]; \
+static struct logger_log VAR = { \
+        .buffer = _buf_ ## VAR, \
+        .misc = { \
+                .minor = MISC_DYNAMIC_MINOR, \
+                .name = NAME, \
+                .fops = &logger_fops, \
+                .parent = NULL, \
+        }, \
+        .wq = __WAIT_QUEUE_HEAD_INITIALIZER(VAR .wq), \
+        .readers = LIST_HEAD_INIT(VAR .readers), \
+        .mutex = __MUTEX_INITIALIZER(VAR .mutex), \
+        .w_off = 0, \
+        .head = 0, \
+        .size = SIZE, \
+};
+
+DEFINE_LOGGER_DEVICE(log_main, LOGGER_LOG_MAIN, 256*1024)
+DEFINE_LOGGER_DEVICE(log_events, LOGGER_LOG_EVENTS, 256*1024)
+DEFINE_LOGGER_DEVICE(log_radio, LOGGER_LOG_RADIO, 256*1024)
+DEFINE_LOGGER_DEVICE(log_system, LOGGER_LOG_SYSTEM, 256*1024)
+
+static struct logger_log *get_log_from_minor(int minor)
+{
+        if (log_main.misc.minor == minor)
+                return &log_main;
+        if (log_events.misc.minor == minor)
+                return &log_events;
+        if (log_radio.misc.minor == minor)
+                return &log_radio;
+        if (log_system.misc.minor == minor)
+                return &log_system;
+        return NULL;
+}
+
+static int __init init_log(struct logger_log *log)
+{
+        int ret;
+
+        ret = misc_register(&log->misc);
+        if (unlikely(ret)) {
+                printk(KERN_ERR "logger: failed to register misc "
+                       "device for log '%s'!\n", log->misc.name);
+                return ret;
+        }
+
+        printk(KERN_INFO "logger: created %luK log '%s'\n",
+               (unsigned long) log->size >> 10, log->misc.name);
+
+        return 0;
+}
+
+static int __init logger_init(void)
+{
+        int ret;
+
+        ret = init_log(&log_main);
+        if (unlikely(ret))
+                goto out;
+
+        ret = init_log(&log_events);
+        if (unlikely(ret))
+                goto out;
+
+        ret = init_log(&log_radio);
+        if (unlikely(ret))
+                goto out;
+
+        ret = init_log(&log_system);
+        if (unlikely(ret))
+                goto out;
+
+out:
+        return ret;
+}
+device_initcall(logger_init);
diff --git a/drivers/staging/android/logger.h b/drivers/staging/android/logger.h
new file mode 100644
index 000000000000..2cb06e9d8f98
--- /dev/null
+++ b/drivers/staging/android/logger.h
@@ -0,0 +1,49 @@
+/* include/linux/logger.h
+ *
+ * Copyright (C) 2007-2008 Google, Inc.
+ * Author: Robert Love <rlove@android.com>
+ *
+ * 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 _LINUX_LOGGER_H
+#define _LINUX_LOGGER_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+struct logger_entry {
+        __u16           len;    /* length of the payload */
+        __u16           __pad;  /* no matter what, we get 2 bytes of padding */
+        __s32           pid;    /* generating process's pid */
+        __s32           tid;    /* generating process's tid */
+        __s32           sec;    /* seconds since Epoch */
+        __s32           nsec;   /* nanoseconds */
+        char            msg[0]; /* the entry's payload */
+};
+
+#define LOGGER_LOG_RADIO        "log_radio"     /* radio-related messages */
+#define LOGGER_LOG_EVENTS       "log_events"    /* system/hardware events */
+#define LOGGER_LOG_SYSTEM       "log_system"    /* system/framework messages */
+#define LOGGER_LOG_MAIN         "log_main"      /* everything else */
+
+#define LOGGER_ENTRY_MAX_LEN            (4*1024)
+#define LOGGER_ENTRY_MAX_PAYLOAD        \
+        (LOGGER_ENTRY_MAX_LEN - sizeof(struct logger_entry))
+
+#define __LOGGERIO      0xAE
+
+#define LOGGER_GET_LOG_BUF_SIZE         _IO(__LOGGERIO, 1) /* size of log */
+#define LOGGER_GET_LOG_LEN              _IO(__LOGGERIO, 2) /* used log len */
+#define LOGGER_GET_NEXT_ENTRY_LEN       _IO(__LOGGERIO, 3) /* next entry len */
+#define LOGGER_FLUSH_LOG                _IO(__LOGGERIO, 4) /* flush log */
+
+#endif /* _LINUX_LOGGER_H */
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
new file mode 100644
index 000000000000..2d8d2b796101
--- /dev/null
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -0,0 +1,219 @@
+/* drivers/misc/lowmemorykiller.c
+ *
+ * The lowmemorykiller driver lets user-space specify a set of memory thresholds
+ * where processes with a range of oom_adj values will get killed. Specify the
+ * minimum oom_adj values in /sys/module/lowmemorykiller/parameters/adj and the
+ * number of free pages in /sys/module/lowmemorykiller/parameters/minfree. Both
+ * files take a comma separated list of numbers in ascending order.
+ *
+ * For example, write "0,8" to /sys/module/lowmemorykiller/parameters/adj and
+ * "1024,4096" to /sys/module/lowmemorykiller/parameters/minfree to kill
+ * processes with a oom_adj value of 8 or higher when the free memory drops
+ * below 4096 pages and kill processes with a oom_adj value of 0 or higher
+ * when the free memory drops below 1024 pages.
+ *
+ * The driver considers memory used for caches to be free, but if a large
+ * percentage of the cached memory is locked this can be very inaccurate
+ * and processes may not get killed until the normal oom killer is triggered.
+ *
+ * Copyright (C) 2007-2008 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/module.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/oom.h>
+#include <linux/sched.h>
+#include <linux/profile.h>
+#include <linux/notifier.h>
+
+static uint32_t lowmem_debug_level = 2;
+static int lowmem_adj[6] = {
+        0,
+        1,
+        6,
+        12,
+};
+static int lowmem_adj_size = 4;
+static size_t lowmem_minfree[6] = {
+        3 * 512,        /* 6MB */
+        2 * 1024,       /* 8MB */
+        4 * 1024,       /* 16MB */
+        16 * 1024,      /* 64MB */
+};
+static int lowmem_minfree_size = 4;
+
+static struct task_struct *lowmem_deathpending;
+
+#define lowmem_print(level, x...)                       \
+        do {                                            \
+                if (lowmem_debug_level >= (level))      \
+                        printk(x);                      \
+        } while (0)
+
+static int
+task_notify_func(struct notifier_block *self, unsigned long val, void *data);
+
+static struct notifier_block task_nb = {
+        .notifier_call  = task_notify_func,
+};
+
+static int
+task_notify_func(struct notifier_block *self, unsigned long val, void *data)
+{
+        struct task_struct *task = data;
+        if (task == lowmem_deathpending) {
+                lowmem_deathpending = NULL;
+                task_handoff_unregister(&task_nb);
+        }
+        return NOTIFY_OK;
+}
+
+static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)
+{
+        struct task_struct *p;
+        struct task_struct *selected = NULL;
+        int rem = 0;
+        int tasksize;
+        int i;
+        int min_adj = OOM_ADJUST_MAX + 1;
+        int selected_tasksize = 0;
+        int selected_oom_adj;
+        int array_size = ARRAY_SIZE(lowmem_adj);
+        int other_free = global_page_state(NR_FREE_PAGES);
+        int other_file = global_page_state(NR_FILE_PAGES) -
+                                                global_page_state(NR_SHMEM);
+
+        /*
+         * If we already have a death outstanding, then
+         * bail out right away; indicating to vmscan
+         * that we have nothing further to offer on
+         * this pass.
+         *
+         * Note: Currently you need CONFIG_PROFILING
+         * for this to work correctly.
+         */
+        if (lowmem_deathpending)
+                return 0;
+
+        if (lowmem_adj_size < array_size)
+                array_size = lowmem_adj_size;
+        if (lowmem_minfree_size < array_size)
+                array_size = lowmem_minfree_size;
+        for (i = 0; i < array_size; i++) {
+                if (other_free < lowmem_minfree[i] &&
+                    other_file < lowmem_minfree[i]) {
+                        min_adj = lowmem_adj[i];
+                        break;
+                }
+        }
+        if (sc->nr_to_scan > 0)
+                lowmem_print(3, "lowmem_shrink %lu, %x, ofree %d %d, ma %d\n",
+                                sc->nr_to_scan, sc->gfp_mask, other_free,
+                                other_file, min_adj);
+        rem = global_page_state(NR_ACTIVE_ANON) +
+                global_page_state(NR_ACTIVE_FILE) +
+                global_page_state(NR_INACTIVE_ANON) +
+                global_page_state(NR_INACTIVE_FILE);
+        if (sc->nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) {
+                lowmem_print(5, "lowmem_shrink %lu, %x, return %d\n",
+                             sc->nr_to_scan, sc->gfp_mask, rem);
+                return rem;
+        }
+        selected_oom_adj = min_adj;
+
+        read_lock(&tasklist_lock);
+        for_each_process(p) {
+                struct mm_struct *mm;
+                struct signal_struct *sig;
+                int oom_adj;
+
+                task_lock(p);
+                mm = p->mm;
+                sig = p->signal;
+                if (!mm || !sig) {
+                        task_unlock(p);
+                        continue;
+                }
+                oom_adj = sig->oom_adj;
+                if (oom_adj < min_adj) {
+                        task_unlock(p);
+                        continue;
+                }
+                tasksize = get_mm_rss(mm);
+                task_unlock(p);
+                if (tasksize <= 0)
+                        continue;
+                if (selected) {
+                        if (oom_adj < selected_oom_adj)
+                                continue;
+                        if (oom_adj == selected_oom_adj &&
+                            tasksize <= selected_tasksize)
+                                continue;
+                }
+                selected = p;
+                selected_tasksize = tasksize;
+                selected_oom_adj = oom_adj;
+                lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n",
+                             p->pid, p->comm, oom_adj, tasksize);
+        }
+        if (selected) {
+                lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n",
+                             selected->pid, selected->comm,
+                             selected_oom_adj, selected_tasksize);
+                /*
+                 * If CONFIG_PROFILING is off, then task_handoff_register()
+                 * is a nop. In that case we don't want to stall the killer
+                 * by setting lowmem_deathpending.
+                 */
+#ifdef CONFIG_PROFILING
+                lowmem_deathpending = selected;
+                task_handoff_register(&task_nb);
+#endif
+                force_sig(SIGKILL, selected);
+                rem -= selected_tasksize;
+        }
+        lowmem_print(4, "lowmem_shrink %lu, %x, return %d\n",
+                     sc->nr_to_scan, sc->gfp_mask, rem);
+        read_unlock(&tasklist_lock);
+        return rem;
+}
+
+static struct shrinker lowmem_shrinker = {
+        .shrink = lowmem_shrink,
+        .seeks = DEFAULT_SEEKS * 16
+};
+
+static int __init lowmem_init(void)
+{
+        register_shrinker(&lowmem_shrinker);
+        return 0;
+}
+
+static void __exit lowmem_exit(void)
+{
+        unregister_shrinker(&lowmem_shrinker);
+}
+
+module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR);
+module_param_array_named(adj, lowmem_adj, int, &lowmem_adj_size,
+                         S_IRUGO | S_IWUSR);
+module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size,
+                         S_IRUGO | S_IWUSR);
+module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR);
+
+module_init(lowmem_init);
+module_exit(lowmem_exit);
+
+MODULE_LICENSE("GPL");
+
diff --git a/drivers/staging/android/pmem.c b/drivers/staging/android/pmem.c
new file mode 100644
index 000000000000..7d97032c6508
--- /dev/null
+++ b/drivers/staging/android/pmem.c
@@ -0,0 +1,1345 @@
+/* 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/android/ram_console.c b/drivers/staging/android/ram_console.c
new file mode 100644
index 000000000000..6d4d67924f22
--- /dev/null
+++ b/drivers/staging/android/ram_console.c
@@ -0,0 +1,443 @@
+/* drivers/android/ram_console.c
+ *
+ * Copyright (C) 2007-2008 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/console.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/proc_fs.h>
+#include <linux/string.h>
+#include <linux/uaccess.h>
+#include <linux/io.h>
+#include "ram_console.h"
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+#include <linux/rslib.h>
+#endif
+
+struct ram_console_buffer {
+        uint32_t    sig;
+        uint32_t    start;
+        uint32_t    size;
+        uint8_t     data[0];
+};
+
+#define RAM_CONSOLE_SIG (0x43474244) /* DBGC */
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT
+static char __initdata
+        ram_console_old_log_init_buffer[CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE];
+#endif
+static char *ram_console_old_log;
+static size_t ram_console_old_log_size;
+
+static struct ram_console_buffer *ram_console_buffer;
+static size_t ram_console_buffer_size;
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+static char *ram_console_par_buffer;
+static struct rs_control *ram_console_rs_decoder;
+static int ram_console_corrected_bytes;
+static int ram_console_bad_blocks;
+#define ECC_BLOCK_SIZE CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE
+#define ECC_SIZE CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE
+#define ECC_SYMSIZE CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE
+#define ECC_POLY CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL
+#endif
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+static void ram_console_encode_rs8(uint8_t *data, size_t len, uint8_t *ecc)
+{
+        int i;
+        uint16_t par[ECC_SIZE];
+        /* Initialize the parity buffer */
+        memset(par, 0, sizeof(par));
+        encode_rs8(ram_console_rs_decoder, data, len, par, 0);
+        for (i = 0; i < ECC_SIZE; i++)
+                ecc[i] = par[i];
+}
+
+static int ram_console_decode_rs8(void *data, size_t len, uint8_t *ecc)
+{
+        int i;
+        uint16_t par[ECC_SIZE];
+        for (i = 0; i < ECC_SIZE; i++)
+                par[i] = ecc[i];
+        return decode_rs8(ram_console_rs_decoder, data, par, len,
+                                NULL, 0, NULL, 0, NULL);
+}
+#endif
+
+static void ram_console_update(const char *s, unsigned int count)
+{
+        struct ram_console_buffer *buffer = ram_console_buffer;
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        uint8_t *buffer_end = buffer->data + ram_console_buffer_size;
+        uint8_t *block;
+        uint8_t *par;
+        int size = ECC_BLOCK_SIZE;
+#endif
+        memcpy(buffer->data + buffer->start, s, count);
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        block = buffer->data + (buffer->start & ~(ECC_BLOCK_SIZE - 1));
+        par = ram_console_par_buffer +
+              (buffer->start / ECC_BLOCK_SIZE) * ECC_SIZE;
+        do {
+                if (block + ECC_BLOCK_SIZE > buffer_end)
+                        size = buffer_end - block;
+                ram_console_encode_rs8(block, size, par);
+                block += ECC_BLOCK_SIZE;
+                par += ECC_SIZE;
+        } while (block < buffer->data + buffer->start + count);
+#endif
+}
+
+static void ram_console_update_header(void)
+{
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        struct ram_console_buffer *buffer = ram_console_buffer;
+        uint8_t *par;
+        par = ram_console_par_buffer +
+              DIV_ROUND_UP(ram_console_buffer_size, ECC_BLOCK_SIZE) * ECC_SIZE;
+        ram_console_encode_rs8((uint8_t *)buffer, sizeof(*buffer), par);
+#endif
+}
+
+static void
+ram_console_write(struct console *console, const char *s, unsigned int count)
+{
+        int rem;
+        struct ram_console_buffer *buffer = ram_console_buffer;
+
+        if (count > ram_console_buffer_size) {
+                s += count - ram_console_buffer_size;
+                count = ram_console_buffer_size;
+        }
+        rem = ram_console_buffer_size - buffer->start;
+        if (rem < count) {
+                ram_console_update(s, rem);
+                s += rem;
+                count -= rem;
+                buffer->start = 0;
+                buffer->size = ram_console_buffer_size;
+        }
+        ram_console_update(s, count);
+
+        buffer->start += count;
+        if (buffer->size < ram_console_buffer_size)
+                buffer->size += count;
+        ram_console_update_header();
+}
+
+static struct console ram_console = {
+        .name   = "ram",
+        .write  = ram_console_write,
+        .flags  = CON_PRINTBUFFER | CON_ENABLED,
+        .index  = -1,
+};
+
+void ram_console_enable_console(int enabled)
+{
+        if (enabled)
+                ram_console.flags |= CON_ENABLED;
+        else
+                ram_console.flags &= ~CON_ENABLED;
+}
+
+static void __init
+ram_console_save_old(struct ram_console_buffer *buffer, const char *bootinfo,
+        char *dest)
+{
+        size_t old_log_size = buffer->size;
+        size_t bootinfo_size = 0;
+        size_t total_size = old_log_size;
+        char *ptr;
+        const char *bootinfo_label = "Boot info:\n";
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        uint8_t *block;
+        uint8_t *par;
+        char strbuf[80];
+        int strbuf_len = 0;
+
+        block = buffer->data;
+        par = ram_console_par_buffer;
+        while (block < buffer->data + buffer->size) {
+                int numerr;
+                int size = ECC_BLOCK_SIZE;
+                if (block + size > buffer->data + ram_console_buffer_size)
+                        size = buffer->data + ram_console_buffer_size - block;
+                numerr = ram_console_decode_rs8(block, size, par);
+                if (numerr > 0) {
+#if 0
+                        printk(KERN_INFO "ram_console: error in block %p, %d\n",
+                               block, numerr);
+#endif
+                        ram_console_corrected_bytes += numerr;
+                } else if (numerr < 0) {
+#if 0
+                        printk(KERN_INFO "ram_console: uncorrectable error in "
+                               "block %p\n", block);
+#endif
+                        ram_console_bad_blocks++;
+                }
+                block += ECC_BLOCK_SIZE;
+                par += ECC_SIZE;
+        }
+        if (ram_console_corrected_bytes || ram_console_bad_blocks)
+                strbuf_len = snprintf(strbuf, sizeof(strbuf),
+                        "\n%d Corrected bytes, %d unrecoverable blocks\n",
+                        ram_console_corrected_bytes, ram_console_bad_blocks);
+        else
+                strbuf_len = snprintf(strbuf, sizeof(strbuf),
+                                      "\nNo errors detected\n");
+        if (strbuf_len >= sizeof(strbuf))
+                strbuf_len = sizeof(strbuf) - 1;
+        total_size += strbuf_len;
+#endif
+
+        if (bootinfo)
+                bootinfo_size = strlen(bootinfo) + strlen(bootinfo_label);
+        total_size += bootinfo_size;
+
+        if (dest == NULL) {
+                dest = kmalloc(total_size, GFP_KERNEL);
+                if (dest == NULL) {
+                        printk(KERN_ERR
+                               "ram_console: failed to allocate buffer\n");
+                        return;
+                }
+        }
+
+        ram_console_old_log = dest;
+        ram_console_old_log_size = total_size;
+        memcpy(ram_console_old_log,
+               &buffer->data[buffer->start], buffer->size - buffer->start);
+        memcpy(ram_console_old_log + buffer->size - buffer->start,
+               &buffer->data[0], buffer->start);
+        ptr = ram_console_old_log + old_log_size;
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        memcpy(ptr, strbuf, strbuf_len);
+        ptr += strbuf_len;
+#endif
+        if (bootinfo) {
+                memcpy(ptr, bootinfo_label, strlen(bootinfo_label));
+                ptr += strlen(bootinfo_label);
+                memcpy(ptr, bootinfo, bootinfo_size);
+                ptr += bootinfo_size;
+        }
+}
+
+static int __init ram_console_init(struct ram_console_buffer *buffer,
+                                   size_t buffer_size, const char *bootinfo,
+                                   char *old_buf)
+{
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        int numerr;
+        uint8_t *par;
+#endif
+        ram_console_buffer = buffer;
+        ram_console_buffer_size =
+                buffer_size - sizeof(struct ram_console_buffer);
+
+        if (ram_console_buffer_size > buffer_size) {
+                pr_err("ram_console: buffer %p, invalid size %zu, "
+                       "datasize %zu\n", buffer, buffer_size,
+                       ram_console_buffer_size);
+                return 0;
+        }
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION
+        ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size,
+                                                ECC_BLOCK_SIZE) + 1) * ECC_SIZE;
+
+        if (ram_console_buffer_size > buffer_size) {
+                pr_err("ram_console: buffer %p, invalid size %zu, "
+                       "non-ecc datasize %zu\n",
+                       buffer, buffer_size, ram_console_buffer_size);
+                return 0;
+        }
+
+        ram_console_par_buffer = buffer->data + ram_console_buffer_size;
+
+
+        /* first consecutive root is 0
+         * primitive element to generate roots = 1
+         */
+        ram_console_rs_decoder = init_rs(ECC_SYMSIZE, ECC_POLY, 0, 1, ECC_SIZE);
+        if (ram_console_rs_decoder == NULL) {
+                printk(KERN_INFO "ram_console: init_rs failed\n");
+                return 0;
+        }
+
+        ram_console_corrected_bytes = 0;
+        ram_console_bad_blocks = 0;
+
+        par = ram_console_par_buffer +
+              DIV_ROUND_UP(ram_console_buffer_size, ECC_BLOCK_SIZE) * ECC_SIZE;
+
+        numerr = ram_console_decode_rs8(buffer, sizeof(*buffer), par);
+        if (numerr > 0) {
+                printk(KERN_INFO "ram_console: error in header, %d\n", numerr);
+                ram_console_corrected_bytes += numerr;
+        } else if (numerr < 0) {
+                printk(KERN_INFO
+                       "ram_console: uncorrectable error in header\n");
+                ram_console_bad_blocks++;
+        }
+#endif
+
+        if (buffer->sig == RAM_CONSOLE_SIG) {
+                if (buffer->size > ram_console_buffer_size
+                    || buffer->start > buffer->size)
+                        printk(KERN_INFO "ram_console: found existing invalid "
+                               "buffer, size %d, start %d\n",
+                               buffer->size, buffer->start);
+                else {
+                        printk(KERN_INFO "ram_console: found existing buffer, "
+                               "size %d, start %d\n",
+                               buffer->size, buffer->start);
+                        ram_console_save_old(buffer, bootinfo, old_buf);
+                }
+        } else {
+                printk(KERN_INFO "ram_console: no valid data in buffer "
+                       "(sig = 0x%08x)\n", buffer->sig);
+        }
+
+        buffer->sig = RAM_CONSOLE_SIG;
+        buffer->start = 0;
+        buffer->size = 0;
+
+        register_console(&ram_console);
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE
+        console_verbose();
+#endif
+        return 0;
+}
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT
+static int __init ram_console_early_init(void)
+{
+        return ram_console_init((struct ram_console_buffer *)
+                CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR,
+                CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE,
+                NULL,
+                ram_console_old_log_init_buffer);
+}
+#else
+static int ram_console_driver_probe(struct platform_device *pdev)
+{
+        struct resource *res = pdev->resource;
+        size_t start;
+        size_t buffer_size;
+        void *buffer;
+        const char *bootinfo = NULL;
+        struct ram_console_platform_data *pdata = pdev->dev.platform_data;
+
+        if (res == NULL || pdev->num_resources != 1 ||
+            !(res->flags & IORESOURCE_MEM)) {
+                printk(KERN_ERR "ram_console: invalid resource, %p %d flags "
+                       "%lx\n", res, pdev->num_resources, res ? res->flags : 0);
+                return -ENXIO;
+        }
+        buffer_size = res->end - res->start + 1;
+        start = res->start;
+        printk(KERN_INFO "ram_console: got buffer at %zx, size %zx\n",
+               start, buffer_size);
+        buffer = ioremap(res->start, buffer_size);
+        if (buffer == NULL) {
+                printk(KERN_ERR "ram_console: failed to map memory\n");
+                return -ENOMEM;
+        }
+
+        if (pdata)
+                bootinfo = pdata->bootinfo;
+
+        return ram_console_init(buffer, buffer_size, bootinfo, NULL/* allocate */);
+}
+
+static struct platform_driver ram_console_driver = {
+        .probe = ram_console_driver_probe,
+        .driver         = {
+                .name   = "ram_console",
+        },
+};
+
+static int __init ram_console_module_init(void)
+{
+        int err;
+        err = platform_driver_register(&ram_console_driver);
+        return err;
+}
+#endif
+
+static ssize_t ram_console_read_old(struct file *file, char __user *buf,
+                                    size_t len, loff_t *offset)
+{
+        loff_t pos = *offset;
+        ssize_t count;
+
+        if (pos >= ram_console_old_log_size)
+                return 0;
+
+        count = min(len, (size_t)(ram_console_old_log_size - pos));
+        if (copy_to_user(buf, ram_console_old_log + pos, count))
+                return -EFAULT;
+
+        *offset += count;
+        return count;
+}
+
+static const struct file_operations ram_console_file_ops = {
+        .owner = THIS_MODULE,
+        .read = ram_console_read_old,
+};
+
+static int __init ram_console_late_init(void)
+{
+        struct proc_dir_entry *entry;
+
+        if (ram_console_old_log == NULL)
+                return 0;
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT
+        ram_console_old_log = kmalloc(ram_console_old_log_size, GFP_KERNEL);
+        if (ram_console_old_log == NULL) {
+                printk(KERN_ERR
+                       "ram_console: failed to allocate buffer for old log\n");
+                ram_console_old_log_size = 0;
+                return 0;
+        }
+        memcpy(ram_console_old_log,
+               ram_console_old_log_init_buffer, ram_console_old_log_size);
+#endif
+        entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL);
+        if (!entry) {
+                printk(KERN_ERR "ram_console: failed to create proc entry\n");
+                kfree(ram_console_old_log);
+                ram_console_old_log = NULL;
+                return 0;
+        }
+
+        entry->proc_fops = &ram_console_file_ops;
+        entry->size = ram_console_old_log_size;
+        return 0;
+}
+
+#ifdef CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT
+console_initcall(ram_console_early_init);
+#else
+postcore_initcall(ram_console_module_init);
+#endif
+late_initcall(ram_console_late_init);
+
diff --git a/drivers/staging/android/ram_console.h b/drivers/staging/android/ram_console.h
new file mode 100644
index 000000000000..9f1125c11066
--- /dev/null
+++ b/drivers/staging/android/ram_console.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2010 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 _INCLUDE_LINUX_PLATFORM_DATA_RAM_CONSOLE_H_
+#define _INCLUDE_LINUX_PLATFORM_DATA_RAM_CONSOLE_H_
+
+struct ram_console_platform_data {
+        const char *bootinfo;
+};
+
+#endif /* _INCLUDE_LINUX_PLATFORM_DATA_RAM_CONSOLE_H_ */
diff --git a/drivers/staging/android/switch/Kconfig b/drivers/staging/android/switch/Kconfig
new file mode 100644
index 000000000000..36846f62f4bc
--- /dev/null
+++ b/drivers/staging/android/switch/Kconfig
@@ -0,0 +1,11 @@
+menuconfig ANDROID_SWITCH
+        tristate "Android Switch class support"
+        help
+          Say Y here to enable Android switch class support. This allows
+          monitoring switches by userspace via sysfs and uevent.
+
+config ANDROID_SWITCH_GPIO
+        tristate "Android GPIO Switch support"
+        depends on GENERIC_GPIO && ANDROID_SWITCH
+        help
+          Say Y here to enable GPIO based switch support.
diff --git a/drivers/staging/android/switch/Makefile b/drivers/staging/android/switch/Makefile
new file mode 100644
index 000000000000..d76bfdcedfaf
--- /dev/null
+++ b/drivers/staging/android/switch/Makefile
@@ -0,0 +1,4 @@
+# Android Switch Class Driver
+obj-$(CONFIG_ANDROID_SWITCH)            += switch_class.o
+obj-$(CONFIG_ANDROID_SWITCH_GPIO)       += switch_gpio.o
+
diff --git a/drivers/staging/android/switch/switch.h b/drivers/staging/android/switch/switch.h
new file mode 100644
index 000000000000..4fcb3109875a
--- /dev/null
+++ b/drivers/staging/android/switch/switch.h
@@ -0,0 +1,53 @@
+/*
+ *  Switch class driver
+ *
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * 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 __LINUX_SWITCH_H__
+#define __LINUX_SWITCH_H__
+
+struct switch_dev {
+        const char      *name;
+        struct device   *dev;
+        int             index;
+        int             state;
+
+        ssize_t (*print_name)(struct switch_dev *sdev, char *buf);
+        ssize_t (*print_state)(struct switch_dev *sdev, char *buf);
+};
+
+struct gpio_switch_platform_data {
+        const char *name;
+        unsigned        gpio;
+
+        /* if NULL, switch_dev.name will be printed */
+        const char *name_on;
+        const char *name_off;
+        /* if NULL, "0" or "1" will be printed */
+        const char *state_on;
+        const char *state_off;
+};
+
+extern int switch_dev_register(struct switch_dev *sdev);
+extern void switch_dev_unregister(struct switch_dev *sdev);
+
+static inline int switch_get_state(struct switch_dev *sdev)
+{
+        return sdev->state;
+}
+
+extern void switch_set_state(struct switch_dev *sdev, int state);
+
+#endif /* __LINUX_SWITCH_H__ */
diff --git a/drivers/staging/android/switch/switch_class.c b/drivers/staging/android/switch/switch_class.c
new file mode 100644
index 000000000000..74680446fc66
--- /dev/null
+++ b/drivers/staging/android/switch/switch_class.c
@@ -0,0 +1,174 @@
+/*
+ * switch_class.c
+ *
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * 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/module.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/err.h>
+#include "switch.h"
+
+struct class *switch_class;
+static atomic_t device_count;
+
+static ssize_t state_show(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct switch_dev *sdev = (struct switch_dev *)
+                dev_get_drvdata(dev);
+
+        if (sdev->print_state) {
+                int ret = sdev->print_state(sdev, buf);
+                if (ret >= 0)
+                        return ret;
+        }
+        return sprintf(buf, "%d\n", sdev->state);
+}
+
+static ssize_t name_show(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct switch_dev *sdev = (struct switch_dev *)
+                dev_get_drvdata(dev);
+
+        if (sdev->print_name) {
+                int ret = sdev->print_name(sdev, buf);
+                if (ret >= 0)
+                        return ret;
+        }
+        return sprintf(buf, "%s\n", sdev->name);
+}
+
+static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, state_show, NULL);
+static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, name_show, NULL);
+
+void switch_set_state(struct switch_dev *sdev, int state)
+{
+        char name_buf[120];
+        char state_buf[120];
+        char *prop_buf;
+        char *envp[3];
+        int env_offset = 0;
+        int length;
+
+        if (sdev->state != state) {
+                sdev->state = state;
+
+                prop_buf = (char *)get_zeroed_page(GFP_KERNEL);
+                if (prop_buf) {
+                        length = name_show(sdev->dev, NULL, prop_buf);
+                        if (length > 0) {
+                                if (prop_buf[length - 1] == '\n')
+                                        prop_buf[length - 1] = 0;
+                                snprintf(name_buf, sizeof(name_buf),
+                                        "SWITCH_NAME=%s", prop_buf);
+                                envp[env_offset++] = name_buf;
+                        }
+                        length = state_show(sdev->dev, NULL, prop_buf);
+                        if (length > 0) {
+                                if (prop_buf[length - 1] == '\n')
+                                        prop_buf[length - 1] = 0;
+                                snprintf(state_buf, sizeof(state_buf),
+                                        "SWITCH_STATE=%s", prop_buf);
+                                envp[env_offset++] = state_buf;
+                        }
+                        envp[env_offset] = NULL;
+                        kobject_uevent_env(&sdev->dev->kobj, KOBJ_CHANGE, envp);
+                        free_page((unsigned long)prop_buf);
+                } else {
+                        printk(KERN_ERR "out of memory in switch_set_state\n");
+                        kobject_uevent(&sdev->dev->kobj, KOBJ_CHANGE);
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(switch_set_state);
+
+static int create_switch_class(void)
+{
+        if (!switch_class) {
+                switch_class = class_create(THIS_MODULE, "switch");
+                if (IS_ERR(switch_class))
+                        return PTR_ERR(switch_class);
+                atomic_set(&device_count, 0);
+        }
+
+        return 0;
+}
+
+int switch_dev_register(struct switch_dev *sdev)
+{
+        int ret;
+
+        if (!switch_class) {
+                ret = create_switch_class();
+                if (ret < 0)
+                        return ret;
+        }
+
+        sdev->index = atomic_inc_return(&device_count);
+        sdev->dev = device_create(switch_class, NULL,
+                MKDEV(0, sdev->index), NULL, sdev->name);
+        if (IS_ERR(sdev->dev))
+                return PTR_ERR(sdev->dev);
+
+        ret = device_create_file(sdev->dev, &dev_attr_state);
+        if (ret < 0)
+                goto err_create_file_1;
+        ret = device_create_file(sdev->dev, &dev_attr_name);
+        if (ret < 0)
+                goto err_create_file_2;
+
+        dev_set_drvdata(sdev->dev, sdev);
+        sdev->state = 0;
+        return 0;
+
+err_create_file_2:
+        device_remove_file(sdev->dev, &dev_attr_state);
+err_create_file_1:
+        device_destroy(switch_class, MKDEV(0, sdev->index));
+        printk(KERN_ERR "switch: Failed to register driver %s\n", sdev->name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(switch_dev_register);
+
+void switch_dev_unregister(struct switch_dev *sdev)
+{
+        device_remove_file(sdev->dev, &dev_attr_name);
+        device_remove_file(sdev->dev, &dev_attr_state);
+        device_destroy(switch_class, MKDEV(0, sdev->index));
+        dev_set_drvdata(sdev->dev, NULL);
+}
+EXPORT_SYMBOL_GPL(switch_dev_unregister);
+
+static int __init switch_class_init(void)
+{
+        return create_switch_class();
+}
+
+static void __exit switch_class_exit(void)
+{
+        class_destroy(switch_class);
+}
+
+module_init(switch_class_init);
+module_exit(switch_class_exit);
+
+MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
+MODULE_DESCRIPTION("Switch class driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/android/switch/switch_gpio.c b/drivers/staging/android/switch/switch_gpio.c
new file mode 100644
index 000000000000..38b2c2f6004e
--- /dev/null
+++ b/drivers/staging/android/switch/switch_gpio.c
@@ -0,0 +1,172 @@
+/*
+ * switch_gpio.c
+ *
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * 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/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>
+#include <linux/gpio.h>
+#include "switch.h"
+
+struct gpio_switch_data {
+        struct switch_dev sdev;
+        unsigned gpio;
+        const char *name_on;
+        const char *name_off;
+        const char *state_on;
+        const char *state_off;
+        int irq;
+        struct work_struct work;
+};
+
+static void gpio_switch_work(struct work_struct *work)
+{
+        int state;
+        struct gpio_switch_data *data =
+                container_of(work, struct gpio_switch_data, work);
+
+        state = gpio_get_value(data->gpio);
+        switch_set_state(&data->sdev, state);
+}
+
+static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
+{
+        struct gpio_switch_data *switch_data =
+            (struct gpio_switch_data *)dev_id;
+
+        schedule_work(&switch_data->work);
+        return IRQ_HANDLED;
+}
+
+static ssize_t switch_gpio_print_state(struct switch_dev *sdev, char *buf)
+{
+        struct gpio_switch_data *switch_data =
+                container_of(sdev, struct gpio_switch_data, sdev);
+        const char *state;
+        if (switch_get_state(sdev))
+                state = switch_data->state_on;
+        else
+                state = switch_data->state_off;
+
+        if (state)
+                return sprintf(buf, "%s\n", state);
+        return -1;
+}
+
+static int gpio_switch_probe(struct platform_device *pdev)
+{
+        struct gpio_switch_platform_data *pdata = pdev->dev.platform_data;
+        struct gpio_switch_data *switch_data;
+        int ret = 0;
+
+        if (!pdata)
+                return -EBUSY;
+
+        switch_data = kzalloc(sizeof(struct gpio_switch_data), GFP_KERNEL);
+        if (!switch_data)
+                return -ENOMEM;
+
+        switch_data->sdev.name = pdata->name;
+        switch_data->gpio = pdata->gpio;
+        switch_data->name_on = pdata->name_on;
+        switch_data->name_off = pdata->name_off;
+        switch_data->state_on = pdata->state_on;
+        switch_data->state_off = pdata->state_off;
+        switch_data->sdev.print_state = switch_gpio_print_state;
+
+        ret = switch_dev_register(&switch_data->sdev);
+        if (ret < 0)
+                goto err_switch_dev_register;
+
+        ret = gpio_request(switch_data->gpio, pdev->name);
+        if (ret < 0)
+                goto err_request_gpio;
+
+        ret = gpio_direction_input(switch_data->gpio);
+        if (ret < 0)
+                goto err_set_gpio_input;
+
+        INIT_WORK(&switch_data->work, gpio_switch_work);
+
+        switch_data->irq = gpio_to_irq(switch_data->gpio);
+        if (switch_data->irq < 0) {
+                ret = switch_data->irq;
+                goto err_detect_irq_num_failed;
+        }
+
+        ret = request_irq(switch_data->irq, gpio_irq_handler,
+                          IRQF_TRIGGER_LOW, pdev->name, switch_data);
+        if (ret < 0)
+                goto err_request_irq;
+
+        /* Perform initial detection */
+        gpio_switch_work(&switch_data->work);
+
+        return 0;
+
+err_request_irq:
+err_detect_irq_num_failed:
+err_set_gpio_input:
+        gpio_free(switch_data->gpio);
+err_request_gpio:
+        switch_dev_unregister(&switch_data->sdev);
+err_switch_dev_register:
+        kfree(switch_data);
+
+        return ret;
+}
+
+static int __devexit gpio_switch_remove(struct platform_device *pdev)
+{
+        struct gpio_switch_data *switch_data = platform_get_drvdata(pdev);
+
+        cancel_work_sync(&switch_data->work);
+        gpio_free(switch_data->gpio);
+        switch_dev_unregister(&switch_data->sdev);
+        kfree(switch_data);
+
+        return 0;
+}
+
+static struct platform_driver gpio_switch_driver = {
+        .probe          = gpio_switch_probe,
+        .remove         = __devexit_p(gpio_switch_remove),
+        .driver         = {
+                .name   = "switch-gpio",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init gpio_switch_init(void)
+{
+        return platform_driver_register(&gpio_switch_driver);
+}
+
+static void __exit gpio_switch_exit(void)
+{
+        platform_driver_unregister(&gpio_switch_driver);
+}
+
+module_init(gpio_switch_init);
+module_exit(gpio_switch_exit);
+
+MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
+MODULE_DESCRIPTION("GPIO Switch driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
new file mode 100644
index 000000000000..a64481c3e86d
--- /dev/null
+++ b/drivers/staging/android/timed_gpio.c
@@ -0,0 +1,176 @@
+/* drivers/misc/timed_gpio.c
+ *
+ * Copyright (C) 2008 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * 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/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/hrtimer.h>
+#include <linux/err.h>
+#include <linux/gpio.h>
+
+#include "timed_output.h"
+#include "timed_gpio.h"
+
+
+struct timed_gpio_data {
+        struct timed_output_dev dev;
+        struct hrtimer timer;
+        spinlock_t lock;
+        unsigned        gpio;
+        int             max_timeout;
+        u8              active_low;
+};
+
+static enum hrtimer_restart gpio_timer_func(struct hrtimer *timer)
+{
+        struct timed_gpio_data *data =
+                container_of(timer, struct timed_gpio_data, timer);
+
+        gpio_direction_output(data->gpio, data->active_low ? 1 : 0);
+        return HRTIMER_NORESTART;
+}
+
+static int gpio_get_time(struct timed_output_dev *dev)
+{
+        struct timed_gpio_data  *data =
+                container_of(dev, struct timed_gpio_data, dev);
+
+        if (hrtimer_active(&data->timer)) {
+                ktime_t r = hrtimer_get_remaining(&data->timer);
+                struct timeval t = ktime_to_timeval(r);
+                return t.tv_sec * 1000 + t.tv_usec / 1000;
+        } else
+                return 0;
+}
+
+static void gpio_enable(struct timed_output_dev *dev, int value)
+{
+        struct timed_gpio_data  *data =
+                container_of(dev, struct timed_gpio_data, dev);
+        unsigned long   flags;
+
+        spin_lock_irqsave(&data->lock, flags);
+
+        /* cancel previous timer and set GPIO according to value */
+        hrtimer_cancel(&data->timer);
+        gpio_direction_output(data->gpio, data->active_low ? !value : !!value);
+
+        if (value > 0) {
+                if (value > data->max_timeout)
+                        value = data->max_timeout;
+
+                hrtimer_start(&data->timer,
+                        ktime_set(value / 1000, (value % 1000) * 1000000),
+                        HRTIMER_MODE_REL);
+        }
+
+        spin_unlock_irqrestore(&data->lock, flags);
+}
+
+static int timed_gpio_probe(struct platform_device *pdev)
+{
+        struct timed_gpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timed_gpio *cur_gpio;
+        struct timed_gpio_data *gpio_data, *gpio_dat;
+        int i, j, ret = 0;
+
+        if (!pdata)
+                return -EBUSY;
+
+        gpio_data = kzalloc(sizeof(struct timed_gpio_data) * pdata->num_gpios,
+                        GFP_KERNEL);
+        if (!gpio_data)
+                return -ENOMEM;
+
+        for (i = 0; i < pdata->num_gpios; i++) {
+                cur_gpio = &pdata->gpios[i];
+                gpio_dat = &gpio_data[i];
+
+                hrtimer_init(&gpio_dat->timer, CLOCK_MONOTONIC,
+                                HRTIMER_MODE_REL);
+                gpio_dat->timer.function = gpio_timer_func;
+                spin_lock_init(&gpio_dat->lock);
+
+                gpio_dat->dev.name = cur_gpio->name;
+                gpio_dat->dev.get_time = gpio_get_time;
+                gpio_dat->dev.enable = gpio_enable;
+                ret = gpio_request(cur_gpio->gpio, cur_gpio->name);
+                if (ret >= 0) {
+                        ret = timed_output_dev_register(&gpio_dat->dev);
+                        if (ret < 0)
+                                gpio_free(cur_gpio->gpio);
+                }
+                if (ret < 0) {
+                        for (j = 0; j < i; j++) {
+                                timed_output_dev_unregister(&gpio_data[i].dev);
+                                gpio_free(gpio_data[i].gpio);
+                        }
+                        kfree(gpio_data);
+                        return ret;
+                }
+
+                gpio_dat->gpio = cur_gpio->gpio;
+                gpio_dat->max_timeout = cur_gpio->max_timeout;
+                gpio_dat->active_low = cur_gpio->active_low;
+                gpio_direction_output(gpio_dat->gpio, gpio_dat->active_low);
+        }
+
+        platform_set_drvdata(pdev, gpio_data);
+
+        return 0;
+}
+
+static int timed_gpio_remove(struct platform_device *pdev)
+{
+        struct timed_gpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timed_gpio_data *gpio_data = platform_get_drvdata(pdev);
+        int i;
+
+        for (i = 0; i < pdata->num_gpios; i++) {
+                timed_output_dev_unregister(&gpio_data[i].dev);
+                gpio_free(gpio_data[i].gpio);
+        }
+
+        kfree(gpio_data);
+
+        return 0;
+}
+
+static struct platform_driver timed_gpio_driver = {
+        .probe          = timed_gpio_probe,
+        .remove         = timed_gpio_remove,
+        .driver         = {
+                .name           = TIMED_GPIO_NAME,
+                .owner          = THIS_MODULE,
+        },
+};
+
+static int __init timed_gpio_init(void)
+{
+        return platform_driver_register(&timed_gpio_driver);
+}
+
+static void __exit timed_gpio_exit(void)
+{
+        platform_driver_unregister(&timed_gpio_driver);
+}
+
+module_init(timed_gpio_init);
+module_exit(timed_gpio_exit);
+
+MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
+MODULE_DESCRIPTION("timed gpio driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/android/timed_gpio.h b/drivers/staging/android/timed_gpio.h
new file mode 100644
index 000000000000..a0e15f8be3f7
--- /dev/null
+++ b/drivers/staging/android/timed_gpio.h
@@ -0,0 +1,33 @@
+/* include/linux/timed_gpio.h
+ *
+ * Copyright (C) 2008 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 _LINUX_TIMED_GPIO_H
+#define _LINUX_TIMED_GPIO_H
+
+#define TIMED_GPIO_NAME "timed-gpio"
+
+struct timed_gpio {
+        const char *name;
+        unsigned        gpio;
+        int             max_timeout;
+        u8              active_low;
+};
+
+struct timed_gpio_platform_data {
+        int             num_gpios;
+        struct timed_gpio *gpios;
+};
+
+#endif
diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
new file mode 100644
index 000000000000..f373422308e0
--- /dev/null
+++ b/drivers/staging/android/timed_output.c
@@ -0,0 +1,123 @@
+/* drivers/misc/timed_output.c
+ *
+ * Copyright (C) 2009 Google, Inc.
+ * Author: Mike Lockwood <lockwood@android.com>
+ *
+ * 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/module.h>
+#include <linux/types.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/err.h>
+
+#include "timed_output.h"
+
+static struct class *timed_output_class;
+static atomic_t device_count;
+
+static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
+                char *buf)
+{
+        struct timed_output_dev *tdev = dev_get_drvdata(dev);
+        int remaining = tdev->get_time(tdev);
+
+        return sprintf(buf, "%d\n", remaining);
+}
+
+static ssize_t enable_store(
+                struct device *dev, struct device_attribute *attr,
+                const char *buf, size_t size)
+{
+        struct timed_output_dev *tdev = dev_get_drvdata(dev);
+        int value;
+
+        if (sscanf(buf, "%d", &value) != 1)
+                return -EINVAL;
+
+        tdev->enable(tdev, value);
+
+        return size;
+}
+
+static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, enable_show, enable_store);
+
+static int create_timed_output_class(void)
+{
+        if (!timed_output_class) {
+                timed_output_class = class_create(THIS_MODULE, "timed_output");
+                if (IS_ERR(timed_output_class))
+                        return PTR_ERR(timed_output_class);
+                atomic_set(&device_count, 0);
+        }
+
+        return 0;
+}
+
+int timed_output_dev_register(struct timed_output_dev *tdev)
+{
+        int ret;
+
+        if (!tdev || !tdev->name || !tdev->enable || !tdev->get_time)
+                return -EINVAL;
+
+        ret = create_timed_output_class();
+        if (ret < 0)
+                return ret;
+
+        tdev->index = atomic_inc_return(&device_count);
+        tdev->dev = device_create(timed_output_class, NULL,
+                MKDEV(0, tdev->index), NULL, tdev->name);
+        if (IS_ERR(tdev->dev))
+                return PTR_ERR(tdev->dev);
+
+        ret = device_create_file(tdev->dev, &dev_attr_enable);
+        if (ret < 0)
+                goto err_create_file;
+
+        dev_set_drvdata(tdev->dev, tdev);
+        tdev->state = 0;
+        return 0;
+
+err_create_file:
+        device_destroy(timed_output_class, MKDEV(0, tdev->index));
+        printk(KERN_ERR "timed_output: Failed to register driver %s\n",
+                        tdev->name);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(timed_output_dev_register);
+
+void timed_output_dev_unregister(struct timed_output_dev *tdev)
+{
+        device_remove_file(tdev->dev, &dev_attr_enable);
+        device_destroy(timed_output_class, MKDEV(0, tdev->index));
+        dev_set_drvdata(tdev->dev, NULL);
+}
+EXPORT_SYMBOL_GPL(timed_output_dev_unregister);
+
+static int __init timed_output_init(void)
+{
+        return create_timed_output_class();
+}
+
+static void __exit timed_output_exit(void)
+{
+        class_destroy(timed_output_class);
+}
+
+module_init(timed_output_init);
+module_exit(timed_output_exit);
+
+MODULE_AUTHOR("Mike Lockwood <lockwood@android.com>");
+MODULE_DESCRIPTION("timed output class driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/android/timed_output.h b/drivers/staging/android/timed_output.h
new file mode 100644
index 000000000000..ec907ab2ff54
--- /dev/null
+++ b/drivers/staging/android/timed_output.h
@@ -0,0 +1,37 @@
+/* include/linux/timed_output.h
+ *
+ * Copyright (C) 2008 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 _LINUX_TIMED_OUTPUT_H
+#define _LINUX_TIMED_OUTPUT_H
+
+struct timed_output_dev {
+        const char      *name;
+
+        /* enable the output and set the timer */
+        void    (*enable)(struct timed_output_dev *sdev, int timeout);
+
+        /* returns the current number of milliseconds remaining on the timer */
+        int             (*get_time)(struct timed_output_dev *sdev);
+
+        /* private data */
+        struct device   *dev;
+        int             index;
+        int             state;
+};
+
+extern int timed_output_dev_register(struct timed_output_dev *dev);
+extern void timed_output_dev_unregister(struct timed_output_dev *dev);
+
+#endif
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c
index 7bb7da7959a2..e77e4e0396cf 100644
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
@@ -201,7 +201,7 @@ static ssize_t set_enabled(struct device *dev, struct device_attribute *attr,
         struct usb_interface *intf = to_usb_interface(dev);
         struct asus_oled_dev *odev = usb_get_intfdata(intf);
         unsigned long value;
-        if (strict_strtoul(buf, 10, &value))
+        if (kstrtoul(buf, 10, &value))
                 return -EINVAL;
 
         enable_oled(odev, value);
@@ -217,7 +217,7 @@ static ssize_t class_set_enabled(struct device *device,
                 (struct asus_oled_dev *) dev_get_drvdata(device);
         unsigned long value;
 
-        if (strict_strtoul(buf, 10, &value))
+        if (kstrtoul(buf, 10, &value))
                 return -EINVAL;
 
         enable_oled(odev, value);
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 2fa658eb74dc..179707b5e7c7 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -161,6 +161,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
         INT Status = STATUS_FAILURE;
         int timeout = 0;
         IOCTL_BUFFER IoBuffer;
+        int bytes;
 
         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Parameters Passed to control IOCTL cmd=0x%X arg=0x%lX", cmd, arg);
 
@@ -230,11 +231,16 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 if (!temp_buff)
                         return -ENOMEM;
 
-                Status = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
+                bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
                                 (PUINT)temp_buff, Bufflen);
-                if (Status == STATUS_SUCCESS) {
-                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, IoBuffer.OutputLength))
-                                Status = -EFAULT;
+                if (bytes > 0) {
+                        Status = STATUS_SUCCESS;
+                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
+                                kfree(temp_buff);
+                                return -EFAULT;
+                        }
+                } else {
+                        Status = bytes;
                 }
 
                 kfree(temp_buff);
@@ -302,7 +308,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength))
                         return -EFAULT;
 
-                /* FIXME: don't trust user supplied length */
+                if (IoBuffer.OutputLength > USHRT_MAX ||
+                        IoBuffer.OutputLength == 0) {
+                        return -EINVAL;
+                }
+
                 temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
                 if (!temp_buff)
                         return STATUS_FAILURE;
@@ -318,11 +328,17 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 }
 
                 uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
-                Status = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);
+                bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register, (PUINT)temp_buff, IoBuffer.OutputLength);
 
-                if (Status == STATUS_SUCCESS)
-                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, IoBuffer.OutputLength))
-                                Status = -EFAULT;
+                if (bytes > 0) {
+                        Status = STATUS_SUCCESS;
+                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
+                                kfree(temp_buff);
+                                return -EFAULT;
+                        }
+                } else {
+                        Status = bytes;
+                }
 
                 kfree(temp_buff);
                 break;
@@ -437,12 +453,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         }
                 }
 
-                Status = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
-
-                if (STATUS_SUCCESS != Status) {
+                bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+                if (bytes < 0) {
+                        Status = bytes;
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
                                         "GPIO_MODE_REGISTER read failed");
                         break;
+                } else {
+                        Status = STATUS_SUCCESS;
                 }
 
                 /* Set the gpio mode register to output */
@@ -519,12 +537,15 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 uiBit = gpio_info.uiGpioNumber;
 
                 /* Set the gpio output register */
-                Status = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
+                bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER,
                                         (PUINT)ucRead, sizeof(UINT));
 
-                if (Status != STATUS_SUCCESS) {
+                if (bytes < 0) {
+                        Status = bytes;
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM Failed\n");
                         return Status;
+                } else {
+                        Status = STATUS_SUCCESS;
                 }
         }
         break;
@@ -590,11 +611,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 }
 
                 if (pgpio_multi_info[WIMAX_IDX].uiGPIOMask) {
-                        Status = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+                        bytes = rdmaltWithLock(Adapter, (UINT)GPIO_PIN_STATE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
 
-                        if (Status != STATUS_SUCCESS) {
+                        if (bytes < 0) {
+                                Status = bytes;
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "RDM to GPIO_PIN_STATE_REGISTER Failed.");
                                 return Status;
+                        } else {
+                                Status = STATUS_SUCCESS;
                         }
 
                         pgpio_multi_info[WIMAX_IDX].uiGPIOValue = (*(UINT *)ucResetValue &
@@ -605,7 +629,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                         "Failed while copying Content to IOBufer for user space err:%d", Status);
-                        break;
+                        return -EFAULT;
                 }
         }
         break;
@@ -629,11 +653,14 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 if (copy_from_user(&gpio_multi_mode, IoBuffer.InputBuffer, IoBuffer.InputLength))
                         return -EFAULT;
 
-                Status = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
+                bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER, (PUINT)ucResetValue, sizeof(UINT));
 
-                if (STATUS_SUCCESS != Status) {
+                if (bytes < 0) {
+                        Status = bytes;
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Read of GPIO_MODE_REGISTER failed");
                         return Status;
+                } else {
+                        Status = STATUS_SUCCESS;
                 }
 
                 /* Validating the request */
@@ -678,7 +705,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                         "Failed while copying Content to IOBufer for user space err:%d", Status);
-                        break;
+                        return -EFAULT;
                 }
         }
         break;
@@ -706,9 +733,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
                         return -ENOMEM;
 
                 if (copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) {
-                        Status = -EFAULT;
                         kfree(pvBuffer);
-                        break;
+                        return -EFAULT;
                 }
 
                 down(&Adapter->LowPowerModeSync);
@@ -733,8 +759,7 @@ cntrlEnd:
         }
 
         case IOCTL_BCM_BUFFER_DOWNLOAD_START: {
-                INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
-                if (NVMAccess) {
+                if (down_trylock(&Adapter->NVMRdmWrmLock)) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
                                         "IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
                         return -EACCES;
@@ -743,157 +768,162 @@ cntrlEnd:
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                 "Starting the firmware download PID =0x%x!!!!\n", current->pid);
 
-                if (!down_trylock(&Adapter->fw_download_sema)) {
-                        Adapter->bBinDownloaded = FALSE;
-                        Adapter->fw_download_process_pid = current->pid;
-                        Adapter->bCfgDownloaded = FALSE;
-                        Adapter->fw_download_done = FALSE;
-                        netif_carrier_off(Adapter->dev);
-                        netif_stop_queue(Adapter->dev);
-                        Status = reset_card_proc(Adapter);
-                        if (Status) {
-                                pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter->dev->name);
-                                up(&Adapter->fw_download_sema);
-                                up(&Adapter->NVMRdmWrmLock);
-                                break;
-                        }
-                        mdelay(10);
-                } else {
-                        Status = -EBUSY;
+                if (down_trylock(&Adapter->fw_download_sema))
+                        return -EBUSY;
+
+                Adapter->bBinDownloaded = FALSE;
+                Adapter->fw_download_process_pid = current->pid;
+                Adapter->bCfgDownloaded = FALSE;
+                Adapter->fw_download_done = FALSE;
+                netif_carrier_off(Adapter->dev);
+                netif_stop_queue(Adapter->dev);
+                Status = reset_card_proc(Adapter);
+                if (Status) {
+                        pr_err(PFX "%s: reset_card_proc Failed!\n", Adapter->dev->name);
+                        up(&Adapter->fw_download_sema);
+                        up(&Adapter->NVMRdmWrmLock);
+                        return Status;
                 }
+                mdelay(10);
 
                 up(&Adapter->NVMRdmWrmLock);
-                break;
+                return Status;
         }
 
         case IOCTL_BCM_BUFFER_DOWNLOAD: {
                 FIRMWARE_INFO *psFwInfo = NULL;
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Starting the firmware download PID =0x%x!!!!\n", current->pid);
-                do {
-                        if (!down_trylock(&Adapter->fw_download_sema)) {
-                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                                "Invalid way to download buffer. Use Start and then call this!!!\n");
-                                Status = -EINVAL;
-                                break;
-                        }
-
-                        /* Copy Ioctl Buffer structure */
-                        if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
-                                return -EFAULT;
 
+                if (!down_trylock(&Adapter->fw_download_sema)) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
-                                        "Length for FW DLD is : %lx\n", IoBuffer.InputLength);
+                                        "Invalid way to download buffer. Use Start and then call this!!!\n");
+                        up(&Adapter->fw_download_sema);
+                        Status = -EINVAL;
+                        return Status;
+                }
 
-                        if (IoBuffer.InputLength > sizeof(FIRMWARE_INFO))
-                                return -EINVAL;
+                /* Copy Ioctl Buffer structure */
+                if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
+                        up(&Adapter->fw_download_sema);
+                        return -EFAULT;
+                }
 
-                        psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
-                        if (!psFwInfo)
-                                return -ENOMEM;
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+                                "Length for FW DLD is : %lx\n", IoBuffer.InputLength);
 
-                        if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength))
-                                return -EFAULT;
+                if (IoBuffer.InputLength > sizeof(FIRMWARE_INFO)) {
+                        up(&Adapter->fw_download_sema);
+                        return -EINVAL;
+                }
 
-                        if (!psFwInfo->pvMappedFirmwareAddress ||
-                                (psFwInfo->u32FirmwareLength == 0)) {
+                psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL);
+                if (!psFwInfo) {
+                        up(&Adapter->fw_download_sema);
+                        return -ENOMEM;
+                }
 
-                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
-                                                psFwInfo->u32FirmwareLength);
-                                Status = -EINVAL;
-                                break;
-                        }
+                if (copy_from_user(psFwInfo, IoBuffer.InputBuffer, IoBuffer.InputLength)) {
+                        up(&Adapter->fw_download_sema);
+                        return -EFAULT;
+                }
 
-                        Status = bcm_ioctl_fw_download(Adapter, psFwInfo);
+                if (!psFwInfo->pvMappedFirmwareAddress ||
+                        (psFwInfo->u32FirmwareLength == 0)) {
 
-                        if (Status != STATUS_SUCCESS) {
-                                if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
-                                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
-                                else
-                                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Something else is wrong %lu\n",
+                                        psFwInfo->u32FirmwareLength);
+                        up(&Adapter->fw_download_sema);
+                        Status = -EINVAL;
+                        return Status;
+                }
 
-                                /* up(&Adapter->fw_download_sema); */
+                Status = bcm_ioctl_fw_download(Adapter, psFwInfo);
 
-                                if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                                        Adapter->DriverState = DRIVER_INIT;
-                                        Adapter->LEDInfo.bLedInitDone = FALSE;
-                                        wake_up(&Adapter->LEDInfo.notify_led_event);
-                                }
-                        }
-                        break;
+                if (Status != STATUS_SUCCESS) {
+                        if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR)
+                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Configuration File Upload Failed\n");
+                        else
+                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL: Firmware File Upload Failed\n");
+
+                        /* up(&Adapter->fw_download_sema); */
 
-                } while (0);
+                        if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
+                                Adapter->DriverState = DRIVER_INIT;
+                                Adapter->LEDInfo.bLedInitDone = FALSE;
+                                wake_up(&Adapter->LEDInfo.notify_led_event);
+                        }
+                }
 
                 if (Status != STATUS_SUCCESS)
                         up(&Adapter->fw_download_sema);
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, "IOCTL: Firmware File Uploaded\n");
                 kfree(psFwInfo);
-                break;
+                return Status;
         }
 
         case IOCTL_BCM_BUFFER_DOWNLOAD_STOP: {
-                INT NVMAccess = down_trylock(&Adapter->NVMRdmWrmLock);
+                if (!down_trylock(&Adapter->fw_download_sema)) {
+                        up(&Adapter->fw_download_sema);
+                        return -EINVAL;
+                }
 
-                if (NVMAccess) {
+                if (down_trylock(&Adapter->NVMRdmWrmLock)) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
                                         "FW download blocked as EEPROM Read/Write is in progress\n");
                         up(&Adapter->fw_download_sema);
                         return -EACCES;
                 }
 
-                if (down_trylock(&Adapter->fw_download_sema)) {
-                        Adapter->bBinDownloaded = TRUE;
-                        Adapter->bCfgDownloaded = TRUE;
-                        atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
-                        Adapter->CurrNumRecvDescs = 0;
-                        Adapter->downloadDDR = 0;
-
-                        /* setting the Mips to Run */
-                        Status = run_card_proc(Adapter);
+                Adapter->bBinDownloaded = TRUE;
+                Adapter->bCfgDownloaded = TRUE;
+                atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
+                Adapter->CurrNumRecvDescs = 0;
+                Adapter->downloadDDR = 0;
 
-                        if (Status) {
-                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");
-                                up(&Adapter->fw_download_sema);
-                                up(&Adapter->NVMRdmWrmLock);
-                                break;
-                        } else {
-                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
-                                                DBG_LVL_ALL, "Firm Download Over...\n");
-                        }
-
-                        mdelay(10);
-
-                        /* Wait for MailBox Interrupt */
-                        if (StartInterruptUrb((PS_INTERFACE_ADAPTER)Adapter->pvInterfaceAdapter))
-                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");
-
-                        timeout = 5*HZ;
-                        Adapter->waiting_to_fw_download_done = FALSE;
-                        wait_event_timeout(Adapter->ioctl_fw_dnld_wait_queue,
-                                        Adapter->waiting_to_fw_download_done, timeout);
-                        Adapter->fw_download_process_pid = INVALID_PID;
-                        Adapter->fw_download_done = TRUE;
-                        atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
-                        Adapter->CurrNumRecvDescs = 0;
-                        Adapter->PrevNumRecvDescs = 0;
-                        atomic_set(&Adapter->cntrlpktCnt, 0);
-                        Adapter->LinkUpStatus = 0;
-                        Adapter->LinkStatus = 0;
+                /* setting the Mips to Run */
+                Status = run_card_proc(Adapter);
 
-                        if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
-                                Adapter->DriverState = FW_DOWNLOAD_DONE;
-                                wake_up(&Adapter->LEDInfo.notify_led_event);
-                        }
-
-                        if (!timeout)
-                                Status = -ENODEV;
+                if (Status) {
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Firm Download Failed\n");
+                        up(&Adapter->fw_download_sema);
+                        up(&Adapter->NVMRdmWrmLock);
+                        return Status;
                 } else {
-                        Status = -EINVAL;
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+                                        DBG_LVL_ALL, "Firm Download Over...\n");
+                }
+
+                mdelay(10);
+
+                /* Wait for MailBox Interrupt */
+                if (StartInterruptUrb((PS_INTERFACE_ADAPTER)Adapter->pvInterfaceAdapter))
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Unable to send interrupt...\n");
+
+                timeout = 5*HZ;
+                Adapter->waiting_to_fw_download_done = FALSE;
+                wait_event_timeout(Adapter->ioctl_fw_dnld_wait_queue,
+                                Adapter->waiting_to_fw_download_done, timeout);
+                Adapter->fw_download_process_pid = INVALID_PID;
+                Adapter->fw_download_done = TRUE;
+                atomic_set(&Adapter->CurrNumFreeTxDesc, 0);
+                Adapter->CurrNumRecvDescs = 0;
+                Adapter->PrevNumRecvDescs = 0;
+                atomic_set(&Adapter->cntrlpktCnt, 0);
+                Adapter->LinkUpStatus = 0;
+                Adapter->LinkStatus = 0;
+
+                if (Adapter->LEDInfo.led_thread_running & BCM_LED_THREAD_RUNNING_ACTIVELY) {
+                        Adapter->DriverState = FW_DOWNLOAD_DONE;
+                        wake_up(&Adapter->LEDInfo.notify_led_event);
                 }
 
+                if (!timeout)
+                        Status = -ENODEV;
+
                 up(&Adapter->fw_download_sema);
                 up(&Adapter->NVMRdmWrmLock);
-                break;
+                return Status;
         }
 
         case IOCTL_BE_BUCKET_SIZE:
@@ -969,11 +999,15 @@ cntrlEnd:
         }
 
         case IOCTL_BCM_GET_DRIVER_VERSION: {
+                ulong len;
+
                 /* Copy Ioctl Buffer structure */
                 if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                         return -EFAULT;
 
-                if (copy_to_user(IoBuffer.OutputBuffer, VER_FILEVERSION_STR, IoBuffer.OutputLength))
+                len = min_t(ulong, IoBuffer.OutputLength, strlen(VER_FILEVERSION_STR) + 1);
+
+                if (copy_to_user(IoBuffer.OutputBuffer, VER_FILEVERSION_STR, len))
                         return -EFAULT;
                 Status = STATUS_SUCCESS;
                 break;
@@ -985,8 +1019,7 @@ cntrlEnd:
                 /* Copy Ioctl Buffer structure */
                 if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user failed..\n");
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
 
                 if (IoBuffer.OutputLength != sizeof(link_state)) {
@@ -1001,8 +1034,7 @@ cntrlEnd:
 
                 if (copy_to_user(IoBuffer.OutputBuffer, &link_state, min_t(size_t, sizeof(link_state), IoBuffer.OutputLength))) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy_to_user Failed..\n");
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
                 Status = STATUS_SUCCESS;
                 break;
@@ -1068,8 +1100,10 @@ cntrlEnd:
                 GetDroppedAppCntrlPktMibs(temp_buff, pTarang);
 
                 if (Status != STATUS_FAILURE)
-                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS)))
-                                Status = -EFAULT;
+                        if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, sizeof(S_MIBS_HOST_STATS_MIBS))) {
+                                kfree(temp_buff);
+                                return -EFAULT;
+                        }
 
                 kfree(temp_buff);
                 break;
@@ -1103,7 +1137,9 @@ cntrlEnd:
                 if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
                         return -EFAULT;
 
-                /* FIXME: restrict length */
+                if (IoBuffer.InputLength < sizeof(ULONG) * 2)
+                        return -EINVAL;
+
                 pvBuffer = kmalloc(IoBuffer.InputLength, GFP_KERNEL);
                 if (!pvBuffer)
                         return -ENOMEM;
@@ -1111,8 +1147,7 @@ cntrlEnd:
                 /* Get WrmBuffer structure */
                 if (copy_from_user(pvBuffer, IoBuffer.InputBuffer, IoBuffer.InputLength)) {
                         kfree(pvBuffer);
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
 
                 pBulkBuffer = (PBULKWRM_BUFFER)pvBuffer;
@@ -1242,8 +1277,7 @@ cntrlEnd:
                 memset(&tv1, 0, sizeof(struct timeval));
                 if ((Adapter->eNVMType == NVM_FLASH) && (Adapter->uiFlashLayoutMajorVersion == 0)) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "The Flash Control Section is Corrupted. Hence Rejection on NVM Read/Write\n");
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
 
                 if (IsFlash2x(Adapter)) {
@@ -1252,7 +1286,7 @@ cntrlEnd:
                                 (Adapter->eActiveDSD != DSD2)) {
 
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No DSD is active..hence NVM Command is blocked");
-                                return STATUS_FAILURE ;
+                                return STATUS_FAILURE;
                         }
                 }
 
@@ -1271,8 +1305,7 @@ cntrlEnd:
 
                 if ((stNVMReadWrite.uiOffset + stNVMReadWrite.uiNumBytes) > Adapter->uiNVMDSDSize) {
                         /* BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Can't allow access beyond NVM Size: 0x%x 0x%x\n", stNVMReadWrite.uiOffset, stNVMReadWrite.uiNumBytes); */
-                        Status = STATUS_FAILURE;
-                        break;
+                        return STATUS_FAILURE;
                 }
 
                 pReadData = kzalloc(stNVMReadWrite.uiNumBytes, GFP_KERNEL);
@@ -1280,9 +1313,8 @@ cntrlEnd:
                         return -ENOMEM;
 
                 if (copy_from_user(pReadData, stNVMReadWrite.pBuffer, stNVMReadWrite.uiNumBytes)) {
-                        Status = -EFAULT;
                         kfree(pReadData);
-                        break;
+                        return -EFAULT;
                 }
 
                 do_gettimeofday(&tv0);
@@ -1309,7 +1341,7 @@ cntrlEnd:
 
                         if (copy_to_user(stNVMReadWrite.pBuffer, pReadData, stNVMReadWrite.uiNumBytes)) {
                                 kfree(pReadData);
-                                Status = -EFAULT;
+                                return -EFAULT;
                         }
                 } else {
                         down(&Adapter->NVMRdmWrmLock);
@@ -1377,9 +1409,8 @@ cntrlEnd:
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, " timetaken by Write/read :%ld msec\n", (tv1.tv_sec - tv0.tv_sec)*1000 + (tv1.tv_usec - tv0.tv_usec)/1000);
 
                 kfree(pReadData);
-                Status = STATUS_SUCCESS;
+                return STATUS_SUCCESS;
         }
-        break;
 
         case IOCTL_BCM_FLASH2X_SECTION_READ: {
                 FLASH2X_READWRITE sFlash2xRead = {0};
@@ -1456,7 +1487,9 @@ cntrlEnd:
                         Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
                         if (Status) {
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Copy to use failed with status :%d", Status);
-                                break;
+                                up(&Adapter->NVMRdmWrmLock);
+                                kfree(pReadBuff);
+                                return -EFAULT;
                         }
                         NOB = NOB - ReadBytes;
                         if (NOB) {
@@ -1548,7 +1581,9 @@ cntrlEnd:
                         Status = copy_from_user(pWriteBuff, InputAddr, WriteBytes);
                         if (Status) {
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to user failed with status :%d", Status);
-                                break;
+                                up(&Adapter->NVMRdmWrmLock);
+                                kfree(pWriteBuff);
+                                return -EFAULT;
                         }
                         BCM_DEBUG_PRINT_BUFFER(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, pWriteBuff, WriteBytes);
 
@@ -1608,8 +1643,10 @@ cntrlEnd:
 
                 BcmGetFlash2xSectionalBitMap(Adapter, psFlash2xBitMap);
                 up(&Adapter->NVMRdmWrmLock);
-                if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP)))
-                        Status = -EFAULT;
+                if (copy_to_user(IoBuffer.OutputBuffer, psFlash2xBitMap, sizeof(FLASH2X_BITMAP))) {
+                        kfree(psFlash2xBitMap);
+                        return -EFAULT;
+                }
 
                 kfree(psFlash2xBitMap);
         }
@@ -1627,13 +1664,13 @@ cntrlEnd:
                 Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                        return Status;
+                        return -EFAULT;
                 }
 
                 Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
-                        return Status;
+                        return -EFAULT;
                 }
 
                 down(&Adapter->NVMRdmWrmLock);
@@ -1677,13 +1714,13 @@ cntrlEnd:
                 Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed Status :%d", Status);
-                        return Status;
+                        return -EFAULT;
                 }
 
                 Status = copy_from_user(&sCopySectStrut, IoBuffer.InputBuffer, sizeof(FLASH2X_COPY_SECTION));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of Copy_Section_Struct failed with Status :%d", Status);
-                        return Status;
+                        return -EFAULT;
                 }
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Source SEction :%x", sCopySectStrut.SrcSection);
@@ -1744,7 +1781,7 @@ cntrlEnd:
                 Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                        break;
+                        return -EFAULT;
                 }
 
                 if (Adapter->eNVMType != NVM_FLASH) {
@@ -1783,12 +1820,12 @@ cntrlEnd:
                 Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of IOCTL BUFFER failed");
-                        return Status;
+                        return -EFAULT;
                 }
                 Status = copy_from_user(&eFlash2xSectionVal, IoBuffer.InputBuffer, sizeof(INT));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy of flash section val failed");
-                        return Status;
+                        return -EFAULT;
                 }
 
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Read Section :%d", eFlash2xSectionVal);
@@ -1830,8 +1867,7 @@ cntrlEnd:
                 /* Copy Ioctl Buffer structure */
                 if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER))) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "copy_from_user 1 failed\n");
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
 
                 if (copy_from_user(&stNVMRead, IoBuffer.OutputBuffer, sizeof(NVM_READWRITE)))
@@ -1886,7 +1922,9 @@ cntrlEnd:
                         Status = copy_to_user(OutPutBuff, pReadBuff, ReadBytes);
                         if (Status) {
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Copy to use failed with status :%d", Status);
-                                break;
+                                up(&Adapter->NVMRdmWrmLock);
+                                kfree(pReadBuff);
+                                return -EFAULT;
                         }
                         NOB = NOB - ReadBytes;
                         if (NOB) {
@@ -1907,8 +1945,7 @@ cntrlEnd:
                 Status = copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER));
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of Ioctl buffer is failed from user space");
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
 
                 if (IoBuffer.InputLength != sizeof(unsigned long)) {
@@ -1919,8 +1956,7 @@ cntrlEnd:
                 Status = copy_from_user(&RxCntrlMsgBitMask, IoBuffer.InputBuffer, IoBuffer.InputLength);
                 if (Status) {
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "copy of control bit mask failed from user space");
-                        Status = -EFAULT;
-                        break;
+                        return -EFAULT;
                 }
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "\n Got user defined cntrl msg bit mask :%lx", RxCntrlMsgBitMask);
                 pTarang->RxCntrlMsgBitMask = RxCntrlMsgBitMask;
diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c
index 2b1e9e17e11c..b058e30b2ca6 100644
--- a/drivers/staging/bcm/HandleControlPacket.c
+++ b/drivers/staging/bcm/HandleControlPacket.c
@@ -1,195 +1,208 @@
 /**
-@file HandleControlPacket.c
-This file contains the routines to deal with
-sending and receiving of control packets.
-*/
+ * @file HandleControlPacket.c
+ * This file contains the routines to deal with
+ * sending and receiving of control packets.
+ */
 #include "headers.h"
 
 /**
-When a control packet is received, analyze the
-"status" and call appropriate response function.
-Enqueue the control packet for Application.
-@return None
-*/
+ * When a control packet is received, analyze the
+ * "status" and call appropriate response function.
+ * Enqueue the control packet for Application.
+ * @return None
+ */
 static VOID handle_rx_control_packet(PMINI_ADAPTER Adapter, struct sk_buff *skb)
 {
-        PPER_TARANG_DATA        pTarang = NULL;
+        PPER_TARANG_DATA pTarang = NULL;
         BOOLEAN HighPriorityMessage = FALSE;
-        struct sk_buff * newPacket = NULL;
+        struct sk_buff *newPacket = NULL;
         CHAR cntrl_msg_mask_bit = 0;
-        BOOLEAN drop_pkt_flag = TRUE ;
+        BOOLEAN drop_pkt_flag = TRUE;
         USHORT usStatus = *(PUSHORT)(skb->data);
 
         if (netif_msg_pktdata(Adapter))
                 print_hex_dump(KERN_DEBUG, PFX "rx control: ", DUMP_PREFIX_NONE,
-                               16, 1, skb->data, skb->len, 0);
-
-        switch(usStatus)
-        {
-                case CM_RESPONSES:               // 0xA0
-                        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "MAC Version Seems to be Non Multi-Classifier, rejected by Driver");
-                        HighPriorityMessage = TRUE ;
-                        break;
-                case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
-                        HighPriorityMessage = TRUE ;
-                        if(Adapter->LinkStatus==LINKUP_DONE)
-                        {
-                                CmControlResponseMessage(Adapter,(skb->data +sizeof(USHORT)));
-                        }
-                        break;
-                case LINK_CONTROL_RESP:          //0xA2
-                case STATUS_RSP:          //0xA1
-                        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"LINK_CONTROL_RESP");
-                        HighPriorityMessage = TRUE ;
-                        LinkControlResponseMessage(Adapter,(skb->data + sizeof(USHORT)));
-                        break;
-                case STATS_POINTER_RESP:       //0xA6
-                        HighPriorityMessage = TRUE ;
-                        StatisticsResponse(Adapter, (skb->data + sizeof(USHORT)));
-                        break;
-                case IDLE_MODE_STATUS:                  //0xA3
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"IDLE_MODE_STATUS Type Message Got from F/W");
-                        InterfaceIdleModeRespond(Adapter, (PUINT)(skb->data +
-                                                sizeof(USHORT)));
-                        HighPriorityMessage = TRUE ;
-                        break;
-
-                case AUTH_SS_HOST_MSG:
-                        HighPriorityMessage = TRUE ;
-                        break;
-
-                default:
-                        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,"Got Default Response");
-                        /* Let the Application Deal with This Packet */
-                        break;
+                                16, 1, skb->data, skb->len, 0);
+
+        switch (usStatus) {
+        case CM_RESPONSES:               /* 0xA0 */
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
+                        DBG_LVL_ALL,
+                        "MAC Version Seems to be Non Multi-Classifier, rejected by Driver");
+                HighPriorityMessage = TRUE;
+                break;
+        case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
+                HighPriorityMessage = TRUE;
+                if (Adapter->LinkStatus == LINKUP_DONE)
+                        CmControlResponseMessage(Adapter,
+                                (skb->data + sizeof(USHORT)));
+                break;
+        case LINK_CONTROL_RESP:          /* 0xA2 */
+        case STATUS_RSP:                 /* 0xA1 */
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
+                        DBG_LVL_ALL, "LINK_CONTROL_RESP");
+                HighPriorityMessage = TRUE;
+                LinkControlResponseMessage(Adapter,
+                        (skb->data + sizeof(USHORT)));
+                break;
+        case STATS_POINTER_RESP:         /* 0xA6 */
+                HighPriorityMessage = TRUE;
+                StatisticsResponse(Adapter, (skb->data + sizeof(USHORT)));
+                break;
+        case IDLE_MODE_STATUS:           /* 0xA3 */
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
+                        DBG_LVL_ALL,
+                        "IDLE_MODE_STATUS Type Message Got from F/W");
+                InterfaceIdleModeRespond(Adapter, (PUINT)(skb->data +
+                                        sizeof(USHORT)));
+                HighPriorityMessage = TRUE;
+                break;
+
+        case AUTH_SS_HOST_MSG:
+                HighPriorityMessage = TRUE;
+                break;
+
+        default:
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
+                        DBG_LVL_ALL, "Got Default Response");
+                /* Let the Application Deal with This Packet */
+                break;
         }
 
-        //Queue The Control Packet to The Application Queues
+        /* Queue The Control Packet to The Application Queues */
         down(&Adapter->RxAppControlQueuelock);
 
-        for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next)
-    {
-        if(Adapter->device_removed)
-                {
+        for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next) {
+                if (Adapter->device_removed)
                         break;
-                }
 
-                drop_pkt_flag = TRUE ;
+                drop_pkt_flag = TRUE;
                 /*
-                        There are cntrl msg from A0 to AC. It has been mapped to 0 to C bit in the cntrl mask.
-                        Also, by default AD to BF has been masked to the rest of the bits... which wil be ON by default.
-                        if mask bit is enable to particular pkt status, send it out to app else stop it.
-                */
+                 * There are cntrl msg from A0 to AC. It has been mapped to 0 to
+                 * C bit in the cntrl mask.
+                 * Also, by default AD to BF has been masked to the rest of the
+                 * bits... which wil be ON by default.
+                 * if mask bit is enable to particular pkt status, send it out
+                 * to app else stop it.
+                 */
                 cntrl_msg_mask_bit = (usStatus & 0x1F);
-                //printk("\ninew  msg  mask bit which is disable in mask:%X", cntrl_msg_mask_bit);
-                if(pTarang->RxCntrlMsgBitMask & (1<<cntrl_msg_mask_bit))
-                                drop_pkt_flag = FALSE;
-
-                if ((drop_pkt_flag == TRUE)  || (pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN) ||
-                                        ((pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN/2) && (HighPriorityMessage == FALSE)))
-                {
+                /*
+                 * printk("\ninew  msg  mask bit which is disable in mask:%X",
+                 *      cntrl_msg_mask_bit);
+                 */
+                if (pTarang->RxCntrlMsgBitMask & (1 << cntrl_msg_mask_bit))
+                        drop_pkt_flag = FALSE;
+
+                if ((drop_pkt_flag == TRUE) ||
+                                (pTarang->AppCtrlQueueLen > MAX_APP_QUEUE_LEN)
+                                || ((pTarang->AppCtrlQueueLen >
+                                        MAX_APP_QUEUE_LEN / 2) &&
+                                    (HighPriorityMessage == FALSE))) {
                         /*
-                                Assumption:-
-                                1. every tarang manages it own dropped pkt statitistics
-                                2. Total packet dropped per tarang will be equal to the sum of all types of dropped
-                                        pkt by that tarang only.
-
-                        */
-                        switch(*(PUSHORT)skb->data)
-                        {
-                                case CM_RESPONSES:
-                                        pTarang->stDroppedAppCntrlMsgs.cm_responses++;
-                                        break;
-                                case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
-                                 pTarang->stDroppedAppCntrlMsgs.cm_control_newdsx_multiclassifier_resp++;
-                                         break;
-                                case LINK_CONTROL_RESP:
-                                        pTarang->stDroppedAppCntrlMsgs.link_control_resp++;
-                                        break;
-                                case STATUS_RSP:
-                                        pTarang->stDroppedAppCntrlMsgs.status_rsp++;
-                                        break;
-                                case STATS_POINTER_RESP:
-                                        pTarang->stDroppedAppCntrlMsgs.stats_pointer_resp++;
-                                        break;
-                                case IDLE_MODE_STATUS:
-                                        pTarang->stDroppedAppCntrlMsgs.idle_mode_status++ ;
-                                        break;
-                                case AUTH_SS_HOST_MSG:
-                                        pTarang->stDroppedAppCntrlMsgs.auth_ss_host_msg++ ;
-                                        break;
+                         * Assumption:-
+                         * 1. every tarang manages it own dropped pkt
+                         *    statitistics
+                         * 2. Total packet dropped per tarang will be equal to
+                         *    the sum of all types of dropped pkt by that
+                         *    tarang only.
+                         */
+                        switch (*(PUSHORT)skb->data) {
+                        case CM_RESPONSES:
+                                pTarang->stDroppedAppCntrlMsgs.cm_responses++;
+                                break;
+                        case CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP:
+                                pTarang->stDroppedAppCntrlMsgs.cm_control_newdsx_multiclassifier_resp++;
+                                break;
+                        case LINK_CONTROL_RESP:
+                                pTarang->stDroppedAppCntrlMsgs.link_control_resp++;
+                                break;
+                        case STATUS_RSP:
+                                pTarang->stDroppedAppCntrlMsgs.status_rsp++;
+                                break;
+                        case STATS_POINTER_RESP:
+                                pTarang->stDroppedAppCntrlMsgs.stats_pointer_resp++;
+                                break;
+                        case IDLE_MODE_STATUS:
+                                pTarang->stDroppedAppCntrlMsgs.idle_mode_status++;
+                                break;
+                        case AUTH_SS_HOST_MSG:
+                                pTarang->stDroppedAppCntrlMsgs.auth_ss_host_msg++;
+                                break;
                         default:
-                                        pTarang->stDroppedAppCntrlMsgs.low_priority_message++ ;
-                                        break;
+                                pTarang->stDroppedAppCntrlMsgs.low_priority_message++;
+                                break;
                         }
 
                         continue;
                 }
 
-        newPacket = skb_clone(skb, GFP_KERNEL);
-        if (!newPacket)
-           break;
-        ENQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail,
-                                newPacket);
-        pTarang->AppCtrlQueueLen++;
-    }
+                newPacket = skb_clone(skb, GFP_KERNEL);
+                if (!newPacket)
+                        break;
+                ENQUEUEPACKET(pTarang->RxAppControlHead,
+                                pTarang->RxAppControlTail, newPacket);
+                pTarang->AppCtrlQueueLen++;
+        }
         up(&Adapter->RxAppControlQueuelock);
-    wake_up(&Adapter->process_read_wait_queue);
-    dev_kfree_skb(skb);
-        BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "After wake_up_interruptible");
+        wake_up(&Adapter->process_read_wait_queue);
+        dev_kfree_skb(skb);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,
+                        "After wake_up_interruptible");
 }
 
 /**
-@ingroup ctrl_pkt_functions
-Thread to handle control pkt reception
-*/
-int control_packet_handler  (PMINI_ADAPTER Adapter  /**< pointer to adapter object*/
-                                                )
+ * @ingroup ctrl_pkt_functions
+ * Thread to handle control pkt reception
+ */
+int control_packet_handler(PMINI_ADAPTER Adapter /* pointer to adapter object*/)
 {
-        struct sk_buff *ctrl_packet= NULL;
+        struct sk_buff *ctrl_packet = NULL;
         unsigned long flags = 0;
-        //struct timeval tv ;
-        //int *puiBuffer = NULL ;
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Entering to make thread wait on control packet event!");
-        while(1)
-        {
+        /* struct timeval tv; */
+        /* int *puiBuffer = NULL; */
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL,
+                "Entering to make thread wait on control packet event!");
+        while (1) {
                 wait_event_interruptible(Adapter->process_rx_cntrlpkt,
-                                                                 atomic_read(&Adapter->cntrlpktCnt) ||
-                                                                 Adapter->bWakeUpDevice ||
-                                                                 kthread_should_stop()
-                                                                );
+                        atomic_read(&Adapter->cntrlpktCnt) ||
+                        Adapter->bWakeUpDevice ||
+                        kthread_should_stop());
 
 
-                if(kthread_should_stop())
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Exiting \n");
+                if (kthread_should_stop()) {
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, CP_CTRL_PKT,
+                                DBG_LVL_ALL, "Exiting\n");
                         return 0;
                 }
-                if(TRUE == Adapter->bWakeUpDevice)
-                {
+                if (TRUE == Adapter->bWakeUpDevice) {
                         Adapter->bWakeUpDevice = FALSE;
-                        if((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode) &&
-                                ((TRUE == Adapter->IdleMode)|| (TRUE == Adapter->bShutStatus)))
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CP_CTRL_PKT, DBG_LVL_ALL, "Calling InterfaceAbortIdlemode\n");
-        //                      Adapter->bTriedToWakeUpFromlowPowerMode = TRUE;
-                                InterfaceIdleModeWakeup (Adapter);
+                        if ((FALSE == Adapter->bTriedToWakeUpFromlowPowerMode)
+                                        && ((TRUE == Adapter->IdleMode) ||
+                                            (TRUE == Adapter->bShutStatus))) {
+                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                        CP_CTRL_PKT, DBG_LVL_ALL,
+                                        "Calling InterfaceAbortIdlemode\n");
+                                /*
+                                 * Adapter->bTriedToWakeUpFromlowPowerMode
+                                 *                                      = TRUE;
+                                 */
+                                InterfaceIdleModeWakeup(Adapter);
                         }
                         continue;
                 }
 
-                while(atomic_read(&Adapter->cntrlpktCnt))
-                {
+                while (atomic_read(&Adapter->cntrlpktCnt)) {
                         spin_lock_irqsave(&Adapter->control_queue_lock, flags);
                         ctrl_packet = Adapter->RxControlHead;
-                        if(ctrl_packet)
-                        {
-                                DEQUEUEPACKET(Adapter->RxControlHead,Adapter->RxControlTail);
-//                              Adapter->RxControlHead=ctrl_packet->next;
+                        if (ctrl_packet) {
+                                DEQUEUEPACKET(Adapter->RxControlHead,
+                                        Adapter->RxControlTail);
+                                /* Adapter->RxControlHead=ctrl_packet->next; */
                         }
 
-                        spin_unlock_irqrestore (&Adapter->control_queue_lock, flags);
-                        handle_rx_control_packet(Adapter, ctrl_packet);
+                        spin_unlock_irqrestore(&Adapter->control_queue_lock,
+                                                flags);
+                        handle_rx_control_packet(Adapter, ctrl_packet);
                         atomic_dec(&Adapter->cntrlpktCnt);
                 }
 
@@ -201,22 +214,22 @@ int control_packet_handler  (PMINI_ADAPTER Adapter  /**< pointer to adapter obje
 INT flushAllAppQ(void)
 {
         PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
-        PPER_TARANG_DATA        pTarang = NULL;
+        PPER_TARANG_DATA pTarang = NULL;
         struct sk_buff *PacketToDrop = NULL;
-        for(pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next)
-        {
-                while(pTarang->RxAppControlHead != NULL)
-                {
-                        PacketToDrop=pTarang->RxAppControlHead;
-                        DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail);
+        for (pTarang = Adapter->pTarangs; pTarang; pTarang = pTarang->next) {
+                while (pTarang->RxAppControlHead != NULL) {
+                        PacketToDrop = pTarang->RxAppControlHead;
+                        DEQUEUEPACKET(pTarang->RxAppControlHead,
+                                        pTarang->RxAppControlTail);
                         dev_kfree_skb(PacketToDrop);
                 }
                 pTarang->AppCtrlQueueLen = 0;
-                //dropped contrl packet statistics also should be reset.
-                memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0, sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
+                /* dropped contrl packet statistics also should be reset. */
+                memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0,
+                        sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
 
         }
-        return STATUS_SUCCESS ;
+        return STATUS_SUCCESS;
 }
 
 
diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index bcd86bbef2fd..65c352f35681 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -62,6 +62,7 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
         static int fw_down;
         INT Status = STATUS_SUCCESS;
         PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
+        int bytes;
 
         buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);
         buff_readback = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA);
@@ -94,8 +95,9 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c
                         break;
                 }
 
-                Status = InterfaceRDM(psIntfAdapter, on_chip_loc, buff_readback, len);
-                if (Status) {
+                bytes = InterfaceRDM(psIntfAdapter, on_chip_loc, buff_readback, len);
+                if (bytes < 0) {
+                        Status = bytes;
                         BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "RDM of len %d Failed! %d", len, reg);
                         goto exit;
                 }
@@ -302,6 +304,7 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi
         UINT len = u32FirmwareLength;
         INT retval = STATUS_SUCCESS;
         PUCHAR readbackbuff = kzalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_KERNEL);
+        int bytes;
 
         if (NULL == readbackbuff) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "MEMORY ALLOCATION FAILED");
@@ -310,9 +313,10 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi
 
         while (u32FirmwareLength && !retval) {
                 len = MIN_VAL(u32FirmwareLength, MAX_TRANSFER_CTRL_BYTE_USB);
-                retval = rdm(Adapter, u32StartingAddress, readbackbuff, len);
+                bytes = rdm(Adapter, u32StartingAddress, readbackbuff, len);
 
-                if (retval) {
+                if (bytes < 0) {
+                        retval = bytes;
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "rdm failed with status %d", retval);
                         break;
                 }
diff --git a/drivers/staging/bcm/InterfaceIdleMode.c b/drivers/staging/bcm/InterfaceIdleMode.c
index 96fa4ead7930..faeb03e62c06 100644
--- a/drivers/staging/bcm/InterfaceIdleMode.c
+++ b/drivers/staging/bcm/InterfaceIdleMode.c
@@ -46,6 +46,7 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
 {
         int     status = STATUS_SUCCESS;
         unsigned int    uiRegRead = 0;
+        int bytes;
 
         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL,"SubType of Message :0x%X", ntohl(*puiBuffer));
 
@@ -77,16 +78,16 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
                         else if(Adapter->ulPowerSaveMode != DEVICE_POWERSAVE_MODE_AS_PROTOCOL_IDLE_MODE)
                         {
                                 //clear on read Register
-                                status = rdmalt(Adapter, DEVICE_INT_OUT_EP_REG0, &uiRegRead, sizeof(uiRegRead));
-                                if(status)
-                                {
+                                bytes = rdmalt(Adapter, DEVICE_INT_OUT_EP_REG0, &uiRegRead, sizeof(uiRegRead));
+                                if (bytes < 0) {
+                                        status = bytes;
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm failed while clearing H/W Abort Reg0");
                                         return status;
                                 }
                                 //clear on read Register
-                                status = rdmalt (Adapter, DEVICE_INT_OUT_EP_REG1, &uiRegRead, sizeof(uiRegRead));
-                                if(status)
-                                {
+                                bytes = rdmalt(Adapter, DEVICE_INT_OUT_EP_REG1, &uiRegRead, sizeof(uiRegRead));
+                                if (bytes < 0) {
+                                        status = bytes;
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "rdm failed while clearing H/W Abort     Reg1");
                                         return status;
                                 }
@@ -117,9 +118,9 @@ int InterfaceIdleModeRespond(PMINI_ADAPTER Adapter, unsigned int* puiBuffer)
                                         Adapter->chip_id== BCS220_3)
                         {
 
-                                status = rdmalt(Adapter, HPM_CONFIG_MSW, &uiRegRead, sizeof(uiRegRead));
-                                if(status)
-                                {
+                                bytes = rdmalt(Adapter, HPM_CONFIG_MSW, &uiRegRead, sizeof(uiRegRead));
+                                if (bytes < 0) {
+                                        status = bytes;
                                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, IDLE_MODE, DBG_LVL_ALL, "rdm failed while Reading HPM_CONFIG_LDO145 Reg 0\n");
                                         return status;
                                 }
@@ -266,6 +267,8 @@ void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter)
 {
         unsigned int uiRegVal = 0;
         INT Status = 0;
+        int bytes;
+
         if(Adapter->ulPowerSaveMode == DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING)
         {
                 // clear idlemode interrupt.
@@ -282,16 +285,16 @@ void InterfaceHandleShutdownModeWakeup(PMINI_ADAPTER Adapter)
         {
 
         //clear Interrupt EP registers.
-                Status = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG0, &uiRegVal, sizeof(uiRegVal));
-                if(Status)
-                {
+                bytes = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG0, &uiRegVal, sizeof(uiRegVal));
+                if (bytes < 0) {
+                        Status = bytes;
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"RDM of DEVICE_INT_OUT_EP_REG0 failed with Err :%d", Status);
                         return;
                 }
 
-        Status = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG1, &uiRegVal, sizeof(uiRegVal));
-                if(Status)
-                {
+                bytes = rdmalt(Adapter,DEVICE_INT_OUT_EP_REG1, &uiRegVal, sizeof(uiRegVal));
+                if (bytes < 0) {
+                        Status = bytes;
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"RDM of DEVICE_INT_OUT_EP_REG1 failed with Err :%d", Status);
                         return;
                 }
diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
index a09d35108f04..8e3c586a699c 100644
--- a/drivers/staging/bcm/InterfaceInit.c
+++ b/drivers/staging/bcm/InterfaceInit.c
@@ -68,7 +68,7 @@ static void InterfaceAdapterFree(PS_INTERFACE_ADAPTER psIntfAdapter)
 static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
 {
         unsigned long ulReg = 0;
-        int ret;
+        int bytes;
 
         /* Program EP2 MAX_PKT_SIZE */
         ulReg = ntohl(EP2_MPS_REG);
@@ -94,8 +94,8 @@ static void ConfigureEndPointTypesThroughEEPROM(PMINI_ADAPTER Adapter)
         BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x140, 4, TRUE);
 
         /* Program TX EP as interrupt(Alternate Setting) */
-        ret = rdmalt(Adapter, 0x0F0110F8, (u32 *)&ulReg, sizeof(u32));
-        if (ret) {
+        bytes = rdmalt(Adapter, 0x0F0110F8, (u32 *)&ulReg, sizeof(u32));
+        if (bytes < 0) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
                         "reading of Tx EP failed\n");
                 return;
@@ -430,6 +430,7 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
         int usedIntOutForBulkTransfer = 0 ;
         BOOLEAN bBcm16 = FALSE;
         UINT uiData = 0;
+        int bytes;
 
         /* Store the usb dev into interface adapter */
         psIntfAdapter->udev = usb_get_dev(interface_to_usbdev(psIntfAdapter->interface));
@@ -438,9 +439,10 @@ static int InterfaceAdapterInit(PS_INTERFACE_ADAPTER psIntfAdapter)
         psIntfAdapter->psAdapter->interface_rdm = BcmRDM;
         psIntfAdapter->psAdapter->interface_wrm = BcmWRM;
 
-        retval = rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG,
+        bytes = rdmalt(psIntfAdapter->psAdapter, CHIP_ID_REG,
                         (u32 *)&(psIntfAdapter->psAdapter->chip_id), sizeof(u32));
-        if (retval) {
+        if (bytes < 0) {
+                retval = bytes;
                 BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "CHIP ID Read Failed\n");
                 return retval;
         }
diff --git a/drivers/staging/bcm/InterfaceMisc.c b/drivers/staging/bcm/InterfaceMisc.c
index 61f878b4f56c..2218faeaf8ac 100644
--- a/drivers/staging/bcm/InterfaceMisc.c
+++ b/drivers/staging/bcm/InterfaceMisc.c
@@ -5,7 +5,7 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
                 PVOID buff,
                 INT len)
 {
-        int retval = 0;
+        int bytes;
         USHORT usRetries = 0;
 
         if (psIntfAdapter == NULL) {
@@ -30,7 +30,7 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
         psIntfAdapter->psAdapter->DeviceAccess = TRUE;
 
         do {
-                retval = usb_control_msg(psIntfAdapter->udev,
+                bytes = usb_control_msg(psIntfAdapter->udev,
                                         usb_rcvctrlpipe(psIntfAdapter->udev, 0),
                                         0x02,
                                         0xC2,
@@ -41,22 +41,20 @@ INT InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
                                         5000);
 
                 usRetries++;
-                if (-ENODEV == retval) {
+                if (-ENODEV == bytes) {
                         psIntfAdapter->psAdapter->device_removed = TRUE;
                         break;
                 }
 
-        } while ((retval < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
+        } while ((bytes < 0) && (usRetries < MAX_RDM_WRM_RETIRES));
 
-        if (retval < 0) {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", retval, usRetries);
-                psIntfAdapter->psAdapter->DeviceAccess = FALSE;
-                return retval;
-        } else {
-                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", retval);
-                psIntfAdapter->psAdapter->DeviceAccess = FALSE;
-                return STATUS_SUCCESS;
-        }
+        if (bytes < 0)
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM failed status :%d, retires :%d", bytes, usRetries);
+        else
+                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_OTHERS, RDM, DBG_LVL_ALL, "RDM sent %d", bytes);
+
+        psIntfAdapter->psAdapter->DeviceAccess = FALSE;
+        return bytes;
 }
 
 INT InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index e9f29d597518..c7725e141fd5 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -814,6 +814,7 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)
         PMINI_ADAPTER Adapter = GET_BCM_ADAPTER(gblpnetdev);
         PS_INTERFACE_ADAPTER psIntfAdapter = NULL;
         unsigned int value = 0, uiResetValue = 0;
+        int bytes;
 
         psIntfAdapter = ((PS_INTERFACE_ADAPTER)(ps_adapter->pvInterfaceAdapter));
         ps_adapter->bDDRInitDone = FALSE;
@@ -848,8 +849,9 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)
                         ps_adapter->chip_id == BCS250_BC ||
                         ps_adapter->chip_id == BCS220_3) {
 
-                        retval = rdmalt(ps_adapter, HPM_CONFIG_LDO145, &value, sizeof(value));
-                        if (retval < 0) {
+                        bytes = rdmalt(ps_adapter, HPM_CONFIG_LDO145, &value, sizeof(value));
+                        if (bytes < 0) {
+                                retval = bytes;
                                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "read failed with status :%d", retval);
                                 goto err_exit;
                         }
@@ -862,8 +864,9 @@ int reset_card_proc(PMINI_ADAPTER ps_adapter)
                         }
                 }
         } else {
-                retval = rdmalt(ps_adapter, 0x0f007018, &value, sizeof(value));
-                if (retval < 0) {
+                bytes = rdmalt(ps_adapter, 0x0f007018, &value, sizeof(value));
+                if (bytes < 0) {
+                        retval = bytes;
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "read failed with status :%d", retval);
                         goto err_exit;
                 }
@@ -925,11 +928,16 @@ err_exit:
 
 int run_card_proc(PMINI_ADAPTER ps_adapter)
 {
+        int status = STATUS_SUCCESS;
+        int bytes;
+
         unsigned int value = 0;
         {
-                if (rdmalt(ps_adapter, CLOCK_RESET_CNTRL_REG_1, &value, sizeof(value)) < 0) {
+                bytes = rdmalt(ps_adapter, CLOCK_RESET_CNTRL_REG_1, &value, sizeof(value));
+                if (bytes < 0) {
+                        status = bytes;
                         BCM_DEBUG_PRINT(ps_adapter, DBG_TYPE_INITEXIT, MP_INIT, DBG_LVL_ALL, "%s:%d\n", __func__, __LINE__);
-                        return STATUS_FAILURE;
+                        return status;
                 }
 
                 if (ps_adapter->bFlashBoot)
@@ -942,7 +950,7 @@ int run_card_proc(PMINI_ADAPTER ps_adapter)
                         return STATUS_FAILURE;
                 }
         }
-        return STATUS_SUCCESS;
+        return status;
 }
 
 int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
@@ -1215,6 +1223,7 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
         int status = 0, i = 0;
         unsigned int temp = 0;
         unsigned char *pucmacaddr = kmalloc(MAC_ADDRESS_SIZE, GFP_KERNEL);
+        int bytes;
 
         if (!pucmacaddr) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No Buffers to Read the EEPROM Address\n");
@@ -1231,8 +1240,9 @@ static unsigned char *ReadMacAddrEEPROM(PMINI_ADAPTER Adapter, ulong dwAddress)
         }
 
         for (i = 0; i < MAC_ADDRESS_SIZE; i++) {
-                status = rdmalt(Adapter, EEPROM_READ_DATA_Q_REG, &temp, sizeof(temp));
-                if (status != STATUS_SUCCESS) {
+                bytes = rdmalt(Adapter, EEPROM_READ_DATA_Q_REG, &temp, sizeof(temp));
+                if (bytes < 0) {
+                        status = bytes;
                         BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "rdm Failed..\n");
                         kfree(pucmacaddr);
                         pucmacaddr = NULL;
@@ -1574,11 +1584,13 @@ void update_per_sf_desc_cnts(PMINI_ADAPTER Adapter)
 {
         INT iIndex = 0;
         u32 uibuff[MAX_TARGET_DSX_BUFFERS];
+        int bytes;
 
         if (!atomic_read(&Adapter->uiMBupdate))
                 return;
 
-        if (rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS) < 0) {
+        bytes = rdmaltWithLock(Adapter, TARGET_SFID_TXDESC_MAP_LOC, (PUINT)uibuff, sizeof(UINT) * MAX_TARGET_DSX_BUFFERS);
+        if (bytes < 0) {
                 BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "rdm failed\n");
                 return;
         }
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index c13ea5c9a2aa..101c4e31249e 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -1,4 +1,3 @@
-
 /*
  * File Name: hostmibs.c
  *
@@ -6,73 +5,72 @@
  *
  * Abstract: This file contains the routines to copy the statistics used by
  * the driver to the Host MIBS structure and giving the same to Application.
- *
  */
+
 #include "headers.h"
 
-INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)
+INT ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMibs)
 {
-        S_SERVICEFLOW_ENTRY    *pstServiceFlowEntry = NULL;
-        S_PHS_RULE             *pstPhsRule          = NULL;
-        S_CLASSIFIER_TABLE     *pstClassifierTable  = NULL;
-        S_CLASSIFIER_ENTRY     *pstClassifierRule   = NULL;
-        PPHS_DEVICE_EXTENSION  pDeviceExtension     = (PPHS_DEVICE_EXTENSION)&Adapter->stBCMPhsContext;
+        S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
+        S_PHS_RULE *pstPhsRule = NULL;
+        S_CLASSIFIER_TABLE *pstClassifierTable = NULL;
+        S_CLASSIFIER_ENTRY *pstClassifierRule = NULL;
+        PPHS_DEVICE_EXTENSION pDeviceExtension = (PPHS_DEVICE_EXTENSION) &Adapter->stBCMPhsContext;
 
-        UINT nClassifierIndex = 0, nPhsTableIndex = 0,nSfIndex = 0, uiIndex = 0;
+        UINT nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;
 
-        if(pDeviceExtension == NULL)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, HOST_MIBS, DBG_LVL_ALL, "Invalid Device Extension\n");
+        if (pDeviceExtension == NULL) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, HOST_MIBS, DBG_LVL_ALL, "Invalid Device Extension\n");
                 return STATUS_FAILURE;
         }
 
-        //Copy the classifier Table
-        for(nClassifierIndex=0; nClassifierIndex < MAX_CLASSIFIERS;
-                        nClassifierIndex++)
-        {
-                if(Adapter->astClassifierTable[nClassifierIndex].bUsed == TRUE)
-                        memcpy((PVOID)&pstHostMibs->astClassifierTable[nClassifierIndex],
-                                (PVOID)&Adapter->astClassifierTable[nClassifierIndex],
-                                sizeof(S_MIBS_CLASSIFIER_RULE));
+        /* Copy the classifier Table */
+        for (nClassifierIndex = 0; nClassifierIndex < MAX_CLASSIFIERS; nClassifierIndex++) {
+                if (Adapter->astClassifierTable[nClassifierIndex].bUsed == TRUE)
+                        memcpy((PVOID) & pstHostMibs->
+                               astClassifierTable[nClassifierIndex],
+                               (PVOID) & Adapter->
+                               astClassifierTable[nClassifierIndex],
+                               sizeof(S_MIBS_CLASSIFIER_RULE));
         }
 
-  //Copy the SF Table
-        for(nSfIndex=0; nSfIndex < NO_OF_QUEUES ; nSfIndex++)
-        {
-        if(Adapter->PackInfo[nSfIndex].bValid)
-        {
-                        memcpy((PVOID)&pstHostMibs->astSFtable[nSfIndex],(PVOID)&Adapter->PackInfo[nSfIndex],sizeof(S_MIBS_SERVICEFLOW_TABLE));
-        }
-        else
-        {
-                //if index in not valid, don't process this for the PHS table. Go For the next entry.
-                continue ;
-        }
+        /* Copy the SF Table */
+        for (nSfIndex = 0; nSfIndex < NO_OF_QUEUES; nSfIndex++) {
+                if (Adapter->PackInfo[nSfIndex].bValid) {
+                        memcpy((PVOID) & pstHostMibs->astSFtable[nSfIndex],
+                               (PVOID) & Adapter->PackInfo[nSfIndex],
+                               sizeof(S_MIBS_SERVICEFLOW_TABLE));
+                } else {
+                        /* If index in not valid,
+                         * don't process this for the PHS table.
+                         * Go For the next entry.
+                         */
+                        continue;
+                }
 
-                //Retrieve the SFID Entry Index for requested Service Flow
-                if(PHS_INVALID_TABLE_INDEX == GetServiceFlowEntry(pDeviceExtension->pstServiceFlowPhsRulesTable,
-                                                  Adapter->PackInfo[nSfIndex].usVCID_Value ,&pstServiceFlowEntry))
-                {
+                /* Retrieve the SFID Entry Index for requested Service Flow */
+                if (PHS_INVALID_TABLE_INDEX ==
+                    GetServiceFlowEntry(pDeviceExtension->
+                                        pstServiceFlowPhsRulesTable,
+                                        Adapter->PackInfo[nSfIndex].
+                                        usVCID_Value, &pstServiceFlowEntry))
 
-                continue;
-                }
+                        continue;
 
                 pstClassifierTable = pstServiceFlowEntry->pstClassifierTable;
 
-
-                for(uiIndex = 0; uiIndex < MAX_PHSRULE_PER_SF; uiIndex++)
-                {
+                for (uiIndex = 0; uiIndex < MAX_PHSRULE_PER_SF; uiIndex++) {
                         pstClassifierRule = &pstClassifierTable->stActivePhsRulesList[uiIndex];
 
-                if(pstClassifierRule->bUsed)
-                {
-                        pstPhsRule = pstClassifierRule->pstPhsRule;
+                        if (pstClassifierRule->bUsed) {
+                                pstPhsRule = pstClassifierRule->pstPhsRule;
 
-                        pstHostMibs->astPhsRulesTable[nPhsTableIndex].ulSFID = Adapter->PackInfo[nSfIndex].ulSFID;
+                                pstHostMibs->astPhsRulesTable[nPhsTableIndex].
+                                    ulSFID = Adapter->PackInfo[nSfIndex].ulSFID;
 
-                        memcpy(&pstHostMibs->astPhsRulesTable[nPhsTableIndex].u8PHSI,
-                                                &pstPhsRule->u8PHSI,
-                                                sizeof(S_PHS_RULE));
+                                memcpy(&pstHostMibs->
+                                       astPhsRulesTable[nPhsTableIndex].u8PHSI,
+                                       &pstPhsRule->u8PHSI, sizeof(S_PHS_RULE));
                                 nPhsTableIndex++;
 
                         }
@@ -81,65 +79,63 @@ INT  ProcessGetHostMibs(PMINI_ADAPTER Adapter, S_MIBS_HOST_STATS_MIBS *pstHostMi
 
         }
 
-
-        //copy other Host Statistics parameters
+        /* Copy other Host Statistics parameters */
         pstHostMibs->stHostInfo.GoodTransmits = Adapter->dev->stats.tx_packets;
         pstHostMibs->stHostInfo.GoodReceives = Adapter->dev->stats.rx_packets;
-        pstHostMibs->stHostInfo.CurrNumFreeDesc =
-                        atomic_read(&Adapter->CurrNumFreeTxDesc);
+        pstHostMibs->stHostInfo.CurrNumFreeDesc = atomic_read(&Adapter->CurrNumFreeTxDesc);
         pstHostMibs->stHostInfo.BEBucketSize = Adapter->BEBucketSize;
         pstHostMibs->stHostInfo.rtPSBucketSize = Adapter->rtPSBucketSize;
         pstHostMibs->stHostInfo.TimerActive = Adapter->TimerActive;
         pstHostMibs->stHostInfo.u32TotalDSD = Adapter->u32TotalDSD;
 
-        memcpy(pstHostMibs->stHostInfo.aTxPktSizeHist,Adapter->aTxPktSizeHist,sizeof(UINT32)*MIBS_MAX_HIST_ENTRIES);
-        memcpy(pstHostMibs->stHostInfo.aRxPktSizeHist,Adapter->aRxPktSizeHist,sizeof(UINT32)*MIBS_MAX_HIST_ENTRIES);
+        memcpy(pstHostMibs->stHostInfo.aTxPktSizeHist, Adapter->aTxPktSizeHist, sizeof(UINT32) * MIBS_MAX_HIST_ENTRIES);
+        memcpy(pstHostMibs->stHostInfo.aRxPktSizeHist, Adapter->aRxPktSizeHist, sizeof(UINT32) * MIBS_MAX_HIST_ENTRIES);
 
         return STATUS_SUCCESS;
 }
 
-
 VOID GetDroppedAppCntrlPktMibs(S_MIBS_HOST_STATS_MIBS *pstHostMibs, const PPER_TARANG_DATA pTarang)
 {
         memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs),
-               &(pTarang->stDroppedAppCntrlMsgs),sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
+               &(pTarang->stDroppedAppCntrlMsgs),
+               sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES));
 }
 
-
-VOID CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter,
-                CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
+VOID CopyMIBSExtendedSFParameters(PMINI_ADAPTER Adapter, CServiceFlowParamSI *psfLocalSet, UINT uiSearchRuleIndex)
 {
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfSfid = psfLocalSet->u32SFID;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMaxSustainedRate = psfLocalSet->u32MaxSustainedTrafficRate;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMaxTrafficBurst = psfLocalSet->u32MaxTrafficBurst;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMinReservedRate = psfLocalSet->u32MinReservedTrafficRate;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsToleratedJitter = psfLocalSet->u32ToleratedJitter;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsMaxLatency = psfLocalSet->u32MaximumLatency;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsFixedVsVariableSduInd = psfLocalSet->u8FixedLengthVSVariableLengthSDUIndicator;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsFixedVsVariableSduInd = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsFixedVsVariableSduInd);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSduSize = psfLocalSet->u8SDUSize;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSduSize = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSduSize);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSfSchedulingType = psfLocalSet->u8ServiceFlowSchedulingType;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSfSchedulingType = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsSfSchedulingType);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqEnable = psfLocalSet->u8ARQEnable;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqEnable = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqEnable);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqWindowSize = ntohs(psfLocalSet->u16ARQWindowSize);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqWindowSize = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqWindowSize);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockLifetime = ntohs(psfLocalSet->u16ARQBlockLifeTime);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockLifetime = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockLifetime);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqSyncLossTimeout = ntohs(psfLocalSet->u16ARQSyncLossTimeOut);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqSyncLossTimeout = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqSyncLossTimeout);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqDeliverInOrder = psfLocalSet->u8ARQDeliverInOrder;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqDeliverInOrder = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqDeliverInOrder);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqRxPurgeTimeout = ntohs(psfLocalSet->u16ARQRxPurgeTimeOut);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqRxPurgeTimeout = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqRxPurgeTimeout);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockSize = ntohs(psfLocalSet->u16ARQBlockSize);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockSize = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsArqBlockSize);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsReqTxPolicy = psfLocalSet->u8RequesttransmissionPolicy;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsReqTxPolicy = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsReqTxPolicy);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnSfCsSpecification = psfLocalSet->u8CSSpecification;
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnSfCsSpecification = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnSfCsSpecification);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsTargetSaid = ntohs(psfLocalSet->u16TargetSAID);
-        Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsTargetSaid = ntohl(Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable.wmanIfCmnCpsTargetSaid);
+        S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
+
+        t->wmanIfSfid = psfLocalSet->u32SFID;
+        t->wmanIfCmnCpsMaxSustainedRate = psfLocalSet->u32MaxSustainedTrafficRate;
+        t->wmanIfCmnCpsMaxTrafficBurst = psfLocalSet->u32MaxTrafficBurst;
+        t->wmanIfCmnCpsMinReservedRate = psfLocalSet->u32MinReservedTrafficRate;
+        t->wmanIfCmnCpsToleratedJitter = psfLocalSet->u32ToleratedJitter;
+        t->wmanIfCmnCpsMaxLatency = psfLocalSet->u32MaximumLatency;
+        t->wmanIfCmnCpsFixedVsVariableSduInd = psfLocalSet->u8FixedLengthVSVariableLengthSDUIndicator;
+        t->wmanIfCmnCpsFixedVsVariableSduInd = ntohl(t->wmanIfCmnCpsFixedVsVariableSduInd);
+        t->wmanIfCmnCpsSduSize = psfLocalSet->u8SDUSize;
+        t->wmanIfCmnCpsSduSize = ntohl(t->wmanIfCmnCpsSduSize);
+        t->wmanIfCmnCpsSfSchedulingType = psfLocalSet->u8ServiceFlowSchedulingType;
+        t->wmanIfCmnCpsSfSchedulingType = ntohl(t->wmanIfCmnCpsSfSchedulingType);
+        t->wmanIfCmnCpsArqEnable = psfLocalSet->u8ARQEnable;
+        t->wmanIfCmnCpsArqEnable = ntohl(t->wmanIfCmnCpsArqEnable);
+        t->wmanIfCmnCpsArqWindowSize = ntohs(psfLocalSet->u16ARQWindowSize);
+        t->wmanIfCmnCpsArqWindowSize = ntohl(t->wmanIfCmnCpsArqWindowSize);
+        t->wmanIfCmnCpsArqBlockLifetime = ntohs(psfLocalSet->u16ARQBlockLifeTime);
+        t->wmanIfCmnCpsArqBlockLifetime = ntohl(t->wmanIfCmnCpsArqBlockLifetime);
+        t->wmanIfCmnCpsArqSyncLossTimeout = ntohs(psfLocalSet->u16ARQSyncLossTimeOut);
+        t->wmanIfCmnCpsArqSyncLossTimeout = ntohl(t->wmanIfCmnCpsArqSyncLossTimeout);
+        t->wmanIfCmnCpsArqDeliverInOrder = psfLocalSet->u8ARQDeliverInOrder;
+        t->wmanIfCmnCpsArqDeliverInOrder = ntohl(t->wmanIfCmnCpsArqDeliverInOrder);
+        t->wmanIfCmnCpsArqRxPurgeTimeout = ntohs(psfLocalSet->u16ARQRxPurgeTimeOut);
+        t->wmanIfCmnCpsArqRxPurgeTimeout = ntohl(t->wmanIfCmnCpsArqRxPurgeTimeout);
+        t->wmanIfCmnCpsArqBlockSize = ntohs(psfLocalSet->u16ARQBlockSize);
+        t->wmanIfCmnCpsArqBlockSize = ntohl(t->wmanIfCmnCpsArqBlockSize);
+        t->wmanIfCmnCpsReqTxPolicy = psfLocalSet->u8RequesttransmissionPolicy;
+        t->wmanIfCmnCpsReqTxPolicy = ntohl(t->wmanIfCmnCpsReqTxPolicy);
+        t->wmanIfCmnSfCsSpecification = psfLocalSet->u8CSSpecification;
+        t->wmanIfCmnSfCsSpecification = ntohl(t->wmanIfCmnSfCsSpecification);
+        t->wmanIfCmnCpsTargetSaid = ntohs(psfLocalSet->u16TargetSAID);
+        t->wmanIfCmnCpsTargetSaid = ntohl(t->wmanIfCmnCpsTargetSaid);
 
 }
diff --git a/drivers/staging/bcm/led_control.c b/drivers/staging/bcm/led_control.c
index 16e939fa15d6..c7f488629722 100644
--- a/drivers/staging/bcm/led_control.c
+++ b/drivers/staging/bcm/led_control.c
@@ -5,65 +5,69 @@
 
 static B_UINT16 CFG_CalculateChecksum(B_UINT8 *pu8Buffer, B_UINT32 u32Size)
 {
-        B_UINT16        u16CheckSum=0;
-        while(u32Size--) {
+        B_UINT16 u16CheckSum = 0;
+        while (u32Size--) {
                 u16CheckSum += (B_UINT8)~(*pu8Buffer);
-            pu8Buffer++;
+                pu8Buffer++;
         }
         return u16CheckSum;
 }
+
 BOOLEAN IsReqGpioIsLedInNVM(PMINI_ADAPTER Adapter, UINT gpios)
 {
-        INT Status ;
-        Status = (Adapter->gpioBitMap & gpios) ^ gpios ;
-        if(Status)
+        INT Status;
+        Status = (Adapter->gpioBitMap & gpios) ^ gpios;
+        if (Status)
                 return FALSE;
         else
                 return TRUE;
 }
 
-static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex, ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)
+static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex,
+                ULONG timeout, INT num_of_time, LedEventInfo_t currdriverstate)
 {
         int Status = STATUS_SUCCESS;
         BOOLEAN bInfinite = FALSE;
 
-        /*Check if num_of_time is -ve. If yes, blink led in infinite loop*/
-        if(num_of_time < 0)
-        {
+        /* Check if num_of_time is -ve. If yes, blink led in infinite loop */
+        if (num_of_time < 0) {
                 bInfinite = TRUE;
                 num_of_time = 1;
         }
-        while(num_of_time)
-        {
-
-                if(currdriverstate == Adapter->DriverState)
+        while (num_of_time) {
+                if (currdriverstate == Adapter->DriverState)
                         TURN_ON_LED(GPIO_Num, uiLedIndex);
 
-                /*Wait for timeout after setting on the LED*/
-                Status = wait_event_interruptible_timeout(Adapter->LEDInfo.notify_led_event,
-                                        currdriverstate != Adapter->DriverState || kthread_should_stop(),
-                                        msecs_to_jiffies(timeout));
-
-                if(kthread_should_stop())
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");
-                        Adapter->LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;
+                /* Wait for timeout after setting on the LED */
+                Status = wait_event_interruptible_timeout(
+                                Adapter->LEDInfo.notify_led_event,
+                                currdriverstate != Adapter->DriverState ||
+                                        kthread_should_stop(),
+                                msecs_to_jiffies(timeout));
+
+                if (kthread_should_stop()) {
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                                DBG_LVL_ALL,
+                                "Led thread got signal to exit..hence exiting");
+                        Adapter->LEDInfo.led_thread_running =
+                                        BCM_LED_THREAD_DISABLED;
                         TURN_OFF_LED(GPIO_Num, uiLedIndex);
-                        Status=EVENT_SIGNALED;
+                        Status = EVENT_SIGNALED;
                         break;
                 }
-                if(Status)
-                {
+                if (Status) {
                         TURN_OFF_LED(GPIO_Num, uiLedIndex);
-                        Status=EVENT_SIGNALED;
+                        Status = EVENT_SIGNALED;
                         break;
                 }
 
                 TURN_OFF_LED(GPIO_Num, uiLedIndex);
-                Status = wait_event_interruptible_timeout(Adapter->LEDInfo.notify_led_event,
-                                        currdriverstate!= Adapter->DriverState || kthread_should_stop(),
-                                        msecs_to_jiffies(timeout));
-                if(bInfinite == FALSE)
+                Status = wait_event_interruptible_timeout(
+                                Adapter->LEDInfo.notify_led_event,
+                                currdriverstate != Adapter->DriverState ||
+                                        kthread_should_stop(),
+                                msecs_to_jiffies(timeout));
+                if (bInfinite == FALSE)
                         num_of_time--;
         }
         return Status;
@@ -71,19 +75,19 @@ static INT LED_Blink(PMINI_ADAPTER Adapter, UINT GPIO_Num, UCHAR uiLedIndex, ULO
 
 static INT ScaleRateofTransfer(ULONG rate)
 {
-        if(rate <= 3)
+        if (rate <= 3)
                 return rate;
-        else if((rate > 3) && (rate <= 100))
+        else if ((rate > 3) && (rate <= 100))
                 return 5;
-        else if((rate > 100) && (rate <= 200))
+        else if ((rate > 100) && (rate <= 200))
                 return 6;
-        else if((rate > 200) && (rate <= 300))
+        else if ((rate > 200) && (rate <= 300))
                 return 7;
-        else if((rate > 300) && (rate <= 400))
+        else if ((rate > 300) && (rate <= 400))
                 return 8;
-        else if((rate > 400) && (rate <= 500))
+        else if ((rate > 400) && (rate <= 500))
                 return 9;
-        else if((rate > 500) && (rate <= 600))
+        else if ((rate > 500) && (rate <= 600))
                 return 10;
         else
                 return MAX_NUM_OF_BLINKS;
@@ -92,215 +96,232 @@ static INT ScaleRateofTransfer(ULONG rate)
 
 
 static INT LED_Proportional_Blink(PMINI_ADAPTER Adapter, UCHAR GPIO_Num_tx,
-                UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex, LedEventInfo_t currdriverstate)
+                UCHAR uiTxLedIndex, UCHAR GPIO_Num_rx, UCHAR uiRxLedIndex,
+                LedEventInfo_t currdriverstate)
 {
-        /* Initial values of TX and RX packets*/
+        /* Initial values of TX and RX packets */
         ULONG64 Initial_num_of_packts_tx = 0, Initial_num_of_packts_rx = 0;
-        /*values of TX and RX packets after 1 sec*/
+        /* values of TX and RX packets after 1 sec */
         ULONG64 Final_num_of_packts_tx = 0, Final_num_of_packts_rx = 0;
-        /*Rate of transfer of Tx and Rx in 1 sec*/
+        /* Rate of transfer of Tx and Rx in 1 sec */
         ULONG64 rate_of_transfer_tx = 0, rate_of_transfer_rx = 0;
         int Status = STATUS_SUCCESS;
         INT num_of_time = 0, num_of_time_tx = 0, num_of_time_rx = 0;
         UINT remDelay = 0;
         BOOLEAN bBlinkBothLED = TRUE;
-        //UINT GPIO_num = DISABLE_GPIO_NUM;
+        /* UINT GPIO_num = DISABLE_GPIO_NUM; */
         ulong timeout = 0;
 
-        /*Read initial value of packets sent/received */
+        /* Read initial value of packets sent/received */
         Initial_num_of_packts_tx = Adapter->dev->stats.tx_packets;
         Initial_num_of_packts_rx = Adapter->dev->stats.rx_packets;
 
-        /*Scale the rate of transfer to no of blinks.*/
-        num_of_time_tx= ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
-        num_of_time_rx= ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
+        /* Scale the rate of transfer to no of blinks. */
+        num_of_time_tx = ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
+        num_of_time_rx = ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
 
-        while((Adapter->device_removed == FALSE))
-        {
+        while ((Adapter->device_removed == FALSE)) {
                 timeout = 50;
-                /*Blink Tx and Rx LED when both Tx and Rx is in normal bandwidth*/
-                if(bBlinkBothLED)
-                {
-                        /*Assign minimum number of blinks of either Tx or Rx.*/
-                        if(num_of_time_tx > num_of_time_rx)
+                /*
+                 * Blink Tx and Rx LED when both Tx and Rx is
+                 * in normal bandwidth
+                 */
+                if (bBlinkBothLED) {
+                        /*
+                         * Assign minimum number of blinks of
+                         * either Tx or Rx.
+                         */
+                        if (num_of_time_tx > num_of_time_rx)
                                 num_of_time = num_of_time_rx;
                         else
                                 num_of_time = num_of_time_tx;
-                        if(num_of_time > 0)
-                        {
-                                /*Blink both Tx and Rx LEDs*/
-                                if(LED_Blink(Adapter, 1<<GPIO_Num_tx, uiTxLedIndex, timeout, num_of_time,currdriverstate)
+                        if (num_of_time > 0) {
+                                /* Blink both Tx and Rx LEDs */
+                                if (LED_Blink(Adapter, 1 << GPIO_Num_tx,
+                                                uiTxLedIndex, timeout,
+                                                num_of_time, currdriverstate)
                                                         == EVENT_SIGNALED)
-                                {
                                         return EVENT_SIGNALED;
-                                }
-                                if(LED_Blink(Adapter, 1<<GPIO_Num_rx, uiRxLedIndex, timeout, num_of_time,currdriverstate)
+
+                                if (LED_Blink(Adapter, 1 << GPIO_Num_rx,
+                                                uiRxLedIndex, timeout,
+                                                num_of_time, currdriverstate)
                                                         == EVENT_SIGNALED)
-                                {
                                         return EVENT_SIGNALED;
-                                }
 
                         }
 
-                        if(num_of_time == num_of_time_tx)
-                        {
-                                /*Blink pending rate of Rx*/
-                                if(LED_Blink(Adapter, (1 << GPIO_Num_rx), uiRxLedIndex, timeout,
-                                                num_of_time_rx-num_of_time,currdriverstate) == EVENT_SIGNALED)
-                                {
+                        if (num_of_time == num_of_time_tx) {
+                                /* Blink pending rate of Rx */
+                                if (LED_Blink(Adapter, (1 << GPIO_Num_rx),
+                                                uiRxLedIndex, timeout,
+                                                num_of_time_rx-num_of_time,
+                                                currdriverstate)
+                                                        == EVENT_SIGNALED)
                                         return EVENT_SIGNALED;
-                                }
+
                                 num_of_time = num_of_time_rx;
-                        }
-                        else
-                        {
-                                /*Blink pending rate of Tx*/
-                                if(LED_Blink(Adapter, 1<<GPIO_Num_tx, uiTxLedIndex, timeout,
-                                        num_of_time_tx-num_of_time,currdriverstate) == EVENT_SIGNALED)
-                                {
+                        } else {
+                                /* Blink pending rate of Tx */
+                                if (LED_Blink(Adapter, 1 << GPIO_Num_tx,
+                                                uiTxLedIndex, timeout,
+                                                num_of_time_tx-num_of_time,
+                                                currdriverstate)
+                                                        == EVENT_SIGNALED)
                                         return EVENT_SIGNALED;
-                                }
+
                                 num_of_time = num_of_time_tx;
                         }
-                }
-                else
-                {
-                        if(num_of_time == num_of_time_tx)
-                        {
-                                /*Blink pending rate of Rx*/
-                                if(LED_Blink(Adapter, 1<<GPIO_Num_tx, uiTxLedIndex, timeout, num_of_time,currdriverstate)
+                } else {
+                        if (num_of_time == num_of_time_tx) {
+                                /* Blink pending rate of Rx */
+                                if (LED_Blink(Adapter, 1 << GPIO_Num_tx,
+                                                uiTxLedIndex, timeout,
+                                                num_of_time, currdriverstate)
                                                         == EVENT_SIGNALED)
-                                {
                                         return EVENT_SIGNALED;
-                                }
-                        }
-                        else
-                        {
-                                /*Blink pending rate of Tx*/
-                                if(LED_Blink(Adapter, 1<<GPIO_Num_rx, uiRxLedIndex, timeout,
-                                                num_of_time,currdriverstate) == EVENT_SIGNALED)
-                                {
+                        } else {
+                                /* Blink pending rate of Tx */
+                                if (LED_Blink(Adapter, 1 << GPIO_Num_rx,
+                                                uiRxLedIndex, timeout,
+                                                num_of_time, currdriverstate)
+                                                        == EVENT_SIGNALED)
                                         return EVENT_SIGNALED;
-                                }
                         }
                 }
-                /* If Tx/Rx rate is less than maximum blinks per second,
-                         * wait till delay completes to 1 second
-                         */
+
+                /*
+                 * If Tx/Rx rate is less than maximum blinks per second,
+                 * wait till delay completes to 1 second
+                 */
                 remDelay = MAX_NUM_OF_BLINKS - num_of_time;
-                if(remDelay > 0)
-                {
-                        timeout= 100 * remDelay;
-                        Status = wait_event_interruptible_timeout(Adapter->LEDInfo.notify_led_event,
-                                                currdriverstate!= Adapter->DriverState ||kthread_should_stop() ,
-                                                msecs_to_jiffies (timeout));
-
-                        if(kthread_should_stop())
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");
-                                Adapter->LEDInfo.led_thread_running= BCM_LED_THREAD_DISABLED;
+                if (remDelay > 0) {
+                        timeout = 100 * remDelay;
+                        Status = wait_event_interruptible_timeout(
+                                        Adapter->LEDInfo.notify_led_event,
+                                        currdriverstate != Adapter->DriverState
+                                                || kthread_should_stop(),
+                                        msecs_to_jiffies(timeout));
+
+                        if (kthread_should_stop()) {
+                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                                        LED_DUMP_INFO, DBG_LVL_ALL,
+                                        "Led thread got signal to exit..hence exiting");
+                                Adapter->LEDInfo.led_thread_running =
+                                                BCM_LED_THREAD_DISABLED;
                                 return EVENT_SIGNALED;
                         }
-                        if(Status)
+                        if (Status)
                                 return EVENT_SIGNALED;
                 }
 
-                /*Turn off both Tx and Rx LEDs before next second*/
-                TURN_OFF_LED(1<<GPIO_Num_tx, uiTxLedIndex);
-                TURN_OFF_LED(1<<GPIO_Num_rx, uiTxLedIndex);
+                /* Turn off both Tx and Rx LEDs before next second */
+                TURN_OFF_LED(1 << GPIO_Num_tx, uiTxLedIndex);
+                TURN_OFF_LED(1 << GPIO_Num_rx, uiTxLedIndex);
 
                 /*
-                 * Read the Tx & Rx packets transmission after 1 second and
-                 * calculate rate of transfer
-                 */
+                 * Read the Tx & Rx packets transmission after 1 second and
+                 * calculate rate of transfer
+                 */
                 Final_num_of_packts_tx = Adapter->dev->stats.tx_packets;
                 Final_num_of_packts_rx = Adapter->dev->stats.rx_packets;
 
-                rate_of_transfer_tx = Final_num_of_packts_tx - Initial_num_of_packts_tx;
-                rate_of_transfer_rx = Final_num_of_packts_rx - Initial_num_of_packts_rx;
+                rate_of_transfer_tx = Final_num_of_packts_tx -
+                                                Initial_num_of_packts_tx;
+                rate_of_transfer_rx = Final_num_of_packts_rx -
+                                                Initial_num_of_packts_rx;
 
-                /*Read initial value of packets sent/received */
+                /* Read initial value of packets sent/received */
                 Initial_num_of_packts_tx = Final_num_of_packts_tx;
-                Initial_num_of_packts_rx = Final_num_of_packts_rx ;
+                Initial_num_of_packts_rx = Final_num_of_packts_rx;
 
-                /*Scale the rate of transfer to no of blinks.*/
-                num_of_time_tx= ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
-                num_of_time_rx= ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
+                /* Scale the rate of transfer to no of blinks. */
+                num_of_time_tx =
+                        ScaleRateofTransfer((ULONG)rate_of_transfer_tx);
+                num_of_time_rx =
+                        ScaleRateofTransfer((ULONG)rate_of_transfer_rx);
 
         }
         return Status;
 }
 
-
-//-----------------------------------------------------------------------------
-// Procedure:   ValidateDSDParamsChecksum
-//
-// Description: Reads DSD Params and validates checkusm.
-//
-// Arguments:
-//      Adapter - Pointer to Adapter structure.
-//      ulParamOffset - Start offset of the DSD parameter to be read and validated.
-//      usParamLen - Length of the DSD Parameter.
-//
-// Returns:
-//  <OSAL_STATUS_CODE>
-//-----------------------------------------------------------------------------
-
-static INT ValidateDSDParamsChecksum(
-                                                                                                        PMINI_ADAPTER Adapter,
-                                                                                                        ULONG  ulParamOffset,
-                                                                                                        USHORT usParamLen )
+/*
+ * -----------------------------------------------------------------------------
+ * Procedure:   ValidateDSDParamsChecksum
+ *
+ * Description: Reads DSD Params and validates checkusm.
+ *
+ * Arguments:
+ *      Adapter - Pointer to Adapter structure.
+ *      ulParamOffset - Start offset of the DSD parameter to be read and
+ *                      validated.
+ *      usParamLen - Length of the DSD Parameter.
+ *
+ * Returns:
+ *  <OSAL_STATUS_CODE>
+ * -----------------------------------------------------------------------------
+ */
+static INT ValidateDSDParamsChecksum(PMINI_ADAPTER Adapter, ULONG ulParamOffset,
+                                        USHORT usParamLen)
 {
         INT Status = STATUS_SUCCESS;
-        PUCHAR puBuffer                     = NULL;
-        USHORT usChksmOrg                   = 0;
+        PUCHAR puBuffer = NULL;
+        USHORT usChksmOrg = 0;
         USHORT usChecksumCalculated = 0;
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",ulParamOffset, usParamLen);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "LED Thread:ValidateDSDParamsChecksum: 0x%lx 0x%X",
+                ulParamOffset, usParamLen);
 
         puBuffer = kmalloc(usParamLen, GFP_KERNEL);
-        if(!puBuffer)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum Allocation failed");
+        if (!puBuffer) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL,
+                        "LED Thread: ValidateDSDParamsChecksum Allocation failed");
                 return -ENOMEM;
 
         }
 
-    //
-    //  Read the DSD data from the parameter offset.
-    //
-        if(STATUS_SUCCESS != BeceemNVMRead(Adapter,(PUINT)puBuffer,ulParamOffset,usParamLen))
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");
-                Status=STATUS_IMAGE_CHECKSUM_MISMATCH;
+        /* Read the DSD data from the parameter offset. */
+        if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)puBuffer,
+                        ulParamOffset, usParamLen)) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL,
+                        "LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");
+                Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
                 goto exit;
         }
 
-        //
-        //      Calculate the checksum of the data read from the DSD parameter.
-        //
-        usChecksumCalculated = CFG_CalculateChecksum(puBuffer,usParamLen);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: usCheckSumCalculated = 0x%x\n", usChecksumCalculated);
-
-        //
-        //      End of the DSD parameter will have a TWO bytes checksum stored in it. Read it and compare with the calculated
-        //      Checksum.
-        //
-        if(STATUS_SUCCESS != BeceemNVMRead(Adapter,(PUINT)&usChksmOrg,ulParamOffset+usParamLen,2))
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");
-                Status=STATUS_IMAGE_CHECKSUM_MISMATCH;
+        /* Calculate the checksum of the data read from the DSD parameter. */
+        usChecksumCalculated = CFG_CalculateChecksum(puBuffer, usParamLen);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "LED Thread: usCheckSumCalculated = 0x%x\n",
+                usChecksumCalculated);
+
+        /*
+         * End of the DSD parameter will have a TWO bytes checksum stored in it.
+         * Read it and compare with the calculated Checksum.
+         */
+        if (STATUS_SUCCESS != BeceemNVMRead(Adapter, (PUINT)&usChksmOrg,
+                        ulParamOffset+usParamLen, 2)) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL,
+                        "LED Thread: ValidateDSDParamsChecksum BeceemNVMRead failed");
+                Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
                 goto exit;
         }
         usChksmOrg = ntohs(usChksmOrg);
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: usChksmOrg = 0x%x", usChksmOrg);
-
-        //
-        //      Compare the checksum calculated with the checksum read from DSD section
-        //
-        if(usChecksumCalculated ^ usChksmOrg)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: ValidateDSDParamsChecksum: Checksums don't match");
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "LED Thread: usChksmOrg = 0x%x", usChksmOrg);
+
+        /*
+         * Compare the checksum calculated with the checksum read
+         * from DSD section
+         */
+        if (usChecksumCalculated ^ usChksmOrg) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL,
+                        "LED Thread: ValidateDSDParamsChecksum: Checksums don't match");
                 Status = STATUS_IMAGE_CHECKSUM_MISMATCH;
                 goto exit;
         }
@@ -311,523 +332,526 @@ exit:
 }
 
 
-//-----------------------------------------------------------------------------
-// Procedure:   ValidateHWParmStructure
-//
-// Description: Validates HW Parameters.
-//
-// Arguments:
-//      Adapter - Pointer to Adapter structure.
-//      ulHwParamOffset - Start offset of the HW parameter Section to be read and validated.
-//
-// Returns:
-//  <OSAL_STATUS_CODE>
-//-----------------------------------------------------------------------------
-
+/*
+ * -----------------------------------------------------------------------------
+ * Procedure:   ValidateHWParmStructure
+ *
+ * Description: Validates HW Parameters.
+ *
+ * Arguments:
+ *      Adapter - Pointer to Adapter structure.
+ *      ulHwParamOffset - Start offset of the HW parameter Section to be read
+ *                              and validated.
+ *
+ * Returns:
+ *  <OSAL_STATUS_CODE>
+ * -----------------------------------------------------------------------------
+ */
 static INT ValidateHWParmStructure(PMINI_ADAPTER Adapter, ULONG ulHwParamOffset)
 {
 
-        INT Status = STATUS_SUCCESS ;
+        INT Status = STATUS_SUCCESS;
         USHORT HwParamLen = 0;
-        // Add DSD start offset to the hwParamOffset to get the actual address.
+        /*
+         * Add DSD start offset to the hwParamOffset to get
+         * the actual address.
+         */
         ulHwParamOffset += DSD_START_OFFSET;
 
-        /*Read the Length of HW_PARAM structure*/
-        BeceemNVMRead(Adapter,(PUINT)&HwParamLen,ulHwParamOffset,2);
+        /* Read the Length of HW_PARAM structure */
+        BeceemNVMRead(Adapter, (PUINT)&HwParamLen, ulHwParamOffset, 2);
         HwParamLen = ntohs(HwParamLen);
-        if(0==HwParamLen || HwParamLen > Adapter->uiNVMDSDSize)
-        {
+        if (0 == HwParamLen || HwParamLen > Adapter->uiNVMDSDSize)
                 return STATUS_IMAGE_CHECKSUM_MISMATCH;
-        }
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "LED Thread:HwParamLen = 0x%x", HwParamLen);
-        Status =ValidateDSDParamsChecksum(Adapter,ulHwParamOffset,HwParamLen);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "LED Thread:HwParamLen = 0x%x", HwParamLen);
+        Status = ValidateDSDParamsChecksum(Adapter, ulHwParamOffset,
+                                                HwParamLen);
         return Status;
 } /* ValidateHWParmStructure() */
 
-static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter, UCHAR GPIO_Array[])
+static int ReadLEDInformationFromEEPROM(PMINI_ADAPTER Adapter,
+                                        UCHAR GPIO_Array[])
 {
         int Status = STATUS_SUCCESS;
 
-        ULONG  dwReadValue              = 0;
-        USHORT usHwParamData    = 0;
-        USHORT usEEPROMVersion  = 0;
-        UCHAR  ucIndex                  = 0;
-        UCHAR  ucGPIOInfo[32]   = {0};
+        ULONG  dwReadValue      = 0;
+        USHORT usHwParamData    = 0;
+        USHORT usEEPROMVersion  = 0;
+        UCHAR  ucIndex          = 0;
+        UCHAR  ucGPIOInfo[32]   = {0};
 
-        BeceemNVMRead(Adapter,(PUINT)&usEEPROMVersion,EEPROM_VERSION_OFFSET,2);
+        BeceemNVMRead(Adapter, (PUINT)&usEEPROMVersion,
+                        EEPROM_VERSION_OFFSET, 2);
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"usEEPROMVersion: Minor:0x%X Major:0x%x",usEEPROMVersion&0xFF, ((usEEPROMVersion>>8)&0xFF));
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "usEEPROMVersion: Minor:0x%X Major:0x%x",
+                usEEPROMVersion&0xFF, ((usEEPROMVersion>>8)&0xFF));
 
 
-        if(((usEEPROMVersion>>8)&0xFF) < EEPROM_MAP5_MAJORVERSION)
-        {
-                BeceemNVMRead(Adapter,(PUINT)&usHwParamData,EEPROM_HW_PARAM_POINTER_ADDRESS,2);
+        if (((usEEPROMVersion>>8)&0xFF) < EEPROM_MAP5_MAJORVERSION) {
+                BeceemNVMRead(Adapter, (PUINT)&usHwParamData,
+                        EEPROM_HW_PARAM_POINTER_ADDRESS, 2);
                 usHwParamData = ntohs(usHwParamData);
                 dwReadValue   = usHwParamData;
-        }
-        else
-        {
-                //
-                // Validate Compatibility section and then read HW param if compatibility section is valid.
-                //
+        } else {
+                /*
+                 * Validate Compatibility section and then read HW param
+                 * if compatibility section is valid.
+                 */
                 Status = ValidateDSDParamsChecksum(Adapter,
-                                           DSD_START_OFFSET,
-                                           COMPATIBILITY_SECTION_LENGTH_MAP5);
+                                DSD_START_OFFSET,
+                                COMPATIBILITY_SECTION_LENGTH_MAP5);
 
-                if(Status != STATUS_SUCCESS)
-                {
+                if (Status != STATUS_SUCCESS)
                         return Status;
-                }
-                BeceemNVMRead(Adapter,(PUINT)&dwReadValue,EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5,4);
+
+                BeceemNVMRead(Adapter, (PUINT)&dwReadValue,
+                        EEPROM_HW_PARAM_POINTER_ADDRRES_MAP5, 4);
                 dwReadValue = ntohl(dwReadValue);
         }
 
 
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Start address of HW_PARAM structure = 0x%lx",dwReadValue);
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "LED Thread: Start address of HW_PARAM structure = 0x%lx",
+                dwReadValue);
 
-        //
-        // Validate if the address read out is within the DSD.
-        // Adapter->uiNVMDSDSize gives whole DSD size inclusive of Autoinit.
-        // lower limit should be above DSD_START_OFFSET and
-        // upper limit should be below (Adapter->uiNVMDSDSize-DSD_START_OFFSET)
-        //
-        if(dwReadValue < DSD_START_OFFSET ||
-           dwReadValue > (Adapter->uiNVMDSDSize-DSD_START_OFFSET))
-        {
+        /*
+         * Validate if the address read out is within the DSD.
+         * Adapter->uiNVMDSDSize gives whole DSD size inclusive of Autoinit.
+         * lower limit should be above DSD_START_OFFSET and
+         * upper limit should be below (Adapter->uiNVMDSDSize-DSD_START_OFFSET)
+         */
+        if (dwReadValue < DSD_START_OFFSET ||
+                        dwReadValue > (Adapter->uiNVMDSDSize-DSD_START_OFFSET))
                 return STATUS_IMAGE_CHECKSUM_MISMATCH;
-        }
 
         Status = ValidateHWParmStructure(Adapter, dwReadValue);
-        if(Status){
+        if (Status)
                 return Status;
-        }
 
         /*
-          Add DSD_START_OFFSET to the offset read from the EEPROM.
-          This will give the actual start HW Parameters start address.
-          To read GPIO section, add GPIO offset further.
-        */
-
-        dwReadValue += DSD_START_OFFSET; // = start address of hw param section.
-        dwReadValue += GPIO_SECTION_START_OFFSET; // = GPIO start offset within HW Param section.
-
-        /* Read the GPIO values for 32 GPIOs from EEPROM and map the function
-         * number to GPIO pin number to GPIO_Array
-         */
-        BeceemNVMRead(Adapter, (UINT *)ucGPIOInfo,dwReadValue,32);
-        for(ucIndex = 0; ucIndex < 32; ucIndex++)
-         {
-
-                 switch(ucGPIOInfo[ucIndex])
-                        {
-                                case RED_LED:
-                                {
-                                        GPIO_Array[RED_LED] = ucIndex;
-                                        Adapter->gpioBitMap |= (1<<ucIndex);
-                                        break;
-                                }
-                                case BLUE_LED:
-                                {
-                                        GPIO_Array[BLUE_LED] = ucIndex;
-                                        Adapter->gpioBitMap |= (1<<ucIndex);
-                                        break;
-                                }
-                                case YELLOW_LED:
-                                {
-                                         GPIO_Array[YELLOW_LED] = ucIndex;
-                                         Adapter->gpioBitMap |= (1<<ucIndex);
-                                         break;
-                                }
-                                case GREEN_LED:
-                                {
-                                        GPIO_Array[GREEN_LED] = ucIndex;
-                                        Adapter->gpioBitMap |= (1<<ucIndex);
-                                        break;
-                                }
-                                default:
-                                        break;
-                        }
+         * Add DSD_START_OFFSET to the offset read from the EEPROM.
+         * This will give the actual start HW Parameters start address.
+         * To read GPIO section, add GPIO offset further.
+         */
+
+        dwReadValue +=
+                DSD_START_OFFSET; /* = start address of hw param section. */
+        dwReadValue += GPIO_SECTION_START_OFFSET;
+                        /* = GPIO start offset within HW Param section. */
 
+        /*
+         * Read the GPIO values for 32 GPIOs from EEPROM and map the function
+         * number to GPIO pin number to GPIO_Array
+         */
+        BeceemNVMRead(Adapter, (UINT *)ucGPIOInfo, dwReadValue, 32);
+        for (ucIndex = 0; ucIndex < 32; ucIndex++) {
+
+                switch (ucGPIOInfo[ucIndex]) {
+                case RED_LED:
+                        GPIO_Array[RED_LED] = ucIndex;
+                        Adapter->gpioBitMap |= (1 << ucIndex);
+                        break;
+                case BLUE_LED:
+                        GPIO_Array[BLUE_LED] = ucIndex;
+                        Adapter->gpioBitMap |= (1 << ucIndex);
+                        break;
+                case YELLOW_LED:
+                        GPIO_Array[YELLOW_LED] = ucIndex;
+                        Adapter->gpioBitMap |= (1 << ucIndex);
+                        break;
+                case GREEN_LED:
+                        GPIO_Array[GREEN_LED] = ucIndex;
+                        Adapter->gpioBitMap |= (1 << ucIndex);
+                        break;
+                default:
+                        break;
                 }
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"GPIO's bit map correspond to LED :0x%X",Adapter->gpioBitMap);
-         return Status;
+
+        }
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "GPIO's bit map correspond to LED :0x%X", Adapter->gpioBitMap);
+        return Status;
 }
 
 
-static int ReadConfigFileStructure(PMINI_ADAPTER Adapter, BOOLEAN *bEnableThread)
+static int ReadConfigFileStructure(PMINI_ADAPTER Adapter,
+                                        BOOLEAN *bEnableThread)
 {
         int Status = STATUS_SUCCESS;
-        UCHAR GPIO_Array[NUM_OF_LEDS+1]; /*Array to store GPIO numbers from EEPROM*/
+        /* Array to store GPIO numbers from EEPROM */
+        UCHAR GPIO_Array[NUM_OF_LEDS+1];
         UINT uiIndex = 0;
         UINT uiNum_of_LED_Type = 0;
         PUCHAR puCFGData        = NULL;
         UCHAR bData = 0;
         memset(GPIO_Array, DISABLE_GPIO_NUM, NUM_OF_LEDS+1);
 
-        if(!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams))
-        {
-                BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Target Params not Avail.\n");
+        if (!Adapter->pstargetparams || IS_ERR(Adapter->pstargetparams)) {
+                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL, "Target Params not Avail.\n");
                 return -ENOENT;
         }
 
-        /*Populate GPIO_Array with GPIO numbers for LED functions*/
-        /*Read the GPIO numbers from EEPROM*/
+        /* Populate GPIO_Array with GPIO numbers for LED functions */
+        /* Read the GPIO numbers from EEPROM */
         Status = ReadLEDInformationFromEEPROM(Adapter, GPIO_Array);
-        if(Status == STATUS_IMAGE_CHECKSUM_MISMATCH)
-        {
+        if (Status == STATUS_IMAGE_CHECKSUM_MISMATCH) {
                 *bEnableThread = FALSE;
                 return STATUS_SUCCESS;
-        }
-        else if(Status)
-        {
+        } else if (Status) {
                 *bEnableThread = FALSE;
                 return Status;
         }
-  /*
-     * CONFIG file read successfully. Deallocate the memory of
-     * uiFileNameBufferSize
-     */
-        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: Config file read successfully\n");
+
+        /*
+         * CONFIG file read successfully. Deallocate the memory of
+         * uiFileNameBufferSize
+         */
+        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,
+                "LED Thread: Config file read successfully\n");
         puCFGData = (PUCHAR) &Adapter->pstargetparams->HostDrvrConfig1;
 
         /*
-         * Offset for HostDrvConfig1, HostDrvConfig2, HostDrvConfig3 which
-         * will have the information of LED type, LED on state for different
-         * driver state and LED blink state.
-         */
+         * Offset for HostDrvConfig1, HostDrvConfig2, HostDrvConfig3 which
+         * will have the information of LED type, LED on state for different
+         * driver state and LED blink state.
+         */
 
-        for(uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++)
-        {
+        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
                 bData = *puCFGData;
 
-                /*Check Bit 8 for polarity. If it is set, polarity is reverse polarity*/
-                if(bData & 0x80)
-                {
+                /*
+                 * Check Bit 8 for polarity. If it is set,
+                 * polarity is reverse polarity
+                 */
+                if (bData & 0x80) {
                         Adapter->LEDInfo.LEDState[uiIndex].BitPolarity = 0;
-                        /*unset the bit 8*/
+                        /* unset the bit 8 */
                         bData = bData & 0x7f;
                 }
 
                 Adapter->LEDInfo.LEDState[uiIndex].LED_Type = bData;
-                if(bData <= NUM_OF_LEDS)
-                        Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num = GPIO_Array[bData];
+                if (bData <= NUM_OF_LEDS)
+                        Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num =
+                                                        GPIO_Array[bData];
                 else
-                        Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num = DISABLE_GPIO_NUM;
+                        Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num =
+                                                        DISABLE_GPIO_NUM;
 
                 puCFGData++;
                 bData = *puCFGData;
                 Adapter->LEDInfo.LEDState[uiIndex].LED_On_State = bData;
                 puCFGData++;
                 bData = *puCFGData;
-                Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State= bData;
+                Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State = bData;
                 puCFGData++;
         }
 
-        /*Check if all the LED settings are disabled. If it is disabled, dont launch the LED control thread.*/
-        for(uiIndex = 0; uiIndex<NUM_OF_LEDS; uiIndex++)
-        {
-                if((Adapter->LEDInfo.LEDState[uiIndex].LED_Type == DISABLE_GPIO_NUM) ||
-                        (Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0x7f) ||
+        /*
+         * Check if all the LED settings are disabled. If it is disabled,
+         * dont launch the LED control thread.
+         */
+        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
+                if ((Adapter->LEDInfo.LEDState[uiIndex].LED_Type == DISABLE_GPIO_NUM) ||
+                        (Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0x7f) ||
                         (Adapter->LEDInfo.LEDState[uiIndex].LED_Type == 0))
                         uiNum_of_LED_Type++;
         }
-        if(uiNum_of_LED_Type >= NUM_OF_LEDS)
+        if (uiNum_of_LED_Type >= NUM_OF_LEDS)
                 *bEnableThread = FALSE;
 
         return Status;
 }
-//--------------------------------------------------------------------------
-// Procedure:   LedGpioInit
-//
-// Description: Initializes LED GPIOs. Makes the LED GPIOs to OUTPUT mode and make the
-//                        initial state to be OFF.
-//
-// Arguments:
-//      Adapter - Pointer to MINI_ADAPTER structure.
-//
-// Returns: VOID
-//
-//-----------------------------------------------------------------------------
 
+/*
+ * -----------------------------------------------------------------------------
+ * Procedure:   LedGpioInit
+ *
+ * Description: Initializes LED GPIOs. Makes the LED GPIOs to OUTPUT mode
+ *                        and make the initial state to be OFF.
+ *
+ * Arguments:
+ *      Adapter - Pointer to MINI_ADAPTER structure.
+ *
+ * Returns: VOID
+ *
+ * -----------------------------------------------------------------------------
+ */
 static VOID LedGpioInit(PMINI_ADAPTER Adapter)
 {
         UINT uiResetValue = 0;
         UINT uiIndex      = 0;
 
         /* Set all LED GPIO Mode to output mode */
-        if(rdmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue, sizeof(uiResetValue)) <0)
-                BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: RDM Failed\n");
-        for(uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++)
-        {
-                if(Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)
+        if (rdmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
+                        sizeof(uiResetValue)) < 0)
+                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL, "LED Thread: RDM Failed\n");
+        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
+                if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num !=
+                                DISABLE_GPIO_NUM)
                         uiResetValue |= (1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num);
-                TURN_OFF_LED(1<<Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num,uiIndex);
+                TURN_OFF_LED(1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num,
+                                uiIndex);
         }
-        if(wrmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue, sizeof(uiResetValue)) < 0)
-                BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: WRM Failed\n");
+        if (wrmalt(Adapter, GPIO_MODE_REGISTER, &uiResetValue,
+                        sizeof(uiResetValue)) < 0)
+                BCM_DEBUG_PRINT (Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL, "LED Thread: WRM Failed\n");
 
-        Adapter->LEDInfo.bIdle_led_off =  FALSE;
+        Adapter->LEDInfo.bIdle_led_off = FALSE;
 }
-//-----------------------------------------------------------------------------
 
-static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx, UCHAR *GPIO_num_rx ,UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,LedEventInfo_t currdriverstate)
+static INT BcmGetGPIOPinInfo(PMINI_ADAPTER Adapter, UCHAR *GPIO_num_tx,
+                UCHAR *GPIO_num_rx, UCHAR *uiLedTxIndex, UCHAR *uiLedRxIndex,
+                LedEventInfo_t currdriverstate)
 {
         UINT uiIndex = 0;
 
         *GPIO_num_tx = DISABLE_GPIO_NUM;
         *GPIO_num_rx = DISABLE_GPIO_NUM;
 
-        for(uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++)
-        {
+        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
 
-                if((currdriverstate == NORMAL_OPERATION)||
-                        (currdriverstate == IDLEMODE_EXIT)||
-                        (currdriverstate == FW_DOWNLOAD))
-                {
-                        if(Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State & currdriverstate)
-                        {
-                                if(Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)
-                                {
-                                        if(*GPIO_num_tx == DISABLE_GPIO_NUM)
-                                        {
+                if ((currdriverstate == NORMAL_OPERATION) ||
+                                (currdriverstate == IDLEMODE_EXIT) ||
+                                (currdriverstate == FW_DOWNLOAD)) {
+                        if (Adapter->LEDInfo.LEDState[uiIndex].LED_Blink_State &
+                                        currdriverstate) {
+                                if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
+                                                != DISABLE_GPIO_NUM) {
+                                        if (*GPIO_num_tx == DISABLE_GPIO_NUM) {
                                                 *GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
                                                 *uiLedTxIndex = uiIndex;
-                                        }
-                                        else
-                                        {
+                                        } else {
                                                 *GPIO_num_rx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
                                                 *uiLedRxIndex = uiIndex;
                                         }
                                 }
                         }
-                }
-                else
-                {
-                        if(Adapter->LEDInfo.LEDState[uiIndex].LED_On_State & currdriverstate)
-                        {
-                                if(Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)
-                                {
+                } else {
+                        if (Adapter->LEDInfo.LEDState[uiIndex].LED_On_State
+                                        & currdriverstate) {
+                                if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
+                                                != DISABLE_GPIO_NUM) {
                                         *GPIO_num_tx = Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num;
                                         *uiLedTxIndex = uiIndex;
                                 }
                         }
                 }
         }
-        return STATUS_SUCCESS ;
+        return STATUS_SUCCESS;
 }
 static VOID LEDControlThread(PMINI_ADAPTER Adapter)
 {
         UINT uiIndex = 0;
         UCHAR GPIO_num = 0;
-        UCHAR uiLedIndex = 0 ;
+        UCHAR uiLedIndex = 0;
         UINT uiResetValue = 0;
         LedEventInfo_t currdriverstate = 0;
         ulong timeout = 0;
 
         INT Status = 0;
 
-        UCHAR  dummyGPIONum = 0;
-        UCHAR  dummyIndex = 0;
+        UCHAR dummyGPIONum = 0;
+        UCHAR dummyIndex = 0;
 
-        //currdriverstate = Adapter->DriverState;
+        /* currdriverstate = Adapter->DriverState; */
         Adapter->LEDInfo.bIdleMode_tx_from_host = FALSE;
 
-        /*Wait till event is triggered*/
-        //wait_event(Adapter->LEDInfo.notify_led_event,
-                        //      currdriverstate!= Adapter->DriverState);
+        /*
+         * Wait till event is triggered
+         *
+         * wait_event(Adapter->LEDInfo.notify_led_event,
+         *      currdriverstate!= Adapter->DriverState);
+         */
 
-        GPIO_num = DISABLE_GPIO_NUM ;
+        GPIO_num = DISABLE_GPIO_NUM;
 
-        while(TRUE)
-        {
-                /*Wait till event is triggered*/
-                if( (GPIO_num == DISABLE_GPIO_NUM)
+        while (TRUE) {
+                /* Wait till event is triggered */
+                if ((GPIO_num == DISABLE_GPIO_NUM)
                                                 ||
-                        ((currdriverstate != FW_DOWNLOAD) &&
-                         (currdriverstate != NORMAL_OPERATION) &&
-                         (currdriverstate != LOWPOWER_MODE_ENTER))
-                                                ||
-                         (currdriverstate == LED_THREAD_INACTIVE)       )
-                {
-                        Status = wait_event_interruptible(Adapter->LEDInfo.notify_led_event,
-                                currdriverstate != Adapter->DriverState || kthread_should_stop());
-                }
-
-                if(kthread_should_stop() || Adapter->device_removed )
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Led thread got signal to exit..hence exiting");
-                        Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;
-                        TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
-                        return ;//STATUS_FAILURE;
+                                ((currdriverstate != FW_DOWNLOAD) &&
+                                 (currdriverstate != NORMAL_OPERATION) &&
+                                 (currdriverstate != LOWPOWER_MODE_ENTER))
+                                                ||
+                                (currdriverstate == LED_THREAD_INACTIVE))
+                        Status = wait_event_interruptible(
+                                        Adapter->LEDInfo.notify_led_event,
+                                        currdriverstate != Adapter->DriverState
+                                                || kthread_should_stop());
+
+                if (kthread_should_stop() || Adapter->device_removed) {
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                                DBG_LVL_ALL,
+                                "Led thread got signal to exit..hence exiting");
+                        Adapter->LEDInfo.led_thread_running =
+                                                BCM_LED_THREAD_DISABLED;
+                        TURN_OFF_LED(1 << GPIO_num, uiLedIndex);
+                        return; /* STATUS_FAILURE; */
                 }
 
-                if(GPIO_num != DISABLE_GPIO_NUM)
-                {
-                        TURN_OFF_LED(1<<GPIO_num, uiLedIndex);
-                }
+                if (GPIO_num != DISABLE_GPIO_NUM)
+                        TURN_OFF_LED(1 << GPIO_num, uiLedIndex);
 
-                if(Adapter->LEDInfo.bLedInitDone == FALSE)
-                {
+                if (Adapter->LEDInfo.bLedInitDone == FALSE) {
                         LedGpioInit(Adapter);
                         Adapter->LEDInfo.bLedInitDone = TRUE;
                 }
 
-                switch(Adapter->DriverState)
-                {
-                        case DRIVER_INIT:
-                        {
-                                currdriverstate = DRIVER_INIT;//Adapter->DriverState;
-                                BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex, currdriverstate);
+                switch (Adapter->DriverState) {
+                case DRIVER_INIT:
+                        currdriverstate = DRIVER_INIT;
+                                        /* Adapter->DriverState; */
+                        BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
+                                &uiLedIndex, &dummyIndex, currdriverstate);
+
+                        if (GPIO_num != DISABLE_GPIO_NUM)
+                                TURN_ON_LED(1 << GPIO_num, uiLedIndex);
 
-                                if(GPIO_num  != DISABLE_GPIO_NUM)
-                                {
-                                        TURN_ON_LED(1<<GPIO_num, uiLedIndex);
-                                }
-                        }
                         break;
-                        case FW_DOWNLOAD:
-                        {
-                                //BCM_DEBUG_PRINT (Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FW_DN_DONE called\n");
-                                currdriverstate = FW_DOWNLOAD;
-                                BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,  &uiLedIndex, &dummyIndex, currdriverstate);
-
-                                if(GPIO_num != DISABLE_GPIO_NUM)
-                                {
-                                        timeout = 50;
-                                        LED_Blink(Adapter, 1<<GPIO_num, uiLedIndex, timeout, -1,currdriverstate);
-                                }
+                case FW_DOWNLOAD:
+                        /*
+                         * BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+                         *      LED_DUMP_INFO, DBG_LVL_ALL,
+                         *      "LED Thread: FW_DN_DONE called\n");
+                         */
+                        currdriverstate = FW_DOWNLOAD;
+                        BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
+                                &uiLedIndex, &dummyIndex, currdriverstate);
+
+                        if (GPIO_num != DISABLE_GPIO_NUM) {
+                                timeout = 50;
+                                LED_Blink(Adapter, 1 << GPIO_num, uiLedIndex,
+                                        timeout, -1, currdriverstate);
                         }
                         break;
-                        case FW_DOWNLOAD_DONE:
-                        {
-                                currdriverstate = FW_DOWNLOAD_DONE;
-                                BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex, &dummyIndex,currdriverstate);
-                                if(GPIO_num != DISABLE_GPIO_NUM)
-                                {
-                                        TURN_ON_LED(1<<GPIO_num, uiLedIndex);
-                                }
-                        }
+                case FW_DOWNLOAD_DONE:
+                        currdriverstate = FW_DOWNLOAD_DONE;
+                        BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
+                                &uiLedIndex, &dummyIndex, currdriverstate);
+                        if (GPIO_num != DISABLE_GPIO_NUM)
+                                TURN_ON_LED(1 << GPIO_num, uiLedIndex);
                         break;
 
-                        case SHUTDOWN_EXIT:
-                        //no break, continue to NO_NETWORK_ENTRY state as well.
-
-                        case NO_NETWORK_ENTRY:
-                        {
-                                currdriverstate = NO_NETWORK_ENTRY;
-                                BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum, &uiLedIndex,&dummyGPIONum,currdriverstate);
-                                if(GPIO_num != DISABLE_GPIO_NUM)
-                                {
-                                        TURN_ON_LED(1<<GPIO_num, uiLedIndex);
-                                }
-                        }
+                case SHUTDOWN_EXIT:
+                        /*
+                         * no break, continue to NO_NETWORK_ENTRY
+                         * state as well.
+                         */
+                case NO_NETWORK_ENTRY:
+                        currdriverstate = NO_NETWORK_ENTRY;
+                        BcmGetGPIOPinInfo(Adapter, &GPIO_num, &dummyGPIONum,
+                                &uiLedIndex, &dummyGPIONum, currdriverstate);
+                        if (GPIO_num != DISABLE_GPIO_NUM)
+                                TURN_ON_LED(1 << GPIO_num, uiLedIndex);
                         break;
-                        case NORMAL_OPERATION:
+                case NORMAL_OPERATION:
                         {
                                 UCHAR GPIO_num_tx = DISABLE_GPIO_NUM;
                                 UCHAR GPIO_num_rx = DISABLE_GPIO_NUM;
                                 UCHAR uiLEDTx = 0;
                                 UCHAR uiLEDRx = 0;
                                 currdriverstate = NORMAL_OPERATION;
-                                Adapter->LEDInfo.bIdle_led_off =  FALSE;
-
-                                BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx, &GPIO_num_rx, &uiLEDTx,&uiLEDRx,currdriverstate);
-                                if((GPIO_num_tx == DISABLE_GPIO_NUM) && (GPIO_num_rx == DISABLE_GPIO_NUM))
-                                {
-                                        GPIO_num = DISABLE_GPIO_NUM ;
-                                }
-                                else
-                                {
-                                        /*If single LED is selected, use same for both Tx and Rx*/
-                                        if(GPIO_num_tx == DISABLE_GPIO_NUM)
-                                        {
+                                Adapter->LEDInfo.bIdle_led_off = FALSE;
+
+                                BcmGetGPIOPinInfo(Adapter, &GPIO_num_tx,
+                                        &GPIO_num_rx, &uiLEDTx, &uiLEDRx,
+                                        currdriverstate);
+                                if ((GPIO_num_tx == DISABLE_GPIO_NUM) &&
+                                                (GPIO_num_rx ==
+                                                 DISABLE_GPIO_NUM)) {
+                                        GPIO_num = DISABLE_GPIO_NUM;
+                                } else {
+                                        /*
+                                         * If single LED is selected, use same
+                                         * for both Tx and Rx
+                                         */
+                                        if (GPIO_num_tx == DISABLE_GPIO_NUM) {
                                                 GPIO_num_tx = GPIO_num_rx;
                                                 uiLEDTx = uiLEDRx;
-                                        }
-                                        else if(GPIO_num_rx == DISABLE_GPIO_NUM)
-                                        {
+                                        } else if (GPIO_num_rx ==
+                                                        DISABLE_GPIO_NUM) {
                                                 GPIO_num_rx = GPIO_num_tx;
                                                 uiLEDRx = uiLEDTx;
                                         }
-                                /*Blink the LED in proportionate to Tx and Rx transmissions.*/
-                                        LED_Proportional_Blink(Adapter, GPIO_num_tx, uiLEDTx, GPIO_num_rx, uiLEDRx,currdriverstate);
+                                        /*
+                                         * Blink the LED in proportionate
+                                         * to Tx and Rx transmissions.
+                                         */
+                                        LED_Proportional_Blink(Adapter,
+                                                GPIO_num_tx, uiLEDTx,
+                                                GPIO_num_rx, uiLEDRx,
+                                                currdriverstate);
                                 }
                         }
                         break;
-                        case LOWPOWER_MODE_ENTER:
-                        {
-                                currdriverstate  = LOWPOWER_MODE_ENTER;
-                                if( DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING == Adapter->ulPowerSaveMode)
-                                {
-                                        /* Turn OFF all the LED */
-                                        uiResetValue = 0;
-                                        for(uiIndex =0; uiIndex < NUM_OF_LEDS; uiIndex++)
-                                        {
-                                                if(Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)
-                                                TURN_OFF_LED((1<<Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num),uiIndex);
-                                        }
-
+                case LOWPOWER_MODE_ENTER:
+                        currdriverstate = LOWPOWER_MODE_ENTER;
+                        if (DEVICE_POWERSAVE_MODE_AS_MANUAL_CLOCK_GATING ==
+                                        Adapter->ulPowerSaveMode) {
+                                /* Turn OFF all the LED */
+                                uiResetValue = 0;
+                                for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
+                                        if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num != DISABLE_GPIO_NUM)
+                                                TURN_OFF_LED((1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);
                                 }
-                                /* Turn off LED And WAKE-UP for Sendinf IDLE mode ACK */
-                                Adapter->LEDInfo.bLedInitDone = FALSE;
-                                Adapter->LEDInfo.bIdle_led_off =  TRUE;
-                                wake_up(&Adapter->LEDInfo.idleModeSyncEvent);
-                                GPIO_num = DISABLE_GPIO_NUM;
-                                break;
-                        }
-                        case IDLEMODE_CONTINUE:
-                        {
-                                currdriverstate = IDLEMODE_CONTINUE;
-                                GPIO_num = DISABLE_GPIO_NUM;
+
                         }
+                        /* Turn off LED And WAKE-UP for Sendinf IDLE mode ACK */
+                        Adapter->LEDInfo.bLedInitDone = FALSE;
+                        Adapter->LEDInfo.bIdle_led_off = TRUE;
+                        wake_up(&Adapter->LEDInfo.idleModeSyncEvent);
+                        GPIO_num = DISABLE_GPIO_NUM;
                         break;
-                        case IDLEMODE_EXIT:
-                        {
-                        }
+                case IDLEMODE_CONTINUE:
+                        currdriverstate = IDLEMODE_CONTINUE;
+                        GPIO_num = DISABLE_GPIO_NUM;
                         break;
-                        case DRIVER_HALT:
-                        {
-                                currdriverstate = DRIVER_HALT;
-                                GPIO_num = DISABLE_GPIO_NUM;
-                                for(uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++)
-                                {
-                                        if(Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num !=
-                                                DISABLE_GPIO_NUM)
-                                                TURN_OFF_LED((1<<Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num),uiIndex);
-                                }
-                                //Adapter->DriverState = DRIVER_INIT;
+                case IDLEMODE_EXIT:
+                        break;
+                case DRIVER_HALT:
+                        currdriverstate = DRIVER_HALT;
+                        GPIO_num = DISABLE_GPIO_NUM;
+                        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
+                                if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
+                                                != DISABLE_GPIO_NUM)
+                                        TURN_OFF_LED((1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);
                         }
+                        /* Adapter->DriverState = DRIVER_INIT; */
                         break;
-                        case LED_THREAD_INACTIVE :
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"InActivating LED thread...");
-                                currdriverstate = LED_THREAD_INACTIVE;
-                                Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_RUNNING_INACTIVELY ;
-                                Adapter->LEDInfo.bLedInitDone = FALSE ;
-                                //disable ALL LED
-                                for(uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++)
-                                {
-                                        if(Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num !=
-                                                DISABLE_GPIO_NUM)
-                                                TURN_OFF_LED((1<<Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num),uiIndex);
-                                }
+                case LED_THREAD_INACTIVE:
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                                DBG_LVL_ALL, "InActivating LED thread...");
+                        currdriverstate = LED_THREAD_INACTIVE;
+                        Adapter->LEDInfo.led_thread_running =
+                                        BCM_LED_THREAD_RUNNING_INACTIVELY;
+                        Adapter->LEDInfo.bLedInitDone = FALSE;
+                        /* disable ALL LED */
+                        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
+                                if (Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num
+                                                != DISABLE_GPIO_NUM)
+                                        TURN_OFF_LED((1 << Adapter->LEDInfo.LEDState[uiIndex].GPIO_Num), uiIndex);
                         }
                         break;
-                        case LED_THREAD_ACTIVE :
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"Activating LED thread again...");
-                                if(Adapter->LinkUpStatus == FALSE)
-                                        Adapter->DriverState = NO_NETWORK_ENTRY;
-                                else
-                                        Adapter->DriverState = NORMAL_OPERATION;
+                case LED_THREAD_ACTIVE:
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                                DBG_LVL_ALL, "Activating LED thread again...");
+                        if (Adapter->LinkUpStatus == FALSE)
+                                Adapter->DriverState = NO_NETWORK_ENTRY;
+                        else
+                                Adapter->DriverState = NORMAL_OPERATION;
 
-                                Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_RUNNING_ACTIVELY ;
-                        }
+                        Adapter->LEDInfo.led_thread_running =
+                                        BCM_LED_THREAD_RUNNING_ACTIVELY;
+                        break;
+                        /* return; */
+                default:
                         break;
-                        //return;
-                        default:
-                                break;
                 }
         }
         Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;
@@ -839,49 +863,54 @@ int InitLedSettings(PMINI_ADAPTER Adapter)
         BOOLEAN bEnableThread = TRUE;
         UCHAR uiIndex = 0;
 
-        /*Initially set BitPolarity to normal polarity. The bit 8 of LED type
- *        is used to change the polarity of the LED.*/
+        /*
+         * Initially set BitPolarity to normal polarity. The bit 8 of LED type
+         * is used to change the polarity of the LED.
+         */
 
-        for(uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++) {
+        for (uiIndex = 0; uiIndex < NUM_OF_LEDS; uiIndex++)
                 Adapter->LEDInfo.LEDState[uiIndex].BitPolarity = 1;
-        }
 
-        /*Read the LED settings of CONFIG file and map it to GPIO numbers in EEPROM*/
+        /*
+         * Read the LED settings of CONFIG file and map it
+         * to GPIO numbers in EEPROM
+         */
         Status = ReadConfigFileStructure(Adapter, &bEnableThread);
-        if(STATUS_SUCCESS != Status)
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL,"LED Thread: FAILED in ReadConfigFileStructure\n");
+        if (STATUS_SUCCESS != Status) {
+                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                        DBG_LVL_ALL,
+                        "LED Thread: FAILED in ReadConfigFileStructure\n");
                 return Status;
         }
 
-        if(Adapter->LEDInfo.led_thread_running)
-        {
-                if(bEnableThread)
+        if (Adapter->LEDInfo.led_thread_running) {
+                if (bEnableThread) {
                         ;
-                else
-                {
+                } else {
                         Adapter->DriverState = DRIVER_HALT;
                         wake_up(&Adapter->LEDInfo.notify_led_event);
-                        Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;
+                        Adapter->LEDInfo.led_thread_running =
+                                                BCM_LED_THREAD_DISABLED;
                 }
 
-        }
-
-        else if(bEnableThread)
-        {
-                /*Create secondary thread to handle the LEDs*/
+        } else if (bEnableThread) {
+                /* Create secondary thread to handle the LEDs */
                 init_waitqueue_head(&Adapter->LEDInfo.notify_led_event);
                 init_waitqueue_head(&Adapter->LEDInfo.idleModeSyncEvent);
-                Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_RUNNING_ACTIVELY;
-                Adapter->LEDInfo.bIdle_led_off =  FALSE;
-                Adapter->LEDInfo.led_cntrl_threadid = kthread_run((int (*)(void *))
-            LEDControlThread, Adapter, "led_control_thread");
-                if(IS_ERR(Adapter->LEDInfo.led_cntrl_threadid))
-        {
-                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, LED_DUMP_INFO, DBG_LVL_ALL, "Not able to spawn Kernel Thread\n");
-                        Adapter->LEDInfo.led_thread_running = BCM_LED_THREAD_DISABLED;
-                return PTR_ERR(Adapter->LEDInfo.led_cntrl_threadid);
-        }
+                Adapter->LEDInfo.led_thread_running =
+                                        BCM_LED_THREAD_RUNNING_ACTIVELY;
+                Adapter->LEDInfo.bIdle_led_off = FALSE;
+                Adapter->LEDInfo.led_cntrl_threadid =
+                        kthread_run((int (*)(void *)) LEDControlThread,
+                        Adapter, "led_control_thread");
+                if (IS_ERR(Adapter->LEDInfo.led_cntrl_threadid)) {
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, LED_DUMP_INFO,
+                                DBG_LVL_ALL,
+                                "Not able to spawn Kernel Thread\n");
+                        Adapter->LEDInfo.led_thread_running =
+                                BCM_LED_THREAD_DISABLED;
+                        return PTR_ERR(Adapter->LEDInfo.led_cntrl_threadid);
+                }
         }
         return Status;
 }
diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index 3de0daf5edb2..7d703cb3c5e0 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -78,7 +78,7 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
         {
                 value=0;
                 uiStatus = 0 ;
-                rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&uiStatus, sizeof(uiStatus));
+                rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
                 if(Adapter->device_removed == TRUE)
                 {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Modem has got removed hence exiting....");
@@ -93,7 +93,7 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
                         wrmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
 
                         value =0;
-                        rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&value, sizeof(value));
+                        rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &value, sizeof(value));
                         uiData = (UCHAR)value;
 
                         break;
@@ -102,8 +102,8 @@ static UCHAR ReadEEPROMStatusRegister( PMINI_ADAPTER Adapter )
                 dwRetries-- ;
                 if ( dwRetries == 0 )
                 {
-                         rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value));
-                         rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG,&value1, sizeof(value1));
+                         rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
+                         rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &value1, sizeof(value1));
                          BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"0x3004 = %x 0x3008 = %x, retries = %d failed.\n",value,value1,  MAX_EEPROM_RETRIES*RETRIES_PER_DELAY);
                         return uiData;
                 }
@@ -158,7 +158,7 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
                 {
 
                 uiStatus = 0;
-                rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
+                rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
                 if(Adapter->device_removed == TRUE)
                 {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Modem has got Removed.hence exiting from loop...");
@@ -202,8 +202,8 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
                 {
                         value=0;
                         value1=0;
-                        rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG,&value, sizeof(value));
-                        rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG,&value1, sizeof(value1));
+                        rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &value, sizeof(value));
+                        rdmalt(Adapter, EEPROM_SPI_Q_STATUS_REG, &value1, sizeof(value1));
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "dwNumWords %d 0x3004 = %x 0x3008 = %x  retries = %d failed.\n", dwNumWords, value,  value1,  MAX_EEPROM_RETRIES*RETRIES_PER_DELAY);
                         return STATUS_FAILURE;
                 }
@@ -217,22 +217,22 @@ INT ReadBeceemEEPROMBulk( PMINI_ADAPTER Adapter,
                 pvalue = (PUCHAR)(pdwData + dwIndex);
 
                 value =0;
-                rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&value, sizeof(value));
+                rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &value, sizeof(value));
 
                 pvalue[0] = value;
 
                 value = 0;
-                rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&value, sizeof(value));
+                rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &value, sizeof(value));
 
                 pvalue[1] = value;
 
                 value =0;
-                rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&value, sizeof(value));
+                rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &value, sizeof(value));
 
                 pvalue[2] = value;
 
                 value = 0;
-                rdmalt(Adapter, EEPROM_READ_DATAQ_REG,&value, sizeof(value));
+                rdmalt(Adapter, EEPROM_READ_DATAQ_REG, &value, sizeof(value));
 
                 pvalue[3] = value;
         }
@@ -445,6 +445,7 @@ static INT BeceemFlashBulkRead(
         UINT uiBytesToRead = uiNumBytes;
         INT Status = 0;
         UINT uiPartOffset = 0;
+        int bytes;
 
         if(Adapter->device_removed )
         {
@@ -469,9 +470,9 @@ static INT BeceemFlashBulkRead(
                 uiBytesToRead = MAX_RW_SIZE - (uiOffset%MAX_RW_SIZE);
                 uiBytesToRead = MIN(uiNumBytes,uiBytesToRead);
 
-                if(rdm(Adapter,uiPartOffset, (PCHAR)pBuffer+uiIndex,uiBytesToRead))
-                {
-                        Status = -1;
+                bytes = rdm(Adapter, uiPartOffset, (PCHAR)pBuffer+uiIndex, uiBytesToRead);
+                if (bytes < 0) {
+                        Status = bytes;
                         Adapter->SelectedChip = RESET_CHIP_SELECT;
                         return Status;
                 }
@@ -488,9 +489,9 @@ static INT BeceemFlashBulkRead(
 
                 uiBytesToRead = MIN(uiNumBytes,MAX_RW_SIZE);
 
-                if(rdm(Adapter,uiPartOffset, (PCHAR)pBuffer+uiIndex,uiBytesToRead))
-                {
-                        Status = -1;
+                bytes = rdm(Adapter, uiPartOffset, (PCHAR)pBuffer+uiIndex, uiBytesToRead);
+                if (bytes < 0) {
+                        Status = bytes;
                         break;
                 }
 
@@ -613,6 +614,7 @@ static INT FlashSectorErase(PMINI_ADAPTER Adapter,
         UINT iIndex = 0, iRetries = 0;
         UINT uiStatus = 0;
         UINT value;
+        int bytes;
 
         for(iIndex=0;iIndex<numOfSectors;iIndex++)
         {
@@ -632,10 +634,11 @@ static INT FlashSectorErase(PMINI_ADAPTER Adapter,
                                 return STATUS_FAILURE;
                         }
 
-                        if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus)) < 0 )
-                        {
-                                BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");
-                                return STATUS_FAILURE;
+                        bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
+                        if (bytes < 0) {
+                                uiStatus = bytes;
+                                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");
+                                return uiStatus;
                         }
                         iRetries++;
                         //After every try lets make the CPU free for 10 ms. generally time taken by the
@@ -679,6 +682,7 @@ static INT flashByteWrite(
 
         UINT value;
         ULONG ulData = *(PUCHAR)pData;
+        int bytes;
 
 //
 // need not write 0xFF because write requires an erase and erase will
@@ -720,10 +724,11 @@ static INT flashByteWrite(
                         return STATUS_FAILURE;
                 }
                 //__udelay(1);
-                if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus)) < 0)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");
-                        return STATUS_FAILURE;
+                bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
+                if (bytes < 0) {
+                        uiStatus = bytes;
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");
+                        return uiStatus;
                 }
                 iRetries--;
                 if( iRetries && ((iRetries % FLASH_PER_RETRIES_DELAY) == 0))
@@ -771,6 +776,7 @@ static INT flashWrite(
 
         UINT value;
         UINT uiErasePattern[4] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};
+        int bytes;
 //
 // need not write 0xFFFFFFFF because write requires an erase and erase will
 // make whole sector 0xFFFFFFFF.
@@ -803,10 +809,11 @@ static INT flashWrite(
                         return STATUS_FAILURE;
                 }
                 //__udelay(1);
-                if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus)) < 0 )
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");
-                        return STATUS_FAILURE;
+                bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
+                if (bytes < 0) {
+                        uiStatus = bytes;
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");
+                        return uiStatus;
                 }
 
                 iRetries--;
@@ -849,6 +856,7 @@ static INT flashByteWriteStatus(
         INT  iRetries = MAX_FLASH_RETRIES * FLASH_PER_RETRIES_DELAY; //3
         ULONG ulData  = *(PUCHAR)pData;
         UINT value;
+        int bytes;
 
 //
 // need not write 0xFFFFFFFF because write requires an erase and erase will
@@ -891,10 +899,11 @@ static INT flashByteWriteStatus(
                         return STATUS_FAILURE;
                 }
                 //__udelay(1);
-                if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus)) < 0)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");
-                        return STATUS_FAILURE;
+                bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
+                if (bytes < 0) {
+                        uiStatus = bytes;
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");
+                        return uiStatus;
                 }
 
                 iRetries--;
@@ -935,6 +944,7 @@ static INT flashWriteStatus(
         //UINT uiReadBack = 0;
         UINT value;
         UINT uiErasePattern[4] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};
+        int bytes;
 
 //
 // need not write 0xFFFFFFFF because write requires an erase and erase will
@@ -967,10 +977,11 @@ static INT flashWriteStatus(
                         return STATUS_FAILURE;
                 }
                 //__udelay(1);
-                if(rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus)) < 0)
-                {
-                        BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Reading status of FLASH_SPI_READQ_REG fails");
-                        return STATUS_FAILURE;
+                bytes = rdmalt(Adapter, FLASH_SPI_READQ_REG, &uiStatus, sizeof(uiStatus));
+                if (bytes < 0) {
+                        uiStatus = bytes;
+                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "Reading status of FLASH_SPI_READQ_REG fails");
+                        return uiStatus;
                 }
                 iRetries--;
                 //this will ensure that in there will be no changes in the current path.
@@ -1841,7 +1852,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
          * What we are checking if the previous write has completed, and this
          * may take time. We should wait till the Empty bit is set. */
         uiStatus = 0;
-        rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&uiStatus, sizeof(uiStatus)) ;
+        rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
         while ( ( uiStatus & EEPROM_WRITE_QUEUE_EMPTY ) == 0 )
         {
                 uiRetries--;
@@ -1855,7 +1866,7 @@ static INT BeceemEEPROMWritePage( PMINI_ADAPTER Adapter, UINT uiData[], UINT uiO
                                         msleep(1);
 
                 uiStatus = 0;
-                rdmalt( Adapter, EEPROM_SPI_Q_STATUS1_REG,&uiStatus, sizeof(uiStatus)) ;
+                rdmalt(Adapter, EEPROM_SPI_Q_STATUS1_REG, &uiStatus, sizeof(uiStatus));
                 if(Adapter->device_removed == TRUE)
                 {
                         BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0,"Modem got removed hence exiting from loop....");
@@ -2500,7 +2511,7 @@ static ULONG BcmReadFlashRDID(PMINI_ADAPTER Adapter)
 // Read SPI READQ REG. The output will be WWXXYYZZ.
 // The ID is 3Bytes long and is WWXXYY. ZZ needs to be Ignored.
 //
-        rdmalt(Adapter, FLASH_SPI_READQ_REG,(PUINT)&ulRDID, sizeof(ulRDID));
+        rdmalt(Adapter, FLASH_SPI_READQ_REG, (PUINT)&ulRDID, sizeof(ulRDID));
 
         return (ulRDID >>8);
 
@@ -4735,8 +4746,8 @@ static INT BcmDoChipSelect(PMINI_ADAPTER Adapter, UINT offset)
         Adapter->SelectedChip = ChipNum ;
 
         //bit[13..12]  will select the appropriate chip
-        rdmalt(Adapter,FLASH_CONFIG_REG, &FlashConfig, 4);
-        rdmalt(Adapter,FLASH_GPIO_CONFIG_REG, &GPIOConfig, 4);
+        rdmalt(Adapter, FLASH_CONFIG_REG, &FlashConfig, 4);
+        rdmalt(Adapter, FLASH_GPIO_CONFIG_REG, &GPIOConfig, 4);
 
         {
                 switch(ChipNum)
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 5e78c77d5a08..0d18d80bcd25 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1479,10 +1479,10 @@ static int comedi_mmap(struct file *file, struct vm_area_struct *vma)
 
         dev_file_info = comedi_get_device_file_info(minor);
         if (dev_file_info == NULL)
-                return -ENODEV;
+                return -ENODEV;
         dev = dev_file_info->device;
         if (dev == NULL)
-                return -ENODEV;
+                return -ENODEV;
 
         mutex_lock(&dev->mutex);
         if (!dev->attached) {
@@ -1556,10 +1556,10 @@ static unsigned int comedi_poll(struct file *file, poll_table * wait)
         dev_file_info = comedi_get_device_file_info(minor);
 
         if (dev_file_info == NULL)
-                return -ENODEV;
+                return -ENODEV;
         dev = dev_file_info->device;
         if (dev == NULL)
-                return -ENODEV;
+                return -ENODEV;
 
         mutex_lock(&dev->mutex);
         if (!dev->attached) {
@@ -1610,10 +1610,10 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
         dev_file_info = comedi_get_device_file_info(minor);
 
         if (dev_file_info == NULL)
-                return -ENODEV;
+                return -ENODEV;
         dev = dev_file_info->device;
         if (dev == NULL)
-                return -ENODEV;
+                return -ENODEV;
 
         if (!dev->attached) {
                 DPRINTK("no driver configured on comedi%i\n", dev->minor);
@@ -1721,10 +1721,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
         dev_file_info = comedi_get_device_file_info(minor);
 
         if (dev_file_info == NULL)
-                return -ENODEV;
+                return -ENODEV;
         dev = dev_file_info->device;
         if (dev == NULL)
-                return -ENODEV;
+                return -ENODEV;
 
         if (!dev->attached) {
                 DPRINTK("no driver configured on comedi%i\n", dev->minor);
@@ -1931,10 +1931,10 @@ static int comedi_close(struct inode *inode, struct file *file)
         dev_file_info = comedi_get_device_file_info(minor);
 
         if (dev_file_info == NULL)
-                return -ENODEV;
+                return -ENODEV;
         dev = dev_file_info->device;
         if (dev == NULL)
-                return -ENODEV;
+                return -ENODEV;
 
         mutex_lock(&dev->mutex);
 
@@ -1973,10 +1973,10 @@ static int comedi_fasync(int fd, struct file *file, int on)
         dev_file_info = comedi_get_device_file_info(minor);
 
         if (dev_file_info == NULL)
-                return -ENODEV;
+                return -ENODEV;
         dev = dev_file_info->device;
         if (dev == NULL)
-                return -ENODEV;
+                return -ENODEV;
 
         return fasync_helper(fd, file, on, &dev->async_queue);
 }
@@ -2479,18 +2479,18 @@ static ssize_t store_max_read_buffer_kb(struct device *dev,
                                         const char *buf, size_t count)
 {
         struct comedi_device_file_info *info = dev_get_drvdata(dev);
-        unsigned long new_max_size_kb;
-        uint64_t new_max_size;
+        unsigned int new_max_size_kb;
+        unsigned int new_max_size;
+        int ret;
         struct comedi_subdevice *const read_subdevice =
             comedi_get_read_subdevice(info);
 
-        if (strict_strtoul(buf, 10, &new_max_size_kb))
-                return -EINVAL;
-        if (new_max_size_kb != (uint32_t) new_max_size_kb)
-                return -EINVAL;
-        new_max_size = ((uint64_t) new_max_size_kb) * bytes_per_kibi;
-        if (new_max_size != (uint32_t) new_max_size)
+        ret = kstrtouint(buf, 10, &new_max_size_kb);
+        if (ret)
+                return ret;
+        if (new_max_size_kb > (UINT_MAX / bytes_per_kibi))
                 return -EINVAL;
+        new_max_size = new_max_size_kb * bytes_per_kibi;
 
         mutex_lock(&info->device->mutex);
         if (read_subdevice == NULL ||
@@ -2540,19 +2540,19 @@ static ssize_t store_read_buffer_kb(struct device *dev,
                                     const char *buf, size_t count)
 {
         struct comedi_device_file_info *info = dev_get_drvdata(dev);
-        unsigned long new_size_kb;
-        uint64_t new_size;
+        unsigned int new_size_kb;
+        unsigned int new_size;
         int retval;
+        int ret;
         struct comedi_subdevice *const read_subdevice =
             comedi_get_read_subdevice(info);
 
-        if (strict_strtoul(buf, 10, &new_size_kb))
-                return -EINVAL;
-        if (new_size_kb != (uint32_t) new_size_kb)
-                return -EINVAL;
-        new_size = ((uint64_t) new_size_kb) * bytes_per_kibi;
-        if (new_size != (uint32_t) new_size)
+        ret = kstrtouint(buf, 10, &new_size_kb);
+        if (ret)
+                return ret;
+        if (new_size_kb > (UINT_MAX / bytes_per_kibi))
                 return -EINVAL;
+        new_size = new_size_kb * bytes_per_kibi;
 
         mutex_lock(&info->device->mutex);
         if (read_subdevice == NULL ||
@@ -2606,18 +2606,18 @@ static ssize_t store_max_write_buffer_kb(struct device *dev,
                                          const char *buf, size_t count)
 {
         struct comedi_device_file_info *info = dev_get_drvdata(dev);
-        unsigned long new_max_size_kb;
-        uint64_t new_max_size;
+        unsigned int new_max_size_kb;
+        unsigned int new_max_size;
+        int ret;
         struct comedi_subdevice *const write_subdevice =
             comedi_get_write_subdevice(info);
 
-        if (strict_strtoul(buf, 10, &new_max_size_kb))
-                return -EINVAL;
-        if (new_max_size_kb != (uint32_t) new_max_size_kb)
-                return -EINVAL;
-        new_max_size = ((uint64_t) new_max_size_kb) * bytes_per_kibi;
-        if (new_max_size != (uint32_t) new_max_size)
+        ret = kstrtouint(buf, 10, &new_max_size_kb);
+        if (ret)
+                return ret;
+        if (new_max_size_kb > (UINT_MAX / bytes_per_kibi))
                 return -EINVAL;
+        new_max_size = new_max_size_kb * bytes_per_kibi;
 
         mutex_lock(&info->device->mutex);
         if (write_subdevice == NULL ||
@@ -2667,19 +2667,19 @@ static ssize_t store_write_buffer_kb(struct device *dev,
                                      const char *buf, size_t count)
 {
         struct comedi_device_file_info *info = dev_get_drvdata(dev);
-        unsigned long new_size_kb;
-        uint64_t new_size;
+        unsigned int new_size_kb;
+        unsigned int new_size;
         int retval;
+        int ret;
         struct comedi_subdevice *const write_subdevice =
             comedi_get_write_subdevice(info);
 
-        if (strict_strtoul(buf, 10, &new_size_kb))
-                return -EINVAL;
-        if (new_size_kb != (uint32_t) new_size_kb)
+        ret = kstrtouint(buf, 10, &new_size_kb);
+        if (ret)
+                return ret;
+        if (new_size_kb > (UINT_MAX / bytes_per_kibi))
                 return -EINVAL;
         new_size = ((uint64_t) new_size_kb) * bytes_per_kibi;
-        if (new_size != (uint32_t) new_size)
-                return -EINVAL;
 
         mutex_lock(&info->device->mutex);
         if (write_subdevice == NULL ||
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 6fb7594319c6..ca5bd9b8704a 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -145,78 +145,77 @@ void fpu_end(void)
 
 static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
 #ifdef CONFIG_APCI_3120
-        {APCI3120_BOARD_VENDOR_ID, 0x818D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x818D)},
 #endif
 #ifdef CONFIG_APCI_1032
-        {APCI1032_BOARD_VENDOR_ID, 0x1003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI1032_BOARD_VENDOR_ID, 0x1003)},
 #endif
 #ifdef CONFIG_APCI_1516
-        {APCI1516_BOARD_VENDOR_ID, 0x1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI1516_BOARD_VENDOR_ID, 0x1001)},
 #endif
 #ifdef CONFIG_APCI_2016
-        {APCI2016_BOARD_VENDOR_ID, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI2016_BOARD_VENDOR_ID, 0x1002)},
 #endif
 #ifdef CONFIG_APCI_2032
-        {APCI2032_BOARD_VENDOR_ID, 0x1004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI2032_BOARD_VENDOR_ID, 0x1004)},
 #endif
 #ifdef CONFIG_APCI_2200
-        {APCI2200_BOARD_VENDOR_ID, 0x1005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI2200_BOARD_VENDOR_ID, 0x1005)},
 #endif
 #ifdef CONFIG_APCI_1564
-        {APCI1564_BOARD_VENDOR_ID, 0x1006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI1564_BOARD_VENDOR_ID, 0x1006)},
 #endif
 #ifdef CONFIG_APCI_1500
-        {APCI1500_BOARD_VENDOR_ID, 0x80fc, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI1500_BOARD_VENDOR_ID, 0x80fc)},
 #endif
 #ifdef CONFIG_APCI_3001
-        {APCI3120_BOARD_VENDOR_ID, 0x828D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI3120_BOARD_VENDOR_ID, 0x828D)},
 #endif
 #ifdef CONFIG_APCI_3501
-        {APCI3501_BOARD_VENDOR_ID, 0x3001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI3501_BOARD_VENDOR_ID, 0x3001)},
 #endif
 #ifdef CONFIG_APCI_035
-        {APCI035_BOARD_VENDOR_ID, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI035_BOARD_VENDOR_ID,  0x0300)},
 #endif
 #ifdef CONFIG_APCI_3200
-        {APCI3200_BOARD_VENDOR_ID, 0x3000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3000)},
 #endif
 #ifdef CONFIG_APCI_3300
-        {APCI3200_BOARD_VENDOR_ID, 0x3007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI3200_BOARD_VENDOR_ID, 0x3007)},
 #endif
 #ifdef CONFIG_APCI_1710
-        {APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(APCI1710_BOARD_VENDOR_ID, APCI1710_BOARD_DEVICE_ID)},
 #endif
 #ifdef CONFIG_APCI_16XX
-        {0x15B8, 0x1009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x100A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x1009)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x100A)},
 #endif
 #ifdef CONFIG_APCI_3XXX
-        {0x15B8, 0x3010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x300F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x300E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3014, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3015, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3016, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3017, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x301A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x301B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x301C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x301D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x301E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x301F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3023, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x300B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x15B8, 0x3024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3010)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300F)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300E)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3013)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3014)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3015)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3016)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3017)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3018)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3019)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301A)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301B)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301C)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301D)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301E)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x301F)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3020)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3021)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3022)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3023)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x300B)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3002)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3003)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3004)},
+        {PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3024)},
 #endif
         {0}
 };
@@ -1019,7 +1018,7 @@ static const struct addi_board boardtypes[] = {
 #endif
 #ifdef CONFIG_APCI_16XX
         {"apci1648",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x1009,
                         128,
                         0,
@@ -1075,7 +1074,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI16XX_InsnBitsWriteTTLIO},
 
         {"apci1696",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x100A,
                         128,
                         0,
@@ -1132,7 +1131,7 @@ static const struct addi_board boardtypes[] = {
 #endif
 #ifdef CONFIG_APCI_3XXX
         {"apci3000-16",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3010,
                         256,
                         256,
@@ -1188,7 +1187,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3000-8",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x300F,
                         256,
                         256,
@@ -1244,7 +1243,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3000-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x300E,
                         256,
                         256,
@@ -1300,7 +1299,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3006-16",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3013,
                         256,
                         256,
@@ -1356,7 +1355,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3006-8",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3014,
                         256,
                         256,
@@ -1412,7 +1411,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3006-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3015,
                         256,
                         256,
@@ -1468,7 +1467,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3010-16",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3016,
                         256,
                         256,
@@ -1524,7 +1523,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3010-8",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3017,
                         256,
                         256,
@@ -1580,7 +1579,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3010-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3018,
                         256,
                         256,
@@ -1636,7 +1635,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3016-16",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3019,
                         256,
                         256,
@@ -1692,7 +1691,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3016-8",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x301A,
                         256,
                         256,
@@ -1748,7 +1747,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3016-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x301B,
                         256,
                         256,
@@ -1804,7 +1803,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3100-16-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x301C,
                         256,
                         256,
@@ -1860,7 +1859,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3100-8-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x301D,
                         256,
                         256,
@@ -1916,7 +1915,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3106-16-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x301E,
                         256,
                         256,
@@ -1972,7 +1971,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3106-8-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x301F,
                         256,
                         256,
@@ -2028,7 +2027,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3110-16-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3020,
                         256,
                         256,
@@ -2084,7 +2083,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3110-8-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3021,
                         256,
                         256,
@@ -2140,7 +2139,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3116-16-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3022,
                         256,
                         256,
@@ -2196,7 +2195,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3116-8-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3023,
                         256,
                         256,
@@ -2252,7 +2251,7 @@ static const struct addi_board boardtypes[] = {
                 i_APCI3XXX_InsnWriteTTLIO},
 
         {"apci3003",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x300B,
                         256,
                         256,
@@ -2307,7 +2306,7 @@ static const struct addi_board boardtypes[] = {
                 NULL},
 
         {"apci3002-16",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3002,
                         256,
                         256,
@@ -2362,7 +2361,7 @@ static const struct addi_board boardtypes[] = {
                 NULL},
 
         {"apci3002-8",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3003,
                         256,
                         256,
@@ -2417,7 +2416,7 @@ static const struct addi_board boardtypes[] = {
                 NULL},
 
         {"apci3002-4",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3004,
                         256,
                         256,
@@ -2472,7 +2471,7 @@ static const struct addi_board boardtypes[] = {
                 NULL},
 
         {"apci3500",
-                        0x15B8,
+                        PCI_VENDOR_ID_ADDIDATA,
                         0x3024,
                         256,
                         256,
diff --git a/drivers/staging/comedi/drivers/adl_pci7230.c b/drivers/staging/comedi/drivers/adl_pci7230.c
index 72a7258b5b92..20d570554fa4 100644
--- a/drivers/staging/comedi/drivers/adl_pci7230.c
+++ b/drivers/staging/comedi/drivers/adl_pci7230.c
@@ -44,15 +44,7 @@ Configuration Options:
 #define PCI_DEVICE_ID_PCI7230 0x7230
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci7230_pci_table) = {
-        {
-                PCI_VENDOR_ID_ADLINK,
-                PCI_DEVICE_ID_PCI7230,
-                PCI_ANY_ID,
-                PCI_ANY_ID,
-                0,
-                0,
-                0
-        },
+        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7230) },
         {0}
 };
 
diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index f28fe6bec050..9a2320537bdb 100644
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -49,10 +49,8 @@ Configuration Options:
 #define PCI_DEVICE_ID_PCI7296 0x7296
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci7296_pci_table) = {
-        {
-        PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7296) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, adl_pci7296_pci_table);
diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c
index 262da7b29b28..86ee21976041 100644
--- a/drivers/staging/comedi/drivers/adl_pci7432.c
+++ b/drivers/staging/comedi/drivers/adl_pci7432.c
@@ -44,10 +44,8 @@ Configuration Options:
 #define PCI_DEVICE_ID_PCI7432 0x7432
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci7432_pci_table) = {
-        {
-        PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI7432) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, adl_pci7432_pci_table);
diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 767a594935c7..3b83d65bc1bc 100644
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -57,10 +57,8 @@ Configuration Options:
 #define PCI_DEVICE_ID_PCI8164 0x8164
 
 static DEFINE_PCI_DEVICE_TABLE(adl_pci8164_pci_table) = {
-        {
-        PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI_DEVICE_ID_PCI8164) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, adl_pci8164_pci_table);
diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index fc48bae42ab7..2a9bd88a4abb 100644
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -311,10 +311,8 @@ static const struct comedi_lrange pci9111_hr_ai_range = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(pci9111_pci_table) = {
-        { PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,
-          0, 0, 0 },
-        /* { PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,
-         *   0, 0, 0 }, */
+        { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HR_DEVICE_ID) },
+        /* { PCI_DEVICE(PCI_VENDOR_ID_ADLINK, PCI9111_HG_DEVICE_ID) }, */
         { 0 }
 };
 
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index da2b75b15d4e..8318c82a555a 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1382,16 +1382,14 @@ static int pci1710_attach(struct comedi_device *dev,
         int i;
         int board_index;
 
-        printk("comedi%d: adv_pci1710: ", dev->minor);
+        dev_info(dev->hw_dev, "comedi%d: adv_pci1710:\n", dev->minor);
 
         opt_bus = it->options[0];
         opt_slot = it->options[1];
 
         ret = alloc_private(dev, sizeof(struct pci1710_private));
-        if (ret < 0) {
-                printk(" - Allocation failed!\n");
+        if (ret < 0)
                 return -ENOMEM;
-        }
 
         /* Look for matching PCI device */
         errstr = "not found!";
@@ -1436,10 +1434,10 @@ static int pci1710_attach(struct comedi_device *dev,
 
         if (!pcidev) {
                 if (opt_bus || opt_slot) {
-                        printk(" - Card at b:s %d:%d %s\n",
-                               opt_bus, opt_slot, errstr);
+                        dev_err(dev->hw_dev, "- Card at b:s %d:%d %s\n",
+                                opt_bus, opt_slot, errstr);
                 } else {
-                        printk(" - Card %s\n", errstr);
+                        dev_err(dev->hw_dev, "- Card %s\n", errstr);
                 }
                 return -EIO;
         }
@@ -1450,8 +1448,8 @@ static int pci1710_attach(struct comedi_device *dev,
         irq = pcidev->irq;
         iobase = pci_resource_start(pcidev, 2);
 
-        printk(", b:s:f=%d:%d:%d, io=0x%4lx", pci_bus, pci_slot, pci_func,
-               iobase);
+        dev_dbg(dev->hw_dev, "b:s:f=%d:%d:%d, io=0x%4lx\n", pci_bus, pci_slot,
+                pci_func, iobase);
 
         dev->iobase = iobase;
 
@@ -1471,10 +1469,8 @@ static int pci1710_attach(struct comedi_device *dev,
                 n_subdevices++;
 
         ret = alloc_subdevices(dev, n_subdevices);
-        if (ret < 0) {
-                printk(" - Allocation failed!\n");
+        if (ret < 0)
                 return ret;
-        }
 
         pci1710_reset(dev);
 
@@ -1483,24 +1479,20 @@ static int pci1710_attach(struct comedi_device *dev,
                         if (request_irq(irq, interrupt_service_pci1710,
                                         IRQF_SHARED, "Advantech PCI-1710",
                                         dev)) {
-                                printk
-                                    (", unable to allocate IRQ %d, DISABLING IT",
-                                     irq);
+                                dev_dbg(dev->hw_dev, "unable to allocate IRQ %d, DISABLING IT",
+                                        irq);
                                 irq = 0;        /* Can't use IRQ */
                         } else {
-                                printk(", irq=%u", irq);
+                                dev_dbg(dev->hw_dev, "irq=%u", irq);
                         }
                 } else {
-                        printk(", IRQ disabled");
+                        dev_dbg(dev->hw_dev, "IRQ disabled");
                 }
         } else {
                 irq = 0;
         }
 
         dev->irq = irq;
-
-        printk(".\n");
-
         subdev = 0;
 
         if (this_board->n_aichan) {
diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 69334f6f64e8..537e58534275 100644
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -1106,13 +1106,10 @@ static int pci_dio_attach(struct comedi_device *dev,
         unsigned long iobase;
         struct pci_dev *pcidev = NULL;
 
-        printk("comedi%d: adv_pci_dio: ", dev->minor);
 
         ret = alloc_private(dev, sizeof(struct pci_dio_private));
-        if (ret < 0) {
-                printk(", Error: Cann't allocate private memory!\n");
+        if (ret < 0)
                 return -ENOMEM;
-        }
 
         for_each_pci_dev(pcidev) {
                 /*  loop through cards supported by this driver */
@@ -1140,19 +1137,18 @@ static int pci_dio_attach(struct comedi_device *dev,
         }
 
         if (!dev->board_ptr) {
-                printk(", Error: Requested type of the card was not found!\n");
+                dev_err(dev->hw_dev, "Error: Requested type of the card was not found!\n");
                 return -EIO;
         }
 
         if (comedi_pci_enable(pcidev, driver_pci_dio.driver_name)) {
-                printk
-                    (", Error: Can't enable PCI device and request regions!\n");
+                dev_err(dev->hw_dev, "Error: Can't enable PCI device and request regions!\n");
                 return -EIO;
         }
         iobase = pci_resource_start(pcidev, this_board->main_pci_region);
-        printk(", b:s:f=%d:%d:%d, io=0x%4lx",
-               pcidev->bus->number, PCI_SLOT(pcidev->devfn),
-               PCI_FUNC(pcidev->devfn), iobase);
+        dev_dbg(dev->hw_dev, "b:s:f=%d:%d:%d, io=0x%4lx\n",
+                pcidev->bus->number, PCI_SLOT(pcidev->devfn),
+                PCI_FUNC(pcidev->devfn), iobase);
 
         dev->iobase = iobase;
         dev->board_name = this_board->name;
@@ -1177,15 +1173,10 @@ static int pci_dio_attach(struct comedi_device *dev,
         }
 
         ret = alloc_subdevices(dev, n_subdevices);
-        if (ret < 0) {
-                printk(", Error: Cann't allocate subdevice memory!\n");
+        if (ret < 0)
                 return ret;
-        }
-
-        printk(".\n");
 
         subdev = 0;
-
         for (i = 0; i < MAX_DI_SUBDEVS; i++)
                 if (this_board->sdi[i].chans) {
                         s = dev->subdevices + subdev;
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 93bbe4ec318d..566cc4411452 100644
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -421,12 +421,9 @@ static const struct dio200_layout_struct dio200_layouts[] = {
 
 #ifdef CONFIG_COMEDI_PCI
 static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
-        {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI215) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI272) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, dio200_pci_table);
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 48246cd50d47..7972cadd403e 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -134,10 +134,8 @@ static const struct pc236_board pc236_boards[] = {
 
 #ifdef CONFIG_COMEDI_PCI
 static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
-        {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI236) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, pc236_pci_table);
diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index 8a3388079094..191ac0d23ce7 100644
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -101,10 +101,8 @@ static const struct pc263_board pc263_boards[] = {
 
 #ifdef CONFIG_COMEDI_PCI
 static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {
-        {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI263) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, pc263_pci_table);
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 1b5ba1c27259..b278917cec25 100644
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -384,12 +384,9 @@ static const struct pci224_board pci224_boards[] = {
  */
 
 static DEFINE_PCI_DEVICE_TABLE(pci224_pci_table) = {
-        {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI224) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_AMPLICON_PCI234) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, pci224_pci_table);
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 7edeb1103dc8..538979551c8e 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -501,12 +501,9 @@ static const struct pci230_board pci230_boards[] = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(pci230_pci_table) = {
-        {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI230) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMPLICON, PCI_DEVICE_ID_PCI260) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, pci230_pci_table);
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index e171c56112d8..49404f49f7b7 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -99,7 +99,7 @@ static struct comedi_driver driver_das16cs = {
         .detach = das16cs_detach,
 };
 
-static struct pcmcia_device *cur_dev = NULL;
+static struct pcmcia_device *cur_dev;
 
 static const struct comedi_lrange das16cs_ai_range = { 4, {
                                                            RANGE(-10, 10),
@@ -150,7 +150,7 @@ static const struct das16cs_board *das16cs_probe(struct comedi_device *dev,
                         return das16cs_boards + i;
         }
 
-        printk("unknown board!\n");
+        dev_dbg(dev->hw_dev, "unknown board!\n");
 
         return NULL;
 }
@@ -163,20 +163,19 @@ static int das16cs_attach(struct comedi_device *dev,
         int ret;
         int i;
 
-        printk("comedi%d: cb_das16_cs: ", dev->minor);
+        dev_dbg(dev->hw_dev, "comedi%d: cb_das16_cs: attached\n", dev->minor);
 
         link = cur_dev;         /* XXX hack */
         if (!link)
                 return -EIO;
 
         dev->iobase = link->resource[0]->start;
-        printk("I/O base=0x%04lx ", dev->iobase);
+        dev_dbg(dev->hw_dev, "I/O base=0x%04lx\n", dev->iobase);
 
-        printk("fingerprint:\n");
+        dev_dbg(dev->hw_dev, "fingerprint:\n");
         for (i = 0; i < 48; i += 2)
-                printk("%04x ", inw(dev->iobase + i));
+                dev_dbg(dev->hw_dev, "%04x\n", inw(dev->iobase + i));
 
-        printk("\n");
 
         ret = request_irq(link->irq, das16cs_interrupt,
                           IRQF_SHARED, "cb_das16_cs", dev);
@@ -185,7 +184,7 @@ static int das16cs_attach(struct comedi_device *dev,
 
         dev->irq = link->irq;
 
-        printk("irq=%u ", dev->irq);
+        dev_dbg(dev->hw_dev, "irq=%u\n", dev->irq);
 
         dev->board_ptr = das16cs_probe(dev, link);
         if (!dev->board_ptr)
@@ -252,14 +251,13 @@ static int das16cs_attach(struct comedi_device *dev,
                 s->type = COMEDI_SUBD_UNUSED;
         }
 
-        printk("attached\n");
 
         return 1;
 }
 
 static int das16cs_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: das16cs: remove\n", dev->minor);
+        dev_dbg(dev->hw_dev, "comedi%d: das16cs: remove\n", dev->minor);
 
         if (dev->irq)
                 free_irq(dev->irq, dev);
@@ -312,7 +310,7 @@ static int das16cs_ai_rinsn(struct comedi_device *dev,
                                 break;
                 }
                 if (to == TIMEOUT) {
-                        printk("cb_das16_cs: ai timeout\n");
+                        dev_dbg(dev->hw_dev, "cb_das16_cs: ai timeout\n");
                         return -ETIME;
                 }
                 data[i] = (unsigned short)inw(dev->iobase + 0);
diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 61968a505f24..7e4ffcfdac62 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -565,8 +565,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
         int index;
         int i;
 
-        printk("comedi%d: cb_pcidas: ", dev->minor);
-
 /*
  * Allocate the private structure area.
  */
@@ -576,7 +574,6 @@ static int cb_pcidas_attach(struct comedi_device *dev,
 /*
  * Probe the device to determine what device in the series it is.
  */
-        printk("\n");
 
         for_each_pci_dev(pcidev) {
                 /*  is it not a computer boards card? */
@@ -600,20 +597,20 @@ static int cb_pcidas_attach(struct comedi_device *dev,
                 }
         }
 
-        printk("No supported ComputerBoards/MeasurementComputing card found on "
-               "requested position\n");
+        dev_err(dev->hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");
         return -EIO;
 
 found:
 
-        printk("Found %s on bus %i, slot %i\n", cb_pcidas_boards[index].name,
-               pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+        dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n",
+                cb_pcidas_boards[index].name, pcidev->bus->number,
+                PCI_SLOT(pcidev->devfn));
 
         /*
          * Enable PCI device and reserve I/O ports.
          */
         if (comedi_pci_enable(pcidev, "cb_pcidas")) {
-                printk(" Failed to enable PCI device and request regions\n");
+                dev_err(dev->hw_dev, "Failed to enable PCI device and request regions\n");
                 return -EIO;
         }
         /*
@@ -639,7 +636,8 @@ found:
         /*  get irq */
         if (request_irq(devpriv->pci_dev->irq, cb_pcidas_interrupt,
                         IRQF_SHARED, "cb_pcidas", dev)) {
-                printk(" unable to allocate irq %d\n", devpriv->pci_dev->irq);
+                dev_dbg(dev->hw_dev, "unable to allocate irq %d\n",
+                        devpriv->pci_dev->irq);
                 return -EINVAL;
         }
         dev->irq = devpriv->pci_dev->irq;
@@ -768,7 +766,6 @@ found:
  */
 static int cb_pcidas_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: cb_pcidas: remove\n", dev->minor);
 
         if (devpriv) {
                 if (devpriv->s5933_config) {
@@ -776,8 +773,8 @@ static int cb_pcidas_detach(struct comedi_device *dev)
                         outl(INTCSR_INBOX_INTR_STATUS,
                              devpriv->s5933_config + AMCC_OP_REG_INTCSR);
 #ifdef CB_PCIDAS_DEBUG
-                        printk("detaching, incsr is 0x%x\n",
-                               inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR));
+                        dev_dbg(dev->hw_dev, "detaching, incsr is 0x%x\n",
+                                inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR));
 #endif
                 }
         }
@@ -858,7 +855,8 @@ static int ai_config_calibration_source(struct comedi_device *dev,
         unsigned int source = data[1];
 
         if (source >= num_calibration_sources) {
-                printk("invalid calibration source: %i\n", source);
+                dev_err(dev->hw_dev, "invalid calibration source: %i\n",
+                        source);
                 return -EINVAL;
         }
 
@@ -1279,7 +1277,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
         outw(bits, devpriv->control_status + ADCMUX_CONT);
 
 #ifdef CB_PCIDAS_DEBUG
-        printk("comedi: sent 0x%x to adcmux control\n", bits);
+        dev_dbg(dev->hw_dev, "comedi: sent 0x%x to adcmux control\n", bits);
 #endif
 
         /*  load counters */
@@ -1306,7 +1304,8 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
                 devpriv->adc_fifo_bits |= INT_FHF;      /* interrupt fifo half full */
         }
 #ifdef CB_PCIDAS_DEBUG
-        printk("comedi: adc_fifo_bits are 0x%x\n", devpriv->adc_fifo_bits);
+        dev_dbg(dev->hw_dev, "comedi: adc_fifo_bits are 0x%x\n",
+                devpriv->adc_fifo_bits);
 #endif
         /*  enable (and clear) interrupts */
         outw(devpriv->adc_fifo_bits | EOAI | INT | LADFUL,
@@ -1332,7 +1331,7 @@ static int cb_pcidas_ai_cmd(struct comedi_device *dev,
                 bits |= BURSTE;
         outw(bits, devpriv->control_status + TRIG_CONTSTAT);
 #ifdef CB_PCIDAS_DEBUG
-        printk("comedi: sent 0x%x to trig control\n", bits);
+        dev_dbg(dev->hw_dev, "comedi: sent 0x%x to trig control\n", bits);
 #endif
 
         return 0;
@@ -1549,7 +1548,8 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
         spin_lock_irqsave(&dev->spinlock, flags);
         devpriv->adc_fifo_bits |= DAEMIE | DAHFIE;
 #ifdef CB_PCIDAS_DEBUG
-        printk("comedi: adc_fifo_bits are 0x%x\n", devpriv->adc_fifo_bits);
+        dev_dbg(dev->hw_dev, "comedi: adc_fifo_bits are 0x%x\n",
+                devpriv->adc_fifo_bits);
 #endif
         /*  enable and clear interrupts */
         outw(devpriv->adc_fifo_bits | DAEMI | DAHFI,
@@ -1559,7 +1559,8 @@ static int cb_pcidas_ao_inttrig(struct comedi_device *dev,
         devpriv->ao_control_bits |= DAC_START | DACEN | DAC_EMPTY;
         outw(devpriv->ao_control_bits, devpriv->control_status + DAC_CSR);
 #ifdef CB_PCIDAS_DEBUG
-        printk("comedi: sent 0x%x to dac control\n", devpriv->ao_control_bits);
+        dev_dbg(dev->hw_dev, "comedi: sent 0x%x to dac control\n",
+                devpriv->ao_control_bits);
 #endif
         spin_unlock_irqrestore(&dev->spinlock, flags);
 
@@ -1587,8 +1588,9 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d)
 
         s5933_status = inl(devpriv->s5933_config + AMCC_OP_REG_INTCSR);
 #ifdef CB_PCIDAS_DEBUG
-        printk("intcsr 0x%x\n", s5933_status);
-        printk("mbef 0x%x\n", inl(devpriv->s5933_config + AMCC_OP_REG_MBEF));
+        dev_dbg(dev->hw_dev, "intcsr 0x%x\n", s5933_status);
+        dev_dbg(dev->hw_dev, "mbef 0x%x\n",
+                inl(devpriv->s5933_config + AMCC_OP_REG_MBEF));
 #endif
 
         if ((INTCSR_INTR_ASSERTED & s5933_status) == 0)
diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index 1e324198996c..c9e8c4785768 100644
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1739,8 +1739,6 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
         uint32_t local_range, local_decode;
         int retval;
 
-        printk("comedi%d: cb_pcidas64\n", dev->minor);
-
 /*
  * Allocate the private structure area.
  */
@@ -1781,12 +1779,11 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 return -EIO;
         }
 
-        printk("Found %s on bus %i, slot %i\n", board(dev)->name,
-               pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+        dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n", board(dev)->name,
+                pcidev->bus->number, PCI_SLOT(pcidev->devfn));
 
         if (comedi_pci_enable(pcidev, driver_cb_pcidas.driver_name)) {
-                printk(KERN_WARNING
-                       " failed to enable PCI device and request regions\n");
+                dev_warn(dev->hw_dev, "failed to enable PCI device and request regions\n");
                 return -EIO;
         }
         pci_set_master(pcidev);
@@ -1814,7 +1811,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         if (!priv(dev)->plx9080_iobase || !priv(dev)->main_iobase
             || !priv(dev)->dio_counter_iobase) {
-                printk(" failed to remap io memory\n");
+                dev_warn(dev->hw_dev, "failed to remap io memory\n");
                 return -ENOMEM;
         }
 
@@ -1850,17 +1847,19 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         priv(dev)->hw_revision =
             hw_revision(dev, readw(priv(dev)->main_iobase + HW_STATUS_REG));
-        printk(" stc hardware revision %i\n", priv(dev)->hw_revision);
+        dev_dbg(dev->hw_dev, "stc hardware revision %i\n",
+                priv(dev)->hw_revision);
         init_plx9080(dev);
         init_stc_registers(dev);
         /*  get irq */
         if (request_irq(pcidev->irq, handle_interrupt, IRQF_SHARED,
                         "cb_pcidas64", dev)) {
-                printk(" unable to allocate irq %u\n", pcidev->irq);
+                dev_dbg(dev->hw_dev, "unable to allocate irq %u\n",
+                        pcidev->irq);
                 return -EINVAL;
         }
         dev->irq = pcidev->irq;
-        printk(" irq %u\n", dev->irq);
+        dev_dbg(dev->hw_dev, "irq %u\n", dev->irq);
 
         retval = setup_subdevices(dev);
         if (retval < 0)
@@ -1882,8 +1881,6 @@ static int detach(struct comedi_device *dev)
 {
         unsigned int i;
 
-        printk("comedi%d: cb_pcidas: remove\n", dev->minor);
-
         if (dev->irq)
                 free_irq(dev->irq, dev);
         if (priv(dev)) {
@@ -2093,7 +2090,8 @@ static int ai_config_calibration_source(struct comedi_device *dev,
         else
                 num_calibration_sources = 8;
         if (source >= num_calibration_sources) {
-                printk("invalid calibration source: %i\n", source);
+                dev_dbg(dev->hw_dev, "invalid calibration source: %i\n",
+                        source);
                 return -EINVAL;
         }
 
@@ -2924,7 +2922,7 @@ static void pio_drain_ai_fifo_16(struct comedi_device *dev)
                 }
 
                 if (num_samples < 0) {
-                        printk(" cb_pcidas64: bug! num_samples < 0\n");
+                        dev_err(dev->hw_dev, "cb_pcidas64: bug! num_samples < 0\n");
                         break;
                 }
 
diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 49102b3a6c4a..abba220a767f 100644
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -282,7 +282,6 @@ static int cb_pcidda_attach(struct comedi_device *dev,
         struct pci_dev *pcidev = NULL;
         int index;
 
-        printk("comedi%d: cb_pcidda: ", dev->minor);
 
 /*
  * Allocate the private structure area.
@@ -293,7 +292,6 @@ static int cb_pcidda_attach(struct comedi_device *dev,
 /*
  * Probe the device to determine what device in the series it is.
  */
-        printk("\n");
 
         for_each_pci_dev(pcidev) {
                 if (pcidev->vendor == PCI_VENDOR_ID_CB) {
@@ -312,22 +310,21 @@ static int cb_pcidda_attach(struct comedi_device *dev,
                 }
         }
         if (!pcidev) {
-                printk
-                    ("Not a ComputerBoards/MeasurementComputing card on requested position\n");
+                dev_err(dev->hw_dev, "Not a ComputerBoards/MeasurementComputing card on requested position\n");
                 return -EIO;
         }
 found:
         devpriv->pci_dev = pcidev;
         dev->board_ptr = cb_pcidda_boards + index;
         /*  "thisboard" macro can be used from here. */
-        printk("Found %s at requested position\n", thisboard->name);
+        dev_dbg(dev->hw_dev, "Found %s at requested position\n",
+                thisboard->name);
 
         /*
          * Enable PCI device and request regions.
          */
         if (comedi_pci_enable(pcidev, thisboard->name)) {
-                printk
-                    ("cb_pcidda: failed to enable PCI device and request regions\n");
+                dev_err(dev->hw_dev, "cb_pcidda: failed to enable PCI device and request regions\n");
                 return -EIO;
         }
 
@@ -377,12 +374,11 @@ found:
         s = dev->subdevices + 2;
         subdev_8255_init(dev, s, NULL, devpriv->digitalio + PORT2A);
 
-        printk(" eeprom:");
+        dev_dbg(dev->hw_dev, "eeprom:\n");
         for (index = 0; index < EEPROM_SIZE; index++) {
                 devpriv->eeprom_data[index] = cb_pcidda_read_eeprom(dev, index);
-                printk(" %i:0x%x ", index, devpriv->eeprom_data[index]);
+                dev_dbg(dev->hw_dev, "%i:0x%x\n", index, devpriv->eeprom_data[index]);
         }
-        printk("\n");
 
         /*  set calibrations dacs */
         for (index = 0; index < thisboard->ao_chans; index++)
@@ -417,8 +413,6 @@ static int cb_pcidda_detach(struct comedi_device *dev)
                 subdev_8255_cleanup(dev, dev->subdevices + 2);
         }
 
-        printk("comedi%d: cb_pcidda: remove\n", dev->minor);
-
         return 0;
 }
 
diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c
index 79477a595ef9..8f3215239a15 100644
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -184,8 +184,6 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         int index;
         int i;
 
-        printk("comedi%d: cb_pcidio: \n", dev->minor);
-
 /*
  * Allocate the private structure area.  alloc_private() is a
  * convenient macro defined in comedidev.h.
@@ -223,8 +221,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 }
         }
 
-        printk("No supported ComputerBoards/MeasurementComputing card found on "
-               "requested position\n");
+        dev_err(dev->hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");
         return -EIO;
 
 found:
@@ -236,14 +233,12 @@ found:
         dev->board_name = thisboard->name;
 
         devpriv->pci_dev = pcidev;
-        printk("Found %s on bus %i, slot %i\n", thisboard->name,
-               devpriv->pci_dev->bus->number,
-               PCI_SLOT(devpriv->pci_dev->devfn));
-        if (comedi_pci_enable(pcidev, thisboard->name)) {
-                printk
-                    ("cb_pcidio: failed to enable PCI device and request regions\n");
+        dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n", thisboard->name,
+                devpriv->pci_dev->bus->number,
+                PCI_SLOT(devpriv->pci_dev->devfn));
+        if (comedi_pci_enable(pcidev, thisboard->name))
                 return -EIO;
-        }
+
         devpriv->dio_reg_base
             =
             pci_resource_start(devpriv->pci_dev,
@@ -259,11 +254,10 @@ found:
         for (i = 0; i < thisboard->n_8255; i++) {
                 subdev_8255_init(dev, dev->subdevices + i,
                                  NULL, devpriv->dio_reg_base + i * 4);
-                printk(" subdev %d: base = 0x%lx\n", i,
-                       devpriv->dio_reg_base + i * 4);
+                dev_dbg(dev->hw_dev, "subdev %d: base = 0x%lx\n", i,
+                        devpriv->dio_reg_base + i * 4);
         }
 
-        printk("attached\n");
         return 1;
 }
 
@@ -277,7 +271,6 @@ found:
  */
 static int pcidio_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: cb_pcidio: remove\n", dev->minor);
         if (devpriv) {
                 if (devpriv->pci_dev) {
                         if (devpriv->dio_reg_base)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index b1b832b65bc1..8ba694263bd3 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -212,8 +212,6 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
         int index;
         /* int i; */
 
-        printk("comedi%d: cb_pcimdas: ", dev->minor);
-
 /*
  * Allocate the private structure area.
  */
@@ -223,7 +221,6 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
 /*
  * Probe the device to determine what device in the series it is.
  */
-        printk("\n");
 
         for_each_pci_dev(pcidev) {
                 /*  is it not a computer boards card? */
@@ -248,26 +245,26 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
                 }
         }
 
-        printk("No supported ComputerBoards/MeasurementComputing card found on "
-               "requested position\n");
+        dev_err(dev->hw_dev, "No supported ComputerBoards/MeasurementComputing card found on requested position\n");
         return -EIO;
 
 found:
 
-        printk("Found %s on bus %i, slot %i\n", cb_pcimdas_boards[index].name,
-               pcidev->bus->number, PCI_SLOT(pcidev->devfn));
+        dev_dbg(dev->hw_dev, "Found %s on bus %i, slot %i\n",
+                cb_pcimdas_boards[index].name, pcidev->bus->number,
+                PCI_SLOT(pcidev->devfn));
 
         /*  Warn about non-tested features */
         switch (thisboard->device_id) {
         case 0x56:
                 break;
         default:
-                printk("THIS CARD IS UNSUPPORTED.\n"
-                       "PLEASE REPORT USAGE TO <mocelet@sucs.org>\n");
+                dev_dbg(dev->hw_dev, "THIS CARD IS UNSUPPORTED.\n"
+                        "PLEASE REPORT USAGE TO <mocelet@sucs.org>\n");
         }
 
         if (comedi_pci_enable(pcidev, "cb_pcimdas")) {
-                printk(" Failed to enable PCI device and request regions\n");
+                dev_err(dev->hw_dev, "Failed to enable PCI device and request regions\n");
                 return -EIO;
         }
 
@@ -277,13 +274,11 @@ found:
         devpriv->BADR3 = pci_resource_start(devpriv->pci_dev, 3);
         devpriv->BADR4 = pci_resource_start(devpriv->pci_dev, 4);
 
-#ifdef CBPCIMDAS_DEBUG
-        printk("devpriv->BADR0 = 0x%lx\n", devpriv->BADR0);
-        printk("devpriv->BADR1 = 0x%lx\n", devpriv->BADR1);
-        printk("devpriv->BADR2 = 0x%lx\n", devpriv->BADR2);
-        printk("devpriv->BADR3 = 0x%lx\n", devpriv->BADR3);
-        printk("devpriv->BADR4 = 0x%lx\n", devpriv->BADR4);
-#endif
+        dev_dbg(dev->hw_dev, "devpriv->BADR0 = 0x%lx\n", devpriv->BADR0);
+        dev_dbg(dev->hw_dev, "devpriv->BADR1 = 0x%lx\n", devpriv->BADR1);
+        dev_dbg(dev->hw_dev, "devpriv->BADR2 = 0x%lx\n", devpriv->BADR2);
+        dev_dbg(dev->hw_dev, "devpriv->BADR3 = 0x%lx\n", devpriv->BADR3);
+        dev_dbg(dev->hw_dev, "devpriv->BADR4 = 0x%lx\n", devpriv->BADR4);
 
 /* Dont support IRQ yet */
 /*  get irq */
@@ -333,8 +328,6 @@ found:
         else
                 s->type = COMEDI_SUBD_UNUSED;
 
-        printk("attached\n");
-
         return 1;
 }
 
@@ -348,16 +341,19 @@ found:
  */
 static int cb_pcimdas_detach(struct comedi_device *dev)
 {
-#ifdef CBPCIMDAS_DEBUG
         if (devpriv) {
-                printk("devpriv->BADR0 = 0x%lx\n", devpriv->BADR0);
-                printk("devpriv->BADR1 = 0x%lx\n", devpriv->BADR1);
-                printk("devpriv->BADR2 = 0x%lx\n", devpriv->BADR2);
-                printk("devpriv->BADR3 = 0x%lx\n", devpriv->BADR3);
-                printk("devpriv->BADR4 = 0x%lx\n", devpriv->BADR4);
+                dev_dbg(dev->hw_dev, "devpriv->BADR0 = 0x%lx\n",
+                        devpriv->BADR0);
+                dev_dbg(dev->hw_dev, "devpriv->BADR1 = 0x%lx\n",
+                        devpriv->BADR1);
+                dev_dbg(dev->hw_dev, "devpriv->BADR2 = 0x%lx\n",
+                        devpriv->BADR2);
+                dev_dbg(dev->hw_dev, "devpriv->BADR3 = 0x%lx\n",
+                        devpriv->BADR3);
+                dev_dbg(dev->hw_dev, "devpriv->BADR4 = 0x%lx\n",
+                        devpriv->BADR4);
         }
-#endif
-        printk("comedi%d: cb_pcimdas: remove\n", dev->minor);
+
         if (dev->irq)
                 free_irq(dev->irq, dev);
         if (devpriv) {
diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 8c981a89ab63..40bddfa22220 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -105,7 +105,8 @@ struct board_struct {
         int ao_bits;
         int dio_chans;
         int dio_method;
-        int dio_offset;         /* how many bytes into the BADR are the DIO ports */
+        /* how many bytes into the BADR are the DIO ports */
+        int dio_offset;
         int regs_badrindex;     /* IO Region for the control, analog output,
                                    and DIO registers */
         int reg_sz;             /* number of bytes of registers in io region */
@@ -144,17 +145,18 @@ static const struct board_struct boards[] = {
 /* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
  * upstream. */
 static DEFINE_PCI_DEVICE_TABLE(pci_table) = {
-        {
-        PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_ID_PCIM_DDA06_16) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, pci_table);
 
-/* this structure is for data unique to this hardware driver.  If
-   several hardware drivers keep similar information in this structure,
-   feel free to suggest moving the variable to the struct comedi_device struct.  */
+/*
+ * this structure is for data unique to this hardware driver.  If
+ * several hardware drivers keep similar information in this structure,
+ * feel free to suggest moving the variable to the struct comedi_device
+ * struct.
+ */
 struct board_private_struct {
         unsigned long registers;        /* set by probe */
         unsigned long dio_registers;
@@ -335,7 +337,10 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (thisboard->dio_chans) {
                 switch (thisboard->dio_method) {
                 case DIO_8255:
-                        /* this is a straight 8255, so register us with the 8255 driver */
+                        /*
+                         * this is a straight 8255, so register us with
+                         * the 8255 driver
+                         */
                         subdev_8255_init(dev, s, NULL, devpriv->dio_registers);
                         devpriv->attached_to_8255 = 1;
                         break;
@@ -436,8 +441,11 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
 
         for (i = 0; i < insn->n; i++) {
                 inw(devpriv->registers + chan * 2);
-                /* should I set data[i] to the result of the actual read on the register
-                   or the cached unsigned int in devpriv->ao_readback[]? */
+                /*
+                 * should I set data[i] to the result of the actual read
+                 * on the register or the cached unsigned int in
+                 * devpriv->ao_readback[]?
+                 */
                 data[i] = devpriv->ao_readback[chan];
         }
 
diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 871f109bcfa3..e3659bd6e85e 100644
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -57,10 +57,9 @@ static const struct contec_board contec_boards[] = {
 
 #define PCI_DEVICE_ID_PIO1616L 0x8172
 static DEFINE_PCI_DEVICE_TABLE(contec_pci_table) = {
-        {
-        PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, PIO1616L}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_CONTEC, PCI_DEVICE_ID_PIO1616L),
+                .driver_data = PIO1616L },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, contec_pci_table);
@@ -197,8 +196,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,
                                struct comedi_insn *insn, unsigned int *data)
 {
 
-        printk("contec_do_insn_bits called\n");
-        printk(" data: %d %d\n", data[0], data[1]);
+        dev_dbg(dev->hw_dev, "contec_do_insn_bits called\n");
+        dev_dbg(dev->hw_dev, "data: %d %d\n", data[0], data[1]);
 
         if (insn->n != 2)
                 return -EINVAL;
@@ -206,8 +205,8 @@ static int contec_do_insn_bits(struct comedi_device *dev,
         if (data[0]) {
                 s->state &= ~data[0];
                 s->state |= data[0] & data[1];
-                printk("  out: %d on %lx\n", s->state,
-                       dev->iobase + thisboard->out_offs);
+                dev_dbg(dev->hw_dev, "out: %d on %lx\n", s->state,
+                        dev->iobase + thisboard->out_offs);
                 outw(s->state, dev->iobase + thisboard->out_offs);
         }
         return 2;
@@ -218,8 +217,8 @@ static int contec_di_insn_bits(struct comedi_device *dev,
                                struct comedi_insn *insn, unsigned int *data)
 {
 
-        printk("contec_di_insn_bits called\n");
-        printk(" data: %d %d\n", data[0], data[1]);
+        dev_dbg(dev->hw_dev, "contec_di_insn_bits called\n");
+        dev_dbg(dev->hw_dev, "data: %d %d\n", data[0], data[1]);
 
         if (insn->n != 2)
                 return -EINVAL;
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 82be77daa7d7..e61c6a8f2857 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -325,9 +325,8 @@ static const struct daq200_boardtype boardtypes[] = {
 #define this_board ((const struct daq200_boardtype *)dev->board_ptr)
 
 static DEFINE_PCI_DEVICE_TABLE(daqboard2000_pci_table) = {
-        {
-        0x1616, 0x0409, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(0x1616, 0x0409) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, daqboard2000_pci_table);
@@ -430,16 +429,14 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
                 /* Enable reading from the scanlist FIFO */
                 fpga->acqControl = DAQBOARD2000_SeqStartScanList;
                 for (timeout = 0; timeout < 20; timeout++) {
-                        if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull) {
+                        if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull)
                                 break;
-                        }
                         /* udelay(2); */
                 }
                 fpga->acqControl = DAQBOARD2000_AdcPacerEnable;
                 for (timeout = 0; timeout < 20; timeout++) {
-                        if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning) {
+                        if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning)
                                 break;
-                        }
                         /* udelay(2); */
                 }
                 for (timeout = 0; timeout < 20; timeout++) {
@@ -465,9 +462,8 @@ static int daqboard2000_ao_insn_read(struct comedi_device *dev,
         int i;
         int chan = CR_CHAN(insn->chanspec);
 
-        for (i = 0; i < insn->n; i++) {
+        for (i = 0; i < insn->n; i++)
                 data[i] = devpriv->ao_readback[chan];
-        }
 
         return i;
 }
@@ -490,9 +486,8 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
                 /* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */
                 fpga->dacSetting[chan] = data[i];
                 for (timeout = 0; timeout < 20; timeout++) {
-                        if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0) {
+                        if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0)
                                 break;
-                        }
                         /* udelay(2); */
                 }
                 devpriv->ao_readback[chan] = data[i];
@@ -507,7 +502,7 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
 
 static void daqboard2000_resetLocalBus(struct comedi_device *dev)
 {
-        printk("daqboard2000_resetLocalBus\n");
+        dev_dbg(dev->hw_dev, "daqboard2000_resetLocalBus\n");
         writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c);
         udelay(10000);
         writel(DAQBOARD2000_SECRLocalBusLo, devpriv->plx + 0x6c);
@@ -516,7 +511,7 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev)
 
 static void daqboard2000_reloadPLX(struct comedi_device *dev)
 {
-        printk("daqboard2000_reloadPLX\n");
+        dev_dbg(dev->hw_dev, "daqboard2000_reloadPLX\n");
         writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);
         udelay(10000);
         writel(DAQBOARD2000_SECRReloadHi, devpriv->plx + 0x6c);
@@ -527,7 +522,7 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev)
 
 static void daqboard2000_pulseProgPin(struct comedi_device *dev)
 {
-        printk("daqboard2000_pulseProgPin 1\n");
+        dev_dbg(dev->hw_dev, "daqboard2000_pulseProgPin 1\n");
         writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
         udelay(10000);
         writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);
@@ -579,14 +574,14 @@ static int initialize_daqboard2000(struct comedi_device *dev,
         secr = readl(devpriv->plx + 0x6c);
         if (!(secr & DAQBOARD2000_EEPROM_PRESENT)) {
 #ifdef DEBUG_EEPROM
-                printk("no serial eeprom\n");
+                dev_dbg(dev->hw_dev, "no serial eeprom\n");
 #endif
                 return -EIO;
         }
 
         for (retry = 0; retry < 3; retry++) {
 #ifdef DEBUG_EEPROM
-                printk("Programming EEPROM try %x\n", retry);
+                dev_dbg(dev->hw_dev, "Programming EEPROM try %x\n", retry);
 #endif
 
                 daqboard2000_resetLocalBus(dev);
@@ -597,7 +592,8 @@ static int initialize_daqboard2000(struct comedi_device *dev,
                                 if (cpld_array[i] == 0xff
                                     && cpld_array[i + 1] == 0x20) {
 #ifdef DEBUG_EEPROM
-                                        printk("Preamble found at %d\n", i);
+                                        dev_dbg(dev->hw_dev, "Preamble found at %d\n",
+                                                i);
 #endif
                                         break;
                                 }
@@ -605,13 +601,12 @@ static int initialize_daqboard2000(struct comedi_device *dev,
                         for (; i < len; i += 2) {
                                 int data =
                                     (cpld_array[i] << 8) + cpld_array[i + 1];
-                                if (!daqboard2000_writeCPLD(dev, data)) {
+                                if (!daqboard2000_writeCPLD(dev, data))
                                         break;
-                                }
                         }
                         if (i >= len) {
 #ifdef DEBUG_EEPROM
-                                printk("Programmed\n");
+                                dev_dbg(dev->hw_dev, "Programmed\n");
 #endif
                                 daqboard2000_resetLocalBus(dev);
                                 daqboard2000_reloadPLX(dev);
@@ -658,9 +653,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
         /*  Set the + reference dac value in the FPGA */
         fpga->refDacs = 0x80 | DAQBOARD2000_PosRefDacSelect;
         for (timeout = 0; timeout < 20; timeout++) {
-                if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0) {
+                if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0)
                         break;
-                }
                 udelay(2);
         }
 /*  printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/
@@ -668,9 +662,8 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
         /*  Set the - reference dac value in the FPGA */
         fpga->refDacs = 0x80 | DAQBOARD2000_NegRefDacSelect;
         for (timeout = 0; timeout < 20; timeout++) {
-                if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0) {
+                if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0)
                         break;
-                }
                 udelay(2);
         }
 /*  printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/
@@ -737,15 +730,13 @@ static int daqboard2000_attach(struct comedi_device *dev,
         unsigned int aux_len;
         int bus, slot;
 
-        printk("comedi%d: daqboard2000:", dev->minor);
-
         bus = it->options[0];
         slot = it->options[1];
 
         result = alloc_private(dev, sizeof(struct daqboard2000_private));
-        if (result < 0) {
+        if (result < 0)
                 return -ENOMEM;
-        }
+
         for (card = pci_get_device(0x1616, 0x0409, NULL);
              card != NULL; card = pci_get_device(0x1616, 0x0409, card)) {
                 if (bus || slot) {
@@ -759,10 +750,10 @@ static int daqboard2000_attach(struct comedi_device *dev,
         }
         if (!card) {
                 if (bus || slot)
-                        printk(" no daqboard2000 found at bus/slot: %d/%d\n",
-                               bus, slot);
+                        dev_err(dev->hw_dev, "no daqboard2000 found at bus/slot: %d/%d\n",
+                                bus, slot);
                 else
-                        printk(" no daqboard2000 found\n");
+                        dev_err(dev->hw_dev, "no daqboard2000 found\n");
                 return -EIO;
         } else {
                 u32 id;
@@ -772,7 +763,8 @@ static int daqboard2000_attach(struct comedi_device *dev,
                       subsystem_device << 16) | card->subsystem_vendor;
                 for (i = 0; i < n_boardtypes; i++) {
                         if (boardtypes[i].id == id) {
-                                printk(" %s", boardtypes[i].name);
+                                dev_dbg(dev->hw_dev, "%s\n",
+                                        boardtypes[i].name);
                                 dev->board_ptr = boardtypes + i;
                         }
                 }
@@ -786,7 +778,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
 
         result = comedi_pci_enable(card, "daqboard2000");
         if (result < 0) {
-                printk(" failed to enable PCI device and request regions\n");
+                dev_err(dev->hw_dev, "failed to enable PCI device and request regions\n");
                 return -EIO;
         }
         devpriv->got_regions = 1;
@@ -794,9 +786,8 @@ static int daqboard2000_attach(struct comedi_device *dev,
             ioremap(pci_resource_start(card, 0), DAQBOARD2000_PLX_SIZE);
         devpriv->daq =
             ioremap(pci_resource_start(card, 2), DAQBOARD2000_DAQ_SIZE);
-        if (!devpriv->plx || !devpriv->daq) {
+        if (!devpriv->plx || !devpriv->daq)
                 return -ENOMEM;
-        }
 
         result = alloc_subdevices(dev, 3);
         if (result < 0)
@@ -817,7 +808,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
         if (aux_data && aux_len) {
                 result = initialize_daqboard2000(dev, aux_data, aux_len);
         } else {
-                printk("no FPGA initialization code, aborting\n");
+                dev_dbg(dev->hw_dev, "no FPGA initialization code, aborting\n");
                 result = -EIO;
         }
         if (result < 0)
@@ -857,30 +848,26 @@ static int daqboard2000_attach(struct comedi_device *dev,
         result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
                                   (unsigned long)(dev->iobase + 0x40));
 
-        printk("\n");
 out:
         return result;
 }
 
 static int daqboard2000_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: daqboard2000: remove\n", dev->minor);
-
         if (dev->subdevices)
                 subdev_8255_cleanup(dev, dev->subdevices + 2);
 
-        if (dev->irq) {
+        if (dev->irq)
                 free_irq(dev->irq, dev);
-        }
+
         if (devpriv) {
                 if (devpriv->daq)
                         iounmap(devpriv->daq);
                 if (devpriv->plx)
                         iounmap(devpriv->plx);
                 if (devpriv->pci_dev) {
-                        if (devpriv->got_regions) {
+                        if (devpriv->got_regions)
                                 comedi_pci_disable(devpriv->pci_dev);
-                        }
                         pci_dev_put(devpriv->pci_dev);
                 }
         }
diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index 3141dc80fe74..c2dd0ed36a73 100644
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -506,10 +506,8 @@ struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS] = {
 
 #ifdef CONFIG_COMEDI_PCI
 static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {
-        {
-        PCI_VENDOR_ID_COMPUTERBOARDS, PCI_DEVICE_ID_PCIDAS08,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_COMPUTERBOARDS, PCI_DEVICE_ID_PCIDAS08) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, das08_pci_table);
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index 6d91d3028178..4ad398aad72c 100644
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -79,22 +79,20 @@ static int das08_cs_attach(struct comedi_device *dev,
         if (ret < 0)
                 return ret;
 
-        printk("comedi%d: das08_cs: ", dev->minor);
+        dev_info(dev->hw_dev, "comedi%d: das08_cs:\n", dev->minor);
         /*  deal with a pci board */
 
         if (thisboard->bustype == pcmcia) {
                 if (link == NULL) {
-                        printk(" no pcmcia cards found\n");
+                        dev_err(dev->hw_dev, "no pcmcia cards found\n");
                         return -EIO;
                 }
                 iobase = link->resource[0]->start;
         } else {
-                printk(" bug! board does not have PCMCIA bustype\n");
+                dev_err(dev->hw_dev, "bug! board does not have PCMCIA bustype\n");
                 return -EINVAL;
         }
 
-        printk("\n");
-
         return das08_common_attach(dev, iobase);
 }
 
diff --git a/drivers/staging/comedi/drivers/das16m1.c b/drivers/staging/comedi/drivers/das16m1.c
index a5ce3b2abe4a..5376e718e3d7 100644
--- a/drivers/staging/comedi/drivers/das16m1.c
+++ b/drivers/staging/comedi/drivers/das16m1.c
@@ -384,20 +384,20 @@ static int das16m1_cmd_exec(struct comedi_device *dev,
         byte = 0;
         /* if we are using external start trigger (also board dislikes having
          * both start and conversion triggers external simultaneously) */
-        if (cmd->start_src == TRIG_EXT && cmd->convert_src != TRIG_EXT) {
+        if (cmd->start_src == TRIG_EXT && cmd->convert_src != TRIG_EXT)
                 byte |= EXT_TRIG_BIT;
-        }
+
         outb(byte, dev->iobase + DAS16M1_CS);
         /* clear interrupt bit */
         outb(0, dev->iobase + DAS16M1_CLEAR_INTR);
 
         /* enable interrupts and internal pacer */
         devpriv->control_state &= ~PACER_MASK;
-        if (cmd->convert_src == TRIG_TIMER) {
+        if (cmd->convert_src == TRIG_TIMER)
                 devpriv->control_state |= INT_PACER;
-        } else {
+        else
                 devpriv->control_state |= EXT_PACER;
-        }
+
         devpriv->control_state |= INTE;
         outb(devpriv->control_state, dev->iobase + DAS16M1_INTR_CONTROL);
 
@@ -531,9 +531,8 @@ static void munge_sample_array(short *array, unsigned int num_elements)
 {
         unsigned int i;
 
-        for (i = 0; i < num_elements; i++) {
+        for (i = 0; i < num_elements; i++)
                 array[i] = munge_sample(array[i]);
-        }
 }
 
 static void das16m1_handler(struct comedi_device *dev, unsigned int status)
@@ -668,25 +667,20 @@ static int das16m1_attach(struct comedi_device *dev,
 
         iobase = it->options[0];
 
-        printk("comedi%d: das16m1:", dev->minor);
-
         ret = alloc_private(dev, sizeof(struct das16m1_private_struct));
         if (ret < 0)
                 return ret;
 
         dev->board_name = thisboard->name;
 
-        printk(" io 0x%lx-0x%lx 0x%lx-0x%lx",
-               iobase, iobase + DAS16M1_SIZE,
-               iobase + DAS16M1_82C55, iobase + DAS16M1_82C55 + DAS16M1_SIZE2);
         if (!request_region(iobase, DAS16M1_SIZE, driver_das16m1.driver_name)) {
-                printk(" I/O port conflict\n");
+                comedi_error(dev, "I/O port conflict\n");
                 return -EIO;
         }
         if (!request_region(iobase + DAS16M1_82C55, DAS16M1_SIZE2,
                             driver_das16m1.driver_name)) {
                 release_region(iobase, DAS16M1_SIZE);
-                printk(" I/O port conflict\n");
+                comedi_error(dev, "I/O port conflict\n");
                 return -EIO;
         }
         dev->iobase = iobase;
@@ -697,17 +691,17 @@ static int das16m1_attach(struct comedi_device *dev,
         if (das16m1_irq_bits(irq) >= 0) {
                 ret = request_irq(irq, das16m1_interrupt, 0,
                                   driver_das16m1.driver_name, dev);
-                if (ret < 0) {
-                        printk(", irq unavailable\n");
+                if (ret < 0)
                         return ret;
-                }
                 dev->irq = irq;
-                printk(", irq %u\n", irq);
+                printk
+                    ("irq %u\n", irq);
         } else if (irq == 0) {
-                printk(", no irq\n");
+                printk
+                    (", no irq\n");
         } else {
-                printk(", invalid irq\n"
-                       " valid irqs are 2, 3, 5, 7, 10, 11, 12, or 15\n");
+                comedi_error(dev, "invalid irq\n"
+                             " valid irqs are 2, 3, 5, 7, 10, 11, 12, or 15\n");
                 return -EINVAL;
         }
 
@@ -771,7 +765,6 @@ static int das16m1_attach(struct comedi_device *dev,
 
 static int das16m1_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: das16m1: remove\n", dev->minor);
 
 /* das16m1_reset(dev); */
 
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index a6df30b7fd7c..99ada5a53b9e 100644
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -573,22 +573,23 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
                         devpriv->dma_bits |= DMA_CH7_CH5;
                         break;
                 default:
-                        printk(" only supports dma channels 5 through 7\n"
-                               " Dual dma only allows the following combinations:\n"
-                               " dma 5,6 / 6,7 / or 7,5\n");
+                        dev_err(dev->hw_dev, " only supports dma channels 5 through 7\n"
+                                " Dual dma only allows the following combinations:\n"
+                                " dma 5,6 / 6,7 / or 7,5\n");
                         return -EINVAL;
                         break;
                 }
                 if (request_dma(dma0, driver_das1800.driver_name)) {
-                        printk(" failed to allocate dma channel %i\n", dma0);
+                        dev_err(dev->hw_dev, "failed to allocate dma channel %i\n",
+                                dma0);
                         return -EINVAL;
                 }
                 devpriv->dma0 = dma0;
                 devpriv->dma_current = dma0;
                 if (dma1) {
                         if (request_dma(dma1, driver_das1800.driver_name)) {
-                                printk(" failed to allocate dma channel %i\n",
-                                       dma1);
+                                dev_err(dev->hw_dev, "failed to allocate dma channel %i\n",
+                                        dma1);
                                 return -EINVAL;
                         }
                         devpriv->dma1 = dma1;
@@ -631,20 +632,20 @@ static int das1800_attach(struct comedi_device *dev,
         if (alloc_private(dev, sizeof(struct das1800_private)) < 0)
                 return -ENOMEM;
 
-        printk("comedi%d: %s: io 0x%lx", dev->minor, driver_das1800.driver_name,
-               iobase);
+        printk(KERN_DEBUG "comedi%d: %s: io 0x%lx", dev->minor,
+               driver_das1800.driver_name, iobase);
         if (irq) {
-                printk(", irq %u", irq);
+                printk(KERN_CONT ", irq %u", irq);
                 if (dma0) {
-                        printk(", dma %u", dma0);
+                        printk(KERN_CONT ", dma %u", dma0);
                         if (dma1)
-                                printk(" and %u", dma1);
+                                printk(KERN_CONT " and %u", dma1);
                 }
         }
-        printk("\n");
+        printk(KERN_CONT "\n");
 
         if (iobase == 0) {
-                printk(" io base address required\n");
+                dev_err(dev->hw_dev, "io base address required\n");
                 return -EINVAL;
         }
 
@@ -659,7 +660,7 @@ static int das1800_attach(struct comedi_device *dev,
 
         board = das1800_probe(dev);
         if (board < 0) {
-                printk(" unable to determine board type\n");
+                dev_err(dev->hw_dev, "unable to determine board type\n");
                 return -ENODEV;
         }
 
@@ -683,7 +684,8 @@ static int das1800_attach(struct comedi_device *dev,
         if (irq) {
                 if (request_irq(irq, das1800_interrupt, 0,
                                 driver_das1800.driver_name, dev)) {
-                        printk(" unable to allocate irq %u\n", irq);
+                        dev_dbg(dev->hw_dev, "unable to allocate irq %u\n",
+                                irq);
                         return -EINVAL;
                 }
         }
@@ -712,7 +714,7 @@ static int das1800_attach(struct comedi_device *dev,
                 devpriv->irq_dma_bits |= 0x38;
                 break;
         default:
-                printk(" irq out of range\n");
+                dev_err(dev->hw_dev, "irq out of range\n");
                 return -EINVAL;
                 break;
         }
@@ -813,8 +815,8 @@ static int das1800_detach(struct comedi_device *dev)
                 kfree(devpriv->ai_buf1);
         }
 
-        printk("comedi%d: %s: remove\n", dev->minor,
-               driver_das1800.driver_name);
+        dev_dbg(dev->hw_dev, "comedi%d: %s: remove\n", dev->minor,
+                driver_das1800.driver_name);
 
         return 0;
 };
@@ -833,8 +835,8 @@ static int das1800_probe(struct comedi_device *dev)
         case 0x3:
                 if (board == das1801st_da || board == das1802st_da ||
                     board == das1701st_da || board == das1702st_da) {
-                        printk(" Board model: %s\n",
-                               das1800_boards[board].name);
+                        dev_dbg(dev->hw_dev, "Board model: %s\n",
+                                das1800_boards[board].name);
                         return board;
                 }
                 printk
@@ -843,8 +845,8 @@ static int das1800_probe(struct comedi_device *dev)
                 break;
         case 0x4:
                 if (board == das1802hr_da || board == das1702hr_da) {
-                        printk(" Board model: %s\n",
-                               das1800_boards[board].name);
+                        dev_dbg(dev->hw_dev, "Board model: %s\n",
+                                das1800_boards[board].name);
                         return board;
                 }
                 printk
@@ -854,8 +856,8 @@ static int das1800_probe(struct comedi_device *dev)
         case 0x5:
                 if (board == das1801ao || board == das1802ao ||
                     board == das1701ao || board == das1702ao) {
-                        printk(" Board model: %s\n",
-                               das1800_boards[board].name);
+                        dev_dbg(dev->hw_dev, "Board model: %s\n",
+                                das1800_boards[board].name);
                         return board;
                 }
                 printk
@@ -864,18 +866,19 @@ static int das1800_probe(struct comedi_device *dev)
                 break;
         case 0x6:
                 if (board == das1802hr || board == das1702hr) {
-                        printk(" Board model: %s\n",
-                               das1800_boards[board].name);
+                        dev_dbg(dev->hw_dev, "Board model: %s\n",
+                                das1800_boards[board].name);
                         return board;
                 }
-                printk(" Board model (probed, not recommended): das-1802hr\n");
+                printk
+                    (" Board model (probed, not recommended): das-1802hr\n");
                 return das1802hr;
                 break;
         case 0x7:
                 if (board == das1801st || board == das1802st ||
                     board == das1701st || board == das1702st) {
-                        printk(" Board model: %s\n",
-                               das1800_boards[board].name);
+                        dev_dbg(dev->hw_dev, "Board model: %s\n",
+                                das1800_boards[board].name);
                         return board;
                 }
                 printk
@@ -884,8 +887,8 @@ static int das1800_probe(struct comedi_device *dev)
                 break;
         case 0x8:
                 if (board == das1801hc || board == das1802hc) {
-                        printk(" Board model: %s\n",
-                               das1800_boards[board].name);
+                        dev_dbg(dev->hw_dev, "Board model: %s\n",
+                                das1800_boards[board].name);
                         return board;
                 }
                 printk
diff --git a/drivers/staging/comedi/drivers/das6402.c b/drivers/staging/comedi/drivers/das6402.c
index 6328f5280b66..f25684145e84 100644
--- a/drivers/staging/comedi/drivers/das6402.c
+++ b/drivers/staging/comedi/drivers/das6402.c
@@ -171,7 +171,7 @@ static irqreturn_t intr_handler(int irq, void *d)
         struct comedi_subdevice *s = dev->subdevices;
 
         if (!dev->attached || devpriv->das6402_ignoreirq) {
-                printk("das6402: BUG: spurious interrupt\n");
+                dev_warn(dev->hw_dev, "BUG: spurious interrupt\n");
                 return IRQ_HANDLED;
         }
 #ifdef DEBUG
@@ -228,9 +228,7 @@ static int das6402_ai_cancel(struct comedi_device *dev,
          */
 
         devpriv->das6402_ignoreirq = 1;
-#ifdef DEBUG
-        printk("das6402: Stopping acquisition\n");
-#endif
+        dev_dbg(dev->hw_dev, "Stopping acquisition\n");
         devpriv->das6402_ignoreirq = 1;
         outb_p(0x02, dev->iobase + 10); /* disable external trigging */
         outw_p(SCANL, dev->iobase + 2); /* resets the card fifo */
@@ -246,10 +244,7 @@ static int das6402_ai_mode2(struct comedi_device *dev,
                             struct comedi_subdevice *s, comedi_trig * it)
 {
         devpriv->das6402_ignoreirq = 1;
-
-#ifdef DEBUG
-        printk("das6402: Starting acquisition\n");
-#endif
+        dev_dbg(dev->hw_dev, "Starting acquisition\n");
         outb_p(0x03, dev->iobase + 10); /* enable external trigging */
         outw_p(SCANL, dev->iobase + 2); /* resets the card fifo */
         outb_p(IRQ | CONVSRC | BURSTEN | INTE, dev->iobase + 9);
@@ -329,10 +324,8 @@ static int das6402_attach(struct comedi_device *dev,
         if (iobase == 0)
                 iobase = 0x300;
 
-        printk("comedi%d: das6402: 0x%04lx", dev->minor, iobase);
-
         if (!request_region(iobase, DAS6402_SIZE, "das6402")) {
-                printk(" I/O port conflict\n");
+                dev_err(dev->hw_dev, "I/O port conflict\n");
                 return -EIO;
         }
         dev->iobase = iobase;
@@ -340,14 +333,12 @@ static int das6402_attach(struct comedi_device *dev,
         /* should do a probe here */
 
         irq = it->options[0];
-        printk(" ( irq = %u )", irq);
+        dev_dbg(dev->hw_dev, "( irq = %u )\n", irq);
         ret = request_irq(irq, intr_handler, 0, "das6402", dev);
-        if (ret < 0) {
-                printk("irq conflict\n");
+        if (ret < 0)
                 return ret;
-        }
-        dev->irq = irq;
 
+        dev->irq = irq;
         ret = alloc_private(dev, sizeof(struct das6402_private));
         if (ret < 0)
                 return ret;
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 96d41ad76956..6e347b40fe61 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -296,47 +296,47 @@ static int das800_probe(struct comedi_device *dev)
         switch (id_bits) {
         case 0x0:
                 if (board == das800) {
-                        printk(" Board model: DAS-800\n");
+                        dev_dbg(dev->hw_dev, "Board model: DAS-800\n");
                         return board;
                 }
                 if (board == ciodas800) {
-                        printk(" Board model: CIO-DAS800\n");
+                        dev_dbg(dev->hw_dev, "Board model: CIO-DAS800\n");
                         return board;
                 }
-                printk(" Board model (probed): DAS-800\n");
+                dev_dbg(dev->hw_dev, "Board model (probed): DAS-800\n");
                 return das800;
                 break;
         case 0x2:
                 if (board == das801) {
-                        printk(" Board model: DAS-801\n");
+                        dev_dbg(dev->hw_dev, "Board model: DAS-801\n");
                         return board;
                 }
                 if (board == ciodas801) {
-                        printk(" Board model: CIO-DAS801\n");
+                        dev_dbg(dev->hw_dev, "Board model: CIO-DAS801\n");
                         return board;
                 }
-                printk(" Board model (probed): DAS-801\n");
+                dev_dbg(dev->hw_dev, "Board model (probed): DAS-801\n");
                 return das801;
                 break;
         case 0x3:
                 if (board == das802) {
-                        printk(" Board model: DAS-802\n");
+                        dev_dbg(dev->hw_dev, "Board model: DAS-802\n");
                         return board;
                 }
                 if (board == ciodas802) {
-                        printk(" Board model: CIO-DAS802\n");
+                        dev_dbg(dev->hw_dev, "Board model: CIO-DAS802\n");
                         return board;
                 }
                 if (board == ciodas80216) {
-                        printk(" Board model: CIO-DAS802/16\n");
+                        dev_dbg(dev->hw_dev, "Board model: CIO-DAS802/16\n");
                         return board;
                 }
-                printk(" Board model (probed): DAS-802\n");
+                dev_dbg(dev->hw_dev, "Board model (probed): DAS-802\n");
                 return das802;
                 break;
         default:
-                printk(" Board model: probe returned 0x%x (unknown)\n",
-                       id_bits);
+                dev_dbg(dev->hw_dev, "Board model: probe returned 0x%x (unknown)\n",
+                        id_bits);
                 return board;
                 break;
         }
@@ -466,42 +466,43 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         unsigned long irq_flags;
         int board;
 
-        printk("comedi%d: das800: io 0x%lx", dev->minor, iobase);
+        dev_info(dev->hw_dev, "comedi%d: das800: io 0x%lx\n", dev->minor,
+                 iobase);
         if (irq)
-                printk(", irq %u", irq);
-        printk("\n");
+                dev_dbg(dev->hw_dev, "irq %u\n", irq);
 
         /* allocate and initialize dev->private */
         if (alloc_private(dev, sizeof(struct das800_private)) < 0)
                 return -ENOMEM;
 
         if (iobase == 0) {
-                printk("io base address required for das800\n");
+                dev_err(dev->hw_dev, "io base address required for das800\n");
                 return -EINVAL;
         }
 
         /* check if io addresses are available */
         if (!request_region(iobase, DAS800_SIZE, "das800")) {
-                printk("I/O port conflict\n");
+                dev_err(dev->hw_dev, "I/O port conflict\n");
                 return -EIO;
         }
         dev->iobase = iobase;
 
         board = das800_probe(dev);
         if (board < 0) {
-                printk("unable to determine board type\n");
+                dev_dbg(dev->hw_dev, "unable to determine board type\n");
                 return -ENODEV;
         }
         dev->board_ptr = das800_boards + board;
 
         /* grab our IRQ */
         if (irq == 1 || irq > 7) {
-                printk("irq out of range\n");
+                dev_err(dev->hw_dev, "irq out of range\n");
                 return -EINVAL;
         }
         if (irq) {
                 if (request_irq(irq, das800_interrupt, 0, "das800", dev)) {
-                        printk("unable to allocate irq %u\n", irq);
+                        dev_err(dev->hw_dev, "unable to allocate irq %u\n",
+                                irq);
                         return -EINVAL;
                 }
         }
@@ -557,7 +558,7 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int das800_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: das800: remove\n", dev->minor);
+        dev_info(dev->hw_dev, "comedi%d: das800: remove\n", dev->minor);
 
         /* only free stuff if it has been allocated by _attach */
         if (dev->iobase)
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 6170f7bac46e..0a7979e52999 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -352,7 +352,8 @@ static int dt3k_send_cmd(struct comedi_device *dev, unsigned int cmd)
         if ((status & DT3000_COMPLETION_MASK) == DT3000_NOERROR)
                 return 0;
 
-        printk("dt3k_send_cmd() timeout/error status=0x%04x\n", status);
+        dev_dbg(dev->hw_dev, "dt3k_send_cmd() timeout/error status=0x%04x\n",
+                status);
 
         return -ETIME;
 }
@@ -383,7 +384,7 @@ static void dt3k_writesingle(struct comedi_device *dev, unsigned int subsys,
         dt3k_send_cmd(dev, CMD_WRITESINGLE);
 }
 
-static int debug_n_ints = 0;
+static int debug_n_ints;
 
 /* FIXME! Assumes shared interrupt is for this card. */
 /* What's this debug_n_ints stuff? Obviously needs some work... */
@@ -429,12 +430,12 @@ static char *intr_flags[] = {
 static void debug_intr_flags(unsigned int flags)
 {
         int i;
-        printk("dt3k: intr_flags:");
+        printk(KERN_DEBUG "dt3k: intr_flags:");
         for (i = 0; i < 8; i++) {
                 if (flags & (1 << i))
-                        printk(" %s", intr_flags[i]);
+                        printk(KERN_CONT " %s", intr_flags[i]);
         }
-        printk("\n");
+        printk(KERN_CONT "\n");
 }
 #endif
 
@@ -452,7 +453,7 @@ static void dt3k_ai_empty_fifo(struct comedi_device *dev,
         if (count < 0)
                 count += AI_FIFO_DEPTH;
 
-        printk("reading %d samples\n", count);
+        dev_dbg(dev->hw_dev, "reading %d samples\n", count);
 
         rear = devpriv->ai_rear;
 
@@ -640,7 +641,7 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         int ret;
         unsigned int mode;
 
-        printk("dt3k_ai_cmd:\n");
+        dev_dbg(dev->hw_dev, "dt3k_ai_cmd:\n");
         for (i = 0; i < cmd->chanlist_len; i++) {
                 chan = CR_CHAN(cmd->chanlist[i]);
                 range = CR_RANGE(cmd->chanlist[i]);
@@ -651,15 +652,15 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         aref = CR_AREF(cmd->chanlist[0]);
 
         writew(cmd->scan_end_arg, devpriv->io_addr + DPR_Params(0));
-        printk("param[0]=0x%04x\n", cmd->scan_end_arg);
+        dev_dbg(dev->hw_dev, "param[0]=0x%04x\n", cmd->scan_end_arg);
 
         if (cmd->convert_src == TRIG_TIMER) {
                 divider = dt3k_ns_to_timer(50, &cmd->convert_arg,
                                            cmd->flags & TRIG_ROUND_MASK);
                 writew((divider >> 16), devpriv->io_addr + DPR_Params(1));
-                printk("param[1]=0x%04x\n", divider >> 16);
+                dev_dbg(dev->hw_dev, "param[1]=0x%04x\n", divider >> 16);
                 writew((divider & 0xffff), devpriv->io_addr + DPR_Params(2));
-                printk("param[2]=0x%04x\n", divider & 0xffff);
+                dev_dbg(dev->hw_dev, "param[2]=0x%04x\n", divider & 0xffff);
         } else {
                 /* not supported */
         }
@@ -668,21 +669,21 @@ static int dt3k_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
                 tscandiv = dt3k_ns_to_timer(100, &cmd->scan_begin_arg,
                                             cmd->flags & TRIG_ROUND_MASK);
                 writew((tscandiv >> 16), devpriv->io_addr + DPR_Params(3));
-                printk("param[3]=0x%04x\n", tscandiv >> 16);
+                dev_dbg(dev->hw_dev, "param[3]=0x%04x\n", tscandiv >> 16);
                 writew((tscandiv & 0xffff), devpriv->io_addr + DPR_Params(4));
-                printk("param[4]=0x%04x\n", tscandiv & 0xffff);
+                dev_dbg(dev->hw_dev, "param[4]=0x%04x\n", tscandiv & 0xffff);
         } else {
                 /* not supported */
         }
 
         mode = DT3000_AD_RETRIG_INTERNAL | 0 | 0;
         writew(mode, devpriv->io_addr + DPR_Params(5));
-        printk("param[5]=0x%04x\n", mode);
+        dev_dbg(dev->hw_dev, "param[5]=0x%04x\n", mode);
         writew(aref == AREF_DIFF, devpriv->io_addr + DPR_Params(6));
-        printk("param[6]=0x%04x\n", aref == AREF_DIFF);
+        dev_dbg(dev->hw_dev, "param[6]=0x%04x\n", aref == AREF_DIFF);
 
         writew(AI_FIFO_DEPTH / 2, devpriv->io_addr + DPR_Params(7));
-        printk("param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);
+        dev_dbg(dev->hw_dev, "param[7]=0x%04x\n", AI_FIFO_DEPTH / 2);
 
         writew(SUBS_AI, devpriv->io_addr + DPR_SubSys);
         ret = dt3k_send_cmd(dev, CMD_CONFIG);
@@ -848,7 +849,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         int bus, slot;
         int ret = 0;
 
-        printk("dt3000:");
+        dev_dbg(dev->hw_dev, "dt3000:\n");
         bus = it->options[0];
         slot = it->options[1];
 
@@ -860,7 +861,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret < 0)
                 return ret;
         if (ret == 0) {
-                printk(" no DT board found\n");
+                dev_warn(dev->hw_dev, "no DT board found\n");
                 return -ENODEV;
         }
 
@@ -868,7 +869,8 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         if (request_irq(devpriv->pci_dev->irq, dt3k_interrupt, IRQF_SHARED,
                         "dt3000", dev)) {
-                printk(" unable to allocate IRQ %u\n", devpriv->pci_dev->irq);
+                dev_err(dev->hw_dev, "unable to allocate IRQ %u\n",
+                        devpriv->pci_dev->irq);
                 return -EINVAL;
         }
         dev->irq = devpriv->pci_dev->irq;
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index 8d98cf412709..6a79ba10630d 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -71,18 +71,12 @@ static struct comedi_driver driver_jr3_pci = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(jr3_pci_pci_table) = {
-        {
-        PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_4_CHANNEL,
-                    PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL) },
+        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_1_CHANNEL_NEW) },
+        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_2_CHANNEL) },
+        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_3_CHANNEL) },
+        { PCI_DEVICE(PCI_VENDOR_ID_JR3, PCI_DEVICE_ID_JR3_4_CHANNEL) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, jr3_pci_pci_table);
@@ -378,14 +372,14 @@ static int jr3_pci_open(struct comedi_device *dev)
         int i;
         struct jr3_pci_dev_private *devpriv = dev->private;
 
-        printk("jr3_pci_open\n");
+        dev_dbg(dev->hw_dev, "jr3_pci_open\n");
         for (i = 0; i < devpriv->n_channels; i++) {
                 struct jr3_pci_subdev_private *p;
 
                 p = dev->subdevices[i].private;
                 if (p) {
-                        printk("serial: %p %d (%d)\n", p, p->serial_no,
-                               p->channel_no);
+                        dev_dbg(dev->hw_dev, "serial: %p %d (%d)\n", p,
+                                p->serial_no, p->channel_no);
                 }
         }
         return 0;
@@ -463,8 +457,8 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,
                                         break;
                                 more = more
                                     && read_idm_word(data, size, &pos, &addr);
-                                printk("Loading#%d %4.4x bytes at %4.4x\n", i,
-                                       count, addr);
+                                dev_dbg(dev->hw_dev, "Loading#%d %4.4x bytes at %4.4x\n",
+                                        i, count, addr);
                                 while (more && count > 0) {
                                         if (addr & 0x4000) {
                                                 /*  16 bit data, never seen in real life!! */
@@ -599,24 +593,24 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s)
                                         min_full_scale =
                                             get_min_full_scales(channel);
                                         printk("Obtained Min. Full Scales:\n");
-                                        printk("%i   ", (min_full_scale).fx);
-                                        printk("%i   ", (min_full_scale).fy);
-                                        printk("%i   ", (min_full_scale).fz);
-                                        printk("%i   ", (min_full_scale).mx);
-                                        printk("%i   ", (min_full_scale).my);
-                                        printk("%i   ", (min_full_scale).mz);
-                                        printk("\n");
+                                        printk(KERN_DEBUG "%i ", (min_full_scale).fx);
+                                        printk(KERN_CONT "%i ", (min_full_scale).fy);
+                                        printk(KERN_CONT "%i ", (min_full_scale).fz);
+                                        printk(KERN_CONT "%i ", (min_full_scale).mx);
+                                        printk(KERN_CONT "%i ", (min_full_scale).my);
+                                        printk(KERN_CONT "%i ", (min_full_scale).mz);
+                                        printk(KERN_CONT "\n");
 
                                         max_full_scale =
                                             get_max_full_scales(channel);
                                         printk("Obtained Max. Full Scales:\n");
-                                        printk("%i   ", (max_full_scale).fx);
-                                        printk("%i   ", (max_full_scale).fy);
-                                        printk("%i   ", (max_full_scale).fz);
-                                        printk("%i   ", (max_full_scale).mx);
-                                        printk("%i   ", (max_full_scale).my);
-                                        printk("%i   ", (max_full_scale).mz);
-                                        printk("\n");
+                                        printk(KERN_DEBUG "%i ", (max_full_scale).fx);
+                                        printk(KERN_CONT "%i ", (max_full_scale).fy);
+                                        printk(KERN_CONT "%i ", (max_full_scale).fz);
+                                        printk(KERN_CONT "%i ", (max_full_scale).mx);
+                                        printk(KERN_CONT "%i ", (max_full_scale).my);
+                                        printk(KERN_CONT "%i ", (max_full_scale).mz);
+                                        printk(KERN_CONT "\n");
 
                                         set_full_scales(channel,
                                                         max_full_scale);
@@ -779,14 +773,12 @@ static int jr3_pci_attach(struct comedi_device *dev,
         int opt_bus, opt_slot, i;
         struct jr3_pci_dev_private *devpriv;
 
-        printk("comedi%d: jr3_pci\n", dev->minor);
-
         opt_bus = it->options[0];
         opt_slot = it->options[1];
 
         if (sizeof(struct jr3_channel) != 0xc00) {
-                printk("sizeof(struct jr3_channel) = %x [expected %x]\n",
-                       (unsigned)sizeof(struct jr3_channel), 0xc00);
+                dev_err(dev->hw_dev, "sizeof(struct jr3_channel) = %x [expected %x]\n",
+                        (unsigned)sizeof(struct jr3_channel), 0xc00);
                 return -EINVAL;
         }
 
@@ -840,7 +832,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
                 }
         }
         if (!card) {
-                printk(" no jr3_pci found\n");
+                dev_err(dev->hw_dev, "no jr3_pci found\n");
                 return -EIO;
         } else {
                 devpriv->pci_dev = card;
@@ -875,10 +867,10 @@ static int jr3_pci_attach(struct comedi_device *dev,
 
                         p = dev->subdevices[i].private;
                         p->channel = &devpriv->iobase->channel[i].data;
-                        printk("p->channel %p %p (%tx)\n",
-                               p->channel, devpriv->iobase,
-                               ((char *)(p->channel) -
-                                (char *)(devpriv->iobase)));
+                        dev_dbg(dev->hw_dev, "p->channel %p %p (%tx)\n",
+                                p->channel, devpriv->iobase,
+                                ((char *)(p->channel) -
+                                 (char *)(devpriv->iobase)));
                         p->channel_no = i;
                         for (j = 0; j < 8; j++) {
                                 int k;
@@ -916,7 +908,7 @@ static int jr3_pci_attach(struct comedi_device *dev,
         devpriv->iobase->channel[0].reset = 0;
 
         result = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);
-        printk("Firmare load %d\n", result);
+        dev_dbg(dev->hw_dev, "Firmare load %d\n", result);
 
         if (result < 0)
                 goto out;
@@ -934,9 +926,9 @@ static int jr3_pci_attach(struct comedi_device *dev,
  */
         msleep_interruptible(25);
         for (i = 0; i < 0x18; i++) {
-                printk("%c",
-                       get_u16(&devpriv->iobase->channel[0].
-                               data.copyright[i]) >> 8);
+                dev_dbg(dev->hw_dev, "%c\n",
+                        get_u16(&devpriv->iobase->channel[0].
+                                data.copyright[i]) >> 8);
         }
 
         /*  Start card timer */
@@ -963,7 +955,6 @@ static int jr3_pci_detach(struct comedi_device *dev)
         int i;
         struct jr3_pci_dev_private *devpriv = dev->private;
 
-        printk("comedi%d: jr3_pci: remove\n", dev->minor);
         if (devpriv) {
                 del_timer_sync(&devpriv->timer);
 
diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 286093bca3fb..4e9e9a078652 100644
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -52,10 +52,8 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it);
 static int cnt_detach(struct comedi_device *dev);
 
 static DEFINE_PCI_DEVICE_TABLE(cnt_pci_table) = {
-        {
-        PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_KOLTER, CNT_CARD_DEVICE_ID) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, cnt_pci_table);
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index cda4b224b30f..8b812e41c52b 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -188,12 +188,9 @@ static const struct comedi_lrange me2600_ao_range = {
 };
 
 static DEFINE_PCI_DEVICE_TABLE(me_pci_table) = {
-        {
-        PCI_VENDOR_ID_MEILHAUS, ME2600_DEVICE_ID, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        PCI_VENDOR_ID_MEILHAUS, ME2000_DEVICE_ID, PCI_ANY_ID,
-                    PCI_ANY_ID, 0, 0, 0}, {
-        0}
+        { PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, ME2600_DEVICE_ID) },
+        { PCI_DEVICE(PCI_VENDOR_ID_MEILHAUS, ME2000_DEVICE_ID) },
+        {0}
 };
 
 MODULE_DEVICE_TABLE(pci, me_pci_table);
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 32e675e3f0b9..c25e44c1905e 100644
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -731,9 +731,8 @@ static int a2150_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         outw(trigger_bits, dev->iobase + TRIGGER_REG);
 
         /*  start acquisition for soft trigger */
-        if (cmd->start_src == TRIG_NOW) {
+        if (cmd->start_src == TRIG_NOW)
                 outw(0, dev->iobase + FIFO_START_REG);
-        }
 #ifdef A2150_DEBUG
         ni_dump_regs(dev);
 #endif
@@ -860,11 +859,10 @@ static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
         case TRIG_ROUND_NEAREST:
         default:
                 /*  if least upper bound is better approximation */
-                if (lub - *period < *period - glb) {
+                if (lub - *period < *period - glb)
                         *period = lub;
-                } else {
+                else
                         *period = glb;
-                }
                 break;
         case TRIG_ROUND_UP:
                 *period = lub;
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 49b824c7bd2e..c0423a8c3e36 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -52,7 +52,7 @@ the PCMCIA interface.
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
 
-static struct pcmcia_device *pcmcia_cur_dev = NULL;
+static struct pcmcia_device *pcmcia_cur_dev;
 
 #define DIO24_SIZE 4            /*  size of io region used by board */
 
@@ -133,22 +133,19 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 #endif
                 break;
         default:
-                printk("bug! couldn't determine board type\n");
+                pr_err("bug! couldn't determine board type\n");
                 return -EINVAL;
                 break;
         }
-        printk("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
-               thisboard->name, iobase);
+        pr_debug("comedi%d: ni_daq_dio24: %s, io 0x%lx", dev->minor,
+                 thisboard->name, iobase);
 #ifdef incomplete
-        if (irq) {
-                printk(", irq %u", irq);
-        }
+        if (irq)
+                pr_debug("irq %u\n", irq);
 #endif
 
-        printk("\n");
-
         if (iobase == 0) {
-                printk("io base address is zero!\n");
+                pr_err("io base address is zero!\n");
                 return -EINVAL;
         }
 
@@ -173,7 +170,7 @@ static int dio24_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int dio24_detach(struct comedi_device *dev)
 {
-        printk("comedi%d: ni_daq_dio24: remove\n", dev->minor);
+        dev_info(dev->hw_dev, "comedi%d: ni_daq_dio24: remove\n", dev->minor);
 
         if (dev->subdevices)
                 subdev_8255_cleanup(dev, dev->subdevices + 0);
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 832a5178b638..ff3840544dd4 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -145,7 +145,7 @@ static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                 irq = link->irq;
                 break;
         default:
-                printk("bug! couldn't determine board type\n");
+                pr_err("bug! couldn't determine board type\n");
                 return -EINVAL;
                 break;
         }
diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 9148abdad074..0f0d995f137c 100644
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1470,7 +1470,7 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
                 /* FIXME: DIO_Output_Register (16 bit reg) is replaced by M_Offset_Static_Digital_Output (32 bit)
                    and M_Offset_SCXI_Serial_Data_Out (8 bit) */
         default:
-                printk("%s: bug! unhandled register=0x%x in switch.\n",
+                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
                        __func__, reg);
                 BUG();
                 return;
@@ -1505,7 +1505,7 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
                 offset = M_Offset_G01_Status;
                 break;
         default:
-                printk("%s: bug! unhandled register=0x%x in switch.\n",
+                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
                        __func__, reg);
                 BUG();
                 return 0;
@@ -1547,7 +1547,7 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
                 offset = M_Offset_G1_Load_B;
                 break;
         default:
-                printk("%s: bug! unhandled register=0x%x in switch.\n",
+                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
                        __func__, reg);
                 BUG();
                 return;
@@ -1573,7 +1573,7 @@ static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)
                 offset = M_Offset_G1_Save;
                 break;
         default:
-                printk("%s: bug! unhandled register=0x%x in switch.\n",
+                printk(KERN_WARNING "%s: bug! unhandled register=0x%x in switch.\n",
                        __func__, reg);
                 BUG();
                 return 0;
@@ -1632,9 +1632,8 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
         }
         devpriv->serial_number = be32_to_cpu(devpriv->serial_number);
 
-        for (i = 0; i < M_SERIES_EEPROM_SIZE; ++i) {
+        for (i = 0; i < M_SERIES_EEPROM_SIZE; ++i)
                 devpriv->eeprom_buffer[i] = ni_readb(Start_Cal_EEPROM + i);
-        }
 
         writel(old_iodwbsr1_bits, devpriv->mite->mite_io_addr + MITE_IODWBSR_1);
         writel(old_iodwbsr_bits, devpriv->mite->mite_io_addr + MITE_IODWBSR);
@@ -1665,9 +1664,9 @@ static void init_6143(struct comedi_device *dev)
 static int pcimio_detach(struct comedi_device *dev)
 {
         mio_common_detach(dev);
-        if (dev->irq) {
+        if (dev->irq)
                 free_irq(dev->irq, dev);
-        }
+
         if (dev->private) {
                 mite_free_ring(devpriv->ai_mite_ring);
                 mite_free_ring(devpriv->ao_mite_ring);
@@ -1685,7 +1684,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
         int ret;
 
-        printk("comedi%d: ni_pcimio:", dev->minor);
+        dev_info(dev->hw_dev, "comedi%d: ni_pcimio:\n", dev->minor);
 
         ret = ni_alloc_private(dev);
         if (ret < 0)
@@ -1695,7 +1694,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         if (ret < 0)
                 return ret;
 
-        printk(" %s", boardtype.name);
+        dev_dbg(dev->hw_dev, "%s\n", boardtype.name);
         dev->board_name = boardtype.name;
 
         if (boardtype.reg_type & ni_reg_m_series_mask) {
@@ -1712,7 +1711,7 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         ret = mite_setup(devpriv->mite);
         if (ret < 0) {
-                printk(" error setting up mite\n");
+                pr_warn("error setting up mite\n");
                 return ret;
         }
         comedi_set_hw_dev(dev, &devpriv->mite->pcidev->dev);
@@ -1740,13 +1739,13 @@ static int pcimio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         dev->irq = mite_irq(devpriv->mite);
 
         if (dev->irq == 0) {
-                printk(" unknown irq (bad)\n");
+                pr_warn("unknown irq (bad)\n");
         } else {
-                printk(" ( irq = %u )", dev->irq);
+                pr_debug("( irq = %u )\n", dev->irq);
                 ret = request_irq(dev->irq, ni_E_interrupt, NI_E_IRQ_FLAGS,
                                   DRV_NAME, dev);
                 if (ret < 0) {
-                        printk(" irq not available\n");
+                        pr_warn("irq not available\n");
                         dev->irq = 0;
                 }
         }
@@ -1787,7 +1786,7 @@ static int pcimio_find_device(struct comedi_device *dev, int bus, int slot)
                         }
                 }
         }
-        printk("no device found\n");
+        pr_warn("no device found\n");
         mite_list_devices();
         return -EIO;
 }
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index 0b9bee36eb5f..96cd7ec2ad53 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -155,8 +155,8 @@ static int pcl816_attach(struct comedi_device *dev,
 static int pcl816_detach(struct comedi_device *dev);
 
 #ifdef unused
-static int RTC_lock = 0;        /* RTC lock */
-static int RTC_timer_lock = 0;  /* RTC int lock */
+static int RTC_lock;    /* RTC lock */
+static int RTC_timer_lock;      /* RTC int lock */
 #endif
 
 static struct comedi_driver driver_pcl816 = {
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c
index b45a9bd8b489..7344a53a81c4 100644
--- a/drivers/staging/comedi/drivers/pcl818.c
+++ b/drivers/staging/comedi/drivers/pcl818.c
@@ -252,8 +252,8 @@ static int pcl818_attach(struct comedi_device *dev,
 static int pcl818_detach(struct comedi_device *dev);
 
 #ifdef unused
-static int RTC_lock = 0;        /* RTC lock */
-static int RTC_timer_lock = 0;  /* RTC int lock */
+static int RTC_lock;    /* RTC lock */
+static int RTC_timer_lock;      /* RTC int lock */
 #endif
 
 struct pcl818_board {
@@ -463,9 +463,8 @@ static int pcl818_ao_insn_read(struct comedi_device *dev,
         int n;
         int chan = CR_CHAN(insn->chanspec);
 
-        for (n = 0; n < insn->n; n++) {
+        for (n = 0; n < insn->n; n++)
                 data[n] = devpriv->ao_readback[chan];
-        }
 
         return n;
 }
@@ -571,9 +570,9 @@ conv_finish:
                 return IRQ_HANDLED;
         }
         devpriv->act_chanlist_pos++;
-        if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len) {
+        if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len)
                 devpriv->act_chanlist_pos = 0;
-        }
+
         s->async->cur_chan++;
         if (s->async->cur_chan >= devpriv->ai_n_chan) {
                 /*  printk("E"); */
@@ -645,9 +644,9 @@ static irqreturn_t interrupt_pcl818_ai_mode13_dma(int irq, void *d)
                 comedi_buf_put(s->async, ptr[bufptr++] >> 4);   /*  get one sample */
 
                 devpriv->act_chanlist_pos++;
-                if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len) {
+                if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len)
                         devpriv->act_chanlist_pos = 0;
-                }
+
                 s->async->cur_chan++;
                 if (s->async->cur_chan >= devpriv->ai_n_chan) {
                         s->async->cur_chan = 0;
@@ -805,11 +804,10 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
                 return IRQ_HANDLED;
         }
 
-        if (lo & 2) {
+        if (lo & 2)
                 len = 512;
-        } else {
+        else
                 len = 0;
-        }
 
         for (i = 0; i < len; i++) {
                 lo = inb(dev->iobase + PCL818_FI_DATALO);
@@ -827,9 +825,9 @@ static irqreturn_t interrupt_pcl818_ai_mode13_fifo(int irq, void *d)
                 comedi_buf_put(s->async, (lo >> 4) | (inb(dev->iobase + PCL818_FI_DATAHI) << 4));       /*  get one sample */
 
                 devpriv->act_chanlist_pos++;
-                if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len) {
+                if (devpriv->act_chanlist_pos >= devpriv->act_chanlist_len)
                         devpriv->act_chanlist_pos = 0;
-                }
+
                 s->async->cur_chan++;
                 if (s->async->cur_chan >= devpriv->ai_n_chan) {
                         s->async->cur_chan = 0;
@@ -1009,7 +1007,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
         int divisor1 = 0, divisor2 = 0;
         unsigned int seglen;
 
-        printk("pcl818_ai_cmd_mode()\n");
+        dev_dbg(dev->hw_dev, "pcl818_ai_cmd_mode()\n");
         if ((!dev->irq) && (!devpriv->dma_rtc)) {
                 comedi_error(dev, "IRQ not defined!");
                 return -EINVAL;
@@ -1112,7 +1110,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
                 break;
         }
 #endif
-        printk("pcl818_ai_cmd_mode() end\n");
+        dev_dbg(dev->hw_dev, "pcl818_ai_cmd_mode() end\n");
         return 0;
 }
 
@@ -1309,11 +1307,9 @@ static void setup_channel_list(struct comedi_device *dev,
 */
 static int check_single_ended(unsigned int port)
 {
-        if (inb(port + PCL818_STATUS) & 0x20) {
+        if (inb(port + PCL818_STATUS) & 0x20)
                 return 1;
-        } else {
-                return 0;
-        }
+        return 0;
 }
 
 /*
@@ -1352,9 +1348,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (!cmd->stop_src || tmp != cmd->stop_src)
                 err++;
 
-        if (err) {
+        if (err)
                 return 1;
-        }
 
         /* step 2: make sure trigger sources are unique and mutually compatible */
 
@@ -1377,9 +1372,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
         if (cmd->stop_src != TRIG_NONE && cmd->stop_src != TRIG_COUNT)
                 err++;
 
-        if (err) {
+        if (err)
                 return 2;
-        }
 
         /* step 3: make sure arguments are trivially compatible */
 
@@ -1421,9 +1415,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                 }
         }
 
-        if (err) {
+        if (err)
                 return 3;
-        }
 
         /* step 4: fix up any arguments */
 
@@ -1438,9 +1431,8 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
                         err++;
         }
 
-        if (err) {
+        if (err)
                 return 4;
-        }
 
         /* step 5: complain about special chanlist considerations */
 
@@ -1461,7 +1453,7 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         struct comedi_cmd *cmd = &s->async->cmd;
         int retval;
 
-        printk("pcl818_ai_cmd()\n");
+        dev_dbg(dev->hw_dev, "pcl818_ai_cmd()\n");
         devpriv->ai_n_chan = cmd->chanlist_len;
         devpriv->ai_chanlist = cmd->chanlist;
         devpriv->ai_flags = cmd->flags;
@@ -1470,17 +1462,16 @@ static int ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         devpriv->ai_timer1 = 0;
         devpriv->ai_timer2 = 0;
 
-        if (cmd->stop_src == TRIG_COUNT) {
+        if (cmd->stop_src == TRIG_COUNT)
                 devpriv->ai_scans = cmd->stop_arg;
-        } else {
+        else
                 devpriv->ai_scans = 0;
-        }
 
         if (cmd->scan_begin_src == TRIG_FOLLOW) {       /*  mode 1, 3 */
                 if (cmd->convert_src == TRIG_TIMER) {   /*  mode 1 */
                         devpriv->ai_timer1 = cmd->convert_arg;
                         retval = pcl818_ai_cmd_mode(1, dev, s);
-                        printk("pcl818_ai_cmd() end\n");
+                        dev_dbg(dev->hw_dev, "pcl818_ai_cmd() end\n");
                         return retval;
                 }
                 if (cmd->convert_src == TRIG_EXT) {     /*  mode 3 */
@@ -1499,7 +1490,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,
                             struct comedi_subdevice *s)
 {
         if (devpriv->irq_blocked > 0) {
-                printk("pcl818_ai_cancel()\n");
+                dev_dbg(dev->hw_dev, "pcl818_ai_cancel()\n");
                 devpriv->irq_was_now_closed = 1;
 
                 switch (devpriv->ai_mode) {
@@ -1549,7 +1540,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev,
         }
 
 end:
-        printk("pcl818_ai_cancel() end\n");
+        dev_dbg(dev->hw_dev, "pcl818_ai_cancel() end\n");
         return 0;
 }
 
@@ -1633,11 +1624,11 @@ static int set_rtc_irq_bit(unsigned char bit)
         save_flags(flags);
         cli();
         val = CMOS_READ(RTC_CONTROL);
-        if (bit) {
+        if (bit)
                 val |= RTC_PIE;
-        } else {
+        else
                 val &= ~RTC_PIE;
-        }
+
         CMOS_WRITE(val, RTC_CONTROL);
         CMOS_READ(RTC_INTR_FLAGS);
         restore_flags(flags);
@@ -1754,22 +1745,23 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
         /* claim our I/O space */
         iobase = it->options[0];
-        printk("comedi%d: pcl818:  board=%s, ioport=0x%03lx",
-               dev->minor, this_board->name, iobase);
+        printk
+            ("comedi%d: pcl818:  board=%s, ioport=0x%03lx",
+             dev->minor, this_board->name, iobase);
         devpriv->io_range = this_board->io_range;
         if ((this_board->fifo) && (it->options[2] == -1)) {     /*  we've board with FIFO and we want to use FIFO */
                 devpriv->io_range = PCLx1xFIFO_RANGE;
                 devpriv->usefifo = 1;
         }
         if (!request_region(iobase, devpriv->io_range, "pcl818")) {
-                printk("I/O port conflict\n");
+                comedi_error(dev, "I/O port conflict\n");
                 return -EIO;
         }
 
         dev->iobase = iobase;
 
         if (pcl818_check(iobase)) {
-                printk(", I can't detect board. FAIL!\n");
+                comedi_error(dev, "I can't detect board. FAIL!\n");
                 return -EIO;
         }
 
@@ -1793,19 +1785,18 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                              irq);
                                         irq = 0;        /* Can't use IRQ */
                                 } else {
-                                        printk(", irq=%u", irq);
+                                        printk(KERN_DEBUG "irq=%u", irq);
                                 }
                         }
                 }
         }
 
         dev->irq = irq;
-        if (irq) {
-                devpriv->irq_free = 1;
-        } /* 1=we have allocated irq */
-        else {
+        if (irq)
+                devpriv->irq_free = 1;   /* 1=we have allocated irq */
+        else
                 devpriv->irq_free = 0;
-        }
+
         devpriv->irq_blocked = 0;       /* number of subdevice which use IRQ */
         devpriv->ai_mode = 0;   /* mode of irq */
 
@@ -1825,7 +1816,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                  "pcl818 DMA (RTC)", dev)) {
                         devpriv->dma_rtc = 1;
                         devpriv->rtc_irq = RTC_IRQ;
-                        printk(", dma_irq=%u", devpriv->rtc_irq);
+                        printk(KERN_DEBUG "dma_irq=%u", devpriv->rtc_irq);
                 } else {
                         RTC_lock--;
                         if (RTC_lock == 0) {
@@ -1850,34 +1841,26 @@ no_rtc:
                 if (dma < 1)
                         goto no_dma;    /* DMA disabled */
                 if (((1 << dma) & this_board->DMAbits) == 0) {
-                        printk(", DMA is out of allowed range, FAIL!\n");
+                        printk(KERN_ERR "DMA is out of allowed range, FAIL!\n");
                         return -EINVAL; /* Bad DMA */
                 }
                 ret = request_dma(dma, "pcl818");
-                if (ret) {
-                        printk(", unable to allocate DMA %u, FAIL!\n", dma);
+                if (ret)
                         return -EBUSY;  /* DMA isn't free */
-                }
                 devpriv->dma = dma;
-                printk(", dma=%u", dma);
                 pages = 2;      /* we need 16KB */
                 devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
-                if (!devpriv->dmabuf[0]) {
-                        printk(", unable to allocate DMA buffer, FAIL!\n");
+                if (!devpriv->dmabuf[0])
                         /* maybe experiment with try_to_free_pages() will help .... */
                         return -EBUSY;  /* no buffer :-( */
-                }
                 devpriv->dmapages[0] = pages;
                 devpriv->hwdmaptr[0] = virt_to_bus((void *)devpriv->dmabuf[0]);
                 devpriv->hwdmasize[0] = (1 << pages) * PAGE_SIZE;
                 /* printk("%d %d %ld, ",devpriv->dmapages[0],devpriv->hwdmasize[0],PAGE_SIZE); */
                 if (devpriv->dma_rtc == 0) {    /*  we must do duble buff :-( */
                         devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
-                        if (!devpriv->dmabuf[1]) {
-                                printk
-                                    (", unable to allocate DMA buffer, FAIL!\n");
+                        if (!devpriv->dmabuf[1])
                                 return -EBUSY;
-                        }
                         devpriv->dmapages[1] = pages;
                         devpriv->hwdmaptr[1] =
                             virt_to_bus((void *)devpriv->dmabuf[1]);
@@ -2017,11 +2000,10 @@ no_dma:
         }
 
         /* select 1/10MHz oscilator */
-        if ((it->options[3] == 0) || (it->options[3] == 10)) {
+        if ((it->options[3] == 0) || (it->options[3] == 10))
                 devpriv->i8253_osc_base = 100;
-        } else {
+        else
                 devpriv->i8253_osc_base = 1000;
-        }
 
         /* max sampling speed */
         devpriv->ns_min = this_board->ns_min;
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c
index 3ad04aaa1e3c..eddac00e4e29 100644
--- a/drivers/staging/comedi/drivers/pcmmio.c
+++ b/drivers/staging/comedi/drivers/pcmmio.c
@@ -371,15 +371,15 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         iobase = it->options[0];
         irq[0] = it->options[1];
 
-        printk(KERN_INFO "comedi%d: %s: io: %lx ", dev->minor, driver.driver_name,
-               iobase);
+        printk(KERN_INFO "comedi%d: %s: io: %lx attaching...\n", dev->minor,
+                        driver.driver_name, iobase);
 
         dev->iobase = iobase;
 
         if (!iobase || !request_region(iobase,
                                        thisboard->total_iosize,
                                        driver.driver_name)) {
-                printk(KERN_ERR "I/O port conflict\n");
+                printk(KERN_ERR "comedi%d: I/O port conflict\n", dev->minor);
                 return -EIO;
         }
 
@@ -394,7 +394,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * convenient macro defined in comedidev.h.
  */
         if (alloc_private(dev, sizeof(struct pcmmio_private)) < 0) {
-                printk(KERN_ERR "cannot allocate private data structure\n");
+                printk(KERN_ERR "comedi%d: cannot allocate private data structure\n",
+                                dev->minor);
                 return -ENOMEM;
         }
 
@@ -417,7 +418,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
             kcalloc(n_subdevs, sizeof(struct pcmmio_subdev_private),
                     GFP_KERNEL);
         if (!devpriv->sprivs) {
-                printk(KERN_ERR "cannot allocate subdevice private data structures\n");
+                printk(KERN_ERR "comedi%d: cannot allocate subdevice private data structures\n",
+                                dev->minor);
                 return -ENOMEM;
         }
         /*
@@ -427,7 +429,8 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
          * Allocate 1 AI + 1 AO + 2 DIO subdevs (24 lines per DIO)
          */
         if (alloc_subdevices(dev, n_subdevs) < 0) {
-                printk(KERN_ERR "cannot allocate subdevice data structures\n");
+                printk(KERN_ERR "comedi%d: cannot allocate subdevice data structures\n",
+                                dev->minor);
                 return -ENOMEM;
         }
 
@@ -557,14 +560,15 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                  */
 
         if (irq[0]) {
-                printk(KERN_DEBUG "irq: %u ", irq[0]);
+                printk(KERN_DEBUG "comedi%d: irq: %u\n", dev->minor, irq[0]);
                 if (thisboard->dio_num_asics == 2 && irq[1])
-                        printk(KERN_DEBUG "second ASIC irq: %u ", irq[1]);
+                        printk(KERN_DEBUG "comedi%d: second ASIC irq: %u\n",
+                                        dev->minor, irq[1]);
         } else {
-                printk(KERN_INFO "(IRQ mode disabled) ");
+                printk(KERN_INFO "comedi%d: (IRQ mode disabled)\n", dev->minor);
         }
 
-        printk(KERN_INFO "attached\n");
+        printk(KERN_INFO "comedi%d: attached\n", dev->minor);
 
         return 1;
 }
@@ -663,7 +667,7 @@ static int pcmmio_dio_insn_bits(struct comedi_device *dev,
                 }
 #ifdef DAMMIT_ITS_BROKEN
                 /* DEBUG */
-                printk(KERN_DEBUG "data_out_byte %02x\n", (unsigned)byte);
+                printk("data_out_byte %02x\n", (unsigned)byte);
 #endif
                 /* save the digital input lines for this byte.. */
                 s->state |= ((unsigned int)byte) << offset;
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c
index b2c2c8971a32..661ba2e03892 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -295,15 +295,15 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
         irq[0] = it->options[1];
         irq[1] = it->options[2];
 
-        printk("comedi%d: %s: io: %lx ", dev->minor, driver.driver_name,
-               iobase);
+        dev_dbg(dev->hw_dev, "comedi%d: %s: io: %lx attached\n", dev->minor,
+                driver.driver_name, iobase);
 
         dev->iobase = iobase;
 
         if (!iobase || !request_region(iobase,
                                        thisboard->num_asics * ASIC_IOSIZE,
                                        driver.driver_name)) {
-                printk("I/O port conflict\n");
+                dev_err(dev->hw_dev, "I/O port conflict\n");
                 return -EIO;
         }
 
@@ -318,7 +318,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * convenient macro defined in comedidev.h.
  */
         if (alloc_private(dev, sizeof(struct pcmuio_private)) < 0) {
-                printk("cannot allocate private data structure\n");
+                dev_warn(dev->hw_dev, "cannot allocate private data structure\n");
                 return -ENOMEM;
         }
 
@@ -337,7 +337,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
             kcalloc(n_subdevs, sizeof(struct pcmuio_subdev_private),
                     GFP_KERNEL);
         if (!devpriv->sprivs) {
-                printk("cannot allocate subdevice private data structures\n");
+                dev_warn(dev->hw_dev, "cannot allocate subdevice private data structures\n");
                 return -ENOMEM;
         }
         /*
@@ -348,7 +348,7 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
          * 96-channel version of the board.
          */
         if (alloc_subdevices(dev, n_subdevs) < 0) {
-                printk("cannot allocate subdevice data structures\n");
+                dev_dbg(dev->hw_dev, "cannot allocate subdevice data structures\n");
                 return -ENOMEM;
         }
 
@@ -436,14 +436,13 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                                    irqs.. */
 
         if (irq[0]) {
-                printk("irq: %u ", irq[0]);
+                dev_dbg(dev->hw_dev, "irq: %u\n", irq[0]);
                 if (irq[1] && thisboard->num_asics == 2)
-                        printk("second ASIC irq: %u ", irq[1]);
+                        dev_dbg(dev->hw_dev, "second ASIC irq: %u\n", irq[1]);
         } else {
-                printk("(IRQ mode disabled) ");
+                dev_dbg(dev->hw_dev, "(IRQ mode disabled)\n");
         }
 
-        printk("attached\n");
 
         return 1;
 }
@@ -460,7 +459,8 @@ static int pcmuio_detach(struct comedi_device *dev)
 {
         int i;
 
-        printk("comedi%d: %s: remove\n", dev->minor, driver.driver_name);
+        dev_dbg(dev->hw_dev, "comedi%d: %s: remove\n", dev->minor,
+                driver.driver_name);
         if (dev->iobase)
                 release_region(dev->iobase, ASIC_IOSIZE * thisboard->num_asics);
 
@@ -501,7 +501,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
 
 #ifdef DAMMIT_ITS_BROKEN
         /* DEBUG */
-        printk("write mask: %08x  data: %08x\n", data[0], data[1]);
+        dev_dbg(dev->hw_dev, "write mask: %08x  data: %08x\n", data[0],
+                data[1]);
 #endif
 
         s->state = 0;
@@ -537,7 +538,7 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
                 }
 #ifdef DAMMIT_ITS_BROKEN
                 /* DEBUG */
-                printk("data_out_byte %02x\n", (unsigned)byte);
+                dev_dbg(dev->hw_dev, "data_out_byte %02x\n", (unsigned)byte);
 #endif
                 /* save the digital input lines for this byte.. */
                 s->state |= ((unsigned int)byte) << offset;
@@ -548,7 +549,8 @@ static int pcmuio_dio_insn_bits(struct comedi_device *dev,
 
 #ifdef DAMMIT_ITS_BROKEN
         /* DEBUG */
-        printk("s->state %08x data_out %08x\n", s->state, data[1]);
+        dev_dbg(dev->hw_dev, "s->state %08x data_out %08x\n", s->state,
+                data[1]);
 #endif
 
         return 2;
@@ -951,14 +953,13 @@ pcmuio_inttrig_start_intr(struct comedi_device *dev, struct comedi_subdevice *s,
 
         spin_lock_irqsave(&subpriv->intr.spinlock, flags);
         s->async->inttrig = 0;
-        if (subpriv->intr.active) {
+        if (subpriv->intr.active)
                 event = pcmuio_start_intr(dev, s);
-        }
+
         spin_unlock_irqrestore(&subpriv->intr.spinlock, flags);
 
-        if (event) {
+        if (event)
                 comedi_event(dev, s);
-        }
 
         return 1;
 }
@@ -1000,9 +1001,8 @@ static int pcmuio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
         }
         spin_unlock_irqrestore(&subpriv->intr.spinlock, flags);
 
-        if (event) {
+        if (event)
                 comedi_event(dev, s);
-        }
 
         return 0;
 }
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index ade2202b6231..d880c2f6fbc1 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -824,7 +824,7 @@ static int serial2002_attach(struct comedi_device *dev,
 {
         struct comedi_subdevice *s;
 
-        printk("comedi%d: serial2002: ", dev->minor);
+        dev_dbg(dev->hw_dev, "comedi%d: attached\n", dev->minor);
         dev->board_name = thisboard->name;
         if (alloc_private(dev, sizeof(struct serial2002_private)) < 0)
                 return -ENOMEM;
@@ -832,7 +832,8 @@ static int serial2002_attach(struct comedi_device *dev,
         dev->close = serial_2002_close;
         devpriv->port = it->options[0];
         devpriv->speed = it->options[1];
-        printk("/dev/ttyS%d @ %d\n", devpriv->port, devpriv->speed);
+        dev_dbg(dev->hw_dev, "/dev/ttyS%d @ %d\n", devpriv->port,
+                devpriv->speed);
 
         if (alloc_subdevices(dev, 5) < 0)
                 return -ENOMEM;
@@ -891,7 +892,7 @@ static int serial2002_detach(struct comedi_device *dev)
         struct comedi_subdevice *s;
         int i;
 
-        printk("comedi%d: serial2002: remove\n", dev->minor);
+        dev_dbg(dev->hw_dev, "comedi%d: remove\n", dev->minor);
         for (i = 0; i < 5; i++) {
                 s = &dev->subdevices[i];
                 kfree(s->maxdata_list);
diff --git a/drivers/staging/comedi/drivers/usbduxsigma.c b/drivers/staging/comedi/drivers/usbduxsigma.c
index 6144afb8cbaa..ca6bcf8b0231 100644
--- a/drivers/staging/comedi/drivers/usbduxsigma.c
+++ b/drivers/staging/comedi/drivers/usbduxsigma.c
@@ -1524,15 +1524,17 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
                 return -EFAULT;
 
         down(&this_usbduxsub->sem);
+
         if (!(this_usbduxsub->probed)) {
-                up(&this_usbduxsub->sem);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out;
         }
         if (trignum != 0) {
                 dev_err(&this_usbduxsub->interface->dev,
                         "comedi%d: usbdux_ao_inttrig: invalid trignum\n",
                         dev->minor);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out;
         }
         if (!(this_usbduxsub->ao_cmd_running)) {
                 this_usbduxsub->ao_cmd_running = 1;
@@ -1542,8 +1544,7 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
                                 "comedi%d: usbdux_ao_inttrig: submitURB: "
                                 "err=%d\n", dev->minor, ret);
                         this_usbduxsub->ao_cmd_running = 0;
-                        up(&this_usbduxsub->sem);
-                        return ret;
+                        goto out;
                 }
                 s->async->inttrig = NULL;
         } else {
@@ -1551,8 +1552,10 @@ static int usbdux_ao_inttrig(struct comedi_device *dev,
                         "comedi%d: ao_inttrig but acqu is already running.\n",
                         dev->minor);
         }
+        ret = 1;
+out:
         up(&this_usbduxsub->sem);
-        return 1;
+        return ret;
 }
 
 static int usbdux_ao_cmdtest(struct comedi_device *dev,
@@ -2689,6 +2692,7 @@ static int usbduxsigma_attach(struct comedi_device *dev,
         if (ret < 0) {
                 dev_err(&udev->interface->dev,
                         "comedi%d: no space for subdev\n", dev->minor);
+                up(&udev->sem);
                 up(&start_stop_sem);
                 return ret;
         }
diff --git a/drivers/staging/crystalhd/bc_dts_defs.h b/drivers/staging/crystalhd/bc_dts_defs.h
index fde5b0627f6b..8cd51a7aad8e 100644
--- a/drivers/staging/crystalhd/bc_dts_defs.h
+++ b/drivers/staging/crystalhd/bc_dts_defs.h
@@ -296,43 +296,79 @@ enum {
         vdecColourPrimariesSMPTE240M,
         vdecColourPrimariesGenericFilm,
 };
-
+/**
+ * @vdecRESOLUTION_CUSTOM: custom
+ * @vdecRESOLUTION_480i: 480i
+ * @vdecRESOLUTION_1080i: 1080i (1920x1080, 60i)
+ * @vdecRESOLUTION_NTSC: NTSC (720x483, 60i)
+ * @vdecRESOLUTION_480p: 480p (720x480, 60p)
+ * @vdecRESOLUTION_720p: 720p (1280x720, 60p)
+ * @vdecRESOLUTION_PAL1: PAL_1 (720x576, 50i)
+ * @vdecRESOLUTION_1080i25: 1080i25 (1920x1080, 50i)
+ * @vdecRESOLUTION_720p50: 720p50 (1280x720, 50p)
+ * @vdecRESOLUTION_576p: 576p (720x576, 50p)
+ * @vdecRESOLUTION_1080i29_97: 1080i (1920x1080, 59.94i)
+ * @vdecRESOLUTION_720p59_94: 720p (1280x720, 59.94p)
+ * @vdecRESOLUTION_SD_DVD: SD DVD (720x483, 60i)
+ * @vdecRESOLUTION_480p656: 480p (720x480, 60p),
+ *      output bus width 8 bit, clock 74.25MHz
+ * @vdecRESOLUTION_1080p23_976: 1080p23_976 (1920x1080, 23.976p)
+ * @vdecRESOLUTION_720p23_976: 720p23_976 (1280x720p, 23.976p)
+ * @vdecRESOLUTION_240p29_97: 240p (1440x240, 29.97p )
+ * @vdecRESOLUTION_240p30: 240p (1440x240, 30p)
+ * @vdecRESOLUTION_288p25: 288p (1440x288p, 25p)
+ * @vdecRESOLUTION_1080p29_97: 1080p29_97 (1920x1080, 29.97p)
+ * @vdecRESOLUTION_1080p30: 1080p30 (1920x1080, 30p)
+ * @vdecRESOLUTION_1080p24: 1080p24 (1920x1080, 24p)
+ * @vdecRESOLUTION_1080p25: 1080p25 (1920x1080, 25p)
+ * @vdecRESOLUTION_720p24: 720p24 (1280x720, 25p)
+ * @vdecRESOLUTION_720p29_97: 720p29.97 (1280x720, 29.97p)
+ * @vdecRESOLUTION_480p23_976: 480p23.976 (720*480, 23.976)
+ * @vdecRESOLUTION_480p29_97: 480p29.976 (720*480, 29.97p)
+ * @vdecRESOLUTION_576p25: 576p25 (720*576, 25p)
+ * @vdecRESOLUTION_480p0: 480p (720x480, 0p)
+ * @vdecRESOLUTION_480i0: 480i (720x480, 0i)
+ * @vdecRESOLUTION_576p0: 576p (720x576, 0p)
+ * @vdecRESOLUTION_720p0: 720p (1280x720, 0p)
+ * @vdecRESOLUTION_1080p0: 1080p (1920x1080, 0p)
+ * @vdecRESOLUTION_1080i0: 1080i (1920x1080, 0i)
+ */
 enum {
-        vdecRESOLUTION_CUSTOM   = 0x00000000, /* custom */
-        vdecRESOLUTION_480i     = 0x00000001, /* 480i */
-        vdecRESOLUTION_1080i    = 0x00000002, /* 1080i (1920x1080, 60i) */
-        vdecRESOLUTION_NTSC     = 0x00000003, /* NTSC (720x483, 60i) */
-        vdecRESOLUTION_480p     = 0x00000004, /* 480p (720x480, 60p) */
-        vdecRESOLUTION_720p     = 0x00000005, /* 720p (1280x720, 60p) */
-        vdecRESOLUTION_PAL1     = 0x00000006, /* PAL_1 (720x576, 50i) */
-        vdecRESOLUTION_1080i25  = 0x00000007, /* 1080i25 (1920x1080, 50i) */
-        vdecRESOLUTION_720p50   = 0x00000008, /* 720p50 (1280x720, 50p) */
-        vdecRESOLUTION_576p     = 0x00000009, /* 576p (720x576, 50p) */
-        vdecRESOLUTION_1080i29_97 = 0x0000000A, /* 1080i (1920x1080, 59.94i) */
-        vdecRESOLUTION_720p59_94  = 0x0000000B, /* 720p (1280x720, 59.94p) */
-        vdecRESOLUTION_SD_DVD   = 0x0000000C, /* SD DVD (720x483, 60i) */
-        vdecRESOLUTION_480p656  = 0x0000000D, /* 480p (720x480, 60p), output bus width 8 bit, clock 74.25MHz */
-        vdecRESOLUTION_1080p23_976 = 0x0000000E, /* 1080p23_976 (1920x1080, 23.976p) */
-        vdecRESOLUTION_720p23_976  = 0x0000000F, /* 720p23_976 (1280x720p, 23.976p) */
-        vdecRESOLUTION_240p29_97   = 0x00000010, /* 240p (1440x240, 29.97p ) */
-        vdecRESOLUTION_240p30   = 0x00000011, /* 240p (1440x240, 30p) */
-        vdecRESOLUTION_288p25   = 0x00000012, /* 288p (1440x288p, 25p) */
-        vdecRESOLUTION_1080p29_97 = 0x00000013, /* 1080p29_97 (1920x1080, 29.97p) */
-        vdecRESOLUTION_1080p30  = 0x00000014, /* 1080p30 (1920x1080, 30p) */
-        vdecRESOLUTION_1080p24  = 0x00000015, /* 1080p24 (1920x1080, 24p) */
-        vdecRESOLUTION_1080p25  = 0x00000016, /* 1080p25 (1920x1080, 25p) */
-        vdecRESOLUTION_720p24   = 0x00000017, /* 720p24 (1280x720, 25p) */
-        vdecRESOLUTION_720p29_97  = 0x00000018, /* 720p29.97 (1280x720, 29.97p) */
-        vdecRESOLUTION_480p23_976 = 0x00000019, /* 480p23.976 (720*480, 23.976) */
-        vdecRESOLUTION_480p29_97  = 0x0000001A, /* 480p29.976 (720*480, 29.97p) */
-        vdecRESOLUTION_576p25   = 0x0000001B, /* 576p25 (720*576, 25p) */
+        vdecRESOLUTION_CUSTOM   = 0x00000000,
+        vdecRESOLUTION_480i     = 0x00000001,
+        vdecRESOLUTION_1080i    = 0x00000002,
+        vdecRESOLUTION_NTSC     = 0x00000003,
+        vdecRESOLUTION_480p     = 0x00000004,
+        vdecRESOLUTION_720p     = 0x00000005,
+        vdecRESOLUTION_PAL1     = 0x00000006,
+        vdecRESOLUTION_1080i25  = 0x00000007,
+        vdecRESOLUTION_720p50   = 0x00000008,
+        vdecRESOLUTION_576p     = 0x00000009,
+        vdecRESOLUTION_1080i29_97 = 0x0000000A,
+        vdecRESOLUTION_720p59_94  = 0x0000000B,
+        vdecRESOLUTION_SD_DVD   = 0x0000000C,
+        vdecRESOLUTION_480p656  = 0x0000000D,
+        vdecRESOLUTION_1080p23_976 = 0x0000000E,
+        vdecRESOLUTION_720p23_976  = 0x0000000F,
+        vdecRESOLUTION_240p29_97   = 0x00000010,
+        vdecRESOLUTION_240p30   = 0x00000011,
+        vdecRESOLUTION_288p25   = 0x00000012,
+        vdecRESOLUTION_1080p29_97 = 0x00000013,
+        vdecRESOLUTION_1080p30  = 0x00000014,
+        vdecRESOLUTION_1080p24  = 0x00000015,
+        vdecRESOLUTION_1080p25  = 0x00000016,
+        vdecRESOLUTION_720p24   = 0x00000017,
+        vdecRESOLUTION_720p29_97  = 0x00000018,
+        vdecRESOLUTION_480p23_976 = 0x00000019,
+        vdecRESOLUTION_480p29_97  = 0x0000001A,
+        vdecRESOLUTION_576p25   = 0x0000001B,
         /* For Zero Frame Rate */
-        vdecRESOLUTION_480p0    = 0x0000001C, /* 480p (720x480, 0p) */
-        vdecRESOLUTION_480i0    = 0x0000001D, /* 480i (720x480, 0i) */
-        vdecRESOLUTION_576p0    = 0x0000001E, /* 576p (720x576, 0p) */
-        vdecRESOLUTION_720p0    = 0x0000001F, /* 720p (1280x720, 0p) */
-        vdecRESOLUTION_1080p0   = 0x00000020, /* 1080p (1920x1080, 0p) */
-        vdecRESOLUTION_1080i0   = 0x00000021, /* 1080i (1920x1080, 0i) */
+        vdecRESOLUTION_480p0    = 0x0000001C,
+        vdecRESOLUTION_480i0    = 0x0000001D,
+        vdecRESOLUTION_576p0    = 0x0000001E,
+        vdecRESOLUTION_720p0    = 0x0000001F,
+        vdecRESOLUTION_1080p0   = 0x00000020,
+        vdecRESOLUTION_1080i0   = 0x00000021,
 };
 
 /* Bit definitions for 'flags' field */
@@ -359,14 +395,23 @@ enum _BC_OUTPUT_FORMAT {
         MODE422_YUY2                    = 0x1,
         MODE422_UYVY                    = 0x2,
 };
-
+/**
+ * struct BC_PIC_INFO_BLOCK
+ * @timeStam;: Timestamp
+ * @picture_number: Ordinal display number
+ * @width:  pixels
+ * @height:  pixels
+ * @chroma_format:  0x420, 0x422 or 0x444
+ * @n_drop;:  number of non-reference frames
+ *      remaining to be dropped
+ */
 struct BC_PIC_INFO_BLOCK {
         /* Common fields. */
-        uint64_t        timeStamp;      /* Timestamp */
-        uint32_t        picture_number; /* Ordinal display number  */
-        uint32_t        width;          /* pixels           */
-        uint32_t        height;         /* pixels           */
-        uint32_t        chroma_format;  /* 0x420, 0x422 or 0x444 */
+        uint64_t        timeStamp;
+        uint32_t        picture_number;
+        uint32_t        width;
+        uint32_t        height;
+        uint32_t        chroma_format;
         uint32_t        pulldown;
         uint32_t        flags;
         uint32_t        frame_rate;
@@ -376,7 +421,8 @@ struct BC_PIC_INFO_BLOCK {
         uint32_t        sess_num;
         uint32_t        ycom;
         uint32_t        custom_aspect_ratio_width_height;
-        uint32_t        n_drop; /* number of non-reference frames remaining to be dropped */
+        uint32_t        n_drop; /* number of non-reference frames
+                                        remaining to be dropped */
 
         /* Protocol-specific extensions. */
         union {
@@ -390,43 +436,71 @@ struct BC_PIC_INFO_BLOCK {
 /*------------------------------------------------------*
  *    ProcOut Info                                      *
  *------------------------------------------------------*/
-/* Optional flags for ProcOut Interface.*/
+
+/**
+ * enum POUT_OPTIONAL_IN_FLAGS - Optional flags for ProcOut Interface.
+ * @BC_POUT_FLAGS_YV12:  Copy Data in YV12 format
+ * @BC_POUT_FLAGS_STRIDE:  Stride size is valid.
+ * @BC_POUT_FLAGS_SIZE:  Take size information from Application
+ * @BC_POUT_FLAGS_INTERLACED:  copy only half the bytes
+ * @BC_POUT_FLAGS_INTERLEAVED:  interleaved frame
+ * @:  * @BC_POUT_FLAGS_FMT_CHANGE:  Data is not VALID when this flag is set
+ * @BC_POUT_FLAGS_PIB_VALID:  PIB Information valid
+ * @BC_POUT_FLAGS_ENCRYPTED:  Data is encrypted.
+ * @BC_POUT_FLAGS_FLD_BOT:  Bottom Field data
+ */
 enum POUT_OPTIONAL_IN_FLAGS_ {
         /* Flags from App to Device */
-        BC_POUT_FLAGS_YV12        = 0x01,       /* Copy Data in YV12 format */
-        BC_POUT_FLAGS_STRIDE      = 0x02,       /* Stride size is valid. */
-        BC_POUT_FLAGS_SIZE        = 0x04,       /* Take size information from Application */
-        BC_POUT_FLAGS_INTERLACED  = 0x08,       /* copy only half the bytes */
-        BC_POUT_FLAGS_INTERLEAVED = 0x10,       /* interleaved frame */
+        BC_POUT_FLAGS_YV12        = 0x01,
+        BC_POUT_FLAGS_STRIDE      = 0x02,
+        BC_POUT_FLAGS_SIZE        = 0x04,
+        BC_POUT_FLAGS_INTERLACED  = 0x08,
+        BC_POUT_FLAGS_INTERLEAVED = 0x10,
 
         /* Flags from Device to APP */
-        BC_POUT_FLAGS_FMT_CHANGE  = 0x10000,    /* Data is not VALID when this flag is set */
-        BC_POUT_FLAGS_PIB_VALID   = 0x20000,    /* PIB Information valid */
-        BC_POUT_FLAGS_ENCRYPTED   = 0x40000,    /* Data is encrypted. */
-        BC_POUT_FLAGS_FLD_BOT     = 0x80000,    /* Bottom Field data */
+        BC_POUT_FLAGS_FMT_CHANGE  = 0x10000,
+        BC_POUT_FLAGS_PIB_VALID   = 0x20000,
+        BC_POUT_FLAGS_ENCRYPTED   = 0x40000,
+        BC_POUT_FLAGS_FLD_BOT     = 0x80000,
 };
 
-typedef enum BC_STATUS(*dts_pout_callback)(void  *shnd, uint32_t width, uint32_t height, uint32_t stride, void *pOut);
+typedef enum BC_STATUS(*dts_pout_callback)(void  *shnd, uint32_t width,
+                        uint32_t height, uint32_t stride, void *pOut);
 
 /* Line 21 Closed Caption */
 /* User Data */
 #define MAX_UD_SIZE             1792    /* 1920 - 128 */
 
+/**
+ * struct BC_DTS_PROC_OUT
+ * @Ybuff: Caller Supplied buffer for Y data
+ * @YbuffSz: Caller Supplied Y buffer size
+ * @YBuffDoneSz: Transferred Y datasize
+ * @*UVbuff: Caller Supplied buffer for UV data
+ * @UVbuffSz: Caller Supplied UV buffer size
+ * @UVBuffDoneSz: Transferred UV data size
+ * @StrideSz: Caller supplied Stride Size
+ * @PoutFlags: Call IN Flags
+ * @discCnt: Picture discontinuity count
+ * @PicInfo: Picture Information Block Data
+ * @b422Mode: Picture output Mode
+ * @bPibEnc: PIB encrypted
+ */
 struct BC_DTS_PROC_OUT {
-        uint8_t         *Ybuff;                 /* Caller Supplied buffer for Y data */
-        uint32_t        YbuffSz;                /* Caller Supplied Y buffer size */
-        uint32_t        YBuffDoneSz;            /* Transferred Y datasize */
+        uint8_t         *Ybuff;
+        uint32_t        YbuffSz;
+        uint32_t        YBuffDoneSz;
 
-        uint8_t         *UVbuff;                /* Caller Supplied buffer for UV data */
-        uint32_t        UVbuffSz;               /* Caller Supplied UV buffer size */
-        uint32_t        UVBuffDoneSz;           /* Transferred UV data size */
+        uint8_t         *UVbuff;
+        uint32_t        UVbuffSz;
+        uint32_t        UVBuffDoneSz;
 
-        uint32_t        StrideSz;               /* Caller supplied Stride Size */
-        uint32_t        PoutFlags;              /* Call IN Flags */
+        uint32_t        StrideSz;
+        uint32_t        PoutFlags;
 
-        uint32_t        discCnt;                /* Picture discontinuity count */
+        uint32_t        discCnt;
 
-        struct BC_PIC_INFO_BLOCK PicInfo;               /* Picture Information Block Data */
+        struct BC_PIC_INFO_BLOCK PicInfo;
 
         /* Line 21 Closed Caption */
         /* User Data */
@@ -436,39 +510,47 @@ struct BC_DTS_PROC_OUT {
         void            *hnd;
         dts_pout_callback AppCallBack;
         uint8_t         DropFrames;
-        uint8_t         b422Mode;               /* Picture output Mode */
-        uint8_t         bPibEnc;                /* PIB encrypted */
+        uint8_t         b422Mode;
+        uint8_t         bPibEnc;
         uint8_t         bRevertScramble;
 
 };
-
+/**
+ * struct BC_DTS_STATUS
+ * @ReadyListCount: Number of frames in ready list (reported by driver)
+ * @PowerStateChange: Number of active state power
+ *      transitions (reported by driver)
+ * @FramesDropped:  Number of frames dropped.  (reported by DIL)
+ * @FramesCaptured: Number of frames captured. (reported by DIL)
+ * @FramesRepeated: Number of frames repeated. (reported by DIL)
+ * @InputCount: Times compressed video has been sent to the HW.
+ *      i.e. Successful DtsProcInput() calls (reported by DIL)
+ * @InputTotalSize: Amount of compressed video that has been sent to the HW.
+ *      (reported by DIL)
+ * @InputBusyCount: Times compressed video has attempted to be sent to the HW
+ *      but the input FIFO was full. (reported by DIL)
+ * @PIBMissCount: Amount of times a PIB is invalid. (reported by DIL)
+ * @cpbEmptySize: supported only for H.264, specifically changed for
+ *      Adobe. Report size of CPB buffer available. (reported by DIL)
+ * @NextTimeStamp: TimeStamp of the next picture that will be returned
+ *      by a call to ProcOutput. Added for Adobe. Reported
+ *      back from the driver
+ */
 struct BC_DTS_STATUS {
-        uint8_t         ReadyListCount; /* Number of frames in ready list (reported by driver) */
-        uint8_t         FreeListCount;  /* Number of frame buffers free.  (reported by driver) */
-        uint8_t         PowerStateChange; /* Number of active state power transitions (reported by driver) */
+        uint8_t         ReadyListCount;
+        uint8_t         FreeListCount;
+        uint8_t         PowerStateChange;
         uint8_t         reserved_[1];
-
-        uint32_t        FramesDropped;  /* Number of frames dropped.  (reported by DIL) */
-        uint32_t        FramesCaptured; /* Number of frames captured. (reported by DIL) */
-        uint32_t        FramesRepeated; /* Number of frames repeated. (reported by DIL) */
-
-        uint32_t        InputCount;     /* Times compressed video has been sent to the HW.
-                                         * i.e. Successful DtsProcInput() calls (reported by DIL) */
-        uint64_t        InputTotalSize; /* Amount of compressed video that has been sent to the HW.
-                                         * (reported by DIL) */
-        uint32_t        InputBusyCount; /* Times compressed video has attempted to be sent to the HW
-                                         * but the input FIFO was full. (reported by DIL) */
-
-        uint32_t        PIBMissCount;   /* Amount of times a PIB is invalid. (reported by DIL) */
-
-        uint32_t        cpbEmptySize;   /* supported only for H.264, specifically changed for
-                                         * Adobe. Report size of CPB buffer available.
-                                         * Reported by DIL */
-        uint64_t        NextTimeStamp;  /* TimeStamp of the next picture that will be returned
-                                         * by a call to ProcOutput. Added for Adobe. Reported
-                                         * back from the driver */
+        uint32_t        FramesDropped;
+        uint32_t        FramesCaptured;
+        uint32_t        FramesRepeated;
+        uint32_t        InputCount;
+        uint64_t        InputTotalSize;
+        uint32_t        InputBusyCount;
+        uint32_t        PIBMissCount;
+        uint32_t        cpbEmptySize;
+        uint64_t        NextTimeStamp;
         uint8_t         reserved__[16];
-
 };
 
 #define BC_SWAP32(_v)                   \
diff --git a/drivers/staging/cxt1e1/comet.h b/drivers/staging/cxt1e1/comet.h
index 5cb3afda0112..e06da4a6f6f6 100644
--- a/drivers/staging/cxt1e1/comet.h
+++ b/drivers/staging/cxt1e1/comet.h
@@ -1,7 +1,3 @@
-/*
- * $Id: comet.h,v 1.3 2005/09/28 00:10:07 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_COMET_H_
 #define _INC_COMET_H_
 
@@ -23,27 +19,9 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.3 $
- * Last changed on $Date: 2005/09/28 00:10:07 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: comet.h,v $
- * Revision 1.3  2005/09/28 00:10:07  rickd
- * Add RCS header. Switch to structure usage.
- *
- * Revision 1.2  2005/04/28 23:43:03  rickd
- * Add RCS tracking heading.
- *
- *-----------------------------------------------------------------------------
  */
 
-#if defined(__FreeBSD__) || defined (__NetBSD__)
-#include <sys/types.h>
-#else
 #include <linux/types.h>
-#endif
-
 
 #define VINT32  volatile u_int32_t
 
diff --git a/drivers/staging/cxt1e1/comet_tables.c b/drivers/staging/cxt1e1/comet_tables.c
index db1293c71a6d..84931117da35 100644
--- a/drivers/staging/cxt1e1/comet_tables.c
+++ b/drivers/staging/cxt1e1/comet_tables.c
@@ -1,7 +1,3 @@
-/*
- * $Id: comet_tables.c,v 1.2 2005/10/17 23:55:27 rickd PMCC4_3_1B $
- */
-
 /*-----------------------------------------------------------------------------
  * comet_tables.c - waveform tables for the PM4351 'COMET'
  *
@@ -20,28 +16,8 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.2 $
- * Last changed on $Date: 2005/10/17 23:55:27 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: comet_tables.c,v $
- * Revision 1.2  2005/10/17 23:55:27  rickd
- * Note that 75 Ohm transmit waveform is not supported on PMCC4.
- *
- * Revision 1.1  2005/09/28 00:10:05  rickd
- * Cosmetic alignment of tables for readability.
- *
- * Revision 1.0  2005/05/10 22:47:53  rickd
- * Initial revision
- *
- *-----------------------------------------------------------------------------
  */
 
-char SBEid_pmcc4_comet_tblc[] =
-  "@(#)comet_tables.c - $Revision: 1.2 $      (c) Copyright 2004-2005 SBE, Inc.";
-
-
 #include <linux/types.h>
 
 /*****************************************************************************
diff --git a/drivers/staging/cxt1e1/comet_tables.h b/drivers/staging/cxt1e1/comet_tables.h
index 80424a26a169..3e2e5badf787 100644
--- a/drivers/staging/cxt1e1/comet_tables.h
+++ b/drivers/staging/cxt1e1/comet_tables.h
@@ -1,7 +1,3 @@
-/*
- * $Id: comet_tables.h,v 1.5 2006/01/02 22:37:31 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_COMET_TBLS_H_
 #define _INC_COMET_TBLS_H_
 
@@ -23,26 +19,6 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.5 $
- * Last changed on $Date: 2006/01/02 22:37:31 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: comet_tables.h,v $
- * Revision 1.5  2006/01/02 22:37:31  rickd
- * Double indexed arrays need sizings to avoid CC errors under
- * gcc 4.0.0
- *
- * Revision 1.4  2005/10/17 23:55:28  rickd
- * The 75 Ohm transmit waveform is not supported on PMCC4.
- *
- * Revision 1.3  2005/09/28 00:10:08  rickd
- * Add GNU License info. Structures moved to -C- file.
- *
- * Revision 1.2  2005/04/28 23:43:04  rickd
- * Add RCS tracking heading.
- *
- *-----------------------------------------------------------------------------
  */
 
 
diff --git a/drivers/staging/cxt1e1/libsbew.h b/drivers/staging/cxt1e1/libsbew.h
index ae8f06d05bed..4254c0426db9 100644
--- a/drivers/staging/cxt1e1/libsbew.h
+++ b/drivers/staging/cxt1e1/libsbew.h
@@ -1,7 +1,3 @@
-/*
- * $Id: libsbew.h,v 2.1 2005/10/27 18:54:19 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_LIBSBEW_H_
 #define _INC_LIBSBEW_H_
 
@@ -25,32 +21,8 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 2.1 $
- * Last changed on $Date: 2005/10/27 18:54:19 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: libsbew.h,v $
- * Revision 2.1  2005/10/27 18:54:19  rickd
- * Add E1PLAIN support.
- *
- * Revision 2.0  2005/09/28 00:10:08  rickd
- * Customized for PMCC4 comet-per-port design.
- *
- * Revision 1.15  2005/03/29 00:51:31  rickd
- * File imported from C1T3 port, Revision 1.15
- *-----------------------------------------------------------------------------
  */
 
-#ifndef __KERNEL__
-#include <sys/types.h>
-#endif
-
-#ifdef __cplusplus
-extern      "C"
-{
-#endif
-
 /********************************/
 /**  set driver logging level  **/
 /********************************/
@@ -574,8 +546,4 @@ struct sbecom_port_param
     extern int  wancfg_set_tsioc (wcfg_t *, struct wanc1t3_ts_param *);
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif                          /*** _INC_LIBSBEW_H_ ***/
diff --git a/drivers/staging/cxt1e1/musycc.c b/drivers/staging/cxt1e1/musycc.c
index 5cc3423a6646..90c0f1e30f65 100644
--- a/drivers/staging/cxt1e1/musycc.c
+++ b/drivers/staging/cxt1e1/musycc.c
@@ -1,7 +1,3 @@
-/*
- * $Id: musycc.c,v 2.1 2007/08/15 23:32:17 rickd PMCC4_3_1B $
- */
-
 unsigned int max_intcnt = 0;
 unsigned int max_bh = 0;
 
@@ -24,53 +20,8 @@ unsigned int max_bh = 0;
  * For further information, contact via email: support@onestopsystems.com
  * One Stop Systems, Inc.  Escondido, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 2.1 $
- * Last changed on $Date: 2007/08/15 23:32:17 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: musycc.c,v $
- * Revision 2.1  2007/08/15 23:32:17  rickd
- * Use 'if 0' instead of GNU comment delimeter to avoid line wrap induced compiler errors.
- *
- * Revision 2.0  2007/08/15 22:13:20  rickd
- * Update to printf pointer %p usage and correct some UINT to ULONG for
- * 64bit comptibility.
- *
- * Revision 1.7  2006/04/21 00:56:40  rickd
- * workqueue files now prefixed with <sbecom> prefix.
- *
- * Revision 1.6  2005/10/27 18:54:19  rickd
- * Clean out old code.  Default to HDLC_FCS16, not TRANS.
- *
- * Revision 1.5  2005/10/17 23:55:28  rickd
- * Initial port of NCOMM support patches from original work found
- * in pmc_c4t1e1 as updated by NCOMM.  Ref: CONFIG_SBE_PMCC4_NCOMM.
- *
- * Revision 1.4  2005/10/13 20:35:25  rickd
- * Cleanup warning for unused <flags> variable.
- *
- * Revision 1.3  2005/10/13 19:19:22  rickd
- * Disable redundant driver removal cleanup code.
- *
- * Revision 1.2  2005/10/11 18:36:16  rickd
- * Clean up warning messages caused by de-implemented some <flags> associated
- * with spin_lock() removals.
- *
- * Revision 1.1  2005/10/05 00:45:28  rickd
- * Re-enable xmit on flow-controlled and full channel to fix restart hang.
- * Add some temp spin-lock debug code (rld_spin_owner).
- *
- * Revision 1.0  2005/09/28 00:10:06  rickd
- * Initial release for C4T1E1 support. Lots of transparent
- * mode updates.
- *
- *-----------------------------------------------------------------------------
  */
 
-char        SBEid_pmcc4_musyccc[] =
-"@(#)musycc.c - $Revision: 2.1 $      (c) Copyright 2004-2006 SBE, Inc.";
-
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/types.h>
diff --git a/drivers/staging/cxt1e1/musycc.h b/drivers/staging/cxt1e1/musycc.h
index 68f3660f4477..cf6b54e15689 100644
--- a/drivers/staging/cxt1e1/musycc.h
+++ b/drivers/staging/cxt1e1/musycc.h
@@ -1,7 +1,3 @@
-/*
- * $Id: musycc.h,v 1.3 2005/09/28 00:10:08 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_MUSYCC_H_
 #define _INC_MUSYCC_H_
 
@@ -24,36 +20,13 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.3 $
- * Last changed on $Date: 2005/09/28 00:10:08 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: musycc.h,v $
- * Revision 1.3  2005/09/28 00:10:08  rickd
- * Add GNU license info. Add PMCC4 PCI/DevIDs.  Implement new
- * musycc reg&bits namings. Use PORTMAP_0 GCD grouping.
- *
- * Revision 1.2  2005/04/28 23:43:04  rickd
- * Add RCS tracking heading.
- *
- *-----------------------------------------------------------------------------
  */
 
-#if defined (__FreeBSD__) || defined (__NetBSD__)
-#include <sys/types.h>
-#else
 #include <linux/types.h>
-#endif
 
 #define VINT8   volatile u_int8_t
 #define VINT32  volatile u_int32_t
 
-#ifdef __cplusplus
-extern      "C"
-{
-#endif
-
 #include "pmcc4_defs.h"
 
 
@@ -448,10 +421,6 @@ extern      "C"
 /*  This must be defined on an entire channel group (Port) basis */
 #define SUERM_THRESHOLD     0x1f
 
-#ifdef __cplusplus
-}
-#endif
-
 #undef VINT32
 #undef VINT8
 
diff --git a/drivers/staging/cxt1e1/ossiRelease.c b/drivers/staging/cxt1e1/ossiRelease.c
index a56029866c2d..f17a902e95e3 100644
--- a/drivers/staging/cxt1e1/ossiRelease.c
+++ b/drivers/staging/cxt1e1/ossiRelease.c
@@ -1,7 +1,3 @@
-/*
- * $Id: ossiRelease.c,v 1.2 2008/05/08 20:14:03 rdobbs PMCC4_3_1B $
- */
-
 /*-----------------------------------------------------------------------------
  * ossiRelease.c -
  *
@@ -26,14 +22,8 @@
  * One Stop Systems, Inc.  Escondido, California  U.S.A.
  *
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.2 $
- * Last changed on $Date: 2008/05/08 20:14:03 $
- * Changed by $Author: rdobbs $
- *-----------------------------------------------------------------------------
  */
 
-
 char pmcc4_OSSI_release[] = "$Release: PMCC4_3_1B,  Copyright (c) 2008 One Stop Systems$";
 
 /***  End-of-File  ***/
diff --git a/drivers/staging/cxt1e1/pmc93x6_eeprom.h b/drivers/staging/cxt1e1/pmc93x6_eeprom.h
index c3ada87efd26..96c48cb83260 100644
--- a/drivers/staging/cxt1e1/pmc93x6_eeprom.h
+++ b/drivers/staging/cxt1e1/pmc93x6_eeprom.h
@@ -1,7 +1,3 @@
-/*
- * $Id: pmc93x6_eeprom.h,v 1.1 2005/09/28 00:10:08 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_PMC93X6_EEPROM_H_
 #define _INC_PMC93X6_EEPROM_H_
 
@@ -23,26 +19,9 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- *-----------------------------------------------------------------------------
- * $Log: pmc93x6_eeprom.h,v $
- * Revision 1.1  2005/09/28 00:10:08  rickd
- * pmc_verify_cksum return value is char.
- *
- * Revision 1.0  2005/05/04 17:20:51  rickd
- * Initial revision
- *
- * Revision 1.0  2005/04/22 23:48:48  rickd
- * Initial revision
- *
- *-----------------------------------------------------------------------------
  */
 
-#if defined (__FreeBSD__) || defined (__NetBSD__)
-#include <sys/types.h>
-#else
 #include <linux/types.h>
-#endif
 
 #ifdef __KERNEL__
 
diff --git a/drivers/staging/cxt1e1/pmcc4.h b/drivers/staging/cxt1e1/pmcc4.h
index e046b87763a2..b0ed4ad13011 100644
--- a/drivers/staging/cxt1e1/pmcc4.h
+++ b/drivers/staging/cxt1e1/pmcc4.h
@@ -1,7 +1,3 @@
-/*
- * $Id: pmcc4.h,v 1.4 2005/11/01 19:24:48 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_PMCC4_H_
 #define _INC_PMCC4_H_
 
@@ -23,49 +19,15 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.4 $
- * Last changed on $Date: 2005/11/01 19:24:48 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: pmcc4.h,v $
- * Revision 1.4  2005/11/01 19:24:48  rickd
- * Remove de-implement function prototypes.  Several <int> to
- * <status_t> changes for consistent usage of same.
- *
- * Revision 1.3  2005/09/28 00:10:08  rickd
- * Add GNU license info. Use config params from libsbew.h
- *
- * Revision 1.2  2005/04/28 23:43:03  rickd
- * Add RCS tracking heading.
- *
- *-----------------------------------------------------------------------------
  */
 
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <sys/types.h>
-#else
-#ifndef __KERNEL__
-#include <sys/types.h>
-#else
 #include <linux/types.h>
-#endif
-#endif
-
-
 
 typedef int status_t;
 
 #define SBE_DRVR_FAIL     0
 #define SBE_DRVR_SUCCESS  1
 
-#ifdef __cplusplus
-extern      "C"
-{
-#endif
-
-
 /********************/
 /* PMCC4 memory Map */
 /********************/
@@ -105,10 +67,6 @@ extern      "C"
 #define sbeE1errSMF    0x02
 #define sbeE1CRC       0x01
 
-#ifdef __cplusplus
-}
-#endif
-
 #ifdef __KERNEL__
 
 /*
diff --git a/drivers/staging/cxt1e1/pmcc4_cpld.h b/drivers/staging/cxt1e1/pmcc4_cpld.h
index 6d8f0337aa3e..a51209bc5274 100644
--- a/drivers/staging/cxt1e1/pmcc4_cpld.h
+++ b/drivers/staging/cxt1e1/pmcc4_cpld.h
@@ -1,7 +1,3 @@
-/*
- * $Id: pmcc4_cpld.h,v 1.0 2005/09/28 00:10:08 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_PMCC4_CPLD_H_
 #define _INC_PMCC4_CPLD_H_
 
@@ -23,34 +19,9 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.0 $
- * Last changed on $Date: 2005/09/28 00:10:08 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: pmcc4_cpld.h,v $
- * Revision 1.0  2005/09/28 00:10:08  rickd
- * Initial revision
- *
- *-----------------------------------------------------------------------------
  */
 
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <sys/types.h>
-#else
-#ifndef __KERNEL__
-#include <sys/types.h>
-#else
 #include <linux/types.h>
-#endif
-#endif
-
-#ifdef __cplusplus
-extern      "C"
-{
-#endif
-
 
 /********************************/
 /* iSPLD control chip registers */
@@ -117,8 +88,4 @@ extern      "C"
 #define PMCC4_CPLD_INTR_CMT_3   0x04
 #define PMCC4_CPLD_INTR_CMT_4   0x08
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif                          /* _INC_PMCC4_CPLD_H_ */
diff --git a/drivers/staging/cxt1e1/pmcc4_defs.h b/drivers/staging/cxt1e1/pmcc4_defs.h
index a39505f45c29..83ceae4324b2 100644
--- a/drivers/staging/cxt1e1/pmcc4_defs.h
+++ b/drivers/staging/cxt1e1/pmcc4_defs.h
@@ -1,7 +1,3 @@
-/*
- * $Id: pmcc4_defs.h,v 1.0 2005/09/28 00:10:09 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_PMCC4_DEFS_H_
 #define _INC_PMCC4_DEFS_H_
 
@@ -25,16 +21,6 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.0 $
- * Last changed on $Date: 2005/09/28 00:10:09 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: pmcc4_defs.h,v $
- * Revision 1.0  2005/09/28 00:10:09  rickd
- * Initial revision
- *
- *-----------------------------------------------------------------------------
  */
 
 
diff --git a/drivers/staging/cxt1e1/pmcc4_drv.c b/drivers/staging/cxt1e1/pmcc4_drv.c
index e1f07fabd22d..8a7b3a646451 100644
--- a/drivers/staging/cxt1e1/pmcc4_drv.c
+++ b/drivers/staging/cxt1e1/pmcc4_drv.c
@@ -1,8 +1,3 @@
-/*
- * $Id: pmcc4_drv.c,v 3.1 2007/08/15 23:32:17 rickd PMCC4_3_1B $
- */
-
-
 /*-----------------------------------------------------------------------------
  * pmcc4_drv.c -
  *
@@ -22,74 +17,10 @@
  * For further information, contact via email: support@onestopsystems.com
  * One Stop Systems, Inc.  Escondido, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 3.1 $
- * Last changed on $Date: 2007/08/15 23:32:17 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: pmcc4_drv.c,v $
- * Revision 3.1  2007/08/15 23:32:17  rickd
- * Use 'if 0' instead of GNU comment delimeter to avoid line wrap induced compiler errors.
- *
- * Revision 3.0  2007/08/15 22:19:55  rickd
- * Correct sizeof() castings and pi->regram to support 64bit compatibility.
- *
- * Revision 2.10  2006/04/21 00:56:40  rickd
- * workqueue files now prefixed with <sbecom> prefix.
- *
- * Revision 2.9  2005/11/01 19:22:49  rickd
- * Add sanity checks against max_port for ioctl functions.
- *
- * Revision 2.8  2005/10/27 18:59:25  rickd
- * Code cleanup.  Default channel config to HDLC_FCS16.
- *
- * Revision 2.7  2005/10/18 18:16:30  rickd
- * Further NCOMM code repairs - (1) interrupt matrix usage inconsistent
- * for indexing into nciInterrupt[][], code missing double parameters.
- * (2) check input of ncomm interrupt registration cardID for correct
- * boundary values.
- *
- * Revision 2.6  2005/10/17 23:55:28  rickd
- * Initial port of NCOMM support patches from original work found
- * in pmc_c4t1e1 as updated by NCOMM.  Ref: CONFIG_SBE_PMCC4_NCOMM.
- * Corrected NCOMMs wanpmcC4T1E1_getBaseAddress() to correctly handle
- * multiple boards.
- *
- * Revision 2.5  2005/10/13 23:01:28  rickd
- * Correct panic for illegal address reference w/in get_brdinfo on
- * first_if/last_if name acquistion under Linux 2.6
- *
- * Revision 2.4  2005/10/13 21:20:19  rickd
- * Correction of c4_cleanup() wherein next should be acquired before
- * ci_t structure is free'd.
- *
- * Revision 2.3  2005/10/13 19:20:10  rickd
- * Correct driver removal cleanup code for multiple boards.
- *
- * Revision 2.2  2005/10/11 18:34:04  rickd
- * New routine added to determine number of ports (comets) on board.
- *
- * Revision 2.1  2005/10/05 00:48:13  rickd
- * Add some RX activation trace code.
- *
- * Revision 2.0  2005/09/28 00:10:06  rickd
- * Implement 2.6 workqueue for TX/RX restart.  Correction to
- * hardware register boundary checks allows expanded access of MUSYCC.
- * Implement new musycc reg&bits namings.
- *
- *-----------------------------------------------------------------------------
  */
 
-char        OSSIid_pmcc4_drvc[] =
-"@(#)pmcc4_drv.c - $Revision: 3.1 $   (c) Copyright 2002-2007 One Stop Systems, Inc.";
-
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#if defined (__FreeBSD__) || defined (__NetBSD__)
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#else
 #include <linux/types.h>
 #include "pmcc4_sysdep.h"
 #include <linux/errno.h>
@@ -98,7 +29,6 @@ char        OSSIid_pmcc4_drvc[] =
 #include <linux/timer.h>        /* include for timer */
 #include <linux/hdlc.h>
 #include <asm/io.h>
-#endif
 
 #include "sbecom_inline_linux.h"
 #include "libsbew.h"
diff --git a/drivers/staging/cxt1e1/pmcc4_ioctls.h b/drivers/staging/cxt1e1/pmcc4_ioctls.h
index 6b8d65673c78..56a1ee39be18 100644
--- a/drivers/staging/cxt1e1/pmcc4_ioctls.h
+++ b/drivers/staging/cxt1e1/pmcc4_ioctls.h
@@ -1,6 +1,3 @@
-/* RCSid: $Header: /home/rickd/projects/pmcc4/include/pmcc4_ioctls.h,v 2.0 2005/09/28 00:10:09 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_PMCC4_IOCTLS_H_
 #define _INC_PMCC4_IOCTLS_H_
 
@@ -22,19 +19,6 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 2.0 $
- * Last changed on $Date: 2005/09/28 00:10:09 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: pmcc4_ioctls.h,v $
- * Revision 2.0  2005/09/28 00:10:09  rickd
- * Add GNU license info. Switch Ioctls to sbe_ioc.h usage.
- *
- * Revision 1.2  2005/04/28 23:43:03  rickd
- * Add RCS tracking heading.
- *
- *-----------------------------------------------------------------------------
  */
 
 #include "sbew_ioc.h"
diff --git a/drivers/staging/cxt1e1/sbe_bid.h b/drivers/staging/cxt1e1/sbe_bid.h
index 1f49b4061fb7..abc2e55f62fc 100644
--- a/drivers/staging/cxt1e1/sbe_bid.h
+++ b/drivers/staging/cxt1e1/sbe_bid.h
@@ -1,7 +1,3 @@
-/*
- * $Id: sbe_bid.h,v 1.0 2005/09/28 00:10:09 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_SBEBID_H_
 #define _INC_SBEBID_H_
 
@@ -24,16 +20,6 @@
  * SBE, Inc.  San Ramon, California  U.S.A.
  *
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.0 $
- * Last changed on $Date: 2005/09/28 00:10:09 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: sbe_bid.h,v $
- * Revision 1.0  2005/09/28 00:10:09  rickd
- * Initial revision
- *
- *-----------------------------------------------------------------------------
  */
 
 #define SBE_BID_REG        0x00000000   /* Board ID Register */
diff --git a/drivers/staging/cxt1e1/sbe_promformat.h b/drivers/staging/cxt1e1/sbe_promformat.h
index 746f81b15c73..aad411d185f5 100644
--- a/drivers/staging/cxt1e1/sbe_promformat.h
+++ b/drivers/staging/cxt1e1/sbe_promformat.h
@@ -1,7 +1,3 @@
-/*
- * $Id: sbe_promformat.h,v 2.2 2005/09/28 00:10:09 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_SBE_PROMFORMAT_H_
 #define _INC_SBE_PROMFORMAT_H_
 
@@ -24,19 +20,6 @@
  * SBE, Inc.  San Ramon, California  U.S.A.
  *
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 2.2 $
- * Last changed on $Date: 2005/09/28 00:10:09 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: sbe_promformat.h,v $
- * Revision 2.2  2005/09/28 00:10:09  rickd
- * Add EEPROM sample from C4T1E1 board.
- *
- * Revision 2.1  2005/05/04 17:18:24  rickd
- * Initial CI.
- *
- *-----------------------------------------------------------------------------
  */
 
 
@@ -85,12 +68,6 @@
  *
  */
 
-#ifdef __cplusplus
-extern      "C"
-{
-#endif
-
-
 #define STRUCT_OFFSET(type, symbol)  ((long)&(((type *)0)->symbol))
 
 /*------------------------------------------------------------------------
@@ -150,8 +127,4 @@ extern      "C"
         FLD_TYPE2   fldType2;
     }           PROMFORMAT;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif                          /*** _INC_SBE_PROMFORMAT_H_ ***/
diff --git a/drivers/staging/cxt1e1/sbecom_inline_linux.h b/drivers/staging/cxt1e1/sbecom_inline_linux.h
index 9ea2c0c2061f..68ed445ab0cb 100644
--- a/drivers/staging/cxt1e1/sbecom_inline_linux.h
+++ b/drivers/staging/cxt1e1/sbecom_inline_linux.h
@@ -1,7 +1,3 @@
-/*
- * $Id: sbecom_inline_linux.h,v 1.2 2007/08/15 22:51:35 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_SBECOM_INLNX_H_
 #define _INC_SBECOM_INLNX_H_
 
@@ -24,22 +20,6 @@
  * For further information, contact via email: support@onestopsystems.com
  * One Stop Systems, Inc.  Escondido, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.2 $
- * Last changed on $Date: 2007/08/15 22:51:35 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: sbecom_inline_linux.h,v $
- * Revision 1.2  2007/08/15 22:51:35  rickd
- * Remove duplicate version.h entry.
- *
- * Revision 1.1  2007/08/15 22:50:29  rickd
- * Update linux/config for 2.6.18 and later.
- *
- * Revision 1.0  2005/09/28 00:10:09  rickd
- * Initial revision
- *
- *-----------------------------------------------------------------------------
  */
 
 
diff --git a/drivers/staging/cxt1e1/sbeproc.h b/drivers/staging/cxt1e1/sbeproc.h
index 4aa53f44ec0b..e82be6afd1e8 100644
--- a/drivers/staging/cxt1e1/sbeproc.h
+++ b/drivers/staging/cxt1e1/sbeproc.h
@@ -1,7 +1,3 @@
-/*
- * $Id: sbeproc.h,v 1.2 2005/10/17 23:55:28 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_SBEPROC_H_
 #define _INC_SBEPROC_H_
 
@@ -23,22 +19,6 @@
  * For further information, contact via email: support@sbei.com
  * SBE, Inc.  San Ramon, California  U.S.A.
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.2 $
- * Last changed on $Date: 2005/10/17 23:55:28 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: sbeproc.h,v $
- * Revision 1.2  2005/10/17 23:55:28  rickd
- * sbecom_proc_brd_init() is an declared an __init function.
- *
- * Revision 1.1  2005/09/28 00:10:09  rickd
- * Remove unneeded inclusion of c4_private.h.
- *
- * Revision 1.0  2005/05/10 22:21:46  rickd
- * Initial check-in.
- *
- *-----------------------------------------------------------------------------
  */
 
 
diff --git a/drivers/staging/cxt1e1/sbew_ioc.h b/drivers/staging/cxt1e1/sbew_ioc.h
index 14d371904d1f..ce9b15c71894 100644
--- a/drivers/staging/cxt1e1/sbew_ioc.h
+++ b/drivers/staging/cxt1e1/sbew_ioc.h
@@ -1,7 +1,3 @@
-/*
- * $Id: sbew_ioc.h,v 1.0 2005/09/28 00:10:10 rickd PMCC4_3_1B $
- */
-
 #ifndef _INC_SBEWIOC_H_
 #define _INC_SBEWIOC_H_
 
@@ -24,55 +20,9 @@
  * SBE, Inc.  San Ramon, California  U.S.A.
  *
  *-----------------------------------------------------------------------------
- * RCS info:
- * RCS revision: $Revision: 1.0 $
- * Last changed on $Date: 2005/09/28 00:10:10 $
- * Changed by $Author: rickd $
- *-----------------------------------------------------------------------------
- * $Log: sbew_ioc.h,v $
- * Revision 1.0  2005/09/28 00:10:10  rickd
- * Initial revision
- *
- * Revision 1.6  2005/01/11 18:41:01  rickd
- * Add BRDADDR_GET Ioctl.
- *
- * Revision 1.5  2004/09/16 18:55:59  rickd
- * Start setting up for generic framer configuration Ioctl by switch
- * from tect3_framer_param[] to sbecom_framer_param[].
- *
- * Revision 1.4  2004/06/28 17:58:15  rickd
- * Rename IOC_TSMAP_[GS] to IOC_TSIOC_[GS] to support need for
- * multiple formats of data when setting up TimeSlots.
- *
- * Revision 1.3  2004/06/22 21:18:13  rickd
- * read_vec now() ONLY handles a single common wrt_vec array.
- *
- * Revision 1.1  2004/06/10 18:11:34  rickd
- * Add IID_GET Ioctl reference.
- *
- * Revision 1.0  2004/06/08 22:59:38  rickd
- * Initial revision
- *
- * Revision 2.0  2004/06/07 17:49:47  rickd
- * Initial library release following merge of wanc1t3/wan256 into
- * common elements for lib.
- *
- *-----------------------------------------------------------------------------
  */
 
-#ifndef __KERNEL__
-#include <sys/types.h>
-#endif
-#ifdef SunOS
-#include <sys/ioccom.h>
-#else
 #include <linux/ioctl.h>
-#endif
-
-#ifdef __cplusplus
-extern      "C"
-{
-#endif
 
 #define SBE_LOCKFILE   "/tmp/.sbewan.LCK"
 
@@ -128,9 +78,4 @@ extern      "C"
 
 #define SBE_IOC_MAXVEC    1
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif                          /*** _INC_SBEWIOC_H_ ***/
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 0c1c6ca8c379..2c4069fcd981 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -155,7 +155,6 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
 #define fMP_ADAPTER_FAIL_SEND_MASK      0x3ff00000
 
 /* Some offsets in PCI config space that are actually used. */
-#define ET1310_PCI_MAX_PYLD             0x4C
 #define ET1310_PCI_MAC_ADDRESS          0xA4
 #define ET1310_PCI_EEPROM_STATUS        0xB2
 #define ET1310_PCI_ACK_NACK             0xC0
@@ -178,9 +177,7 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
 
 /* RX defines */
 #define USE_FBR0 1
-
 #define FBR_CHUNKS 32
-
 #define MAX_DESC_PER_RING_RX         1024
 
 /* number of RFDs - default and min */
@@ -195,7 +192,6 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
 #endif
 
 #define NIC_MIN_NUM_RFD         64
-
 #define NUM_PACKETS_HANDLED     256
 
 #define ALCATEL_MULTICAST_PKT   0x01000000
@@ -303,8 +299,8 @@ struct fbr_lookup {
         dma_addr_t       ring_physaddr;
         void            *mem_virtaddrs[MAX_DESC_PER_RING_RX / FBR_CHUNKS];
         dma_addr_t       mem_physaddrs[MAX_DESC_PER_RING_RX / FBR_CHUNKS];
-        uint64_t         real_physaddr;
-        uint64_t         offset;
+        u64              real_physaddr;
+        u64              offset;
         u32              local_full;
         u32              num_entries;
         u32              buffsize;
@@ -427,7 +423,6 @@ struct tx_ring {
         int since_irq;
 };
 
-/* ADAPTER defines */
 /*
  * Do not change these values: if changed, then change also in respective
  * TXdma and Rxdma engines
@@ -576,8 +571,6 @@ struct et131x_adapter {
         struct net_device_stats net_stats;
 };
 
-/* EEPROM functions */
-
 static int eeprom_wait_ready(struct pci_dev *pdev, u32 *status)
 {
         u32 reg;
@@ -795,7 +788,7 @@ static int eeprom_read(struct et131x_adapter *adapter, u32 addr, u8 *pdata)
         return (status & LBCIF_STATUS_ACK_ERROR) ? -EIO : 0;
 }
 
-int et131x_init_eeprom(struct et131x_adapter *adapter)
+static int et131x_init_eeprom(struct et131x_adapter *adapter)
 {
         struct pci_dev *pdev = adapter->pdev;
         u8 eestatus;
@@ -868,7 +861,7 @@ int et131x_init_eeprom(struct et131x_adapter *adapter)
  * et131x_rx_dma_enable - re-start of Rx_DMA on the ET1310.
  * @adapter: pointer to our adapter structure
  */
-void et131x_rx_dma_enable(struct et131x_adapter *adapter)
+static void et131x_rx_dma_enable(struct et131x_adapter *adapter)
 {
         /* Setup the receive dma configuration register for normal operation */
         u32 csr =  0x2000;      /* FBR1 enable */
@@ -906,7 +899,7 @@ void et131x_rx_dma_enable(struct et131x_adapter *adapter)
  * et131x_rx_dma_disable - Stop of Rx_DMA on the ET1310
  * @adapter: pointer to our adapter structure
  */
-void et131x_rx_dma_disable(struct et131x_adapter *adapter)
+static void et131x_rx_dma_disable(struct et131x_adapter *adapter)
 {
         u32 csr;
         /* Setup the receive dma configuration register */
@@ -928,7 +921,7 @@ void et131x_rx_dma_disable(struct et131x_adapter *adapter)
  *
  * Mainly used after a return to the D0 (full-power) state from a lower state.
  */
-void et131x_tx_dma_enable(struct et131x_adapter *adapter)
+static void et131x_tx_dma_enable(struct et131x_adapter *adapter)
 {
         /* Setup the transmit dma configuration register for normal
          * operation
@@ -948,23 +941,10 @@ static inline void add_12bit(u32 *v, int n)
 }
 
 /**
- * nic_rx_pkts - Checks the hardware for available packets
- * @adapter: pointer to our adapter
- *
- * Returns rfd, a pointer to our MPRFD.
- *
- * Checks the hardware for available packets, using completion ring
- * If packets are available, it gets an RFD from the recv_list, attaches
- * the packet to it, puts the RFD in the RecvPendList, and also returns
- * the pointer to the RFD.
- */
-/* MAC functions */
-
-/**
  * et1310_config_mac_regs1 - Initialize the first part of MAC regs
  * @adapter: pointer to our adapter structure
  */
-void et1310_config_mac_regs1(struct et131x_adapter *adapter)
+static void et1310_config_mac_regs1(struct et131x_adapter *adapter)
 {
         struct mac_regs __iomem *macregs = &adapter->regs->mac;
         u32 station1;
@@ -1024,7 +1004,7 @@ void et1310_config_mac_regs1(struct et131x_adapter *adapter)
  * et1310_config_mac_regs2 - Initialize the second part of MAC regs
  * @adapter: pointer to our adapter structure
  */
-void et1310_config_mac_regs2(struct et131x_adapter *adapter)
+static void et1310_config_mac_regs2(struct et131x_adapter *adapter)
 {
         int32_t delay = 0;
         struct mac_regs __iomem *mac = &adapter->regs->mac;
@@ -1105,7 +1085,7 @@ void et1310_config_mac_regs2(struct et131x_adapter *adapter)
  *
  * Returns 0 if the device is not in phy coma, 1 if it is in phy coma
  */
-int et1310_in_phy_coma(struct et131x_adapter *adapter)
+static int et1310_in_phy_coma(struct et131x_adapter *adapter)
 {
         u32 pmcsr;
 
@@ -1114,15 +1094,13 @@ int et1310_in_phy_coma(struct et131x_adapter *adapter)
         return ET_PM_PHY_SW_COMA & pmcsr ? 1 : 0;
 }
 
-void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)
+static void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)
 {
         struct rxmac_regs __iomem *rxmac = &adapter->regs->rxmac;
-        uint32_t nIndex;
-        uint32_t result;
-        uint32_t hash1 = 0;
-        uint32_t hash2 = 0;
-        uint32_t hash3 = 0;
-        uint32_t hash4 = 0;
+        u32 hash1 = 0;
+        u32 hash2 = 0;
+        u32 hash3 = 0;
+        u32 hash4 = 0;
         u32 pm_csr;
 
         /* If ET131X_PACKET_TYPE_MULTICAST is specified, then we provision
@@ -1131,10 +1109,13 @@ void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)
          * driver.
          */
         if (adapter->packet_filter & ET131X_PACKET_TYPE_MULTICAST) {
+                int i;
+
                 /* Loop through our multicast array and set up the device */
-                for (nIndex = 0; nIndex < adapter->multicast_addr_count;
-                     nIndex++) {
-                        result = ether_crc(6, adapter->multicast_list[nIndex]);
+                for (i = 0; i < adapter->multicast_addr_count; i++) {
+                        u32 result;
+
+                        result = ether_crc(6, adapter->multicast_list[i]);
 
                         result = (result & 0x3F800000) >> 23;
 
@@ -1163,7 +1144,7 @@ void et1310_setup_device_for_multicast(struct et131x_adapter *adapter)
         }
 }
 
-void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)
+static void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)
 {
         struct rxmac_regs __iomem *rxmac = &adapter->regs->rxmac;
         u32 uni_pf1;
@@ -1203,7 +1184,7 @@ void et1310_setup_device_for_unicast(struct et131x_adapter *adapter)
         }
 }
 
-void et1310_config_rxmac_regs(struct et131x_adapter *adapter)
+static void et1310_config_rxmac_regs(struct et131x_adapter *adapter)
 {
         struct rxmac_regs __iomem *rxmac = &adapter->regs->rxmac;
         struct phy_device *phydev = adapter->phydev;
@@ -1334,7 +1315,7 @@ void et1310_config_rxmac_regs(struct et131x_adapter *adapter)
         writel(0x9, &rxmac->ctrl);
 }
 
-void et1310_config_txmac_regs(struct et131x_adapter *adapter)
+static void et1310_config_txmac_regs(struct et131x_adapter *adapter)
 {
         struct txmac_regs __iomem *txmac = &adapter->regs->txmac;
 
@@ -1348,7 +1329,7 @@ void et1310_config_txmac_regs(struct et131x_adapter *adapter)
                 writel(0x40, &txmac->cf_param);
 }
 
-void et1310_config_macstat_regs(struct et131x_adapter *adapter)
+static void et1310_config_macstat_regs(struct et131x_adapter *adapter)
 {
         struct macstat_regs __iomem *macstat =
                 &adapter->regs->macstat;
@@ -1422,7 +1403,7 @@ void et1310_config_macstat_regs(struct et131x_adapter *adapter)
  *
  * Returns 0 on success, errno on failure (as defined in errno.h)
  */
-int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,
+static int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,
               u8 reg, u16 *value)
 {
         struct mac_regs __iomem *mac = &adapter->regs->mac;
@@ -1478,7 +1459,7 @@ int et131x_phy_mii_read(struct et131x_adapter *adapter, u8 addr,
         return status;
 }
 
-int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)
+static int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)
 {
         struct phy_device *phydev = adapter->phydev;
 
@@ -1498,7 +1479,7 @@ int et131x_mii_read(struct et131x_adapter *adapter, u8 reg, u16 *value)
  *
  * Return 0 on success, errno on failure (as defined in errno.h)
  */
-int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)
+static int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)
 {
         struct mac_regs __iomem *mac = &adapter->regs->mac;
         struct phy_device *phydev = adapter->phydev;
@@ -1564,8 +1545,9 @@ int et131x_mii_write(struct et131x_adapter *adapter, u8 reg, u16 value)
 }
 
 /* Still used from _mac for BIT_READ */
-void et1310_phy_access_mii_bit(struct et131x_adapter *adapter, u16 action,
-                               u16 regnum, u16 bitnum, u8 *value)
+static void et1310_phy_access_mii_bit(struct et131x_adapter *adapter,
+                                      u16 action, u16 regnum, u16 bitnum,
+                                      u8 *value)
 {
         u16 reg;
         u16 mask = 0x0001 << bitnum;
@@ -1591,7 +1573,7 @@ void et1310_phy_access_mii_bit(struct et131x_adapter *adapter, u16 action,
         }
 }
 
-void et1310_config_flow_control(struct et131x_adapter *adapter)
+static void et1310_config_flow_control(struct et131x_adapter *adapter)
 {
         struct phy_device *phydev = adapter->phydev;
 
@@ -1632,7 +1614,7 @@ void et1310_config_flow_control(struct et131x_adapter *adapter)
  * et1310_update_macstat_host_counters - Update the local copy of the statistics
  * @adapter: pointer to the adapter structure
  */
-void et1310_update_macstat_host_counters(struct et131x_adapter *adapter)
+static void et1310_update_macstat_host_counters(struct et131x_adapter *adapter)
 {
         struct ce_stats *stats = &adapter->stats;
         struct macstat_regs __iomem *macstat =
@@ -1664,7 +1646,7 @@ void et1310_update_macstat_host_counters(struct et131x_adapter *adapter)
  * the statistics held in the adapter structure, checking the "wrap"
  * bit for each counter.
  */
-void et1310_handle_macstat_interrupt(struct et131x_adapter *adapter)
+static void et1310_handle_macstat_interrupt(struct et131x_adapter *adapter)
 {
         u32 carry_reg1;
         u32 carry_reg2;
@@ -1714,9 +1696,7 @@ void et1310_handle_macstat_interrupt(struct et131x_adapter *adapter)
                 adapter->stats.tx_collisions    += COUNTER_WRAP_12_BIT;
 }
 
-/* PHY functions */
-
-int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg)
+static int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg)
 {
         struct net_device *netdev = bus->priv;
         struct et131x_adapter *adapter = netdev_priv(netdev);
@@ -1731,7 +1711,7 @@ int et131x_mdio_read(struct mii_bus *bus, int phy_addr, int reg)
                 return value;
 }
 
-int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 value)
+static int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 value)
 {
         struct net_device *netdev = bus->priv;
         struct et131x_adapter *adapter = netdev_priv(netdev);
@@ -1739,7 +1719,7 @@ int et131x_mdio_write(struct mii_bus *bus, int phy_addr, int reg, u16 value)
         return et131x_mii_write(adapter, reg, value);
 }
 
-int et131x_mdio_reset(struct mii_bus *bus)
+static int et131x_mdio_reset(struct mii_bus *bus)
 {
         struct net_device *netdev = bus->priv;
         struct et131x_adapter *adapter = netdev_priv(netdev);
@@ -1759,7 +1739,7 @@ int et131x_mdio_reset(struct mii_bus *bus)
  *      Can't you see that this code processed
  *      Phy power, phy power..
  */
-void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)
+static void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)
 {
         u16 data;
 
@@ -1775,7 +1755,7 @@ void et1310_phy_power_down(struct et131x_adapter *adapter, bool down)
  * @adapter: pointer to our private adapter structure
  *
  */
-void et131x_xcvr_init(struct et131x_adapter *adapter)
+static void et131x_xcvr_init(struct et131x_adapter *adapter)
 {
         u16 imr;
         u16 isr;
@@ -1822,7 +1802,7 @@ void et131x_xcvr_init(struct et131x_adapter *adapter)
  *
  * Used to configure the global registers on the JAGCore
  */
-void et131x_configure_global_regs(struct et131x_adapter *adapter)
+static void et131x_configure_global_regs(struct et131x_adapter *adapter)
 {
         struct global_regs __iomem *regs = &adapter->regs->global;
 
@@ -1863,13 +1843,11 @@ void et131x_configure_global_regs(struct et131x_adapter *adapter)
         writel(0, &regs->watchdog_timer);
 }
 
-/* PM functions */
-
 /**
  * et131x_config_rx_dma_regs - Start of Rx_DMA init sequence
  * @adapter: pointer to our adapter structure
  */
-void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)
+static void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)
 {
         struct rxdma_regs __iomem *rx_dma = &adapter->regs->rxdma;
         struct rx_ring *rx_local = &adapter->rx_ring;
@@ -1987,7 +1965,7 @@ void et131x_config_rx_dma_regs(struct et131x_adapter *adapter)
  * Configure the transmit engine with the ring buffers we have created
  * and prepare it for use.
  */
-void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)
+static void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)
 {
         struct txdma_regs __iomem *txdma = &adapter->regs->txdma;
 
@@ -2017,7 +1995,7 @@ void et131x_config_tx_dma_regs(struct et131x_adapter *adapter)
  *
  * Returns 0 on success, errno on failure (as defined in errno.h)
  */
-void et131x_adapter_setup(struct et131x_adapter *adapter)
+static void et131x_adapter_setup(struct et131x_adapter *adapter)
 {
         /* Configure the JAGCore */
         et131x_configure_global_regs(adapter);
@@ -2044,7 +2022,7 @@ void et131x_adapter_setup(struct et131x_adapter *adapter)
  * et131x_soft_reset - Issue a soft reset to the hardware, complete for ET1310
  * @adapter: pointer to our private adapter structure
  */
-void et131x_soft_reset(struct et131x_adapter *adapter)
+static void et131x_soft_reset(struct et131x_adapter *adapter)
 {
         /* Disable MAC Core */
         writel(0xc00f0000, &adapter->regs->mac.cfg1);
@@ -2062,7 +2040,7 @@ void et131x_soft_reset(struct et131x_adapter *adapter)
  *      Enable the appropriate interrupts on the ET131x according to our
  *      configuration
  */
-void et131x_enable_interrupts(struct et131x_adapter *adapter)
+static void et131x_enable_interrupts(struct et131x_adapter *adapter)
 {
         u32 mask;
 
@@ -2082,7 +2060,7 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)
  *
  *      Block all interrupts from the et131x device at the device itself
  */
-void et131x_disable_interrupts(struct et131x_adapter *adapter)
+static void et131x_disable_interrupts(struct et131x_adapter *adapter)
 {
         /* Disable all global interrupts */
         writel(INT_MASK_DISABLE, &adapter->regs->global.int_mask);
@@ -2092,7 +2070,7 @@ void et131x_disable_interrupts(struct et131x_adapter *adapter)
  * et131x_tx_dma_disable - Stop of Tx_DMA on the ET1310
  * @adapter: pointer to our adapter structure
  */
-void et131x_tx_dma_disable(struct et131x_adapter *adapter)
+static void et131x_tx_dma_disable(struct et131x_adapter *adapter)
 {
         /* Setup the tramsmit dma configuration register */
         writel(ET_TXDMA_CSR_HALT|ET_TXDMA_SNGL_EPKT,
@@ -2103,7 +2081,7 @@ void et131x_tx_dma_disable(struct et131x_adapter *adapter)
  * et131x_enable_txrx - Enable tx/rx queues
  * @netdev: device to be enabled
  */
-void et131x_enable_txrx(struct net_device *netdev)
+static void et131x_enable_txrx(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
@@ -2123,7 +2101,7 @@ void et131x_enable_txrx(struct net_device *netdev)
  * et131x_disable_txrx - Disable tx/rx queues
  * @netdev: device to be disabled
  */
-void et131x_disable_txrx(struct net_device *netdev)
+static void et131x_disable_txrx(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
@@ -2142,7 +2120,7 @@ void et131x_disable_txrx(struct net_device *netdev)
  * et131x_init_send - Initialize send data structures
  * @adapter: pointer to our private adapter structure
  */
-void et131x_init_send(struct et131x_adapter *adapter)
+static void et131x_init_send(struct et131x_adapter *adapter)
 {
         struct tcb *tcb;
         u32 ct;
@@ -2192,7 +2170,7 @@ void et131x_init_send(struct et131x_adapter *adapter)
  *       indicating linkup status, call the MPDisablePhyComa routine to
  *             restore JAGCore and gigE PHY
  */
-void et1310_enable_phy_coma(struct et131x_adapter *adapter)
+static void et1310_enable_phy_coma(struct et131x_adapter *adapter)
 {
         unsigned long flags;
         u32 pmcsr;
@@ -2231,7 +2209,7 @@ void et1310_enable_phy_coma(struct et131x_adapter *adapter)
  * et1310_disable_phy_coma - Disable the Phy Coma Mode
  * @adapter: pointer to our adapter structure
  */
-void et1310_disable_phy_coma(struct et131x_adapter *adapter)
+static void et1310_disable_phy_coma(struct et131x_adapter *adapter)
 {
         u32 pmcsr;
 
@@ -2269,8 +2247,6 @@ void et1310_disable_phy_coma(struct et131x_adapter *adapter)
         et131x_enable_txrx(adapter->netdev);
 }
 
-/* RX functions */
-
 static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)
 {
         u32 tmp_free_buff_ring = *free_buff_ring;
@@ -2296,16 +2272,14 @@ static inline u32 bump_free_buff_ring(u32 *free_buff_ring, u32 limit)
  * @offset: pointer to the offset variable
  * @mask: correct mask
  */
-void et131x_align_allocated_memory(struct et131x_adapter *adapter,
-                                   uint64_t *phys_addr,
-                                   uint64_t *offset, uint64_t mask)
+static void et131x_align_allocated_memory(struct et131x_adapter *adapter,
+                                          u64 *phys_addr, u64 *offset,
+                                          u64 mask)
 {
-        uint64_t new_addr;
+        u64 new_addr = *phys_addr & ~mask;
 
         *offset = 0;
 
-        new_addr = *phys_addr & ~mask;
-
         if (new_addr != *phys_addr) {
                 /* Move to next aligned block */
                 new_addr += mask + 1;
@@ -2325,7 +2299,7 @@ void et131x_align_allocated_memory(struct et131x_adapter *adapter,
  * Allocates Free buffer ring 1 for sure, free buffer ring 0 if required,
  * and the Packet Status Ring.
  */
-int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
+static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 {
         u32 i, j;
         u32 bufsize;
@@ -2454,8 +2428,8 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
                         rx_ring->fbr[1]->offset);
 #endif
         for (i = 0; i < (rx_ring->fbr[0]->num_entries / FBR_CHUNKS); i++) {
-                u64 fbr1_offset;
                 u64 fbr1_tmp_physaddr;
+                u64 fbr1_offset;
                 u32 fbr1_align;
 
                 /* This code allocates an area of memory big enough for N
@@ -2520,8 +2494,8 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 #ifdef USE_FBR0
         /* Same for FBR0 (if in use) */
         for (i = 0; i < (rx_ring->fbr[1]->num_entries / FBR_CHUNKS); i++) {
-                u64 fbr0_offset;
                 u64 fbr0_tmp_physaddr;
+                u64 fbr0_offset;
 
                 fbr_chunksize =
                     ((FBR_CHUNKS + 1) * rx_ring->fbr[1]->buffsize) - 1;
@@ -2629,7 +2603,7 @@ int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
  * et131x_rx_dma_memory_free - Free all memory allocated within this module.
  * @adapter: pointer to our private adapter structure
  */
-void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
+static void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
 {
         u32 index;
         u32 bufsize;
@@ -2774,7 +2748,7 @@ void et131x_rx_dma_memory_free(struct et131x_adapter *adapter)
  *
  * Returns 0 on success and errno on failure (as defined in errno.h)
  */
-int et131x_init_recv(struct et131x_adapter *adapter)
+static int et131x_init_recv(struct et131x_adapter *adapter)
 {
         int status = -ENOMEM;
         struct rfd *rfd = NULL;
@@ -2824,7 +2798,7 @@ int et131x_init_recv(struct et131x_adapter *adapter)
  * et131x_set_rx_dma_timer - Set the heartbeat timer according to line rate.
  * @adapter: pointer to our adapter structure
  */
-void et131x_set_rx_dma_timer(struct et131x_adapter *adapter)
+static void et131x_set_rx_dma_timer(struct et131x_adapter *adapter)
 {
         struct phy_device *phydev = adapter->phydev;
 
@@ -2918,6 +2892,17 @@ static void nic_return_rfd(struct et131x_adapter *adapter, struct rfd *rfd)
         WARN_ON(rx_local->num_ready_recv > rx_local->num_rfd);
 }
 
+/**
+ * nic_rx_pkts - Checks the hardware for available packets
+ * @adapter: pointer to our adapter
+ *
+ * Returns rfd, a pointer to our MPRFD.
+ *
+ * Checks the hardware for available packets, using completion ring
+ * If packets are available, it gets an RFD from the recv_list, attaches
+ * the packet to it, puts the RFD in the RecvPendList, and also returns
+ * the pointer to the RFD.
+ */
 static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
 {
         struct rx_ring *rx_local = &adapter->rx_ring;
@@ -3139,7 +3124,7 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
  *
  * Assumption, Rcv spinlock has been acquired.
  */
-void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
+static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
 {
         struct rfd *rfd = NULL;
         u32 count = 0;
@@ -3188,8 +3173,6 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
                 adapter->rx_ring.unfinished_receives = false;
 }
 
-/* TX functions */
-
 /**
  * et131x_tx_dma_memory_alloc
  * @adapter: pointer to our private adapter structure
@@ -3202,7 +3185,7 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *adapter)
  * memory. The device will update the "status" in memory each time it xmits a
  * packet.
  */
-int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
+static int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
 {
         int desc_size = 0;
         struct tx_ring *tx_ring = &adapter->tx_ring;
@@ -3256,7 +3239,7 @@ int et131x_tx_dma_memory_alloc(struct et131x_adapter *adapter)
  *
  * Returns 0 on success and errno on failure (as defined in errno.h).
  */
-void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
+static void et131x_tx_dma_memory_free(struct et131x_adapter *adapter)
 {
         int desc_size = 0;
 
@@ -3578,7 +3561,7 @@ static int send_packet(struct sk_buff *skb, struct et131x_adapter *adapter)
  *
  * Return 0 in almost all cases; non-zero value in extreme hard failure only
  */
-int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
+static int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
 {
         int status = 0;
         struct et131x_adapter *adapter = netdev_priv(netdev);
@@ -3696,7 +3679,7 @@ static inline void free_send_packet(struct et131x_adapter *adapter,
  *
  * Assumption - Send spinlock has been acquired
  */
-void et131x_free_busy_send_packets(struct et131x_adapter *adapter)
+static void et131x_free_busy_send_packets(struct et131x_adapter *adapter)
 {
         struct tcb *tcb;
         unsigned long flags;
@@ -3743,7 +3726,7 @@ void et131x_free_busy_send_packets(struct et131x_adapter *adapter)
  *
  * Assumption - Send spinlock has been acquired
  */
-void et131x_handle_send_interrupt(struct et131x_adapter *adapter)
+static void et131x_handle_send_interrupt(struct et131x_adapter *adapter)
 {
         unsigned long flags;
         u32 serviced;
@@ -3798,8 +3781,6 @@ void et131x_handle_send_interrupt(struct et131x_adapter *adapter)
         spin_unlock_irqrestore(&adapter->tcb_send_qlock, flags);
 }
 
-/* ETHTOOL functions */
-
 static int et131x_get_settings(struct net_device *netdev,
                                struct ethtool_cmd *cmd)
 {
@@ -3965,18 +3946,16 @@ static struct ethtool_ops et131x_ethtool_ops = {
         .get_link = ethtool_op_get_link,
 };
 
-void et131x_set_ethtool_ops(struct net_device *netdev)
+static void et131x_set_ethtool_ops(struct net_device *netdev)
 {
         SET_ETHTOOL_OPS(netdev, &et131x_ethtool_ops);
 }
 
-/* PCI functions */
-
 /**
  * et131x_hwaddr_init - set up the MAC Address on the ET1310
  * @adapter: pointer to our private adapter structure
  */
-void et131x_hwaddr_init(struct et131x_adapter *adapter)
+static void et131x_hwaddr_init(struct et131x_adapter *adapter)
 {
         /* If have our default mac from init and no mac address from
          * EEPROM then we need to generate the last octet and set it on the
@@ -4022,24 +4001,31 @@ void et131x_hwaddr_init(struct et131x_adapter *adapter)
 static int et131x_pci_init(struct et131x_adapter *adapter,
                                                 struct pci_dev *pdev)
 {
-        int i;
-        u8 max_payload;
-        u8 read_size_reg;
+        int cap = pci_pcie_cap(pdev);
+        u16 max_payload;
+        u16 ctl;
+        int i, rc;
 
-        if (et131x_init_eeprom(adapter) < 0)
-                return -EIO;
+        rc = et131x_init_eeprom(adapter);
+        if (rc < 0)
+                goto out;
 
+        if (!cap) {
+                dev_err(&pdev->dev, "Missing PCIe capabilities\n");
+                goto err_out;
+        }
+                
         /* Let's set up the PORT LOGIC Register.  First we need to know what
          * the max_payload_size is
          */
-        if (pci_read_config_byte(pdev, ET1310_PCI_MAX_PYLD, &max_payload)) {
+        if (pci_read_config_word(pdev, cap + PCI_EXP_DEVCAP, &max_payload)) {
                 dev_err(&pdev->dev,
                     "Could not read PCI config space for Max Payload Size\n");
-                return -EIO;
+                goto err_out;
         }
 
         /* Program the Ack/Nak latency and replay timers */
-        max_payload &= 0x07;    /* Only the lower 3 bits are valid */
+        max_payload &= 0x07;
 
         if (max_payload < 2) {
                 static const u16 acknak[2] = { 0x76, 0xD0 };
@@ -4049,13 +4035,13 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
                                                acknak[max_payload])) {
                         dev_err(&pdev->dev,
                           "Could not write PCI config space for ACK/NAK\n");
-                        return -EIO;
+                        goto err_out;
                 }
                 if (pci_write_config_word(pdev, ET1310_PCI_REPLAY,
                                                replay[max_payload])) {
                         dev_err(&pdev->dev,
                           "Could not write PCI config space for Replay Timer\n");
-                        return -EIO;
+                        goto err_out;
                 }
         }
 
@@ -4065,23 +4051,22 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
         if (pci_write_config_byte(pdev, ET1310_PCI_L0L1LATENCY, 0x11)) {
                 dev_err(&pdev->dev,
                   "Could not write PCI config space for Latency Timers\n");
-                return -EIO;
+                goto err_out;
         }
 
         /* Change the max read size to 2k */
-        if (pci_read_config_byte(pdev, 0x51, &read_size_reg)) {
+        if (pci_read_config_word(pdev, cap + PCI_EXP_DEVCTL, &ctl)) {
                 dev_err(&pdev->dev,
                         "Could not read PCI config space for Max read size\n");
-                return -EIO;
+                goto err_out;
         }
 
-        read_size_reg &= 0x8f;
-        read_size_reg |= 0x40;
+        ctl = (ctl & ~PCI_EXP_DEVCTL_READRQ) | ( 0x04 << 12);
 
-        if (pci_write_config_byte(pdev, 0x51, read_size_reg)) {
+        if (pci_write_config_word(pdev, cap + PCI_EXP_DEVCTL, ctl)) {
                 dev_err(&pdev->dev,
                       "Could not write PCI config space for Max read size\n");
-                return -EIO;
+                goto err_out;
         }
 
         /* Get MAC address from config space if an eeprom exists, otherwise
@@ -4096,11 +4081,15 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
                 if (pci_read_config_byte(pdev, ET1310_PCI_MAC_ADDRESS + i,
                                         adapter->rom_addr + i)) {
                         dev_err(&pdev->dev, "Could not read PCI config space for MAC address\n");
-                        return -EIO;
+                        goto err_out;
                 }
         }
         memcpy(adapter->addr, adapter->rom_addr, ETH_ALEN);
-        return 0;
+out:
+        return rc;
+err_out:
+        rc = -EIO;
+        goto out;
 }
 
 /**
@@ -4110,7 +4099,7 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
  * The routine called when the error timer expires, to track the number of
  * recurring errors.
  */
-void et131x_error_timer_handler(unsigned long data)
+static void et131x_error_timer_handler(unsigned long data)
 {
         struct et131x_adapter *adapter = (struct et131x_adapter *) data;
         struct phy_device *phydev = adapter->phydev;
@@ -4153,7 +4142,7 @@ void et131x_error_timer_handler(unsigned long data)
  *
  * Allocate all the memory blocks for send, receive and others.
  */
-int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)
+static int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)
 {
         int status;
 
@@ -4188,7 +4177,7 @@ int et131x_adapter_memory_alloc(struct et131x_adapter *adapter)
  * et131x_adapter_memory_free - Free all memory allocated for use by Tx & Rx
  * @adapter: pointer to our private adapter structure
  */
-void et131x_adapter_memory_free(struct et131x_adapter *adapter)
+static void et131x_adapter_memory_free(struct et131x_adapter *adapter)
 {
         /* Free DMA memory */
         et131x_tx_dma_memory_free(adapter);
@@ -4364,10 +4353,6 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
         adapter->pdev = pci_dev_get(pdev);
         adapter->netdev = netdev;
 
-        /* Do the same for the netdev struct */
-        netdev->irq = pdev->irq;
-        netdev->base_addr = pci_resource_start(pdev, 0);
-
         /* Initialize spinlocks here */
         spin_lock_init(&adapter->lock);
         spin_lock_init(&adapter->tcb_send_qlock);
@@ -4400,6 +4385,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev)
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
         unregister_netdev(netdev);
+        phy_disconnect(adapter->phydev);
         mdiobus_unregister(adapter->mii_bus);
         kfree(adapter->mii_bus->irq);
         mdiobus_free(adapter->mii_bus);
@@ -4417,7 +4403,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev)
  * et131x_up - Bring up a device for use.
  * @netdev: device to be opened
  */
-void et131x_up(struct net_device *netdev)
+static void et131x_up(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
@@ -4429,7 +4415,7 @@ void et131x_up(struct net_device *netdev)
  * et131x_down - Bring down the device
  * @netdev: device to be broght down
  */
-void et131x_down(struct net_device *netdev)
+static void et131x_down(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
@@ -4475,8 +4461,6 @@ static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume);
 #define ET131X_PM_OPS NULL
 #endif
 
-/* ISR functions */
-
 /**
  * et131x_isr - The Interrupt Service Routine for the driver.
  * @irq: the IRQ on which the interrupt was received.
@@ -4573,7 +4557,7 @@ out:
  * scheduled to run in a deferred context by the ISR. This is where the ISR's
  * work actually gets done.
  */
-void et131x_isr_handler(struct work_struct *work)
+static void et131x_isr_handler(struct work_struct *work)
 {
         struct et131x_adapter *adapter =
                 container_of(work, struct et131x_adapter, task);
@@ -4774,8 +4758,6 @@ void et131x_isr_handler(struct work_struct *work)
         et131x_enable_interrupts(adapter);
 }
 
-/* NETDEV functions */
-
 /**
  * et131x_stats - Return the current device statistics.
  * @netdev: device whose stats are being queried
@@ -4829,10 +4811,12 @@ static struct net_device_stats *et131x_stats(struct net_device *netdev)
  *
  * Returns 0 on success, errno on failure (as defined in errno.h)
  */
-int et131x_open(struct net_device *netdev)
+static int et131x_open(struct net_device *netdev)
 {
-        int result = 0;
         struct et131x_adapter *adapter = netdev_priv(netdev);
+        struct pci_dev *pdev = adapter->pdev;
+        unsigned int irq = pdev->irq;
+        int result;
 
         /* Start the timer to track NIC errors */
         init_timer(&adapter->error_timer);
@@ -4841,12 +4825,9 @@ int et131x_open(struct net_device *netdev)
         adapter->error_timer.data = (unsigned long)adapter;
         add_timer(&adapter->error_timer);
 
-        /* Register our IRQ */
-        result = request_irq(netdev->irq, et131x_isr, IRQF_SHARED,
-                                        netdev->name, netdev);
+        result = request_irq(irq, et131x_isr, IRQF_SHARED, netdev->name, netdev);
         if (result) {
-                dev_err(&adapter->pdev->dev, "could not register IRQ %d\n",
-                        netdev->irq);
+                dev_err(&pdev->dev, "could not register IRQ %d\n", irq);
                 return result;
         }
 
@@ -4863,14 +4844,14 @@ int et131x_open(struct net_device *netdev)
  *
  * Returns 0 on success, errno on failure (as defined in errno.h)
  */
-int et131x_close(struct net_device *netdev)
+static int et131x_close(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
 
         et131x_down(netdev);
 
         adapter->flags &= ~fMP_ADAPTER_INTERRUPT_IN_USE;
-        free_irq(netdev->irq, netdev);
+        free_irq(adapter->pdev->irq, netdev);
 
         /* Stop the error timer */
         return del_timer_sync(&adapter->error_timer);
@@ -4905,8 +4886,8 @@ static int et131x_ioctl(struct net_device *netdev, struct ifreq *reqbuf,
  */
 static int et131x_set_packet_filter(struct et131x_adapter *adapter)
 {
+        int filter = adapter->packet_filter;
         int status = 0;
-        uint32_t filter = adapter->packet_filter;
         u32 ctrl;
         u32 pf_ctrl;
 
@@ -4968,7 +4949,7 @@ static int et131x_set_packet_filter(struct et131x_adapter *adapter)
 static void et131x_multicast(struct net_device *netdev)
 {
         struct et131x_adapter *adapter = netdev_priv(netdev);
-        uint32_t packet_filter = 0;
+        int packet_filter;
         unsigned long flags;
         struct netdev_hw_addr *ha;
         int i;
@@ -5249,40 +5230,6 @@ static const struct net_device_ops et131x_netdev_ops = {
 };
 
 /**
- * et131x_device_alloc
- *
- * Returns pointer to the allocated and initialized net_device struct for
- * this device.
- *
- * Create instances of net_device and wl_private for the new adapter and
- * register the device's entry points in the net_device structure.
- */
-struct net_device *et131x_device_alloc(void)
-{
-        struct net_device *netdev;
-
-        /* Alloc net_device and adapter structs */
-        netdev = alloc_etherdev(sizeof(struct et131x_adapter));
-
-        if (!netdev) {
-                printk(KERN_ERR "et131x: Alloc of net_device struct failed\n");
-                return NULL;
-        }
-
-        /*
-         * Setup the function registration table (and other data) for a
-         * net_device
-         */
-        netdev->watchdog_timeo = ET131X_TX_TIMEOUT;
-        netdev->netdev_ops     = &et131x_netdev_ops;
-
-        /* Poll? */
-        /* netdev->poll               = &et131x_poll; */
-        /* netdev->poll_controller    = &et131x_poll_controller; */
-        return netdev;
-}
-
-/**
  * et131x_pci_setup - Perform device initialization
  * @pdev: a pointer to the device's pci_dev structure
  * @ent: this device's entry in the pci_device_id table
@@ -5297,24 +5244,26 @@ struct net_device *et131x_device_alloc(void)
 static int __devinit et131x_pci_setup(struct pci_dev *pdev,
                                const struct pci_device_id *ent)
 {
-        int result;
         struct net_device *netdev;
         struct et131x_adapter *adapter;
+        int rc;
         int ii;
 
-        result = pci_enable_device(pdev);
-        if (result) {
+        rc = pci_enable_device(pdev);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "pci_enable_device() failed\n");
-                goto err_out;
+                goto out;
         }
 
         /* Perform some basic PCI checks */
         if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
                 dev_err(&pdev->dev, "Can't find PCI device's base address\n");
+                rc = -ENODEV;
                 goto err_disable;
         }
 
-        if (pci_request_regions(pdev, DRIVER_NAME)) {
+        rc = pci_request_regions(pdev, DRIVER_NAME);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "Can't get PCI resources\n");
                 goto err_disable;
         }
@@ -5323,46 +5272,50 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
 
         /* Check the DMA addressing support of this device */
         if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {
-                result = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-                if (result) {
+                rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
+                if (rc < 0) {
                         dev_err(&pdev->dev,
                           "Unable to obtain 64 bit DMA for consistent allocations\n");
                         goto err_release_res;
                 }
         } else if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
-                result = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-                if (result) {
+                rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+                if (rc < 0) {
                         dev_err(&pdev->dev,
                           "Unable to obtain 32 bit DMA for consistent allocations\n");
                         goto err_release_res;
                 }
         } else {
                 dev_err(&pdev->dev, "No usable DMA addressing method\n");
-                result = -EIO;
+                rc = -EIO;
                 goto err_release_res;
         }
 
         /* Allocate netdev and private adapter structs */
-        netdev = et131x_device_alloc();
+        netdev = alloc_etherdev(sizeof(struct et131x_adapter));
         if (!netdev) {
                 dev_err(&pdev->dev, "Couldn't alloc netdev struct\n");
-                result = -ENOMEM;
+                rc = -ENOMEM;
                 goto err_release_res;
         }
 
+        netdev->watchdog_timeo = ET131X_TX_TIMEOUT;
+        netdev->netdev_ops     = &et131x_netdev_ops;
+
         SET_NETDEV_DEV(netdev, &pdev->dev);
         et131x_set_ethtool_ops(netdev);
 
         adapter = et131x_adapter_init(netdev, pdev);
 
-        /* Initialise the PCI setup for the device */
-        et131x_pci_init(adapter, pdev);
+        rc = et131x_pci_init(adapter, pdev);
+        if (rc < 0)
+                goto err_free_dev;
 
         /* Map the bus-relative registers to system virtual memory */
         adapter->regs = pci_ioremap_bar(pdev, 0);
         if (!adapter->regs) {
                 dev_err(&pdev->dev, "Cannot map device registers\n");
-                result = -ENOMEM;
+                rc = -ENOMEM;
                 goto err_free_dev;
         }
 
@@ -5376,8 +5329,8 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
         et131x_disable_interrupts(adapter);
 
         /* Allocate DMA memory */
-        result = et131x_adapter_memory_alloc(adapter);
-        if (result) {
+        rc = et131x_adapter_memory_alloc(adapter);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "Could not alloc adapater memory (DMA)\n");
                 goto err_iounmap;
         }
@@ -5395,6 +5348,8 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
         adapter->boot_coma = 0;
         et1310_disable_phy_coma(adapter);
 
+        rc = -ENOMEM;
+
         /* Setup the mii_bus struct */
         adapter->mii_bus = mdiobus_alloc();
         if (!adapter->mii_bus) {
@@ -5418,13 +5373,14 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
         for (ii = 0; ii < PHY_MAX_ADDR; ii++)
                 adapter->mii_bus->irq[ii] = PHY_POLL;
 
-        if (mdiobus_register(adapter->mii_bus)) {
+        rc = mdiobus_register(adapter->mii_bus);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "failed to register MII bus\n");
-                mdiobus_free(adapter->mii_bus);
                 goto err_mdio_free_irq;
         }
 
-        if (et131x_mii_probe(netdev)) {
+        rc = et131x_mii_probe(netdev);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "failed to probe MII bus\n");
                 goto err_mdio_unregister;
         }
@@ -5440,10 +5396,10 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
          */
 
         /* Register the net_device struct with the Linux network layer */
-        result = register_netdev(netdev);
-        if (result != 0) {
+        rc = register_netdev(netdev);
+        if (rc < 0) {
                 dev_err(&pdev->dev, "register_netdev() failed\n");
-                goto err_mdio_unregister;
+                goto err_phy_disconnect;
         }
 
         /* Register the net_device struct with the PCI subsystem. Save a copy
@@ -5451,10 +5407,11 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
          * been initialized, just in case it needs to be quickly restored.
          */
         pci_set_drvdata(pdev, netdev);
-        pci_save_state(adapter->pdev);
-
-        return result;
+out:
+        return rc;
 
+err_phy_disconnect:
+        phy_disconnect(adapter->phydev);
 err_mdio_unregister:
         mdiobus_unregister(adapter->mii_bus);
 err_mdio_free_irq:
@@ -5472,8 +5429,7 @@ err_release_res:
         pci_release_regions(pdev);
 err_disable:
         pci_disable_device(pdev);
-err_out:
-        return result;
+        goto out;
 }
 
 static DEFINE_PCI_DEVICE_TABLE(et131x_pci_table) = {
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index c263284ddc0e..cf47a5d191fc 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -199,7 +199,7 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev)
                 struct usb_interface *intf = to_usb_interface(dev);     \
                 struct usb_tranzport *t = usb_get_intfdata(intf);       \
                 unsigned long temp;     \
-                if (strict_strtoul(buf, 10, &temp))     \
+                if (kstrtoul(buf, 10, &temp))   \
                         return -EINVAL; \
                 t->value = temp;        \
                 return count;   \
diff --git a/drivers/staging/gma500/Kconfig b/drivers/staging/gma500/Kconfig
index bfe2166acda6..c7a2b3bc0a18 100644
--- a/drivers/staging/gma500/Kconfig
+++ b/drivers/staging/gma500/Kconfig
@@ -1,6 +1,6 @@
 config DRM_PSB
         tristate "Intel GMA5/600 KMS Framebuffer"
-        depends on DRM && PCI && X86
+        depends on DRM && PCI && X86 && BROKEN
         select FB_CFB_COPYAREA
         select FB_CFB_FILLRECT
         select FB_CFB_IMAGEBLIT
diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
index 436fe9733b16..408257038335 100644
--- a/drivers/staging/gma500/power.c
+++ b/drivers/staging/gma500/power.c
@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
         ret = gma_resume_pci(dev->pdev);
         if (ret == 0) {
                 /* FIXME: we want to defer this for Medfield/Oaktrail */
-                gma_resume_display(dev);
+                gma_resume_display(dev->pdev);
                 psb_irq_preinstall(dev);
                 psb_irq_postinstall(dev);
                 pm_runtime_get(&dev->pdev->dev);
diff --git a/drivers/staging/hv/Kconfig b/drivers/staging/hv/Kconfig
index 072185ebe95b..60ac479a2909 100644
--- a/drivers/staging/hv/Kconfig
+++ b/drivers/staging/hv/Kconfig
@@ -3,15 +3,3 @@ config HYPERV_STORAGE
         depends on HYPERV && SCSI
         help
          Select this option to enable the Hyper-V virtual storage driver.
-
-config HYPERV_NET
-        tristate "Microsoft Hyper-V virtual network driver"
-        depends on HYPERV && NET
-        help
-          Select this option to enable the Hyper-V virtual network driver.
-
-config HYPERV_MOUSE
-        tristate "Microsoft Hyper-V mouse driver"
-        depends on HYPERV && HID
-        help
-          Select this option to enable the Hyper-V mouse driver.
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index 0f55ceee919b..af95a6b7e436 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -1,6 +1,3 @@
 obj-$(CONFIG_HYPERV_STORAGE)    += hv_storvsc.o
-obj-$(CONFIG_HYPERV_NET)        += hv_netvsc.o
-obj-$(CONFIG_HYPERV_MOUSE)      += hv_mouse.o
 
 hv_storvsc-y := storvsc_drv.o
-hv_netvsc-y := netvsc_drv.o netvsc.o rndis_filter.o
diff --git a/drivers/staging/hv/TODO b/drivers/staging/hv/TODO
index ed4d63619df2..dea7d92dfdc1 100644
--- a/drivers/staging/hv/TODO
+++ b/drivers/staging/hv/TODO
@@ -1,7 +1,5 @@
 TODO:
-        - audit the network driver
         - audit the scsi driver
 
 Please send patches for this code to Greg Kroah-Hartman <gregkh@suse.de>,
-Hank Janssen <hjanssen@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>,
-K. Y. Srinivasan <kys@microsoft.com>
+Haiyang Zhang <haiyangz@microsoft.com>, and K. Y. Srinivasan <kys@microsoft.com>
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
deleted file mode 100644
index ccd39c70c527..000000000000
--- a/drivers/staging/hv/hv_mouse.c
+++ /dev/null
@@ -1,599 +0,0 @@
-/*
- *  Copyright (c) 2009, Citrix Systems, Inc.
- *  Copyright (c) 2010, Microsoft Corporation.
- *  Copyright (c) 2011, Novell Inc.
- *
- *  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.
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/device.h>
-#include <linux/workqueue.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/input.h>
-#include <linux/hid.h>
-#include <linux/hiddev.h>
-#include <linux/hyperv.h>
-
-
-struct hv_input_dev_info {
-        unsigned int size;
-        unsigned short vendor;
-        unsigned short product;
-        unsigned short version;
-        unsigned short reserved[11];
-};
-
-/* The maximum size of a synthetic input message. */
-#define SYNTHHID_MAX_INPUT_REPORT_SIZE 16
-
-/*
- * Current version
- *
- * History:
- * Beta, RC < 2008/1/22        1,0
- * RC > 2008/1/22              2,0
- */
-#define SYNTHHID_INPUT_VERSION_MAJOR    2
-#define SYNTHHID_INPUT_VERSION_MINOR    0
-#define SYNTHHID_INPUT_VERSION          (SYNTHHID_INPUT_VERSION_MINOR | \
-                                         (SYNTHHID_INPUT_VERSION_MAJOR << 16))
-
-
-#pragma pack(push, 1)
-/*
- * Message types in the synthetic input protocol
- */
-enum synthhid_msg_type {
-        SYNTH_HID_PROTOCOL_REQUEST,
-        SYNTH_HID_PROTOCOL_RESPONSE,
-        SYNTH_HID_INITIAL_DEVICE_INFO,
-        SYNTH_HID_INITIAL_DEVICE_INFO_ACK,
-        SYNTH_HID_INPUT_REPORT,
-        SYNTH_HID_MAX
-};
-
-/*
- * Basic message structures.
- */
-struct synthhid_msg_hdr {
-        enum synthhid_msg_type type;
-        u32 size;
-};
-
-struct synthhid_msg {
-        struct synthhid_msg_hdr header;
-        char data[1]; /* Enclosed message */
-};
-
-union synthhid_version {
-        struct {
-                u16 minor_version;
-                u16 major_version;
-        };
-        u32 version;
-};
-
-/*
- * Protocol messages
- */
-struct synthhid_protocol_request {
-        struct synthhid_msg_hdr header;
-        union synthhid_version version_requested;
-};
-
-struct synthhid_protocol_response {
-        struct synthhid_msg_hdr header;
-        union synthhid_version version_requested;
-        unsigned char approved;
-};
-
-struct synthhid_device_info {
-        struct synthhid_msg_hdr header;
-        struct hv_input_dev_info hid_dev_info;
-        struct hid_descriptor hid_descriptor;
-};
-
-struct synthhid_device_info_ack {
-        struct synthhid_msg_hdr header;
-        unsigned char reserved;
-};
-
-struct synthhid_input_report {
-        struct synthhid_msg_hdr header;
-        char buffer[1];
-};
-
-#pragma pack(pop)
-
-#define INPUTVSC_SEND_RING_BUFFER_SIZE          (10*PAGE_SIZE)
-#define INPUTVSC_RECV_RING_BUFFER_SIZE          (10*PAGE_SIZE)
-
-#define NBITS(x) (((x)/BITS_PER_LONG)+1)
-
-enum pipe_prot_msg_type {
-        PIPE_MESSAGE_INVALID,
-        PIPE_MESSAGE_DATA,
-        PIPE_MESSAGE_MAXIMUM
-};
-
-
-struct pipe_prt_msg {
-        enum pipe_prot_msg_type type;
-        u32 size;
-        char data[1];
-};
-
-struct  mousevsc_prt_msg {
-        enum pipe_prot_msg_type type;
-        u32 size;
-        union {
-                struct synthhid_protocol_request request;
-                struct synthhid_protocol_response response;
-                struct synthhid_device_info_ack ack;
-        };
-};
-
-/*
- * Represents an mousevsc device
- */
-struct mousevsc_dev {
-        struct hv_device        *device;
-        unsigned char           init_complete;
-        struct mousevsc_prt_msg protocol_req;
-        struct mousevsc_prt_msg protocol_resp;
-        /* Synchronize the request/response if needed */
-        struct completion       wait_event;
-        int                     dev_info_status;
-
-        struct hid_descriptor   *hid_desc;
-        unsigned char           *report_desc;
-        u32                     report_desc_size;
-        struct hv_input_dev_info hid_dev_info;
-        int                     connected;
-        struct hid_device       *hid_device;
-};
-
-
-static struct mousevsc_dev *alloc_input_device(struct hv_device *device)
-{
-        struct mousevsc_dev *input_dev;
-
-        input_dev = kzalloc(sizeof(struct mousevsc_dev), GFP_KERNEL);
-
-        if (!input_dev)
-                return NULL;
-
-        input_dev->device = device;
-        hv_set_drvdata(device, input_dev);
-        init_completion(&input_dev->wait_event);
-
-        return input_dev;
-}
-
-static void free_input_device(struct mousevsc_dev *device)
-{
-        kfree(device->hid_desc);
-        kfree(device->report_desc);
-        hv_set_drvdata(device->device, NULL);
-        kfree(device);
-}
-
-
-static void mousevsc_on_receive_device_info(struct mousevsc_dev *input_device,
-                                struct synthhid_device_info *device_info)
-{
-        int ret = 0;
-        struct hid_descriptor *desc;
-        struct mousevsc_prt_msg ack;
-
-        /* Assume success for now */
-        input_device->dev_info_status = 0;
-
-        memcpy(&input_device->hid_dev_info, &device_info->hid_dev_info,
-                sizeof(struct hv_input_dev_info));
-
-        desc = &device_info->hid_descriptor;
-        WARN_ON(desc->bLength == 0);
-
-        input_device->hid_desc = kzalloc(desc->bLength, GFP_ATOMIC);
-
-        if (!input_device->hid_desc)
-                goto cleanup;
-
-        memcpy(input_device->hid_desc, desc, desc->bLength);
-
-        input_device->report_desc_size = desc->desc[0].wDescriptorLength;
-        if (input_device->report_desc_size == 0)
-                goto cleanup;
-        input_device->report_desc = kzalloc(input_device->report_desc_size,
-                                          GFP_ATOMIC);
-
-        if (!input_device->report_desc)
-                goto cleanup;
-
-        memcpy(input_device->report_desc,
-               ((unsigned char *)desc) + desc->bLength,
-               desc->desc[0].wDescriptorLength);
-
-        /* Send the ack */
-        memset(&ack, 0, sizeof(struct mousevsc_prt_msg));
-
-        ack.type = PIPE_MESSAGE_DATA;
-        ack.size = sizeof(struct synthhid_device_info_ack);
-
-        ack.ack.header.type = SYNTH_HID_INITIAL_DEVICE_INFO_ACK;
-        ack.ack.header.size = 1;
-        ack.ack.reserved = 0;
-
-        ret = vmbus_sendpacket(input_device->device->channel,
-                        &ack,
-                        sizeof(struct pipe_prt_msg) - sizeof(unsigned char) +
-                        sizeof(struct synthhid_device_info_ack),
-                        (unsigned long)&ack,
-                        VM_PKT_DATA_INBAND,
-                        VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-        if (ret != 0)
-                goto cleanup;
-
-        complete(&input_device->wait_event);
-
-        return;
-
-cleanup:
-        kfree(input_device->hid_desc);
-        input_device->hid_desc = NULL;
-
-        kfree(input_device->report_desc);
-        input_device->report_desc = NULL;
-
-        input_device->dev_info_status = -1;
-        complete(&input_device->wait_event);
-}
-
-static void mousevsc_on_receive(struct hv_device *device,
-                                struct vmpacket_descriptor *packet)
-{
-        struct pipe_prt_msg *pipe_msg;
-        struct synthhid_msg *hid_msg;
-        struct mousevsc_dev *input_dev = hv_get_drvdata(device);
-        struct synthhid_input_report *input_report;
-
-        pipe_msg = (struct pipe_prt_msg *)((unsigned long)packet +
-                                                (packet->offset8 << 3));
-
-        if (pipe_msg->type != PIPE_MESSAGE_DATA)
-                return;
-
-        hid_msg = (struct synthhid_msg *)&pipe_msg->data[0];
-
-        switch (hid_msg->header.type) {
-        case SYNTH_HID_PROTOCOL_RESPONSE:
-                memcpy(&input_dev->protocol_resp, pipe_msg,
-                       pipe_msg->size + sizeof(struct pipe_prt_msg) -
-                       sizeof(unsigned char));
-                complete(&input_dev->wait_event);
-                break;
-
-        case SYNTH_HID_INITIAL_DEVICE_INFO:
-                WARN_ON(pipe_msg->size < sizeof(struct hv_input_dev_info));
-
-                /*
-                 * Parse out the device info into device attr,
-                 * hid desc and report desc
-                 */
-                mousevsc_on_receive_device_info(input_dev,
-                        (struct synthhid_device_info *)&pipe_msg->data[0]);
-                break;
-        case SYNTH_HID_INPUT_REPORT:
-                input_report =
-                        (struct synthhid_input_report *)&pipe_msg->data[0];
-                if (!input_dev->init_complete)
-                        break;
-                hid_input_report(input_dev->hid_device,
-                                HID_INPUT_REPORT, input_report->buffer,
-                                input_report->header.size, 1);
-                break;
-        default:
-                pr_err("unsupported hid msg type - type %d len %d",
-                       hid_msg->header.type, hid_msg->header.size);
-                break;
-        }
-
-}
-
-static void mousevsc_on_channel_callback(void *context)
-{
-        const int packetSize = 0x100;
-        int ret = 0;
-        struct hv_device *device = (struct hv_device *)context;
-
-        u32 bytes_recvd;
-        u64 req_id;
-        unsigned char packet[0x100];
-        struct vmpacket_descriptor *desc;
-        unsigned char   *buffer = packet;
-        int     bufferlen = packetSize;
-
-
-        do {
-                ret = vmbus_recvpacket_raw(device->channel, buffer,
-                                        bufferlen, &bytes_recvd, &req_id);
-
-                if (ret == 0) {
-                        if (bytes_recvd > 0) {
-                                desc = (struct vmpacket_descriptor *)buffer;
-
-                                switch (desc->type) {
-                                case VM_PKT_COMP:
-                                        break;
-
-                                case VM_PKT_DATA_INBAND:
-                                        mousevsc_on_receive(
-                                                device, desc);
-                                        break;
-
-                                default:
-                                        pr_err("unhandled packet type %d, tid %llx len %d\n",
-                                                   desc->type,
-                                                   req_id,
-                                                   bytes_recvd);
-                                        break;
-                                }
-
-                                /* reset */
-                                if (bufferlen > packetSize) {
-                                        kfree(buffer);
-
-                                        buffer = packet;
-                                        bufferlen = packetSize;
-                                }
-                        } else {
-                                if (bufferlen > packetSize) {
-                                        kfree(buffer);
-
-                                        buffer = packet;
-                                        bufferlen = packetSize;
-                                }
-                                break;
-                        }
-                } else if (ret == -ENOBUFS) {
-                        /* Handle large packet */
-                        bufferlen = bytes_recvd;
-                        buffer = kzalloc(bytes_recvd, GFP_ATOMIC);
-
-                        if (buffer == NULL) {
-                                buffer = packet;
-                                bufferlen = packetSize;
-                                break;
-                        }
-                }
-        } while (1);
-
-        return;
-}
-
-static int mousevsc_connect_to_vsp(struct hv_device *device)
-{
-        int ret = 0;
-        int t;
-        struct mousevsc_dev *input_dev = hv_get_drvdata(device);
-        struct mousevsc_prt_msg *request;
-        struct mousevsc_prt_msg *response;
-
-
-        request = &input_dev->protocol_req;
-
-        memset(request, 0, sizeof(struct mousevsc_prt_msg));
-
-        request->type = PIPE_MESSAGE_DATA;
-        request->size = sizeof(struct synthhid_protocol_request);
-
-        request->request.header.type = SYNTH_HID_PROTOCOL_REQUEST;
-        request->request.header.size = sizeof(unsigned int);
-        request->request.version_requested.version = SYNTHHID_INPUT_VERSION;
-
-
-        ret = vmbus_sendpacket(device->channel, request,
-                                sizeof(struct pipe_prt_msg) -
-                                sizeof(unsigned char) +
-                                sizeof(struct synthhid_protocol_request),
-                                (unsigned long)request,
-                                VM_PKT_DATA_INBAND,
-                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
-        if (ret != 0)
-                goto cleanup;
-
-        t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ);
-        if (t == 0) {
-                ret = -ETIMEDOUT;
-                goto cleanup;
-        }
-
-        response = &input_dev->protocol_resp;
-
-        if (!response->response.approved) {
-                pr_err("synthhid protocol request failed (version %d)",
-                       SYNTHHID_INPUT_VERSION);
-                ret = -ENODEV;
-                goto cleanup;
-        }
-
-        t = wait_for_completion_timeout(&input_dev->wait_event, 5*HZ);
-        if (t == 0) {
-                ret = -ETIMEDOUT;
-                goto cleanup;
-        }
-
-        /*
-         * We should have gotten the device attr, hid desc and report
-         * desc at this point
-         */
-        if (input_dev->dev_info_status)
-                ret = -ENOMEM;
-
-cleanup:
-
-        return ret;
-}
-
-static int mousevsc_hid_open(struct hid_device *hid)
-{
-        return 0;
-}
-
-static void mousevsc_hid_close(struct hid_device *hid)
-{
-}
-
-static struct hid_ll_driver mousevsc_ll_driver = {
-        .open = mousevsc_hid_open,
-        .close = mousevsc_hid_close,
-};
-
-static struct hid_driver mousevsc_hid_driver;
-
-static void reportdesc_callback(struct hv_device *dev, void *packet, u32 len)
-{
-        struct hid_device *hid_dev;
-        struct mousevsc_dev *input_device = hv_get_drvdata(dev);
-
-        hid_dev = hid_allocate_device();
-        if (IS_ERR(hid_dev))
-                return;
-
-        hid_dev->ll_driver = &mousevsc_ll_driver;
-        hid_dev->driver = &mousevsc_hid_driver;
-
-        if (hid_parse_report(hid_dev, packet, len))
-                return;
-
-        hid_dev->bus = BUS_VIRTUAL;
-        hid_dev->vendor = input_device->hid_dev_info.vendor;
-        hid_dev->product = input_device->hid_dev_info.product;
-        hid_dev->version = input_device->hid_dev_info.version;
-
-        sprintf(hid_dev->name, "%s", "Microsoft Vmbus HID-compliant Mouse");
-
-        if (!hidinput_connect(hid_dev, 0)) {
-                hid_dev->claimed |= HID_CLAIMED_INPUT;
-
-                input_device->connected = 1;
-
-        }
-
-        input_device->hid_device = hid_dev;
-}
-
-static int mousevsc_on_device_add(struct hv_device *device)
-{
-        int ret = 0;
-        struct mousevsc_dev *input_dev;
-
-        input_dev = alloc_input_device(device);
-
-        if (!input_dev)
-                return -ENOMEM;
-
-        input_dev->init_complete = false;
-
-        ret = vmbus_open(device->channel,
-                INPUTVSC_SEND_RING_BUFFER_SIZE,
-                INPUTVSC_RECV_RING_BUFFER_SIZE,
-                NULL,
-                0,
-                mousevsc_on_channel_callback,
-                device
-                );
-
-        if (ret != 0) {
-                free_input_device(input_dev);
-                return ret;
-        }
-
-
-        ret = mousevsc_connect_to_vsp(device);
-
-        if (ret != 0) {
-                vmbus_close(device->channel);
-                free_input_device(input_dev);
-                return ret;
-        }
-
-
-        /* workaround SA-167 */
-        if (input_dev->report_desc[14] == 0x25)
-                input_dev->report_desc[14] = 0x29;
-
-        reportdesc_callback(device, input_dev->report_desc,
-                            input_dev->report_desc_size);
-
-        input_dev->init_complete = true;
-
-        return ret;
-}
-
-static int mousevsc_probe(struct hv_device *dev,
-                        const struct hv_vmbus_device_id *dev_id)
-{
-
-        return mousevsc_on_device_add(dev);
-
-}
-
-static int mousevsc_remove(struct hv_device *dev)
-{
-        struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
-
-        vmbus_close(dev->channel);
-
-        if (input_dev->connected) {
-                hidinput_disconnect(input_dev->hid_device);
-                input_dev->connected = 0;
-                hid_destroy_device(input_dev->hid_device);
-        }
-
-        free_input_device(input_dev);
-
-        return 0;
-}
-
-static const struct hv_vmbus_device_id id_table[] = {
-        /* Mouse guid */
-        { VMBUS_DEVICE(0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c,
-                       0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A) },
-        { },
-};
-
-MODULE_DEVICE_TABLE(vmbus, id_table);
-
-static struct  hv_driver mousevsc_drv = {
-        .name = "mousevsc",
-        .id_table = id_table,
-        .probe = mousevsc_probe,
-        .remove = mousevsc_remove,
-};
-
-static int __init mousevsc_init(void)
-{
-        return vmbus_driver_register(&mousevsc_drv);
-}
-
-static void __exit mousevsc_exit(void)
-{
-        vmbus_driver_unregister(&mousevsc_drv);
-}
-
-MODULE_LICENSE("GPL");
-MODULE_VERSION(HV_DRV_VERSION);
-module_init(mousevsc_init);
-module_exit(mousevsc_exit);
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index ae8c33e7849c..eb853f71089a 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -32,6 +32,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/hyperv.h>
+#include <linux/mempool.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
@@ -42,6 +43,7 @@
 #include <scsi/scsi_dbg.h>
 
 
+#define STORVSC_MIN_BUF_NR                              64
 #define STORVSC_RING_BUFFER_SIZE                        (20*PAGE_SIZE)
 static int storvsc_ringbuffer_size = STORVSC_RING_BUFFER_SIZE;
 
@@ -78,7 +80,7 @@ MODULE_PARM_DESC(storvsc_ringbuffer_size, "Ring buffer size (bytes)");
 /* V1 Beta                    0.1 */
 /* V1 RC < 2008/1/31          1.0 */
 /* V1 RC > 2008/1/31          2.0 */
-#define VMSTOR_PROTOCOL_VERSION_CURRENT VMSTOR_PROTOCOL_VERSION(2, 0)
+#define VMSTOR_PROTOCOL_VERSION_CURRENT VMSTOR_PROTOCOL_VERSION(4, 2)
 
 
 
@@ -104,7 +106,8 @@ enum vstor_packet_operation {
         VSTOR_OPERATION_END_INITIALIZATION      = 8,
         VSTOR_OPERATION_QUERY_PROTOCOL_VERSION  = 9,
         VSTOR_OPERATION_QUERY_PROPERTIES        = 10,
-        VSTOR_OPERATION_MAXIMUM                 = 10
+        VSTOR_OPERATION_ENUMERATE_BUS           = 11,
+        VSTOR_OPERATION_MAXIMUM                 = 11
 };
 
 /*
@@ -234,8 +237,6 @@ struct vstor_packet {
 #define STORVSC_MAX_CHANNELS                            1
 #define STORVSC_MAX_CMD_LEN                             16
 
-struct hv_storvsc_request;
-
 /* Matches Windows-end */
 enum storvsc_request_type {
         WRITE_TYPE,
@@ -284,9 +285,13 @@ struct storvsc_device {
         struct hv_storvsc_request reset_request;
 };
 
+struct stor_mem_pools {
+        struct kmem_cache *request_pool;
+        mempool_t *request_mempool;
+};
+
 struct hv_host_device {
         struct hv_device *dev;
-        struct kmem_cache *request_pool;
         unsigned int port;
         unsigned char path;
         unsigned char target;
@@ -302,6 +307,51 @@ struct storvsc_cmd_request {
         struct hv_storvsc_request request;
 };
 
+struct storvsc_scan_work {
+        struct work_struct work;
+        struct Scsi_Host *host;
+        uint lun;
+};
+
+static void storvsc_bus_scan(struct work_struct *work)
+{
+        struct storvsc_scan_work *wrk;
+        int id, order_id;
+
+        wrk = container_of(work, struct storvsc_scan_work, work);
+        for (id = 0; id < wrk->host->max_id; ++id) {
+                if (wrk->host->reverse_ordering)
+                        order_id = wrk->host->max_id - id - 1;
+                else
+                        order_id = id;
+
+                scsi_scan_target(&wrk->host->shost_gendev, 0,
+                                order_id, SCAN_WILD_CARD, 1);
+        }
+        kfree(wrk);
+}
+
+static void storvsc_remove_lun(struct work_struct *work)
+{
+        struct storvsc_scan_work *wrk;
+        struct scsi_device *sdev;
+
+        wrk = container_of(work, struct storvsc_scan_work, work);
+        if (!scsi_host_get(wrk->host))
+                goto done;
+
+        sdev = scsi_device_lookup(wrk->host, 0, 0, wrk->lun);
+
+        if (sdev) {
+                scsi_remove_device(sdev);
+                scsi_device_put(sdev);
+        }
+        scsi_host_put(wrk->host);
+
+done:
+        kfree(wrk);
+}
+
 static inline struct storvsc_device *get_out_stor_device(
                                         struct hv_device *device)
 {
@@ -549,11 +599,25 @@ static void storvsc_on_receive(struct hv_device *device,
                              struct vstor_packet *vstor_packet,
                              struct hv_storvsc_request *request)
 {
+        struct storvsc_scan_work *work;
+        struct storvsc_device *stor_device;
+
         switch (vstor_packet->operation) {
         case VSTOR_OPERATION_COMPLETE_IO:
                 storvsc_on_io_completion(device, vstor_packet, request);
                 break;
+
         case VSTOR_OPERATION_REMOVE_DEVICE:
+        case VSTOR_OPERATION_ENUMERATE_BUS:
+                stor_device = get_in_stor_device(device);
+                work = kmalloc(sizeof(struct storvsc_scan_work), GFP_ATOMIC);
+                if (!work)
+                        return;
+
+                INIT_WORK(&work->work, storvsc_bus_scan);
+                work->host = stor_device->host;
+                schedule_work(&work->work);
+                break;
 
         default:
                 break;
@@ -729,19 +793,48 @@ static void storvsc_get_ide_info(struct hv_device *dev, int *target, int *path)
 
 static int storvsc_device_alloc(struct scsi_device *sdevice)
 {
-        /*
-         * This enables luns to be located sparsely. Otherwise, we may not
-         * discovered them.
-         */
-        sdevice->sdev_bflags |= BLIST_SPARSELUN | BLIST_LARGELUN;
+        struct stor_mem_pools *memp;
+        int number = STORVSC_MIN_BUF_NR;
+
+        memp = kzalloc(sizeof(struct stor_mem_pools), GFP_KERNEL);
+        if (!memp)
+                return -ENOMEM;
+
+        memp->request_pool =
+                kmem_cache_create(dev_name(&sdevice->sdev_dev),
+                                sizeof(struct storvsc_cmd_request), 0,
+                                SLAB_HWCACHE_ALIGN, NULL);
+
+        if (!memp->request_pool)
+                goto err0;
+
+        memp->request_mempool = mempool_create(number, mempool_alloc_slab,
+                                                mempool_free_slab,
+                                                memp->request_pool);
+
+        if (!memp->request_mempool)
+                goto err1;
+
+        sdevice->hostdata = memp;
+
         return 0;
+
+err1:
+        kmem_cache_destroy(memp->request_pool);
+
+err0:
+        kfree(memp);
+        return -ENOMEM;
 }
 
-static int storvsc_merge_bvec(struct request_queue *q,
-                              struct bvec_merge_data *bmd, struct bio_vec *bvec)
+static void storvsc_device_destroy(struct scsi_device *sdevice)
 {
-        /* checking done by caller. */
-        return bvec->bv_len;
+        struct stor_mem_pools *memp = sdevice->hostdata;
+
+        mempool_destroy(memp->request_mempool);
+        kmem_cache_destroy(memp->request_pool);
+        kfree(memp);
+        sdevice->hostdata = NULL;
 }
 
 static int storvsc_device_configure(struct scsi_device *sdevice)
@@ -751,8 +844,6 @@ static int storvsc_device_configure(struct scsi_device *sdevice)
 
         blk_queue_max_segment_size(sdevice->request_queue, PAGE_SIZE);
 
-        blk_queue_merge_bvec(sdevice->request_queue, storvsc_merge_bvec);
-
         blk_queue_bounce_limit(sdevice->request_queue, BLK_BOUNCE_ANY);
 
         return 0;
@@ -802,12 +893,14 @@ static int do_bounce_buffer(struct scatterlist *sgl, unsigned int sg_count)
 
 static struct scatterlist *create_bounce_buffer(struct scatterlist *sgl,
                                                 unsigned int sg_count,
-                                                unsigned int len)
+                                                unsigned int len,
+                                                int write)
 {
         int i;
         int num_pages;
         struct scatterlist *bounce_sgl;
         struct page *page_buf;
+        unsigned int buf_len = ((write == WRITE_TYPE) ? 0 : PAGE_SIZE);
 
         num_pages = ALIGN(len, PAGE_SIZE) >> PAGE_SHIFT;
 
@@ -819,7 +912,7 @@ static struct scatterlist *create_bounce_buffer(struct scatterlist *sgl,
                 page_buf = alloc_page(GFP_ATOMIC);
                 if (!page_buf)
                         goto cleanup;
-                sg_set_page(&bounce_sgl[i], page_buf, 0, 0);
+                sg_set_page(&bounce_sgl[i], page_buf, buf_len, 0);
         }
 
         return bounce_sgl;
@@ -833,7 +926,8 @@ cleanup:
 /* Assume the original sgl has enough room */
 static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
                                             struct scatterlist *bounce_sgl,
-                                            unsigned int orig_sgl_count)
+                                            unsigned int orig_sgl_count,
+                                            unsigned int bounce_sgl_count)
 {
         int i;
         int j = 0;
@@ -874,6 +968,24 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl,
                                 kunmap_atomic((void *)bounce_addr, KM_IRQ0);
                                 j++;
 
+                                /*
+                                 * It is possible that the number of elements
+                                 * in the bounce buffer may not be equal to
+                                 * the number of elements in the original
+                                 * scatter list. Handle this correctly.
+                                 */
+
+                                if (j == bounce_sgl_count) {
+                                        /*
+                                         * We are done; cleanup and return.
+                                         */
+                                        kunmap_atomic((void *)(dest_addr -
+                                                        orig_sgl[i].offset),
+                                                        KM_IRQ0);
+                                        local_irq_restore(flags);
+                                        return total_copied;
+                                }
+
                                 /* if we need to use another bounce buffer */
                                 if (destlen || i != orig_sgl_count - 1)
                                         bounce_addr =
@@ -965,18 +1077,13 @@ static int storvsc_remove(struct hv_device *dev)
 {
         struct storvsc_device *stor_device = hv_get_drvdata(dev);
         struct Scsi_Host *host = stor_device->host;
-        struct hv_host_device *host_dev =
-                        (struct hv_host_device *)host->hostdata;
 
         scsi_remove_host(host);
 
         scsi_host_put(host);
 
         storvsc_dev_remove(dev);
-        if (host_dev->request_pool) {
-                kmem_cache_destroy(host_dev->request_pool);
-                host_dev->request_pool = NULL;
-        }
+
         return 0;
 }
 
@@ -1014,7 +1121,7 @@ static int storvsc_host_reset(struct hv_device *device)
 
         stor_device = get_out_stor_device(device);
         if (!stor_device)
-                return -ENODEV;
+                return FAILED;
 
         request = &stor_device->reset_request;
         vstor_packet = &request->vstor_packet;
@@ -1031,13 +1138,11 @@ static int storvsc_host_reset(struct hv_device *device)
                                VM_PKT_DATA_INBAND,
                                VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
         if (ret != 0)
-                goto cleanup;
+                return FAILED;
 
         t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
-        if (t == 0) {
-                ret = -ETIMEDOUT;
-                goto cleanup;
-        }
+        if (t == 0)
+                return TIMEOUT_ERROR;
 
 
         /*
@@ -1045,8 +1150,7 @@ static int storvsc_host_reset(struct hv_device *device)
          * should have been flushed out and return to us
          */
 
-cleanup:
-        return ret;
+        return SUCCESS;
 }
 
 
@@ -1055,16 +1159,10 @@ cleanup:
  */
 static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
 {
-        int ret;
-        struct hv_host_device *host_dev =
-                (struct hv_host_device *)scmnd->device->host->hostdata;
+        struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
         struct hv_device *dev = host_dev->dev;
 
-        ret = storvsc_host_reset(dev);
-        if (ret != 0)
-                return ret;
-
-        return ret;
+        return storvsc_host_reset(dev);
 }
 
 
@@ -1076,21 +1174,22 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
         struct storvsc_cmd_request *cmd_request =
                 (struct storvsc_cmd_request *)request->context;
         struct scsi_cmnd *scmnd = cmd_request->cmd;
-        struct hv_host_device *host_dev =
-                (struct hv_host_device *)scmnd->device->host->hostdata;
+        struct hv_host_device *host_dev = shost_priv(scmnd->device->host);
         void (*scsi_done_fn)(struct scsi_cmnd *);
         struct scsi_sense_hdr sense_hdr;
         struct vmscsi_request *vm_srb;
+        struct storvsc_scan_work *wrk;
+        struct stor_mem_pools *memp = scmnd->device->hostdata;
 
         vm_srb = &request->vstor_packet.vm_srb;
         if (cmd_request->bounce_sgl_count) {
-                if (vm_srb->data_in == READ_TYPE) {
+                if (vm_srb->data_in == READ_TYPE)
                         copy_from_bounce_buffer(scsi_sglist(scmnd),
                                         cmd_request->bounce_sgl,
-                                        scsi_sg_count(scmnd));
-                        destroy_bounce_buffer(cmd_request->bounce_sgl,
+                                        scsi_sg_count(scmnd),
+                                        cmd_request->bounce_sgl_count);
+                destroy_bounce_buffer(cmd_request->bounce_sgl,
                                         cmd_request->bounce_sgl_count);
-                }
         }
 
         /*
@@ -1103,6 +1202,29 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
         else
                 scmnd->result = vm_srb->scsi_status;
 
+        /*
+         * If the LUN is invalid; remove the device.
+         */
+        if (vm_srb->srb_status == 0x20) {
+                struct storvsc_device *stor_dev;
+                struct hv_device *dev = host_dev->dev;
+                struct Scsi_Host *host;
+
+                stor_dev = get_in_stor_device(dev);
+                host = stor_dev->host;
+
+                wrk = kmalloc(sizeof(struct storvsc_scan_work),
+                                GFP_ATOMIC);
+                if (!wrk) {
+                        scmnd->result = DID_TARGET_FAILURE << 16;
+                } else {
+                        wrk->host = host;
+                        wrk->lun = vm_srb->lun;
+                        INIT_WORK(&wrk->work, storvsc_remove_lun);
+                        schedule_work(&wrk->work);
+                }
+        }
+
         if (scmnd->result) {
                 if (scsi_normalize_sense(scmnd->sense_buffer,
                                 SCSI_SENSE_BUFFERSIZE, &sense_hdr))
@@ -1120,7 +1242,7 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
 
         scsi_done_fn(scmnd);
 
-        kmem_cache_free(host_dev->request_pool, cmd_request);
+        mempool_free(cmd_request, memp->request_mempool);
 }
 
 static bool storvsc_check_scsi_cmd(struct scsi_cmnd *scmnd)
@@ -1131,7 +1253,7 @@ static bool storvsc_check_scsi_cmd(struct scsi_cmnd *scmnd)
         switch (scsi_op) {
         /* smartd sends this command, which will offline the device */
         case SET_WINDOW:
-                scmnd->result = DID_ERROR << 16;
+                scmnd->result = ILLEGAL_REQUEST << 16;
                 allowed = false;
                 break;
         default:
@@ -1143,12 +1265,10 @@ static bool storvsc_check_scsi_cmd(struct scsi_cmnd *scmnd)
 /*
  * storvsc_queuecommand - Initiate command processing
  */
-static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
-                                void (*done)(struct scsi_cmnd *))
+static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
 {
         int ret;
-        struct hv_host_device *host_dev =
-                (struct hv_host_device *)scmnd->device->host->hostdata;
+        struct hv_host_device *host_dev = shost_priv(host);
         struct hv_device *dev = host_dev->dev;
         struct hv_storvsc_request *request;
         struct storvsc_cmd_request *cmd_request;
@@ -1157,9 +1277,10 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
         struct scatterlist *sgl;
         unsigned int sg_count = 0;
         struct vmscsi_request *vm_srb;
+        struct stor_mem_pools *memp = scmnd->device->hostdata;
 
         if (storvsc_check_scsi_cmd(scmnd) == false) {
-                done(scmnd);
+                scmnd->scsi_done(scmnd);
                 return 0;
         }
 
@@ -1172,16 +1293,14 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
                 goto retry_request;
         }
 
-        scmnd->scsi_done = done;
-
         request_size = sizeof(struct storvsc_cmd_request);
 
-        cmd_request = kmem_cache_zalloc(host_dev->request_pool,
+        cmd_request = mempool_alloc(memp->request_mempool,
                                        GFP_ATOMIC);
-        if (!cmd_request) {
-                scmnd->scsi_done = NULL;
+        if (!cmd_request)
                 return SCSI_MLQUEUE_DEVICE_BUSY;
-        }
+
+        memset(cmd_request, 0, sizeof(struct storvsc_cmd_request));
 
         /* Setup the cmd request */
         cmd_request->bounce_sgl_count = 0;
@@ -1231,12 +1350,12 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
                 if (do_bounce_buffer(sgl, scsi_sg_count(scmnd)) != -1) {
                         cmd_request->bounce_sgl =
                                 create_bounce_buffer(sgl, scsi_sg_count(scmnd),
-                                                     scsi_bufflen(scmnd));
+                                                     scsi_bufflen(scmnd),
+                                                     vm_srb->data_in);
                         if (!cmd_request->bounce_sgl) {
-                                scmnd->scsi_done = NULL;
                                 scmnd->host_scribble = NULL;
-                                kmem_cache_free(host_dev->request_pool,
-                                                cmd_request);
+                                mempool_free(cmd_request,
+                                                memp->request_mempool);
 
                                 return SCSI_MLQUEUE_HOST_BUSY;
                         }
@@ -1278,9 +1397,8 @@ retry_request:
                         destroy_bounce_buffer(cmd_request->bounce_sgl,
                                         cmd_request->bounce_sgl_count);
 
-                kmem_cache_free(host_dev->request_pool, cmd_request);
+                mempool_free(cmd_request, memp->request_mempool);
 
-                scmnd->scsi_done = NULL;
                 scmnd->host_scribble = NULL;
 
                 ret = SCSI_MLQUEUE_DEVICE_BUSY;
@@ -1289,9 +1407,6 @@ retry_request:
         return ret;
 }
 
-static DEF_SCSI_QCMD(storvsc_queuecommand)
-
-
 /* Scsi driver */
 static struct scsi_host_template scsi_driver = {
         .module =               THIS_MODULE,
@@ -1300,6 +1415,7 @@ static struct scsi_host_template scsi_driver = {
         .queuecommand =         storvsc_queuecommand,
         .eh_host_reset_handler =        storvsc_host_reset_handler,
         .slave_alloc =          storvsc_device_alloc,
+        .slave_destroy =        storvsc_device_destroy,
         .slave_configure =      storvsc_device_configure,
         .cmd_per_lun =          1,
         /* 64 max_queue * 1 target */
@@ -1308,14 +1424,7 @@ static struct scsi_host_template scsi_driver = {
         /* no use setting to 0 since ll_blk_rw reset it to 1 */
         /* currently 32 */
         .sg_tablesize =         MAX_MULTIPAGE_BUFFER_COUNT,
-        /*
-         * ENABLE_CLUSTERING allows mutiple physically contig bio_vecs to merge
-         * into 1 sg element. If set, we must limit the max_segment_size to
-         * PAGE_SIZE, otherwise we may get 1 sg element that represents
-         * multiple
-         */
-        /* physically contig pfns (ie sg[x].length > PAGE_SIZE). */
-        .use_clustering =       ENABLE_CLUSTERING,
+        .use_clustering =       DISABLE_CLUSTERING,
         /* Make sure we dont get a sg segment crosses a page boundary */
         .dma_boundary =         PAGE_SIZE-1,
 };
@@ -1360,27 +1469,17 @@ static int storvsc_probe(struct hv_device *device,
         if (!host)
                 return -ENOMEM;
 
-        host_dev = (struct hv_host_device *)host->hostdata;
+        host_dev = shost_priv(host);
         memset(host_dev, 0, sizeof(struct hv_host_device));
 
         host_dev->port = host->host_no;
         host_dev->dev = device;
 
-        host_dev->request_pool =
-                                kmem_cache_create(dev_name(&device->device),
-                                        sizeof(struct storvsc_cmd_request), 0,
-                                        SLAB_HWCACHE_ALIGN, NULL);
-
-        if (!host_dev->request_pool) {
-                scsi_host_put(host);
-                return -ENOMEM;
-        }
 
         stor_device = kzalloc(sizeof(struct storvsc_device), GFP_KERNEL);
         if (!stor_device) {
-                kmem_cache_destroy(host_dev->request_pool);
-                scsi_host_put(host);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err_out0;
         }
 
         stor_device->destroy = false;
@@ -1391,12 +1490,8 @@ static int storvsc_probe(struct hv_device *device,
 
         stor_device->port_number = host->host_no;
         ret = storvsc_connect_to_vsp(device, storvsc_ringbuffer_size);
-        if (ret) {
-                kmem_cache_destroy(host_dev->request_pool);
-                scsi_host_put(host);
-                kfree(stor_device);
-                return ret;
-        }
+        if (ret)
+                goto err_out1;
 
         if (dev_is_ide)
                 storvsc_get_ide_info(device, &target, &path);
@@ -1416,7 +1511,7 @@ static int storvsc_probe(struct hv_device *device,
         /* Register the HBA and start the scsi bus scan */
         ret = scsi_add_host(host, &device->device);
         if (ret != 0)
-                goto err_out;
+                goto err_out2;
 
         if (!dev_is_ide) {
                 scsi_scan_host(host);
@@ -1425,21 +1520,32 @@ static int storvsc_probe(struct hv_device *device,
         ret = scsi_add_device(host, 0, target, 0);
         if (ret) {
                 scsi_remove_host(host);
-                goto err_out;
+                goto err_out2;
         }
         return 0;
 
-err_out:
+err_out2:
+        /*
+         * Once we have connected with the host, we would need to
+         * to invoke storvsc_dev_remove() to rollback this state and
+         * this call also frees up the stor_device; hence the jump around
+         * err_out1 label.
+         */
         storvsc_dev_remove(device);
-        kmem_cache_destroy(host_dev->request_pool);
+        goto err_out0;
+
+err_out1:
+        kfree(stor_device);
+
+err_out0:
         scsi_host_put(host);
-        return -ENODEV;
+        return ret;
 }
 
 /* The one and only one */
 
 static struct hv_driver storvsc_drv = {
-        .name = "storvsc",
+        .name = KBUILD_MODNAME,
         .id_table = id_table,
         .probe = storvsc_probe,
         .remove = storvsc_remove,
diff --git a/drivers/staging/iio/Documentation/generic_buffer.c b/drivers/staging/iio/Documentation/generic_buffer.c
index d58095321491..69a05b9456d6 100644
--- a/drivers/staging/iio/Documentation/generic_buffer.c
+++ b/drivers/staging/iio/Documentation/generic_buffer.c
@@ -28,6 +28,7 @@
 #include <linux/types.h>
 #include <string.h>
 #include <poll.h>
+#include <endian.h>
 #include "iio_utils.h"
 
 /**
@@ -56,6 +57,13 @@ int size_from_channelarray(struct iio_channel_info *channels, int num_channels)
 
 void print2byte(int input, struct iio_channel_info *info)
 {
+        /* First swap if incorrect endian */
+
+        if (info->be)
+                input = be16toh((uint_16t)input);
+        else
+                input = le16toh((uint_16t)input);
+
         /* shift before conversion to avoid sign extension
            of left aligned data */
         input = input >> info->shift;
diff --git a/drivers/staging/iio/Documentation/iio_utils.h b/drivers/staging/iio/Documentation/iio_utils.h
index 75938b2412ff..6f3a392297ec 100644
--- a/drivers/staging/iio/Documentation/iio_utils.h
+++ b/drivers/staging/iio/Documentation/iio_utils.h
@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <dirent.h>
 
 #define IIO_MAX_NAME_LENGTH 30
 
@@ -73,6 +74,7 @@ struct iio_channel_info {
         unsigned bits_used;
         unsigned shift;
         uint64_t mask;
+        unsigned be;
         unsigned is_signed;
         unsigned enabled;
         unsigned location;
@@ -83,6 +85,7 @@ struct iio_channel_info {
  * @is_signed: output whether channel is signed
  * @bytes: output how many bytes the channel storage occupies
  * @mask: output a bit mask for the raw data
+ * @be: big endian
  * @device_dir: the iio device directory
  * @name: the channel name
  * @generic_name: the channel type name
@@ -92,6 +95,7 @@ inline int iioutils_get_type(unsigned *is_signed,
                              unsigned *bits_used,
                              unsigned *shift,
                              uint64_t *mask,
+                             unsigned *be,
                              const char *device_dir,
                              const char *name,
                              const char *generic_name)
@@ -100,7 +104,7 @@ inline int iioutils_get_type(unsigned *is_signed,
         int ret;
         DIR *dp;
         char *scan_el_dir, *builtname, *builtname_generic, *filename = 0;
-        char signchar;
+        char signchar, endianchar;
         unsigned padint;
         const struct dirent *ent;
 
@@ -144,9 +148,18 @@ inline int iioutils_get_type(unsigned *is_signed,
                                 ret = -errno;
                                 goto error_free_filename;
                         }
-                        fscanf(sysfsfp,
-                               "%c%u/%u>>%u", &signchar, bits_used,
-                               &padint, shift);
+
+                        ret = fscanf(sysfsfp,
+                                     "%ce:%c%u/%u>>%u",
+                                     &endianchar,
+                                     &signchar,
+                                     bits_used,
+                                     &padint, shift);
+                        if (ret < 0) {
+                                printf("failed to pass scan type description\n");
+                                return ret;
+                        }
+                        *be = (endianchar == 'b');
                         *bytes = padint / 8;
                         if (*bits_used == 64)
                                 *mask = ~0;
@@ -156,6 +169,10 @@ inline int iioutils_get_type(unsigned *is_signed,
                                 *is_signed = 1;
                         else
                                 *is_signed = 0;
+                        fclose(sysfsfp);
+                        free(filename);
+
+                        filename = 0;
                 }
 error_free_filename:
         if (filename)
@@ -386,6 +403,7 @@ inline int build_channel_array(const char *device_dir,
                                                 &current->bits_used,
                                                 &current->shift,
                                                 &current->mask,
+                                                &current->be,
                                                 device_dir,
                                                 current->name,
                                                 current->generic_name);
diff --git a/drivers/staging/iio/Documentation/ring.txt b/drivers/staging/iio/Documentation/ring.txt
index 7e99ef2b7bc0..e33807761cd7 100644
--- a/drivers/staging/iio/Documentation/ring.txt
+++ b/drivers/staging/iio/Documentation/ring.txt
@@ -23,10 +23,6 @@ The function pointers within here are used to allow the core to handle
 as much buffer functionality as possible. Note almost all of these
 are optional.
 
-mark_in_use, unmark_in_use
-  Basically indicate that not changes should be made to the buffer state that
-  will effect the form of the data being captures (e.g. scan elements or length)
-
 store_to
   If possible, push data to the buffer.
 
@@ -39,8 +35,6 @@ rip_first_n
   The primary buffer reading function. Note that it may well not return
   as much data as requested.
 
-mark_param_changed
-  Used to indicate that something has changed. Used in conjunction with
 request_update
   If parameters have changed that require reinitialization or configuration of
   the buffer this will trigger it.
@@ -51,7 +45,3 @@ get_bytes_per_datum, set_bytes_per_datum
 get_length / set_length
   Get/set the number of complete scans that may be held by the buffer.
 
-is_enabled
-  Query if ring buffer is in use
-enable
-  Start the ring buffer.
diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio b/drivers/staging/iio/Documentation/sysfs-bus-iio
index 0d6823d19b61..46a995d6d261 100644
--- a/drivers/staging/iio/Documentation/sysfs-bus-iio
+++ b/drivers/staging/iio/Documentation/sysfs-bus-iio
@@ -276,6 +276,16 @@ Description:
                 If a discrete set of scale values are available, they
                 are listed in this attribute.
 
+What:           /sys/.../in_accel_filter_low_pass_3db_frequency
+What:           /sys/.../in_magn_filter_low_pass_3db_frequency
+What:           /sys/.../in_anglvel_filter_low_pass_3db_frequency
+KernelVersion:  3.2
+Contact:        linux-iio@vger.kernel.org
+Description:
+                If a known or controllable low pass filter is applied
+                to the underlying data channel, then this parameter
+                gives the 3dB frequency of the filter in Hz.
+
 What:           /sys/bus/iio/devices/iio:deviceX/out_voltageY_raw
 KernelVersion:  2.6.37
 Contact:        linux-iio@vger.kernel.org
diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig
index 4ec9118955f9..90162aa8b2df 100644
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
@@ -76,7 +76,6 @@ config IIO_DUMMY_EVGEN
 
 config IIO_SIMPLE_DUMMY
        tristate "An example driver with no hardware requirements"
-       select IIO_SIMPLE_DUMMY_EVGEN if IIO_SIMPLE_DUMMY_EVENTS
        help
          Driver intended mainly as documentation for how to write
          a driver. May also be useful for testing userspace code
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index 97f747eac647..d439e45d07fa 100644
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -17,7 +17,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "adis16201.h"
 
@@ -322,8 +322,7 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
                         *val = 0;
@@ -348,10 +347,10 @@ static int adis16201_read_raw(struct iio_dev *indio_dev,
                         return -EINVAL;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = 25;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ACCEL:
                         bits = 12;
@@ -388,7 +387,7 @@ static int adis16201_write_raw(struct iio_dev *indio_dev,
         s16 val16;
         u8 addr;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ACCEL:
                         bits = 12;
@@ -408,36 +407,36 @@ static int adis16201_write_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16201_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_supply, ADIS16201_SCAN_SUPPLY,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_OFFSET_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
                  temp, ADIS16201_SCAN_TEMP,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_x, ADIS16201_SCAN_ACC_X,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_y, ADIS16201_SCAN_ACC_Y,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_aux, ADIS16201_SCAN_AUX_ADC,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  incli_x, ADIS16201_SCAN_INCLI_X,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  incli_y, ADIS16201_SCAN_INCLI_Y,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(7)
@@ -554,3 +553,4 @@ module_spi_driver(adis16201_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16201 Programmable Digital Vibration Sensor driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16201");
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index 0016ed378e3a..26c610faee3f 100644
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -74,11 +74,11 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (ring->scan_count)
-                if (adis16201_read_ring_data(indio_dev, st->rx) >= 0)
-                        for (; i < ring->scan_count; i++)
-                                data[i] = be16_to_cpup(
-                                        (__be16 *)&(st->rx[i*2]));
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)
+            && adis16201_read_ring_data(indio_dev, st->rx) >= 0)
+                for (; i < bitmap_weight(indio_dev->active_scan_mask,
+                                         indio_dev->masklength); i++)
+                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
         /* Guaranteed to be aligned with 8 byte boundary */
         if (ring->scan_timestamp)
@@ -116,11 +116,9 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
         }
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
-        ring->bpe = 2;
         ring->scan_timestamp = true;
         ring->access = &ring_sw_access_funcs;
-        ring->setup_ops = &adis16201_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16201_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16201_trigger_handler,
diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index a6d6d27f3c97..1a5140f9e3f4 100644
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -17,7 +17,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "adis16203.h"
 
@@ -329,8 +329,7 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
                         *val = 0;
@@ -350,10 +349,10 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
                 default:
                         return -EINVAL;
                 }
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = 25;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 bits = 14;
                 mutex_lock(&indio_dev->mlock);
                 addr = adis16203_addresses[chan->address][1];
@@ -374,26 +373,26 @@ static int adis16203_read_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16203_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_supply, ADIS16203_SCAN_SUPPLY,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_aux, ADIS16203_SCAN_AUX_ADC,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  incli_x, ADIS16203_SCAN_INCLI_X,
                  IIO_ST('s', 14, 16, 0), 0),
         /* Fixme: Not what it appears to be - see data sheet */
         IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  incli_y, ADIS16203_SCAN_INCLI_Y,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_OFFSET_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
                  temp, ADIS16203_SCAN_TEMP,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(5),
@@ -509,3 +508,4 @@ module_spi_driver(adis16203_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16203 Programmable Digital Vibration Sensor driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16203");
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
index 1fdfe6f6ac6e..064640d15e41 100644
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -74,11 +74,11 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (ring->scan_count)
-                if (adis16203_read_ring_data(&indio_dev->dev, st->rx) >= 0)
-                        for (; i < ring->scan_count; i++)
-                                data[i] = be16_to_cpup(
-                                        (__be16 *)&(st->rx[i*2]));
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
+            adis16203_read_ring_data(&indio_dev->dev, st->rx) >= 0)
+                for (; i < bitmap_weight(indio_dev->active_scan_mask,
+                                         indio_dev->masklength); i++)
+                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
         /* Guaranteed to be aligned with 8 byte boundary */
         if (ring->scan_timestamp)
@@ -118,11 +118,9 @@ int adis16203_configure_ring(struct iio_dev *indio_dev)
         }
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
-        ring->bpe = 2;
         ring->scan_timestamp = true;
         ring->access = &ring_sw_access_funcs;
-        ring->setup_ops = &adis16203_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16203_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16203_trigger_handler,
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index 7ac5b4c533d8..fa89364b841e 100644
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -20,7 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "adis16204.h"
 
@@ -366,7 +366,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
                         *val = 0;
@@ -390,12 +390,12 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
                         return -EINVAL;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = 25;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
-        case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):
-                if (mask == (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE)) {
+        case IIO_CHAN_INFO_CALIBBIAS:
+        case IIO_CHAN_INFO_PEAK:
+                if (mask == IIO_CHAN_INFO_CALIBBIAS) {
                         bits = 12;
                         addrind = 1;
                 } else { /* PEAK_SEPARATE */
@@ -428,7 +428,7 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
         s16 val16;
         u8 addr;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ACCEL:
                         bits = 12;
@@ -445,28 +445,28 @@ static int adis16204_write_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16204_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 0, 0, "supply", 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_supply, ADIS16204_SCAN_SUPPLY,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_aux, ADIS16204_SCAN_AUX_ADC,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_OFFSET_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
                  temp, ADIS16204_SCAN_TEMP,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                 IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
                  accel_x, ADIS16204_SCAN_ACC_X,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                 IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
                  accel_y, ADIS16204_SCAN_ACC_Y,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(5),
@@ -582,3 +582,4 @@ module_spi_driver(adis16204_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("ADIS16204 High-g Digital Impact Sensor and Recorder");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16204");
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
index 6fd3d8f51f2c..4081179dfa5c 100644
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -71,11 +71,11 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (ring->scan_count)
-                if (adis16204_read_ring_data(&indio_dev->dev, st->rx) >= 0)
-                        for (; i < ring->scan_count; i++)
-                                data[i] = be16_to_cpup(
-                                        (__be16 *)&(st->rx[i*2]));
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
+            adis16204_read_ring_data(&indio_dev->dev, st->rx) >= 0)
+                for (; i < bitmap_weight(indio_dev->active_scan_mask,
+                                         indio_dev->masklength); i++)
+                        data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
         /* Guaranteed to be aligned with 8 byte boundary */
         if (ring->scan_timestamp)
@@ -114,10 +114,8 @@ int adis16204_configure_ring(struct iio_dev *indio_dev)
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
         ring->access = &ring_sw_access_funcs;
-        ring->bpe = 2;
         ring->scan_timestamp = true;
-        ring->setup_ops = &adis16204_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16204_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16204_trigger_handler,
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c
index c03afbf5bbdc..a98715f6bd6d 100644
--- a/drivers/staging/iio/accel/adis16209_core.c
+++ b/drivers/staging/iio/accel/adis16209_core.c
@@ -18,7 +18,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "adis16209.h"
 
@@ -304,7 +304,7 @@ static int adis16209_write_raw(struct iio_dev *indio_dev,
         s16 val16;
         u8 addr;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ACCEL:
                 case IIO_INCLI:
@@ -355,8 +355,7 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
                         *val = 0;
@@ -381,10 +380,10 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
                         return -EINVAL;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = 25;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ACCEL:
                         bits = 14;
@@ -410,34 +409,34 @@ static int adis16209_read_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16209_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_supply, ADIS16209_SCAN_SUPPLY,
                  IIO_ST('u', 14, 16, 0), 0),
         IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                 (1 << IIO_CHAN_INFO_OFFSET_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                 IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,
                  temp, ADIS16209_SCAN_TEMP,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_x, ADIS16209_SCAN_ACC_X,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_y, ADIS16209_SCAN_ACC_Y,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_aux, ADIS16209_SCAN_AUX_ADC,
                  IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  incli_x, ADIS16209_SCAN_INCLI_X,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  incli_y, ADIS16209_SCAN_INCLI_Y,
                  IIO_ST('s', 14, 16, 0), 0),
         IIO_CHAN(IIO_ROT, 0, 1, 0, NULL, 0, IIO_MOD_X,
@@ -558,3 +557,4 @@ module_spi_driver(adis16209_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16209 Digital Vibration Sensor driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16209");
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index d17e39d95459..2a6fd334f5f1 100644
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -72,9 +72,10 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (ring->scan_count &&
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
             adis16209_read_ring_data(&indio_dev->dev, st->rx) >= 0)
-                for (; i < ring->scan_count; i++)
+                for (; i < bitmap_weight(indio_dev->active_scan_mask,
+                                         indio_dev->masklength); i++)
                         data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
         /* Guaranteed to be aligned with 8 byte boundary */
@@ -114,10 +115,8 @@ int adis16209_configure_ring(struct iio_dev *indio_dev)
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
         ring->access = &ring_sw_access_funcs;
-        ring->bpe = 2;
         ring->scan_timestamp = true;
-        ring->setup_ops = &adis16209_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16209_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16209_trigger_handler,
diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c
index 73298e7849e6..51a852d45482 100644
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@ -167,9 +167,9 @@ static ssize_t adis16220_write_16bit(struct device *dev,
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int ret;
-        long val;
+        u16 val;
 
-        ret = strict_strtol(buf, 10, &val);
+        ret = kstrtou16(buf, 10, &val);
         if (ret)
                 goto error_ret;
         ret = adis16220_spi_write_reg_16(indio_dev, this_attr->address, val);
@@ -510,17 +510,17 @@ static int adis16220_read_raw(struct iio_dev *indio_dev,
         case 0:
                 addrind = 0;
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 if (chan->type == IIO_TEMP) {
                         *val = 25;
                         return IIO_VAL_INT;
                 }
                 addrind = 1;
                 break;
-        case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):
+        case IIO_CHAN_INFO_PEAK:
                 addrind = 2;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 *val = 0;
                 switch (chan->type) {
                 case IIO_TEMP:
@@ -575,27 +575,27 @@ static const struct iio_chan_spec adis16220_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "supply",
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
         }, {
                 .type = IIO_ACCEL,
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                             (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
-                             (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                             IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                             IIO_CHAN_INFO_PEAK_SEPARATE_BIT,
                 .address = accel,
         }, {
                 .type = IIO_TEMP,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                             (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                             IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = temp,
         }, {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                             (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                             IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_1,
         }, {
                 .type = IIO_VOLTAGE,
@@ -713,3 +713,4 @@ module_spi_driver(adis16220_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16220 Digital Vibration Sensor");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16220");
diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index 88881b9919ef..17f77fef7f2b 100644
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -21,7 +21,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "adis16240.h"
 
@@ -389,8 +389,7 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
                         *val = 0;
@@ -411,14 +410,14 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
                         return -EINVAL;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_PEAK_SCALE_SHARED):
+        case IIO_CHAN_INFO_PEAK_SCALE:
                 *val = 6;
                 *val2 = 629295;
                 return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = 25;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 bits = 10;
                 mutex_lock(&indio_dev->mlock);
                 addr = adis16240_addresses[chan->address][1];
@@ -432,7 +431,7 @@ static int adis16240_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):
+        case IIO_CHAN_INFO_PEAK:
                 bits = 10;
                 mutex_lock(&indio_dev->mlock);
                 addr = adis16240_addresses[chan->address][2];
@@ -460,7 +459,7 @@ static int adis16240_write_raw(struct iio_dev *indio_dev,
         s16 val16;
         u8 addr;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 val16 = val & ((1 << bits) - 1);
                 addr = adis16240_addresses[chan->address][1];
                 return adis16240_spi_write_reg_16(indio_dev, addr, val16);
@@ -470,7 +469,7 @@ static int adis16240_write_raw(struct iio_dev *indio_dev,
 
 static struct iio_chan_spec adis16240_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  in_supply, ADIS16240_SCAN_SUPPLY,
                  IIO_ST('u', 10, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
@@ -478,22 +477,22 @@ static struct iio_chan_spec adis16240_channels[] = {
                  in_aux, ADIS16240_SCAN_AUX_ADC,
                  IIO_ST('u', 10, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_x, ADIS16240_SCAN_ACC_X,
                  IIO_ST('s', 10, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_y, ADIS16240_SCAN_ACC_Y,
                  IIO_ST('s', 10, 16, 0), 0),
         IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Z,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED) |
-                 (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                 IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                  accel_z, ADIS16240_SCAN_ACC_Z,
                  IIO_ST('s', 10, 16, 0), 0),
         IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  temp, ADIS16240_SCAN_TEMP,
                  IIO_ST('u', 10, 16, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(6)
@@ -611,3 +610,4 @@ module_spi_driver(adis16240_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices Programmable Impact Sensor and Recorder");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16240");
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
index b907ca3f4fdf..e23622d96f9f 100644
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@ -69,9 +69,10 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (ring->scan_count &&
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
             adis16240_read_ring_data(&indio_dev->dev, st->rx) >= 0)
-                for (; i < ring->scan_count; i++)
+                for (; i < bitmap_weight(indio_dev->active_scan_mask,
+                                         indio_dev->masklength); i++)
                         data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
         /* Guaranteed to be aligned with 8 byte boundary */
@@ -111,10 +112,8 @@ int adis16240_configure_ring(struct iio_dev *indio_dev)
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
         ring->access = &ring_sw_access_funcs;
-        ring->bpe = 2;
         ring->scan_timestamp = true;
-        ring->setup_ops = &adis16240_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16240_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16240_trigger_handler,
diff --git a/drivers/staging/iio/accel/kxsd9.c b/drivers/staging/iio/accel/kxsd9.c
index cfce21c2eddc..d13d7215ff6e 100644
--- a/drivers/staging/iio/accel/kxsd9.c
+++ b/drivers/staging/iio/accel/kxsd9.c
@@ -140,7 +140,7 @@ static int kxsd9_write_raw(struct iio_dev *indio_dev,
 {
         int ret = -EINVAL;
 
-        if (mask == (1 << IIO_CHAN_INFO_SCALE_SHARED)) {
+        if (mask == IIO_CHAN_INFO_SCALE) {
                 /* Check no integer component */
                 if (val)
                         return -EINVAL;
@@ -164,7 +164,7 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev,
                         goto error_ret;
                 *val = ret;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
                 if (ret)
                         goto error_ret;
@@ -181,7 +181,7 @@ error_ret:
                 .type = IIO_ACCEL,                                      \
                 .modified = 1,                                          \
                 .channel2 = IIO_MOD_##axis,                             \
-                .info_mask = 1 << IIO_CHAN_INFO_SCALE_SHARED,           \
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,            \
                 .address = KXSD9_REG_##axis,                            \
         }
 
@@ -268,8 +268,10 @@ static int __devexit kxsd9_remove(struct spi_device *spi)
 }
 
 static const struct spi_device_id kxsd9_id[] = {
-        {"kxsd9", 0}
+        {"kxsd9", 0},
+        { },
 };
+MODULE_DEVICE_TABLE(spi, kxsd9_id);
 
 static struct spi_driver kxsd9_driver = {
         .driver = {
diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h
index 7237a9ab61a8..2db383fc2743 100644
--- a/drivers/staging/iio/accel/lis3l02dq.h
+++ b/drivers/staging/iio/accel/lis3l02dq.h
@@ -181,11 +181,6 @@ int lis3l02dq_disable_all_events(struct iio_dev *indio_dev);
 void lis3l02dq_remove_trigger(struct iio_dev *indio_dev);
 int lis3l02dq_probe_trigger(struct iio_dev *indio_dev);
 
-ssize_t lis3l02dq_read_accel_from_buffer(struct iio_buffer *buffer,
-                                       int index,
-                                       int *val);
-
-
 int lis3l02dq_configure_buffer(struct iio_dev *indio_dev);
 void lis3l02dq_unconfigure_buffer(struct iio_dev *indio_dev);
 
@@ -212,13 +207,6 @@ static inline int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
 {
         return 0;
 }
-static inline ssize_t
-lis3l02dq_read_accel_from_buffer(struct iio_buffer *buffer,
-                                 int index,
-                                 int *val)
-{
-        return 0;
-}
 
 static int lis3l02dq_configure_buffer(struct iio_dev *indio_dev)
 {
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 6877521ec173..376da5137967 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -25,7 +25,8 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../events.h"
+#include "../buffer.h"
 
 #include "lis3l02dq.h"
 
@@ -226,14 +227,14 @@ static int lis3l02dq_write_raw(struct iio_dev *indio_dev,
         u8 uval;
         s8 sval;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 if (val > 255 || val < -256)
                         return -EINVAL;
                 sval = val;
                 reg = lis3l02dq_axis_map[LIS3L02DQ_BIAS][chan->address];
                 ret = lis3l02dq_spi_write_reg_8(indio_dev, reg, sval);
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (val & ~0xFF)
                         return -EINVAL;
                 uval = val;
@@ -259,23 +260,20 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
         case 0:
                 /* Take the iio_dev status lock */
                 mutex_lock(&indio_dev->mlock);
-                if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED)
-                        ret = lis3l02dq_read_accel_from_buffer(indio_dev->
-                                                               buffer,
-                                                               chan->scan_index,
-                                                               val);
-                else {
+                if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
+                        ret = -EBUSY;
+                } else {
                         reg = lis3l02dq_axis_map
                                 [LIS3L02DQ_ACCEL][chan->address];
                         ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
                 }
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 *val = 0;
                 *val2 = 9580;
                 return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 reg = lis3l02dq_axis_map[LIS3L02DQ_GAIN][chan->address];
                 ret = lis3l02dq_spi_read_reg_8(indio_dev, reg, &utemp);
                 if (ret)
@@ -284,7 +282,7 @@ static int lis3l02dq_read_raw(struct iio_dev *indio_dev,
                 *val = utemp;
                 return IIO_VAL_INT;
 
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 reg = lis3l02dq_axis_map[LIS3L02DQ_BIAS][chan->address];
                 ret = lis3l02dq_spi_read_reg_8(indio_dev, reg, (u8 *)&stemp);
                 /* to match with what previous code does */
@@ -331,11 +329,11 @@ static ssize_t lis3l02dq_write_frequency(struct device *dev,
                                          size_t len)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        long val;
+        unsigned long val;
         int ret;
         u8 t;
 
-        ret = strict_strtol(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -515,9 +513,9 @@ static irqreturn_t lis3l02dq_event_handler(int irq, void *private)
 }
 
 #define LIS3L02DQ_INFO_MASK                             \
-        ((1 << IIO_CHAN_INFO_SCALE_SHARED) |            \
-         (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |     \
-         (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE))
+        (IIO_CHAN_INFO_SCALE_SHARED_BIT |               \
+         IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |        \
+         IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT)
 
 #define LIS3L02DQ_EVENT_MASK                                    \
         (IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |    \
@@ -534,7 +532,7 @@ static struct iio_chan_spec lis3l02dq_channels[] = {
 };
 
 
-static ssize_t lis3l02dq_read_event_config(struct iio_dev *indio_dev,
+static int lis3l02dq_read_event_config(struct iio_dev *indio_dev,
                                            u64 event_code)
 {
 
@@ -809,3 +807,4 @@ module_spi_driver(lis3l02dq_driver);
 MODULE_AUTHOR("Jonathan Cameron <jic23@cam.ac.uk>");
 MODULE_DESCRIPTION("ST LIS3L02DQ Accelerometer SPI driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:lis3l02dq");
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 89527af8f4c5..98c5c92d3450 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -38,38 +38,6 @@ irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private)
                 return IRQ_WAKE_THREAD;
 }
 
-/**
- * lis3l02dq_read_accel_from_buffer() individual acceleration read from buffer
- **/
-ssize_t lis3l02dq_read_accel_from_buffer(struct iio_buffer *buffer,
-                                         int index,
-                                         int *val)
-{
-        int ret;
-        s16 *data;
-
-        if (!iio_scan_mask_query(buffer, index))
-                return -EINVAL;
-
-        if (!buffer->access->read_last)
-                return -EBUSY;
-
-        data = kmalloc(buffer->access->get_bytes_per_datum(buffer),
-                       GFP_KERNEL);
-        if (data == NULL)
-                return -ENOMEM;
-
-        ret = buffer->access->read_last(buffer, (u8 *)data);
-        if (ret)
-                goto error_free_data;
-        *val = data[bitmap_weight(buffer->scan_mask, index)];
-error_free_data:
-
-        kfree(data);
-
-        return ret;
-}
-
 static const u8 read_all_tx_array[] = {
         LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_X_L_ADDR), 0,
         LIS3L02DQ_READ_REG(LIS3L02DQ_REG_OUT_X_H_ADDR), 0,
@@ -87,21 +55,21 @@ static const u8 read_all_tx_array[] = {
  **/
 static int lis3l02dq_read_all(struct iio_dev *indio_dev, u8 *rx_array)
 {
-        struct iio_buffer *buffer = indio_dev->buffer;
         struct lis3l02dq_state *st = iio_priv(indio_dev);
         struct spi_transfer *xfers;
         struct spi_message msg;
         int ret, i, j = 0;
 
-        xfers = kzalloc((buffer->scan_count) * 2
-                        * sizeof(*xfers), GFP_KERNEL);
+        xfers = kcalloc(bitmap_weight(indio_dev->active_scan_mask,
+                                      indio_dev->masklength) * 2,
+                        sizeof(*xfers), GFP_KERNEL);
         if (!xfers)
                 return -ENOMEM;
 
         mutex_lock(&st->buf_lock);
 
         for (i = 0; i < ARRAY_SIZE(read_all_tx_array)/4; i++)
-                if (test_bit(i, buffer->scan_mask)) {
+                if (test_bit(i, indio_dev->active_scan_mask)) {
                         /* lower byte */
                         xfers[j].tx_buf = st->tx + 2*j;
                         st->tx[2*j] = read_all_tx_array[i*4];
@@ -129,7 +97,8 @@ static int lis3l02dq_read_all(struct iio_dev *indio_dev, u8 *rx_array)
          * values in alternate bytes
          */
         spi_message_init(&msg);
-        for (j = 0; j < buffer->scan_count * 2; j++)
+        for (j = 0; j < bitmap_weight(indio_dev->active_scan_mask,
+                                      indio_dev->masklength) * 2; j++)
                 spi_message_add_tail(&xfers[j], &msg);
 
         ret = spi_sync(st->us, &msg);
@@ -145,14 +114,16 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev,
         int ret, i;
         u8 *rx_array ;
         s16 *data = (s16 *)buf;
+        int scan_count = bitmap_weight(indio_dev->active_scan_mask,
+                                       indio_dev->masklength);
 
-        rx_array = kzalloc(4 * (indio_dev->buffer->scan_count), GFP_KERNEL);
+        rx_array = kzalloc(4 * scan_count, GFP_KERNEL);
         if (rx_array == NULL)
                 return -ENOMEM;
         ret = lis3l02dq_read_all(indio_dev, rx_array);
         if (ret < 0)
                 return ret;
-        for (i = 0; i < indio_dev->buffer->scan_count; i++)
+        for (i = 0; i < scan_count; i++)
                 data[i] = combine_8_to_16(rx_array[i*4+1],
                                         rx_array[i*4+3]);
         kfree(rx_array);
@@ -175,7 +146,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (buffer->scan_count)
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 len = lis3l02dq_get_buffer_element(indio_dev, data);
 
           /* Guaranteed to be aligned with 8 byte boundary */
@@ -363,17 +334,17 @@ static int lis3l02dq_buffer_postenable(struct iio_dev *indio_dev)
         if (ret)
                 goto error_ret;
 
-        if (iio_scan_mask_query(indio_dev->buffer, 0)) {
+        if (test_bit(0, indio_dev->active_scan_mask)) {
                 t |= LIS3L02DQ_REG_CTRL_1_AXES_X_ENABLE;
                 oneenabled = true;
         } else
                 t &= ~LIS3L02DQ_REG_CTRL_1_AXES_X_ENABLE;
-        if (iio_scan_mask_query(indio_dev->buffer, 1)) {
+        if (test_bit(1, indio_dev->active_scan_mask)) {
                 t |= LIS3L02DQ_REG_CTRL_1_AXES_Y_ENABLE;
                 oneenabled = true;
         } else
                 t &= ~LIS3L02DQ_REG_CTRL_1_AXES_Y_ENABLE;
-        if (iio_scan_mask_query(indio_dev->buffer, 2)) {
+        if (test_bit(2, indio_dev->active_scan_mask)) {
                 t |= LIS3L02DQ_REG_CTRL_1_AXES_Z_ENABLE;
                 oneenabled = true;
         } else
@@ -437,11 +408,9 @@ int lis3l02dq_configure_buffer(struct iio_dev *indio_dev)
         indio_dev->buffer = buffer;
         /* Effectively select the buffer implementation */
         indio_dev->buffer->access = &lis3l02dq_access_funcs;
-        buffer->bpe = 2;
 
         buffer->scan_timestamp = true;
-        buffer->setup_ops = &lis3l02dq_buffer_setup_ops;
-        buffer->owner = THIS_MODULE;
+        indio_dev->setup_ops = &lis3l02dq_buffer_setup_ops;
 
         /* Functions are NULL as we set handler below */
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 6c359074a06d..49764fb7181c 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -20,7 +20,8 @@
 #include <linux/module.h>
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../events.h"
+#include "../buffer.h"
 
 #include "sca3000.h"
 
@@ -381,13 +382,17 @@ sca3000_store_measurement_mode(struct device *dev,
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct sca3000_state *st = iio_priv(indio_dev);
         int ret;
-        int mask = 0x03;
-        long val;
+        u8 mask = 0x03;
+        u8 val;
 
         mutex_lock(&st->lock);
-        ret = strict_strtol(buf, 10, &val);
+        ret = kstrtou8(buf, 10, &val);
         if (ret)
                 goto error_ret;
+        if (val > 3) {
+                ret = -EINVAL;
+                goto error_ret;
+        }
         ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
         if (ret)
                 goto error_ret;
@@ -424,7 +429,7 @@ static IIO_DEVICE_ATTR(measurement_mode, S_IRUGO | S_IWUSR,
 static IIO_DEVICE_ATTR(revision, S_IRUGO, sca3000_show_rev, NULL, 0);
 
 #define SCA3000_INFO_MASK                       \
-        (1 << IIO_CHAN_INFO_SCALE_SHARED)
+        IIO_CHAN_INFO_SCALE_SHARED_BIT
 #define SCA3000_EVENT_MASK                                      \
         (IIO_EV_BIT(IIO_EV_TYPE_MAG, IIO_EV_DIR_RISING))
 
@@ -474,7 +479,7 @@ static int sca3000_read_raw(struct iio_dev *indio_dev,
                         (sizeof(*val)*8 - 13);
                 mutex_unlock(&st->lock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 *val = 0;
                 if (chan->type == IIO_ACCEL)
                         *val2 = st->info->scale;
@@ -1161,9 +1166,9 @@ static int __devinit sca3000_probe(struct spi_device *spi)
         if (ret < 0)
                 goto error_unregister_dev;
         if (indio_dev->buffer) {
-                iio_scan_mask_set(indio_dev->buffer, 0);
-                iio_scan_mask_set(indio_dev->buffer, 1);
-                iio_scan_mask_set(indio_dev->buffer, 2);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer, 0);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer, 1);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer, 2);
         }
 
         if (spi->irq) {
@@ -1240,6 +1245,7 @@ static const struct spi_device_id sca3000_id[] = {
         {"sca3000_e05", e05},
         {}
 };
+MODULE_DEVICE_TABLE(spi, sca3000_id);
 
 static struct spi_driver sca3000_driver = {
         .driver = {
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index 4a9a01dccd0c..6b824a11f7f4 100644
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ b/drivers/staging/iio/accel/sca3000_ring.c
@@ -20,7 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_hw.h"
 #include "sca3000.h"
 
@@ -146,7 +146,6 @@ static int sca3000_ring_get_bytes_per_datum(struct iio_buffer *r)
 }
 
 static IIO_BUFFER_ENABLE_ATTR;
-static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
 static IIO_BUFFER_LENGTH_ATTR;
 
 /**
@@ -158,8 +157,7 @@ static ssize_t sca3000_query_ring_int(struct device *dev,
 {
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int ret, val;
-        struct iio_buffer *ring = dev_get_drvdata(dev);
-        struct iio_dev *indio_dev = ring->indio_dev;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct sca3000_state *st = iio_priv(indio_dev);
 
         mutex_lock(&st->lock);
@@ -180,8 +178,7 @@ static ssize_t sca3000_set_ring_int(struct device *dev,
                                       const char *buf,
                                       size_t len)
 {
-        struct iio_buffer *ring = dev_get_drvdata(dev);
-        struct iio_dev *indio_dev = ring->indio_dev;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct sca3000_state *st = iio_priv(indio_dev);
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         long val;
@@ -222,8 +219,7 @@ static ssize_t sca3000_show_buffer_scale(struct device *dev,
                                          struct device_attribute *attr,
                                          char *buf)
 {
-        struct iio_buffer *ring = dev_get_drvdata(dev);
-        struct iio_dev *indio_dev = ring->indio_dev;
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct sca3000_state *st = iio_priv(indio_dev);
 
         return sprintf(buf, "0.%06d\n", 4*st->info->scale);
@@ -243,7 +239,6 @@ static IIO_DEVICE_ATTR(in_accel_scale,
  */
 static struct attribute *sca3000_ring_attributes[] = {
         &dev_attr_length.attr,
-        &dev_attr_bytes_per_datum.attr,
         &dev_attr_enable.attr,
         &iio_dev_attr_50_percent.dev_attr.attr,
         &iio_dev_attr_75_percent.dev_attr.attr,
@@ -269,7 +264,7 @@ static struct iio_buffer *sca3000_rb_allocate(struct iio_dev *indio_dev)
         buf = &ring->buf;
         buf->stufftoread = 0;
         buf->attrs = &sca3000_ring_attr;
-        iio_buffer_init(buf, indio_dev);
+        iio_buffer_init(buf);
 
         return buf;
 }
@@ -350,7 +345,7 @@ static const struct iio_buffer_setup_ops sca3000_ring_setup_ops = {
 
 void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
 {
-        indio_dev->buffer->setup_ops = &sca3000_ring_setup_ops;
+        indio_dev->setup_ops = &sca3000_ring_setup_ops;
 }
 
 /**
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 797e65cd03e8..45f4504ed927 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -19,7 +19,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger.h"
 #include "../trigger_consumer.h"
@@ -453,25 +453,6 @@ out:
         return ret;
 }
 
-static int ad7192_scan_from_ring(struct ad7192_state *st, unsigned ch, int *val)
-{
-        struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
-        int ret;
-        s64 dat64[2];
-        u32 *dat32 = (u32 *)dat64;
-
-        if (!(test_bit(ch, ring->scan_mask)))
-                return  -EBUSY;
-
-        ret = ring->access->read_last(ring, (u8 *) &dat64);
-        if (ret)
-                return ret;
-
-        *val = *dat32;
-
-        return 0;
-}
-
 static int ad7192_ring_preenable(struct iio_dev *indio_dev)
 {
         struct ad7192_state *st = iio_priv(indio_dev);
@@ -479,12 +460,14 @@ static int ad7192_ring_preenable(struct iio_dev *indio_dev)
         size_t d_size;
         unsigned channel;
 
-        if (!ring->scan_count)
+        if (bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 return -EINVAL;
 
-        channel = find_first_bit(ring->scan_mask, indio_dev->masklength);
+        channel = find_first_bit(indio_dev->active_scan_mask,
+                                 indio_dev->masklength);
 
-        d_size = ring->scan_count *
+        d_size = bitmap_weight(indio_dev->active_scan_mask,
+                               indio_dev->masklength) *
                  indio_dev->channels[0].scan_type.storagebits / 8;
 
         if (ring->scan_timestamp) {
@@ -544,7 +527,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p)
         s64 dat64[2];
         s32 *dat32 = (s32 *)dat64;
 
-        if (ring->scan_count)
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 __ad7192_read_reg(st, 1, 1, AD7192_REG_DATA,
                                   dat32,
                                   indio_dev->channels[0].scan_type.realbits/8);
@@ -592,7 +575,7 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         }
 
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad7192_ring_setup_ops;
+        indio_dev->setup_ops = &ad7192_ring_setup_ops;
 
         /* Flag that polled ring buffering is possible */
         indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
@@ -626,6 +609,10 @@ static irqreturn_t ad7192_data_rdy_trig_poll(int irq, void *private)
         return IRQ_HANDLED;
 }
 
+static struct iio_trigger_ops ad7192_trigger_ops = {
+        .owner = THIS_MODULE,
+};
+
 static int ad7192_probe_trigger(struct iio_dev *indio_dev)
 {
         struct ad7192_state *st = iio_priv(indio_dev);
@@ -638,7 +625,7 @@ static int ad7192_probe_trigger(struct iio_dev *indio_dev)
                 ret = -ENOMEM;
                 goto error_ret;
         }
-
+        st->trig->ops = &ad7192_trigger_ops;
         ret = request_irq(st->spi->irq,
                           ad7192_data_rdy_trig_poll,
                           IRQF_TRIGGER_LOW,
@@ -650,7 +637,6 @@ static int ad7192_probe_trigger(struct iio_dev *indio_dev)
         disable_irq_nosync(st->spi->irq);
         st->irq_dis = true;
         st->trig->dev.parent = &st->spi->dev;
-        st->trig->owner = THIS_MODULE;
         st->trig->private_data = indio_dev;
 
         ret = iio_trigger_register(st->trig);
@@ -795,7 +781,7 @@ static ssize_t ad7192_set(struct device *dev,
                 return -EBUSY;
         }
 
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD7192_REG_GPOCON:
                 if (val)
                         st->gpocon |= AD7192_GPOCON_BPDSW;
@@ -873,8 +859,7 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,
         case 0:
                 mutex_lock(&indio_dev->mlock);
                 if (iio_buffer_enabled(indio_dev))
-                        ret = ad7192_scan_from_ring(st,
-                                        chan->scan_index, &smpl);
+                        ret = -EBUSY;
                 else
                         ret = ad7192_read(st, chan->address,
                                         chan->scan_type.realbits / 8, &smpl);
@@ -901,18 +886,20 @@ static int ad7192_read_raw(struct iio_dev *indio_dev,
                 }
                 return IIO_VAL_INT;
 
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
-                mutex_lock(&indio_dev->mlock);
-                *val = st->scale_avail[AD7192_CONF_GAIN(st->conf)][0];
-                *val2 = st->scale_avail[AD7192_CONF_GAIN(st->conf)][1];
-                mutex_unlock(&indio_dev->mlock);
-
-                return IIO_VAL_INT_PLUS_NANO;
-
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-                *val =  1000;
-
-                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_VOLTAGE:
+                        mutex_lock(&indio_dev->mlock);
+                        *val = st->scale_avail[AD7192_CONF_GAIN(st->conf)][0];
+                        *val2 = st->scale_avail[AD7192_CONF_GAIN(st->conf)][1];
+                        mutex_unlock(&indio_dev->mlock);
+                        return IIO_VAL_INT_PLUS_NANO;
+                case IIO_TEMP:
+                        *val =  1000;
+                        return IIO_VAL_INT;
+                default:
+                        return -EINVAL;
+                }
         }
 
         return -EINVAL;
@@ -935,7 +922,7 @@ static int ad7192_write_raw(struct iio_dev *indio_dev,
         }
 
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 ret = -EINVAL;
                 for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++)
                         if (val2 == st->scale_avail[i][1]) {
@@ -992,7 +979,7 @@ static const struct iio_info ad7192_info = {
           .extend_name = _name,                                         \
           .channel = _chan,                                             \
           .channel2 = _chan2,                                           \
-          .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),               \
+          .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,          \
           .address = _address,                                          \
           .scan_index = _si,                                            \
           .scan_type =  IIO_ST('s', 24, 32, 0)}
@@ -1001,7 +988,7 @@ static const struct iio_info ad7192_info = {
         { .type = IIO_VOLTAGE,                                          \
           .indexed = 1,                                                 \
           .channel = _chan,                                             \
-          .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),               \
+          .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,          \
           .address = _address,                                          \
           .scan_index = _si,                                            \
           .scan_type =  IIO_ST('s', 24, 32, 0)}
@@ -1010,7 +997,7 @@ static const struct iio_info ad7192_info = {
         { .type = IIO_TEMP,                                             \
           .indexed = 1,                                                 \
           .channel = _chan,                                             \
-          .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),             \
+          .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,                \
           .address = _address,                                          \
           .scan_index = _si,                                            \
           .scan_type =  IIO_ST('s', 24, 32, 0)}
@@ -1151,6 +1138,7 @@ static const struct spi_device_id ad7192_id[] = {
         {"ad7195", ID_AD7195},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7192_id);
 
 static struct spi_driver ad7192_driver = {
         .driver = {
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index dbaeae81e873..7dbd6812c240 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -18,6 +18,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../events.h"
 
 #include "ad7280a.h"
 
@@ -455,10 +456,10 @@ static ssize_t ad7280_store_balance_timer(struct device *dev,
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad7280_state *st = iio_priv(indio_dev);
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-        long val;
+        unsigned long val;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &val);
+        ret = kstrtoul(buf, 10, &val);
         if (ret)
                 return ret;
 
@@ -487,8 +488,8 @@ static int ad7280_channel_init(struct ad7280_state *st)
 {
         int dev, ch, cnt;
 
-        st->channels = kzalloc(sizeof(*st->channels) *
-                                ((st->slave_num + 1) * 12 + 2), GFP_KERNEL);
+        st->channels = kcalloc((st->slave_num + 1) * 12 + 2,
+                               sizeof(*st->channels), GFP_KERNEL);
         if (st->channels == NULL)
                 return -ENOMEM;
 
@@ -507,7 +508,7 @@ static int ad7280_channel_init(struct ad7280_state *st)
                         }
                         st->channels[cnt].indexed = 1;
                         st->channels[cnt].info_mask =
-                                (1 << IIO_CHAN_INFO_SCALE_SHARED);
+                                IIO_CHAN_INFO_SCALE_SHARED_BIT;
                         st->channels[cnt].address =
                                 AD7280A_DEVADDR(dev) << 8 | ch;
                         st->channels[cnt].scan_index = cnt;
@@ -523,7 +524,7 @@ static int ad7280_channel_init(struct ad7280_state *st)
         st->channels[cnt].channel2 = dev * 6;
         st->channels[cnt].address = AD7280A_ALL_CELLS;
         st->channels[cnt].indexed = 1;
-        st->channels[cnt].info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED);
+        st->channels[cnt].info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT;
         st->channels[cnt].scan_index = cnt;
         st->channels[cnt].scan_type.sign = 'u';
         st->channels[cnt].scan_type.realbits = 32;
@@ -600,7 +601,7 @@ static ssize_t ad7280_read_channel_config(struct device *dev,
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         unsigned val;
 
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD7280A_CELL_OVERVOLTAGE:
                 val = 1000 + (st->cell_threshhigh * 1568) / 100;
                 break;
@@ -636,7 +637,7 @@ static ssize_t ad7280_write_channel_config(struct device *dev,
         if (ret)
                 return ret;
 
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD7280A_CELL_OVERVOLTAGE:
         case AD7280A_CELL_UNDERVOLTAGE:
                 val = ((val - 1000) * 100) / 1568; /* LSB 15.68mV */
@@ -652,7 +653,7 @@ static ssize_t ad7280_write_channel_config(struct device *dev,
         val = clamp(val, 0L, 0xFFL);
 
         mutex_lock(&indio_dev->mlock);
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD7280A_CELL_OVERVOLTAGE:
                 st->cell_threshhigh = val;
                 break;
@@ -682,13 +683,13 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
         unsigned *channels;
         int i, ret;
 
-        channels = kzalloc(sizeof(*channels) * st->scan_cnt, GFP_KERNEL);
+        channels = kcalloc(st->scan_cnt, sizeof(*channels), GFP_KERNEL);
         if (channels == NULL)
                 return IRQ_HANDLED;
 
         ret = ad7280_read_all_channels(st, st->scan_cnt, channels);
         if (ret < 0)
-                return IRQ_HANDLED;
+                goto out;
 
         for (i = 0; i < st->scan_cnt; i++) {
                 if (((channels[i] >> 23) & 0xF) <= AD7280A_CELL_VOLTAGE_6) {
@@ -731,6 +732,7 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
                 }
         }
 
+out:
         kfree(channels);
 
         return IRQ_HANDLED;
@@ -801,7 +803,7 @@ static int ad7280_read_raw(struct iio_dev *indio_dev,
                 *val = ret;
 
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 if ((chan->address & 0xFF) <= AD7280A_CELL_VOLTAGE_6)
                         scale_uv = (4000 * 1000) >> AD7280A_BITS;
                 else
@@ -968,11 +970,11 @@ static const struct spi_device_id ad7280_id[] = {
         {"ad7280a", 0},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7280_id);
 
 static struct spi_driver ad7280_driver = {
         .driver = {
                 .name   = "ad7280",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7280_probe,
diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index aa44a52a7adb..0a13616e3db9 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -19,6 +19,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../events.h"
 
 /*
  * Simplified handling
@@ -500,7 +501,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
                 default:
                         return -EINVAL;
                 }
-        case (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE):
+        case IIO_CHAN_INFO_AVERAGE_RAW:
                 ret = i2c_smbus_read_word_data(chip->client,
                                                AD7291_T_AVERAGE);
                         if (ret < 0)
@@ -509,18 +510,24 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
                                 AD7291_VALUE_MASK) << 4) >> 4;
                         *val = signval;
                         return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
-                scale_uv = (chip->int_vref_mv * 1000) >> AD7291_BITS;
-                *val =  scale_uv / 1000;
-                *val2 = (scale_uv % 1000) * 1000;
-                return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-                /*
-                * One LSB of the ADC corresponds to 0.25 deg C.
-                * The temperature reading is in 12-bit twos complement format
-                */
-                *val = 250;
-                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_VOLTAGE:
+                        scale_uv = (chip->int_vref_mv * 1000) >> AD7291_BITS;
+                        *val =  scale_uv / 1000;
+                        *val2 = (scale_uv % 1000) * 1000;
+                        return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_TEMP:
+                        /*
+                         * One LSB of the ADC corresponds to 0.25 deg C.
+                         * The temperature reading is in 12-bit twos
+                         * complement format
+                         */
+                        *val = 250;
+                        return IIO_VAL_INT;
+                default:
+                        return -EINVAL;
+                }
         default:
                 return -EINVAL;
         }
@@ -529,7 +536,7 @@ static int ad7291_read_raw(struct iio_dev *indio_dev,
 #define AD7291_VOLTAGE_CHAN(_chan)                                      \
 {                                                                       \
         .type = IIO_VOLTAGE,                                            \
-        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),                 \
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,                    \
         .indexed = 1,                                                   \
         .channel = _chan,                                               \
         .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)|\
@@ -547,8 +554,8 @@ static const struct iio_chan_spec ad7291_channels[] = {
         AD7291_VOLTAGE_CHAN(7),
         {
                 .type = IIO_TEMP,
-                .info_mask = (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE) |
-                                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT |
+                                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .indexed = 1,
                 .channel = 0,
                 .event_mask =
diff --git a/drivers/staging/iio/adc/ad7298.h b/drivers/staging/iio/adc/ad7298.h
index 9ddf5cf0e519..a0e5dea415ef 100644
--- a/drivers/staging/iio/adc/ad7298.h
+++ b/drivers/staging/iio/adc/ad7298.h
@@ -54,14 +54,9 @@ struct ad7298_state {
 };
 
 #ifdef CONFIG_IIO_BUFFER
-int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch);
 int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7298_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_IIO_BUFFER */
-static inline int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch)
-{
-        return 0;
-}
 
 static inline int
 ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/staging/iio/adc/ad7298_core.c
index a799bd1922dc..8dd6aa9cf928 100644
--- a/drivers/staging/iio/adc/ad7298_core.c
+++ b/drivers/staging/iio/adc/ad7298_core.c
@@ -18,37 +18,37 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "ad7298.h"
 
 static struct iio_chan_spec ad7298_channels[] = {
         IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  9, AD7298_CH_TEMP, IIO_ST('s', 32, 32, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  0, 0, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  1, 1, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 2, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  2, 2, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 3, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  3, 3, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 4, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  4, 4, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 5, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  5, 5, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 6, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  6, 6, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 7, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                 IIO_CHAN_INFO_SCALE_SHARED_BIT,
                  7, 7, IIO_ST('u', 12, 16, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(8),
 };
@@ -69,27 +69,28 @@ static int ad7298_scan_direct(struct ad7298_state *st, unsigned ch)
 static int ad7298_scan_temp(struct ad7298_state *st, int *val)
 {
         int tmp, ret;
+        __be16 buf;
 
-        tmp = cpu_to_be16(AD7298_WRITE | AD7298_TSENSE |
+        buf = cpu_to_be16(AD7298_WRITE | AD7298_TSENSE |
                           AD7298_TAVG | st->ext_ref);
 
-        ret = spi_write(st->spi, (u8 *)&tmp, 2);
+        ret = spi_write(st->spi, (u8 *)&buf, 2);
         if (ret)
                 return ret;
 
-        tmp = 0;
+        buf = cpu_to_be16(0);
 
-        ret = spi_write(st->spi, (u8 *)&tmp, 2);
+        ret = spi_write(st->spi, (u8 *)&buf, 2);
         if (ret)
                 return ret;
 
         usleep_range(101, 1000); /* sleep > 100us */
 
-        ret = spi_read(st->spi, (u8 *)&tmp, 2);
+        ret = spi_read(st->spi, (u8 *)&buf, 2);
         if (ret)
                 return ret;
 
-        tmp = be16_to_cpu(tmp) & RES_MASK(AD7298_BITS);
+        tmp = be16_to_cpu(buf) & RES_MASK(AD7298_BITS);
 
         /*
          * One LSB of the ADC corresponds to 0.25 deg C.
@@ -122,12 +123,8 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
         switch (m) {
         case 0:
                 mutex_lock(&indio_dev->mlock);
-                if (iio_buffer_enabled(indio_dev)) {
-                        if (chan->address == AD7298_CH_TEMP)
-                                ret = -ENODEV;
-                        else
-                                ret = ad7298_scan_from_ring(indio_dev,
-                                                            chan->address);
+                if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
+                        ret = -EBUSY;
                 } else {
                         if (chan->address == AD7298_CH_TEMP)
                                 ret = ad7298_scan_temp(st, val);
@@ -143,15 +140,20 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
                         *val = ret & RES_MASK(AD7298_BITS);
 
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
-                scale_uv = (st->int_vref_mv * 1000) >> AD7298_BITS;
-                *val =  scale_uv / 1000;
-                *val2 = (scale_uv % 1000) * 1000;
-                return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-                *val =  1;
-                *val2 = 0;
-                return IIO_VAL_INT_PLUS_MICRO;
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_VOLTAGE:
+                        scale_uv = (st->int_vref_mv * 1000) >> AD7298_BITS;
+                        *val =  scale_uv / 1000;
+                        *val2 = (scale_uv % 1000) * 1000;
+                        return IIO_VAL_INT_PLUS_MICRO;
+                case IIO_TEMP:
+                        *val =  1;
+                        *val2 = 0;
+                        return IIO_VAL_INT_PLUS_MICRO;
+                default:
+                        return -EINVAL;
+                }
         }
         return -EINVAL;
 }
@@ -265,11 +267,11 @@ static const struct spi_device_id ad7298_id[] = {
         {"ad7298", 0},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7298_id);
 
 static struct spi_driver ad7298_driver = {
         .driver = {
                 .name   = "ad7298",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7298_probe,
@@ -281,4 +283,3 @@ module_spi_driver(ad7298_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD7298 ADC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad7298");
diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
index 47630d506a63..d1a12dd015e2 100644
--- a/drivers/staging/iio/adc/ad7298_ring.c
+++ b/drivers/staging/iio/adc/ad7298_ring.c
@@ -12,41 +12,12 @@
 #include <linux/spi/spi.h>
 
 #include "../iio.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger_consumer.h"
 
 #include "ad7298.h"
 
-int ad7298_scan_from_ring(struct iio_dev *indio_dev, long ch)
-{
-        struct iio_buffer *ring = indio_dev->buffer;
-        int ret;
-        u16 *ring_data;
-
-        if (!(test_bit(ch, ring->scan_mask))) {
-                ret = -EBUSY;
-                goto error_ret;
-        }
-
-        ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-                            GFP_KERNEL);
-        if (ring_data == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = ring->access->read_last(ring, (u8 *) ring_data);
-        if (ret)
-                goto error_free_ring_data;
-
-        ret = be16_to_cpu(ring_data[ch]);
-
-error_free_ring_data:
-        kfree(ring_data);
-error_ret:
-        return ret;
-}
-
 /**
  * ad7298_ring_preenable() setup the parameters of the ring before enabling
  *
@@ -61,8 +32,9 @@ static int ad7298_ring_preenable(struct iio_dev *indio_dev)
         size_t d_size;
         int i, m;
         unsigned short command;
-
-        d_size = ring->scan_count * (AD7298_STORAGE_BITS / 8);
+        int scan_count = bitmap_weight(indio_dev->active_scan_mask,
+                                       indio_dev->masklength);
+        d_size = scan_count * (AD7298_STORAGE_BITS / 8);
 
         if (ring->scan_timestamp) {
                 d_size += sizeof(s64);
@@ -79,7 +51,7 @@ static int ad7298_ring_preenable(struct iio_dev *indio_dev)
         command = AD7298_WRITE | st->ext_ref;
 
         for (i = 0, m = AD7298_CH(0); i < AD7298_MAX_CHAN; i++, m >>= 1)
-                if (test_bit(i, ring->scan_mask))
+                if (test_bit(i, indio_dev->active_scan_mask))
                         command |= m;
 
         st->tx_buf[0] = cpu_to_be16(command);
@@ -96,7 +68,7 @@ static int ad7298_ring_preenable(struct iio_dev *indio_dev)
         spi_message_add_tail(&st->ring_xfer[0], &st->ring_msg);
         spi_message_add_tail(&st->ring_xfer[1], &st->ring_msg);
 
-        for (i = 0; i < ring->scan_count; i++) {
+        for (i = 0; i < scan_count; i++) {
                 st->ring_xfer[i + 2].rx_buf = &st->rx_buf[i];
                 st->ring_xfer[i + 2].len = 2;
                 st->ring_xfer[i + 2].cs_change = 1;
@@ -134,7 +106,8 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)
                         &time_ns, sizeof(time_ns));
         }
 
-        for (i = 0; i < ring->scan_count; i++)
+        for (i = 0; i < bitmap_weight(indio_dev->active_scan_mask,
+                                                 indio_dev->masklength); i++)
                 buf[i] = be16_to_cpu(st->rx_buf[i]);
 
         indio_dev->buffer->access->store_to(ring, (u8 *)buf, time_ns);
@@ -174,7 +147,7 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         }
 
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad7298_ring_setup_ops;
+        indio_dev->setup_ops = &ad7298_ring_setup_ops;
         indio_dev->buffer->scan_timestamp = true;
 
         /* Flag that polled ring buffering is possible */
diff --git a/drivers/staging/iio/adc/ad7476.h b/drivers/staging/iio/adc/ad7476.h
index 60142926565f..27f696c75cc4 100644
--- a/drivers/staging/iio/adc/ad7476.h
+++ b/drivers/staging/iio/adc/ad7476.h
@@ -50,14 +50,9 @@ enum ad7476_supported_device_ids {
 };
 
 #ifdef CONFIG_IIO_BUFFER
-int ad7476_scan_from_ring(struct iio_dev *indio_dev);
 int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7476_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_IIO_BUFFER */
-static inline int ad7476_scan_from_ring(struct iio_dev *indio_dev)
-{
-        return 0;
-}
 
 static inline int
 ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index 0b5852030ab6..0c064d1c3927 100644
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -17,7 +17,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "ad7476.h"
 
@@ -46,7 +46,7 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
         case 0:
                 mutex_lock(&indio_dev->mlock);
                 if (iio_buffer_enabled(indio_dev))
-                        ret = ad7476_scan_from_ring(indio_dev);
+                        ret = -EBUSY;
                 else
                         ret = ad7476_scan_direct(st);
                 mutex_unlock(&indio_dev->mlock);
@@ -56,7 +56,7 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
                 *val = (ret >> st->chip_info->channel[0].scan_type.shift) &
                         RES_MASK(st->chip_info->channel[0].scan_type.realbits);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 scale_uv = (st->int_vref_mv * 1000)
                         >> st->chip_info->channel[0].scan_type.realbits;
                 *val =  scale_uv/1000;
@@ -69,49 +69,49 @@ static int ad7476_read_raw(struct iio_dev *indio_dev,
 static const struct ad7476_chip_info ad7476_chip_info_tbl[] = {
         [ID_AD7466] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 12, 16, 0), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7467] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 10, 16, 2), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7468] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1 , 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 8, 16, 4), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7475] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 12, 16, 0), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7476] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 12, 16, 0), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7477] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 10, 16, 2), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7478] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 8, 16, 4), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
         },
         [ID_AD7495] = {
                 .channel[0] = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                       (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                       IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                        0, 0, IIO_ST('u', 12, 16, 0), 0),
                 .channel[1] = IIO_CHAN_SOFT_TIMESTAMP(1),
                 .int_vref_mv = 2500,
@@ -237,11 +237,11 @@ static const struct spi_device_id ad7476_id[] = {
         {"ad7495", ID_AD7495},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7476_id);
 
 static struct spi_driver ad7476_driver = {
         .driver = {
                 .name   = "ad7476",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7476_probe,
@@ -253,4 +253,3 @@ module_spi_driver(ad7476_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD7475/6/7/8(A) AD7466/7/8 ADC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad7476");
diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
index e82c1a433f4f..4e298b2a05b2 100644
--- a/drivers/staging/iio/adc/ad7476_ring.c
+++ b/drivers/staging/iio/adc/ad7476_ring.c
@@ -14,36 +14,12 @@
 #include <linux/spi/spi.h>
 
 #include "../iio.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger_consumer.h"
 
 #include "ad7476.h"
 
-int ad7476_scan_from_ring(struct iio_dev *indio_dev)
-{
-        struct iio_buffer *ring = indio_dev->buffer;
-        int ret;
-        u8 *ring_data;
-
-        ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-                            GFP_KERNEL);
-        if (ring_data == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = ring->access->read_last(ring, ring_data);
-        if (ret)
-                goto error_free_ring_data;
-
-        ret = (ring_data[0] << 8) | ring_data[1];
-
-error_free_ring_data:
-        kfree(ring_data);
-error_ret:
-        return ret;
-}
-
 /**
  * ad7476_ring_preenable() setup the parameters of the ring before enabling
  *
@@ -56,7 +32,8 @@ static int ad7476_ring_preenable(struct iio_dev *indio_dev)
         struct ad7476_state *st = iio_priv(indio_dev);
         struct iio_buffer *ring = indio_dev->buffer;
 
-        st->d_size = ring->scan_count *
+        st->d_size = bitmap_weight(indio_dev->active_scan_mask,
+                                   indio_dev->masklength) *
                 st->chip_info->channel[0].scan_type.storagebits / 8;
 
         if (ring->scan_timestamp) {
@@ -137,7 +114,7 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         }
 
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad7476_ring_setup_ops;
+        indio_dev->setup_ops = &ad7476_ring_setup_ops;
         indio_dev->buffer->scan_timestamp = true;
 
         /* Flag that polled ring buffering is possible */
diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h
index 35018c3f518e..10f59896597f 100644
--- a/drivers/staging/iio/adc/ad7606.h
+++ b/drivers/staging/iio/adc/ad7606.h
@@ -99,7 +99,6 @@ enum ad7606_supported_device_ids {
         ID_AD7606_4
 };
 
-int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch);
 int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7606_ring_cleanup(struct iio_dev *indio_dev);
 #endif /* IIO_ADC_AD7606_H_ */
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index e3ecd3d2ef3a..ddb7ef92f5c1 100644
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -20,7 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "ad7606.h"
 
@@ -91,7 +91,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
         case 0:
                 mutex_lock(&indio_dev->mlock);
                 if (iio_buffer_enabled(indio_dev))
-                        ret = ad7606_scan_from_ring(indio_dev, chan->address);
+                        ret = -EBUSY;
                 else
                         ret = ad7606_scan_direct(indio_dev, chan->address);
                 mutex_unlock(&indio_dev->mlock);
@@ -100,7 +100,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev,
                         return ret;
                 *val = (short) ret;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 scale_uv = (st->range * 1000 * 2)
                         >> st->chip_info->channels[0].scan_type.realbits;
                 *val =  scale_uv / 1000;
diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c
index 688632edd3d7..cff97568189e 100644
--- a/drivers/staging/iio/adc/ad7606_par.c
+++ b/drivers/staging/iio/adc/ad7606_par.c
@@ -189,4 +189,3 @@ module_exit(ad7606_cleanup);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD7606 ADC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:ad7606_par");
diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
index 20927fd53728..e8f94a18a943 100644
--- a/drivers/staging/iio/adc/ad7606_ring.c
+++ b/drivers/staging/iio/adc/ad7606_ring.c
@@ -12,36 +12,12 @@
 #include <linux/slab.h>
 
 #include "../iio.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger_consumer.h"
 
 #include "ad7606.h"
 
-int ad7606_scan_from_ring(struct iio_dev *indio_dev, unsigned ch)
-{
-        struct iio_buffer *ring = indio_dev->buffer;
-        int ret;
-        u16 *ring_data;
-
-        ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-                            GFP_KERNEL);
-        if (ring_data == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = ring->access->read_last(ring, (u8 *) ring_data);
-        if (ret)
-                goto error_free_ring_data;
-
-        ret = ring_data[ch];
-
-error_free_ring_data:
-        kfree(ring_data);
-error_ret:
-        return ret;
-}
-
 /**
  * ad7606_trigger_handler_th() th/bh of trigger launched polling to ring buffer
  *
@@ -136,8 +112,6 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 
         /* Effectively select the ring buffer implementation */
         indio_dev->buffer->access = &ring_sw_access_funcs;
-        indio_dev->buffer->bpe =
-                st->chip_info->channels[0].scan_type.storagebits / 8;
         indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh,
                                                  &ad7606_trigger_handler_th_bh,
                                                  0,
@@ -152,7 +126,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
 
         /* Ring buffer functions - here trigger setup related */
 
-        indio_dev->buffer->setup_ops = &ad7606_ring_setup_ops;
+        indio_dev->setup_ops = &ad7606_ring_setup_ops;
         indio_dev->buffer->scan_timestamp = true ;
 
         INIT_WORK(&st->poll_work, &ad7606_poll_bh_to_ring);
diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
index b984bd2048b6..237f1c44d296 100644
--- a/drivers/staging/iio/adc/ad7606_spi.c
+++ b/drivers/staging/iio/adc/ad7606_spi.c
@@ -97,11 +97,11 @@ static const struct spi_device_id ad7606_id[] = {
         {"ad7606-4", ID_AD7606_4},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7606_id);
 
 static struct spi_driver ad7606_driver = {
         .driver = {
                 .name = "ad7606",
-                .bus = &spi_bus_type,
                 .owner = THIS_MODULE,
                 .pm    = AD7606_SPI_PM_OPS,
         },
@@ -114,4 +114,3 @@ module_spi_driver(ad7606_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD7606 ADC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad7606_spi");
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index ec90261cbc3c..a13e58c814e6 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -114,7 +114,7 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,
                         *val *= 128;
 
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 scale_uv = (st->int_vref_mv * 100000)
                         >> (channel.scan_type.realbits - 1);
                 *val =  scale_uv / 100000;
@@ -127,12 +127,12 @@ static int ad7780_read_raw(struct iio_dev *indio_dev,
 static const struct ad7780_chip_info ad7780_chip_info_tbl[] = {
         [ID_AD7780] = {
                 .channel = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                    (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                    IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                     0, 0, IIO_ST('s', 24, 32, 8), 0),
         },
         [ID_AD7781] = {
                 .channel = IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,
-                                    (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                                    IIO_CHAN_INFO_SCALE_SHARED_BIT,
                                     0, 0, IIO_ST('s', 20, 32, 12), 0),
         },
 };
@@ -272,11 +272,11 @@ static const struct spi_device_id ad7780_id[] = {
         {"ad7781", ID_AD7781},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7780_id);
 
 static struct spi_driver ad7780_driver = {
         .driver = {
                 .name   = "ad7780",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7780_probe,
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 1c5588e88cdf..6a058b19c49a 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -20,7 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger.h"
 #include "../trigger_consumer.h"
@@ -316,25 +316,6 @@ out:
         return ret;
 }
 
-static int ad7793_scan_from_ring(struct ad7793_state *st, unsigned ch, int *val)
-{
-        struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
-        int ret;
-        s64 dat64[2];
-        u32 *dat32 = (u32 *)dat64;
-
-        if (!(test_bit(ch, ring->scan_mask)))
-                return  -EBUSY;
-
-        ret = ring->access->read_last(ring, (u8 *) &dat64);
-        if (ret)
-                return ret;
-
-        *val = *dat32;
-
-        return 0;
-}
-
 static int ad7793_ring_preenable(struct iio_dev *indio_dev)
 {
         struct ad7793_state *st = iio_priv(indio_dev);
@@ -342,14 +323,15 @@ static int ad7793_ring_preenable(struct iio_dev *indio_dev)
         size_t d_size;
         unsigned channel;
 
-        if (!ring->scan_count)
+        if (bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 return -EINVAL;
 
-        channel = find_first_bit(ring->scan_mask,
+        channel = find_first_bit(indio_dev->active_scan_mask,
                                  indio_dev->masklength);
 
-        d_size = ring->scan_count *
-                 indio_dev->channels[0].scan_type.storagebits / 8;
+        d_size = bitmap_weight(indio_dev->active_scan_mask,
+                               indio_dev->masklength) *
+                indio_dev->channels[0].scan_type.storagebits / 8;
 
         if (ring->scan_timestamp) {
                 d_size += sizeof(s64);
@@ -411,7 +393,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p)
         s64 dat64[2];
         s32 *dat32 = (s32 *)dat64;
 
-        if (ring->scan_count)
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 __ad7793_read_reg(st, 1, 1, AD7793_REG_DATA,
                                   dat32,
                                   indio_dev->channels[0].scan_type.realbits/8);
@@ -459,7 +441,7 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         }
 
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad7793_ring_setup_ops;
+        indio_dev->setup_ops = &ad7793_ring_setup_ops;
 
         /* Flag that polled ring buffering is possible */
         indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
@@ -493,6 +475,10 @@ static irqreturn_t ad7793_data_rdy_trig_poll(int irq, void *private)
         return IRQ_HANDLED;
 }
 
+static struct iio_trigger_ops ad7793_trigger_ops = {
+        .owner = THIS_MODULE,
+};
+
 static int ad7793_probe_trigger(struct iio_dev *indio_dev)
 {
         struct ad7793_state *st = iio_priv(indio_dev);
@@ -505,6 +491,7 @@ static int ad7793_probe_trigger(struct iio_dev *indio_dev)
                 ret = -ENOMEM;
                 goto error_ret;
         }
+        st->trig->ops = &ad7793_trigger_ops;
 
         ret = request_irq(st->spi->irq,
                           ad7793_data_rdy_trig_poll,
@@ -517,7 +504,6 @@ static int ad7793_probe_trigger(struct iio_dev *indio_dev)
         disable_irq_nosync(st->spi->irq);
         st->irq_dis = true;
         st->trig->dev.parent = &st->spi->dev;
-        st->trig->owner = THIS_MODULE;
         st->trig->private_data = indio_dev;
 
         ret = iio_trigger_register(st->trig);
@@ -649,8 +635,7 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
         case 0:
                 mutex_lock(&indio_dev->mlock);
                 if (iio_buffer_enabled(indio_dev))
-                        ret = ad7793_scan_from_ring(st,
-                                        chan->scan_index, &smpl);
+                        ret = -EBUSY;
                 else
                         ret = ad7793_read(st, chan->address,
                                         chan->scan_type.realbits / 8, &smpl);
@@ -667,19 +652,21 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
 
                 return IIO_VAL_INT;
 
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
-                *val = st->scale_avail[(st->conf >> 8) & 0x7][0];
-                *val2 = st->scale_avail[(st->conf >> 8) & 0x7][1];
-
-                return IIO_VAL_INT_PLUS_NANO;
-
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_VOLTAGE:
-                        /* 1170mV / 2^23 * 6 */
-                        scale_uv = (1170ULL * 100000000ULL * 6ULL)
-                                >> (chan->scan_type.realbits -
-                                (unipolar ? 0 : 1));
+                        if (chan->differential) {
+                                *val = st->
+                                        scale_avail[(st->conf >> 8) & 0x7][0];
+                                *val2 = st->
+                                        scale_avail[(st->conf >> 8) & 0x7][1];
+                                return IIO_VAL_INT_PLUS_NANO;
+                        } else {
+                                /* 1170mV / 2^23 * 6 */
+                                scale_uv = (1170ULL * 100000000ULL * 6ULL)
+                                        >> (chan->scan_type.realbits -
+                                            (unipolar ? 0 : 1));
+                        }
                         break;
                 case IIO_TEMP:
                         /* Always uses unity gain and internal ref */
@@ -716,7 +703,7 @@ static int ad7793_write_raw(struct iio_dev *indio_dev,
         }
 
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 ret = -EINVAL;
                 for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++)
                         if (val2 == st->scale_avail[i][1]) {
@@ -775,7 +762,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 0,
                         .channel2 = 0,
                         .address = AD7793_CH_AIN1P_AIN1M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 0,
                         .scan_type = IIO_ST('s', 24, 32, 0)
                 },
@@ -786,7 +773,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 1,
                         .channel2 = 1,
                         .address = AD7793_CH_AIN2P_AIN2M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 1,
                         .scan_type = IIO_ST('s', 24, 32, 0)
                 },
@@ -797,7 +784,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 2,
                         .channel2 = 2,
                         .address = AD7793_CH_AIN3P_AIN3M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 2,
                         .scan_type = IIO_ST('s', 24, 32, 0)
                 },
@@ -809,7 +796,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 2,
                         .channel2 = 2,
                         .address = AD7793_CH_AIN1M_AIN1M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 2,
                         .scan_type = IIO_ST('s', 24, 32, 0)
                 },
@@ -818,7 +805,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .indexed = 1,
                         .channel = 0,
                         .address = AD7793_CH_TEMP,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                         .scan_index = 4,
                         .scan_type = IIO_ST('s', 24, 32, 0),
                 },
@@ -828,7 +815,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .indexed = 1,
                         .channel = 4,
                         .address = AD7793_CH_AVDD_MONITOR,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                         .scan_index = 5,
                         .scan_type = IIO_ST('s', 24, 32, 0),
                 },
@@ -842,7 +829,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 0,
                         .channel2 = 0,
                         .address = AD7793_CH_AIN1P_AIN1M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 0,
                         .scan_type = IIO_ST('s', 16, 32, 0)
                 },
@@ -853,7 +840,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 1,
                         .channel2 = 1,
                         .address = AD7793_CH_AIN2P_AIN2M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 1,
                         .scan_type = IIO_ST('s', 16, 32, 0)
                 },
@@ -864,7 +851,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 2,
                         .channel2 = 2,
                         .address = AD7793_CH_AIN3P_AIN3M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 2,
                         .scan_type = IIO_ST('s', 16, 32, 0)
                 },
@@ -876,7 +863,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .channel = 2,
                         .channel2 = 2,
                         .address = AD7793_CH_AIN1M_AIN1M,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .scan_index = 2,
                         .scan_type = IIO_ST('s', 16, 32, 0)
                 },
@@ -885,7 +872,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .indexed = 1,
                         .channel = 0,
                         .address = AD7793_CH_TEMP,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                         .scan_index = 4,
                         .scan_type = IIO_ST('s', 16, 32, 0),
                 },
@@ -895,7 +882,7 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
                         .indexed = 1,
                         .channel = 4,
                         .address = AD7793_CH_AVDD_MONITOR,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                         .scan_index = 5,
                         .scan_type = IIO_ST('s', 16, 32, 0),
                 },
@@ -1034,11 +1021,11 @@ static const struct spi_device_id ad7793_id[] = {
         {"ad7793", ID_AD7793},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7793_id);
 
 static struct spi_driver ad7793_driver = {
         .driver = {
                 .name   = "ad7793",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7793_probe,
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index acbf9363132b..52b720e2b03a 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -18,6 +18,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../events.h"
 
 /*
  * AD7816 config masks
@@ -459,7 +460,6 @@ MODULE_DEVICE_TABLE(spi, ad7816_id);
 static struct spi_driver ad7816_driver = {
         .driver = {
                 .name = "ad7816",
-                .bus = &spi_bus_type,
                 .owner = THIS_MODULE,
         },
         .probe = ad7816_probe,
diff --git a/drivers/staging/iio/adc/ad7887.h b/drivers/staging/iio/adc/ad7887.h
index 3452d1819077..bc53b6532121 100644
--- a/drivers/staging/iio/adc/ad7887.h
+++ b/drivers/staging/iio/adc/ad7887.h
@@ -83,14 +83,9 @@ enum ad7887_supported_device_ids {
 };
 
 #ifdef CONFIG_IIO_BUFFER
-int ad7887_scan_from_ring(struct ad7887_state *st, int channum);
 int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad7887_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_IIO_BUFFER */
-static inline int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
-{
-        return 0;
-}
 
 static inline int
 ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
index 91b8fb09d92b..e9bbc3eed15d 100644
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -17,7 +17,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 
 #include "ad7887.h"
@@ -45,7 +45,7 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
         case 0:
                 mutex_lock(&indio_dev->mlock);
                 if (iio_buffer_enabled(indio_dev))
-                        ret = ad7887_scan_from_ring(st, 1 << chan->address);
+                        ret = -EBUSY;
                 else
                         ret = ad7887_scan_direct(st, chan->address);
                 mutex_unlock(&indio_dev->mlock);
@@ -55,7 +55,7 @@ static int ad7887_read_raw(struct iio_dev *indio_dev,
                 *val = (ret >> st->chip_info->channel[0].scan_type.shift) &
                         RES_MASK(st->chip_info->channel[0].scan_type.realbits);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 scale_uv = (st->int_vref_mv * 1000)
                         >> st->chip_info->channel[0].scan_type.realbits;
                 *val =  scale_uv/1000;
@@ -75,7 +75,7 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
                         .type = IIO_VOLTAGE,
                         .indexed = 1,
                         .channel = 1,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .address = 1,
                         .scan_index = 1,
                         .scan_type = IIO_ST('u', 12, 16, 0),
@@ -84,7 +84,7 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = {
                         .type = IIO_VOLTAGE,
                         .indexed = 1,
                         .channel = 0,
-                        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                         .address = 0,
                         .scan_index = 0,
                         .scan_type = IIO_ST('u', 12, 16, 0),
@@ -246,11 +246,11 @@ static const struct spi_device_id ad7887_id[] = {
         {"ad7887", ID_AD7887},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad7887_id);
 
 static struct spi_driver ad7887_driver = {
         .driver = {
                 .name   = "ad7887",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad7887_probe,
@@ -262,4 +262,3 @@ module_spi_driver(ad7887_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD7887 ADC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad7887");
diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
index cb74cada5611..85076cd962e7 100644
--- a/drivers/staging/iio/adc/ad7887_ring.c
+++ b/drivers/staging/iio/adc/ad7887_ring.c
@@ -13,46 +13,12 @@
 #include <linux/spi/spi.h>
 
 #include "../iio.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger_consumer.h"
 
 #include "ad7887.h"
 
-int ad7887_scan_from_ring(struct ad7887_state *st, int channum)
-{
-        struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
-        int count = 0, ret;
-        u16 *ring_data;
-
-        if (!(test_bit(channum, ring->scan_mask))) {
-                ret = -EBUSY;
-                goto error_ret;
-        }
-
-        ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-                            GFP_KERNEL);
-        if (ring_data == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = ring->access->read_last(ring, (u8 *) ring_data);
-        if (ret)
-                goto error_free_ring_data;
-
-        /* for single channel scan the result is stored with zero offset */
-        if ((test_bit(1, ring->scan_mask) || test_bit(0, ring->scan_mask)) &&
-            (channum == 1))
-                count = 1;
-
-        ret = be16_to_cpu(ring_data[count]);
-
-error_free_ring_data:
-        kfree(ring_data);
-error_ret:
-        return ret;
-}
-
 /**
  * ad7887_ring_preenable() setup the parameters of the ring before enabling
  *
@@ -65,7 +31,8 @@ static int ad7887_ring_preenable(struct iio_dev *indio_dev)
         struct ad7887_state *st = iio_priv(indio_dev);
         struct iio_buffer *ring = indio_dev->buffer;
 
-        st->d_size = ring->scan_count *
+        st->d_size = bitmap_weight(indio_dev->active_scan_mask,
+                                   indio_dev->masklength) *
                 st->chip_info->channel[0].scan_type.storagebits / 8;
 
         if (ring->scan_timestamp) {
@@ -80,7 +47,7 @@ static int ad7887_ring_preenable(struct iio_dev *indio_dev)
                         set_bytes_per_datum(indio_dev->buffer, st->d_size);
 
         /* We know this is a single long so can 'cheat' */
-        switch (*ring->scan_mask) {
+        switch (*indio_dev->active_scan_mask) {
         case (1 << 0):
                 st->ring_msg = &st->msg[AD7887_CH0];
                 break;
@@ -121,7 +88,8 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)
         __u8 *buf;
         int b_sent;
 
-        unsigned int bytes = ring->scan_count *
+        unsigned int bytes = bitmap_weight(indio_dev->active_scan_mask,
+                                           indio_dev->masklength) *
                 st->chip_info->channel[0].scan_type.storagebits / 8;
 
         buf = kzalloc(st->d_size, GFP_KERNEL);
@@ -176,7 +144,7 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
                 goto error_deallocate_sw_rb;
         }
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad7887_ring_setup_ops;
+        indio_dev->setup_ops = &ad7887_ring_setup_ops;
 
         /* Flag that polled ring buffering is possible */
         indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
diff --git a/drivers/staging/iio/adc/ad799x.h b/drivers/staging/iio/adc/ad799x.h
index eda01d5bab7d..356f690a76fb 100644
--- a/drivers/staging/iio/adc/ad799x.h
+++ b/drivers/staging/iio/adc/ad799x.h
@@ -124,15 +124,9 @@ struct ad799x_platform_data {
 int ad7997_8_set_scan_mode(struct ad799x_state *st, unsigned mask);
 
 #ifdef CONFIG_AD799X_RING_BUFFER
-int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum);
 int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void ad799x_ring_cleanup(struct iio_dev *indio_dev);
 #else /* CONFIG_AD799X_RING_BUFFER */
-int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum)
-{
-        return -EINVAL;
-}
-
 
 static inline int
 ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index c0d2f886ea2c..d5b581d8bc2b 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -35,7 +35,8 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../events.h"
+#include "../buffer.h"
 
 #include "ad799x.h"
 
@@ -150,8 +151,7 @@ static int ad799x_read_raw(struct iio_dev *indio_dev,
         case 0:
                 mutex_lock(&indio_dev->mlock);
                 if (iio_buffer_enabled(indio_dev))
-                        ret = ad799x_single_channel_from_ring(indio_dev,
-                                                              chan->scan_index);
+                        ret = -EBUSY;
                 else
                         ret = ad799x_scan_direct(st, chan->scan_index);
                 mutex_unlock(&indio_dev->mlock);
@@ -161,7 +161,7 @@ static int ad799x_read_raw(struct iio_dev *indio_dev,
                 *val = (ret >> chan->scan_type.shift) &
                         RES_MASK(chan->scan_type.realbits);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 scale_uv = (st->int_vref_mv * 1000) >> chan->scan_type.realbits;
                 *val =  scale_uv / 1000;
                 *val2 = (scale_uv % 1000) * 1000;
@@ -934,4 +934,3 @@ module_i2c_driver(ad799x_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD799x ADC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("i2c:ad799x");
diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
index e3f4698d7815..5dded9e7820a 100644
--- a/drivers/staging/iio/adc/ad799x_ring.c
+++ b/drivers/staging/iio/adc/ad799x_ring.c
@@ -17,42 +17,12 @@
 #include <linux/bitops.h>
 
 #include "../iio.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger_consumer.h"
 
 #include "ad799x.h"
 
-int ad799x_single_channel_from_ring(struct iio_dev *indio_dev, int channum)
-{
-        struct iio_buffer *ring = indio_dev->buffer;
-        int count = 0, ret;
-        u16 *ring_data;
-
-        if (!(test_bit(channum, ring->scan_mask))) {
-                ret = -EBUSY;
-                goto error_ret;
-        }
-
-        ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-                            GFP_KERNEL);
-        if (ring_data == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = ring->access->read_last(ring, (u8 *) ring_data);
-        if (ret)
-                goto error_free_ring_data;
-        /* Need a count of channels prior to this one */
-        count = bitmap_weight(ring->scan_mask, channum);
-        ret = be16_to_cpu(ring_data[count]);
-
-error_free_ring_data:
-        kfree(ring_data);
-error_ret:
-        return ret;
-}
-
 /**
  * ad799x_ring_preenable() setup the parameters of the ring before enabling
  *
@@ -71,9 +41,10 @@ static int ad799x_ring_preenable(struct iio_dev *indio_dev)
          */
 
         if (st->id == ad7997 || st->id == ad7998)
-                ad7997_8_set_scan_mode(st, *ring->scan_mask);
+                ad7997_8_set_scan_mode(st, *indio_dev->active_scan_mask);
 
-        st->d_size = ring->scan_count * 2;
+        st->d_size = bitmap_weight(indio_dev->active_scan_mask,
+                                   indio_dev->masklength) * 2;
 
         if (ring->scan_timestamp) {
                 st->d_size += sizeof(s64);
@@ -115,12 +86,13 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
         case ad7991:
         case ad7995:
         case ad7999:
-                cmd = st->config | (*ring->scan_mask << AD799X_CHANNEL_SHIFT);
+                cmd = st->config |
+                        (*indio_dev->active_scan_mask << AD799X_CHANNEL_SHIFT);
                 break;
         case ad7992:
         case ad7993:
         case ad7994:
-                cmd = (*ring->scan_mask << AD799X_CHANNEL_SHIFT) |
+                cmd = (*indio_dev->active_scan_mask << AD799X_CHANNEL_SHIFT) |
                         AD7998_CONV_RES_REG;
                 break;
         case ad7997:
@@ -132,7 +104,8 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)
         }
 
         b_sent = i2c_smbus_read_i2c_block_data(st->client,
-                        cmd, ring->scan_count * 2, rxbuf);
+                        cmd, bitmap_weight(indio_dev->active_scan_mask,
+                                           indio_dev->masklength) * 2, rxbuf);
         if (b_sent < 0)
                 goto done;
 
@@ -183,7 +156,7 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         }
 
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad799x_buf_setup_ops;
+        indio_dev->setup_ops = &ad799x_buf_setup_ops;
         indio_dev->buffer->scan_timestamp = true;
 
         /* Flag that polled ring buffering is possible */
diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c
index bc307f3b024e..eec2f325d549 100644
--- a/drivers/staging/iio/adc/adt7310.c
+++ b/drivers/staging/iio/adc/adt7310.c
@@ -17,7 +17,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-
+#include "../events.h"
 /*
  * ADT7310 registers definition
  */
@@ -877,7 +877,6 @@ MODULE_DEVICE_TABLE(spi, adt7310_id);
 static struct spi_driver adt7310_driver = {
         .driver = {
                 .name = "adt7310",
-                .bus = &spi_bus_type,
                 .owner = THIS_MODULE,
         },
         .probe = adt7310_probe,
diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c
index 3481cf6f7574..c62248ceb37a 100644
--- a/drivers/staging/iio/adc/adt7410.c
+++ b/drivers/staging/iio/adc/adt7410.c
@@ -17,6 +17,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../events.h"
 
 /*
  * ADT7410 registers definition
diff --git a/drivers/staging/iio/adc/max1363.h b/drivers/staging/iio/adc/max1363.h
index cbcb08a2cb50..2cd0112067b2 100644
--- a/drivers/staging/iio/adc/max1363.h
+++ b/drivers/staging/iio/adc/max1363.h
@@ -146,22 +146,22 @@ struct max1363_state {
 };
 
 const struct max1363_mode
-*max1363_match_mode(unsigned long *mask, const struct max1363_chip_info *ci);
+*max1363_match_mode(const unsigned long *mask,
+                    const struct max1363_chip_info *ci);
 
 int max1363_set_scan_mode(struct max1363_state *st);
 
 #ifdef CONFIG_MAX1363_RING_BUFFER
-
-int max1363_single_channel_from_ring(const long *mask,
-                                     struct max1363_state *st);
+int max1363_update_scan_mode(struct iio_dev *indio_dev,
+                             const unsigned long *scan_mask);
 int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev);
 void max1363_ring_cleanup(struct iio_dev *indio_dev);
 
 #else /* CONFIG_MAX1363_RING_BUFFER */
-
-int max1363_single_channel_from_ring(long mask, struct max1363_state *st)
+int max1363_update_scan_mode(struct iio_dev *indio_dev,
+                             const long *scan_mask)
 {
-        return -EINVAL;
+        return 0;
 }
 
 static inline int
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index 3f28f1ab52a2..b92cb4af18ce 100644
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -34,7 +34,8 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../events.h"
+#include "../buffer.h"
 
 #include "max1363.h"
 
@@ -147,7 +148,8 @@ static const struct max1363_mode max1363_mode_table[] = {
 };
 
 const struct max1363_mode
-*max1363_match_mode(unsigned long *mask, const struct max1363_chip_info *ci)
+*max1363_match_mode(const unsigned long *mask,
+const struct max1363_chip_info *ci)
 {
         int i;
         if (mask)
@@ -189,7 +191,6 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
         int ret = 0;
         s32 data;
         char rxbuf[2];
-        const unsigned long *mask;
         struct max1363_state *st = iio_priv(indio_dev);
         struct i2c_client *client = st->client;
 
@@ -198,46 +199,38 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
          * If monitor mode is enabled, the method for reading a single
          * channel will have to be rather different and has not yet
          * been implemented.
+         *
+         * Also, cannot read directly if buffered capture enabled.
          */
-        if (st->monitor_on) {
+        if (st->monitor_on || iio_buffer_enabled(indio_dev)) {
                 ret = -EBUSY;
                 goto error_ret;
         }
 
-        /* If ring buffer capture is occurring, query the buffer */
-        if (iio_buffer_enabled(indio_dev)) {
-                mask = max1363_mode_table[chan->address].modemask;
-                data = max1363_single_channel_from_ring(mask, st);
+        /* Check to see if current scan mode is correct */
+        if (st->current_mode != &max1363_mode_table[chan->address]) {
+                /* Update scan mode if needed */
+                st->current_mode = &max1363_mode_table[chan->address];
+                ret = max1363_set_scan_mode(st);
+                if (ret < 0)
+                        goto error_ret;
+        }
+        if (st->chip_info->bits != 8) {
+                /* Get reading */
+                data = i2c_master_recv(client, rxbuf, 2);
                 if (data < 0) {
                         ret = data;
                         goto error_ret;
                 }
+                data = (s32)(rxbuf[1]) | ((s32)(rxbuf[0] & 0x0F)) << 8;
         } else {
-                /* Check to see if current scan mode is correct */
-                if (st->current_mode != &max1363_mode_table[chan->address]) {
-                        /* Update scan mode if needed */
-                        st->current_mode = &max1363_mode_table[chan->address];
-                        ret = max1363_set_scan_mode(st);
-                        if (ret < 0)
-                                goto error_ret;
-                }
-                if (st->chip_info->bits != 8) {
-                        /* Get reading */
-                        data = i2c_master_recv(client, rxbuf, 2);
-                        if (data < 0) {
-                                ret = data;
-                                goto error_ret;
-                        }
-                        data = (s32)(rxbuf[1]) | ((s32)(rxbuf[0] & 0x0F)) << 8;
-                } else {
-                        /* Get reading */
-                        data = i2c_master_recv(client, rxbuf, 1);
-                        if (data < 0) {
-                                ret = data;
-                                goto error_ret;
-                        }
-                        data = rxbuf[0];
+                /* Get reading */
+                data = i2c_master_recv(client, rxbuf, 1);
+                if (data < 0) {
+                        ret = data;
+                        goto error_ret;
                 }
+                data = rxbuf[0];
         }
         *val = data;
 error_ret:
@@ -260,7 +253,7 @@ static int max1363_read_raw(struct iio_dev *indio_dev,
                 if (ret < 0)
                         return ret;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 if ((1 << (st->chip_info->bits + 1)) >
                     st->chip_info->int_vref_mv) {
                         *val = 0;
@@ -288,7 +281,7 @@ static const enum max1363_modes max1363_mode_list[] = {
 #define MAX1363_EV_M                                            \
         (IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING)      \
          | IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING))
-#define MAX1363_INFO_MASK (1 << IIO_CHAN_INFO_SCALE_SHARED)
+#define MAX1363_INFO_MASK IIO_CHAN_INFO_SCALE_SHARED_BIT
 #define MAX1363_CHAN_U(num, addr, si, bits, evmask)                     \
         {                                                               \
                 .type = IIO_VOLTAGE,                                    \
@@ -296,7 +289,13 @@ static const enum max1363_modes max1363_mode_list[] = {
                 .channel = num,                                         \
                 .address = addr,                                        \
                 .info_mask = MAX1363_INFO_MASK,                         \
-                .scan_type = IIO_ST('u', bits, (bits > 8) ? 16 : 8, 0), \
+                .datasheet_name = "AIN"#num,                            \
+                .scan_type = {                                          \
+                        .sign = 'u',                                    \
+                        .realbits = bits,                               \
+                        .storagebits = (bits > 8) ? 16 : 8,             \
+                        .endianness = IIO_BE,                           \
+                },                                                      \
                 .scan_index = si,                                       \
                 .event_mask = evmask,                                   \
         }
@@ -311,7 +310,13 @@ static const enum max1363_modes max1363_mode_list[] = {
                 .channel2 = num2,                                       \
                 .address = addr,                                        \
                 .info_mask = MAX1363_INFO_MASK,                         \
-                .scan_type = IIO_ST('u', bits, (bits > 8) ? 16 : 8, 0), \
+                .datasheet_name = "AIN"#num"-AIN"#num2,                 \
+                .scan_type = {                                          \
+                        .sign = 's',                                    \
+                        .realbits = bits,                               \
+                        .storagebits = (bits > 8) ? 16 : 8,             \
+                        .endianness = IIO_BE,                           \
+                },                                                      \
                 .scan_index = si,                                       \
                 .event_mask = evmask,                                   \
         }
@@ -833,6 +838,7 @@ static const struct iio_info max1363_info = {
         .read_event_config = &max1363_read_event_config,
         .write_event_config = &max1363_write_event_config,
         .read_raw = &max1363_read_raw,
+        .update_scan_mode = &max1363_update_scan_mode,
         .driver_module = THIS_MODULE,
         .event_attrs = &max1363_event_attribute_group,
 };
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
index df6893e058cc..f730b3fb971a 100644
--- a/drivers/staging/iio/adc/max1363_ring.c
+++ b/drivers/staging/iio/adc/max1363_ring.c
@@ -15,88 +15,25 @@
 #include <linux/bitops.h>
 
 #include "../iio.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 #include "../trigger_consumer.h"
 
 #include "max1363.h"
 
-int max1363_single_channel_from_ring(const long *mask, struct max1363_state *st)
-{
-        struct iio_buffer *ring = iio_priv_to_dev(st)->buffer;
-        int count = 0, ret, index;
-        u8 *ring_data;
-        index = find_first_bit(mask, MAX1363_MAX_CHANNELS);
-
-        if (!(test_bit(index, st->current_mode->modemask))) {
-                ret = -EBUSY;
-                goto error_ret;
-        }
-
-        ring_data = kmalloc(ring->access->get_bytes_per_datum(ring),
-                            GFP_KERNEL);
-        if (ring_data == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        ret = ring->access->read_last(ring, ring_data);
-        if (ret)
-                goto error_free_ring_data;
-        /* Need a count of channels prior to this one */
-
-        count = bitmap_weight(mask, index - 1);
-        if (st->chip_info->bits != 8)
-                ret = ((int)(ring_data[count*2 + 0] & 0x0F) << 8)
-                        + (int)(ring_data[count*2 + 1]);
-        else
-                ret = ring_data[count];
-
-error_free_ring_data:
-        kfree(ring_data);
-error_ret:
-        return ret;
-}
-
-
-/**
- * max1363_ring_preenable() - setup the parameters of the ring before enabling
- *
- * The complex nature of the setting of the nuber of bytes per datum is due
- * to this driver currently ensuring that the timestamp is stored at an 8
- * byte boundary.
- **/
-static int max1363_ring_preenable(struct iio_dev *indio_dev)
+int max1363_update_scan_mode(struct iio_dev *indio_dev,
+                             const unsigned long *scan_mask)
 {
         struct max1363_state *st = iio_priv(indio_dev);
-        struct iio_buffer *ring = indio_dev->buffer;
-        size_t d_size = 0;
-        unsigned long numvals;
 
         /*
          * Need to figure out the current mode based upon the requested
          * scan mask in iio_dev
          */
-        st->current_mode = max1363_match_mode(ring->scan_mask,
-                                        st->chip_info);
+        st->current_mode = max1363_match_mode(scan_mask, st->chip_info);
         if (!st->current_mode)
                 return -EINVAL;
-
         max1363_set_scan_mode(st);
-
-        numvals = bitmap_weight(st->current_mode->modemask,
-                                indio_dev->masklength);
-        if (ring->access->set_bytes_per_datum) {
-                if (ring->scan_timestamp)
-                        d_size += sizeof(s64);
-                if (st->chip_info->bits != 8)
-                        d_size += numvals*2;
-                else
-                        d_size += numvals;
-                if (ring->scan_timestamp && (d_size % 8))
-                        d_size += 8 - (d_size % 8);
-                ring->access->set_bytes_per_datum(ring, d_size);
-        }
-
         return 0;
 }
 
@@ -114,12 +51,14 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 
         /* Ensure the timestamp is 8 byte aligned */
         if (st->chip_info->bits != 8)
-                d_size = numvals*2 + sizeof(s64);
+                d_size = numvals*2;
         else
-                d_size = numvals + sizeof(s64);
-        if (d_size % sizeof(s64))
-                d_size += sizeof(s64) - (d_size % sizeof(s64));
-
+                d_size = numvals;
+        if (indio_dev->buffer->scan_timestamp) {
+                d_size += sizeof(s64);
+                if (d_size % sizeof(s64))
+                        d_size += sizeof(s64) - (d_size % sizeof(s64));
+        }
         /* Monitor mode prevents reading. Whilst not currently implemented
          * might as well have this test in here in the meantime as it does
          * no harm.
@@ -139,9 +78,10 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)
 
         time_ns = iio_get_time_ns();
 
-        memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
+        if (indio_dev->buffer->scan_timestamp)
+                memcpy(rxbuf + d_size - sizeof(s64), &time_ns, sizeof(time_ns));
+        iio_push_to_buffer(indio_dev->buffer, rxbuf, time_ns);
 
-        indio_dev->buffer->access->store_to(indio_dev->buffer, rxbuf, time_ns);
 done:
         iio_trigger_notify_done(indio_dev->trig);
         kfree(rxbuf);
@@ -151,7 +91,7 @@ done:
 
 static const struct iio_buffer_setup_ops max1363_ring_setup_ops = {
         .postenable = &iio_triggered_buffer_postenable,
-        .preenable = &max1363_ring_preenable,
+        .preenable = &iio_sw_buffer_preenable,
         .predisable = &iio_triggered_buffer_predisable,
 };
 
@@ -179,7 +119,7 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         /* Effectively select the ring buffer implementation */
         indio_dev->buffer->access = &ring_sw_access_funcs;
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &max1363_ring_setup_ops;
+        indio_dev->setup_ops = &max1363_ring_setup_ops;
 
         /* Flag that polled ring buffering is possible */
         indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
diff --git a/drivers/staging/iio/addac/adt7316-spi.c b/drivers/staging/iio/addac/adt7316-spi.c
index 1e93c7b7aed9..1ea3cd06299d 100644
--- a/drivers/staging/iio/addac/adt7316-spi.c
+++ b/drivers/staging/iio/addac/adt7316-spi.c
@@ -151,7 +151,6 @@ static int adt7316_spi_resume(struct spi_device *spi_dev)
 static struct spi_driver adt7316_driver = {
         .driver = {
                 .name = "adt7316",
-                .bus = &spi_bus_type,
                 .owner = THIS_MODULE,
         },
         .probe = adt7316_spi_probe,
diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/addac/adt7316.c
index 8df24704ff26..13c39292d3f2 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 
 #include "../iio.h"
+#include "../events.h"
 #include "../sysfs.h"
 #include "adt7316.h"
 
diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer.h
index 9e8f01009979..6fb6e64181a5 100644
--- a/drivers/staging/iio/buffer_generic.h
+++ b/drivers/staging/iio/buffer.h
@@ -11,7 +11,6 @@
 #define _IIO_BUFFER_GENERIC_H_
 #include <linux/sysfs.h>
 #include "iio.h"
-#include "chrdev.h"
 
 #ifdef CONFIG_IIO_BUFFER
 
@@ -19,22 +18,14 @@ struct iio_buffer;
 
 /**
  * struct iio_buffer_access_funcs - access functions for buffers.
- * @mark_in_use:        reference counting, typically to prevent module removal
- * @unmark_in_use:      reduce reference count when no longer using buffer
  * @store_to:           actually store stuff to the buffer
- * @read_last:          get the last element stored
- * @read_first_n:       try to get a specified number of elements (must exist)
- * @mark_param_change:  notify buffer that some relevant parameter has changed
- *                      Often this means the underlying storage may need to
- *                      change.
+ * @read_first_n:       try to get a specified number of bytes (must exist)
  * @request_update:     if a parameter change has been marked, update underlying
  *                      storage.
  * @get_bytes_per_datum:get current bytes per datum
  * @set_bytes_per_datum:set number of bytes per datum
  * @get_length:         get number of datums in buffer
  * @set_length:         set number of datums in buffer
- * @is_enabled:         query if buffer is currently being used
- * @enable:             enable the buffer
  *
  * The purpose of this structure is to make the buffer element
  * modular as event for a given driver, different usecases may require
@@ -45,85 +36,60 @@ struct iio_buffer;
  * any of them not existing.
  **/
 struct iio_buffer_access_funcs {
-        void (*mark_in_use)(struct iio_buffer *buffer);
-        void (*unmark_in_use)(struct iio_buffer *buffer);
-
         int (*store_to)(struct iio_buffer *buffer, u8 *data, s64 timestamp);
-        int (*read_last)(struct iio_buffer *buffer, u8 *data);
         int (*read_first_n)(struct iio_buffer *buffer,
                             size_t n,
                             char __user *buf);
 
-        int (*mark_param_change)(struct iio_buffer *buffer);
         int (*request_update)(struct iio_buffer *buffer);
 
         int (*get_bytes_per_datum)(struct iio_buffer *buffer);
         int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);
         int (*get_length)(struct iio_buffer *buffer);
         int (*set_length)(struct iio_buffer *buffer, int length);
-
-        int (*is_enabled)(struct iio_buffer *buffer);
-        int (*enable)(struct iio_buffer *buffer);
-};
-
-/**
- * struct iio_buffer_setup_ops - buffer setup related callbacks
- * @preenable:          [DRIVER] function to run prior to marking buffer enabled
- * @postenable:         [DRIVER] function to run after marking buffer enabled
- * @predisable:         [DRIVER] function to run prior to marking buffer
- *                      disabled
- * @postdisable:        [DRIVER] function to run after marking buffer disabled
- */
-struct iio_buffer_setup_ops {
-        int                             (*preenable)(struct iio_dev *);
-        int                             (*postenable)(struct iio_dev *);
-        int                             (*predisable)(struct iio_dev *);
-        int                             (*postdisable)(struct iio_dev *);
 };
 
 /**
  * struct iio_buffer - general buffer structure
- * @indio_dev:          industrial I/O device structure
- * @owner:              module that owns the buffer (for ref counting)
  * @length:             [DEVICE] number of datums in buffer
  * @bytes_per_datum:    [DEVICE] size of individual datum including timestamp
- * @bpe:                [DEVICE] size of individual channel value
  * @scan_el_attrs:      [DRIVER] control of scan elements if that scan mode
  *                      control method is used
- * @scan_count: [INTERN] the number of elements in the current scan mode
  * @scan_mask:          [INTERN] bitmask used in masking scan mode elements
+ * @scan_index_timestamp:[INTERN] cache of the index to the timestamp
  * @scan_timestamp:     [INTERN] does the scan mode include a timestamp
  * @access:             [DRIVER] buffer access functions associated with the
  *                      implementation.
- * @flags:              [INTERN] file ops related flags including busy flag.
+ * @scan_el_dev_attr_list:[INTERN] list of scan element related attributes.
+ * @scan_el_group:      [DRIVER] attribute group for those attributes not
+ *                      created from the iio_chan_info array.
+ * @pollq:              [INTERN] wait queue to allow for polling on the buffer.
+ * @stufftoread:        [INTERN] flag to indicate new data.
+ * @demux_list:         [INTERN] list of operations required to demux the scan.
+ * @demux_bounce:       [INTERN] buffer for doing gather from incoming scan.
  **/
 struct iio_buffer {
-        struct iio_dev                          *indio_dev;
-        struct module                           *owner;
         int                                     length;
         int                                     bytes_per_datum;
-        int                                     bpe;
         struct attribute_group                  *scan_el_attrs;
-        int                                     scan_count;
         long                                    *scan_mask;
         bool                                    scan_timestamp;
+        unsigned                                scan_index_timestamp;
         const struct iio_buffer_access_funcs    *access;
-        const struct iio_buffer_setup_ops               *setup_ops;
         struct list_head                        scan_el_dev_attr_list;
         struct attribute_group                  scan_el_group;
         wait_queue_head_t                       pollq;
         bool                                    stufftoread;
-        unsigned long                           flags;
         const struct attribute_group *attrs;
+        struct list_head                        demux_list;
+        unsigned char                           *demux_bounce;
 };
 
 /**
  * iio_buffer_init() - Initialize the buffer structure
  * @buffer: buffer to be initialized
- * @indio_dev: the iio device the buffer is assocated with
  **/
-void iio_buffer_init(struct iio_buffer *buffer,
-                          struct iio_dev *indio_dev);
+void iio_buffer_init(struct iio_buffer *buffer);
 
 void iio_buffer_deinit(struct iio_buffer *buffer);
 
@@ -140,17 +106,27 @@ static inline void __iio_update_buffer(struct iio_buffer *buffer,
         buffer->length = length;
 }
 
-int iio_scan_mask_query(struct iio_buffer *buffer, int bit);
+int iio_scan_mask_query(struct iio_dev *indio_dev,
+                        struct iio_buffer *buffer, int bit);
 
 /**
  * iio_scan_mask_set() - set particular bit in the scan mask
  * @buffer: the buffer whose scan mask we are interested in
  * @bit: the bit to be set.
  **/
-int iio_scan_mask_set(struct iio_buffer *buffer, int bit);
+int iio_scan_mask_set(struct iio_dev *indio_dev,
+                      struct iio_buffer *buffer, int bit);
 
-#define to_iio_buffer(d)                                \
-        container_of(d, struct iio_buffer, dev)
+/**
+ * iio_push_to_buffer() - push to a registered buffer.
+ * @buffer:             IIO buffer structure for device
+ * @scan:               Full scan.
+ * @timestamp:
+ */
+int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
+                       s64 timestamp);
+
+int iio_update_demux(struct iio_dev *indio_dev);
 
 /**
  * iio_buffer_register() - register the buffer with IIO core
@@ -180,12 +156,6 @@ ssize_t iio_buffer_write_length(struct device *dev,
                               const char *buf,
                               size_t len);
 /**
- * iio_buffer_read_bytes_per_datum() - attr for number of bytes in whole datum
- **/
-ssize_t iio_buffer_read_bytes_per_datum(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf);
-/**
  * iio_buffer_store_enable() - attr to turn the buffer on
  **/
 ssize_t iio_buffer_store_enable(struct device *dev,
@@ -201,9 +171,6 @@ ssize_t iio_buffer_show_enable(struct device *dev,
 #define IIO_BUFFER_LENGTH_ATTR DEVICE_ATTR(length, S_IRUGO | S_IWUSR,   \
                                            iio_buffer_read_length,      \
                                            iio_buffer_write_length)
-#define IIO_BUFFER_BYTES_PER_DATUM_ATTR                                 \
-        DEVICE_ATTR(bytes_per_datum, S_IRUGO | S_IWUSR,                 \
-                    iio_buffer_read_bytes_per_datum, NULL)
 
 #define IIO_BUFFER_ENABLE_ATTR DEVICE_ATTR(enable, S_IRUGO | S_IWUSR,   \
                                            iio_buffer_show_enable,      \
diff --git a/drivers/staging/iio/cdc/ad7150.c b/drivers/staging/iio/cdc/ad7150.c
index 47181875e113..b73007dcf4b3 100644
--- a/drivers/staging/iio/cdc/ad7150.c
+++ b/drivers/staging/iio/cdc/ad7150.c
@@ -15,7 +15,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-
+#include "../events.h"
 /*
  * AD7150 registers definition
  */
@@ -111,7 +111,7 @@ static int ad7150_read_raw(struct iio_dev *indio_dev,
                         return ret;
                 *val = swab16(ret);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE):
+        case IIO_CHAN_INFO_AVERAGE_RAW:
                 ret = i2c_smbus_read_word_data(chip->client,
                                         ad7150_addresses[chan->channel][1]);
                 if (ret < 0)
@@ -429,7 +429,7 @@ static const struct iio_chan_spec ad7150_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT,
                 .event_mask =
                 IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
                 IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING) |
@@ -441,7 +441,7 @@ static const struct iio_chan_spec ad7150_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT,
                 .event_mask =
                 IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
                 IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING) |
diff --git a/drivers/staging/iio/cdc/ad7152.c b/drivers/staging/iio/cdc/ad7152.c
index 152d3be6d97d..fdb83c35e6dd 100644
--- a/drivers/staging/iio/cdc/ad7152.c
+++ b/drivers/staging/iio/cdc/ad7152.c
@@ -259,7 +259,7 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
         mutex_lock(&indio_dev->mlock);
 
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (val != 1) {
                         ret = -EINVAL;
                         goto out;
@@ -276,7 +276,7 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
                 ret = 0;
                 break;
 
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 if ((val < 0) | (val > 0xFFFF)) {
                         ret = -EINVAL;
                         goto out;
@@ -289,7 +289,7 @@ static int ad7152_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 if (val != 0) {
                         ret = -EINVAL;
                         goto out;
@@ -372,7 +372,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
 
                 ret = i2c_smbus_read_word_data(chip->client,
                                 ad7152_addresses[chan->channel][AD7152_GAIN]);
@@ -384,7 +384,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT_PLUS_MICRO;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 ret = i2c_smbus_read_word_data(chip->client,
                                 ad7152_addresses[chan->channel][AD7152_OFFS]);
                 if (ret < 0)
@@ -393,7 +393,7 @@ static int ad7152_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 ret = i2c_smbus_read_byte_data(chip->client,
                                 ad7152_addresses[chan->channel][AD7152_SETUP]);
                 if (ret < 0)
@@ -416,7 +416,7 @@ static int ad7152_write_raw_get_fmt(struct iio_dev *indio_dev,
                                long mask)
 {
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 return IIO_VAL_INT_PLUS_NANO;
         default:
                 return IIO_VAL_INT_PLUS_MICRO;
@@ -436,34 +436,34 @@ static const struct iio_chan_spec ad7152_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
         }, {
                 .type = IIO_CAPACITANCE,
                 .differential = 1,
                 .indexed = 1,
                 .channel = 0,
                 .channel2 = 2,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
         }, {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
         }, {
                 .type = IIO_CAPACITANCE,
                 .differential = 1,
                 .indexed = 1,
                 .channel = 1,
                 .channel2 = 3,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
         }
 };
 /*
diff --git a/drivers/staging/iio/cdc/ad7746.c b/drivers/staging/iio/cdc/ad7746.c
index 9df590891a69..40b8512cbc32 100644
--- a/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@ -123,7 +123,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_VT_DATA_HIGH << 8 |
                         AD7746_VTSETUP_VTMD_EXT_VIN,
         },
@@ -132,7 +132,7 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .extend_name = "supply",
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_VT_DATA_HIGH << 8 |
                         AD7746_VTSETUP_VTMD_VDD_MON,
         },
@@ -156,10 +156,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8,
         },
         [CIN1_DIFF] = {
@@ -168,10 +168,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .channel2 = 2,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CAPDIFF
         },
@@ -179,10 +179,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .type = IIO_CAPACITANCE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CIN2,
         },
@@ -192,10 +192,10 @@ static const struct iio_chan_spec ad7746_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .channel2 = 3,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED) |
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = AD7746_REG_CAP_DATA_HIGH << 8 |
                         AD7746_CAPSETUP_CAPDIFF | AD7746_CAPSETUP_CIN2,
         }
@@ -477,7 +477,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
         mutex_lock(&indio_dev->mlock);
 
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (val != 1) {
                         ret = -EINVAL;
                         goto out;
@@ -503,7 +503,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 if ((val < 0) | (val > 0xFFFF)) {
                         ret = -EINVAL;
                         goto out;
@@ -515,7 +515,7 @@ static int ad7746_write_raw(struct iio_dev *indio_dev,
 
                 ret = 0;
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 if ((val < 0) | (val > 43008000)) { /* 21pF */
                         ret = -EINVAL;
                         goto out;
@@ -612,7 +612,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 switch (chan->type) {
                 case IIO_CAPACITANCE:
                         reg = AD7746_REG_CAP_GAINH;
@@ -634,7 +634,7 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT_PLUS_MICRO;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SHARED):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 ret = i2c_smbus_read_word_data(chip->client,
                                                AD7746_REG_CAP_OFFH);
                 if (ret < 0)
@@ -643,13 +643,13 @@ static int ad7746_read_raw(struct iio_dev *indio_dev,
 
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = AD7746_CAPDAC_DACP(chip->capdac[chan->channel]
                         [chan->differential]) * 338646;
 
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_CAPACITANCE:
                         /* 8.192pf / 2^24 */
diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h
deleted file mode 100644
index d8e736f60522..000000000000
--- a/drivers/staging/iio/chrdev.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* The industrial I/O core - character device related
- *
- * Copyright (c) 2008 Jonathan Cameron
- *
- * 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.
- */
-
-#ifndef _IIO_CHRDEV_H_
-#define _IIO_CHRDEV_H_
-
-/**
- * struct iio_event_data - The actual event being pushed to userspace
- * @id:         event identifier
- * @timestamp:  best estimate of time of event occurrence (often from
- *              the interrupt handler)
- */
-struct iio_event_data {
-        u64     id;
-        s64     timestamp;
-};
-
-#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
-#endif
diff --git a/drivers/staging/iio/dac/Kconfig b/drivers/staging/iio/dac/Kconfig
index fac8549dc8e7..13e27979df24 100644
--- a/drivers/staging/iio/dac/Kconfig
+++ b/drivers/staging/iio/dac/Kconfig
@@ -24,6 +24,29 @@ config AD5360
           To compile this driver as module choose M here: the module will be called
           ad5360.
 
+config AD5380
+        tristate "Analog Devices AD5380/81/82/83/84/90/91/92 DAC driver"
+        depends on (SPI_MASTER || I2C)
+        select REGMAP_I2C if I2C
+        select REGMAP_SPI if SPI_MASTER
+        help
+          Say yes here to build support for Analog Devices AD5380, AD5381,
+          AD5382, AD5383, AD5384, AD5390, AD5391, AD5392 multi-channel
+          Digital to Analog Converters (DAC).
+
+          To compile this driver as module choose M here: the module will be called
+          ad5380.
+
+config AD5421
+        tristate "Analog Devices AD5421 DAC driver"
+        depends on SPI
+        help
+          Say yes here to build support for Analog Devices AD5421 loop-powered
+          digital-to-analog convertors (DAC).
+
+          To compile this driver as module choose M here: the module will be called
+          ad5421.
+
 config AD5624R_SPI
         tristate "Analog Devices AD5624/44/64R DAC spi driver"
         depends on SPI
@@ -37,7 +60,7 @@ config AD5446
         help
           Say yes here to build support for Analog Devices AD5444, AD5446,
           AD5512A, AD5542A, AD5543, AD5553, AD5601, AD5611, AD5620, AD5621,
-          AD5640, AD5660 DACs.
+          AD5640, AD5660, AD5662 DACs.
 
           To compile this driver as a module, choose M here: the
           module will be called ad5446.
@@ -52,12 +75,22 @@ config AD5504
           To compile this driver as a module, choose M here: the
           module will be called ad5504.
 
+config AD5764
+        tristate "Analog Devices AD5764/64R/44/44R DAC driver"
+        depends on SPI_MASTER
+        help
+          Say yes here to build support for Analog Devices AD5764, AD5764R, AD5744,
+          AD5744R Digital to Analog Converter.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ad5764.
+
 config AD5791
-        tristate "Analog Devices AD5760/AD5780/AD5781/AD5791 DAC SPI driver"
+        tristate "Analog Devices AD5760/AD5780/AD5781/AD5790/AD5791 DAC SPI driver"
         depends on SPI
         help
           Say yes here to build support for Analog Devices AD5760, AD5780,
-          AD5781, AD5791 High Resolution Voltage Output Digital to
+          AD5781, AD5790, AD5791 High Resolution Voltage Output Digital to
           Analog Converter.
 
           To compile this driver as a module, choose M here: the
diff --git a/drivers/staging/iio/dac/Makefile b/drivers/staging/iio/dac/Makefile
index 07b6f5ebdb52..8ab1d264aab7 100644
--- a/drivers/staging/iio/dac/Makefile
+++ b/drivers/staging/iio/dac/Makefile
@@ -3,10 +3,13 @@
 #
 
 obj-$(CONFIG_AD5360) += ad5360.o
+obj-$(CONFIG_AD5380) += ad5380.o
+obj-$(CONFIG_AD5421) += ad5421.o
 obj-$(CONFIG_AD5624R_SPI) += ad5624r_spi.o
 obj-$(CONFIG_AD5064) += ad5064.o
 obj-$(CONFIG_AD5504) += ad5504.o
 obj-$(CONFIG_AD5446) += ad5446.o
+obj-$(CONFIG_AD5764) += ad5764.o
 obj-$(CONFIG_AD5791) += ad5791.o
 obj-$(CONFIG_AD5686) += ad5686.o
 obj-$(CONFIG_MAX517) += max517.o
diff --git a/drivers/staging/iio/dac/ad5064.c b/drivers/staging/iio/dac/ad5064.c
index 39cfe6cb02a2..049a855039c2 100644
--- a/drivers/staging/iio/dac/ad5064.c
+++ b/drivers/staging/iio/dac/ad5064.c
@@ -91,7 +91,7 @@ enum ad5064_type {
         .indexed = 1,                                           \
         .output = 1,                                            \
         .channel = (chan),                                      \
-        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),       \
+        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,  \
         .address = AD5064_ADDR_DAC(chan),                       \
         .scan_type = IIO_ST('u', (bits), 16, 20 - (bits))       \
 }
@@ -280,14 +280,14 @@ static int ad5064_read_raw(struct iio_dev *indio_dev,
                            long m)
 {
         struct ad5064_state *st = iio_priv(indio_dev);
-        unsigned long scale_uv;
         unsigned int vref;
+        int scale_uv;
 
         switch (m) {
         case 0:
                 *val = st->dac_cache[chan->channel];
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 vref = st->chip_info->shared_vref ? 0 : chan->channel;
                 scale_uv = regulator_get_voltage(st->vref_reg[vref].consumer);
                 if (scale_uv < 0)
diff --git a/drivers/staging/iio/dac/ad5360.c b/drivers/staging/iio/dac/ad5360.c
index bc0459e32d04..710b256affcc 100644
--- a/drivers/staging/iio/dac/ad5360.c
+++ b/drivers/staging/iio/dac/ad5360.c
@@ -103,10 +103,10 @@ enum ad5360_type {
         .type = IIO_VOLTAGE,                                    \
         .indexed = 1,                                           \
         .output = 1,                                            \
-        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |      \
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |          \
-                (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |      \
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),        \
+        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT | \
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |             \
+                IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT | \
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,   \
         .scan_type = IIO_ST('u', (bits), 16, 16 - (bits))       \
 }
 
@@ -326,21 +326,21 @@ static int ad5360_write_raw(struct iio_dev *indio_dev,
                 return ad5360_write(indio_dev, AD5360_CMD_WRITE_DATA,
                                  chan->address, val, chan->scan_type.shift);
 
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 if (val >= max_val || val < 0)
                         return -EINVAL;
 
                 return ad5360_write(indio_dev, AD5360_CMD_WRITE_OFFSET,
                                  chan->address, val, chan->scan_type.shift);
 
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (val >= max_val || val < 0)
                         return -EINVAL;
 
                 return ad5360_write(indio_dev, AD5360_CMD_WRITE_GAIN,
                                  chan->address, val, chan->scan_type.shift);
 
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 if (val <= -max_val || val > 0)
                         return -EINVAL;
 
@@ -371,8 +371,8 @@ static int ad5360_read_raw(struct iio_dev *indio_dev,
                            long m)
 {
         struct ad5360_state *st = iio_priv(indio_dev);
-        unsigned long scale_uv;
         unsigned int ofs_index;
+        int scale_uv;
         int ret;
 
         switch (m) {
@@ -383,7 +383,7 @@ static int ad5360_read_raw(struct iio_dev *indio_dev,
                         return ret;
                 *val = ret >> chan->scan_type.shift;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 /* vout = 4 * vref * dac_code */
                 scale_uv = ad5360_get_channel_vref(st, chan->channel) * 4 * 100;
                 if (scale_uv < 0)
@@ -393,21 +393,21 @@ static int ad5360_read_raw(struct iio_dev *indio_dev,
                 *val =  scale_uv / 100000;
                 *val2 = (scale_uv % 100000) * 10;
                 return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 ret = ad5360_read(indio_dev, AD5360_READBACK_OFFSET,
                         chan->address);
                 if (ret < 0)
                         return ret;
                 *val = ret;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 ret = ad5360_read(indio_dev, AD5360_READBACK_GAIN,
                         chan->address);
                 if (ret < 0)
                         return ret;
                 *val = ret;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 ofs_index = ad5360_get_channel_vref_index(st, chan->channel);
                 ret = ad5360_read(indio_dev, AD5360_READBACK_SF,
                         AD5360_REG_SF_OFS(ofs_index));
diff --git a/drivers/staging/iio/dac/ad5380.c b/drivers/staging/iio/dac/ad5380.c
new file mode 100644
index 000000000000..eff97ae05c4b
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5380.c
@@ -0,0 +1,676 @@
+/*
+ * Analog devices AD5380, AD5381, AD5382, AD5383, AD5390, AD5391, AD5392
+ * multi-channel Digital to Analog Converters driver
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "dac.h"
+
+
+#define AD5380_REG_DATA(x)      (((x) << 2) | 3)
+#define AD5380_REG_OFFSET(x)    (((x) << 2) | 2)
+#define AD5380_REG_GAIN(x)      (((x) << 2) | 1)
+#define AD5380_REG_SF_PWR_DOWN  (8 << 2)
+#define AD5380_REG_SF_PWR_UP    (9 << 2)
+#define AD5380_REG_SF_CTRL      (12 << 2)
+
+#define AD5380_CTRL_PWR_DOWN_MODE_OFFSET        13
+#define AD5380_CTRL_INT_VREF_2V5                BIT(12)
+#define AD5380_CTRL_INT_VREF_EN                 BIT(10)
+
+/**
+ * struct ad5380_chip_info - chip specific information
+ * @channel_template:   channel specification template
+ * @num_channels:       number of channels
+ * @int_vref:           internal vref in uV
+*/
+
+struct ad5380_chip_info {
+        struct iio_chan_spec    channel_template;
+        unsigned int            num_channels;
+        unsigned int            int_vref;
+};
+
+/**
+ * struct ad5380_state - driver instance specific data
+ * @regmap:             regmap instance used by the device
+ * @chip_info:          chip model specific constants, available modes etc
+ * @vref_reg:           vref supply regulator
+ * @vref:               actual reference voltage used in uA
+ * @pwr_down:           whether the chip is currently in power down mode
+ */
+
+struct ad5380_state {
+        struct regmap                   *regmap;
+        const struct ad5380_chip_info   *chip_info;
+        struct regulator                *vref_reg;
+        int                             vref;
+        bool                            pwr_down;
+};
+
+enum ad5380_type {
+        ID_AD5380_3,
+        ID_AD5380_5,
+        ID_AD5381_3,
+        ID_AD5381_5,
+        ID_AD5382_3,
+        ID_AD5382_5,
+        ID_AD5383_3,
+        ID_AD5383_5,
+        ID_AD5390_3,
+        ID_AD5390_5,
+        ID_AD5391_3,
+        ID_AD5391_5,
+        ID_AD5392_3,
+        ID_AD5392_5,
+};
+
+#define AD5380_CHANNEL(_bits) {                                 \
+        .type = IIO_VOLTAGE,                                    \
+        .indexed = 1,                                           \
+        .output = 1,                                            \
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |           \
+                IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |         \
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,           \
+        .scan_type = IIO_ST('u', (_bits), 16, 14 - (_bits))     \
+}
+
+static const struct ad5380_chip_info ad5380_chip_info_tbl[] = {
+        [ID_AD5380_3] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 40,
+                .int_vref = 1250000,
+        },
+        [ID_AD5380_5] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 40,
+                .int_vref = 2500000,
+        },
+        [ID_AD5381_3] = {
+                .channel_template = AD5380_CHANNEL(12),
+                .num_channels = 16,
+                .int_vref = 1250000,
+        },
+        [ID_AD5381_5] = {
+                .channel_template = AD5380_CHANNEL(12),
+                .num_channels = 16,
+                .int_vref = 2500000,
+        },
+        [ID_AD5382_3] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 32,
+                .int_vref = 1250000,
+        },
+        [ID_AD5382_5] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 32,
+                .int_vref = 2500000,
+        },
+        [ID_AD5383_3] = {
+                .channel_template = AD5380_CHANNEL(12),
+                .num_channels = 32,
+                .int_vref = 1250000,
+        },
+        [ID_AD5383_5] = {
+                .channel_template = AD5380_CHANNEL(12),
+                .num_channels = 32,
+                .int_vref = 2500000,
+        },
+        [ID_AD5390_3] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 16,
+                .int_vref = 1250000,
+        },
+        [ID_AD5390_5] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 16,
+                .int_vref = 2500000,
+        },
+        [ID_AD5391_3] = {
+                .channel_template = AD5380_CHANNEL(12),
+                .num_channels = 16,
+                .int_vref = 1250000,
+        },
+        [ID_AD5391_5] = {
+                .channel_template = AD5380_CHANNEL(12),
+                .num_channels = 16,
+                .int_vref = 2500000,
+        },
+        [ID_AD5392_3] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 8,
+                .int_vref = 1250000,
+        },
+        [ID_AD5392_5] = {
+                .channel_template = AD5380_CHANNEL(14),
+                .num_channels = 8,
+                .int_vref = 2500000,
+        },
+};
+
+static ssize_t ad5380_read_dac_powerdown(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5380_state *st = iio_priv(indio_dev);
+
+        return sprintf(buf, "%d\n", st->pwr_down);
+}
+
+static ssize_t ad5380_write_dac_powerdown(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5380_state *st = iio_priv(indio_dev);
+        bool pwr_down;
+        int ret;
+
+        ret = strtobool(buf, &pwr_down);
+        if (ret)
+                return ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        if (pwr_down)
+                ret = regmap_write(st->regmap, AD5380_REG_SF_PWR_DOWN, 0);
+        else
+                ret = regmap_write(st->regmap, AD5380_REG_SF_PWR_UP, 0);
+
+        st->pwr_down = pwr_down;
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(out_voltage_powerdown,
+                        S_IRUGO | S_IWUSR,
+                        ad5380_read_dac_powerdown,
+                        ad5380_write_dac_powerdown, 0);
+
+static const char ad5380_powerdown_modes[][15] = {
+        [0]     = "100kohm_to_gnd",
+        [1]     = "three_state",
+};
+
+static ssize_t ad5380_read_powerdown_mode(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5380_state *st = iio_priv(indio_dev);
+        unsigned int mode;
+        int ret;
+
+        ret = regmap_read(st->regmap, AD5380_REG_SF_CTRL, &mode);
+        if (ret)
+                return ret;
+
+        mode = (mode >> AD5380_CTRL_PWR_DOWN_MODE_OFFSET) & 1;
+
+        return sprintf(buf, "%s\n", ad5380_powerdown_modes[mode]);
+}
+
+static ssize_t ad5380_write_powerdown_mode(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t len)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5380_state *st = iio_priv(indio_dev);
+        unsigned int i;
+        int ret;
+
+        for (i = 0; i < ARRAY_SIZE(ad5380_powerdown_modes); ++i) {
+                if (sysfs_streq(buf, ad5380_powerdown_modes[i]))
+                        break;
+        }
+
+        if (i == ARRAY_SIZE(ad5380_powerdown_modes))
+                return -EINVAL;
+
+        ret = regmap_update_bits(st->regmap, AD5380_REG_SF_CTRL,
+                1 << AD5380_CTRL_PWR_DOWN_MODE_OFFSET,
+                i << AD5380_CTRL_PWR_DOWN_MODE_OFFSET);
+
+        return ret ? ret : len;
+}
+
+static IIO_DEVICE_ATTR(out_voltage_powerdown_mode,
+                        S_IRUGO | S_IWUSR,
+                        ad5380_read_powerdown_mode,
+                        ad5380_write_powerdown_mode, 0);
+
+static IIO_CONST_ATTR(out_voltage_powerdown_mode_available,
+                        "100kohm_to_gnd three_state");
+
+static struct attribute *ad5380_attributes[] = {
+        &iio_dev_attr_out_voltage_powerdown.dev_attr.attr,
+        &iio_dev_attr_out_voltage_powerdown_mode.dev_attr.attr,
+        &iio_const_attr_out_voltage_powerdown_mode_available.dev_attr.attr,
+        NULL,
+};
+
+static const struct attribute_group ad5380_attribute_group = {
+        .attrs = ad5380_attributes,
+};
+
+static unsigned int ad5380_info_to_reg(struct iio_chan_spec const *chan,
+        long info)
+{
+        switch (info) {
+        case 0:
+                return AD5380_REG_DATA(chan->address);
+        case IIO_CHAN_INFO_CALIBBIAS:
+                return AD5380_REG_OFFSET(chan->address);
+        case IIO_CHAN_INFO_CALIBSCALE:
+                return AD5380_REG_GAIN(chan->address);
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static int ad5380_write_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int val, int val2, long info)
+{
+        const unsigned int max_val = (1 << chan->scan_type.realbits);
+        struct ad5380_state *st = iio_priv(indio_dev);
+
+        switch (info) {
+        case 0:
+        case IIO_CHAN_INFO_CALIBSCALE:
+                if (val >= max_val || val < 0)
+                        return -EINVAL;
+
+                return regmap_write(st->regmap,
+                        ad5380_info_to_reg(chan, info),
+                        val << chan->scan_type.shift);
+        case IIO_CHAN_INFO_CALIBBIAS:
+                val += (1 << chan->scan_type.realbits) / 2;
+                if (val >= max_val || val < 0)
+                        return -EINVAL;
+
+                return regmap_write(st->regmap,
+                        AD5380_REG_OFFSET(chan->address),
+                        val << chan->scan_type.shift);
+        default:
+                break;
+        }
+        return -EINVAL;
+}
+
+static int ad5380_read_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int *val, int *val2, long info)
+{
+        struct ad5380_state *st = iio_priv(indio_dev);
+        unsigned long scale_uv;
+        int ret;
+
+        switch (info) {
+        case 0:
+        case IIO_CHAN_INFO_CALIBSCALE:
+                ret = regmap_read(st->regmap, ad5380_info_to_reg(chan, info),
+                                        val);
+                if (ret)
+                        return ret;
+                *val >>= chan->scan_type.shift;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                ret = regmap_read(st->regmap, AD5380_REG_OFFSET(chan->address),
+                                        val);
+                if (ret)
+                        return ret;
+                *val >>= chan->scan_type.shift;
+                val -= (1 << chan->scan_type.realbits) / 2;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                scale_uv = ((2 * st->vref) >> chan->scan_type.realbits) * 100;
+                *val =  scale_uv / 100000;
+                *val2 = (scale_uv % 100000) * 10;
+                return IIO_VAL_INT_PLUS_MICRO;
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static const struct iio_info ad5380_info = {
+        .read_raw = ad5380_read_raw,
+        .write_raw = ad5380_write_raw,
+        .attrs = &ad5380_attribute_group,
+        .driver_module = THIS_MODULE,
+};
+
+static int __devinit ad5380_alloc_channels(struct iio_dev *indio_dev)
+{
+        struct ad5380_state *st = iio_priv(indio_dev);
+        struct iio_chan_spec *channels;
+        unsigned int i;
+
+        channels = kcalloc(sizeof(struct iio_chan_spec),
+                        st->chip_info->num_channels, GFP_KERNEL);
+
+        if (!channels)
+                return -ENOMEM;
+
+        for (i = 0; i < st->chip_info->num_channels; ++i) {
+                channels[i] = st->chip_info->channel_template;
+                channels[i].channel = i;
+                channels[i].address = i;
+        }
+
+        indio_dev->channels = channels;
+
+        return 0;
+}
+
+static int __devinit ad5380_probe(struct device *dev, struct regmap *regmap,
+        enum ad5380_type type, const char *name)
+{
+        struct iio_dev *indio_dev;
+        struct ad5380_state *st;
+        unsigned int ctrl = 0;
+        int ret;
+
+        indio_dev = iio_allocate_device(sizeof(*st));
+        if (indio_dev == NULL) {
+                dev_err(dev, "Failed to allocate iio device\n");
+                ret = -ENOMEM;
+                goto error_regmap_exit;
+        }
+
+        st = iio_priv(indio_dev);
+        dev_set_drvdata(dev, indio_dev);
+
+        st->chip_info = &ad5380_chip_info_tbl[type];
+        st->regmap = regmap;
+
+        indio_dev->dev.parent = dev;
+        indio_dev->name = name;
+        indio_dev->info = &ad5380_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->num_channels = st->chip_info->num_channels;
+
+        ret = ad5380_alloc_channels(indio_dev);
+        if (ret) {
+                dev_err(dev, "Failed to allocate channel spec: %d\n", ret);
+                goto error_free;
+        }
+
+        if (st->chip_info->int_vref == 2500000)
+                ctrl |= AD5380_CTRL_INT_VREF_2V5;
+
+        st->vref_reg = regulator_get(dev, "vref");
+        if (!IS_ERR(st->vref_reg)) {
+                ret = regulator_enable(st->vref_reg);
+                if (ret) {
+                        dev_err(dev, "Failed to enable vref regulators: %d\n",
+                                ret);
+                        goto error_free_reg;
+                }
+
+                st->vref = regulator_get_voltage(st->vref_reg);
+        } else {
+                st->vref = st->chip_info->int_vref;
+                ctrl |= AD5380_CTRL_INT_VREF_EN;
+        }
+
+        ret = regmap_write(st->regmap, AD5380_REG_SF_CTRL, ctrl);
+        if (ret) {
+                dev_err(dev, "Failed to write to device: %d\n", ret);
+                goto error_disable_reg;
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret) {
+                dev_err(dev, "Failed to register iio device: %d\n", ret);
+                goto error_disable_reg;
+        }
+
+        return 0;
+
+error_disable_reg:
+        if (!IS_ERR(st->vref_reg))
+                regulator_disable(st->vref_reg);
+error_free_reg:
+        if (!IS_ERR(st->vref_reg))
+                regulator_put(st->vref_reg);
+
+        kfree(indio_dev->channels);
+error_free:
+        iio_free_device(indio_dev);
+error_regmap_exit:
+        regmap_exit(regmap);
+
+        return ret;
+}
+
+static int __devexit ad5380_remove(struct device *dev)
+{
+        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct ad5380_state *st = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        kfree(indio_dev->channels);
+
+        if (!IS_ERR(st->vref_reg)) {
+                regulator_disable(st->vref_reg);
+                regulator_put(st->vref_reg);
+        }
+
+        regmap_exit(st->regmap);
+        iio_free_device(indio_dev);
+
+        return 0;
+}
+
+static bool ad5380_reg_false(struct device *dev, unsigned int reg)
+{
+        return false;
+}
+
+static const struct regmap_config ad5380_regmap_config = {
+        .reg_bits = 10,
+        .val_bits = 14,
+
+        .max_register = AD5380_REG_DATA(40),
+        .cache_type = REGCACHE_RBTREE,
+
+        .volatile_reg = ad5380_reg_false,
+        .readable_reg = ad5380_reg_false,
+};
+
+#if IS_ENABLED(CONFIG_SPI_MASTER)
+
+static int __devinit ad5380_spi_probe(struct spi_device *spi)
+{
+        const struct spi_device_id *id = spi_get_device_id(spi);
+        struct regmap *regmap;
+
+        regmap = regmap_init_spi(spi, &ad5380_regmap_config);
+
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
+        return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name);
+}
+
+static int __devexit ad5380_spi_remove(struct spi_device *spi)
+{
+        return ad5380_remove(&spi->dev);
+}
+
+static const struct spi_device_id ad5380_spi_ids[] = {
+        { "ad5380-3", ID_AD5380_3 },
+        { "ad5380-5", ID_AD5380_5 },
+        { "ad5381-3", ID_AD5381_3 },
+        { "ad5381-5", ID_AD5381_5 },
+        { "ad5382-3", ID_AD5382_3 },
+        { "ad5382-5", ID_AD5382_5 },
+        { "ad5383-3", ID_AD5383_3 },
+        { "ad5383-5", ID_AD5383_5 },
+        { "ad5384-3", ID_AD5380_3 },
+        { "ad5384-5", ID_AD5380_5 },
+        { "ad5390-3", ID_AD5390_3 },
+        { "ad5390-5", ID_AD5390_5 },
+        { "ad5391-3", ID_AD5391_3 },
+        { "ad5391-5", ID_AD5391_5 },
+        { "ad5392-3", ID_AD5392_3 },
+        { "ad5392-5", ID_AD5392_5 },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, ad5380_spi_ids);
+
+static struct spi_driver ad5380_spi_driver = {
+        .driver = {
+                   .name = "ad5380",
+                   .owner = THIS_MODULE,
+        },
+        .probe = ad5380_spi_probe,
+        .remove = __devexit_p(ad5380_spi_remove),
+        .id_table = ad5380_spi_ids,
+};
+
+static inline int ad5380_spi_register_driver(void)
+{
+        return spi_register_driver(&ad5380_spi_driver);
+}
+
+static inline void ad5380_spi_unregister_driver(void)
+{
+        spi_unregister_driver(&ad5380_spi_driver);
+}
+
+#else
+
+static inline int ad5380_spi_register_driver(void)
+{
+        return 0;
+}
+
+static inline void ad5380_spi_unregister_driver(void)
+{
+}
+
+#endif
+
+#if IS_ENABLED(CONFIG_I2C)
+
+static int __devinit ad5380_i2c_probe(struct i2c_client *i2c,
+        const struct i2c_device_id *id)
+{
+        struct regmap *regmap;
+
+        regmap = regmap_init_i2c(i2c, &ad5380_regmap_config);
+
+        if (IS_ERR(regmap))
+                return PTR_ERR(regmap);
+
+        return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name);
+}
+
+static int __devexit ad5380_i2c_remove(struct i2c_client *i2c)
+{
+        return ad5380_remove(&i2c->dev);
+}
+
+static const struct i2c_device_id ad5380_i2c_ids[] = {
+        { "ad5380-3", ID_AD5380_3 },
+        { "ad5380-5", ID_AD5380_5 },
+        { "ad5381-3", ID_AD5381_3 },
+        { "ad5381-5", ID_AD5381_5 },
+        { "ad5382-3", ID_AD5382_3 },
+        { "ad5382-5", ID_AD5382_5 },
+        { "ad5383-3", ID_AD5383_3 },
+        { "ad5383-5", ID_AD5383_5 },
+        { "ad5384-3", ID_AD5380_3 },
+        { "ad5384-5", ID_AD5380_5 },
+        { "ad5390-3", ID_AD5390_3 },
+        { "ad5390-5", ID_AD5390_5 },
+        { "ad5391-3", ID_AD5391_3 },
+        { "ad5391-5", ID_AD5391_5 },
+        { "ad5392-3", ID_AD5392_3 },
+        { "ad5392-5", ID_AD5392_5 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ad5380_i2c_ids);
+
+static struct i2c_driver ad5380_i2c_driver = {
+        .driver = {
+                   .name = "ad5380",
+                   .owner = THIS_MODULE,
+        },
+        .probe = ad5380_i2c_probe,
+        .remove = __devexit_p(ad5380_i2c_remove),
+        .id_table = ad5380_i2c_ids,
+};
+
+static inline int ad5380_i2c_register_driver(void)
+{
+        return i2c_add_driver(&ad5380_i2c_driver);
+}
+
+static inline void ad5380_i2c_unregister_driver(void)
+{
+        i2c_del_driver(&ad5380_i2c_driver);
+}
+
+#else
+
+static inline int ad5380_i2c_register_driver(void)
+{
+        return 0;
+}
+
+static inline void ad5380_i2c_unregister_driver(void)
+{
+}
+
+#endif
+
+static int __init ad5380_spi_init(void)
+{
+        int ret;
+
+        ret = ad5380_spi_register_driver();
+        if (ret)
+                return ret;
+
+        ret = ad5380_i2c_register_driver();
+        if (ret) {
+                ad5380_spi_unregister_driver();
+                return ret;
+        }
+
+        return 0;
+}
+module_init(ad5380_spi_init);
+
+static void __exit ad5380_spi_exit(void)
+{
+        ad5380_i2c_unregister_driver();
+        ad5380_spi_unregister_driver();
+
+}
+module_exit(ad5380_spi_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices AD5380/81/82/83/84/90/91/92 DAC");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dac/ad5421.c b/drivers/staging/iio/dac/ad5421.c
new file mode 100644
index 000000000000..71ee86824763
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5421.c
@@ -0,0 +1,555 @@
+/*
+ * AD5421 Digital to analog converters  driver
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "../events.h"
+#include "dac.h"
+#include "ad5421.h"
+
+
+#define AD5421_REG_DAC_DATA             0x1
+#define AD5421_REG_CTRL                 0x2
+#define AD5421_REG_OFFSET               0x3
+#define AD5421_REG_GAIN                 0x4
+/* load dac and fault shared the same register number. Writing to it will cause
+ * a dac load command, reading from it will return the fault status register */
+#define AD5421_REG_LOAD_DAC             0x5
+#define AD5421_REG_FAULT                0x5
+#define AD5421_REG_FORCE_ALARM_CURRENT  0x6
+#define AD5421_REG_RESET                0x7
+#define AD5421_REG_START_CONVERSION     0x8
+#define AD5421_REG_NOOP                 0x9
+
+#define AD5421_CTRL_WATCHDOG_DISABLE    BIT(12)
+#define AD5421_CTRL_AUTO_FAULT_READBACK BIT(11)
+#define AD5421_CTRL_MIN_CURRENT         BIT(9)
+#define AD5421_CTRL_ADC_SOURCE_TEMP     BIT(8)
+#define AD5421_CTRL_ADC_ENABLE          BIT(7)
+#define AD5421_CTRL_PWR_DOWN_INT_VREF   BIT(6)
+
+#define AD5421_FAULT_SPI                        BIT(15)
+#define AD5421_FAULT_PEC                        BIT(14)
+#define AD5421_FAULT_OVER_CURRENT               BIT(13)
+#define AD5421_FAULT_UNDER_CURRENT              BIT(12)
+#define AD5421_FAULT_TEMP_OVER_140              BIT(11)
+#define AD5421_FAULT_TEMP_OVER_100              BIT(10)
+#define AD5421_FAULT_UNDER_VOLTAGE_6V           BIT(9)
+#define AD5421_FAULT_UNDER_VOLTAGE_12V          BIT(8)
+
+/* These bits will cause the fault pin to go high */
+#define AD5421_FAULT_TRIGGER_IRQ \
+        (AD5421_FAULT_SPI | AD5421_FAULT_PEC | AD5421_FAULT_OVER_CURRENT | \
+        AD5421_FAULT_UNDER_CURRENT | AD5421_FAULT_TEMP_OVER_140)
+
+/**
+ * struct ad5421_state - driver instance specific data
+ * @spi:                spi_device
+ * @ctrl:               control register cache
+ * @current_range:      current range which the device is configured for
+ * @data:               spi transfer buffers
+ * @fault_mask:         software masking of events
+ */
+struct ad5421_state {
+        struct spi_device               *spi;
+        unsigned int                    ctrl;
+        enum ad5421_current_range       current_range;
+        unsigned int                    fault_mask;
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        union {
+                u32 d32;
+                u8 d8[4];
+        } data[2] ____cacheline_aligned;
+};
+
+static const struct iio_chan_spec ad5421_channels[] = {
+        {
+                .type = IIO_CURRENT,
+                .indexed = 1,
+                .output = 1,
+                .channel = 0,
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                        IIO_CHAN_INFO_OFFSET_SHARED_BIT |
+                        IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |
+                        IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
+                .scan_type = IIO_ST('u', 16, 16, 0),
+                .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
+                        IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
+        },
+        {
+                .type = IIO_TEMP,
+                .channel = -1,
+                .event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+        },
+};
+
+static int ad5421_write_unlocked(struct iio_dev *indio_dev,
+        unsigned int reg, unsigned int val)
+{
+        struct ad5421_state *st = iio_priv(indio_dev);
+
+        st->data[0].d32 = cpu_to_be32((reg << 16) | val);
+
+        return spi_write(st->spi, &st->data[0].d8[1], 3);
+}
+
+static int ad5421_write(struct iio_dev *indio_dev, unsigned int reg,
+        unsigned int val)
+{
+        int ret;
+
+        mutex_lock(&indio_dev->mlock);
+        ret = ad5421_write_unlocked(indio_dev, reg, val);
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static int ad5421_read(struct iio_dev *indio_dev, unsigned int reg)
+{
+        struct ad5421_state *st = iio_priv(indio_dev);
+        struct spi_message m;
+        int ret;
+        struct spi_transfer t[] = {
+                {
+                        .tx_buf = &st->data[0].d8[1],
+                        .len = 3,
+                        .cs_change = 1,
+                }, {
+                        .rx_buf = &st->data[1].d8[1],
+                        .len = 3,
+                },
+        };
+
+        spi_message_init(&m);
+        spi_message_add_tail(&t[0], &m);
+        spi_message_add_tail(&t[1], &m);
+
+        mutex_lock(&indio_dev->mlock);
+
+        st->data[0].d32 = cpu_to_be32((1 << 23) | (reg << 16));
+
+        ret = spi_sync(st->spi, &m);
+        if (ret >= 0)
+                ret = be32_to_cpu(st->data[1].d32) & 0xffff;
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static int ad5421_update_ctrl(struct iio_dev *indio_dev, unsigned int set,
+        unsigned int clr)
+{
+        struct ad5421_state *st = iio_priv(indio_dev);
+        unsigned int ret;
+
+        mutex_lock(&indio_dev->mlock);
+
+        st->ctrl &= ~clr;
+        st->ctrl |= set;
+
+        ret = ad5421_write_unlocked(indio_dev, AD5421_REG_CTRL, st->ctrl);
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static irqreturn_t ad5421_fault_handler(int irq, void *data)
+{
+        struct iio_dev *indio_dev = data;
+        struct ad5421_state *st = iio_priv(indio_dev);
+        unsigned int fault;
+        unsigned int old_fault = 0;
+        unsigned int events;
+
+        fault = ad5421_read(indio_dev, AD5421_REG_FAULT);
+        if (!fault)
+                return IRQ_NONE;
+
+        /* If we had a fault, this might mean that the DAC has lost its state
+         * and has been reset. Make sure that the control register actually
+         * contains what we expect it to contain. Otherwise the watchdog might
+         * be enabled and we get watchdog timeout faults, which will render the
+         * DAC unusable. */
+        ad5421_update_ctrl(indio_dev, 0, 0);
+
+
+        /* The fault pin stays high as long as a fault condition is present and
+         * it is not possible to mask fault conditions. For certain fault
+         * conditions for example like over-temperature it takes some time
+         * until the fault condition disappears. If we would exit the interrupt
+         * handler immediately after handling the event it would be entered
+         * again instantly. Thus we fall back to polling in case we detect that
+         * a interrupt condition is still present.
+         */
+        do {
+                /* 0xffff is a invalid value for the register and will only be
+                 * read if there has been a communication error */
+                if (fault == 0xffff)
+                        fault = 0;
+
+                /* we are only interested in new events */
+                events = (old_fault ^ fault) & fault;
+                events &= st->fault_mask;
+
+                if (events & AD5421_FAULT_OVER_CURRENT) {
+                        iio_push_event(indio_dev,
+                                IIO_UNMOD_EVENT_CODE(IIO_CURRENT,
+                                        0,
+                                        IIO_EV_TYPE_THRESH,
+                                        IIO_EV_DIR_RISING),
+                        iio_get_time_ns());
+                }
+
+                if (events & AD5421_FAULT_UNDER_CURRENT) {
+                        iio_push_event(indio_dev,
+                                IIO_UNMOD_EVENT_CODE(IIO_CURRENT,
+                                        0,
+                                        IIO_EV_TYPE_THRESH,
+                                        IIO_EV_DIR_FALLING),
+                                iio_get_time_ns());
+                }
+
+                if (events & AD5421_FAULT_TEMP_OVER_140) {
+                        iio_push_event(indio_dev,
+                                IIO_UNMOD_EVENT_CODE(IIO_TEMP,
+                                        0,
+                                        IIO_EV_TYPE_MAG,
+                                        IIO_EV_DIR_RISING),
+                                iio_get_time_ns());
+                }
+
+                old_fault = fault;
+                fault = ad5421_read(indio_dev, AD5421_REG_FAULT);
+
+                /* still active? go to sleep for some time */
+                if (fault & AD5421_FAULT_TRIGGER_IRQ)
+                        msleep(1000);
+
+        } while (fault & AD5421_FAULT_TRIGGER_IRQ);
+
+
+        return IRQ_HANDLED;
+}
+
+static void ad5421_get_current_min_max(struct ad5421_state *st,
+        unsigned int *min, unsigned int *max)
+{
+        /* The current range is configured using external pins, which are
+         * usually hard-wired and not run-time switchable. */
+        switch (st->current_range) {
+        case AD5421_CURRENT_RANGE_4mA_20mA:
+                *min = 4000;
+                *max = 20000;
+                break;
+        case AD5421_CURRENT_RANGE_3mA8_21mA:
+                *min = 3800;
+                *max = 21000;
+                break;
+        case AD5421_CURRENT_RANGE_3mA2_24mA:
+                *min = 3200;
+                *max = 24000;
+                break;
+        default:
+                *min = 0;
+                *max = 1;
+                break;
+        }
+}
+
+static inline unsigned int ad5421_get_offset(struct ad5421_state *st)
+{
+        unsigned int min, max;
+
+        ad5421_get_current_min_max(st, &min, &max);
+        return (min * (1 << 16)) / (max - min);
+}
+
+static inline unsigned int ad5421_get_scale(struct ad5421_state *st)
+{
+        unsigned int min, max;
+
+        ad5421_get_current_min_max(st, &min, &max);
+        return ((max - min) * 1000) / (1 << 16);
+}
+
+static int ad5421_read_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int *val, int *val2, long m)
+{
+        struct ad5421_state *st = iio_priv(indio_dev);
+        int ret;
+
+        if (chan->type != IIO_CURRENT)
+                return -EINVAL;
+
+        switch (m) {
+        case 0:
+                ret = ad5421_read(indio_dev, AD5421_REG_DAC_DATA);
+                if (ret < 0)
+                        return ret;
+                *val = ret;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                *val = 0;
+                *val2 = ad5421_get_scale(st);
+                return IIO_VAL_INT_PLUS_MICRO;
+        case IIO_CHAN_INFO_OFFSET:
+                *val = ad5421_get_offset(st);
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                ret = ad5421_read(indio_dev, AD5421_REG_OFFSET);
+                if (ret < 0)
+                        return ret;
+                *val = ret - 32768;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_CALIBSCALE:
+                ret = ad5421_read(indio_dev, AD5421_REG_GAIN);
+                if (ret < 0)
+                        return ret;
+                *val = ret;
+                return IIO_VAL_INT;
+        }
+
+        return -EINVAL;
+}
+
+static int ad5421_write_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int val, int val2, long mask)
+{
+        const unsigned int max_val = 1 << 16;
+
+        switch (mask) {
+        case 0:
+                if (val >= max_val || val < 0)
+                        return -EINVAL;
+
+                return ad5421_write(indio_dev, AD5421_REG_DAC_DATA, val);
+        case IIO_CHAN_INFO_CALIBBIAS:
+                val += 32768;
+                if (val >= max_val || val < 0)
+                        return -EINVAL;
+
+                return ad5421_write(indio_dev, AD5421_REG_OFFSET, val);
+        case IIO_CHAN_INFO_CALIBSCALE:
+                if (val >= max_val || val < 0)
+                        return -EINVAL;
+
+                return ad5421_write(indio_dev, AD5421_REG_GAIN, val);
+        default:
+                break;
+        }
+
+        return -EINVAL;
+}
+
+static int ad5421_write_event_config(struct iio_dev *indio_dev,
+        u64 event_code, int state)
+{
+        struct ad5421_state *st = iio_priv(indio_dev);
+        unsigned int mask;
+
+        switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
+        case IIO_CURRENT:
+                if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+                        IIO_EV_DIR_RISING)
+                        mask = AD5421_FAULT_OVER_CURRENT;
+                else
+                        mask = AD5421_FAULT_UNDER_CURRENT;
+                break;
+        case IIO_TEMP:
+                mask = AD5421_FAULT_TEMP_OVER_140;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        mutex_lock(&indio_dev->mlock);
+        if (state)
+                st->fault_mask |= mask;
+        else
+                st->fault_mask &= ~mask;
+        mutex_unlock(&indio_dev->mlock);
+
+        return 0;
+}
+
+static int ad5421_read_event_config(struct iio_dev *indio_dev,
+        u64 event_code)
+{
+        struct ad5421_state *st = iio_priv(indio_dev);
+        unsigned int mask;
+
+        switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
+        case IIO_CURRENT:
+                if (IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
+                        IIO_EV_DIR_RISING)
+                        mask = AD5421_FAULT_OVER_CURRENT;
+                else
+                        mask = AD5421_FAULT_UNDER_CURRENT;
+                break;
+        case IIO_TEMP:
+                mask = AD5421_FAULT_TEMP_OVER_140;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return (bool)(st->fault_mask & mask);
+}
+
+static int ad5421_read_event_value(struct iio_dev *indio_dev, u64 event_code,
+        int *val)
+{
+        int ret;
+
+        switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
+        case IIO_CURRENT:
+                ret = ad5421_read(indio_dev, AD5421_REG_DAC_DATA);
+                if (ret < 0)
+                        return ret;
+                *val = ret;
+                break;
+        case IIO_TEMP:
+                *val = 140000;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static const struct iio_info ad5421_info = {
+        .read_raw =             ad5421_read_raw,
+        .write_raw =            ad5421_write_raw,
+        .read_event_config =    ad5421_read_event_config,
+        .write_event_config =   ad5421_write_event_config,
+        .read_event_value =     ad5421_read_event_value,
+        .driver_module =        THIS_MODULE,
+};
+
+static int __devinit ad5421_probe(struct spi_device *spi)
+{
+        struct ad5421_platform_data *pdata = dev_get_platdata(&spi->dev);
+        struct iio_dev *indio_dev;
+        struct ad5421_state *st;
+        int ret;
+
+        indio_dev = iio_allocate_device(sizeof(*st));
+        if (indio_dev == NULL) {
+                dev_err(&spi->dev, "Failed to allocate iio device\n");
+                return  -ENOMEM;
+        }
+
+        st = iio_priv(indio_dev);
+        spi_set_drvdata(spi, indio_dev);
+
+        st->spi = spi;
+
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = "ad5421";
+        indio_dev->info = &ad5421_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = ad5421_channels;
+        indio_dev->num_channels = ARRAY_SIZE(ad5421_channels);
+
+        st->ctrl = AD5421_CTRL_WATCHDOG_DISABLE |
+                        AD5421_CTRL_AUTO_FAULT_READBACK;
+
+        if (pdata) {
+                st->current_range = pdata->current_range;
+                if (pdata->external_vref)
+                        st->ctrl |= AD5421_CTRL_PWR_DOWN_INT_VREF;
+        } else {
+                st->current_range = AD5421_CURRENT_RANGE_4mA_20mA;
+        }
+
+        /* write initial ctrl register value */
+        ad5421_update_ctrl(indio_dev, 0, 0);
+
+        if (spi->irq) {
+                ret = request_threaded_irq(spi->irq,
+                                           NULL,
+                                           ad5421_fault_handler,
+                                           IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+                                           "ad5421 fault",
+                                           indio_dev);
+                if (ret)
+                        goto error_free;
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to register iio device: %d\n", ret);
+                goto error_free_irq;
+        }
+
+        return 0;
+
+error_free_irq:
+        if (spi->irq)
+                free_irq(spi->irq, indio_dev);
+error_free:
+        iio_free_device(indio_dev);
+
+        return ret;
+}
+
+static int __devexit ad5421_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+
+        iio_device_unregister(indio_dev);
+        if (spi->irq)
+                free_irq(spi->irq, indio_dev);
+        iio_free_device(indio_dev);
+
+        return 0;
+}
+
+static struct spi_driver ad5421_driver = {
+        .driver = {
+                   .name = "ad5421",
+                   .owner = THIS_MODULE,
+        },
+        .probe = ad5421_probe,
+        .remove = __devexit_p(ad5421_remove),
+};
+
+static __init int ad5421_init(void)
+{
+        return spi_register_driver(&ad5421_driver);
+}
+module_init(ad5421_init);
+
+static __exit void ad5421_exit(void)
+{
+        spi_unregister_driver(&ad5421_driver);
+}
+module_exit(ad5421_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices AD5421 DAC");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ad5421");
diff --git a/drivers/staging/iio/dac/ad5421.h b/drivers/staging/iio/dac/ad5421.h
new file mode 100644
index 000000000000..cd2bb84ff1b0
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5421.h
@@ -0,0 +1,32 @@
+#ifndef __IIO_DAC_AD5421_H__
+#define __IIO_DAC_AD5421_H__
+
+/*
+ * TODO: This file needs to go into include/linux/iio
+ */
+
+/**
+ * enum ad5421_current_range - Current range the AD5421 is configured for.
+ * @AD5421_CURRENT_RANGE_4mA_20mA: 4 mA to 20 mA (RANGE1,0 pins = 00)
+ * @AD5421_CURRENT_RANGE_3mA8_21mA: 3.8 mA to 21 mA (RANGE1,0 pins = x1)
+ * @AD5421_CURRENT_RANGE_3mA2_24mA: 3.2 mA to 24 mA (RANGE1,0 pins = 10)
+ */
+
+enum ad5421_current_range {
+        AD5421_CURRENT_RANGE_4mA_20mA,
+        AD5421_CURRENT_RANGE_3mA8_21mA,
+        AD5421_CURRENT_RANGE_3mA2_24mA,
+};
+
+/**
+ * struct ad5421_platform_data - AD5421 DAC driver platform data
+ * @external_vref: whether an external reference voltage is used or not
+ * @current_range: Current range the AD5421 is configured for
+ */
+
+struct ad5421_platform_data {
+        bool external_vref;
+        enum ad5421_current_range current_range;
+};
+
+#endif
diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/staging/iio/dac/ad5446.c
index ec701e939b6b..693e7482524c 100644
--- a/drivers/staging/iio/dac/ad5446.c
+++ b/drivers/staging/iio/dac/ad5446.c
@@ -26,19 +26,17 @@
 
 static void ad5446_store_sample(struct ad5446_state *st, unsigned val)
 {
-        st->data.d16 = cpu_to_be16(AD5446_LOAD |
-                                        (val << st->chip_info->left_shift));
+        st->data.d16 = cpu_to_be16(AD5446_LOAD | val);
 }
 
 static void ad5542_store_sample(struct ad5446_state *st, unsigned val)
 {
-        st->data.d16 = cpu_to_be16(val << st->chip_info->left_shift);
+        st->data.d16 = cpu_to_be16(val);
 }
 
 static void ad5620_store_sample(struct ad5446_state *st, unsigned val)
 {
-        st->data.d16 = cpu_to_be16(AD5620_LOAD |
-                                        (val << st->chip_info->left_shift));
+        st->data.d16 = cpu_to_be16(AD5620_LOAD | val);
 }
 
 static void ad5660_store_sample(struct ad5446_state *st, unsigned val)
@@ -63,50 +61,6 @@ static void ad5660_store_pwr_down(struct ad5446_state *st, unsigned mode)
         st->data.d24[2] = val & 0xFF;
 }
 
-static ssize_t ad5446_write(struct device *dev,
-                struct device_attribute *attr,
-                const char *buf,
-                size_t len)
-{
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ad5446_state *st = iio_priv(indio_dev);
-        int ret;
-        long val;
-
-        ret = strict_strtol(buf, 10, &val);
-        if (ret)
-                goto error_ret;
-
-        if (val > RES_MASK(st->chip_info->bits)) {
-                ret = -EINVAL;
-                goto error_ret;
-        }
-
-        mutex_lock(&indio_dev->mlock);
-        st->cached_val = val;
-        st->chip_info->store_sample(st, val);
-        ret = spi_sync(st->spi, &st->msg);
-        mutex_unlock(&indio_dev->mlock);
-
-error_ret:
-        return ret ? ret : len;
-}
-
-static IIO_DEV_ATTR_OUT_RAW(0, ad5446_write, 0);
-
-static ssize_t ad5446_show_scale(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
-{
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ad5446_state *st = iio_priv(indio_dev);
-        /* Corresponds to Vref / 2^(bits) */
-        unsigned int scale_uv = (st->vref_mv * 1000) >> st->chip_info->bits;
-
-        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
-}
-static IIO_DEVICE_ATTR(out_voltage_scale, S_IRUGO, ad5446_show_scale, NULL, 0);
-
 static ssize_t ad5446_write_powerdown_mode(struct device *dev,
                                        struct device_attribute *attr,
                                        const char *buf, size_t len)
@@ -189,8 +143,6 @@ static IIO_DEVICE_ATTR(out_voltage0_powerdown, S_IRUGO | S_IWUSR,
                         ad5446_write_dac_powerdown, 0);
 
 static struct attribute *ad5446_attributes[] = {
-        &iio_dev_attr_out_voltage0_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage_scale.dev_attr.attr,
         &iio_dev_attr_out_voltage0_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage_powerdown_mode.dev_attr.attr,
         &iio_const_attr_out_voltage_powerdown_mode_available.dev_attr.attr,
@@ -223,121 +175,148 @@ static const struct attribute_group ad5446_attribute_group = {
         .is_visible = ad5446_attr_is_visible,
 };
 
+#define AD5446_CHANNEL(bits, storage, shift) { \
+        .type = IIO_VOLTAGE, \
+        .indexed = 1, \
+        .output = 1, \
+        .channel = 0, \
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT, \
+        .scan_type = IIO_ST('u', (bits), (storage), (shift)) \
+}
+
 static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
         [ID_AD5444] = {
-                .bits = 12,
-                .storagebits = 16,
-                .left_shift = 2,
+                .channel = AD5446_CHANNEL(12, 16, 2),
                 .store_sample = ad5446_store_sample,
         },
         [ID_AD5446] = {
-                .bits = 14,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(14, 16, 0),
                 .store_sample = ad5446_store_sample,
         },
         [ID_AD5541A] = {
-                .bits = 16,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(16, 16, 0),
                 .store_sample = ad5542_store_sample,
         },
         [ID_AD5542A] = {
-                .bits = 16,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(16, 16, 0),
                 .store_sample = ad5542_store_sample,
         },
         [ID_AD5543] = {
-                .bits = 16,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(16, 16, 0),
                 .store_sample = ad5542_store_sample,
         },
         [ID_AD5512A] = {
-                .bits = 12,
-                .storagebits = 16,
-                .left_shift = 4,
+                .channel = AD5446_CHANNEL(12, 16, 4),
                 .store_sample = ad5542_store_sample,
         },
         [ID_AD5553] = {
-                .bits = 14,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(14, 16, 0),
                 .store_sample = ad5542_store_sample,
         },
         [ID_AD5601] = {
-                .bits = 8,
-                .storagebits = 16,
-                .left_shift = 6,
+                .channel = AD5446_CHANNEL(8, 16, 6),
                 .store_sample = ad5542_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5611] = {
-                .bits = 10,
-                .storagebits = 16,
-                .left_shift = 4,
+                .channel = AD5446_CHANNEL(10, 16, 4),
                 .store_sample = ad5542_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5621] = {
-                .bits = 12,
-                .storagebits = 16,
-                .left_shift = 2,
+                .channel = AD5446_CHANNEL(12, 16, 2),
                 .store_sample = ad5542_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5620_2500] = {
-                .bits = 12,
-                .storagebits = 16,
-                .left_shift = 2,
+                .channel = AD5446_CHANNEL(12, 16, 2),
                 .int_vref_mv = 2500,
                 .store_sample = ad5620_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5620_1250] = {
-                .bits = 12,
-                .storagebits = 16,
-                .left_shift = 2,
+                .channel = AD5446_CHANNEL(12, 16, 2),
                 .int_vref_mv = 1250,
                 .store_sample = ad5620_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5640_2500] = {
-                .bits = 14,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(14, 16, 0),
                 .int_vref_mv = 2500,
                 .store_sample = ad5620_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5640_1250] = {
-                .bits = 14,
-                .storagebits = 16,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(14, 16, 0),
                 .int_vref_mv = 1250,
                 .store_sample = ad5620_store_sample,
                 .store_pwr_down = ad5620_store_pwr_down,
         },
         [ID_AD5660_2500] = {
-                .bits = 16,
-                .storagebits = 24,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(16, 16, 0),
                 .int_vref_mv = 2500,
                 .store_sample = ad5660_store_sample,
                 .store_pwr_down = ad5660_store_pwr_down,
         },
         [ID_AD5660_1250] = {
-                .bits = 16,
-                .storagebits = 24,
-                .left_shift = 0,
+                .channel = AD5446_CHANNEL(16, 16, 0),
                 .int_vref_mv = 1250,
                 .store_sample = ad5660_store_sample,
                 .store_pwr_down = ad5660_store_pwr_down,
         },
 };
 
+static int ad5446_read_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int *val,
+                           int *val2,
+                           long m)
+{
+        struct ad5446_state *st = iio_priv(indio_dev);
+        unsigned long scale_uv;
+
+        switch (m) {
+        case IIO_CHAN_INFO_SCALE:
+                scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+                *val =  scale_uv / 1000;
+                *val2 = (scale_uv % 1000) * 1000;
+                return IIO_VAL_INT_PLUS_MICRO;
+
+        }
+        return -EINVAL;
+}
+
+static int ad5446_write_raw(struct iio_dev *indio_dev,
+                               struct iio_chan_spec const *chan,
+                               int val,
+                               int val2,
+                               long mask)
+{
+        struct ad5446_state *st = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case 0:
+                if (val >= (1 << chan->scan_type.realbits) || val < 0)
+                        return -EINVAL;
+
+                val <<= chan->scan_type.shift;
+                mutex_lock(&indio_dev->mlock);
+                st->cached_val = val;
+                st->chip_info->store_sample(st, val);
+                ret = spi_sync(st->spi, &st->msg);
+                mutex_unlock(&indio_dev->mlock);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
 static const struct iio_info ad5446_info = {
+        .read_raw = ad5446_read_raw,
+        .write_raw = ad5446_write_raw,
         .attrs = &ad5446_attribute_group,
         .driver_module = THIS_MODULE,
 };
@@ -376,11 +355,13 @@ static int __devinit ad5446_probe(struct spi_device *spi)
         indio_dev->name = spi_get_device_id(spi)->name;
         indio_dev->info = &ad5446_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = &st->chip_info->channel;
+        indio_dev->num_channels = 1;
 
         /* Setup default message */
 
         st->xfer.tx_buf = &st->data;
-        st->xfer.len = st->chip_info->storagebits / 8;
+        st->xfer.len = st->chip_info->channel.scan_type.storagebits / 8;
 
         spi_message_init(&st->msg);
         spi_message_add_tail(&st->xfer, &st->msg);
@@ -454,11 +435,11 @@ static const struct spi_device_id ad5446_id[] = {
         {"ad5660-1250", ID_AD5660_1250},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad5446_id);
 
 static struct spi_driver ad5446_driver = {
         .driver = {
                 .name   = "ad5446",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad5446_probe,
@@ -470,4 +451,3 @@ module_spi_driver(ad5446_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD5444/AD5446 DAC");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad5446");
diff --git a/drivers/staging/iio/dac/ad5446.h b/drivers/staging/iio/dac/ad5446.h
index 7118d653ac3e..4ea3476fb065 100644
--- a/drivers/staging/iio/dac/ad5446.h
+++ b/drivers/staging/iio/dac/ad5446.h
@@ -25,8 +25,6 @@
 #define AD5660_PWRDWN_100k      (0x2 << 16) /* Power-down: 100kOhm to GND */
 #define AD5660_PWRDWN_TRISTATE  (0x3 << 16) /* Power-down: Three-state */
 
-#define RES_MASK(bits)  ((1 << (bits)) - 1)
-
 #define MODE_PWRDWN_1k          0x1
 #define MODE_PWRDWN_100k        0x2
 #define MODE_PWRDWN_TRISTATE    0x3
@@ -62,18 +60,14 @@ struct ad5446_state {
 
 /**
  * struct ad5446_chip_info - chip specific information
- * @bits:               accuracy of the DAC in bits
- * @storagebits:        number of bits written to the DAC
- * @left_shift:         number of bits the datum must be shifted
+ * @channel:            channel spec for the DAC
  * @int_vref_mv:        AD5620/40/60: the internal reference voltage
  * @store_sample:       chip specific helper function to store the datum
  * @store_sample:       chip specific helper function to store the powerpown cmd
  */
 
 struct ad5446_chip_info {
-        u8                      bits;
-        u8                      storagebits;
-        u8                      left_shift;
+        struct iio_chan_spec    channel;
         u16                     int_vref_mv;
         void (*store_sample)    (struct ad5446_state *st, unsigned val);
         void (*store_pwr_down)  (struct ad5446_state *st, unsigned mode);
diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/staging/iio/dac/ad5504.c
index 57539ce8e6cf..bc17205fe722 100644
--- a/drivers/staging/iio/dac/ad5504.c
+++ b/drivers/staging/iio/dac/ad5504.c
@@ -18,9 +18,27 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../events.h"
 #include "dac.h"
 #include "ad5504.h"
 
+#define AD5504_CHANNEL(_chan) { \
+        .type = IIO_VOLTAGE, \
+        .indexed = 1, \
+        .output = 1, \
+        .channel = (_chan), \
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT, \
+        .address = AD5504_ADDR_DAC(_chan), \
+        .scan_type = IIO_ST('u', 12, 16, 0), \
+}
+
+static const struct iio_chan_spec ad5504_channels[] = {
+        AD5504_CHANNEL(0),
+        AD5504_CHANNEL(1),
+        AD5504_CHANNEL(2),
+        AD5504_CHANNEL(3),
+};
+
 static int ad5504_spi_write(struct spi_device *spi, u8 addr, u16 val)
 {
         u16 tmp = cpu_to_be16(AD5504_CMD_WRITE |
@@ -30,13 +48,14 @@ static int ad5504_spi_write(struct spi_device *spi, u8 addr, u16 val)
         return spi_write(spi, (u8 *)&tmp, 2);
 }
 
-static int ad5504_spi_read(struct spi_device *spi, u8 addr, u16 *val)
+static int ad5504_spi_read(struct spi_device *spi, u8 addr)
 {
         u16 tmp = cpu_to_be16(AD5504_CMD_READ | AD5504_ADDR(addr));
+        u16 val;
         int ret;
         struct spi_transfer     t = {
                         .tx_buf         = &tmp,
-                        .rx_buf         = val,
+                        .rx_buf         = &val,
                         .len            = 2,
                 };
         struct spi_message      m;
@@ -45,44 +64,61 @@ static int ad5504_spi_read(struct spi_device *spi, u8 addr, u16 *val)
         spi_message_add_tail(&t, &m);
         ret = spi_sync(spi, &m);
 
-        *val = be16_to_cpu(*val) & AD5504_RES_MASK;
+        if (ret < 0)
+                return ret;
 
-        return ret;
+        return be16_to_cpu(val) & AD5504_RES_MASK;
 }
 
-static ssize_t ad5504_write_dac(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t len)
+static int ad5504_read_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int *val,
+                           int *val2,
+                           long m)
 {
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad5504_state *st = iio_priv(indio_dev);
-        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-        long readin;
+        unsigned long scale_uv;
         int ret;
 
-        ret = strict_strtol(buf, 10, &readin);
-        if (ret)
-                return ret;
+        switch (m) {
+        case 0:
+                ret = ad5504_spi_read(st->spi, chan->address);
+                if (ret < 0)
+                        return ret;
 
-        ret = ad5504_spi_write(st->spi, this_attr->address, readin);
-        return ret ? ret : len;
+                *val = ret;
+
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+                *val =  scale_uv / 1000;
+                *val2 = (scale_uv % 1000) * 1000;
+                return IIO_VAL_INT_PLUS_MICRO;
+
+        }
+        return -EINVAL;
 }
 
-static ssize_t ad5504_read_dac(struct device *dev,
-                                           struct device_attribute *attr,
-                                           char *buf)
+static int ad5504_write_raw(struct iio_dev *indio_dev,
+                               struct iio_chan_spec const *chan,
+                               int val,
+                               int val2,
+                               long mask)
 {
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad5504_state *st = iio_priv(indio_dev);
-        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int ret;
-        u16 val;
 
-        ret = ad5504_spi_read(st->spi, this_attr->address, &val);
-        if (ret)
-                return ret;
+        switch (mask) {
+        case 0:
+                if (val >= (1 << chan->scan_type.realbits) || val < 0)
+                        return -EINVAL;
 
-        return sprintf(buf, "%d\n", val);
+                return ad5504_spi_write(st->spi, chan->address, val);
+        default:
+                ret = -EINVAL;
+        }
+
+        return -EINVAL;
 }
 
 static ssize_t ad5504_read_powerdown_mode(struct device *dev,
@@ -157,32 +193,6 @@ static ssize_t ad5504_write_dac_powerdown(struct device *dev,
         return ret ? ret : len;
 }
 
-static ssize_t ad5504_show_scale(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
-{
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ad5504_state *st = iio_priv(indio_dev);
-        /* Corresponds to Vref / 2^(bits) */
-        unsigned int scale_uv = (st->vref_mv * 1000) >> AD5505_BITS;
-
-        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
-}
-static IIO_DEVICE_ATTR(out_voltage_scale, S_IRUGO, ad5504_show_scale, NULL, 0);
-
-#define IIO_DEV_ATTR_OUT_RW_RAW(_num, _show, _store, _addr)             \
-        IIO_DEVICE_ATTR(out_voltage##_num##_raw,                        \
-                        S_IRUGO | S_IWUSR, _show, _store, _addr)
-
-static IIO_DEV_ATTR_OUT_RW_RAW(0, ad5504_read_dac,
-        ad5504_write_dac, AD5504_ADDR_DAC0);
-static IIO_DEV_ATTR_OUT_RW_RAW(1, ad5504_read_dac,
-        ad5504_write_dac, AD5504_ADDR_DAC1);
-static IIO_DEV_ATTR_OUT_RW_RAW(2, ad5504_read_dac,
-        ad5504_write_dac, AD5504_ADDR_DAC2);
-static IIO_DEV_ATTR_OUT_RW_RAW(3, ad5504_read_dac,
-        ad5504_write_dac, AD5504_ADDR_DAC3);
-
 static IIO_DEVICE_ATTR(out_voltage_powerdown_mode, S_IRUGO |
                         S_IWUSR, ad5504_read_powerdown_mode,
                         ad5504_write_powerdown_mode, 0);
@@ -203,17 +213,12 @@ static IIO_DEV_ATTR_DAC_POWERDOWN(3, ad5504_read_dac_powerdown,
                                    ad5504_write_dac_powerdown, 3);
 
 static struct attribute *ad5504_attributes[] = {
-        &iio_dev_attr_out_voltage0_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage1_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage2_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage3_raw.dev_attr.attr,
         &iio_dev_attr_out_voltage0_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage1_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage2_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage3_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage_powerdown_mode.dev_attr.attr,
         &iio_const_attr_out_voltage_powerdown_mode_available.dev_attr.attr,
-        &iio_dev_attr_out_voltage_scale.dev_attr.attr,
         NULL,
 };
 
@@ -222,11 +227,9 @@ static const struct attribute_group ad5504_attribute_group = {
 };
 
 static struct attribute *ad5501_attributes[] = {
-        &iio_dev_attr_out_voltage0_raw.dev_attr.attr,
         &iio_dev_attr_out_voltage0_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage_powerdown_mode.dev_attr.attr,
         &iio_const_attr_out_voltage_powerdown_mode_available.dev_attr.attr,
-        &iio_dev_attr_out_voltage_scale.dev_attr.attr,
         NULL,
 };
 
@@ -261,12 +264,16 @@ static irqreturn_t ad5504_event_handler(int irq, void *private)
 }
 
 static const struct iio_info ad5504_info = {
+        .write_raw = ad5504_write_raw,
+        .read_raw = ad5504_read_raw,
         .attrs = &ad5504_attribute_group,
         .event_attrs = &ad5504_ev_attribute_group,
         .driver_module = THIS_MODULE,
 };
 
 static const struct iio_info ad5501_info = {
+        .write_raw = ad5504_write_raw,
+        .read_raw = ad5504_read_raw,
         .attrs = &ad5501_attribute_group,
         .event_attrs = &ad5504_ev_attribute_group,
         .driver_module = THIS_MODULE,
@@ -307,10 +314,14 @@ static int __devinit ad5504_probe(struct spi_device *spi)
         st->spi = spi;
         indio_dev->dev.parent = &spi->dev;
         indio_dev->name = spi_get_device_id(st->spi)->name;
-        if (spi_get_device_id(st->spi)->driver_data == ID_AD5501)
+        if (spi_get_device_id(st->spi)->driver_data == ID_AD5501) {
                 indio_dev->info = &ad5501_info;
-        else
+                indio_dev->num_channels = 1;
+        } else {
                 indio_dev->info = &ad5504_info;
+                indio_dev->num_channels = 4;
+        }
+        indio_dev->channels = ad5504_channels;
         indio_dev->modes = INDIO_DIRECT_MODE;
 
         if (spi->irq) {
@@ -367,6 +378,7 @@ static const struct spi_device_id ad5504_id[] = {
         {"ad5501", ID_AD5501},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad5504_id);
 
 static struct spi_driver ad5504_driver = {
         .driver = {
diff --git a/drivers/staging/iio/dac/ad5504.h b/drivers/staging/iio/dac/ad5504.h
index 85beb1dd29b9..afe09522f53c 100644
--- a/drivers/staging/iio/dac/ad5504.h
+++ b/drivers/staging/iio/dac/ad5504.h
@@ -18,10 +18,7 @@
 
 /* Registers */
 #define AD5504_ADDR_NOOP                0
-#define AD5504_ADDR_DAC0                1
-#define AD5504_ADDR_DAC1                2
-#define AD5504_ADDR_DAC2                3
-#define AD5504_ADDR_DAC3                4
+#define AD5504_ADDR_DAC(x)              ((x) + 1)
 #define AD5504_ADDR_ALL_DAC             5
 #define AD5504_ADDR_CTRL                7
 
diff --git a/drivers/staging/iio/dac/ad5624r.h b/drivers/staging/iio/dac/ad5624r.h
index b71c6a03e780..5dca3028cdfd 100644
--- a/drivers/staging/iio/dac/ad5624r.h
+++ b/drivers/staging/iio/dac/ad5624r.h
@@ -32,12 +32,12 @@
 
 /**
  * struct ad5624r_chip_info - chip specific information
- * @bits:               accuracy of the DAC in bits
+ * @channels:           channel spec for the DAC
  * @int_vref_mv:        AD5620/40/60: the internal reference voltage
  */
 
 struct ad5624r_chip_info {
-        u8                              bits;
+        const struct iio_chan_spec      *channels;
         u16                             int_vref_mv;
 };
 
diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/staging/iio/dac/ad5624r_spi.c
index 6e05f0dbae0b..10c7484366ef 100644
--- a/drivers/staging/iio/dac/ad5624r_spi.c
+++ b/drivers/staging/iio/dac/ad5624r_spi.c
@@ -21,29 +21,51 @@
 #include "dac.h"
 #include "ad5624r.h"
 
+#define AD5624R_CHANNEL(_chan, _bits) { \
+        .type = IIO_VOLTAGE, \
+        .indexed = 1, \
+        .output = 1, \
+        .channel = (_chan), \
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT, \
+        .address = (_chan), \
+        .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits)), \
+}
+
+#define DECLARE_AD5624R_CHANNELS(_name, _bits) \
+        const struct iio_chan_spec _name##_channels[] = { \
+                AD5624R_CHANNEL(0, _bits), \
+                AD5624R_CHANNEL(1, _bits), \
+                AD5624R_CHANNEL(2, _bits), \
+                AD5624R_CHANNEL(3, _bits), \
+}
+
+static DECLARE_AD5624R_CHANNELS(ad5624r, 12);
+static DECLARE_AD5624R_CHANNELS(ad5644r, 14);
+static DECLARE_AD5624R_CHANNELS(ad5664r, 16);
+
 static const struct ad5624r_chip_info ad5624r_chip_info_tbl[] = {
         [ID_AD5624R3] = {
-                .bits = 12,
-                .int_vref_mv = 1250,
-        },
-        [ID_AD5644R3] = {
-                .bits = 14,
-                .int_vref_mv = 1250,
-        },
-        [ID_AD5664R3] = {
-                .bits = 16,
+                .channels = ad5624r_channels,
                 .int_vref_mv = 1250,
         },
         [ID_AD5624R5] = {
-                .bits = 12,
+                .channels = ad5624r_channels,
                 .int_vref_mv = 2500,
         },
+        [ID_AD5644R3] = {
+                .channels = ad5644r_channels,
+                .int_vref_mv = 1250,
+        },
         [ID_AD5644R5] = {
-                .bits = 14,
+                .channels = ad5644r_channels,
                 .int_vref_mv = 2500,
         },
+        [ID_AD5664R3] = {
+                .channels = ad5664r_channels,
+                .int_vref_mv = 1250,
+        },
         [ID_AD5664R5] = {
-                .bits = 16,
+                .channels = ad5664r_channels,
                 .int_vref_mv = 2500,
         },
 };
@@ -70,24 +92,49 @@ static int ad5624r_spi_write(struct spi_device *spi,
         return spi_write(spi, msg, 3);
 }
 
-static ssize_t ad5624r_write_dac(struct device *dev,
-                                 struct device_attribute *attr,
-                                 const char *buf, size_t len)
+static int ad5624r_read_raw(struct iio_dev *indio_dev,
+                           struct iio_chan_spec const *chan,
+                           int *val,
+                           int *val2,
+                           long m)
 {
-        long readin;
-        int ret;
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
         struct ad5624r_state *st = iio_priv(indio_dev);
-        struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
+        unsigned long scale_uv;
 
-        ret = strict_strtol(buf, 10, &readin);
-        if (ret)
-                return ret;
+        switch (m) {
+        case IIO_CHAN_INFO_SCALE:
+                scale_uv = (st->vref_mv * 1000) >> chan->scan_type.realbits;
+                *val =  scale_uv / 1000;
+                *val2 = (scale_uv % 1000) * 1000;
+                return IIO_VAL_INT_PLUS_MICRO;
 
-        ret = ad5624r_spi_write(st->us, AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,
-                                this_attr->address, readin,
-                                st->chip_info->bits);
-        return ret ? ret : len;
+        }
+        return -EINVAL;
+}
+
+static int ad5624r_write_raw(struct iio_dev *indio_dev,
+                               struct iio_chan_spec const *chan,
+                               int val,
+                               int val2,
+                               long mask)
+{
+        struct ad5624r_state *st = iio_priv(indio_dev);
+        int ret;
+
+        switch (mask) {
+        case 0:
+                if (val >= (1 << chan->scan_type.realbits) || val < 0)
+                        return -EINVAL;
+
+                return ad5624r_spi_write(st->us,
+                                AD5624R_CMD_WRITE_INPUT_N_UPDATE_N,
+                                chan->address, val,
+                                chan->scan_type.shift);
+        default:
+                ret = -EINVAL;
+        }
+
+        return -EINVAL;
 }
 
 static ssize_t ad5624r_read_powerdown_mode(struct device *dev,
@@ -161,24 +208,6 @@ static ssize_t ad5624r_write_dac_powerdown(struct device *dev,
         return ret ? ret : len;
 }
 
-static ssize_t ad5624r_show_scale(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
-{
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ad5624r_state *st = iio_priv(indio_dev);
-        /* Corresponds to Vref / 2^(bits) */
-        unsigned int scale_uv = (st->vref_mv * 1000) >> st->chip_info->bits;
-
-        return sprintf(buf, "%d.%03d\n", scale_uv / 1000, scale_uv % 1000);
-}
-static IIO_DEVICE_ATTR(out_voltage_scale, S_IRUGO, ad5624r_show_scale, NULL, 0);
-
-static IIO_DEV_ATTR_OUT_RAW(0, ad5624r_write_dac, AD5624R_ADDR_DAC0);
-static IIO_DEV_ATTR_OUT_RAW(1, ad5624r_write_dac, AD5624R_ADDR_DAC1);
-static IIO_DEV_ATTR_OUT_RAW(2, ad5624r_write_dac, AD5624R_ADDR_DAC2);
-static IIO_DEV_ATTR_OUT_RAW(3, ad5624r_write_dac, AD5624R_ADDR_DAC3);
-
 static IIO_DEVICE_ATTR(out_voltage_powerdown_mode, S_IRUGO |
                         S_IWUSR, ad5624r_read_powerdown_mode,
                         ad5624r_write_powerdown_mode, 0);
@@ -200,17 +229,12 @@ static IIO_DEV_ATTR_DAC_POWERDOWN(3, ad5624r_read_dac_powerdown,
                                    ad5624r_write_dac_powerdown, 3);
 
 static struct attribute *ad5624r_attributes[] = {
-        &iio_dev_attr_out_voltage0_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage1_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage2_raw.dev_attr.attr,
-        &iio_dev_attr_out_voltage3_raw.dev_attr.attr,
         &iio_dev_attr_out_voltage0_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage1_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage2_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage3_powerdown.dev_attr.attr,
         &iio_dev_attr_out_voltage_powerdown_mode.dev_attr.attr,
         &iio_const_attr_out_voltage_powerdown_mode_available.dev_attr.attr,
-        &iio_dev_attr_out_voltage_scale.dev_attr.attr,
         NULL,
 };
 
@@ -219,6 +243,8 @@ static const struct attribute_group ad5624r_attribute_group = {
 };
 
 static const struct iio_info ad5624r_info = {
+        .write_raw = ad5624r_write_raw,
+        .read_raw = ad5624r_read_raw,
         .attrs = &ad5624r_attribute_group,
         .driver_module = THIS_MODULE,
 };
@@ -259,6 +285,8 @@ static int __devinit ad5624r_probe(struct spi_device *spi)
         indio_dev->name = spi_get_device_id(spi)->name;
         indio_dev->info = &ad5624r_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->channels = st->chip_info->channels;
+        indio_dev->num_channels = AD5624R_DAC_CHANNELS;
 
         ret = ad5624r_spi_write(spi, AD5624R_CMD_INTERNAL_REFER_SETUP, 0,
                                 !!voltage_uv, 16);
@@ -307,6 +335,7 @@ static const struct spi_device_id ad5624r_id[] = {
         {"ad5664r5", ID_AD5664R5},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad5624r_id);
 
 static struct spi_driver ad5624r_driver = {
         .driver = {
diff --git a/drivers/staging/iio/dac/ad5686.c b/drivers/staging/iio/dac/ad5686.c
index e72db2fbfedf..ce2d6193dd89 100644
--- a/drivers/staging/iio/dac/ad5686.c
+++ b/drivers/staging/iio/dac/ad5686.c
@@ -99,7 +99,7 @@ enum ad5686_supported_device_ids {
                 .indexed = 1,                                   \
                 .output = 1,                                    \
                 .channel = chan,                                \
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED), \
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,    \
                 .address = AD5686_ADDR_DAC(chan),                       \
                 .scan_type = IIO_ST('u', bits, 16, shift)       \
 }
@@ -306,7 +306,7 @@ static int ad5686_read_raw(struct iio_dev *indio_dev,
                 *val = ret;
                 return IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 scale_uv = (st->vref_mv * 100000)
                         >> (chan->scan_type.realbits);
                 *val =  scale_uv / 100000;
@@ -437,6 +437,7 @@ static const struct spi_device_id ad5686_id[] = {
         {"ad5686", ID_AD5686},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad5686_id);
 
 static struct spi_driver ad5686_driver = {
         .driver = {
diff --git a/drivers/staging/iio/dac/ad5764.c b/drivers/staging/iio/dac/ad5764.c
new file mode 100644
index 000000000000..ff91480ae65c
--- /dev/null
+++ b/drivers/staging/iio/dac/ad5764.c
@@ -0,0 +1,393 @@
+/*
+ * Analog devices AD5764, AD5764R, AD5744, AD5744R quad-channel
+ * Digital to Analog Converters driver
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
+#include <linux/regulator/consumer.h>
+
+#include "../iio.h"
+#include "../sysfs.h"
+#include "dac.h"
+
+#define AD5764_REG_SF_NOP                       0x0
+#define AD5764_REG_SF_CONFIG                    0x1
+#define AD5764_REG_SF_CLEAR                     0x4
+#define AD5764_REG_SF_LOAD                      0x5
+#define AD5764_REG_DATA(x)                      ((2 << 3) | (x))
+#define AD5764_REG_COARSE_GAIN(x)               ((3 << 3) | (x))
+#define AD5764_REG_FINE_GAIN(x)                 ((4 << 3) | (x))
+#define AD5764_REG_OFFSET(x)                    ((5 << 3) | (x))
+
+#define AD5764_NUM_CHANNELS 4
+
+/**
+ * struct ad5764_chip_info - chip specific information
+ * @int_vref:   Value of the internal reference voltage in uV - 0 if external
+ *              reference voltage is used
+ * @channel     channel specification
+*/
+
+struct ad5764_chip_info {
+        unsigned long int_vref;
+        const struct iio_chan_spec *channels;
+};
+
+/**
+ * struct ad5764_state - driver instance specific data
+ * @spi:                spi_device
+ * @chip_info:          chip info
+ * @vref_reg:           vref supply regulators
+ * @data:               spi transfer buffers
+ */
+
+struct ad5764_state {
+        struct spi_device               *spi;
+        const struct ad5764_chip_info   *chip_info;
+        struct regulator_bulk_data      vref_reg[2];
+
+        /*
+         * DMA (thus cache coherency maintenance) requires the
+         * transfer buffers to live in their own cache lines.
+         */
+        union {
+                __be32 d32;
+                u8 d8[4];
+        } data[2] ____cacheline_aligned;
+};
+
+enum ad5764_type {
+        ID_AD5744,
+        ID_AD5744R,
+        ID_AD5764,
+        ID_AD5764R,
+};
+
+#define AD5764_CHANNEL(_chan, _bits) {                          \
+        .type = IIO_VOLTAGE,                                    \
+        .indexed = 1,                                           \
+        .output = 1,                                            \
+        .channel = (_chan),                                     \
+        .address = (_chan),                                     \
+        .info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |          \
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |              \
+                IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |         \
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,           \
+        .scan_type = IIO_ST('u', (_bits), 16, 16 - (_bits))     \
+}
+
+#define DECLARE_AD5764_CHANNELS(_name, _bits) \
+const struct iio_chan_spec _name##_channels[] = { \
+        AD5764_CHANNEL(0, (_bits)), \
+        AD5764_CHANNEL(1, (_bits)), \
+        AD5764_CHANNEL(2, (_bits)), \
+        AD5764_CHANNEL(3, (_bits)), \
+};
+
+static DECLARE_AD5764_CHANNELS(ad5764, 16);
+static DECLARE_AD5764_CHANNELS(ad5744, 14);
+
+static const struct ad5764_chip_info ad5764_chip_infos[] = {
+        [ID_AD5744] = {
+                .int_vref = 0,
+                .channels = ad5744_channels,
+        },
+        [ID_AD5744R] = {
+                .int_vref = 5000000,
+                .channels = ad5744_channels,
+        },
+        [ID_AD5764] = {
+                .int_vref = 0,
+                .channels = ad5764_channels,
+        },
+        [ID_AD5764R] = {
+                .int_vref = 5000000,
+                .channels = ad5764_channels,
+        },
+};
+
+static int ad5764_write(struct iio_dev *indio_dev, unsigned int reg,
+        unsigned int val)
+{
+        struct ad5764_state *st = iio_priv(indio_dev);
+        int ret;
+
+        mutex_lock(&indio_dev->mlock);
+        st->data[0].d32 = cpu_to_be32((reg << 16) | val);
+
+        ret = spi_write(st->spi, &st->data[0].d8[1], 3);
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static int ad5764_read(struct iio_dev *indio_dev, unsigned int reg,
+        unsigned int *val)
+{
+        struct ad5764_state *st = iio_priv(indio_dev);
+        struct spi_message m;
+        int ret;
+        struct spi_transfer t[] = {
+                {
+                        .tx_buf = &st->data[0].d8[1],
+                        .len = 3,
+                        .cs_change = 1,
+                }, {
+                        .rx_buf = &st->data[1].d8[1],
+                        .len = 3,
+                },
+        };
+
+        spi_message_init(&m);
+        spi_message_add_tail(&t[0], &m);
+        spi_message_add_tail(&t[1], &m);
+
+        mutex_lock(&indio_dev->mlock);
+
+        st->data[0].d32 = cpu_to_be32((1 << 23) | (reg << 16));
+
+        ret = spi_sync(st->spi, &m);
+        if (ret >= 0)
+                *val = be32_to_cpu(st->data[1].d32) & 0xffff;
+
+        mutex_unlock(&indio_dev->mlock);
+
+        return ret;
+}
+
+static int ad5764_chan_info_to_reg(struct iio_chan_spec const *chan, long info)
+{
+        switch (info) {
+        case 0:
+                return AD5764_REG_DATA(chan->address);
+        case IIO_CHAN_INFO_CALIBBIAS:
+                return AD5764_REG_OFFSET(chan->address);
+        case IIO_CHAN_INFO_CALIBSCALE:
+                return AD5764_REG_FINE_GAIN(chan->address);
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static int ad5764_write_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int val, int val2, long info)
+{
+        const int max_val = (1 << chan->scan_type.realbits);
+        unsigned int reg;
+
+        switch (info) {
+        case 0:
+                if (val >= max_val || val < 0)
+                        return -EINVAL;
+                val <<= chan->scan_type.shift;
+                break;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                if (val >= 128 || val < -128)
+                        return -EINVAL;
+                break;
+        case IIO_CHAN_INFO_CALIBSCALE:
+                if (val >= 32 || val < -32)
+                        return -EINVAL;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        reg = ad5764_chan_info_to_reg(chan, info);
+        return ad5764_write(indio_dev, reg, (u16)val);
+}
+
+static int ad5764_get_channel_vref(struct ad5764_state *st,
+        unsigned int channel)
+{
+        if (st->chip_info->int_vref)
+                return st->chip_info->int_vref;
+        else
+                return regulator_get_voltage(st->vref_reg[channel / 2].consumer);
+}
+
+static int ad5764_read_raw(struct iio_dev *indio_dev,
+        struct iio_chan_spec const *chan, int *val, int *val2, long info)
+{
+        struct ad5764_state *st = iio_priv(indio_dev);
+        unsigned long scale_uv;
+        unsigned int reg;
+        int vref;
+        int ret;
+
+        switch (info) {
+        case 0:
+                reg = AD5764_REG_DATA(chan->address);
+                ret = ad5764_read(indio_dev, reg, val);
+                if (ret < 0)
+                        return ret;
+                *val >>= chan->scan_type.shift;
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                reg = AD5764_REG_OFFSET(chan->address);
+                ret = ad5764_read(indio_dev, reg, val);
+                if (ret < 0)
+                        return ret;
+                *val = sign_extend32(*val, 7);
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_CALIBSCALE:
+                reg = AD5764_REG_FINE_GAIN(chan->address);
+                ret = ad5764_read(indio_dev, reg, val);
+                if (ret < 0)
+                        return ret;
+                *val = sign_extend32(*val, 5);
+                return IIO_VAL_INT;
+        case IIO_CHAN_INFO_SCALE:
+                /* vout = 4 * vref + ((dac_code / 65535) - 0.5) */
+                vref = ad5764_get_channel_vref(st, chan->channel);
+                if (vref < 0)
+                        return vref;
+
+                scale_uv = (vref * 4 * 100) >> chan->scan_type.realbits;
+                *val = scale_uv / 100000;
+                *val2 = (scale_uv % 100000) * 10;
+                return IIO_VAL_INT_PLUS_MICRO;
+        case IIO_CHAN_INFO_OFFSET:
+                *val = -(1 << chan->scan_type.realbits) / 2;
+                return IIO_VAL_INT;
+        }
+
+        return -EINVAL;
+}
+
+static const struct iio_info ad5764_info = {
+        .read_raw = ad5764_read_raw,
+        .write_raw = ad5764_write_raw,
+        .driver_module = THIS_MODULE,
+};
+
+static int __devinit ad5764_probe(struct spi_device *spi)
+{
+        enum ad5764_type type = spi_get_device_id(spi)->driver_data;
+        struct iio_dev *indio_dev;
+        struct ad5764_state *st;
+        int ret;
+
+        indio_dev = iio_allocate_device(sizeof(*st));
+        if (indio_dev == NULL) {
+                dev_err(&spi->dev, "Failed to allocate iio device\n");
+                return -ENOMEM;
+        }
+
+        st = iio_priv(indio_dev);
+        spi_set_drvdata(spi, indio_dev);
+
+        st->spi = spi;
+        st->chip_info = &ad5764_chip_infos[type];
+
+        indio_dev->dev.parent = &spi->dev;
+        indio_dev->name = spi_get_device_id(spi)->name;
+        indio_dev->info = &ad5764_info;
+        indio_dev->modes = INDIO_DIRECT_MODE;
+        indio_dev->num_channels = AD5764_NUM_CHANNELS;
+        indio_dev->channels = st->chip_info->channels;
+
+        if (st->chip_info->int_vref == 0) {
+                st->vref_reg[0].supply = "vrefAB";
+                st->vref_reg[1].supply = "vrefCD";
+
+                ret = regulator_bulk_get(&st->spi->dev,
+                        ARRAY_SIZE(st->vref_reg), st->vref_reg);
+                if (ret) {
+                        dev_err(&spi->dev, "Failed to request vref regulators: %d\n",
+                                ret);
+                        goto error_free;
+                }
+
+                ret = regulator_bulk_enable(ARRAY_SIZE(st->vref_reg),
+                        st->vref_reg);
+                if (ret) {
+                        dev_err(&spi->dev, "Failed to enable vref regulators: %d\n",
+                                ret);
+                        goto error_free_reg;
+                }
+        }
+
+        ret = iio_device_register(indio_dev);
+        if (ret) {
+                dev_err(&spi->dev, "Failed to register iio device: %d\n", ret);
+                goto error_disable_reg;
+        }
+
+        return 0;
+
+error_disable_reg:
+        if (st->chip_info->int_vref == 0)
+                regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg);
+error_free_reg:
+        if (st->chip_info->int_vref == 0)
+                regulator_bulk_free(ARRAY_SIZE(st->vref_reg), st->vref_reg);
+error_free:
+        iio_free_device(indio_dev);
+
+        return ret;
+}
+
+static int __devexit ad5764_remove(struct spi_device *spi)
+{
+        struct iio_dev *indio_dev = spi_get_drvdata(spi);
+        struct ad5764_state *st = iio_priv(indio_dev);
+
+        iio_device_unregister(indio_dev);
+
+        if (st->chip_info->int_vref == 0) {
+                regulator_bulk_disable(ARRAY_SIZE(st->vref_reg), st->vref_reg);
+                regulator_bulk_free(ARRAY_SIZE(st->vref_reg), st->vref_reg);
+        }
+
+        iio_free_device(indio_dev);
+
+        return 0;
+}
+
+static const struct spi_device_id ad5764_ids[] = {
+        { "ad5744", ID_AD5744 },
+        { "ad5744r", ID_AD5744R },
+        { "ad5764", ID_AD5764 },
+        { "ad5764r", ID_AD5764R },
+        { }
+};
+MODULE_DEVICE_TABLE(spi, ad5764_ids);
+
+static struct spi_driver ad5764_driver = {
+        .driver = {
+                .name = "ad5764",
+                .owner = THIS_MODULE,
+        },
+        .probe = ad5764_probe,
+        .remove = __devexit_p(ad5764_remove),
+        .id_table = ad5764_ids,
+};
+
+static int __init ad5764_spi_init(void)
+{
+        return spi_register_driver(&ad5764_driver);
+}
+module_init(ad5764_spi_init);
+
+static void __exit ad5764_spi_exit(void)
+{
+        spi_unregister_driver(&ad5764_driver);
+}
+module_exit(ad5764_spi_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Analog Devices AD5744/AD5744R/AD5764/AD5764R DAC");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dac/ad5791.c b/drivers/staging/iio/dac/ad5791.c
index 4a80fd822231..ac45636a8d72 100644
--- a/drivers/staging/iio/dac/ad5791.c
+++ b/drivers/staging/iio/dac/ad5791.c
@@ -1,5 +1,6 @@
 /*
- * AD5760, AD5780, AD5781, AD5791 Voltage Output Digital to Analog Converter
+ * AD5760, AD5780, AD5781, AD5790, AD5791 Voltage Output Digital to Analog
+ * Converter
  *
  * Copyright 2011 Analog Devices Inc.
  *
@@ -77,8 +78,8 @@ static int ad5791_spi_read(struct spi_device *spi, u8 addr, u32 *val)
         .indexed = 1,                                   \
         .address = AD5791_ADDR_DAC0,                    \
         .channel = 0,                                   \
-        .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED) | \
-                (1 << IIO_CHAN_INFO_OFFSET_SHARED),     \
+        .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT | \
+                IIO_CHAN_INFO_OFFSET_SHARED_BIT,        \
         .scan_type = IIO_ST('u', bits, 24, shift)       \
 }
 
@@ -237,11 +238,11 @@ static int ad5791_read_raw(struct iio_dev *indio_dev,
                 *val &= AD5791_DAC_MASK;
                 *val >>= chan->scan_type.shift;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 *val = 0;
                 *val2 = (((u64)st->vref_mv) * 1000000ULL) >> chan->scan_type.realbits;
                 return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_OFFSET_SHARED):
+        case IIO_CHAN_INFO_OFFSET:
                 val64 = (((u64)st->vref_neg_mv) << chan->scan_type.realbits);
                 do_div(val64, st->vref_mv);
                 *val = -val64;
@@ -397,9 +398,11 @@ static const struct spi_device_id ad5791_id[] = {
         {"ad5760", ID_AD5760},
         {"ad5780", ID_AD5780},
         {"ad5781", ID_AD5781},
+        {"ad5790", ID_AD5791},
         {"ad5791", ID_AD5791},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad5791_id);
 
 static struct spi_driver ad5791_driver = {
         .driver = {
@@ -413,5 +416,5 @@ static struct spi_driver ad5791_driver = {
 module_spi_driver(ad5791_driver);
 
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
-MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5791 DAC");
+MODULE_DESCRIPTION("Analog Devices AD5760/AD5780/AD5781/AD5790/AD5791 DAC");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/dds/ad5930.c b/drivers/staging/iio/dds/ad5930.c
index 4a360d044a36..9c32d1beae25 100644
--- a/drivers/staging/iio/dds/ad5930.c
+++ b/drivers/staging/iio/dds/ad5930.c
@@ -148,3 +148,4 @@ module_spi_driver(ad5930_driver);
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("Analog Devices ad5930 driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:" DRV_NAME);
diff --git a/drivers/staging/iio/dds/ad9832.c b/drivers/staging/iio/dds/ad9832.c
index cc32fd65b8b3..2ccf25dd9289 100644
--- a/drivers/staging/iio/dds/ad9832.c
+++ b/drivers/staging/iio/dds/ad9832.c
@@ -88,7 +88,7 @@ static ssize_t ad9832_write(struct device *dev,
                 goto error_ret;
 
         mutex_lock(&indio_dev->mlock);
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD9832_FREQ0HM:
         case AD9832_FREQ1HM:
                 ret = ad9832_write_frequency(st, this_attr->address, val);
@@ -344,11 +344,11 @@ static const struct spi_device_id ad9832_id[] = {
         {"ad9835", 0},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad9832_id);
 
 static struct spi_driver ad9832_driver = {
         .driver = {
                 .name   = "ad9832",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad9832_probe,
@@ -360,4 +360,3 @@ module_spi_driver(ad9832_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD9832/AD9835 DDS");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad9832");
diff --git a/drivers/staging/iio/dds/ad9834.c b/drivers/staging/iio/dds/ad9834.c
index 51fda6f69815..5e67104fea18 100644
--- a/drivers/staging/iio/dds/ad9834.c
+++ b/drivers/staging/iio/dds/ad9834.c
@@ -77,7 +77,7 @@ static ssize_t ad9834_write(struct device *dev,
                 goto error_ret;
 
         mutex_lock(&indio_dev->mlock);
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD9834_REG_FREQ0:
         case AD9834_REG_FREQ1:
                 ret = ad9834_write_frequency(st, this_attr->address, val);
@@ -153,7 +153,7 @@ static ssize_t ad9834_store_wavetype(struct device *dev,
 
         mutex_lock(&indio_dev->mlock);
 
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case 0:
                 if (sysfs_streq(buf, "sine")) {
                         st->control &= ~AD9834_MODE;
@@ -435,11 +435,11 @@ static const struct spi_device_id ad9834_id[] = {
         {"ad9838", ID_AD9838},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad9834_id);
 
 static struct spi_driver ad9834_driver = {
         .driver = {
                 .name   = "ad9834",
-                .bus    = &spi_bus_type,
                 .owner  = THIS_MODULE,
         },
         .probe          = ad9834_probe,
@@ -451,4 +451,3 @@ module_spi_driver(ad9834_driver);
 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
 MODULE_DESCRIPTION("Analog Devices AD9833/AD9834/AD9837/AD9838 DDS");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("spi:ad9834");
diff --git a/drivers/staging/iio/dds/ad9850.c b/drivers/staging/iio/dds/ad9850.c
index f9c96afcb996..f4f731bb2191 100644
--- a/drivers/staging/iio/dds/ad9850.c
+++ b/drivers/staging/iio/dds/ad9850.c
@@ -134,3 +134,4 @@ module_spi_driver(ad9850_driver);
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("Analog Devices ad9850 driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:" DRV_NAME);
diff --git a/drivers/staging/iio/dds/ad9852.c b/drivers/staging/iio/dds/ad9852.c
index 9fc73fdc9c3b..554266c615a8 100644
--- a/drivers/staging/iio/dds/ad9852.c
+++ b/drivers/staging/iio/dds/ad9852.c
@@ -285,3 +285,4 @@ module_spi_driver(ad9852_driver);
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("Analog Devices ad9852 driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:" DRV_NAME);
diff --git a/drivers/staging/iio/dds/ad9910.c b/drivers/staging/iio/dds/ad9910.c
index 57046b03121f..3985766d6f87 100644
--- a/drivers/staging/iio/dds/ad9910.c
+++ b/drivers/staging/iio/dds/ad9910.c
@@ -418,3 +418,4 @@ module_spi_driver(ad9910_driver);
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("Analog Devices ad9910 driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:" DRV_NAME);
diff --git a/drivers/staging/iio/dds/ad9951.c b/drivers/staging/iio/dds/ad9951.c
index d29130e9acdf..4d150048002a 100644
--- a/drivers/staging/iio/dds/ad9951.c
+++ b/drivers/staging/iio/dds/ad9951.c
@@ -229,3 +229,4 @@ module_spi_driver(ad9951_driver);
 MODULE_AUTHOR("Cliff Cai");
 MODULE_DESCRIPTION("Analog Devices ad9951 driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:" DRV_NAME);
diff --git a/drivers/staging/iio/events.h b/drivers/staging/iio/events.h
new file mode 100644
index 000000000000..bfb63400fa60
--- /dev/null
+++ b/drivers/staging/iio/events.h
@@ -0,0 +1,103 @@
+/* The industrial I/O - event passing to userspace
+ *
+ * Copyright (c) 2008-2011 Jonathan Cameron
+ *
+ * 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.
+ */
+#ifndef _IIO_EVENTS_H_
+#define _IIO_EVENTS_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+#include "types.h"
+
+/**
+ * struct iio_event_data - The actual event being pushed to userspace
+ * @id:         event identifier
+ * @timestamp:  best estimate of time of event occurrence (often from
+ *              the interrupt handler)
+ */
+struct iio_event_data {
+        __u64   id;
+        __s64   timestamp;
+};
+
+#define IIO_GET_EVENT_FD_IOCTL _IOR('i', 0x90, int)
+
+enum iio_event_type {
+        IIO_EV_TYPE_THRESH,
+        IIO_EV_TYPE_MAG,
+        IIO_EV_TYPE_ROC,
+        IIO_EV_TYPE_THRESH_ADAPTIVE,
+        IIO_EV_TYPE_MAG_ADAPTIVE,
+};
+
+enum iio_event_direction {
+        IIO_EV_DIR_EITHER,
+        IIO_EV_DIR_RISING,
+        IIO_EV_DIR_FALLING,
+};
+
+/**
+ * IIO_EVENT_CODE() - create event identifier
+ * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
+ * @diff:       Whether the event is for an differential channel or not.
+ * @modifier:   Modifier for the channel. Should be one of enum iio_modifier.
+ * @direction:  Direction of the event. One of enum iio_event_direction.
+ * @type:       Type of the event. Should be one enum iio_event_type.
+ * @chan:       Channel number for non-differential channels.
+ * @chan1:      First channel number for differential channels.
+ * @chan2:      Second channel number for differential channels.
+ */
+
+#define IIO_EVENT_CODE(chan_type, diff, modifier, direction,            \
+                       type, chan, chan1, chan2)                        \
+        (((u64)type << 56) | ((u64)diff << 55) |                        \
+         ((u64)direction << 48) | ((u64)modifier << 40) |               \
+         ((u64)chan_type << 32) | (((u16)chan2) << 16) | ((u16)chan1) | \
+         ((u16)chan))
+
+
+#define IIO_EV_DIR_MAX 4
+#define IIO_EV_BIT(type, direction)                     \
+        (1 << (type*IIO_EV_DIR_MAX + direction))
+
+/**
+ * IIO_MOD_EVENT_CODE() - create event identifier for modified channels
+ * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
+ * @number:     Channel number.
+ * @modifier:   Modifier for the channel. Should be one of enum iio_modifier.
+ * @type:       Type of the event. Should be one enum iio_event_type.
+ * @direction:  Direction of the event. One of enum iio_event_direction.
+ */
+
+#define IIO_MOD_EVENT_CODE(chan_type, number, modifier,         \
+                           type, direction)                             \
+        IIO_EVENT_CODE(chan_type, 0, modifier, direction, type, number, 0, 0)
+
+/**
+ * IIO_UNMOD_EVENT_CODE() - create event identifier for unmodified channels
+ * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
+ * @number:     Channel number.
+ * @type:       Type of the event. Should be one enum iio_event_type.
+ * @direction:  Direction of the event. One of enum iio_event_direction.
+ */
+
+#define IIO_UNMOD_EVENT_CODE(chan_type, number, type, direction)        \
+        IIO_EVENT_CODE(chan_type, 0, 0, direction, type, number, 0, 0)
+
+#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
+
+#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF)
+
+#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
+
+/* Event code number extraction depends on which type of event we have.
+ * Perhaps review this function in the future*/
+#define IIO_EVENT_CODE_EXTRACT_NUM(mask) ((__s16)(mask & 0xFFFF))
+
+#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
+
+#endif
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index 22aea5b4e61d..ea295b25308c 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -37,11 +37,11 @@ config ADIS16260
           will be called adis16260.
 
 config ADXRS450
-        tristate "Analog Devices ADXRS450 Digital Output Gyroscope SPI driver"
+        tristate "Analog Devices ADXRS450/3 Digital Output Gyroscope SPI driver"
         depends on SPI
         help
-          Say yes here to build support for Analog Devices ADXRS450 programmable
-          digital output gyroscope.
+          Say yes here to build support for Analog Devices ADXRS450 and ADXRS453
+          programmable digital output gyroscope.
 
           This driver can also be built as a module.  If so, the module
           will be called adxrs450.
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index ff1b5a82b3d6..c0ca7093e0ed 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -98,11 +98,11 @@ static int adis16060_read_raw(struct iio_dev *indio_dev,
                 mutex_unlock(&indio_dev->mlock);
                 *val = tval;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = -7;
                 *val2 = 461117;
                 return IIO_VAL_INT_PLUS_MICRO;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 *val = 0;
                 *val2 = 34000;
                 return IIO_VAL_INT_PLUS_MICRO;
@@ -136,8 +136,8 @@ static const struct iio_chan_spec adis16060_channels[] = {
                 .type = IIO_TEMP,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = ADIS16060_TEMP_OUT,
         }
 };
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c
index 9405f2d368ee..1815490db8b4 100644
--- a/drivers/staging/iio/gyro/adis16080_core.c
+++ b/drivers/staging/iio/gyro/adis16080_core.c
@@ -194,3 +194,4 @@ module_spi_driver(adis16080_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16080/100 Yaw Rate Gyroscope Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16080");
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index c9aaca9631f4..947eb86f05d8 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -173,3 +173,4 @@ module_spi_driver(adis16130_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADIS16130 High Precision Angular Rate");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:adis16130");
diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index 886dddf867ef..8f6af47e9559 100644
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -20,7 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 
 #include "adis16260.h"
 
@@ -390,9 +390,9 @@ enum adis16260_channel {
 #define ADIS16260_GYRO_CHANNEL_SET(axis, mod)                           \
         struct iio_chan_spec adis16260_channels_##axis[] = {            \
                 IIO_CHAN(IIO_ANGL_VEL, 1, 0, 0, NULL, 0, mod,           \
-                         (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |      \
-                         (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) |     \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT | \
+                         IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT |        \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          gyro, ADIS16260_SCAN_GYRO,                     \
                          IIO_ST('s', 14, 16, 0), 0),                    \
                 IIO_CHAN(IIO_ANGL, 1, 0, 0, NULL, 0, mod,               \
@@ -400,16 +400,16 @@ enum adis16260_channel {
                          angle, ADIS16260_SCAN_ANGL,                    \
                          IIO_ST('u', 14, 16, 0), 0),                    \
                 IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,                 \
-                         (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |         \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |            \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          temp, ADIS16260_SCAN_TEMP,                     \
                          IIO_ST('u', 12, 16, 0), 0),                    \
                 IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "supply", 0, 0,          \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          in_supply, ADIS16260_SCAN_SUPPLY,              \
                          IIO_ST('u', 12, 16, 0), 0),                    \
                 IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,              \
-                         (1 << IIO_CHAN_INFO_SCALE_SEPARATE),           \
+                         IIO_CHAN_INFO_SCALE_SEPARATE_BIT,              \
                          in_aux, ADIS16260_SCAN_AUX_ADC,                \
                          IIO_ST('u', 12, 16, 0), 0),                    \
                 IIO_CHAN_SOFT_TIMESTAMP(5)                              \
@@ -464,8 +464,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         *val = 0;
@@ -489,10 +488,10 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
                         return -EINVAL;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 *val = 25;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         bits = 12;
@@ -512,7 +511,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         bits = 12;
@@ -544,11 +543,11 @@ static int adis16260_write_raw(struct iio_dev *indio_dev,
         s16 val16;
         u8 addr;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 val16 = val & ((1 << bits) - 1);
                 addr = adis16260_addresses[chan->address][1];
                 return adis16260_spi_write_reg_16(indio_dev, addr, val16);
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 val16 = val & ((1 << bits) - 1);
                 addr = adis16260_addresses[chan->address][2];
                 return adis16260_spi_write_reg_16(indio_dev, addr, val16);
@@ -633,11 +632,16 @@ static int __devinit adis16260_probe(struct spi_device *spi)
         }
         if (indio_dev->buffer) {
                 /* Set default scan mode */
-                iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_SUPPLY);
-                iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_GYRO);
-                iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_AUX_ADC);
-                iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_TEMP);
-                iio_scan_mask_set(indio_dev->buffer, ADIS16260_SCAN_ANGL);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer,
+                                  ADIS16260_SCAN_SUPPLY);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer,
+                                  ADIS16260_SCAN_GYRO);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer,
+                                  ADIS16260_SCAN_AUX_ADC);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer,
+                                  ADIS16260_SCAN_TEMP);
+                iio_scan_mask_set(indio_dev, indio_dev->buffer,
+                                  ADIS16260_SCAN_ANGL);
         }
         if (spi->irq) {
                 ret = adis16260_probe_trigger(indio_dev);
@@ -701,6 +705,7 @@ static const struct spi_device_id adis16260_id[] = {
         {"adis16251", 1},
         {}
 };
+MODULE_DEVICE_TABLE(spi, adis16260_id);
 
 static struct spi_driver adis16260_driver = {
         .driver = {
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index 52a9e784e7c8..699a6152c409 100644
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -74,9 +74,10 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)
                 return -ENOMEM;
         }
 
-        if (ring->scan_count &&
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
             adis16260_read_ring_data(&indio_dev->dev, st->rx) >= 0)
-                for (; i < ring->scan_count; i++)
+                for (; i < bitmap_weight(indio_dev->active_scan_mask,
+                                         indio_dev->masklength); i++)
                         data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));
 
         /* Guaranteed to be aligned with 8 byte boundary */
@@ -116,10 +117,8 @@ int adis16260_configure_ring(struct iio_dev *indio_dev)
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
         ring->access = &ring_sw_access_funcs;
-        ring->bpe = 2;
         ring->scan_timestamp = true;
-        ring->setup_ops = &adis16260_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16260_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16260_trigger_handler,
diff --git a/drivers/staging/iio/gyro/adxrs450.h b/drivers/staging/iio/gyro/adxrs450.h
index b6b682876406..af0c870100b6 100644
--- a/drivers/staging/iio/gyro/adxrs450.h
+++ b/drivers/staging/iio/gyro/adxrs450.h
@@ -39,6 +39,11 @@
 
 #define ADXRS450_GET_ST(a)      ((a >> 26) & 0x3)
 
+enum {
+        ID_ADXRS450,
+        ID_ADXRS453,
+};
+
 /**
  * struct adxrs450_state - device instance specific data
  * @us:                 actual spi_device
diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c
index 70fd468b6850..15e2496f70c8 100644
--- a/drivers/staging/iio/gyro/adxrs450_core.c
+++ b/drivers/staging/iio/gyro/adxrs450_core.c
@@ -1,5 +1,5 @@
 /*
- * ADXRS450 Digital Output Gyroscope Driver
+ * ADXRS450/ADXRS453 Digital Output Gyroscope Driver
  *
  * Copyright 2011 Analog Devices Inc.
  *
@@ -243,7 +243,7 @@ static int adxrs450_write_raw(struct iio_dev *indio_dev,
 {
         int ret;
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 ret = adxrs450_spi_write_reg_16(indio_dev,
                                                 ADXRS450_DNC1,
                                                 val & 0x3FF);
@@ -263,7 +263,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
 {
         int ret;
         s16 t;
-        u16 ut;
+
         switch (mask) {
         case 0:
                 switch (chan->type) {
@@ -276,10 +276,10 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
                         break;
                 case IIO_TEMP:
                         ret = adxrs450_spi_read_reg_16(indio_dev,
-                                                       ADXRS450_TEMP1, &ut);
+                                                       ADXRS450_TEMP1, &t);
                         if (ret)
                                 break;
-                        *val = ut;
+                        *val = (t >> 6) + 225;
                         ret = IIO_VAL_INT;
                         break;
                 default:
@@ -287,13 +287,34 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
                         break;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->type) {
+                case IIO_ANGL_VEL:
+                        *val = 0;
+                        *val2 = 218166;
+                        return IIO_VAL_INT_PLUS_NANO;
+                case IIO_TEMP:
+                        *val = 200;
+                        *val2 = 0;
+                        return IIO_VAL_INT;
+                default:
+                        return -EINVAL;
+                }
+                break;
+        case IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW:
                 ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_QUAD1, &t);
                 if (ret)
                         break;
                 *val = t;
                 ret = IIO_VAL_INT;
                 break;
+        case IIO_CHAN_INFO_CALIBBIAS:
+                ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_DNC1, &t);
+                if (ret)
+                        break;
+                *val = t;
+                ret = IIO_VAL_INT;
+                break;
         default:
                 ret = -EINVAL;
                 break;
@@ -302,18 +323,36 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
         return ret;
 }
 
-static const struct iio_chan_spec adxrs450_channels[] = {
-        {
-                .type = IIO_ANGL_VEL,
-                .modified = 1,
-                .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE)
-        }, {
-                .type = IIO_TEMP,
-                .indexed = 1,
-                .channel = 0,
-        }
+static const struct iio_chan_spec adxrs450_channels[2][2] = {
+        [ID_ADXRS450] = {
+                {
+                        .type = IIO_ANGL_VEL,
+                        .modified = 1,
+                        .channel2 = IIO_MOD_Z,
+                        .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT |
+                        IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                }, {
+                        .type = IIO_TEMP,
+                        .indexed = 1,
+                        .channel = 0,
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                }
+        },
+        [ID_ADXRS453] = {
+                {
+                        .type = IIO_ANGL_VEL,
+                        .modified = 1,
+                        .channel2 = IIO_MOD_Z,
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT,
+                }, {
+                        .type = IIO_TEMP,
+                        .indexed = 1,
+                        .channel = 0,
+                        .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
+                }
+        },
 };
 
 static const struct iio_info adxrs450_info = {
@@ -343,7 +382,8 @@ static int __devinit adxrs450_probe(struct spi_device *spi)
         indio_dev->dev.parent = &spi->dev;
         indio_dev->info = &adxrs450_info;
         indio_dev->modes = INDIO_DIRECT_MODE;
-        indio_dev->channels = adxrs450_channels;
+        indio_dev->channels =
+                adxrs450_channels[spi_get_device_id(spi)->driver_data];
         indio_dev->num_channels = ARRAY_SIZE(adxrs450_channels);
         indio_dev->name = spi->dev.driver->name;
 
@@ -373,6 +413,13 @@ static int adxrs450_remove(struct spi_device *spi)
         return 0;
 }
 
+static const struct spi_device_id adxrs450_id[] = {
+        {"adxrs450", ID_ADXRS450},
+        {"adxrs453", ID_ADXRS453},
+        {}
+};
+MODULE_DEVICE_TABLE(spi, adxrs450_id);
+
 static struct spi_driver adxrs450_driver = {
         .driver = {
                 .name = "adxrs450",
@@ -380,9 +427,10 @@ static struct spi_driver adxrs450_driver = {
         },
         .probe = adxrs450_probe,
         .remove = __devexit_p(adxrs450_remove),
+        .id_table       = adxrs450_id,
 };
 module_spi_driver(adxrs450_driver);
 
 MODULE_AUTHOR("Cliff Cai <cliff.cai@xxxxxxxxxx>");
-MODULE_DESCRIPTION("Analog Devices ADXRS450 Gyroscope SPI driver");
+MODULE_DESCRIPTION("Analog Devices ADXRS450/ADXRS453 Gyroscope SPI driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index f3d88cd7e8a0..be6ced31f65e 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -7,13 +7,12 @@
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  */
-
 #ifndef _INDUSTRIAL_IO_H_
 #define _INDUSTRIAL_IO_H_
 
 #include <linux/device.h>
 #include <linux/cdev.h>
-
+#include "types.h"
 /* IIO TODO LIST */
 /*
  * Provide means of adjusting timer accuracy.
@@ -25,62 +24,64 @@ enum iio_data_type {
         IIO_PROCESSED,
 };
 
-enum iio_chan_type {
-        /* real channel types */
-        IIO_VOLTAGE,
-        IIO_CURRENT,
-        IIO_POWER,
-        IIO_ACCEL,
-        IIO_ANGL_VEL,
-        IIO_MAGN,
-        IIO_LIGHT,
-        IIO_INTENSITY,
-        IIO_PROXIMITY,
-        IIO_TEMP,
-        IIO_INCLI,
-        IIO_ROT,
-        IIO_ANGL,
-        IIO_TIMESTAMP,
-        IIO_CAPACITANCE,
-};
-
-enum iio_modifier {
-        IIO_NO_MOD,
-        IIO_MOD_X,
-        IIO_MOD_Y,
-        IIO_MOD_Z,
-        IIO_MOD_X_AND_Y,
-        IIO_MOD_X_ANX_Z,
-        IIO_MOD_Y_AND_Z,
-        IIO_MOD_X_AND_Y_AND_Z,
-        IIO_MOD_X_OR_Y,
-        IIO_MOD_X_OR_Z,
-        IIO_MOD_Y_OR_Z,
-        IIO_MOD_X_OR_Y_OR_Z,
-        IIO_MOD_LIGHT_BOTH,
-        IIO_MOD_LIGHT_IR,
-};
-
 /* Could add the raw attributes as well - allowing buffer only devices */
 enum iio_chan_info_enum {
-        IIO_CHAN_INFO_SCALE_SHARED,
-        IIO_CHAN_INFO_SCALE_SEPARATE,
-        IIO_CHAN_INFO_OFFSET_SHARED,
-        IIO_CHAN_INFO_OFFSET_SEPARATE,
-        IIO_CHAN_INFO_CALIBSCALE_SHARED,
-        IIO_CHAN_INFO_CALIBSCALE_SEPARATE,
-        IIO_CHAN_INFO_CALIBBIAS_SHARED,
-        IIO_CHAN_INFO_CALIBBIAS_SEPARATE,
-        IIO_CHAN_INFO_PEAK_SHARED,
-        IIO_CHAN_INFO_PEAK_SEPARATE,
-        IIO_CHAN_INFO_PEAK_SCALE_SHARED,
-        IIO_CHAN_INFO_PEAK_SCALE_SEPARATE,
-        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED,
-        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE,
-        IIO_CHAN_INFO_AVERAGE_RAW_SHARED,
-        IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE,
+        /* 0 is reserverd for raw attributes */
+        IIO_CHAN_INFO_SCALE = 1,
+        IIO_CHAN_INFO_OFFSET,
+        IIO_CHAN_INFO_CALIBSCALE,
+        IIO_CHAN_INFO_CALIBBIAS,
+        IIO_CHAN_INFO_PEAK,
+        IIO_CHAN_INFO_PEAK_SCALE,
+        IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW,
+        IIO_CHAN_INFO_AVERAGE_RAW,
+        IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY,
 };
 
+#define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
+#define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)
+
+#define IIO_CHAN_INFO_SCALE_SEPARATE_BIT                \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_SCALE)
+#define IIO_CHAN_INFO_SCALE_SHARED_BIT                  \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_SCALE)
+#define IIO_CHAN_INFO_OFFSET_SEPARATE_BIT                       \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_OFFSET)
+#define IIO_CHAN_INFO_OFFSET_SHARED_BIT                 \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_OFFSET)
+#define IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT                   \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBSCALE)
+#define IIO_CHAN_INFO_CALIBSCALE_SHARED_BIT                     \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBSCALE)
+#define IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT                    \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_CALIBBIAS)
+#define IIO_CHAN_INFO_CALIBBIAS_SHARED_BIT                      \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_CALIBBIAS)
+#define IIO_CHAN_INFO_PEAK_SEPARATE_BIT                 \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAK)
+#define IIO_CHAN_INFO_PEAK_SHARED_BIT                   \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAK)
+#define IIO_CHAN_INFO_PEAKSCALE_SEPARATE_BIT                    \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_PEAKSCALE)
+#define IIO_CHAN_INFO_PEAKSCALE_SHARED_BIT                      \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_PEAKSCALE)
+#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE_BIT    \
+        IIO_CHAN_INFO_SEPARATE_BIT(                             \
+                IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)
+#define IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED_BIT      \
+        IIO_CHAN_INFO_SHARED_BIT(                               \
+                IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW)
+#define IIO_CHAN_INFO_AVERAGE_RAW_SEPARATE_BIT                  \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_AVERAGE_RAW)
+#define IIO_CHAN_INFO_AVERAGE_RAW_SHARED_BIT                    \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_AVERAGE_RAW)
+#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT \
+        IIO_CHAN_INFO_SHARED_BIT(                              \
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)
+#define IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SEPARATE_BIT \
+        IIO_CHAN_INFO_SEPARATE_BIT(                            \
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY)
+
 enum iio_endian {
         IIO_CPU,
         IIO_BE,
@@ -109,6 +110,10 @@ enum iio_endian {
  * @extend_name:        Allows labeling of channel attributes with an
  *                      informative name. Note this has no effect codes etc,
  *                      unlike modifiers.
+ * @datasheet_name:     A name used in in kernel mapping of channels. It should
+ *                      corrspond to the first name that the channel is referred
+ *                      to by in the datasheet (e.g. IND), or the nearest
+ *                      possible compound name (e.g. IND-INC).
  * @processed_val:      Flag to specify the data access attribute should be
  *                      *_input rather than *_raw.
  * @modified:           Does a modifier apply to this channel. What these are
@@ -137,6 +142,7 @@ struct iio_chan_spec {
         long                    info_mask;
         long                    event_mask;
         char                    *extend_name;
+        const char              *datasheet_name;
         unsigned                processed_val:1;
         unsigned                modified:1;
         unsigned                indexed:1;
@@ -261,7 +267,23 @@ struct iio_info {
                                  int val);
         int (*validate_trigger)(struct iio_dev *indio_dev,
                                 struct iio_trigger *trig);
+        int (*update_scan_mode)(struct iio_dev *indio_dev,
+                                const unsigned long *scan_mask);
+};
 
+/**
+ * struct iio_buffer_setup_ops - buffer setup related callbacks
+ * @preenable:          [DRIVER] function to run prior to marking buffer enabled
+ * @postenable:         [DRIVER] function to run after marking buffer enabled
+ * @predisable:         [DRIVER] function to run prior to marking buffer
+ *                      disabled
+ * @postdisable:        [DRIVER] function to run after marking buffer disabled
+ */
+struct iio_buffer_setup_ops {
+        int                             (*preenable)(struct iio_dev *);
+        int                             (*postenable)(struct iio_dev *);
+        int                             (*predisable)(struct iio_dev *);
+        int                             (*postdisable)(struct iio_dev *);
 };
 
 /**
@@ -278,6 +300,7 @@ struct iio_info {
  * @available_scan_masks: [DRIVER] optional array of allowed bitmasks
  * @masklength:         [INTERN] the length of the mask established from
  *                      channels
+ * @active_scan_mask:   [INTERN] union of all scan masks requested by buffers
  * @trig:               [INTERN] current device trigger (buffer modes)
  * @pollfunc:           [DRIVER] function run on trigger being received
  * @channels:           [DRIVER] channel specification structure table
@@ -290,6 +313,7 @@ struct iio_info {
  * @chrdev:             [INTERN] associated character device
  * @groups:             [INTERN] attribute groups
  * @groupcounter:       [INTERN] index of next attribute group
+ * @flags:              [INTERN] file ops related flags including busy flag.
  **/
 struct iio_dev {
         int                             id;
@@ -305,6 +329,7 @@ struct iio_dev {
 
         unsigned long                   *available_scan_masks;
         unsigned                        masklength;
+        unsigned long                   *active_scan_mask;
         struct iio_trigger              *trig;
         struct iio_poll_func            *pollfunc;
 
@@ -315,13 +340,24 @@ struct iio_dev {
         struct attribute_group          chan_attr_group;
         const char                      *name;
         const struct iio_info           *info;
+        const struct iio_buffer_setup_ops       *setup_ops;
         struct cdev                     chrdev;
 #define IIO_MAX_GROUPS 6
         const struct attribute_group    *groups[IIO_MAX_GROUPS + 1];
         int                             groupcounter;
+
+        unsigned long                   flags;
 };
 
 /**
+ * iio_find_channel_from_si() - get channel from its scan index
+ * @indio_dev:          device
+ * @si:                 scan index to match
+ */
+const struct iio_chan_spec
+*iio_find_channel_from_si(struct iio_dev *indio_dev, int si);
+
+/**
  * iio_device_register() - register a device with the IIO subsystem
  * @indio_dev:          Device structure filled by the device driver
  **/
diff --git a/drivers/staging/iio/iio_core.h b/drivers/staging/iio/iio_core.h
index 36159e0dbfc3..107cfb1cbb01 100644
--- a/drivers/staging/iio/iio_core.h
+++ b/drivers/staging/iio/iio_core.h
@@ -33,9 +33,6 @@ int __iio_add_chan_devattr(const char *postfix,
 #ifdef CONFIG_IIO_BUFFER
 struct poll_table_struct;
 
-int iio_chrdev_buffer_open(struct iio_dev *indio_dev);
-void iio_chrdev_buffer_release(struct iio_dev *indio_dev);
-
 unsigned int iio_buffer_poll(struct file *filp,
                              struct poll_table_struct *wait);
 ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
@@ -47,14 +44,6 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
 
 #else
 
-static inline int iio_chrdev_buffer_open(struct iio_dev *indio_dev)
-{
-        return -EINVAL;
-}
-
-static inline void iio_chrdev_buffer_release(struct iio_dev *indio_dev)
-{}
-
 #define iio_buffer_poll_addr NULL
 #define iio_buffer_read_first_n_outer_addr NULL
 
diff --git a/drivers/staging/iio/iio_core_trigger.h b/drivers/staging/iio/iio_core_trigger.h
index 523c288b776b..6f7c56fcbe78 100644
--- a/drivers/staging/iio/iio_core_trigger.h
+++ b/drivers/staging/iio/iio_core_trigger.h
@@ -13,8 +13,7 @@
  * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers
  * @indio_dev: iio_dev associated with the device that will consume the trigger
  **/
-
-int iio_device_register_trigger_consumer(struct iio_dev *indio_dev);
+void iio_device_register_trigger_consumer(struct iio_dev *indio_dev);
 
 /**
  * iio_device_unregister_trigger_consumer() - reverse the registration process
diff --git a/drivers/staging/iio/iio_dummy_evgen.c b/drivers/staging/iio/iio_dummy_evgen.c
index da657d10471d..cdbf289bfe2d 100644
--- a/drivers/staging/iio/iio_dummy_evgen.c
+++ b/drivers/staging/iio/iio_dummy_evgen.c
@@ -102,6 +102,10 @@ static int iio_dummy_evgen_create(void)
 int iio_dummy_evgen_get_irq(void)
 {
         int i, ret = 0;
+
+        if (iio_evgen == NULL)
+                return -ENODEV;
+
         mutex_lock(&iio_evgen->lock);
         for (i = 0; i < IIO_EVENTGEN_NO; i++)
                 if (iio_evgen->inuse[i] == false) {
diff --git a/drivers/staging/iio/iio_simple_dummy.c b/drivers/staging/iio/iio_simple_dummy.c
index af0c99236d4f..e3a94572bb40 100644
--- a/drivers/staging/iio/iio_simple_dummy.c
+++ b/drivers/staging/iio/iio_simple_dummy.c
@@ -21,7 +21,8 @@
 
 #include "iio.h"
 #include "sysfs.h"
-#include "buffer_generic.h"
+#include "events.h"
+#include "buffer.h"
 #include "iio_simple_dummy.h"
 
 /*
@@ -76,13 +77,13 @@ static struct iio_chan_spec iio_dummy_channels[] = {
                  * Offset for userspace to apply prior to scale
                  * when converting to standard units (microvolts)
                  */
-                (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
+                IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
                 /*
                  * in_voltage0_scale
                  * Multipler for userspace to apply post offset
                  * when converting to standard units (microvolts)
                  */
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 /* The ordering of elements in the buffer via an enum */
                 .scan_index = voltage0,
                 .scan_type = { /* Description of storage in buffer */
@@ -117,7 +118,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
                  * Shared version of scale - shared by differential
                  * input channels of type IIO_VOLTAGE.
                  */
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .scan_index = diffvoltage1m2,
                 .scan_type = { /* Description of storage in buffer */
                         .sign = 's', /* signed */
@@ -134,7 +135,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
                 .channel = 3,
                 .channel2 = 4,
                 .info_mask =
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .scan_index = diffvoltage3m4,
                 .scan_type = {
                         .sign = 's',
@@ -159,7 +160,7 @@ static struct iio_chan_spec iio_dummy_channels[] = {
                  * seeing the readings. Typically part of hardware
                  * calibration.
                  */
-                (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+                IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,
                 .scan_index = accelx,
                 .scan_type = { /* Description of storage in buffer */
                         .sign = 's', /* signed */
@@ -228,29 +229,32 @@ static int iio_dummy_read_raw(struct iio_dev *indio_dev,
                         break;
                 }
                 break;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 /* only single ended adc -> 7 */
                 *val = 7;
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
-                /* only single ended adc -> 0.001333 */
-                *val = 0;
-                *val2 = 1333;
-                ret = IIO_VAL_INT_PLUS_MICRO;
-                break;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
-                /* all differential adc channels -> 0.000001344 */
-                *val = 0;
-                *val2 = 1344;
-                ret = IIO_VAL_INT_PLUS_NANO;
+        case IIO_CHAN_INFO_SCALE:
+                switch (chan->differential) {
+                case 0:
+                        /* only single ended adc -> 0.001333 */
+                        *val = 0;
+                        *val2 = 1333;
+                        ret = IIO_VAL_INT_PLUS_MICRO;
+                        break;
+                case 1:
+                        /* all differential adc channels -> 0.000001344 */
+                        *val = 0;
+                        *val2 = 1344;
+                        ret = IIO_VAL_INT_PLUS_NANO;
+                }
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 /* only the acceleration axis - read from cache */
                 *val = st->accel_calibbias;
                 ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 *val = st->accel_calibscale->val;
                 *val2 = st->accel_calibscale->val2;
                 ret = IIO_VAL_INT_PLUS_MICRO;
@@ -295,7 +299,7 @@ static int iio_dummy_write_raw(struct iio_dev *indio_dev,
                 st->dac_val = val;
                 mutex_unlock(&st->lock);
                 return 0;
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 mutex_lock(&st->lock);
                 /* Compare against table - hard matching here */
                 for (i = 0; i < ARRAY_SIZE(dummy_scales); i++)
@@ -514,7 +518,8 @@ static __init int iio_dummy_init(void)
                 return -EINVAL;
         }
         /* Fake a bus */
-        iio_dummy_devs = kzalloc(sizeof(*iio_dummy_devs)*instances, GFP_KERNEL);
+        iio_dummy_devs = kcalloc(instances, sizeof(*iio_dummy_devs),
+                                 GFP_KERNEL);
         /* Here we have no actual device so call probe */
         for (i = 0; i < instances; i++) {
                 ret = iio_dummy_probe(i);
diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
index edad0e7b4f4d..d6a1c0e82a5b 100644
--- a/drivers/staging/iio/iio_simple_dummy_buffer.c
+++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
@@ -57,7 +57,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
         if (data == NULL)
                 return -ENOMEM;
 
-        if (buffer->scan_count) {
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)) {
                 /*
                  * Three common options here:
                  * hardware scans: certain combinations of channels make
@@ -75,7 +75,10 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
                  * in the constant table fakedata.
                  */
                 int i, j;
-                for (i = 0, j = 0; i < buffer->scan_count; i++) {
+                for (i = 0, j = 0;
+                     i < bitmap_weight(indio_dev->active_scan_mask,
+                                       indio_dev->masklength);
+                     i++) {
                         j = find_next_bit(buffer->scan_mask,
                                           indio_dev->masklength, j + 1);
                         /* random access read form the 'device' */
@@ -142,8 +145,6 @@ int iio_simple_dummy_configure_buffer(struct iio_dev *indio_dev)
         /* Tell the core how to access the buffer */
         buffer->access = &kfifo_access_funcs;
 
-        /* Number of bytes per element */
-        buffer->bpe = 2;
         /* Enable timestamps by default */
         buffer->scan_timestamp = true;
 
@@ -151,8 +152,7 @@ int iio_simple_dummy_configure_buffer(struct iio_dev *indio_dev)
          * Tell the core what device type specific functions should
          * be run on either side of buffer capture enable / disable.
          */
-        buffer->setup_ops = &iio_simple_dummy_buffer_setup_ops;
-        buffer->owner = THIS_MODULE;
+        indio_dev->setup_ops = &iio_simple_dummy_buffer_setup_ops;
 
         /*
          * Configure a polling function.
diff --git a/drivers/staging/iio/iio_simple_dummy_events.c b/drivers/staging/iio/iio_simple_dummy_events.c
index 9f00cff7ddd5..449c7a5ece80 100644
--- a/drivers/staging/iio/iio_simple_dummy_events.c
+++ b/drivers/staging/iio/iio_simple_dummy_events.c
@@ -14,6 +14,7 @@
 
 #include "iio.h"
 #include "sysfs.h"
+#include "events.h"
 #include "iio_simple_dummy.h"
 
 /* Evgen 'fakes' interrupt events for this example */
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
index 454d131455de..9a2ca55625f4 100644
--- a/drivers/staging/iio/impedance-analyzer/ad5933.c
+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
@@ -21,7 +21,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "../ring_sw.h"
 
 #include "ad5933.h"
@@ -113,10 +113,10 @@ static struct iio_chan_spec ad5933_channels[] = {
                  0, AD5933_REG_TEMP_DATA, IIO_ST('s', 14, 16, 0), 0),
         /* Ring Channels */
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "real_raw", 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  AD5933_REG_REAL_DATA, 0, IIO_ST('s', 16, 16, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "imag_raw", 0, 0,
-                 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                  AD5933_REG_IMAG_DATA, 1, IIO_ST('s', 16, 16, 0), 0),
 };
 
@@ -329,7 +329,7 @@ static ssize_t ad5933_show(struct device *dev,
         int ret = 0, len = 0;
 
         mutex_lock(&indio_dev->mlock);
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD5933_OUT_RANGE:
                 len = sprintf(buf, "%d\n",
                               st->range_avail[(st->ctrl_hb >> 1) & 0x3]);
@@ -380,7 +380,7 @@ static ssize_t ad5933_store(struct device *dev,
         }
 
         mutex_lock(&indio_dev->mlock);
-        switch (this_attr->address) {
+        switch ((u32) this_attr->address) {
         case AD5933_OUT_RANGE:
                 for (i = 0; i < 4; i++)
                         if (val == st->range_avail[i]) {
@@ -537,14 +537,14 @@ static const struct iio_info ad5933_info = {
 static int ad5933_ring_preenable(struct iio_dev *indio_dev)
 {
         struct ad5933_state *st = iio_priv(indio_dev);
-        struct iio_buffer *ring = indio_dev->buffer;
         size_t d_size;
         int ret;
 
-        if (!ring->scan_count)
+        if (bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 return -EINVAL;
 
-        d_size = ring->scan_count *
+        d_size = bitmap_weight(indio_dev->active_scan_mask,
+                               indio_dev->masklength) *
                  ad5933_channels[1].scan_type.storagebits / 8;
 
         if (indio_dev->buffer->access->set_bytes_per_datum)
@@ -611,7 +611,7 @@ static int ad5933_register_ring_funcs_and_init(struct iio_dev *indio_dev)
         indio_dev->buffer->access = &ring_sw_access_funcs;
 
         /* Ring buffer functions - here trigger setup related */
-        indio_dev->buffer->setup_ops = &ad5933_ring_setup_ops;
+        indio_dev->setup_ops = &ad5933_ring_setup_ops;
 
         indio_dev->modes |= INDIO_BUFFER_HARDWARE;
 
@@ -640,12 +640,14 @@ static void ad5933_work(struct work_struct *work)
         ad5933_i2c_read(st->client, AD5933_REG_STATUS, 1, &status);
 
         if (status & AD5933_STAT_DATA_VALID) {
+                int scan_count = bitmap_weight(indio_dev->active_scan_mask,
+                                               indio_dev->masklength);
                 ad5933_i2c_read(st->client,
-                                test_bit(1, ring->scan_mask) ?
+                                test_bit(1, indio_dev->active_scan_mask) ?
                                 AD5933_REG_REAL_DATA : AD5933_REG_IMAG_DATA,
-                                ring->scan_count * 2, (u8 *)buf);
+                                scan_count * 2, (u8 *)buf);
 
-                if (ring->scan_count == 2) {
+                if (scan_count == 2) {
                         buf[0] = be16_to_cpu(buf[0]);
                         buf[1] = be16_to_cpu(buf[1]);
                 } else {
@@ -734,8 +736,8 @@ static int __devinit ad5933_probe(struct i2c_client *client,
                 goto error_unreg_ring;
 
         /* enable both REAL and IMAG channels by default */
-        iio_scan_mask_set(indio_dev->buffer, 0);
-        iio_scan_mask_set(indio_dev->buffer, 1);
+        iio_scan_mask_set(indio_dev, indio_dev->buffer, 0);
+        iio_scan_mask_set(indio_dev, indio_dev->buffer, 1);
 
         ret = ad5933_setup(st);
         if (ret)
diff --git a/drivers/staging/iio/imu/adis16400.h b/drivers/staging/iio/imu/adis16400.h
index f3546ee910a2..83d133efaac6 100644
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
@@ -148,12 +148,14 @@ struct adis16400_chip_info {
  * @tx:                 transmit buffer
  * @rx:                 receive buffer
  * @buf_lock:           mutex to protect tx and rx
+ * @filt_int:           integer part of requested filter frequency
  **/
 struct adis16400_state {
         struct spi_device               *us;
         struct iio_trigger              *trig;
         struct mutex                    buf_lock;
         struct adis16400_chip_info      *variant;
+        int                             filt_int;
 
         u8      tx[ADIS16400_MAX_TX] ____cacheline_aligned;
         u8      rx[ADIS16400_MAX_RX] ____cacheline_aligned;
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index efc0f6529008..e73ad7818d85 100644
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -28,7 +28,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "adis16400.h"
 
 enum adis16400_chip_variant {
@@ -161,25 +161,65 @@ error_ret:
         return ret;
 }
 
+static int adis16400_get_freq(struct iio_dev *indio_dev)
+{
+        u16 t;
+        int sps, ret;
+
+        ret = adis16400_spi_read_reg_16(indio_dev, ADIS16400_SMPL_PRD, &t);
+        if (ret < 0)
+                return ret;
+        sps =  (t & ADIS16400_SMPL_PRD_TIME_BASE) ? 53 : 1638;
+        sps /= (t & ADIS16400_SMPL_PRD_DIV_MASK) + 1;
+
+        return sps;
+}
+
 static ssize_t adis16400_read_frequency(struct device *dev,
                 struct device_attribute *attr,
                 char *buf)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
         int ret, len = 0;
-        u16 t;
-        int sps;
-        ret = adis16400_spi_read_reg_16(indio_dev,
-                        ADIS16400_SMPL_PRD,
-                        &t);
-        if (ret)
+        ret = adis16400_get_freq(indio_dev);
+        if (ret < 0)
                 return ret;
-        sps =  (t & ADIS16400_SMPL_PRD_TIME_BASE) ? 53 : 1638;
-        sps /= (t & ADIS16400_SMPL_PRD_DIV_MASK) + 1;
-        len = sprintf(buf, "%d SPS\n", sps);
+        len = sprintf(buf, "%d SPS\n", ret);
         return len;
 }
 
+static const unsigned adis16400_3db_divisors[] = {
+        [0] = 2, /* Special case */
+        [1] = 5,
+        [2] = 10,
+        [3] = 50,
+        [4] = 200,
+};
+
+static int adis16400_set_filter(struct iio_dev *indio_dev, int sps, int val)
+{
+        int i, ret;
+        u16 val16;
+        for (i = ARRAY_SIZE(adis16400_3db_divisors) - 1; i >= 0; i--)
+                if (sps/adis16400_3db_divisors[i] > val)
+                        break;
+        if (i == -1)
+                ret = -EINVAL;
+        else {
+                ret = adis16400_spi_read_reg_16(indio_dev,
+                                                ADIS16400_SENS_AVG,
+                                                &val16);
+                if (ret < 0)
+                        goto error_ret;
+
+                ret = adis16400_spi_write_reg_16(indio_dev,
+                                                 ADIS16400_SENS_AVG,
+                                                 (val16 & ~0x03) | i);
+        }
+error_ret:
+        return ret;
+}
+
 static ssize_t adis16400_write_frequency(struct device *dev,
                 struct device_attribute *attr,
                 const char *buf,
@@ -210,6 +250,7 @@ static ssize_t adis16400_write_frequency(struct device *dev,
                         ADIS16400_SMPL_PRD,
                         t);
 
+        /* Also update the filter */
         mutex_unlock(&indio_dev->mlock);
 
         return ret ? ret : len;
@@ -455,22 +496,39 @@ static u8 adis16400_addresses[17][2] = {
         [incli_y] = { ADIS16300_ROLL_OUT }
 };
 
+
 static int adis16400_write_raw(struct iio_dev *indio_dev,
                                struct iio_chan_spec const *chan,
                                int val,
                                int val2,
                                long mask)
 {
-        int ret;
+        struct adis16400_state *st = iio_priv(indio_dev);
+        int ret, sps;
 
         switch (mask) {
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 mutex_lock(&indio_dev->mlock);
                 ret = adis16400_spi_write_reg_16(indio_dev,
                                 adis16400_addresses[chan->address][1],
                                 val);
                 mutex_unlock(&indio_dev->mlock);
                 return ret;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                /* Need to cache values so we can update if the frequency
+                   changes */
+                mutex_lock(&indio_dev->mlock);
+                st->filt_int = val;
+                /* Work out update to current value */
+                sps = adis16400_get_freq(indio_dev);
+                if (sps < 0) {
+                        mutex_unlock(&indio_dev->mlock);
+                        return sps;
+                }
+
+                ret = adis16400_set_filter(indio_dev, sps, val);
+                mutex_unlock(&indio_dev->mlock);
+                return ret;
         default:
                 return -EINVAL;
         }
@@ -504,8 +562,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
                 *val = val16;
                 mutex_unlock(&indio_dev->mlock);
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 switch (chan->type) {
                 case IIO_ANGL_VEL:
                         *val = 0;
@@ -533,7 +590,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
                 default:
                         return -EINVAL;
                 }
-        case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+        case IIO_CHAN_INFO_CALIBBIAS:
                 mutex_lock(&indio_dev->mlock);
                 ret = adis16400_spi_read_reg_16(indio_dev,
                                 adis16400_addresses[chan->address][1],
@@ -544,11 +601,29 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
                 val16 = ((val16 & 0xFFF) << 4) >> 4;
                 *val = val16;
                 return IIO_VAL_INT;
-        case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+        case IIO_CHAN_INFO_OFFSET:
                 /* currently only temperature */
                 *val = 198;
                 *val2 = 160000;
                 return IIO_VAL_INT_PLUS_MICRO;
+        case IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY:
+                mutex_lock(&indio_dev->mlock);
+                /* Need both the number of taps and the sampling frequency */
+                ret = adis16400_spi_read_reg_16(indio_dev,
+                                                ADIS16400_SENS_AVG,
+                                                &val16);
+                if (ret < 0) {
+                        mutex_unlock(&indio_dev->mlock);
+                        return ret;
+                }
+                ret = adis16400_get_freq(indio_dev);
+                if (ret > 0)
+                        *val = ret/adis16400_3db_divisors[val16 & 0x03];
+                *val2 = 0;
+                mutex_unlock(&indio_dev->mlock);
+                if (ret < 0)
+                        return ret;
+                return IIO_VAL_INT_PLUS_MICRO;
         default:
                 return -EINVAL;
         }
@@ -560,7 +635,7 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "supply",
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
                 .scan_index = ADIS16400_SCAN_SUPPLY,
                 .scan_type = IIO_ST('u', 14, 16, 0)
@@ -568,8 +643,9 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_x,
                 .scan_index = ADIS16400_SCAN_GYRO_X,
                 .scan_type = IIO_ST('s', 14, 16, 0)
@@ -577,8 +653,9 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_y,
                 .scan_index = ADIS16400_SCAN_GYRO_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -586,8 +663,9 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_z,
                 .scan_index = ADIS16400_SCAN_GYRO_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -595,8 +673,9 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_x,
                 .scan_index = ADIS16400_SCAN_ACC_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -604,8 +683,9 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_y,
                 .scan_index = ADIS16400_SCAN_ACC_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -613,8 +693,9 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_z,
                 .scan_index = ADIS16400_SCAN_ACC_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -622,7 +703,8 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_MAGN,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = magn_x,
                 .scan_index = ADIS16400_SCAN_MAGN_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -630,7 +712,8 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_MAGN,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = magn_y,
                 .scan_index = ADIS16400_SCAN_MAGN_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -638,7 +721,8 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_MAGN,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = magn_z,
                 .scan_index = ADIS16400_SCAN_MAGN_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -646,8 +730,8 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_TEMP,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = temp,
                 .scan_index = ADIS16400_SCAN_TEMP,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -655,7 +739,7 @@ static struct iio_chan_spec adis16400_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in1,
                 .scan_index = ADIS16400_SCAN_ADC_0,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -669,7 +753,7 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "supply",
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
                 .scan_index = ADIS16400_SCAN_SUPPLY,
                 .scan_type = IIO_ST('u', 12, 16, 0)
@@ -677,8 +761,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_x,
                 .scan_index = ADIS16400_SCAN_GYRO_X,
                 .scan_type = IIO_ST('s', 14, 16, 0)
@@ -686,8 +771,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_y,
                 .scan_index = ADIS16400_SCAN_GYRO_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -695,8 +781,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_z,
                 .scan_index = ADIS16400_SCAN_GYRO_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -704,8 +791,9 @@ static struct iio_chan_spec adis16350_channels[] = {
         .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_x,
                 .scan_index = ADIS16400_SCAN_ACC_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -713,8 +801,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_y,
                 .scan_index = ADIS16400_SCAN_ACC_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -722,8 +811,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_z,
                 .scan_index = ADIS16400_SCAN_ACC_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -732,8 +822,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "x",
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = temp0,
                 .scan_index = ADIS16350_SCAN_TEMP_X,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -742,8 +833,9 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .indexed = 1,
                 .channel = 1,
                 .extend_name = "y",
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = temp1,
                 .scan_index = ADIS16350_SCAN_TEMP_Y,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -752,8 +844,8 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .indexed = 1,
                 .channel = 2,
                 .extend_name = "z",
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = temp2,
                 .scan_index = ADIS16350_SCAN_TEMP_Z,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -761,7 +853,7 @@ static struct iio_chan_spec adis16350_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in1,
                 .scan_index = ADIS16350_SCAN_ADC_0,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -775,7 +867,7 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .extend_name = "supply",
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in_supply,
                 .scan_index = ADIS16400_SCAN_SUPPLY,
                 .scan_type = IIO_ST('u', 12, 16, 0)
@@ -783,8 +875,9 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_x,
                 .scan_index = ADIS16400_SCAN_GYRO_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -792,8 +885,9 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_x,
                 .scan_index = ADIS16400_SCAN_ACC_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -801,8 +895,9 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_y,
                 .scan_index = ADIS16400_SCAN_ACC_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -810,8 +905,9 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_z,
                 .scan_index = ADIS16400_SCAN_ACC_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -819,8 +915,8 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_TEMP,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_OFFSET_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = temp,
                 .scan_index = ADIS16400_SCAN_TEMP,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -828,7 +924,7 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_VOLTAGE,
                 .indexed = 1,
                 .channel = 1,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,
                 .address = in1,
                 .scan_index = ADIS16350_SCAN_ADC_0,
                 .scan_type = IIO_ST('s', 12, 16, 0),
@@ -836,7 +932,7 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_INCLI,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = incli_x,
                 .scan_index = ADIS16300_SCAN_INCLI_X,
                 .scan_type = IIO_ST('s', 13, 16, 0),
@@ -844,7 +940,7 @@ static struct iio_chan_spec adis16300_channels[] = {
                 .type = IIO_INCLI,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = incli_y,
                 .scan_index = ADIS16300_SCAN_INCLI_Y,
                 .scan_type = IIO_ST('s', 13, 16, 0),
@@ -857,8 +953,9 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_x,
                 .scan_index = ADIS16400_SCAN_GYRO_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -866,8 +963,9 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_y,
                 .scan_index = ADIS16400_SCAN_GYRO_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -875,8 +973,9 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_ANGL_VEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = gyro_z,
                 .scan_index = ADIS16400_SCAN_GYRO_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -884,8 +983,9 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_X,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_x,
                 .scan_index = ADIS16400_SCAN_ACC_X,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -893,8 +993,9 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Y,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_y,
                 .scan_index = ADIS16400_SCAN_ACC_Y,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -902,8 +1003,9 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_ACCEL,
                 .modified = 1,
                 .channel2 = IIO_MOD_Z,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT |
+                IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY_SHARED_BIT,
                 .address = accel_z,
                 .scan_index = ADIS16400_SCAN_ACC_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -911,8 +1013,8 @@ static const struct iio_chan_spec adis16334_channels[] = {
                 .type = IIO_TEMP,
                 .indexed = 1,
                 .channel = 0,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                .info_mask = IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 .address = accel_z,
                 .scan_index = ADIS16400_SCAN_ACC_Z,
                 .scan_type = IIO_ST('s', 14, 16, 0),
@@ -1118,6 +1220,7 @@ static const struct spi_device_id adis16400_id[] = {
         {"adis16405", ADIS16400},
         {}
 };
+MODULE_DEVICE_TABLE(spi, adis16400_id);
 
 static struct spi_driver adis16400_driver = {
         .driver = {
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index fd886bf51a6d..ac22de573f3e 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -79,14 +79,16 @@ static int adis16350_spi_read_all(struct device *dev, u8 *rx)
         struct spi_message msg;
         int i, j = 0, ret;
         struct spi_transfer *xfers;
+        int scan_count = bitmap_weight(indio_dev->active_scan_mask,
+                                       indio_dev->masklength);
 
-        xfers = kzalloc(sizeof(*xfers)*indio_dev->buffer->scan_count + 1,
+        xfers = kzalloc(sizeof(*xfers)*(scan_count + 1),
                         GFP_KERNEL);
         if (xfers == NULL)
                 return -ENOMEM;
 
         for (i = 0; i < ARRAY_SIZE(read_all_tx_array); i++)
-                if (test_bit(i, indio_dev->buffer->scan_mask)) {
+                if (test_bit(i, indio_dev->active_scan_mask)) {
                         xfers[j].tx_buf = &read_all_tx_array[i];
                         xfers[j].bits_per_word = 16;
                         xfers[j].len = 2;
@@ -97,7 +99,7 @@ static int adis16350_spi_read_all(struct device *dev, u8 *rx)
         xfers[j].len = 2;
 
         spi_message_init(&msg);
-        for (j = 0; j < indio_dev->buffer->scan_count + 1; j++)
+        for (j = 0; j < scan_count + 1; j++)
                 spi_message_add_tail(&xfers[j], &msg);
 
         ret = spi_sync(st->us, &msg);
@@ -119,26 +121,27 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
         s16 *data;
         size_t datasize = ring->access->get_bytes_per_datum(ring);
         /* Asumption that long is enough for maximum channels */
-        unsigned long mask = *ring->scan_mask;
-
+        unsigned long mask = *indio_dev->active_scan_mask;
+        int scan_count = bitmap_weight(indio_dev->active_scan_mask,
+                                       indio_dev->masklength);
         data = kmalloc(datasize , GFP_KERNEL);
         if (data == NULL) {
                 dev_err(&st->us->dev, "memory alloc failed in ring bh");
                 return -ENOMEM;
         }
 
-        if (ring->scan_count) {
+        if (scan_count) {
                 if (st->variant->flags & ADIS16400_NO_BURST) {
                         ret = adis16350_spi_read_all(&indio_dev->dev, st->rx);
                         if (ret < 0)
                                 goto err;
-                        for (; i < ring->scan_count; i++)
+                        for (; i < scan_count; i++)
                                 data[i] = *(s16 *)(st->rx + i*2);
                 } else {
                         ret = adis16400_spi_read_burst(&indio_dev->dev, st->rx);
                         if (ret < 0)
                                 goto err;
-                        for (; i < indio_dev->buffer->scan_count; i++) {
+                        for (; i < scan_count; i++) {
                                 j = __ffs(mask);
                                 mask &= ~(1 << j);
                                 data[i] = be16_to_cpup(
@@ -186,10 +189,8 @@ int adis16400_configure_ring(struct iio_dev *indio_dev)
         indio_dev->buffer = ring;
         /* Effectively select the ring buffer implementation */
         ring->access = &ring_sw_access_funcs;
-        ring->bpe = 2;
         ring->scan_timestamp = true;
-        ring->setup_ops = &adis16400_ring_setup_ops;
-        ring->owner = THIS_MODULE;
+        indio_dev->setup_ops = &adis16400_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &adis16400_trigger_handler,
diff --git a/drivers/staging/iio/industrialio-buffer.c b/drivers/staging/iio/industrialio-buffer.c
index 9df0ce81dade..d7b1e9e435ae 100644
--- a/drivers/staging/iio/industrialio-buffer.c
+++ b/drivers/staging/iio/industrialio-buffer.c
@@ -24,7 +24,7 @@
 #include "iio.h"
 #include "iio_core.h"
 #include "sysfs.h"
-#include "buffer_generic.h"
+#include "buffer.h"
 
 static const char * const iio_endian_prefix[] = {
         [IIO_BE] = "be",
@@ -43,7 +43,7 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
         struct iio_dev *indio_dev = filp->private_data;
         struct iio_buffer *rb = indio_dev->buffer;
 
-        if (!rb->access->read_first_n)
+        if (!rb || !rb->access->read_first_n)
                 return -EINVAL;
         return rb->access->read_first_n(rb, n, buf);
 }
@@ -64,28 +64,9 @@ unsigned int iio_buffer_poll(struct file *filp,
         return 0;
 }
 
-int iio_chrdev_buffer_open(struct iio_dev *indio_dev)
+void iio_buffer_init(struct iio_buffer *buffer)
 {
-        struct iio_buffer *rb = indio_dev->buffer;
-        if (!rb)
-                return -EINVAL;
-        if (rb->access->mark_in_use)
-                rb->access->mark_in_use(rb);
-        return 0;
-}
-
-void iio_chrdev_buffer_release(struct iio_dev *indio_dev)
-{
-        struct iio_buffer *rb = indio_dev->buffer;
-
-        clear_bit(IIO_BUSY_BIT_POS, &rb->flags);
-        if (rb->access->unmark_in_use)
-                rb->access->unmark_in_use(rb);
-}
-
-void iio_buffer_init(struct iio_buffer *buffer, struct iio_dev *indio_dev)
-{
-        buffer->indio_dev = indio_dev;
+        INIT_LIST_HEAD(&buffer->demux_list);
         init_waitqueue_head(&buffer->pollq);
 }
 EXPORT_SYMBOL(iio_buffer_init);
@@ -126,17 +107,15 @@ static ssize_t iio_scan_el_show(struct device *dev,
         int ret;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
 
-        ret = iio_scan_mask_query(indio_dev->buffer,
-                                  to_iio_dev_attr(attr)->address);
-        if (ret < 0)
-                return ret;
+        ret = test_bit(to_iio_dev_attr(attr)->address,
+                       indio_dev->buffer->scan_mask);
+
         return sprintf(buf, "%d\n", ret);
 }
 
 static int iio_scan_mask_clear(struct iio_buffer *buffer, int bit)
 {
         clear_bit(bit, buffer->scan_mask);
-        buffer->scan_count--;
         return 0;
 }
 
@@ -153,11 +132,11 @@ static ssize_t iio_scan_el_store(struct device *dev,
 
         state = !(buf[0] == '0');
         mutex_lock(&indio_dev->mlock);
-        if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
+        if (iio_buffer_enabled(indio_dev)) {
                 ret = -EBUSY;
                 goto error_ret;
         }
-        ret = iio_scan_mask_query(buffer, this_attr->address);
+        ret = iio_scan_mask_query(indio_dev, buffer, this_attr->address);
         if (ret < 0)
                 goto error_ret;
         if (!state && ret) {
@@ -165,7 +144,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
                 if (ret)
                         goto error_ret;
         } else if (state && !ret) {
-                ret = iio_scan_mask_set(buffer, this_attr->address);
+                ret = iio_scan_mask_set(indio_dev, buffer, this_attr->address);
                 if (ret)
                         goto error_ret;
         }
@@ -173,7 +152,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
 error_ret:
         mutex_unlock(&indio_dev->mlock);
 
-        return ret ? ret : len;
+        return ret < 0 ? ret : len;
 
 }
 
@@ -196,7 +175,7 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
 
         state = !(buf[0] == '0');
         mutex_lock(&indio_dev->mlock);
-        if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
+        if (iio_buffer_enabled(indio_dev)) {
                 ret = -EBUSY;
                 goto error_ret;
         }
@@ -311,12 +290,14 @@ int iio_buffer_register(struct iio_dev *indio_dev,
                         if (ret < 0)
                                 goto error_cleanup_dynamic;
                         attrcount += ret;
+                        if (channels[i].type == IIO_TIMESTAMP)
+                                buffer->scan_index_timestamp =
+                                        channels[i].scan_index;
                 }
                 if (indio_dev->masklength && buffer->scan_mask == NULL) {
-                        buffer->scan_mask
-                                = kzalloc(sizeof(*buffer->scan_mask)*
-                                          BITS_TO_LONGS(indio_dev->masklength),
-                                          GFP_KERNEL);
+                        buffer->scan_mask = kcalloc(BITS_TO_LONGS(indio_dev->masklength),
+                                                    sizeof(*buffer->scan_mask),
+                                                    GFP_KERNEL);
                         if (buffer->scan_mask == NULL) {
                                 ret = -ENOMEM;
                                 goto error_cleanup_dynamic;
@@ -326,10 +307,9 @@ int iio_buffer_register(struct iio_dev *indio_dev,
 
         buffer->scan_el_group.name = iio_scan_elements_group_name;
 
-        buffer->scan_el_group.attrs
-                = kzalloc(sizeof(buffer->scan_el_group.attrs[0])*
-                          (attrcount + 1),
-                          GFP_KERNEL);
+        buffer->scan_el_group.attrs = kcalloc(attrcount + 1,
+                                              sizeof(buffer->scan_el_group.attrs[0]),
+                                              GFP_KERNEL);
         if (buffer->scan_el_group.attrs == NULL) {
                 ret = -ENOMEM;
                 goto error_free_scan_mask;
@@ -395,31 +375,20 @@ ssize_t iio_buffer_write_length(struct device *dev,
                 if (val == buffer->access->get_length(buffer))
                         return len;
 
-        if (buffer->access->set_length) {
-                buffer->access->set_length(buffer, val);
-                if (buffer->access->mark_param_change)
-                        buffer->access->mark_param_change(buffer);
+        mutex_lock(&indio_dev->mlock);
+        if (iio_buffer_enabled(indio_dev)) {
+                ret = -EBUSY;
+        } else {
+                if (buffer->access->set_length)
+                        buffer->access->set_length(buffer, val);
+                ret = 0;
         }
+        mutex_unlock(&indio_dev->mlock);
 
-        return len;
+        return ret ? ret : len;
 }
 EXPORT_SYMBOL(iio_buffer_write_length);
 
-ssize_t iio_buffer_read_bytes_per_datum(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct iio_buffer *buffer = indio_dev->buffer;
-
-        if (buffer->access->get_bytes_per_datum)
-                return sprintf(buf, "%d\n",
-                               buffer->access->get_bytes_per_datum(buffer));
-
-        return 0;
-}
-EXPORT_SYMBOL(iio_buffer_read_bytes_per_datum);
-
 ssize_t iio_buffer_store_enable(struct device *dev,
                                 struct device_attribute *attr,
                                 const char *buf,
@@ -434,14 +403,14 @@ ssize_t iio_buffer_store_enable(struct device *dev,
         mutex_lock(&indio_dev->mlock);
         previous_mode = indio_dev->currentmode;
         requested_state = !(buf[0] == '0');
-        current_state = !!(previous_mode & INDIO_ALL_BUFFER_MODES);
+        current_state = iio_buffer_enabled(indio_dev);
         if (current_state == requested_state) {
                 printk(KERN_INFO "iio-buffer, current state requested again\n");
                 goto done;
         }
         if (requested_state) {
-                if (buffer->setup_ops->preenable) {
-                        ret = buffer->setup_ops->preenable(indio_dev);
+                if (indio_dev->setup_ops->preenable) {
+                        ret = indio_dev->setup_ops->preenable(indio_dev);
                         if (ret) {
                                 printk(KERN_ERR
                                        "Buffer not started:"
@@ -458,16 +427,12 @@ ssize_t iio_buffer_store_enable(struct device *dev,
                                 goto error_ret;
                         }
                 }
-                if (buffer->access->mark_in_use)
-                        buffer->access->mark_in_use(buffer);
                 /* Definitely possible for devices to support both of these.*/
                 if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) {
                         if (!indio_dev->trig) {
                                 printk(KERN_INFO
                                        "Buffer not started: no trigger\n");
                                 ret = -EINVAL;
-                                if (buffer->access->unmark_in_use)
-                                        buffer->access->unmark_in_use(buffer);
                                 goto error_ret;
                         }
                         indio_dev->currentmode = INDIO_BUFFER_TRIGGERED;
@@ -478,32 +443,28 @@ ssize_t iio_buffer_store_enable(struct device *dev,
                         goto error_ret;
                 }
 
-                if (buffer->setup_ops->postenable) {
-                        ret = buffer->setup_ops->postenable(indio_dev);
+                if (indio_dev->setup_ops->postenable) {
+                        ret = indio_dev->setup_ops->postenable(indio_dev);
                         if (ret) {
                                 printk(KERN_INFO
                                        "Buffer not started:"
                                        "postenable failed\n");
-                                if (buffer->access->unmark_in_use)
-                                        buffer->access->unmark_in_use(buffer);
                                 indio_dev->currentmode = previous_mode;
-                                if (buffer->setup_ops->postdisable)
-                                        buffer->setup_ops->
+                                if (indio_dev->setup_ops->postdisable)
+                                        indio_dev->setup_ops->
                                                 postdisable(indio_dev);
                                 goto error_ret;
                         }
                 }
         } else {
-                if (buffer->setup_ops->predisable) {
-                        ret = buffer->setup_ops->predisable(indio_dev);
+                if (indio_dev->setup_ops->predisable) {
+                        ret = indio_dev->setup_ops->predisable(indio_dev);
                         if (ret)
                                 goto error_ret;
                 }
-                if (buffer->access->unmark_in_use)
-                        buffer->access->unmark_in_use(buffer);
                 indio_dev->currentmode = INDIO_DIRECT_MODE;
-                if (buffer->setup_ops->postdisable) {
-                        ret = buffer->setup_ops->postdisable(indio_dev);
+                if (indio_dev->setup_ops->postdisable) {
+                        ret = indio_dev->setup_ops->postdisable(indio_dev);
                         if (ret)
                                 goto error_ret;
                 }
@@ -523,37 +484,10 @@ ssize_t iio_buffer_show_enable(struct device *dev,
                                char *buf)
 {
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        return sprintf(buf, "%d\n", !!(indio_dev->currentmode
-                                       & INDIO_ALL_BUFFER_MODES));
+        return sprintf(buf, "%d\n", iio_buffer_enabled(indio_dev));
 }
 EXPORT_SYMBOL(iio_buffer_show_enable);
 
-int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
-{
-        struct iio_buffer *buffer = indio_dev->buffer;
-        size_t size;
-        dev_dbg(&indio_dev->dev, "%s\n", __func__);
-        /* Check if there are any scan elements enabled, if not fail*/
-        if (!(buffer->scan_count || buffer->scan_timestamp))
-                return -EINVAL;
-        if (buffer->scan_timestamp)
-                if (buffer->scan_count)
-                        /* Timestamp (aligned to s64) and data */
-                        size = (((buffer->scan_count * buffer->bpe)
-                                        + sizeof(s64) - 1)
-                                & ~(sizeof(s64) - 1))
-                                + sizeof(s64);
-                else /* Timestamp only  */
-                        size = sizeof(s64);
-        else /* Data only */
-                size = buffer->scan_count * buffer->bpe;
-        buffer->access->set_bytes_per_datum(buffer, size);
-
-        return 0;
-}
-EXPORT_SYMBOL(iio_sw_buffer_preenable);
-
-
 /* note NULL used as error indicator as it doesn't make sense. */
 static unsigned long *iio_scan_mask_match(unsigned long *av_masks,
                                           unsigned int masklength,
@@ -569,14 +503,57 @@ static unsigned long *iio_scan_mask_match(unsigned long *av_masks,
         return NULL;
 }
 
+int iio_sw_buffer_preenable(struct iio_dev *indio_dev)
+{
+        struct iio_buffer *buffer = indio_dev->buffer;
+        const struct iio_chan_spec *ch;
+        unsigned bytes = 0;
+        int length, i;
+        dev_dbg(&indio_dev->dev, "%s\n", __func__);
+
+        /* How much space will the demuxed element take? */
+        for_each_set_bit(i, buffer->scan_mask,
+                         indio_dev->masklength) {
+                ch = iio_find_channel_from_si(indio_dev, i);
+                length = ch->scan_type.storagebits/8;
+                bytes = ALIGN(bytes, length);
+                bytes += length;
+        }
+        if (buffer->scan_timestamp) {
+                ch = iio_find_channel_from_si(indio_dev,
+                                              buffer->scan_index_timestamp);
+                length = ch->scan_type.storagebits/8;
+                bytes = ALIGN(bytes, length);
+                bytes += length;
+        }
+        buffer->access->set_bytes_per_datum(buffer, bytes);
+
+        /* What scan mask do we actually have ?*/
+        if (indio_dev->available_scan_masks)
+                indio_dev->active_scan_mask =
+                        iio_scan_mask_match(indio_dev->available_scan_masks,
+                                            indio_dev->masklength,
+                                            buffer->scan_mask);
+        else
+                indio_dev->active_scan_mask = buffer->scan_mask;
+        iio_update_demux(indio_dev);
+
+        if (indio_dev->info->update_scan_mode)
+                return indio_dev->info
+                        ->update_scan_mode(indio_dev,
+                                           indio_dev->active_scan_mask);
+        return 0;
+}
+EXPORT_SYMBOL(iio_sw_buffer_preenable);
+
 /**
  * iio_scan_mask_set() - set particular bit in the scan mask
  * @buffer: the buffer whose scan mask we are interested in
  * @bit: the bit to be set.
  **/
-int iio_scan_mask_set(struct iio_buffer *buffer, int bit)
+int iio_scan_mask_set(struct iio_dev *indio_dev,
+                      struct iio_buffer *buffer, int bit)
 {
-        struct iio_dev *indio_dev = buffer->indio_dev;
         unsigned long *mask;
         unsigned long *trialmask;
 
@@ -604,7 +581,6 @@ int iio_scan_mask_set(struct iio_buffer *buffer, int bit)
                 }
         }
         bitmap_copy(buffer->scan_mask, trialmask, indio_dev->masklength);
-        buffer->scan_count++;
 
         kfree(trialmask);
 
@@ -612,25 +588,147 @@ int iio_scan_mask_set(struct iio_buffer *buffer, int bit)
 };
 EXPORT_SYMBOL_GPL(iio_scan_mask_set);
 
-int iio_scan_mask_query(struct iio_buffer *buffer, int bit)
+int iio_scan_mask_query(struct iio_dev *indio_dev,
+                        struct iio_buffer *buffer, int bit)
 {
-        struct iio_dev *indio_dev = buffer->indio_dev;
-        long *mask;
-
         if (bit > indio_dev->masklength)
                 return -EINVAL;
 
         if (!buffer->scan_mask)
                 return 0;
-        if (indio_dev->available_scan_masks)
-                mask = iio_scan_mask_match(indio_dev->available_scan_masks,
-                                           indio_dev->masklength,
-                                           buffer->scan_mask);
-        else
-                mask = buffer->scan_mask;
-        if (!mask)
-                return 0;
 
-        return test_bit(bit, mask);
+        return test_bit(bit, buffer->scan_mask);
 };
 EXPORT_SYMBOL_GPL(iio_scan_mask_query);
+
+/**
+ * struct iio_demux_table() - table describing demux memcpy ops
+ * @from:       index to copy from
+ * @to: index to copy to
+ * @length:     how many bytes to copy
+ * @l:          list head used for management
+ */
+struct iio_demux_table {
+        unsigned from;
+        unsigned to;
+        unsigned length;
+        struct list_head l;
+};
+
+static unsigned char *iio_demux(struct iio_buffer *buffer,
+                                 unsigned char *datain)
+{
+        struct iio_demux_table *t;
+
+        if (list_empty(&buffer->demux_list))
+                return datain;
+        list_for_each_entry(t, &buffer->demux_list, l)
+                memcpy(buffer->demux_bounce + t->to,
+                       datain + t->from, t->length);
+
+        return buffer->demux_bounce;
+}
+
+int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
+                       s64 timestamp)
+{
+        unsigned char *dataout = iio_demux(buffer, data);
+
+        return buffer->access->store_to(buffer, dataout, timestamp);
+}
+EXPORT_SYMBOL_GPL(iio_push_to_buffer);
+
+int iio_update_demux(struct iio_dev *indio_dev)
+{
+        const struct iio_chan_spec *ch;
+        struct iio_buffer *buffer = indio_dev->buffer;
+        int ret, in_ind = -1, out_ind, length;
+        unsigned in_loc = 0, out_loc = 0;
+        struct iio_demux_table *p, *q;
+
+        /* Clear out any old demux */
+        list_for_each_entry_safe(p, q, &buffer->demux_list, l) {
+                list_del(&p->l);
+                kfree(p);
+        }
+        kfree(buffer->demux_bounce);
+        buffer->demux_bounce = NULL;
+
+        /* First work out which scan mode we will actually have */
+        if (bitmap_equal(indio_dev->active_scan_mask,
+                         buffer->scan_mask,
+                         indio_dev->masklength))
+                return 0;
+
+        /* Now we have the two masks, work from least sig and build up sizes */
+        for_each_set_bit(out_ind,
+                         indio_dev->active_scan_mask,
+                         indio_dev->masklength) {
+                in_ind = find_next_bit(indio_dev->active_scan_mask,
+                                       indio_dev->masklength,
+                                       in_ind + 1);
+                while (in_ind != out_ind) {
+                        in_ind = find_next_bit(indio_dev->active_scan_mask,
+                                               indio_dev->masklength,
+                                               in_ind + 1);
+                        ch = iio_find_channel_from_si(indio_dev, in_ind);
+                        length = ch->scan_type.storagebits/8;
+                        /* Make sure we are aligned */
+                        in_loc += length;
+                        if (in_loc % length)
+                                in_loc += length - in_loc % length;
+                }
+                p = kmalloc(sizeof(*p), GFP_KERNEL);
+                if (p == NULL) {
+                        ret = -ENOMEM;
+                        goto error_clear_mux_table;
+                }
+                ch = iio_find_channel_from_si(indio_dev, in_ind);
+                length = ch->scan_type.storagebits/8;
+                if (out_loc % length)
+                        out_loc += length - out_loc % length;
+                if (in_loc % length)
+                        in_loc += length - in_loc % length;
+                p->from = in_loc;
+                p->to = out_loc;
+                p->length = length;
+                list_add_tail(&p->l, &buffer->demux_list);
+                out_loc += length;
+                in_loc += length;
+        }
+        /* Relies on scan_timestamp being last */
+        if (buffer->scan_timestamp) {
+                p = kmalloc(sizeof(*p), GFP_KERNEL);
+                if (p == NULL) {
+                        ret = -ENOMEM;
+                        goto error_clear_mux_table;
+                }
+                ch = iio_find_channel_from_si(indio_dev,
+                        buffer->scan_index_timestamp);
+                length = ch->scan_type.storagebits/8;
+                if (out_loc % length)
+                        out_loc += length - out_loc % length;
+                if (in_loc % length)
+                        in_loc += length - in_loc % length;
+                p->from = in_loc;
+                p->to = out_loc;
+                p->length = length;
+                list_add_tail(&p->l, &buffer->demux_list);
+                out_loc += length;
+                in_loc += length;
+        }
+        buffer->demux_bounce = kzalloc(out_loc, GFP_KERNEL);
+        if (buffer->demux_bounce == NULL) {
+                ret = -ENOMEM;
+                goto error_clear_mux_table;
+        }
+        return 0;
+
+error_clear_mux_table:
+        list_for_each_entry_safe(p, q, &buffer->demux_list, l) {
+                list_del(&p->l);
+                kfree(p);
+        }
+        return ret;
+}
+EXPORT_SYMBOL_GPL(iio_update_demux);
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index aec9311b108c..19f897f3c85e 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -25,8 +25,8 @@
 #include "iio.h"
 #include "iio_core.h"
 #include "iio_core_trigger.h"
-#include "chrdev.h"
 #include "sysfs.h"
+#include "events.h"
 
 /* IDA to assign each registered device a unique id*/
 static DEFINE_IDA(iio_ida);
@@ -77,17 +77,29 @@ static const char * const iio_modifier_names[] = {
 
 /* relies on pairs of these shared then separate */
 static const char * const iio_chan_info_postfix[] = {
-        [IIO_CHAN_INFO_SCALE_SHARED/2] = "scale",
-        [IIO_CHAN_INFO_OFFSET_SHARED/2] = "offset",
-        [IIO_CHAN_INFO_CALIBSCALE_SHARED/2] = "calibscale",
-        [IIO_CHAN_INFO_CALIBBIAS_SHARED/2] = "calibbias",
-        [IIO_CHAN_INFO_PEAK_SHARED/2] = "peak_raw",
-        [IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale",
-        [IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED/2]
-        = "quadrature_correction_raw",
-        [IIO_CHAN_INFO_AVERAGE_RAW_SHARED/2] = "mean_raw",
+        [IIO_CHAN_INFO_SCALE] = "scale",
+        [IIO_CHAN_INFO_OFFSET] = "offset",
+        [IIO_CHAN_INFO_CALIBSCALE] = "calibscale",
+        [IIO_CHAN_INFO_CALIBBIAS] = "calibbias",
+        [IIO_CHAN_INFO_PEAK] = "peak_raw",
+        [IIO_CHAN_INFO_PEAK_SCALE] = "peak_scale",
+        [IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW] = "quadrature_correction_raw",
+        [IIO_CHAN_INFO_AVERAGE_RAW] = "mean_raw",
+        [IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY]
+        = "filter_low_pass_3db_frequency",
 };
 
+const struct iio_chan_spec
+*iio_find_channel_from_si(struct iio_dev *indio_dev, int si)
+{
+        int i;
+
+        for (i = 0; i < indio_dev->num_channels; i++)
+                if (indio_dev->channels[i].scan_index == si)
+                        return &indio_dev->channels[i];
+        return NULL;
+}
+
 /**
  * struct iio_detected_event_list - list element for events that have occurred
  * @list:               linked list header
@@ -169,8 +181,11 @@ static ssize_t iio_event_chrdev_read(struct file *filep,
 {
         struct iio_event_interface *ev_int = filep->private_data;
         struct iio_detected_event_list *el;
+        size_t len = sizeof(el->ev);
         int ret;
-        size_t len;
+
+        if (count < len)
+                return -EINVAL;
 
         mutex_lock(&ev_int->event_list_lock);
         if (list_empty(&ev_int->det_events)) {
@@ -192,7 +207,6 @@ static ssize_t iio_event_chrdev_read(struct file *filep,
         el = list_first_entry(&ev_int->det_events,
                               struct iio_detected_event_list,
                               list);
-        len = sizeof el->ev;
         if (copy_to_user(buf, &(el->ev), len)) {
                 ret = -EFAULT;
                 goto error_mutex_unlock;
@@ -415,7 +429,7 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
         sysfs_attr_init(&dev_attr->attr);
 
         /* Build up postfix of <extend_name>_<modifier>_postfix */
-        if (chan->modified) {
+        if (chan->modified && !generic) {
                 if (chan->extend_name)
                         full_postfix = kasprintf(GFP_KERNEL, "%s_%s_%s",
                                                  iio_modifier_names[chan
@@ -600,7 +614,7 @@ static int iio_device_add_channel_sysfs(struct iio_dev *indio_dev,
                                              chan,
                                              &iio_read_channel_info,
                                              &iio_write_channel_info,
-                                             (1 << i),
+                                             i/2,
                                              !(i%2),
                                              &indio_dev->dev,
                                              &indio_dev->channel_attr_list);
@@ -665,10 +679,9 @@ static int iio_device_register_sysfs(struct iio_dev *indio_dev)
         if (indio_dev->name)
                 attrcount++;
 
-        indio_dev->chan_attr_group.attrs
-                = kzalloc(sizeof(indio_dev->chan_attr_group.attrs[0])*
-                          (attrcount + 1),
-                          GFP_KERNEL);
+        indio_dev->chan_attr_group.attrs = kcalloc(attrcount + 1,
+                                                   sizeof(indio_dev->chan_attr_group.attrs[0]),
+                                                   GFP_KERNEL);
         if (indio_dev->chan_attr_group.attrs == NULL) {
                 ret = -ENOMEM;
                 goto error_clear_attrs;
@@ -788,6 +801,9 @@ static ssize_t iio_ev_value_store(struct device *dev,
         unsigned long val;
         int ret;
 
+        if (!indio_dev->info->write_event_value)
+                return -EINVAL;
+
         ret = strict_strtoul(buf, 10, &val);
         if (ret)
                 return ret;
@@ -958,10 +974,9 @@ static int iio_device_register_eventset(struct iio_dev *indio_dev)
         }
 
         indio_dev->event_interface->group.name = iio_event_group_name;
-        indio_dev->event_interface->group.attrs =
-                kzalloc(sizeof(indio_dev->event_interface->group.attrs[0])
-                        *(attrcount + 1),
-                        GFP_KERNEL);
+        indio_dev->event_interface->group.attrs = kcalloc(attrcount + 1,
+                                                          sizeof(indio_dev->event_interface->group.attrs[0]),
+                                                          GFP_KERNEL);
         if (indio_dev->event_interface->group.attrs == NULL) {
                 ret = -ENOMEM;
                 goto error_free_setup_event_lines;
@@ -1068,9 +1083,13 @@ static int iio_chrdev_open(struct inode *inode, struct file *filp)
 {
         struct iio_dev *indio_dev = container_of(inode->i_cdev,
                                                 struct iio_dev, chrdev);
+
+        if (test_and_set_bit(IIO_BUSY_BIT_POS, &indio_dev->flags))
+                return -EBUSY;
+
         filp->private_data = indio_dev;
 
-        return iio_chrdev_buffer_open(indio_dev);
+        return 0;
 }
 
 /**
@@ -1078,8 +1097,9 @@ static int iio_chrdev_open(struct inode *inode, struct file *filp)
  **/
 static int iio_chrdev_release(struct inode *inode, struct file *filp)
 {
-        iio_chrdev_buffer_release(container_of(inode->i_cdev,
-                                             struct iio_dev, chrdev));
+        struct iio_dev *indio_dev = container_of(inode->i_cdev,
+                                                struct iio_dev, chrdev);
+        clear_bit(IIO_BUSY_BIT_POS, &indio_dev->flags);
         return 0;
 }
 
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 68a4d4e8c635..47ecadd4818d 100644
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -159,13 +159,12 @@ EXPORT_SYMBOL(iio_trigger_generic_data_rdy_poll);
 void iio_trigger_poll_chained(struct iio_trigger *trig, s64 time)
 {
         int i;
-        if (!trig->use_count) {
+        if (!trig->use_count)
                 for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++)
                         if (trig->subirqs[i].enabled) {
                                 trig->use_count++;
                                 handle_nested_irq(trig->subirq_base + i);
                         }
-        }
 }
 EXPORT_SYMBOL(iio_trigger_poll_chained);
 
@@ -173,10 +172,9 @@ void iio_trigger_notify_done(struct iio_trigger *trig)
 {
         trig->use_count--;
         if (trig->use_count == 0 && trig->ops && trig->ops->try_reenable)
-                if (trig->ops->try_reenable(trig)) {
+                if (trig->ops->try_reenable(trig))
                         /* Missed and interrupt so launch new poll now */
                         iio_trigger_poll(trig, 0);
-                }
 }
 EXPORT_SYMBOL(iio_trigger_notify_done);
 
@@ -222,8 +220,16 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
         ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                    pf->type, pf->name,
                                    pf);
-        if (trig->ops && trig->ops->set_trigger_state && notinuse)
+        if (ret < 0) {
+                module_put(pf->indio_dev->info->driver_module);
+                return ret;
+        }
+
+        if (trig->ops && trig->ops->set_trigger_state && notinuse) {
                 ret = trig->ops->set_trigger_state(trig, true);
+                if (ret < 0)
+                        module_put(pf->indio_dev->info->driver_module);
+        }
 
         return ret;
 }
@@ -336,6 +342,8 @@ static ssize_t iio_trigger_write_current(struct device *dev,
         mutex_unlock(&indio_dev->mlock);
 
         trig = iio_trigger_find_by_name(buf, len);
+        if (oldtrig == trig)
+                return len;
 
         if (trig && indio_dev->info->validate_trigger) {
                 ret = indio_dev->info->validate_trigger(indio_dev, trig);
@@ -473,12 +481,10 @@ void iio_free_trigger(struct iio_trigger *trig)
 }
 EXPORT_SYMBOL(iio_free_trigger);
 
-int iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
+void iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
 {
         indio_dev->groups[indio_dev->groupcounter++] =
                 &iio_trigger_consumer_attr_group;
-
-        return 0;
 }
 
 void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev)
@@ -490,18 +496,14 @@ void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev)
 
 int iio_triggered_buffer_postenable(struct iio_dev *indio_dev)
 {
-        return indio_dev->trig
-                ? iio_trigger_attach_poll_func(indio_dev->trig,
-                                               indio_dev->pollfunc)
-                : 0;
+        return iio_trigger_attach_poll_func(indio_dev->trig,
+                                            indio_dev->pollfunc);
 }
 EXPORT_SYMBOL(iio_triggered_buffer_postenable);
 
 int iio_triggered_buffer_predisable(struct iio_dev *indio_dev)
 {
-        return indio_dev->trig
-                ? iio_trigger_dettach_poll_func(indio_dev->trig,
-                                                indio_dev->pollfunc)
-                : 0;
+        return iio_trigger_dettach_poll_func(indio_dev->trig,
+                                             indio_dev->pollfunc);
 }
 EXPORT_SYMBOL(iio_triggered_buffer_predisable);
diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c
index e8c234bb18f0..e1e9c06cde4a 100644
--- a/drivers/staging/iio/kfifo_buf.c
+++ b/drivers/staging/iio/kfifo_buf.c
@@ -11,9 +11,7 @@
 struct iio_kfifo {
         struct iio_buffer buffer;
         struct kfifo kf;
-        int use_count;
         int update_needed;
-        struct mutex use_lock;
 };
 
 #define iio_to_kfifo(r) container_of(r, struct iio_kfifo, buffer)
@@ -33,54 +31,25 @@ static int iio_request_update_kfifo(struct iio_buffer *r)
         int ret = 0;
         struct iio_kfifo *buf = iio_to_kfifo(r);
 
-        mutex_lock(&buf->use_lock);
         if (!buf->update_needed)
                 goto error_ret;
-        if (buf->use_count) {
-                ret = -EAGAIN;
-                goto error_ret;
-        }
         kfifo_free(&buf->kf);
         ret = __iio_allocate_kfifo(buf, buf->buffer.bytes_per_datum,
                                    buf->buffer.length);
 error_ret:
-        mutex_unlock(&buf->use_lock);
         return ret;
 }
 
-static void iio_mark_kfifo_in_use(struct iio_buffer *r)
-{
-        struct iio_kfifo *buf = iio_to_kfifo(r);
-        mutex_lock(&buf->use_lock);
-        buf->use_count++;
-        mutex_unlock(&buf->use_lock);
-}
-
-static void iio_unmark_kfifo_in_use(struct iio_buffer *r)
-{
-        struct iio_kfifo *buf = iio_to_kfifo(r);
-        mutex_lock(&buf->use_lock);
-        buf->use_count--;
-        mutex_unlock(&buf->use_lock);
-}
-
 static int iio_get_length_kfifo(struct iio_buffer *r)
 {
         return r->length;
 }
 
-static inline void __iio_init_kfifo(struct iio_kfifo *kf)
-{
-        mutex_init(&kf->use_lock);
-}
-
 static IIO_BUFFER_ENABLE_ATTR;
-static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
 static IIO_BUFFER_LENGTH_ATTR;
 
 static struct attribute *iio_kfifo_attributes[] = {
         &dev_attr_length.attr,
-        &dev_attr_bytes_per_datum.attr,
         &dev_attr_enable.attr,
         NULL,
 };
@@ -98,9 +67,8 @@ struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
         if (!kf)
                 return NULL;
         kf->update_needed = true;
-        iio_buffer_init(&kf->buffer, indio_dev);
+        iio_buffer_init(&kf->buffer);
         kf->buffer.attrs = &iio_kfifo_attribute_group;
-        __iio_init_kfifo(kf);
 
         return &kf->buffer;
 }
@@ -111,20 +79,19 @@ static int iio_get_bytes_per_datum_kfifo(struct iio_buffer *r)
         return r->bytes_per_datum;
 }
 
-static int iio_set_bytes_per_datum_kfifo(struct iio_buffer *r, size_t bpd)
+static int iio_mark_update_needed_kfifo(struct iio_buffer *r)
 {
-        if (r->bytes_per_datum != bpd) {
-                r->bytes_per_datum = bpd;
-                if (r->access->mark_param_change)
-                        r->access->mark_param_change(r);
-        }
+        struct iio_kfifo *kf = iio_to_kfifo(r);
+        kf->update_needed = true;
         return 0;
 }
 
-static int iio_mark_update_needed_kfifo(struct iio_buffer *r)
+static int iio_set_bytes_per_datum_kfifo(struct iio_buffer *r, size_t bpd)
 {
-        struct iio_kfifo *kf = iio_to_kfifo(r);
-        kf->update_needed = true;
+        if (r->bytes_per_datum != bpd) {
+                r->bytes_per_datum = bpd;
+                iio_mark_update_needed_kfifo(r);
+        }
         return 0;
 }
 
@@ -132,8 +99,7 @@ static int iio_set_length_kfifo(struct iio_buffer *r, int length)
 {
         if (r->length != length) {
                 r->length = length;
-                if (r->access->mark_param_change)
-                        r->access->mark_param_change(r);
+                iio_mark_update_needed_kfifo(r);
         }
         return 0;
 }
@@ -150,16 +116,9 @@ static int iio_store_to_kfifo(struct iio_buffer *r,
 {
         int ret;
         struct iio_kfifo *kf = iio_to_kfifo(r);
-        u8 *datal = kmalloc(r->bytes_per_datum, GFP_KERNEL);
-        memcpy(datal, data, r->bytes_per_datum - sizeof(timestamp));
-        memcpy(datal + r->bytes_per_datum - sizeof(timestamp),
-                &timestamp, sizeof(timestamp));
         ret = kfifo_in(&kf->kf, data, r->bytes_per_datum);
-        if (ret != r->bytes_per_datum) {
-                kfree(datal);
+        if (ret != r->bytes_per_datum)
                 return -EBUSY;
-        }
-        kfree(datal);
         return 0;
 }
 
@@ -169,17 +128,18 @@ static int iio_read_first_n_kfifo(struct iio_buffer *r,
         int ret, copied;
         struct iio_kfifo *kf = iio_to_kfifo(r);
 
-        ret = kfifo_to_user(&kf->kf, buf, r->bytes_per_datum*n, &copied);
+        if (n < r->bytes_per_datum)
+                return -EINVAL;
+
+        n = rounddown(n, r->bytes_per_datum);
+        ret = kfifo_to_user(&kf->kf, buf, n, &copied);
 
         return copied;
 }
 
 const struct iio_buffer_access_funcs kfifo_access_funcs = {
-        .mark_in_use = &iio_mark_kfifo_in_use,
-        .unmark_in_use = &iio_unmark_kfifo_in_use,
         .store_to = &iio_store_to_kfifo,
         .read_first_n = &iio_read_first_n_kfifo,
-        .mark_param_change = &iio_mark_update_needed_kfifo,
         .request_update = &iio_request_update_kfifo,
         .get_bytes_per_datum = &iio_get_bytes_per_datum_kfifo,
         .set_bytes_per_datum = &iio_set_bytes_per_datum_kfifo,
diff --git a/drivers/staging/iio/kfifo_buf.h b/drivers/staging/iio/kfifo_buf.h
index a15598bb9fdb..cc2bd9a1ccfe 100644
--- a/drivers/staging/iio/kfifo_buf.h
+++ b/drivers/staging/iio/kfifo_buf.h
@@ -1,7 +1,7 @@
 
 #include <linux/kfifo.h>
 #include "iio.h"
-#include "buffer_generic.h"
+#include "buffer.h"
 
 extern const struct iio_buffer_access_funcs kfifo_access_funcs;
 
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 47638362224b..849d6a564afa 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -362,8 +362,7 @@ static int isl29018_write_raw(struct iio_dev *indio_dev,
         int ret = -EINVAL;
 
         mutex_lock(&chip->lock);
-        if (mask == (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) &&
-            chan->type == IIO_LIGHT) {
+        if (mask == IIO_CHAN_INFO_CALIBSCALE && chan->type == IIO_LIGHT) {
                 chip->lux_scale = val;
                 ret = 0;
         }
@@ -402,7 +401,7 @@ static int isl29018_read_raw(struct iio_dev *indio_dev,
                 if (!ret)
                         ret = IIO_VAL_INT;
                 break;
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (chan->type == IIO_LIGHT) {
                         *val = chip->lux_scale;
                         ret = IIO_VAL_INT;
@@ -421,7 +420,7 @@ static const struct iio_chan_spec isl29018_channels[] = {
                 .indexed = 1,
                 .channel = 0,
                 .processed_val = IIO_PROCESSED,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
         }, {
                 .type = IIO_INTENSITY,
                 .modified = 1,
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index 1942db13b03b..ffca85e81ef5 100644
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -37,6 +37,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
+#include "../events.h"
 #include "tsl2563.h"
 
 /* Use this many bits for fraction part. */
@@ -226,6 +227,8 @@ static int tsl2563_read_id(struct tsl2563_chip *chip, u8 *id)
         if (ret < 0)
                 return ret;
 
+        *id = ret;
+
         return 0;
 }
 
@@ -510,7 +513,7 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev,
                 }
                 break;
 
-        case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
+        case IIO_CHAN_INFO_CALIBSCALE:
                 if (chan->channel == 0)
                         *val = calib_to_sysfs(chip->calib0);
                 else
@@ -536,7 +539,7 @@ static const struct iio_chan_spec tsl2563_channels[] = {
                 .type = IIO_INTENSITY,
                 .modified = 1,
                 .channel2 = IIO_MOD_LIGHT_BOTH,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE),
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
                 .event_mask = (IIO_EV_BIT(IIO_EV_TYPE_THRESH,
                                           IIO_EV_DIR_RISING) |
                                IIO_EV_BIT(IIO_EV_TYPE_THRESH,
@@ -544,8 +547,8 @@ static const struct iio_chan_spec tsl2563_channels[] = {
         }, {
                 .type = IIO_INTENSITY,
                 .modified = 1,
-                .channel2 = IIO_MOD_LIGHT_BOTH,
-                .info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE),
+                .channel2 = IIO_MOD_LIGHT_IR,
+                .info_mask = IIO_CHAN_INFO_CALIBSCALE_SEPARATE_BIT,
         }
 };
 
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 3836f73a5296..5b6455a238d8 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -194,6 +194,7 @@ static int taos_get_lux(struct iio_dev *indio_dev)
 {
         u16 ch0, ch1; /* separated ch0/ch1 data from device */
         u32 lux; /* raw lux calculated from device data */
+        u64 lux64;
         u32 ratio;
         u8 buf[5];
         struct taos_lux *p;
@@ -297,9 +298,19 @@ static int taos_get_lux(struct iio_dev *indio_dev)
                 lux = (lux + (chip->als_time_scale >> 1)) /
                         chip->als_time_scale;
 
-        /* adjust for active gain scale */
-        lux >>= 13; /* tables have factor of 8192 builtin for accuracy */
-        lux = (lux * chip->taos_settings.als_gain_trim + 500) / 1000;
+        /* Adjust for active gain scale.
+         * The taos_device_lux tables above have a factor of 8192 built in,
+         * so we need to shift right.
+         * User-specified gain provides a multiplier.
+         * Apply user-specified gain before shifting right to retain precision.
+         * Use 64 bits to avoid overflow on multiplication.
+         * Then go back to 32 bits before division to avoid using div_u64().
+         */
+        lux64 = lux;
+        lux64 = lux64 * chip->taos_settings.als_gain_trim;
+        lux64 >>= 13;
+        lux = lux64;
+        lux = (lux + 500) / 1000;
         if (lux > TSL258X_LUX_CALC_OVER_FLOW) { /* check for overflow */
 return_max:
                 lux = TSL258X_LUX_CALC_OVER_FLOW;
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index db31d6d0e5b6..3158f12cb051 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -431,7 +431,7 @@ static int ak8975_read_raw(struct iio_dev *indio_dev,
         switch (mask) {
         case 0:
                 return ak8975_read_axis(indio_dev, chan->address, val);
-        case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+        case IIO_CHAN_INFO_SCALE:
                 *val = data->raw_to_gauss[chan->address];
                 return IIO_VAL_INT;
         }
@@ -443,7 +443,7 @@ static int ak8975_read_raw(struct iio_dev *indio_dev,
                 .type = IIO_MAGN,                                       \
                 .modified = 1,                                          \
                 .channel2 = IIO_MOD_##axis,                             \
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),       \
+                .info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,  \
                 .address = index,                                       \
         }
 
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 7bb1bc605136..f2e85a9cf196 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -463,7 +463,7 @@ static int hmc5843_read_raw(struct iio_dev *indio_dev,
                 return hmc5843_read_measurement(indio_dev,
                                                 chan->address,
                                                 val);
-        case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+        case IIO_CHAN_INFO_SCALE:
                 *val = 0;
                 *val2 = hmc5843_regval_to_nanoscale[data->range];
                 return IIO_VAL_INT_PLUS_NANO;
@@ -476,7 +476,7 @@ static int hmc5843_read_raw(struct iio_dev *indio_dev,
                 .type = IIO_MAGN,                                       \
                 .modified = 1,                                          \
                 .channel2 = IIO_MOD_##axis,                             \
-                .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED),         \
+                .info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,            \
                 .address = add                                          \
         }
 
@@ -605,6 +605,7 @@ static const struct i2c_device_id hmc5843_id[] = {
         { "hmc5843", 0 },
         { }
 };
+MODULE_DEVICE_TABLE(i2c, hmc5843_id);
 
 static struct i2c_driver hmc5843_driver = {
         .driver = {
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 4c7b0cbf49fa..57baac6c0d40 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -582,3 +582,4 @@ module_spi_driver(ade7753_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADE7753/6 Single-Phase Multifunction Meter");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ade7753");
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 15c98cde76d1..8d81c92007e9 100644
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -605,3 +605,4 @@ module_spi_driver(ade7754_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADE7754 Polyphase Multifunction Energy Metering IC Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ad7754");
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 39338bcb1872..dcb20294dfe8 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -20,7 +20,7 @@
 
 #include "../iio.h"
 #include "../sysfs.h"
-#include "../buffer_generic.h"
+#include "../buffer.h"
 #include "meter.h"
 #include "ade7758.h"
 
@@ -663,63 +663,63 @@ static const struct attribute_group ade7758_attribute_group = {
 
 static struct iio_chan_spec ade7758_channels[] = {
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_VOLTAGE),
                 0, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_CURRENT),
                 1, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_APP_PWR),
                 2, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_ACT_PWR),
                 3, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 0, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_A, AD7758_REACT_PWR),
                 4, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_VOLTAGE),
                 5, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_CURRENT),
                 6, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_APP_PWR),
                 7, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_ACT_PWR),
                 8, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 1, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_B, AD7758_REACT_PWR),
                 9, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, "raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_VOLTAGE),
                 10, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_CURRENT, 0, 1, 0, "raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_CURRENT),
                 11, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "apparent_raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_APP_PWR),
                 12, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "active_raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_ACT_PWR),
                 13, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN(IIO_POWER, 0, 1, 0, "reactive_raw", 2, 0,
-                (1 << IIO_CHAN_INFO_SCALE_SHARED),
+                IIO_CHAN_INFO_SCALE_SHARED_BIT,
                 AD7758_WT(AD7758_PHASE_C, AD7758_REACT_PWR),
                 14, IIO_ST('s', 24, 32, 0), 0),
         IIO_CHAN_SOFT_TIMESTAMP(15),
@@ -746,12 +746,12 @@ static int __devinit ade7758_probe(struct spi_device *spi)
         spi_set_drvdata(spi, indio_dev);
 
         /* Allocate the comms buffers */
-        st->rx = kzalloc(sizeof(*st->rx)*ADE7758_MAX_RX, GFP_KERNEL);
+        st->rx = kcalloc(ADE7758_MAX_RX, sizeof(*st->rx), GFP_KERNEL);
         if (st->rx == NULL) {
                 ret = -ENOMEM;
                 goto error_free_dev;
         }
-        st->tx = kzalloc(sizeof(*st->tx)*ADE7758_MAX_TX, GFP_KERNEL);
+        st->tx = kcalloc(ADE7758_MAX_TX, sizeof(*st->tx), GFP_KERNEL);
         if (st->tx == NULL) {
                 ret = -ENOMEM;
                 goto error_free_rx;
@@ -843,6 +843,7 @@ static const struct spi_device_id ade7758_id[] = {
         {"ade7758", 0},
         {}
 };
+MODULE_DEVICE_TABLE(spi, ade7758_id);
 
 static struct spi_driver ade7758_driver = {
         .driver = {
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index 00fa2ac5c459..f29f2b278fe4 100644
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -67,7 +67,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)
         s64 dat64[2];
         u32 *dat32 = (u32 *)dat64;
 
-        if (ring->scan_count)
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 if (ade7758_spi_read_burst(&indio_dev->dev) >= 0)
                         *dat32 = get_unaligned_be32(&st->rx_buf[5]) & 0xFFFFFF;
 
@@ -96,10 +96,11 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev)
         size_t d_size;
         unsigned channel;
 
-        if (!ring->scan_count)
+        if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength))
                 return -EINVAL;
 
-        channel = find_first_bit(ring->scan_mask, indio_dev->masklength);
+        channel = find_first_bit(indio_dev->active_scan_mask,
+                                 indio_dev->masklength);
 
         d_size = st->ade7758_ring_channels[channel].scan_type.storagebits / 8;
 
@@ -145,8 +146,7 @@ int ade7758_configure_ring(struct iio_dev *indio_dev)
 
         /* Effectively select the ring buffer implementation */
         indio_dev->buffer->access = &ring_sw_access_funcs;
-        indio_dev->buffer->setup_ops = &ade7758_ring_setup_ops;
-        indio_dev->buffer->owner = THIS_MODULE;
+        indio_dev->setup_ops = &ade7758_ring_setup_ops;
 
         indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
                                                  &ade7758_trigger_handler,
diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index cfa2a5eff122..0beab478dcd9 100644
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -526,3 +526,4 @@ module_spi_driver(ade7759_driver);
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_DESCRIPTION("Analog Devices ADE7759 Active Energy Metering IC Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("spi:ad7759");
diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
index c485a79aeec3..81121862c1bd 100644
--- a/drivers/staging/iio/meter/ade7854-spi.c
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@ -343,6 +343,7 @@ static const struct spi_device_id ade7854_id[] = {
         { "ade7878", 0 },
         { }
 };
+MODULE_DEVICE_TABLE(spi, ade7854_id);
 
 static struct spi_driver ade7854_driver = {
         .driver = {
diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c
index 1c6a02bfd45d..d8ce854c1897 100644
--- a/drivers/staging/iio/resolver/ad2s1200.c
+++ b/drivers/staging/iio/resolver/ad2s1200.c
@@ -160,6 +160,7 @@ static const struct spi_device_id ad2s1200_id[] = {
         { "ad2s1205" },
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad2s1200_id);
 
 static struct spi_driver ad2s1200_driver = {
         .driver = {
diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index ff1b3316d016..c439fcf72be7 100644
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -749,6 +749,7 @@ static const struct spi_device_id ad2s1210_id[] = {
         { "ad2s1210" },
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad2s1210_id);
 
 static struct spi_driver ad2s1210_driver = {
         .driver = {
diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c
index 6d0794389e74..2a86f582ddf1 100644
--- a/drivers/staging/iio/resolver/ad2s90.c
+++ b/drivers/staging/iio/resolver/ad2s90.c
@@ -109,6 +109,7 @@ static const struct spi_device_id ad2s90_id[] = {
         { "ad2s90" },
         {}
 };
+MODULE_DEVICE_TABLE(spi, ad2s90_id);
 
 static struct spi_driver ad2s90_driver = {
         .driver = {
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index 66a34addb75f..3e24ec455854 100644
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -23,11 +23,8 @@
  * @data:               the ring buffer memory
  * @read_p:             read pointer (oldest available)
  * @write_p:            write pointer
- * @last_written_p:     read pointer (newest available)
  * @half_p:             half buffer length behind write_p (event generation)
- * @use_count:          reference count to prevent resizing when in use
  * @update_needed:      flag to indicated change in size requested
- * @use_lock:           lock to prevent change in size when in use
  *
  * Note that the first element of all ring buffers must be a
  * struct iio_buffer.
@@ -37,12 +34,9 @@ struct iio_sw_ring_buffer {
         unsigned char           *data;
         unsigned char           *read_p;
         unsigned char           *write_p;
-        unsigned char           *last_written_p;
         /* used to act as a point at which to signal an event */
         unsigned char           *half_p;
-        int                     use_count;
         int                     update_needed;
-        spinlock_t              use_lock;
 };
 
 #define iio_to_sw_ring(r) container_of(r, struct iio_sw_ring_buffer, buf)
@@ -56,38 +50,15 @@ static inline int __iio_allocate_sw_ring_buffer(struct iio_sw_ring_buffer *ring,
         ring->data = kmalloc(length*ring->buf.bytes_per_datum, GFP_ATOMIC);
         ring->read_p = NULL;
         ring->write_p = NULL;
-        ring->last_written_p = NULL;
         ring->half_p = NULL;
         return ring->data ? 0 : -ENOMEM;
 }
 
-static inline void __iio_init_sw_ring_buffer(struct iio_sw_ring_buffer *ring)
-{
-        spin_lock_init(&ring->use_lock);
-}
-
 static inline void __iio_free_sw_ring_buffer(struct iio_sw_ring_buffer *ring)
 {
         kfree(ring->data);
 }
 
-static void iio_mark_sw_rb_in_use(struct iio_buffer *r)
-{
-        struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
-        spin_lock(&ring->use_lock);
-        ring->use_count++;
-        spin_unlock(&ring->use_lock);
-}
-
-static void iio_unmark_sw_rb_in_use(struct iio_buffer *r)
-{
-        struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
-        spin_lock(&ring->use_lock);
-        ring->use_count--;
-        spin_unlock(&ring->use_lock);
-}
-
-
 /* Ring buffer related functionality */
 /* Store to ring is typically called in the bh of a data ready interrupt handler
  * in the device driver */
@@ -115,7 +86,6 @@ static int iio_store_to_sw_ring(struct iio_sw_ring_buffer *ring,
          * Always valid as either points to latest or second latest value.
          * Before this runs it is null and read attempts fail with -EAGAIN.
          */
-        ring->last_written_p = ring->write_p;
         barrier();
         /* temp_ptr used to ensure we never have an invalid pointer
          * it may be slightly lagging, but never invalid
@@ -174,6 +144,7 @@ static int iio_read_first_n_sw_rb(struct iio_buffer *r,
         u8 *initial_read_p, *initial_write_p, *current_read_p, *end_read_p;
         u8 *data;
         int ret, max_copied, bytes_to_rip, dead_offset;
+        size_t data_available, buffer_size;
 
         /* A userspace program has probably made an error if it tries to
          *  read something that is not a whole number of bpds.
@@ -186,9 +157,11 @@ static int iio_read_first_n_sw_rb(struct iio_buffer *r,
                        n, ring->buf.bytes_per_datum);
                 goto error_ret;
         }
+
+        buffer_size = ring->buf.bytes_per_datum*ring->buf.length;
+
         /* Limit size to whole of ring buffer */
-        bytes_to_rip = min((size_t)(ring->buf.bytes_per_datum*ring->buf.length),
-                           n);
+        bytes_to_rip = min_t(size_t, buffer_size, n);
 
         data = kmalloc(bytes_to_rip, GFP_KERNEL);
         if (data == NULL) {
@@ -217,38 +190,24 @@ static int iio_read_first_n_sw_rb(struct iio_buffer *r,
                 goto error_free_data_cpy;
         }
 
-        if (initial_write_p >= initial_read_p + bytes_to_rip) {
-                /* write_p is greater than necessary, all is easy */
-                max_copied = bytes_to_rip;
-                memcpy(data, initial_read_p, max_copied);
-                end_read_p = initial_read_p + max_copied;
-        } else if (initial_write_p > initial_read_p) {
-                /*not enough data to cpy */
-                max_copied = initial_write_p - initial_read_p;
+        if (initial_write_p >= initial_read_p)
+                data_available = initial_write_p - initial_read_p;
+        else
+                data_available = buffer_size - (initial_read_p - initial_write_p);
+
+        if (data_available < bytes_to_rip)
+                bytes_to_rip = data_available;
+
+        if (initial_read_p + bytes_to_rip >= ring->data + buffer_size) {
+                max_copied = ring->data + buffer_size - initial_read_p;
                 memcpy(data, initial_read_p, max_copied);
-                end_read_p = initial_write_p;
+                memcpy(data + max_copied, ring->data, bytes_to_rip - max_copied);
+                end_read_p = ring->data + bytes_to_rip - max_copied;
         } else {
-                /* going through 'end' of ring buffer */
-                max_copied = ring->data
-                        + ring->buf.length*ring->buf.bytes_per_datum - initial_read_p;
-                memcpy(data, initial_read_p, max_copied);
-                /* possible we are done if we align precisely with end */
-                if (max_copied == bytes_to_rip)
-                        end_read_p = ring->data;
-                else if (initial_write_p
-                         > ring->data + bytes_to_rip - max_copied) {
-                        /* enough data to finish */
-                        memcpy(data + max_copied, ring->data,
-                               bytes_to_rip - max_copied);
-                        max_copied = bytes_to_rip;
-                        end_read_p = ring->data + (bytes_to_rip - max_copied);
-                } else {  /* not enough data */
-                        memcpy(data + max_copied, ring->data,
-                               initial_write_p - ring->data);
-                        max_copied += initial_write_p - ring->data;
-                        end_read_p = initial_write_p;
-                }
+                memcpy(data, initial_read_p, bytes_to_rip);
+                end_read_p = initial_read_p + bytes_to_rip;
         }
+
         /* Now to verify which section was cleanly copied - i.e. how far
          * read pointer has been pushed */
         current_read_p = ring->read_p;
@@ -256,15 +215,14 @@ static int iio_read_first_n_sw_rb(struct iio_buffer *r,
         if (initial_read_p <= current_read_p)
                 dead_offset = current_read_p - initial_read_p;
         else
-                dead_offset = ring->buf.length*ring->buf.bytes_per_datum
-                        - (initial_read_p - current_read_p);
+                dead_offset = buffer_size - (initial_read_p - current_read_p);
 
         /* possible issue if the initial write has been lapped or indeed
          * the point we were reading to has been passed */
         /* No valid data read.
          * In this case the read pointer is already correct having been
          * pushed further than we would look. */
-        if (max_copied - dead_offset < 0) {
+        if (bytes_to_rip - dead_offset < 0) {
                 ret = 0;
                 goto error_free_data_cpy;
         }
@@ -280,7 +238,7 @@ static int iio_read_first_n_sw_rb(struct iio_buffer *r,
         while (ring->read_p != end_read_p)
                 ring->read_p = end_read_p;
 
-        ret = max_copied - dead_offset;
+        ret = bytes_to_rip - dead_offset;
 
         if (copy_to_user(buf, data + dead_offset, ret))  {
                 ret =  -EFAULT;
@@ -305,52 +263,18 @@ static int iio_store_to_sw_rb(struct iio_buffer *r,
         return iio_store_to_sw_ring(ring, data, timestamp);
 }
 
-static int iio_read_last_from_sw_ring(struct iio_sw_ring_buffer *ring,
-                                      unsigned char *data)
-{
-        unsigned char *last_written_p_copy;
-
-        iio_mark_sw_rb_in_use(&ring->buf);
-again:
-        barrier();
-        last_written_p_copy = ring->last_written_p;
-        barrier(); /*unnessecary? */
-        /* Check there is anything here */
-        if (last_written_p_copy == NULL)
-                return -EAGAIN;
-        memcpy(data, last_written_p_copy, ring->buf.bytes_per_datum);
-
-        if (unlikely(ring->last_written_p != last_written_p_copy))
-                goto again;
-
-        iio_unmark_sw_rb_in_use(&ring->buf);
-        return 0;
-}
-
-static int iio_read_last_from_sw_rb(struct iio_buffer *r,
-                             unsigned char *data)
-{
-        return iio_read_last_from_sw_ring(iio_to_sw_ring(r), data);
-}
-
 static int iio_request_update_sw_rb(struct iio_buffer *r)
 {
         int ret = 0;
         struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
 
         r->stufftoread = false;
-        spin_lock(&ring->use_lock);
         if (!ring->update_needed)
                 goto error_ret;
-        if (ring->use_count) {
-                ret = -EAGAIN;
-                goto error_ret;
-        }
         __iio_free_sw_ring_buffer(ring);
         ret = __iio_allocate_sw_ring_buffer(ring, ring->buf.bytes_per_datum,
                                             ring->buf.length);
 error_ret:
-        spin_unlock(&ring->use_lock);
         return ret;
 }
 
@@ -360,12 +284,18 @@ static int iio_get_bytes_per_datum_sw_rb(struct iio_buffer *r)
         return ring->buf.bytes_per_datum;
 }
 
+static int iio_mark_update_needed_sw_rb(struct iio_buffer *r)
+{
+        struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
+        ring->update_needed = true;
+        return 0;
+}
+
 static int iio_set_bytes_per_datum_sw_rb(struct iio_buffer *r, size_t bpd)
 {
         if (r->bytes_per_datum != bpd) {
                 r->bytes_per_datum = bpd;
-                if (r->access->mark_param_change)
-                        r->access->mark_param_change(r);
+                iio_mark_update_needed_sw_rb(r);
         }
         return 0;
 }
@@ -379,27 +309,17 @@ static int iio_set_length_sw_rb(struct iio_buffer *r, int length)
 {
         if (r->length != length) {
                 r->length = length;
-                if (r->access->mark_param_change)
-                        r->access->mark_param_change(r);
+                iio_mark_update_needed_sw_rb(r);
         }
         return 0;
 }
 
-static int iio_mark_update_needed_sw_rb(struct iio_buffer *r)
-{
-        struct iio_sw_ring_buffer *ring = iio_to_sw_ring(r);
-        ring->update_needed = true;
-        return 0;
-}
-
 static IIO_BUFFER_ENABLE_ATTR;
-static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
 static IIO_BUFFER_LENGTH_ATTR;
 
 /* Standard set of ring buffer attributes */
 static struct attribute *iio_ring_attributes[] = {
         &dev_attr_length.attr,
-        &dev_attr_bytes_per_datum.attr,
         &dev_attr_enable.attr,
         NULL,
 };
@@ -419,8 +339,7 @@ struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
                 return NULL;
         ring->update_needed = true;
         buf = &ring->buf;
-        iio_buffer_init(buf, indio_dev);
-        __iio_init_sw_ring_buffer(ring);
+        iio_buffer_init(buf);
         buf->attrs = &iio_ring_attribute_group;
 
         return buf;
@@ -434,12 +353,8 @@ void iio_sw_rb_free(struct iio_buffer *r)
 EXPORT_SYMBOL(iio_sw_rb_free);
 
 const struct iio_buffer_access_funcs ring_sw_access_funcs = {
-        .mark_in_use = &iio_mark_sw_rb_in_use,
-        .unmark_in_use = &iio_unmark_sw_rb_in_use,
         .store_to = &iio_store_to_sw_rb,
-        .read_last = &iio_read_last_from_sw_rb,
         .read_first_n = &iio_read_first_n_sw_rb,
-        .mark_param_change = &iio_mark_update_needed_sw_rb,
         .request_update = &iio_request_update_sw_rb,
         .get_bytes_per_datum = &iio_get_bytes_per_datum_sw_rb,
         .set_bytes_per_datum = &iio_set_bytes_per_datum_sw_rb,
diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
index a3e15784c225..e6a6e2c40960 100644
--- a/drivers/staging/iio/ring_sw.h
+++ b/drivers/staging/iio/ring_sw.h
@@ -23,7 +23,7 @@
 
 #ifndef _IIO_RING_SW_H_
 #define _IIO_RING_SW_H_
-#include "buffer_generic.h"
+#include "buffer.h"
 
 /**
  * ring_sw_access_funcs - access functions for a software ring buffer
diff --git a/drivers/staging/iio/sysfs.h b/drivers/staging/iio/sysfs.h
index 868952b5ba63..bfedb73b850e 100644
--- a/drivers/staging/iio/sysfs.h
+++ b/drivers/staging/iio/sysfs.h
@@ -114,47 +114,4 @@ struct iio_const_attr {
 #define IIO_CONST_ATTR_TEMP_SCALE(_string)              \
         IIO_CONST_ATTR(in_temp_scale, _string)
 
-enum iio_event_type {
-        IIO_EV_TYPE_THRESH,
-        IIO_EV_TYPE_MAG,
-        IIO_EV_TYPE_ROC,
-        IIO_EV_TYPE_THRESH_ADAPTIVE,
-        IIO_EV_TYPE_MAG_ADAPTIVE,
-};
-
-enum iio_event_direction {
-        IIO_EV_DIR_EITHER,
-        IIO_EV_DIR_RISING,
-        IIO_EV_DIR_FALLING,
-};
-
-#define IIO_EVENT_CODE(chan_type, diff, modifier, direction,            \
-                       type, chan, chan1, chan2)                        \
-        (((u64)type << 56) | ((u64)diff << 55) |                        \
-         ((u64)direction << 48) | ((u64)modifier << 40) |               \
-         ((u64)chan_type << 32) | (chan2 << 16) | chan1 | chan)
-
-#define IIO_EV_DIR_MAX 4
-#define IIO_EV_BIT(type, direction)                     \
-        (1 << (type*IIO_EV_DIR_MAX + direction))
-
-#define IIO_MOD_EVENT_CODE(channelclass, number, modifier,              \
-                           type, direction)                             \
-        IIO_EVENT_CODE(channelclass, 0, modifier, direction, type, number, 0, 0)
-
-#define IIO_UNMOD_EVENT_CODE(channelclass, number, type, direction)     \
-        IIO_EVENT_CODE(channelclass, 0, 0, direction, type, number, 0, 0)
-
-#define IIO_EVENT_CODE_EXTRACT_TYPE(mask) ((mask >> 56) & 0xFF)
-
-#define IIO_EVENT_CODE_EXTRACT_DIR(mask) ((mask >> 48) & 0xCF)
-
-#define IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(mask) ((mask >> 32) & 0xFF)
-
-/* Event code number extraction depends on which type of event we have.
- * Perhaps review this function in the future*/
-#define IIO_EVENT_CODE_EXTRACT_NUM(mask) (mask & 0xFFFF)
-
-#define IIO_EVENT_CODE_EXTRACT_MODIFIER(mask) ((mask >> 40) & 0xFF)
-
 #endif /* _INDUSTRIAL_IO_SYSFS_H_ */
diff --git a/drivers/staging/iio/trigger.h b/drivers/staging/iio/trigger.h
index 5cc42a655c88..1cfca231db8f 100644
--- a/drivers/staging/iio/trigger.h
+++ b/drivers/staging/iio/trigger.h
@@ -46,7 +46,6 @@ struct iio_trigger_ops {
  * @private_data:       [DRIVER] device specific data
  * @list:               [INTERN] used in maintenance of global trigger list
  * @alloc_list:         [DRIVER] used for driver specific trigger list
- * @owner:              [DRIVER] used to monitor usage count of the trigger.
  * @use_count:          use count for the trigger
  * @subirq_chip:        [INTERN] associate 'virtual' irq chip.
  * @subirq_base:        [INTERN] base number for irqs provided by trigger.
@@ -63,7 +62,6 @@ struct iio_trigger {
         void                            *private_data;
         struct list_head                list;
         struct list_head                alloc_list;
-        struct module                   *owner;
         int use_count;
 
         struct irq_chip                 subirq_chip;
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
index d35d085da949..bd7416b2c561 100644
--- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
+++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
@@ -125,7 +125,6 @@ static int iio_trig_periodic_rtc_probe(struct platform_device *dev)
                         goto error_put_trigger_and_remove_from_list;
                 }
                 trig->private_data = trig_info;
-                trig->owner = THIS_MODULE;
                 trig->ops = &iio_prtc_trigger_ops;
                 /* RTC access */
                 trig_info->rtc
diff --git a/drivers/staging/iio/types.h b/drivers/staging/iio/types.h
new file mode 100644
index 000000000000..b7d26474ad06
--- /dev/null
+++ b/drivers/staging/iio/types.h
@@ -0,0 +1,49 @@
+/* industrial I/O data types needed both in and out of kernel
+ *
+ * Copyright (c) 2008 Jonathan Cameron
+ *
+ * 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.
+ */
+
+#ifndef _IIO_TYPES_H_
+#define _IIO_TYPES_H_
+
+enum iio_chan_type {
+        /* real channel types */
+        IIO_VOLTAGE,
+        IIO_CURRENT,
+        IIO_POWER,
+        IIO_ACCEL,
+        IIO_ANGL_VEL,
+        IIO_MAGN,
+        IIO_LIGHT,
+        IIO_INTENSITY,
+        IIO_PROXIMITY,
+        IIO_TEMP,
+        IIO_INCLI,
+        IIO_ROT,
+        IIO_ANGL,
+        IIO_TIMESTAMP,
+        IIO_CAPACITANCE,
+};
+
+enum iio_modifier {
+        IIO_NO_MOD,
+        IIO_MOD_X,
+        IIO_MOD_Y,
+        IIO_MOD_Z,
+        IIO_MOD_X_AND_Y,
+        IIO_MOD_X_AND_Z,
+        IIO_MOD_Y_AND_Z,
+        IIO_MOD_X_AND_Y_AND_Z,
+        IIO_MOD_X_OR_Y,
+        IIO_MOD_X_OR_Z,
+        IIO_MOD_Y_OR_Z,
+        IIO_MOD_X_OR_Y_OR_Z,
+        IIO_MOD_LIGHT_BOTH,
+        IIO_MOD_LIGHT_IR,
+};
+
+#endif /* _IIO_TYPES_H_ */
diff --git a/drivers/staging/intel_sst/Kconfig b/drivers/staging/intel_sst/Kconfig
deleted file mode 100644
index 82391077b384..000000000000
--- a/drivers/staging/intel_sst/Kconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-config SND_INTEL_SST
-        tristate "Intel SST (LPE) Driver"
-        depends on X86 && INTEL_SCU_IPC
-        default n
-        help
-          Say Y here to include support for the Intel(R) MID SST DSP driver
-          On other PC platforms if you are unsure answer 'N'
-
-config SND_INTELMID
-        tristate "Intel MID sound card driver"
-        depends on SOUND && SND
-        select SND_PCM
-        select SND_SEQUENCER
-        select SND_JACK
-        depends on SND_INTEL_SST
-        default n
-        help
-          Say Y here to include support for the Intel(R) MID sound card driver
-          On other PC platforms if you are unsure answer 'N'
diff --git a/drivers/staging/intel_sst/Makefile b/drivers/staging/intel_sst/Makefile
deleted file mode 100644
index 9eb7c158bb65..000000000000
--- a/drivers/staging/intel_sst/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for Intel MID Audio drivers
-#
-snd-intel-sst-y := intel_sst.o intel_sst_ipc.o intel_sst_stream.o intel_sst_drv_interface.o intel_sst_dsp.o intel_sst_pvt.o intel_sst_stream_encoded.o intel_sst_app_interface.o
-snd-intelmid-y := intelmid.o intelmid_msic_control.o intelmid_ctrl.o intelmid_pvt.o intelmid_v0_control.o intelmid_v1_control.o intelmid_v2_control.o
-obj-$(CONFIG_SND_INTEL_SST) += snd-intel-sst.o
-obj-$(CONFIG_SND_INTELMID) += snd-intelmid.o
diff --git a/drivers/staging/intel_sst/TODO b/drivers/staging/intel_sst/TODO
deleted file mode 100644
index c733d7011091..000000000000
--- a/drivers/staging/intel_sst/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-TODO
-----
-
-Get the memrar driver cleaned up and upstream (dependency blocking SST)
-Replace long/short press with two virtual buttons
-Review the printks and kill off any left over ST_ERR: messages
-Review the misc device ioctls for 32/64bit safety and sanity
-Review the misc device ioctls for size safety depending on config and decide
-        if space/unused areas should be left
-What the sound folks turn up on full review
-Using the ALSA frameworks properly
-
-
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
deleted file mode 100644
index ff9aaec0557f..000000000000
--- a/drivers/staging/intel_sst/intel_sst.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- *  intel_sst.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10       Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This driver exposes the audio engine functionalities to the ALSA
- *       and middleware.
- *
- *  This file contains all init functions
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/fs.h>
-#include <linux/interrupt.h>
-#include <linux/firmware.h>
-#include <linux/miscdevice.h>
-#include <linux/pm_runtime.h>
-#include <linux/module.h>
-#include <asm/mrst.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-
-MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
-MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
-MODULE_AUTHOR("Dharageswari R <dharageswari.r@intel.com>");
-MODULE_AUTHOR("KP Jeeja <jeeja.kp@intel.com>");
-MODULE_DESCRIPTION("Intel (R) SST(R) Audio Engine Driver");
-MODULE_LICENSE("GPL v2");
-MODULE_VERSION(SST_DRIVER_VERSION);
-
-struct intel_sst_drv *sst_drv_ctx;
-static struct mutex drv_ctx_lock;
-struct class *sst_class;
-
-/* fops Routines */
-static const struct file_operations intel_sst_fops = {
-        .owner = THIS_MODULE,
-        .open = intel_sst_open,
-        .release = intel_sst_release,
-        .read = intel_sst_read,
-        .write = intel_sst_write,
-        .unlocked_ioctl = intel_sst_ioctl,
-        .mmap = intel_sst_mmap,
-        .aio_read = intel_sst_aio_read,
-        .aio_write = intel_sst_aio_write,
-};
-static const struct file_operations intel_sst_fops_cntrl = {
-        .owner = THIS_MODULE,
-        .open = intel_sst_open_cntrl,
-        .release = intel_sst_release_cntrl,
-        .unlocked_ioctl = intel_sst_ioctl,
-};
-
-static struct miscdevice lpe_dev = {
-        .minor = MISC_DYNAMIC_MINOR,/* dynamic allocation */
-        .name = "intel_sst",/* /dev/intel_sst */
-        .fops = &intel_sst_fops
-};
-
-
-static struct miscdevice lpe_ctrl = {
-        .minor = MISC_DYNAMIC_MINOR,/* dynamic allocation */
-        .name = "intel_sst_ctrl",/* /dev/intel_sst_ctrl */
-        .fops = &intel_sst_fops_cntrl
-};
-
-/**
-* intel_sst_interrupt - Interrupt service routine for SST
-*
-* @irq: irq number of interrupt
-* @context: pointer to device structre
-*
-* This function is called by OS when SST device raises
-* an interrupt. This will be result of write in IPC register
-* Source can be busy or done interrupt
-*/
-static irqreturn_t intel_sst_interrupt(int irq, void *context)
-{
-        union interrupt_reg isr;
-        union ipc_header header;
-        union interrupt_reg imr;
-        struct intel_sst_drv *drv = (struct intel_sst_drv *) context;
-        unsigned int size = 0, str_id;
-        struct stream_info *stream ;
-
-        /* Do not handle interrupt in suspended state */
-        if (drv->sst_state == SST_SUSPENDED)
-                return IRQ_NONE;
-        /* Interrupt arrived, check src */
-        isr.full = sst_shim_read(drv->shim, SST_ISRX);
-
-        if (isr.part.busy_interrupt) {
-                header.full = sst_shim_read(drv->shim, SST_IPCD);
-                if (header.part.msg_id == IPC_SST_PERIOD_ELAPSED) {
-                        sst_clear_interrupt();
-                        str_id = header.part.str_id;
-                        stream = &sst_drv_ctx->streams[str_id];
-                        if (stream->period_elapsed)
-                                stream->period_elapsed(stream->pcm_substream);
-                        return IRQ_HANDLED;
-                }
-                if (header.part.large)
-                        size = header.part.data;
-                if (header.part.msg_id & REPLY_MSG) {
-                        sst_drv_ctx->ipc_process_msg.header = header;
-                        memcpy_fromio(sst_drv_ctx->ipc_process_msg.mailbox,
-                                drv->mailbox + SST_MAILBOX_RCV, size);
-                        queue_work(sst_drv_ctx->process_msg_wq,
-                                        &sst_drv_ctx->ipc_process_msg.wq);
-                } else {
-                        sst_drv_ctx->ipc_process_reply.header = header;
-                        memcpy_fromio(sst_drv_ctx->ipc_process_reply.mailbox,
-                                drv->mailbox + SST_MAILBOX_RCV, size);
-                        queue_work(sst_drv_ctx->process_reply_wq,
-                                        &sst_drv_ctx->ipc_process_reply.wq);
-                }
-                /* mask busy inetrrupt */
-                imr.full = sst_shim_read(drv->shim, SST_IMRX);
-                imr.part.busy_interrupt = 1;
-                sst_shim_write(sst_drv_ctx->shim, SST_IMRX, imr.full);
-                return IRQ_HANDLED;
-        } else if (isr.part.done_interrupt) {
-                /* Clear done bit */
-                header.full = sst_shim_read(drv->shim, SST_IPCX);
-                header.part.done = 0;
-                sst_shim_write(sst_drv_ctx->shim, SST_IPCX, header.full);
-                /* write 1 to clear status register */;
-                isr.part.done_interrupt = 1;
-                /* dummy register for shim workaround */
-                sst_shim_write(sst_drv_ctx->shim, SST_ISRX, isr.full);
-                queue_work(sst_drv_ctx->post_msg_wq,
-                        &sst_drv_ctx->ipc_post_msg.wq);
-                return IRQ_HANDLED;
-        } else
-                return IRQ_NONE;
-
-}
-
-
-/*
-* intel_sst_probe - PCI probe function
-*
-* @pci: PCI device structure
-* @pci_id: PCI device ID structure
-*
-* This function is called by OS when a device is found
-* This enables the device, interrupt etc
-*/
-static int __devinit intel_sst_probe(struct pci_dev *pci,
-                        const struct pci_device_id *pci_id)
-{
-        int i, ret = 0;
-
-        pr_debug("Probe for DID %x\n", pci->device);
-        mutex_lock(&drv_ctx_lock);
-        if (sst_drv_ctx) {
-                pr_err("Only one sst handle is supported\n");
-                mutex_unlock(&drv_ctx_lock);
-                return -EBUSY;
-        }
-
-        sst_drv_ctx = kzalloc(sizeof(*sst_drv_ctx), GFP_KERNEL);
-        if (!sst_drv_ctx) {
-                pr_err("malloc fail\n");
-                mutex_unlock(&drv_ctx_lock);
-                return -ENOMEM;
-        }
-        mutex_unlock(&drv_ctx_lock);
-
-        sst_drv_ctx->pci_id = pci->device;
-
-        mutex_init(&sst_drv_ctx->stream_lock);
-        mutex_init(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->pmic_state = SND_MAD_UN_INIT;
-
-        sst_drv_ctx->stream_cnt = 0;
-        sst_drv_ctx->encoded_cnt = 0;
-        sst_drv_ctx->am_cnt = 0;
-        sst_drv_ctx->pb_streams = 0;
-        sst_drv_ctx->cp_streams = 0;
-        sst_drv_ctx->unique_id = 0;
-        sst_drv_ctx->pmic_port_instance = SST_DEFAULT_PMIC_PORT;
-
-        INIT_LIST_HEAD(&sst_drv_ctx->ipc_dispatch_list);
-        INIT_WORK(&sst_drv_ctx->ipc_post_msg.wq, sst_post_message);
-        INIT_WORK(&sst_drv_ctx->ipc_process_msg.wq, sst_process_message);
-        INIT_WORK(&sst_drv_ctx->ipc_process_reply.wq, sst_process_reply);
-        INIT_WORK(&sst_drv_ctx->mad_ops.wq, sst_process_mad_ops);
-        init_waitqueue_head(&sst_drv_ctx->wait_queue);
-
-        sst_drv_ctx->mad_wq = create_workqueue("sst_mad_wq");
-        if (!sst_drv_ctx->mad_wq)
-                goto do_free_drv_ctx;
-        sst_drv_ctx->post_msg_wq = create_workqueue("sst_post_msg_wq");
-        if (!sst_drv_ctx->post_msg_wq)
-                goto free_mad_wq;
-        sst_drv_ctx->process_msg_wq = create_workqueue("sst_process_msg_wqq");
-        if (!sst_drv_ctx->process_msg_wq)
-                goto free_post_msg_wq;
-        sst_drv_ctx->process_reply_wq = create_workqueue("sst_proces_reply_wq");
-        if (!sst_drv_ctx->process_reply_wq)
-                goto free_process_msg_wq;
-
-        for (i = 0; i < MAX_ACTIVE_STREAM; i++) {
-                sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-                sst_drv_ctx->alloc_block[i].ops_block.condition = false;
-        }
-        spin_lock_init(&sst_drv_ctx->list_spin_lock);
-
-        sst_drv_ctx->max_streams = pci_id->driver_data;
-        pr_debug("Got drv data max stream %d\n",
-                                sst_drv_ctx->max_streams);
-        for (i = 1; i <= sst_drv_ctx->max_streams; i++) {
-                struct stream_info *stream = &sst_drv_ctx->streams[i];
-                INIT_LIST_HEAD(&stream->bufs);
-                mutex_init(&stream->lock);
-                spin_lock_init(&stream->pcm_lock);
-        }
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
-                sst_drv_ctx->mmap_mem = NULL;
-                sst_drv_ctx->mmap_len = SST_MMAP_PAGES * PAGE_SIZE;
-                while (sst_drv_ctx->mmap_len > 0) {
-                        sst_drv_ctx->mmap_mem =
-                                kzalloc(sst_drv_ctx->mmap_len, GFP_KERNEL);
-                        if (sst_drv_ctx->mmap_mem) {
-                                pr_debug("Got memory %p size 0x%x\n",
-                                        sst_drv_ctx->mmap_mem,
-                                        sst_drv_ctx->mmap_len);
-                                break;
-                        }
-                        if (sst_drv_ctx->mmap_len < (SST_MMAP_STEP*PAGE_SIZE)) {
-                                pr_err("mem alloc fail...abort!!\n");
-                                ret = -ENOMEM;
-                                goto free_process_reply_wq;
-                        }
-                        sst_drv_ctx->mmap_len -= (SST_MMAP_STEP * PAGE_SIZE);
-                        pr_debug("mem alloc failed...trying %d\n",
-                                                sst_drv_ctx->mmap_len);
-                }
-        }
-
-        /* Init the device */
-        ret = pci_enable_device(pci);
-        if (ret) {
-                pr_err("device can't be enabled\n");
-                goto do_free_mem;
-        }
-        sst_drv_ctx->pci = pci_dev_get(pci);
-        ret = pci_request_regions(pci, SST_DRV_NAME);
-        if (ret)
-                goto do_disable_device;
-        /* map registers */
-        /* SST Shim */
-        sst_drv_ctx->shim_phy_add = pci_resource_start(pci, 1);
-        sst_drv_ctx->shim = pci_ioremap_bar(pci, 1);
-        if (!sst_drv_ctx->shim)
-                goto do_release_regions;
-        pr_debug("SST Shim Ptr %p\n", sst_drv_ctx->shim);
-
-        /* Shared SRAM */
-        sst_drv_ctx->mailbox = pci_ioremap_bar(pci, 2);
-        if (!sst_drv_ctx->mailbox)
-                goto do_unmap_shim;
-        pr_debug("SRAM Ptr %p\n", sst_drv_ctx->mailbox);
-
-        /* IRAM */
-        sst_drv_ctx->iram = pci_ioremap_bar(pci, 3);
-        if (!sst_drv_ctx->iram)
-                goto do_unmap_sram;
-        pr_debug("IRAM Ptr %p\n", sst_drv_ctx->iram);
-
-        /* DRAM */
-        sst_drv_ctx->dram = pci_ioremap_bar(pci, 4);
-        if (!sst_drv_ctx->dram)
-                goto do_unmap_iram;
-        pr_debug("DRAM Ptr %p\n", sst_drv_ctx->dram);
-
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_UN_INIT;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        /* Register the ISR */
-        ret = request_irq(pci->irq, intel_sst_interrupt,
-                IRQF_SHARED, SST_DRV_NAME, sst_drv_ctx);
-        if (ret)
-                goto do_unmap_dram;
-        pr_debug("Registered IRQ 0x%x\n", pci->irq);
-
-        /*Register LPE Control as misc driver*/
-        ret = misc_register(&lpe_ctrl);
-        if (ret) {
-                pr_err("couldn't register control device\n");
-                goto do_free_irq;
-        }
-
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
-                ret = misc_register(&lpe_dev);
-                if (ret) {
-                        pr_err("couldn't register LPE device\n");
-                        goto do_free_misc;
-                }
-        } else if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID) {
-                u32 csr;
-
-                /*allocate mem for fw context save during suspend*/
-                sst_drv_ctx->fw_cntx = kzalloc(FW_CONTEXT_MEM, GFP_KERNEL);
-                if (!sst_drv_ctx->fw_cntx) {
-                        ret = -ENOMEM;
-                        goto do_free_misc;
-                }
-                /*setting zero as that is valid mem to restore*/
-                sst_drv_ctx->fw_cntx_size = 0;
-
-                /*set lpe start clock and ram size*/
-                csr = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-                csr |= 0x30060; /*remove the clock ratio after fw fix*/
-                sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr);
-        }
-        sst_drv_ctx->lpe_stalled = 0;
-        pci_set_drvdata(pci, sst_drv_ctx);
-        pm_runtime_allow(&pci->dev);
-        pm_runtime_put_noidle(&pci->dev);
-        pr_debug("...successfully done!!!\n");
-        return ret;
-
-do_free_misc:
-        misc_deregister(&lpe_ctrl);
-do_free_irq:
-        free_irq(pci->irq, sst_drv_ctx);
-do_unmap_dram:
-        iounmap(sst_drv_ctx->dram);
-do_unmap_iram:
-        iounmap(sst_drv_ctx->iram);
-do_unmap_sram:
-        iounmap(sst_drv_ctx->mailbox);
-do_unmap_shim:
-        iounmap(sst_drv_ctx->shim);
-do_release_regions:
-        pci_release_regions(pci);
-do_disable_device:
-        pci_disable_device(pci);
-do_free_mem:
-        kfree(sst_drv_ctx->mmap_mem);
-free_process_reply_wq:
-        destroy_workqueue(sst_drv_ctx->process_reply_wq);
-free_process_msg_wq:
-        destroy_workqueue(sst_drv_ctx->process_msg_wq);
-free_post_msg_wq:
-        destroy_workqueue(sst_drv_ctx->post_msg_wq);
-free_mad_wq:
-        destroy_workqueue(sst_drv_ctx->mad_wq);
-do_free_drv_ctx:
-        kfree(sst_drv_ctx);
-        sst_drv_ctx = NULL;
-        pr_err("Probe failed with %d\n", ret);
-        return ret;
-}
-
-/**
-* intel_sst_remove - PCI remove function
-*
-* @pci: PCI device structure
-*
-* This function is called by OS when a device is unloaded
-* This frees the interrupt etc
-*/
-static void __devexit intel_sst_remove(struct pci_dev *pci)
-{
-        pm_runtime_get_noresume(&pci->dev);
-        pm_runtime_forbid(&pci->dev);
-        pci_dev_put(sst_drv_ctx->pci);
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_UN_INIT;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        misc_deregister(&lpe_ctrl);
-        free_irq(pci->irq, sst_drv_ctx);
-        iounmap(sst_drv_ctx->dram);
-        iounmap(sst_drv_ctx->iram);
-        iounmap(sst_drv_ctx->mailbox);
-        iounmap(sst_drv_ctx->shim);
-        sst_drv_ctx->pmic_state = SND_MAD_UN_INIT;
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
-                misc_deregister(&lpe_dev);
-                kfree(sst_drv_ctx->mmap_mem);
-        } else
-                kfree(sst_drv_ctx->fw_cntx);
-        flush_scheduled_work();
-        destroy_workqueue(sst_drv_ctx->process_reply_wq);
-        destroy_workqueue(sst_drv_ctx->process_msg_wq);
-        destroy_workqueue(sst_drv_ctx->post_msg_wq);
-        destroy_workqueue(sst_drv_ctx->mad_wq);
-        kfree(pci_get_drvdata(pci));
-        sst_drv_ctx = NULL;
-        pci_release_regions(pci);
-        pci_disable_device(pci);
-        pci_set_drvdata(pci, NULL);
-}
-
-void sst_save_dsp_context(void)
-{
-        struct snd_sst_ctxt_params fw_context;
-        unsigned int pvt_id, i;
-        struct ipc_post *msg = NULL;
-
-        /*check cpu type*/
-        if (sst_drv_ctx->pci_id != SST_MFLD_PCI_ID)
-                return;
-                /*not supported for rest*/
-        if (sst_drv_ctx->sst_state != SST_FW_RUNNING) {
-                pr_debug("fw not running no context save ...\n");
-                return;
-        }
-
-        /*send msg to fw*/
-        if (sst_create_large_msg(&msg))
-                return;
-        pvt_id = sst_assign_pvt_id(sst_drv_ctx);
-        i = sst_get_block_stream(sst_drv_ctx);
-        sst_drv_ctx->alloc_block[i].sst_id = pvt_id;
-        sst_fill_header(&msg->header, IPC_IA_GET_FW_CTXT, 1, pvt_id);
-        msg->header.part.data = sizeof(fw_context) + sizeof(u32);
-        fw_context.address = virt_to_phys((void *)sst_drv_ctx->fw_cntx);
-        fw_context.size = FW_CONTEXT_MEM;
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32),
-                                &fw_context, sizeof(fw_context));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        /*wait for reply*/
-        if (sst_wait_timeout(sst_drv_ctx, &sst_drv_ctx->alloc_block[i]))
-                pr_debug("err fw context save timeout  ...\n");
-        sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-        pr_debug("fw context saved  ...\n");
-        return;
-}
-
-/* Power Management */
-/*
-* intel_sst_suspend - PCI suspend function
-*
-* @pci: PCI device structure
-* @state: PM message
-*
-* This function is called by OS when a power event occurs
-*/
-int intel_sst_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        union config_status_reg csr;
-
-        pr_debug("intel_sst_suspend called\n");
-
-        if (sst_drv_ctx->stream_cnt) {
-                pr_err("active streams,not able to suspend\n");
-                return -EBUSY;
-        }
-        /*save fw context*/
-        sst_save_dsp_context();
-        /*Assert RESET on LPE Processor*/
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.full = csr.full | 0x2;
-        /* Move the SST state to Suspended */
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_SUSPENDED;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        pci_set_drvdata(pci, sst_drv_ctx);
-        pci_save_state(pci);
-        pci_disable_device(pci);
-        pci_set_power_state(pci, PCI_D3hot);
-        return 0;
-}
-
-/**
-* intel_sst_resume - PCI resume function
-*
-* @pci: PCI device structure
-*
-* This function is called by OS when a power event occurs
-*/
-int intel_sst_resume(struct pci_dev *pci)
-{
-        int ret = 0;
-
-        pr_debug("intel_sst_resume called\n");
-        if (sst_drv_ctx->sst_state != SST_SUSPENDED) {
-                pr_err("SST is not in suspended state\n");
-                return 0;
-        }
-        sst_drv_ctx = pci_get_drvdata(pci);
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        ret = pci_enable_device(pci);
-        if (ret)
-                pr_err("device can't be enabled\n");
-
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_UN_INIT;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        return 0;
-}
-
-/* The runtime_suspend/resume is pretty much similar to the legacy
- * suspend/resume with the noted exception below:
- * The PCI core takes care of taking the system through D3hot and
- * restoring it back to D0 and so there is no need to duplicate
- * that here.
- */
-static int intel_sst_runtime_suspend(struct device *dev)
-{
-        union config_status_reg csr;
-
-        pr_debug("intel_sst_runtime_suspend called\n");
-        if (sst_drv_ctx->stream_cnt) {
-                pr_err("active streams,not able to suspend\n");
-                return -EBUSY;
-        }
-        /*save fw context*/
-        sst_save_dsp_context();
-        /*Assert RESET on LPE Processor*/
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.full = csr.full | 0x2;
-        /* Move the SST state to Suspended */
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_SUSPENDED;
-
-        /* Only needed by Medfield */
-        if (sst_drv_ctx->pci_id != SST_MRST_PCI_ID)
-                sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        return 0;
-}
-
-static int intel_sst_runtime_resume(struct device *dev)
-{
-
-        pr_debug("intel_sst_runtime_resume called\n");
-        if (sst_drv_ctx->sst_state != SST_SUSPENDED) {
-                pr_err("SST is not in suspended state\n");
-                return 0;
-        }
-
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_UN_INIT;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        return 0;
-}
-
-static int intel_sst_runtime_idle(struct device *dev)
-{
-        pr_debug("runtime_idle called\n");
-        if (sst_drv_ctx->stream_cnt == 0 && sst_drv_ctx->am_cnt == 0)
-                pm_schedule_suspend(dev, SST_SUSPEND_DELAY);
-        return -EBUSY;
-}
-
-static const struct dev_pm_ops intel_sst_pm = {
-        .runtime_suspend = intel_sst_runtime_suspend,
-        .runtime_resume = intel_sst_runtime_resume,
-        .runtime_idle = intel_sst_runtime_idle,
-};
-
-/* PCI Routines */
-static struct pci_device_id intel_sst_ids[] = {
-        { PCI_VDEVICE(INTEL, SST_MRST_PCI_ID), 3},
-        { PCI_VDEVICE(INTEL, SST_MFLD_PCI_ID), 6},
-        { 0, }
-};
-MODULE_DEVICE_TABLE(pci, intel_sst_ids);
-
-static struct pci_driver driver = {
-        .name = SST_DRV_NAME,
-        .id_table = intel_sst_ids,
-        .probe = intel_sst_probe,
-        .remove = __devexit_p(intel_sst_remove),
-#ifdef CONFIG_PM
-        .suspend = intel_sst_suspend,
-        .resume = intel_sst_resume,
-        .driver = {
-                .pm = &intel_sst_pm,
-        },
-#endif
-};
-
-/**
-* intel_sst_init - Module init function
-*
-* Registers with PCI
-* Registers with /dev
-* Init all data strutures
-*/
-static int __init intel_sst_init(void)
-{
-        /* Init all variables, data structure etc....*/
-        int ret = 0;
-        pr_debug("INFO: ******** SST DRIVER loading.. Ver: %s\n",
-                                       SST_DRIVER_VERSION);
-
-        mutex_init(&drv_ctx_lock);
-        /* Register with PCI */
-        ret = pci_register_driver(&driver);
-        if (ret)
-                pr_err("PCI register failed\n");
-        return ret;
-}
-
-/**
-* intel_sst_exit - Module exit function
-*
-* Unregisters with PCI
-* Unregisters with /dev
-* Frees all data strutures
-*/
-static void __exit intel_sst_exit(void)
-{
-        pci_unregister_driver(&driver);
-
-        pr_debug("driver unloaded\n");
-        sst_drv_ctx = NULL;
-        return;
-}
-
-module_init(intel_sst_init);
-module_exit(intel_sst_exit);
diff --git a/drivers/staging/intel_sst/intel_sst.h b/drivers/staging/intel_sst/intel_sst.h
deleted file mode 100644
index 4ad2829105a7..000000000000
--- a/drivers/staging/intel_sst/intel_sst.h
+++ /dev/null
@@ -1,162 +0,0 @@
-#ifndef __INTEL_SST_H__
-#define __INTEL_SST_H__
-/*
- *  intel_sst.h - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This driver exposes the audio engine functionalities to the ALSA
- *      and middleware.
- *  This file is shared between the SST and MAD drivers
- */
-#include "intel_sst_ioctl.h"
-#include <sound/jack.h>
-
-#define SST_CARD_NAMES "intel_mid_card"
-
-#define MFLD_MAX_HW_CH 4
-/* control list Pmic & Lpe */
-/* Input controls */
-enum port_status {
-        ACTIVATE = 1,
-        DEACTIVATE,
-};
-
-/* Card states */
-enum sst_card_states {
-        SND_CARD_UN_INIT = 0,
-        SND_CARD_INIT_DONE,
-};
-
-enum sst_controls {
-        SST_SND_ALLOC =                 0x1000,
-        SST_SND_PAUSE =                 0x1001,
-        SST_SND_RESUME =                0x1002,
-        SST_SND_DROP =                  0x1003,
-        SST_SND_FREE =                  0x1004,
-        SST_SND_BUFFER_POINTER =        0x1005,
-        SST_SND_STREAM_INIT =           0x1006,
-        SST_SND_START    =              0x1007,
-        SST_SND_STREAM_PROCESS =        0x1008,
-        SST_MAX_CONTROLS =              0x1008,
-        SST_CONTROL_BASE =              0x1000,
-        SST_ENABLE_RX_TIME_SLOT =       0x1009,
-};
-
-enum SND_CARDS {
-        SND_FS = 0,
-        SND_MX,
-        SND_NC,
-        SND_MSIC
-};
-
-struct pcm_stream_info {
-        int str_id;
-        void *mad_substream;
-        void (*period_elapsed) (void *mad_substream);
-        unsigned long long buffer_ptr;
-        int sfreq;
-};
-
-struct snd_pmic_ops {
-        int card_status;
-        int master_mute;
-        int num_channel;
-        int input_dev_id;
-        int mute_status;
-        struct mutex lock;
-        int pb_on, pbhs_on;
-        int cap_on;
-        int output_dev_id;
-        int lineout_dev_id, line_out_names_cnt;
-        int prev_lineout_dev_id;
-        bool jack_interrupt_status;
-        int (*set_input_dev) (u8 value);
-        int (*set_output_dev) (u8 value);
-        int (*set_lineout_dev) (u8 value);
-        int (*set_mute) (int dev_id, u8 value);
-        int (*get_mute) (int dev_id, u8 *value);
-
-        int (*set_vol) (int dev_id, int value);
-        int (*get_vol) (int dev_id, int *value);
-
-        int (*init_card) (void);
-        int (*set_pcm_audio_params)
-                (int sfreq, int word_size , int num_channel);
-        int (*set_pcm_voice_params) (void);
-        int (*set_voice_port) (int status);
-        int (*set_audio_port) (int status);
-
-        int (*power_up_pmic_pb) (unsigned int port);
-        int (*power_up_pmic_cp) (unsigned int port);
-        int (*power_down_pmic_pb) (unsigned int device);
-        int (*power_down_pmic_cp) (unsigned int device);
-        int (*power_down_pmic) (void);
-        void (*pmic_irq_cb) (void *cb_data, u8 value);
-        void (*pmic_irq_enable)(void *data);
-        int (*pmic_jack_enable) (void);
-        int (*pmic_get_mic_bias)(void *intelmaddata);
-        int (*pmic_set_headset_state)(int state);
-
-        unsigned int hw_dmic_map[MFLD_MAX_HW_CH];
-        unsigned int available_dmics;
-        int (*set_hw_dmic_route) (u8 index);
-
-        int gpio_amp;
-};
-
-extern void sst_mad_send_jack_report(struct snd_jack *jack,
-                                     int buttonpressevent,
-                                     int status);
-
-
-int intemad_set_headset_state(int state);
-int intelmad_get_mic_bias(void);
-
-struct intel_sst_pcm_control {
-        int (*open) (struct snd_sst_params *str_param);
-        int (*device_control) (int cmd, void *arg);
-        int (*close) (unsigned int str_id);
-};
-struct intel_sst_card_ops {
-        char *module_name;
-        unsigned int  vendor_id;
-        struct intel_sst_pcm_control *pcm_control;
-        struct snd_pmic_ops *scard_ops;
-};
-
-/* modified for generic access */
-struct sc_reg_access {
-        u16 reg_addr;
-        u8 value;
-        u8 mask;
-};
-enum sc_reg_access_type {
-        PMIC_READ = 0,
-        PMIC_WRITE,
-        PMIC_READ_MODIFY,
-};
-
-int register_sst_card(struct intel_sst_card_ops *card);
-void unregister_sst_card(struct intel_sst_card_ops *card);
-#endif /* __INTEL_SST_H__ */
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c
deleted file mode 100644
index 93b41a284d83..000000000000
--- a/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ /dev/null
@@ -1,1460 +0,0 @@
-/*
- *  intel_sst_interface.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *  Harsha Priya <priya.harsha@intel.com>
- *  Dharageswari R <dharageswari.r@intel.com>
- *  Jeeja KP <jeeja.kp@intel.com>
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *  This driver exposes the audio engine functionalities to the ALSA
- *      and middleware.
- *  Upper layer interfaces (MAD driver, MMF) to SST driver
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/fs.h>
-#include <linux/uio.h>
-#include <linux/aio.h>
-#include <linux/uaccess.h>
-#include <linux/firmware.h>
-#include <linux/pm_runtime.h>
-#include <linux/ioctl.h>
-#ifdef CONFIG_MRST_RAR_HANDLER
-#include <linux/rar_register.h>
-#include "../../../drivers/staging/memrar/memrar.h"
-#endif
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-#define AM_MODULE 1
-#define STREAM_MODULE 0
-
-
-/**
-* intel_sst_check_device - checks SST device
-*
-* This utility function checks the state of SST device and downlaods FW if
-* not done, or resumes the device if suspended
-*/
-
-static int intel_sst_check_device(void)
-{
-        int retval = 0;
-        if (sst_drv_ctx->pmic_state != SND_MAD_INIT_DONE) {
-                pr_warn("Sound card not available\n");
-                return -EIO;
-        }
-        if (sst_drv_ctx->sst_state == SST_SUSPENDED) {
-                pr_debug("Resuming from Suspended state\n");
-                retval = intel_sst_resume(sst_drv_ctx->pci);
-                if (retval) {
-                        pr_debug("Resume Failed= %#x,abort\n", retval);
-                        return retval;
-                }
-        }
-
-        if (sst_drv_ctx->sst_state == SST_UN_INIT) {
-                /* FW is not downloaded */
-                retval = sst_download_fw();
-                if (retval)
-                        return -ENODEV;
-                if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
-                        retval = sst_drv_ctx->rx_time_slot_status;
-                        if (retval != RX_TIMESLOT_UNINIT
-                                        && sst_drv_ctx->pmic_vendor != SND_NC)
-                                sst_enable_rx_timeslot(retval);
-                }
-        }
-        return 0;
-}
-
-/**
- * intel_sst_open - opens a handle to driver
- *
- * @i_node:     inode structure
- * @file_ptr:pointer to file
- *
- * This function is called by OS when a user space component
- * tries to get a driver handle. Only one handle at a time
- * will be allowed
- */
-int intel_sst_open(struct inode *i_node, struct file *file_ptr)
-{
-        unsigned int retval;
-
-        mutex_lock(&sst_drv_ctx->stream_lock);
-        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
-        retval = intel_sst_check_device();
-        if (retval) {
-                pm_runtime_put(&sst_drv_ctx->pci->dev);
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-                return retval;
-        }
-
-        if (sst_drv_ctx->encoded_cnt < MAX_ENC_STREAM) {
-                struct ioctl_pvt_data *data =
-                        kzalloc(sizeof(struct ioctl_pvt_data), GFP_KERNEL);
-                if (!data) {
-                        pm_runtime_put(&sst_drv_ctx->pci->dev);
-                        mutex_unlock(&sst_drv_ctx->stream_lock);
-                        return -ENOMEM;
-                }
-
-                sst_drv_ctx->encoded_cnt++;
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-                data->pvt_id = sst_assign_pvt_id(sst_drv_ctx);
-                data->str_id = 0;
-                file_ptr->private_data = (void *)data;
-                pr_debug("pvt_id handle = %d!\n", data->pvt_id);
-        } else {
-                retval = -EUSERS;
-                pm_runtime_put(&sst_drv_ctx->pci->dev);
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-        }
-        return retval;
-}
-
-/**
- * intel_sst_open_cntrl - opens a handle to driver
- *
- * @i_node:     inode structure
- * @file_ptr:pointer to file
- *
- * This function is called by OS when a user space component
- * tries to get a driver handle to /dev/intel_sst_control.
- * Only one handle at a time will be allowed
- * This is for control operations only
- */
-int intel_sst_open_cntrl(struct inode *i_node, struct file *file_ptr)
-{
-        unsigned int retval;
-
-        /* audio manager open */
-        mutex_lock(&sst_drv_ctx->stream_lock);
-        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
-        retval = intel_sst_check_device();
-        if (retval) {
-                pm_runtime_put(&sst_drv_ctx->pci->dev);
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-                return retval;
-        }
-
-        if (sst_drv_ctx->am_cnt < MAX_AM_HANDLES) {
-                sst_drv_ctx->am_cnt++;
-                pr_debug("AM handle opened...\n");
-                file_ptr->private_data = NULL;
-        } else {
-                retval = -EACCES;
-                pm_runtime_put(&sst_drv_ctx->pci->dev);
-        }
-
-        mutex_unlock(&sst_drv_ctx->stream_lock);
-        return retval;
-}
-
-/**
- * intel_sst_release - releases a handle to driver
- *
- * @i_node:     inode structure
- * @file_ptr:   pointer to file
- *
- * This function is called by OS when a user space component
- * tries to release a driver handle.
- */
-int intel_sst_release(struct inode *i_node, struct file *file_ptr)
-{
-        struct ioctl_pvt_data *data = file_ptr->private_data;
-
-        pr_debug("Release called, closing app handle\n");
-        mutex_lock(&sst_drv_ctx->stream_lock);
-        sst_drv_ctx->encoded_cnt--;
-        sst_drv_ctx->stream_cnt--;
-        pm_runtime_put(&sst_drv_ctx->pci->dev);
-        mutex_unlock(&sst_drv_ctx->stream_lock);
-        free_stream_context(data->str_id);
-        kfree(data);
-        return 0;
-}
-
-int intel_sst_release_cntrl(struct inode *i_node, struct file *file_ptr)
-{
-        /* audio manager close */
-        mutex_lock(&sst_drv_ctx->stream_lock);
-        sst_drv_ctx->am_cnt--;
-        pm_runtime_put(&sst_drv_ctx->pci->dev);
-        mutex_unlock(&sst_drv_ctx->stream_lock);
-        pr_debug("AM handle closed\n");
-        return 0;
-}
-
-/**
-* intel_sst_mmap - mmaps a kernel buffer to user space for copying data
-*
-* @vma:         vm area structure instance
-* @file_ptr:    pointer to file
-*
-* This function is called by OS when a user space component
-* tries to get mmap memory from driver
-*/
-int intel_sst_mmap(struct file *file_ptr, struct vm_area_struct *vma)
-{
-        int retval, length;
-        struct ioctl_pvt_data *data =
-                (struct ioctl_pvt_data *)file_ptr->private_data;
-        int str_id = data->str_id;
-        void *mem_area;
-
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return -EINVAL;
-
-        length = vma->vm_end - vma->vm_start;
-        pr_debug("called for stream %d length 0x%x\n", str_id, length);
-
-        if (length > sst_drv_ctx->mmap_len)
-                return -ENOMEM;
-        if (!sst_drv_ctx->mmap_mem)
-                return -EIO;
-
-        /* round it up to the page boundary  */
-        /*mem_area = (void *)((((unsigned long)sst_drv_ctx->mmap_mem)
-                                + PAGE_SIZE - 1) & PAGE_MASK);*/
-        mem_area = (void *) PAGE_ALIGN((unsigned int) sst_drv_ctx->mmap_mem);
-
-        /* map the whole physically contiguous area in one piece  */
-        retval = remap_pfn_range(vma,
-                        vma->vm_start,
-                        virt_to_phys((void *)mem_area) >> PAGE_SHIFT,
-                        length,
-                        vma->vm_page_prot);
-        if (retval)
-                sst_drv_ctx->streams[str_id].mmapped = false;
-        else
-                sst_drv_ctx->streams[str_id].mmapped = true;
-
-        pr_debug("mmap ret 0x%x\n", retval);
-        return retval;
-}
-
-/* sets mmap data buffers to play/capture*/
-static int intel_sst_mmap_play_capture(u32 str_id,
-                struct snd_sst_mmap_buffs *mmap_buf)
-{
-        struct sst_stream_bufs *bufs;
-        int retval, i;
-        struct stream_info *stream;
-        struct snd_sst_mmap_buff_entry *buf_entry;
-        struct snd_sst_mmap_buff_entry *tmp_buf;
-
-        pr_debug("called for str_id %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return -EINVAL;
-
-        stream = &sst_drv_ctx->streams[str_id];
-        if (stream->mmapped != true)
-                return -EIO;
-
-        if (stream->status == STREAM_UN_INIT ||
-                stream->status == STREAM_DECODE) {
-                return -EBADRQC;
-        }
-        stream->curr_bytes = 0;
-        stream->cumm_bytes = 0;
-
-        tmp_buf = kcalloc(mmap_buf->entries, sizeof(*tmp_buf), GFP_KERNEL);
-        if (!tmp_buf)
-                return -ENOMEM;
-        if (copy_from_user(tmp_buf, (void __user *)mmap_buf->buff,
-                        mmap_buf->entries * sizeof(*tmp_buf))) {
-                retval = -EFAULT;
-                goto out_free;
-        }
-
-        pr_debug("new buffers count %d status %d\n",
-                        mmap_buf->entries, stream->status);
-        buf_entry = tmp_buf;
-        for (i = 0; i < mmap_buf->entries; i++) {
-                bufs = kzalloc(sizeof(*bufs), GFP_KERNEL);
-                if (!bufs) {
-                        retval = -ENOMEM;
-                        goto out_free;
-                }
-                bufs->size = buf_entry->size;
-                bufs->offset = buf_entry->offset;
-                bufs->addr = sst_drv_ctx->mmap_mem;
-                bufs->in_use = false;
-                buf_entry++;
-                /* locking here */
-                mutex_lock(&stream->lock);
-                list_add_tail(&bufs->node, &stream->bufs);
-                mutex_unlock(&stream->lock);
-        }
-
-        mutex_lock(&stream->lock);
-        stream->data_blk.condition = false;
-        stream->data_blk.ret_code = 0;
-        if (stream->status == STREAM_INIT &&
-                        stream->prev != STREAM_UN_INIT &&
-                        stream->need_draining != true) {
-                stream->prev = stream->status;
-                stream->status = STREAM_RUNNING;
-                if (stream->ops == STREAM_OPS_PLAYBACK) {
-                        if (sst_play_frame(str_id) < 0) {
-                                pr_warn("play frames fail\n");
-                                mutex_unlock(&stream->lock);
-                                retval = -EIO;
-                                goto out_free;
-                        }
-                } else if (stream->ops == STREAM_OPS_CAPTURE) {
-                        if (sst_capture_frame(str_id) < 0) {
-                                pr_warn("capture frame fail\n");
-                                mutex_unlock(&stream->lock);
-                                retval = -EIO;
-                                goto out_free;
-                        }
-                }
-        }
-        mutex_unlock(&stream->lock);
-        /* Block the call for reply */
-        if (!list_empty(&stream->bufs)) {
-                stream->data_blk.on = true;
-                retval = sst_wait_interruptible(sst_drv_ctx,
-                                        &stream->data_blk);
-        }
-
-        if (retval >= 0)
-                retval = stream->cumm_bytes;
-        pr_debug("end of play/rec ioctl bytes = %d!!\n", retval);
-
-out_free:
-        kfree(tmp_buf);
-        return retval;
-}
-
-/*sets user data buffers to play/capture*/
-static int intel_sst_play_capture(struct stream_info *stream, int str_id)
-{
-        int retval;
-
-        stream->data_blk.ret_code = 0;
-        stream->data_blk.on = true;
-        stream->data_blk.condition = false;
-
-        mutex_lock(&stream->lock);
-        if (stream->status == STREAM_INIT && stream->prev != STREAM_UN_INIT) {
-                /* stream is started */
-                stream->prev = stream->status;
-                stream->status = STREAM_RUNNING;
-        }
-
-        if (stream->status == STREAM_INIT && stream->prev == STREAM_UN_INIT) {
-                /* stream is not started yet */
-                pr_debug("Stream isn't in started state %d, prev %d\n",
-                        stream->status, stream->prev);
-        } else if ((stream->status == STREAM_RUNNING ||
-                        stream->status == STREAM_PAUSED) &&
-                        stream->need_draining != true) {
-                /* stream is started */
-                if (stream->ops == STREAM_OPS_PLAYBACK ||
-                                stream->ops == STREAM_OPS_PLAYBACK_DRM) {
-                        if (sst_play_frame(str_id) < 0) {
-                                pr_warn("play frames failed\n");
-                                mutex_unlock(&stream->lock);
-                                return -EIO;
-                        }
-                } else if (stream->ops == STREAM_OPS_CAPTURE) {
-                        if (sst_capture_frame(str_id) < 0) {
-                                pr_warn("capture frames failed\n");
-                                mutex_unlock(&stream->lock);
-                                return -EIO;
-                        }
-                }
-        } else {
-                mutex_unlock(&stream->lock);
-                return -EIO;
-        }
-        mutex_unlock(&stream->lock);
-        /* Block the call for reply */
-
-        retval = sst_wait_interruptible(sst_drv_ctx, &stream->data_blk);
-        if (retval) {
-                stream->status = STREAM_INIT;
-                pr_debug("wait returned error...\n");
-        }
-        return retval;
-}
-
-/* fills kernel list with buffer addresses for SST DSP driver to process*/
-static int snd_sst_fill_kernel_list(struct stream_info *stream,
-                        const struct iovec *iovec, unsigned long nr_segs,
-                        struct list_head *copy_to_list)
-{
-        struct sst_stream_bufs *stream_bufs;
-        unsigned long index, mmap_len;
-        unsigned char __user *bufp;
-        unsigned long size, copied_size;
-        int retval = 0, add_to_list = 0;
-        static int sent_offset;
-        static unsigned long sent_index;
-
-#ifdef CONFIG_MRST_RAR_HANDLER
-        if (stream->ops == STREAM_OPS_PLAYBACK_DRM) {
-                for (index = stream->sg_index; index < nr_segs; index++) {
-                        __u32 rar_handle;
-                        struct sst_stream_bufs *stream_bufs =
-                                kzalloc(sizeof(*stream_bufs), GFP_KERNEL);
-
-                        stream->sg_index = index;
-                        if (!stream_bufs)
-                                return -ENOMEM;
-                        if (copy_from_user((void *) &rar_handle,
-                                        iovec[index].iov_base,
-                                        sizeof(__u32))) {
-                                kfree(stream_bufs);
-                                return -EFAULT;
-                        }
-                        stream_bufs->addr = (char *)rar_handle;
-                        stream_bufs->in_use = false;
-                        stream_bufs->size = iovec[0].iov_len;
-                        /* locking here */
-                        mutex_lock(&stream->lock);
-                        list_add_tail(&stream_bufs->node, &stream->bufs);
-                        mutex_unlock(&stream->lock);
-                }
-                stream->sg_index = index;
-                return retval;
-        }
-#endif
-        stream_bufs = kzalloc(sizeof(*stream_bufs), GFP_KERNEL);
-        if (!stream_bufs)
-                return -ENOMEM;
-        stream_bufs->addr = sst_drv_ctx->mmap_mem;
-        mmap_len = sst_drv_ctx->mmap_len;
-        stream_bufs->addr = sst_drv_ctx->mmap_mem;
-        bufp = stream->cur_ptr;
-
-        copied_size = 0;
-
-        if (!stream->sg_index)
-                sent_index = sent_offset = 0;
-
-        for (index = stream->sg_index; index < nr_segs; index++) {
-                stream->sg_index = index;
-                if (!stream->cur_ptr)
-                        bufp = iovec[index].iov_base;
-
-                size = ((unsigned long)iovec[index].iov_base
-                        + iovec[index].iov_len) - (unsigned long) bufp;
-
-                if ((copied_size + size) > mmap_len)
-                        size = mmap_len - copied_size;
-
-
-                if (stream->ops == STREAM_OPS_PLAYBACK) {
-                        if (copy_from_user((void *)
-                                        (stream_bufs->addr + copied_size),
-                                        bufp, size)) {
-                                /* Clean up the list and return error code */
-                                retval = -EFAULT;
-                                break;
-                        }
-                } else if (stream->ops == STREAM_OPS_CAPTURE) {
-                        struct snd_sst_user_cap_list *entry =
-                                kzalloc(sizeof(*entry), GFP_KERNEL);
-
-                        if (!entry) {
-                                kfree(stream_bufs);
-                                return -ENOMEM;
-                        }
-                        entry->iov_index = index;
-                        entry->iov_offset = (unsigned long) bufp -
-                                        (unsigned long)iovec[index].iov_base;
-                        entry->offset = copied_size;
-                        entry->size = size;
-                        list_add_tail(&entry->node, copy_to_list);
-                }
-
-                stream->cur_ptr = bufp + size;
-
-                if (((unsigned long)iovec[index].iov_base
-                                + iovec[index].iov_len) <
-                                ((unsigned long)iovec[index].iov_base)) {
-                        pr_debug("Buffer overflows\n");
-                        kfree(stream_bufs);
-                        return -EINVAL;
-                }
-
-                if (((unsigned long)iovec[index].iov_base
-                                        + iovec[index].iov_len) ==
-                                        (unsigned long)stream->cur_ptr) {
-                        stream->cur_ptr = NULL;
-                        stream->sg_index++;
-                }
-
-                copied_size += size;
-                pr_debug("copied_size - %lx\n", copied_size);
-                if ((copied_size >= mmap_len) ||
-                                (stream->sg_index == nr_segs)) {
-                        add_to_list = 1;
-                }
-
-                if (add_to_list) {
-                        stream_bufs->in_use = false;
-                        stream_bufs->size = copied_size;
-                        /* locking here */
-                        mutex_lock(&stream->lock);
-                        list_add_tail(&stream_bufs->node, &stream->bufs);
-                        mutex_unlock(&stream->lock);
-                        break;
-                }
-        }
-        return retval;
-}
-
-/* This function copies the captured data returned from SST DSP engine
- * to the user buffers*/
-static int snd_sst_copy_userbuf_capture(struct stream_info *stream,
-                        const struct iovec *iovec,
-                        struct list_head *copy_to_list)
-{
-        struct snd_sst_user_cap_list *entry, *_entry;
-        struct sst_stream_bufs *kbufs = NULL, *_kbufs;
-        int retval = 0;
-
-        /* copy sent buffers */
-        pr_debug("capture stream copying to user now...\n");
-        list_for_each_entry_safe(kbufs, _kbufs, &stream->bufs, node) {
-                if (kbufs->in_use == true) {
-                        /* copy to user */
-                        list_for_each_entry_safe(entry, _entry,
-                                                copy_to_list, node) {
-                                if (copy_to_user(iovec[entry->iov_index].iov_base + entry->iov_offset,
-                                             kbufs->addr + entry->offset,
-                                             entry->size)) {
-                                        /* Clean up the list and return error */
-                                        retval = -EFAULT;
-                                        break;
-                                }
-                                list_del(&entry->node);
-                                kfree(entry);
-                        }
-                }
-        }
-        pr_debug("end of cap copy\n");
-        return retval;
-}
-
-/*
- * snd_sst_userbufs_play_cap - constructs the list from user buffers
- *
- * @iovec:pointer to iovec structure
- * @nr_segs:number entries in the iovec structure
- * @str_id:stream id
- * @stream:pointer to stream_info structure
- *
- * This function will traverse the user list and copy the data to the kernel
- * space buffers.
- */
-static int snd_sst_userbufs_play_cap(const struct iovec *iovec,
-                        unsigned long nr_segs, unsigned int str_id,
-                        struct stream_info *stream)
-{
-        int retval;
-        LIST_HEAD(copy_to_list);
-
-
-        retval = snd_sst_fill_kernel_list(stream, iovec, nr_segs,
-                       &copy_to_list);
-
-        retval = intel_sst_play_capture(stream, str_id);
-        if (retval < 0)
-                return retval;
-
-        if (stream->ops == STREAM_OPS_CAPTURE) {
-                retval = snd_sst_copy_userbuf_capture(stream, iovec,
-                                &copy_to_list);
-        }
-        return retval;
-}
-
-/* This function is common function across read/write
-  for user buffers called from system calls*/
-static int intel_sst_read_write(unsigned int str_id, char __user *buf,
-                                        size_t count)
-{
-        int retval;
-        struct stream_info *stream;
-        struct iovec iovec;
-        unsigned long nr_segs;
-
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return -EINVAL;
-        stream = &sst_drv_ctx->streams[str_id];
-        if (stream->mmapped == true) {
-                pr_warn("user write and stream is mapped\n");
-                return -EIO;
-        }
-        if (!count)
-                return -EINVAL;
-        stream->curr_bytes = 0;
-        stream->cumm_bytes = 0;
-        /* copy user buf details */
-        pr_debug("new buffers %p, copy size %d, status %d\n" ,
-                        buf, (int) count, (int) stream->status);
-
-        stream->buf_type = SST_BUF_USER_STATIC;
-        iovec.iov_base = buf;
-        iovec.iov_len  = count;
-        nr_segs = 1;
-
-        do {
-                retval = snd_sst_userbufs_play_cap(
-                                &iovec, nr_segs, str_id, stream);
-                if (retval < 0)
-                        break;
-
-        } while (stream->sg_index < nr_segs);
-
-        stream->sg_index = 0;
-        stream->cur_ptr = NULL;
-        if (retval >= 0)
-                retval = stream->cumm_bytes;
-        pr_debug("end of play/rec bytes = %d!!\n", retval);
-        return retval;
-}
-
-/***
- * intel_sst_write - This function is called when user tries to play out data
- *
- * @file_ptr:pointer to file
- * @buf:user buffer to be played out
- * @count:size of tthe buffer
- * @offset:offset to start from
- *
- * writes the encoded data into DSP
- */
-int intel_sst_write(struct file *file_ptr, const char __user *buf,
-                        size_t count, loff_t *offset)
-{
-        struct ioctl_pvt_data *data = file_ptr->private_data;
-        int str_id = data->str_id;
-        struct stream_info *stream = &sst_drv_ctx->streams[str_id];
-
-        pr_debug("called for %d\n", str_id);
-        if (stream->status == STREAM_UN_INIT ||
-                stream->status == STREAM_DECODE) {
-                return -EBADRQC;
-        }
-        return intel_sst_read_write(str_id, (char __user *)buf, count);
-}
-
-/*
- * intel_sst_aio_write - write buffers
- *
- * @kiocb:pointer to a structure containing file pointer
- * @iov:list of user buffer to be played out
- * @nr_segs:number of entries
- * @offset:offset to start from
- *
- * This function is called when user tries to play out multiple data buffers
- */
-ssize_t intel_sst_aio_write(struct kiocb *kiocb, const struct iovec *iov,
-                        unsigned long nr_segs, loff_t  offset)
-{
-        int retval;
-        struct ioctl_pvt_data *data = kiocb->ki_filp->private_data;
-        int str_id = data->str_id;
-        struct stream_info *stream;
-
-        pr_debug("entry - %ld\n", nr_segs);
-
-        if (is_sync_kiocb(kiocb) == false)
-                return -EINVAL;
-
-        pr_debug("called for str_id %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return -EINVAL;
-        stream = &sst_drv_ctx->streams[str_id];
-        if (stream->mmapped == true)
-                return -EIO;
-        if (stream->status == STREAM_UN_INIT ||
-                stream->status == STREAM_DECODE) {
-                return -EBADRQC;
-        }
-        stream->curr_bytes = 0;
-        stream->cumm_bytes = 0;
-        pr_debug("new segs %ld, offset %d, status %d\n" ,
-                        nr_segs, (int) offset, (int) stream->status);
-        stream->buf_type = SST_BUF_USER_STATIC;
-        do {
-                retval = snd_sst_userbufs_play_cap(iov, nr_segs,
-                                                str_id, stream);
-                if (retval < 0)
-                        break;
-
-        } while (stream->sg_index < nr_segs);
-
-        stream->sg_index = 0;
-        stream->cur_ptr = NULL;
-        if (retval >= 0)
-                retval = stream->cumm_bytes;
-        pr_debug("end of play/rec bytes = %d!!\n", retval);
-        return retval;
-}
-
-/*
- * intel_sst_read - read the encoded data
- *
- * @file_ptr: pointer to file
- * @buf: user buffer to be filled with captured data
- * @count: size of tthe buffer
- * @offset: offset to start from
- *
- * This function is called when user tries to capture data
- */
-int intel_sst_read(struct file *file_ptr, char __user *buf,
-                        size_t count, loff_t *offset)
-{
-        struct ioctl_pvt_data *data = file_ptr->private_data;
-        int str_id = data->str_id;
-        struct stream_info *stream = &sst_drv_ctx->streams[str_id];
-
-        pr_debug("called for %d\n", str_id);
-        if (stream->status == STREAM_UN_INIT ||
-                        stream->status == STREAM_DECODE)
-                return -EBADRQC;
-        return intel_sst_read_write(str_id, buf, count);
-}
-
-/*
- * intel_sst_aio_read - aio read
- *
- * @kiocb: pointer to a structure containing file pointer
- * @iov: list of user buffer to be filled with captured
- * @nr_segs: number of entries
- * @offset: offset to start from
- *
- * This function is called when user tries to capture out multiple data buffers
- */
-ssize_t intel_sst_aio_read(struct kiocb *kiocb, const struct iovec *iov,
-                         unsigned long nr_segs, loff_t offset)
-{
-        int retval;
-        struct ioctl_pvt_data *data = kiocb->ki_filp->private_data;
-        int str_id = data->str_id;
-        struct stream_info *stream;
-
-        pr_debug("entry - %ld\n", nr_segs);
-
-        if (is_sync_kiocb(kiocb) == false) {
-                pr_debug("aio_read from user space is not allowed\n");
-                return -EINVAL;
-        }
-
-        pr_debug("called for str_id %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return -EINVAL;
-        stream = &sst_drv_ctx->streams[str_id];
-        if (stream->mmapped == true)
-                return -EIO;
-        if (stream->status == STREAM_UN_INIT ||
-                        stream->status == STREAM_DECODE)
-                return -EBADRQC;
-        stream->curr_bytes = 0;
-        stream->cumm_bytes = 0;
-
-        pr_debug("new segs %ld, offset %d, status %d\n" ,
-                        nr_segs, (int) offset, (int) stream->status);
-        stream->buf_type = SST_BUF_USER_STATIC;
-        do {
-                retval = snd_sst_userbufs_play_cap(iov, nr_segs,
-                                                str_id, stream);
-                if (retval < 0)
-                        break;
-
-        } while (stream->sg_index < nr_segs);
-
-        stream->sg_index = 0;
-        stream->cur_ptr = NULL;
-        if (retval >= 0)
-                retval = stream->cumm_bytes;
-        pr_debug("end of play/rec bytes = %d!!\n", retval);
-        return retval;
-}
-
-/* sst_print_stream_params - prints the stream parameters (debug fn)*/
-static void sst_print_stream_params(struct snd_sst_get_stream_params *get_prm)
-{
-        pr_debug("codec params:result = %d\n",
-                                get_prm->codec_params.result);
-        pr_debug("codec params:stream = %d\n",
-                                get_prm->codec_params.stream_id);
-        pr_debug("codec params:codec = %d\n",
-                                get_prm->codec_params.codec);
-        pr_debug("codec params:ops = %d\n",
-                                get_prm->codec_params.ops);
-        pr_debug("codec params:stream_type = %d\n",
-                                get_prm->codec_params.stream_type);
-        pr_debug("pcmparams:sfreq = %d\n",
-                                get_prm->pcm_params.sfreq);
-        pr_debug("pcmparams:num_chan = %d\n",
-                                get_prm->pcm_params.num_chan);
-        pr_debug("pcmparams:pcm_wd_sz = %d\n",
-                                get_prm->pcm_params.pcm_wd_sz);
-        return;
-}
-
-/**
- * sst_create_algo_ipc - create ipc msg for algorithm parameters
- *
- * @algo_params: Algorithm parameters
- * @msg: post msg pointer
- *
- * This function is called to create ipc msg
- */
-int sst_create_algo_ipc(struct snd_ppp_params *algo_params,
-                                        struct ipc_post **msg)
-{
-        if (sst_create_large_msg(msg))
-                return -ENOMEM;
-        sst_fill_header(&(*msg)->header,
-                        IPC_IA_ALG_PARAMS, 1, algo_params->str_id);
-        (*msg)->header.part.data = sizeof(u32) +
-                        sizeof(*algo_params) + algo_params->size;
-        memcpy((*msg)->mailbox_data, &(*msg)->header, sizeof(u32));
-        memcpy((*msg)->mailbox_data + sizeof(u32),
-                                algo_params, sizeof(*algo_params));
-        return 0;
-}
-
-/**
- * sst_send_algo_ipc - send ipc msg for algorithm parameters
- *
- * @msg: post msg pointer
- *
- * This function is called to send ipc msg
- */
-int sst_send_algo_ipc(struct ipc_post **msg)
-{
-        sst_drv_ctx->ppp_params_blk.condition = false;
-        sst_drv_ctx->ppp_params_blk.ret_code = 0;
-        sst_drv_ctx->ppp_params_blk.on = true;
-        sst_drv_ctx->ppp_params_blk.data = NULL;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&(*msg)->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        return sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &sst_drv_ctx->ppp_params_blk, SST_BLOCK_TIMEOUT);
-}
-
-/**
- * intel_sst_ioctl_dsp - receives the device ioctl's
- *
- * @cmd:Ioctl cmd
- * @arg:data
- *
- * This function is called when a user space component
- * sends a DSP Ioctl to SST driver
- */
-long intel_sst_ioctl_dsp(unsigned int cmd, unsigned long arg)
-{
-        int retval = 0;
-        struct snd_ppp_params algo_params;
-        struct snd_ppp_params *algo_params_copied;
-        struct ipc_post *msg;
-
-        switch (_IOC_NR(cmd)) {
-        case _IOC_NR(SNDRV_SST_SET_ALGO):
-                if (copy_from_user(&algo_params, (void __user *)arg,
-                                                        sizeof(algo_params)))
-                        return -EFAULT;
-                if (algo_params.size > SST_MAILBOX_SIZE)
-                        return -EMSGSIZE;
-
-                pr_debug("Algo ID %d Str id %d Enable %d Size %d\n",
-                        algo_params.algo_id, algo_params.str_id,
-                        algo_params.enable, algo_params.size);
-                retval = sst_create_algo_ipc(&algo_params, &msg);
-                if (retval)
-                        break;
-                algo_params.reserved = 0;
-                if (copy_from_user(msg->mailbox_data + sizeof(algo_params),
-                                algo_params.params, algo_params.size))
-                        return -EFAULT;
-
-                retval = sst_send_algo_ipc(&msg);
-                if (retval) {
-                        pr_debug("Error in sst_set_algo = %d\n", retval);
-                        retval = -EIO;
-                }
-                break;
-
-        case _IOC_NR(SNDRV_SST_GET_ALGO):
-                if (copy_from_user(&algo_params, (void __user *)arg,
-                                                        sizeof(algo_params)))
-                        return -EFAULT;
-                pr_debug("Algo ID %d Str id %d Enable %d Size %d\n",
-                        algo_params.algo_id, algo_params.str_id,
-                        algo_params.enable, algo_params.size);
-                retval = sst_create_algo_ipc(&algo_params, &msg);
-                if (retval)
-                        break;
-                algo_params.reserved = 1;
-                retval = sst_send_algo_ipc(&msg);
-                if (retval) {
-                        pr_debug("Error in sst_get_algo = %d\n", retval);
-                        retval = -EIO;
-                        break;
-                }
-                algo_params_copied = (struct snd_ppp_params *)
-                                        sst_drv_ctx->ppp_params_blk.data;
-                if (algo_params_copied->size > algo_params.size) {
-                        pr_debug("mem insufficient to copy\n");
-                        retval = -EMSGSIZE;
-                        goto free_mem;
-                } else {
-                        char __user *tmp;
-
-                        if (copy_to_user(algo_params.params,
-                                        algo_params_copied->params,
-                                        algo_params_copied->size)) {
-                                retval = -EFAULT;
-                                goto free_mem;
-                        }
-                        tmp = (char __user *)arg + offsetof(
-                                        struct snd_ppp_params, size);
-                        if (copy_to_user(tmp, &algo_params_copied->size,
-                                                 sizeof(__u32))) {
-                                retval = -EFAULT;
-                                goto free_mem;
-                        }
-
-                }
-free_mem:
-                kfree(algo_params_copied->params);
-                kfree(algo_params_copied);
-                break;
-        }
-        return retval;
-}
-
-
-int sst_ioctl_tuning_params(unsigned long arg)
-{
-        struct snd_sst_tuning_params params;
-        struct ipc_post *msg;
-
-        if (copy_from_user(&params, (void __user *)arg, sizeof(params)))
-                return -EFAULT;
-        if (params.size > SST_MAILBOX_SIZE)
-                return -ENOMEM;
-        pr_debug("Parameter %d, Stream %d, Size %d\n", params.type,
-                        params.str_id, params.size);
-        if (sst_create_large_msg(&msg))
-                return -ENOMEM;
-
-        sst_fill_header(&msg->header, IPC_IA_TUNING_PARAMS, 1, params.str_id);
-        msg->header.part.data = sizeof(u32) + sizeof(params) + params.size;
-        memcpy(msg->mailbox_data, &msg->header.full, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), &params, sizeof(params));
-        if (copy_from_user(msg->mailbox_data + sizeof(params),
-                        (void __user *)(unsigned long)params.addr,
-                        params.size)) {
-                kfree(msg->mailbox_data);
-                kfree(msg);
-                return -EFAULT;
-        }
-        return sst_send_algo_ipc(&msg);
-}
-/**
- * intel_sst_ioctl - receives the device ioctl's
- * @file_ptr:pointer to file
- * @cmd:Ioctl cmd
- * @arg:data
- *
- * This function is called by OS when a user space component
- * sends an Ioctl to SST driver
- */
-long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
-{
-        int retval = 0;
-        struct ioctl_pvt_data *data = NULL;
-        int str_id = 0, minor = 0;
-
-        data = file_ptr->private_data;
-        if (data) {
-                minor = 0;
-                str_id = data->str_id;
-        } else
-                minor = 1;
-
-        if (sst_drv_ctx->sst_state != SST_FW_RUNNING)
-                return -EBUSY;
-
-        switch (_IOC_NR(cmd)) {
-        case _IOC_NR(SNDRV_SST_STREAM_PAUSE):
-                pr_debug("IOCTL_PAUSE received for %d!\n", str_id);
-                if (minor != STREAM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                retval = sst_pause_stream(str_id);
-                break;
-
-        case _IOC_NR(SNDRV_SST_STREAM_RESUME):
-                pr_debug("SNDRV_SST_IOCTL_RESUME received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                retval = sst_resume_stream(str_id);
-                break;
-
-        case _IOC_NR(SNDRV_SST_STREAM_SET_PARAMS): {
-                struct snd_sst_params str_param;
-
-                pr_debug("IOCTL_SET_PARAMS received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-
-                if (copy_from_user(&str_param, (void __user *)arg,
-                                sizeof(str_param))) {
-                        retval = -EFAULT;
-                        break;
-                }
-
-                if (!str_id) {
-
-                        retval = sst_get_stream(&str_param);
-                        if (retval > 0) {
-                                struct stream_info *str_info;
-                                char __user *dest;
-
-                                sst_drv_ctx->stream_cnt++;
-                                data->str_id = retval;
-                                str_info = &sst_drv_ctx->streams[retval];
-                                str_info->src = SST_DRV;
-                                dest = (char __user *)arg + offsetof(struct snd_sst_params, stream_id);
-                                retval = copy_to_user(dest, &retval, sizeof(__u32));
-                                if (retval)
-                                        retval = -EFAULT;
-                        } else {
-                                if (retval == -SST_ERR_INVALID_PARAMS)
-                                        retval = -EINVAL;
-                        }
-                } else {
-                        pr_debug("SET_STREAM_PARAMS received!\n");
-                        /* allocated set params only */
-                        retval = sst_set_stream_param(str_id, &str_param);
-                        /* Block the call for reply */
-                        if (!retval) {
-                                int sfreq = 0, word_size = 0, num_channel = 0;
-                                sfreq = str_param.sparams.uc.pcm_params.sfreq;
-                                word_size = str_param.sparams.uc.pcm_params.pcm_wd_sz;
-                                num_channel = str_param.sparams.uc.pcm_params.num_chan;
-                                if (str_param.ops == STREAM_OPS_CAPTURE) {
-                                        sst_drv_ctx->scard_ops->\
-                                        set_pcm_audio_params(sfreq,
-                                                word_size, num_channel);
-                                }
-                        }
-                }
-                break;
-        }
-        case _IOC_NR(SNDRV_SST_SET_VOL): {
-                struct snd_sst_vol set_vol;
-
-                if (copy_from_user(&set_vol, (void __user *)arg,
-                                sizeof(set_vol))) {
-                        pr_debug("copy failed\n");
-                        retval = -EFAULT;
-                        break;
-                }
-                pr_debug("SET_VOLUME received for %d!\n",
-                                set_vol.stream_id);
-                if (minor == STREAM_MODULE && set_vol.stream_id == 0) {
-                        pr_debug("invalid operation!\n");
-                        retval = -EPERM;
-                        break;
-                }
-                retval = sst_set_vol(&set_vol);
-                break;
-        }
-        case _IOC_NR(SNDRV_SST_GET_VOL): {
-                struct snd_sst_vol get_vol;
-
-                if (copy_from_user(&get_vol, (void __user *)arg,
-                                sizeof(get_vol))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                pr_debug("IOCTL_GET_VOLUME received for stream = %d!\n",
-                                get_vol.stream_id);
-                if (minor == STREAM_MODULE && get_vol.stream_id == 0) {
-                        pr_debug("invalid operation!\n");
-                        retval = -EPERM;
-                        break;
-                }
-                retval = sst_get_vol(&get_vol);
-                if (retval) {
-                        retval = -EIO;
-                        break;
-                }
-                pr_debug("id:%d\n, vol:%d, ramp_dur:%d, ramp_type:%d\n",
-                                get_vol.stream_id, get_vol.volume,
-                                get_vol.ramp_duration, get_vol.ramp_type);
-                if (copy_to_user((struct snd_sst_vol __user *)arg,
-                                &get_vol, sizeof(get_vol))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                /*sst_print_get_vol_info(str_id, &get_vol);*/
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_MUTE): {
-                struct snd_sst_mute set_mute;
-
-                if (copy_from_user(&set_mute, (void __user *)arg,
-                                sizeof(set_mute))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                pr_debug("SNDRV_SST_SET_VOLUME received for %d!\n",
-                        set_mute.stream_id);
-                if (minor == STREAM_MODULE && set_mute.stream_id == 0) {
-                        retval = -EPERM;
-                        break;
-                }
-                retval = sst_set_mute(&set_mute);
-                break;
-        }
-        case _IOC_NR(SNDRV_SST_STREAM_GET_PARAMS): {
-                struct snd_sst_get_stream_params get_params;
-
-                pr_debug("IOCTL_GET_PARAMS received!\n");
-                if (minor != 0) {
-                        retval = -EBADRQC;
-                        break;
-                }
-
-                retval = sst_get_stream_params(str_id, &get_params);
-                if (retval) {
-                        retval = -EIO;
-                        break;
-                }
-                if (copy_to_user((struct snd_sst_get_stream_params __user *)arg,
-                                        &get_params, sizeof(get_params))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                sst_print_stream_params(&get_params);
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_MMAP_PLAY):
-        case _IOC_NR(SNDRV_SST_MMAP_CAPTURE): {
-                struct snd_sst_mmap_buffs mmap_buf;
-
-                pr_debug("SNDRV_SST_MMAP_PLAY/CAPTURE received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                if (copy_from_user(&mmap_buf, (void __user *)arg,
-                                sizeof(mmap_buf))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                retval = intel_sst_mmap_play_capture(str_id, &mmap_buf);
-                break;
-        }
-        case _IOC_NR(SNDRV_SST_STREAM_DROP):
-                pr_debug("SNDRV_SST_IOCTL_DROP received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EINVAL;
-                        break;
-                }
-                retval = sst_drop_stream(str_id);
-                break;
-
-        case _IOC_NR(SNDRV_SST_STREAM_GET_TSTAMP): {
-                struct snd_sst_tstamp tstamp = {0};
-                unsigned long long time, freq, mod;
-
-                pr_debug("SNDRV_SST_STREAM_GET_TSTAMP received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                memcpy_fromio(&tstamp,
-                        sst_drv_ctx->mailbox + SST_TIME_STAMP + str_id * sizeof(tstamp),
-                        sizeof(tstamp));
-                time = tstamp.samples_rendered;
-                freq = (unsigned long long) tstamp.sampling_frequency;
-                time = time * 1000; /* converting it to ms */
-                mod = do_div(time, freq);
-                if (copy_to_user((void __user *)arg, &time,
-                                sizeof(unsigned long long)))
-                        retval = -EFAULT;
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_STREAM_START):{
-                struct stream_info *stream;
-
-                pr_debug("SNDRV_SST_STREAM_START received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EINVAL;
-                        break;
-                }
-                retval = sst_validate_strid(str_id);
-                if (retval)
-                        break;
-                stream = &sst_drv_ctx->streams[str_id];
-                mutex_lock(&stream->lock);
-                if (stream->status == STREAM_INIT &&
-                        stream->need_draining != true) {
-                        stream->prev = stream->status;
-                        stream->status = STREAM_RUNNING;
-                        if (stream->ops == STREAM_OPS_PLAYBACK ||
-                                stream->ops == STREAM_OPS_PLAYBACK_DRM) {
-                                retval = sst_play_frame(str_id);
-                        } else if (stream->ops == STREAM_OPS_CAPTURE)
-                                retval = sst_capture_frame(str_id);
-                        else {
-                                retval = -EINVAL;
-                                mutex_unlock(&stream->lock);
-                                break;
-                        }
-                        if (retval < 0) {
-                                stream->status = STREAM_INIT;
-                                mutex_unlock(&stream->lock);
-                                break;
-                        }
-                } else {
-                        retval = -EINVAL;
-                }
-                mutex_unlock(&stream->lock);
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_SET_TARGET_DEVICE): {
-                struct snd_sst_target_device target_device;
-
-                pr_debug("SET_TARGET_DEVICE received!\n");
-                if (copy_from_user(&target_device, (void __user *)arg,
-                                sizeof(target_device))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                if (minor != AM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                retval = sst_target_device_select(&target_device);
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_DRIVER_INFO): {
-                struct snd_sst_driver_info info;
-
-                pr_debug("SNDRV_SST_DRIVER_INFO received\n");
-                info.version = SST_VERSION_NUM;
-                /* hard coding, shud get sumhow later */
-                info.active_pcm_streams = sst_drv_ctx->stream_cnt -
-                                                sst_drv_ctx->encoded_cnt;
-                info.active_enc_streams = sst_drv_ctx->encoded_cnt;
-                info.max_pcm_streams = MAX_ACTIVE_STREAM - MAX_ENC_STREAM;
-                info.max_enc_streams = MAX_ENC_STREAM;
-                info.buf_per_stream = sst_drv_ctx->mmap_len;
-                if (copy_to_user((void __user *)arg, &info,
-                                sizeof(info)))
-                        retval = -EFAULT;
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_STREAM_DECODE): {
-                struct snd_sst_dbufs param;
-                struct snd_sst_dbufs dbufs_local;
-                struct snd_sst_buffs ibufs, obufs;
-                struct snd_sst_buff_entry *ibuf_tmp, *obuf_tmp;
-                char __user *dest;
-
-                pr_debug("SNDRV_SST_STREAM_DECODE received\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                if (copy_from_user(&param, (void __user *)arg,
-                                sizeof(param))) {
-                        retval = -EFAULT;
-                        break;
-                }
-
-                dbufs_local.input_bytes_consumed = param.input_bytes_consumed;
-                dbufs_local.output_bytes_produced =
-                                        param.output_bytes_produced;
-
-                if (copy_from_user(&ibufs, (void __user *)param.ibufs, sizeof(ibufs))) {
-                        retval = -EFAULT;
-                        break;
-                }
-                if (copy_from_user(&obufs, (void __user *)param.obufs, sizeof(obufs))) {
-                        retval = -EFAULT;
-                        break;
-                }
-
-                ibuf_tmp = kcalloc(ibufs.entries, sizeof(*ibuf_tmp), GFP_KERNEL);
-                obuf_tmp = kcalloc(obufs.entries, sizeof(*obuf_tmp), GFP_KERNEL);
-                if (!ibuf_tmp || !obuf_tmp) {
-                        retval = -ENOMEM;
-                        goto free_iobufs;
-                }
-
-                if (copy_from_user(ibuf_tmp, (void __user *)ibufs.buff_entry,
-                                ibufs.entries * sizeof(*ibuf_tmp))) {
-                        retval = -EFAULT;
-                        goto free_iobufs;
-                }
-                ibufs.buff_entry = ibuf_tmp;
-                dbufs_local.ibufs = &ibufs;
-
-                if (copy_from_user(obuf_tmp, (void __user *)obufs.buff_entry,
-                                obufs.entries * sizeof(*obuf_tmp))) {
-                        retval = -EFAULT;
-                        goto free_iobufs;
-                }
-                obufs.buff_entry = obuf_tmp;
-                dbufs_local.obufs = &obufs;
-
-                retval = sst_decode(str_id, &dbufs_local);
-                if (retval) {
-                        retval = -EAGAIN;
-                        goto free_iobufs;
-                }
-
-                dest = (char __user *)arg + offsetof(struct snd_sst_dbufs, input_bytes_consumed);
-                if (copy_to_user(dest,
-                                &dbufs_local.input_bytes_consumed,
-                                sizeof(unsigned long long))) {
-                        retval = -EFAULT;
-                        goto free_iobufs;
-                }
-
-                dest = (char __user *)arg + offsetof(struct snd_sst_dbufs, input_bytes_consumed);
-                if (copy_to_user(dest,
-                                &dbufs_local.output_bytes_produced,
-                                sizeof(unsigned long long))) {
-                        retval = -EFAULT;
-                        goto free_iobufs;
-                }
-free_iobufs:
-                kfree(ibuf_tmp);
-                kfree(obuf_tmp);
-                break;
-        }
-
-        case _IOC_NR(SNDRV_SST_STREAM_DRAIN):
-                pr_debug("SNDRV_SST_STREAM_DRAIN received\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EINVAL;
-                        break;
-                }
-                retval = sst_drain_stream(str_id);
-                break;
-
-        case _IOC_NR(SNDRV_SST_STREAM_BYTES_DECODED): {
-                unsigned long long __user *bytes = (unsigned long long __user *)arg;
-                struct snd_sst_tstamp tstamp = {0};
-
-                pr_debug("STREAM_BYTES_DECODED received!\n");
-                if (minor != STREAM_MODULE) {
-                        retval = -EINVAL;
-                        break;
-                }
-                memcpy_fromio(&tstamp,
-                        sst_drv_ctx->mailbox + SST_TIME_STAMP + str_id * sizeof(tstamp),
-                        sizeof(tstamp));
-                if (copy_to_user(bytes, &tstamp.bytes_processed,
-                                sizeof(*bytes)))
-                        retval = -EFAULT;
-                break;
-        }
-        case _IOC_NR(SNDRV_SST_FW_INFO): {
-                struct snd_sst_fw_info *fw_info;
-
-                pr_debug("SNDRV_SST_FW_INFO received\n");
-
-                fw_info = kzalloc(sizeof(*fw_info), GFP_ATOMIC);
-                if (!fw_info) {
-                        retval = -ENOMEM;
-                        break;
-                }
-                retval = sst_get_fw_info(fw_info);
-                if (retval) {
-                        retval = -EIO;
-                        kfree(fw_info);
-                        break;
-                }
-                if (copy_to_user((struct snd_sst_dbufs __user *)arg,
-                                fw_info, sizeof(*fw_info))) {
-                        kfree(fw_info);
-                        retval = -EFAULT;
-                        break;
-                }
-                /*sst_print_fw_info(fw_info);*/
-                kfree(fw_info);
-                break;
-        }
-        case _IOC_NR(SNDRV_SST_GET_ALGO):
-        case _IOC_NR(SNDRV_SST_SET_ALGO):
-                if (minor != AM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                retval = intel_sst_ioctl_dsp(cmd, arg);
-                break;
-
-        case _IOC_NR(SNDRV_SST_TUNING_PARAMS):
-                if (minor != AM_MODULE) {
-                        retval = -EBADRQC;
-                        break;
-                }
-                retval = sst_ioctl_tuning_params(arg);
-                break;
-
-        default:
-                retval = -EINVAL;
-        }
-        pr_debug("intel_sst_ioctl:complete ret code = %d\n", retval);
-        return retval;
-}
-
diff --git a/drivers/staging/intel_sst/intel_sst_common.h b/drivers/staging/intel_sst/intel_sst_common.h
deleted file mode 100644
index 870981ba3c97..000000000000
--- a/drivers/staging/intel_sst/intel_sst_common.h
+++ /dev/null
@@ -1,623 +0,0 @@
-#ifndef __INTEL_SST_COMMON_H__
-#define __INTEL_SST_COMMON_H__
-/*
- *  intel_sst_common.h - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  Common private declarations for SST
- */
-
-#define SST_DRIVER_VERSION "1.2.17"
-#define SST_VERSION_NUM 0x1217
-
-/* driver names */
-#define SST_DRV_NAME "intel_sst_driver"
-#define SST_MRST_PCI_ID 0x080A
-#define SST_MFLD_PCI_ID 0x082F
-#define PCI_ID_LENGTH 4
-#define SST_SUSPEND_DELAY 2000
-#define FW_CONTEXT_MEM (64*1024)
-
-enum sst_states {
-        SST_FW_LOADED = 1,
-        SST_FW_RUNNING,
-        SST_UN_INIT,
-        SST_ERROR,
-        SST_SUSPENDED
-};
-
-#define MAX_ACTIVE_STREAM       3
-#define MAX_ENC_STREAM          1
-#define MAX_AM_HANDLES          1
-#define ALLOC_TIMEOUT           5000
-/* SST numbers */
-#define SST_BLOCK_TIMEOUT       5000
-#define TARGET_DEV_BLOCK_TIMEOUT        5000
-
-#define BLOCK_UNINIT            -1
-#define RX_TIMESLOT_UNINIT      -1
-
-/* SST register map */
-#define SST_CSR                 0x00
-#define SST_PISR                0x08
-#define SST_PIMR                0x10
-#define SST_ISRX                0x18
-#define SST_IMRX                0x28
-#define SST_IPCX                0x38 /* IPC IA-SST */
-#define SST_IPCD                0x40 /* IPC SST-IA */
-#define SST_ISRD                0x20 /* dummy register for shim workaround */
-#define SST_SHIM_SIZE           0X44
-
-#define SPI_MODE_ENABLE_BASE_ADDR 0xffae4000
-#define FW_SIGNATURE_SIZE       4
-
-/* PMIC and SST hardware states */
-enum sst_mad_states {
-        SND_MAD_UN_INIT = 0,
-        SND_MAD_INIT_DONE,
-};
-
-/* stream states */
-enum sst_stream_states {
-        STREAM_UN_INIT  = 0,    /* Freed/Not used stream */
-        STREAM_RUNNING  = 1,    /* Running */
-        STREAM_PAUSED   = 2,    /* Paused stream */
-        STREAM_DECODE   = 3,    /* stream is in decoding only state */
-        STREAM_INIT     = 4,    /* stream init, waiting for data */
-};
-
-
-enum sst_ram_type {
-        SST_IRAM        = 1,
-        SST_DRAM        = 2,
-};
-/* SST shim registers to structure mapping  */
-union config_status_reg {
-        struct {
-                u32 mfld_strb:1;
-                u32 sst_reset:1;
-                u32 hw_rsvd:3;
-                u32 sst_clk:2;
-                u32 bypass:3;
-                u32 run_stall:1;
-                u32 rsvd1:2;
-                u32 strb_cntr_rst:1;
-                u32 rsvd:18;
-        } part;
-        u32 full;
-};
-
-union interrupt_reg {
-        struct {
-                u32 done_interrupt:1;
-                u32 busy_interrupt:1;
-                u32 rsvd:30;
-        } part;
-        u32 full;
-};
-
-union sst_pisr_reg {
-        struct {
-                u32 pssp0:1;
-                u32 pssp1:1;
-                u32 rsvd0:3;
-                u32 dmac:1;
-                u32 rsvd1:26;
-        } part;
-        u32 full;
-};
-
-union sst_pimr_reg {
-        struct {
-                u32 ssp0:1;
-                u32 ssp1:1;
-                u32 rsvd0:3;
-                u32 dmac:1;
-                u32 rsvd1:10;
-                u32 ssp0_sc:1;
-                u32 ssp1_sc:1;
-                u32 rsvd2:3;
-                u32 dmac_sc:1;
-                u32 rsvd3:10;
-        } part;
-        u32 full;
-};
-
-
-struct sst_stream_bufs {
-        struct list_head        node;
-        u32                     size;
-        const char              *addr;
-        u32                     data_copied;
-        bool                    in_use;
-        u32                     offset;
-};
-
-struct snd_sst_user_cap_list {
-        unsigned int iov_index; /* index of iov */
-        unsigned long iov_offset; /* offset in iov */
-        unsigned long offset; /* offset in kmem */
-        unsigned long size; /* size copied */
-        struct list_head node;
-};
-/*
-This structure is used to block a user/fw data call to another
-fw/user call
-*/
-struct sst_block {
-        bool    condition; /* condition for blocking check */
-        int     ret_code; /* ret code when block is released */
-        void    *data; /* data to be appsed for block if any */
-        bool    on;
-};
-
-enum snd_sst_buf_type {
-        SST_BUF_USER_STATIC = 1,
-        SST_BUF_USER_DYNAMIC,
-        SST_BUF_MMAP_STATIC,
-        SST_BUF_MMAP_DYNAMIC,
-};
-
-enum snd_src {
-        SST_DRV = 1,
-        MAD_DRV = 2
-};
-
-/**
- * struct stream_info - structure that holds the stream information
- *
- * @status : stream current state
- * @prev : stream prev state
- * @codec : stream codec
- * @sst_id : stream id
- * @ops : stream operation pb/cp/drm...
- * @bufs: stream buffer list
- * @lock : stream mutex for protecting state
- * @pcm_lock : spinlock for pcm path only
- * @mmapped : is stream mmapped
- * @sg_index : current stream user buffer index
- * @cur_ptr : stream user buffer pointer
- * @buf_entry : current user buffer
- * @data_blk : stream block for data operations
- * @ctrl_blk : stream block for ctrl operations
- * @buf_type : stream user buffer type
- * @pcm_substream : PCM substream
- * @period_elapsed : PCM period elapsed callback
- * @sfreq : stream sampling freq
- * @decode_ibuf : Decoded i/p buffers pointer
- * @decode_obuf : Decoded o/p buffers pointer
- * @decode_isize : Decoded i/p buffers size
- * @decode_osize : Decoded o/p buffers size
- * @decode_ibuf_type : Decoded i/p buffer type
- * @decode_obuf_type : Decoded o/p buffer type
- * @idecode_alloc : Decode alloc index
- * @need_draining : stream set for drain
- * @str_type : stream type
- * @curr_bytes : current bytes decoded
- * @cumm_bytes : cummulative bytes decoded
- * @str_type : stream type
- * @src : stream source
- * @device : output device type (medfield only)
- * @pcm_slot : pcm slot value
- */
-struct stream_info {
-        unsigned int            status;
-        unsigned int            prev;
-        u8                      codec;
-        unsigned int            sst_id;
-        unsigned int            ops;
-        struct list_head        bufs;
-        struct mutex            lock; /* mutex */
-        spinlock_t          pcm_lock;
-        bool                    mmapped;
-        unsigned int            sg_index; /*  current buf Index  */
-        unsigned char __user    *cur_ptr; /*  Current static bufs  */
-        struct snd_sst_buf_entry __user *buf_entry;
-        struct sst_block        data_blk; /* stream ops block */
-        struct sst_block        ctrl_blk; /* stream control cmd block */
-        enum snd_sst_buf_type   buf_type;
-        void                    *pcm_substream;
-        void (*period_elapsed) (void *pcm_substream);
-        unsigned int            sfreq;
-        void                    *decode_ibuf, *decode_obuf;
-        unsigned int            decode_isize, decode_osize;
-        u8 decode_ibuf_type, decode_obuf_type;
-        unsigned int            idecode_alloc;
-        unsigned int            need_draining;
-        unsigned int            str_type;
-        u32                     curr_bytes;
-        u32                     cumm_bytes;
-        u32                     src;
-        enum snd_sst_audio_device_type device;
-        u8                      pcm_slot;
-};
-
-/*
- * struct stream_alloc_bloc - this structure is used for blocking the user's
- * alloc calls to fw's response to alloc calls
- *
- * @sst_id : session id of blocked stream
- * @ops_block : ops block struture
- */
-struct stream_alloc_block {
-        int                     sst_id; /* session id of blocked stream */
-        struct sst_block        ops_block; /* ops block struture */
-};
-
-#define SST_FW_SIGN "$SST"
-#define SST_FW_LIB_SIGN "$LIB"
-
-/*
- * struct fw_header - FW file headers
- *
- * @signature : FW signature
- * @modules : # of modules
- * @file_format : version of header format
- * @reserved : reserved fields
- */
-struct fw_header {
-        unsigned char signature[FW_SIGNATURE_SIZE]; /* FW signature */
-        u32 file_size; /* size of fw minus this header */
-        u32 modules; /*  # of modules */
-        u32 file_format; /* version of header format */
-        u32 reserved[4];
-};
-
-struct fw_module_header {
-        unsigned char signature[FW_SIGNATURE_SIZE]; /* module signature */
-        u32 mod_size; /* size of module */
-        u32 blocks; /* # of blocks */
-        u32 type; /* codec type, pp lib */
-        u32 entry_point;
-};
-
-struct dma_block_info {
-        enum sst_ram_type       type;   /* IRAM/DRAM */
-        u32                     size;   /* Bytes */
-        u32                     ram_offset; /* Offset in I/DRAM */
-        u32                     rsvd;   /* Reserved field */
-};
-
-struct ioctl_pvt_data {
-        int                     str_id;
-        int                     pvt_id;
-};
-
-struct sst_ipc_msg_wq {
-        union ipc_header        header;
-        char mailbox[SST_MAILBOX_SIZE];
-        struct work_struct      wq;
-};
-
-struct mad_ops_wq {
-        int stream_id;
-        enum sst_controls control_op;
-        struct work_struct      wq;
-
-};
-
-#define SST_MMAP_PAGES  (640*1024 / PAGE_SIZE)
-#define SST_MMAP_STEP   (40*1024 / PAGE_SIZE)
-
-/***
- * struct intel_sst_drv - driver ops
- *
- * @pmic_state : pmic state
- * @pmic_vendor : pmic vendor detected
- * @sst_state : current sst device state
- * @pci_id : PCI device id loaded
- * @shim : SST shim pointer
- * @mailbox : SST mailbox pointer
- * @iram : SST IRAM pointer
- * @dram : SST DRAM pointer
- * @shim_phy_add : SST shim phy addr
- * @ipc_dispatch_list : ipc messages dispatched
- * @ipc_post_msg_wq : wq to post IPC messages context
- * @ipc_process_msg : wq to process msgs from FW context
- * @ipc_process_reply : wq to process reply from FW context
- * @ipc_post_msg : wq to post reply from FW context
- * @mad_ops : MAD driver operations registered
- * @mad_wq : MAD driver wq
- * @post_msg_wq : wq to post IPC messages
- * @process_msg_wq : wq to process msgs from FW
- * @process_reply_wq : wq to process reply from FW
- * @streams : sst stream contexts
- * @alloc_block : block structure for alloc
- * @tgt_dev_blk : block structure for target device
- * @fw_info_blk : block structure for fw info block
- * @vol_info_blk : block structure for vol info block
- * @mute_info_blk : block structure for mute info block
- * @hs_info_blk : block structure for hs info block
- * @list_lock : sst driver list lock (deprecated)
- * @list_spin_lock : sst driver spin lock block
- * @scard_ops : sst card ops
- * @pci : sst pci device struture
- * @active_streams : sst active streams
- * @sst_lock : sst device lock
- * @stream_lock : sst stream lock
- * @unique_id : sst unique id
- * @stream_cnt : total sst active stream count
- * @pb_streams : total active pb streams
- * @cp_streams : total active cp streams
- * @lpe_stalled : lpe stall status
- * @pmic_port_instance : active pmic port instance
- * @rx_time_slot_status : active rx slot
- * @lpaudio_start : lpaudio status
- * @audio_start : audio status
- * @devt_d : pointer to /dev/lpe node
- * @devt_c : pointer to /dev/lpe_ctrl node
- * @max_streams : max streams allowed
- */
-struct intel_sst_drv {
-        bool                    pmic_state;
-        int                     pmic_vendor;
-        int                     sst_state;
-        unsigned int            pci_id;
-        void __iomem            *shim;
-        void __iomem            *mailbox;
-        void __iomem            *iram;
-        void __iomem            *dram;
-        unsigned int            shim_phy_add;
-        struct list_head        ipc_dispatch_list;
-        struct work_struct      ipc_post_msg_wq;
-        struct sst_ipc_msg_wq   ipc_process_msg;
-        struct sst_ipc_msg_wq   ipc_process_reply;
-        struct sst_ipc_msg_wq   ipc_post_msg;
-        struct mad_ops_wq       mad_ops;
-        wait_queue_head_t       wait_queue;
-        struct workqueue_struct *mad_wq;
-        struct workqueue_struct *post_msg_wq;
-        struct workqueue_struct *process_msg_wq;
-        struct workqueue_struct *process_reply_wq;
-
-        struct stream_info      streams[MAX_NUM_STREAMS];
-        struct stream_alloc_block alloc_block[MAX_ACTIVE_STREAM];
-        struct sst_block        tgt_dev_blk, fw_info_blk, ppp_params_blk,
-                                vol_info_blk, mute_info_blk, hs_info_blk;
-        struct mutex            list_lock;/* mutex for IPC list locking */
-        spinlock_t      list_spin_lock; /* mutex for IPC list locking */
-        struct snd_pmic_ops     *scard_ops;
-        struct pci_dev          *pci;
-        int active_streams[MAX_NUM_STREAMS];
-        void                    *mmap_mem;
-        struct mutex            sst_lock;
-        struct mutex            stream_lock;
-        unsigned int            mmap_len;
-        unsigned int            unique_id;
-        unsigned int            stream_cnt;     /* total streams */
-        unsigned int            encoded_cnt;    /* enocded streams only */
-        unsigned int            am_cnt;
-        unsigned int            pb_streams;     /* pb streams active */
-        unsigned int            cp_streams;     /* cp streams active */
-        unsigned int            lpe_stalled; /* LPE is stalled or not */
-        unsigned int            pmic_port_instance; /*pmic port instance*/
-        int                     rx_time_slot_status;
-        unsigned int            lpaudio_start;
-                /* 1 - LPA stream(MP3 pb) in progress*/
-        unsigned int            audio_start;
-        dev_t                   devt_d, devt_c;
-        unsigned int            max_streams;
-        unsigned int            *fw_cntx;
-        unsigned int            fw_cntx_size;
-
-        unsigned int            fw_downloaded;
-};
-
-extern struct intel_sst_drv *sst_drv_ctx;
-
-#define CHIP_REV_REG 0xff108000
-#define CHIP_REV_ADDR 0x78
-
-/* misc definitions */
-#define FW_DWNL_ID 0xFF
-#define LOOP1 0x11111111
-#define LOOP2 0x22222222
-#define LOOP3 0x33333333
-#define LOOP4 0x44444444
-
-#define SST_DEFAULT_PMIC_PORT 1 /*audio port*/
-/* NOTE: status will have +ve for good cases and -ve for error ones */
-#define MAX_STREAM_FIELD 255
-
-int sst_alloc_stream(char *params, unsigned int stream_ops, u8 codec,
-                                                unsigned int session_id);
-int sst_alloc_stream_response(unsigned int str_id,
-                                struct snd_sst_alloc_response *response);
-int sst_stalled(void);
-int sst_pause_stream(int id);
-int sst_resume_stream(int id);
-int sst_enable_rx_timeslot(int status);
-int sst_drop_stream(int id);
-int sst_free_stream(int id);
-int sst_start_stream(int streamID);
-int sst_play_frame(int streamID);
-int sst_pcm_play_frame(int str_id, struct sst_stream_bufs *sst_buf);
-int sst_capture_frame(int streamID);
-int sst_set_stream_param(int streamID, struct snd_sst_params *str_param);
-int sst_target_device_select(struct snd_sst_target_device *target_device);
-int sst_decode(int str_id, struct snd_sst_dbufs *dbufs);
-int sst_get_decoded_bytes(int str_id, unsigned long long *bytes);
-int sst_get_fw_info(struct snd_sst_fw_info *info);
-int sst_get_stream_params(int str_id,
-                struct snd_sst_get_stream_params *get_params);
-int sst_get_stream(struct snd_sst_params *str_param);
-int sst_get_stream_allocated(struct snd_sst_params *str_param,
-                                struct snd_sst_lib_download **lib_dnld);
-int sst_drain_stream(int str_id);
-int sst_get_vol(struct snd_sst_vol *set_vol);
-int sst_set_vol(struct snd_sst_vol *set_vol);
-int sst_set_mute(struct snd_sst_mute *set_mute);
-
-
-void sst_post_message(struct work_struct *work);
-void sst_process_message(struct work_struct *work);
-void sst_process_reply(struct work_struct *work);
-void sst_process_mad_ops(struct work_struct *work);
-void sst_process_mad_jack_detection(struct work_struct *work);
-
-long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd,
-                        unsigned long arg);
-int intel_sst_open(struct inode *i_node, struct file *file_ptr);
-int intel_sst_open_cntrl(struct inode *i_node, struct file *file_ptr);
-int intel_sst_release(struct inode *i_node, struct file *file_ptr);
-int intel_sst_release_cntrl(struct inode *i_node, struct file *file_ptr);
-int intel_sst_read(struct file *file_ptr, char __user *buf,
-                        size_t count, loff_t *ppos);
-int intel_sst_write(struct file *file_ptr, const char __user *buf,
-                        size_t count, loff_t *ppos);
-int intel_sst_mmap(struct file *fp, struct vm_area_struct *vma);
-ssize_t intel_sst_aio_write(struct kiocb *kiocb, const struct iovec *iov,
-                        unsigned long nr_segs, loff_t  offset);
-ssize_t intel_sst_aio_read(struct kiocb *kiocb, const struct iovec *iov,
-                        unsigned long nr_segs, loff_t offset);
-
-int sst_load_fw(const struct firmware *fw, void *context);
-int sst_load_library(struct snd_sst_lib_download *lib, u8 ops);
-int sst_spi_mode_enable(void);
-int sst_get_block_stream(struct intel_sst_drv *sst_drv_ctx);
-
-int sst_wait_interruptible(struct intel_sst_drv *sst_drv_ctx,
-                                struct sst_block *block);
-int sst_wait_interruptible_timeout(struct intel_sst_drv *sst_drv_ctx,
-                struct sst_block *block, int timeout);
-int sst_wait_timeout(struct intel_sst_drv *sst_drv_ctx,
-                struct stream_alloc_block *block);
-int sst_create_large_msg(struct ipc_post **arg);
-int sst_create_short_msg(struct ipc_post **arg);
-void sst_wake_up_alloc_block(struct intel_sst_drv *sst_drv_ctx,
-                u8 sst_id, int status, void *data);
-void sst_clear_interrupt(void);
-int intel_sst_resume(struct pci_dev *pci);
-int sst_download_fw(void);
-void free_stream_context(unsigned int str_id);
-void sst_clean_stream(struct stream_info *stream);
-
-/*
- * sst_fill_header - inline to fill sst header
- *
- * @header : ipc header
- * @msg : IPC message to be sent
- * @large : is ipc large msg
- * @str_id : stream id
- *
- * this function is an inline function that sets the headers before
- * sending a message
- */
-static inline void sst_fill_header(union ipc_header *header,
-                                int msg, int large, int str_id)
-{
-        header->part.msg_id = msg;
-        header->part.str_id = str_id;
-        header->part.large = large;
-        header->part.done = 0;
-        header->part.busy = 1;
-        header->part.data = 0;
-}
-
-/*
- * sst_assign_pvt_id - assign a pvt id for stream
- *
- * @sst_drv_ctx : driver context
- *
- * this inline function assigns a private id for calls that dont have stream
- * context yet, should be called with lock held
- */
-static inline unsigned int sst_assign_pvt_id(struct intel_sst_drv *sst_drv_ctx)
-{
-        sst_drv_ctx->unique_id++;
-        if (sst_drv_ctx->unique_id >= MAX_NUM_STREAMS)
-                sst_drv_ctx->unique_id = 1;
-        return sst_drv_ctx->unique_id;
-}
-
-/*
- * sst_init_stream - this function initialzes stream context
- *
- * @stream : stream struture
- * @codec : codec for stream
- * @sst_id : stream id
- * @ops : stream operation
- * @slot : stream pcm slot
- * @device : device type
- *
- * this inline function initialzes stream context for allocated stream
- */
-static inline void sst_init_stream(struct stream_info *stream,
-                int codec, int sst_id, int ops, u8 slot,
-                enum snd_sst_audio_device_type device)
-{
-        stream->status = STREAM_INIT;
-        stream->prev = STREAM_UN_INIT;
-        stream->codec = codec;
-        stream->sst_id = sst_id;
-        stream->str_type = 0;
-        stream->ops = ops;
-        stream->data_blk.on = false;
-        stream->data_blk.condition = false;
-        stream->data_blk.ret_code = 0;
-        stream->data_blk.data = NULL;
-        stream->ctrl_blk.on = false;
-        stream->ctrl_blk.condition = false;
-        stream->ctrl_blk.ret_code = 0;
-        stream->ctrl_blk.data = NULL;
-        stream->need_draining = false;
-        stream->decode_ibuf = NULL;
-        stream->decode_isize = 0;
-        stream->mmapped = false;
-        stream->pcm_slot = slot;
-        stream->device = device;
-}
-
-
-/*
- * sst_validate_strid - this function validates the stream id
- *
- * @str_id : stream id to be validated
- *
- * returns 0 if valid stream
- */
-static inline int sst_validate_strid(int str_id)
-{
-        if (str_id <= 0 || str_id > sst_drv_ctx->max_streams) {
-                pr_err("SST ERR: invalid stream id : %d MAX_STREAMS:%d\n",
-                                        str_id, sst_drv_ctx->max_streams);
-                return -EINVAL;
-        } else
-                return 0;
-}
-
-static inline int sst_shim_write(void __iomem *addr, int offset, int value)
-{
-
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-                writel(value, addr + SST_ISRD); /*dummy*/
-        writel(value, addr + offset);
-        return 0;
-}
-
-static inline int sst_shim_read(void __iomem *addr, int offset)
-{
-        return readl(addr + offset);
-}
-#endif /* __INTEL_SST_COMMON_H__ */
diff --git a/drivers/staging/intel_sst/intel_sst_drv_interface.c b/drivers/staging/intel_sst/intel_sst_drv_interface.c
deleted file mode 100644
index 22bd29c0c439..000000000000
--- a/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ /dev/null
@@ -1,564 +0,0 @@
-/*
- *  intel_sst_interface.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com)
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *  This driver exposes the audio engine functionalities to the ALSA
- *      and middleware.
- *  Upper layer interfaces (MAD driver, MMF) to SST driver
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/fs.h>
-#include <linux/firmware.h>
-#include <linux/pm_runtime.h>
-#include <linux/export.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-
-/*
- * sst_download_fw - download the audio firmware to DSP
- *
- * This function is called when the FW needs to be downloaded to SST DSP engine
- */
-int sst_download_fw(void)
-{
-        int retval;
-        const struct firmware *fw_sst;
-        char name[20];
-
-        if (sst_drv_ctx->sst_state != SST_UN_INIT)
-                return -EPERM;
-
-        /* Reload firmware is not needed for MRST */
-        if ( (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) && sst_drv_ctx->fw_downloaded) {
-                pr_debug("FW already downloaded, skip for MRST platform\n");
-                sst_drv_ctx->sst_state = SST_FW_RUNNING;
-                return 0;
-        }
-
-        snprintf(name, sizeof(name), "%s%04x%s", "fw_sst_",
-                                        sst_drv_ctx->pci_id, ".bin");
-
-        pr_debug("Downloading %s FW now...\n", name);
-        retval = request_firmware(&fw_sst, name, &sst_drv_ctx->pci->dev);
-        if (retval) {
-                pr_err("request fw failed %d\n", retval);
-                return retval;
-        }
-        sst_drv_ctx->alloc_block[0].sst_id = FW_DWNL_ID;
-        sst_drv_ctx->alloc_block[0].ops_block.condition = false;
-        retval = sst_load_fw(fw_sst, NULL);
-        if (retval)
-                goto end_restore;
-
-        retval = sst_wait_timeout(sst_drv_ctx, &sst_drv_ctx->alloc_block[0]);
-        if (retval)
-                pr_err("fw download failed %d\n" , retval);
-        else
-                sst_drv_ctx->fw_downloaded = 1;
-
-end_restore:
-        release_firmware(fw_sst);
-        sst_drv_ctx->alloc_block[0].sst_id = BLOCK_UNINIT;
-        return retval;
-}
-
-
-/*
- * sst_stalled - this function checks if the lpe is in stalled state
- */
-int sst_stalled(void)
-{
-        int retry = 1000;
-        int retval = -1;
-
-        while (retry) {
-                if (!sst_drv_ctx->lpe_stalled)
-                        return 0;
-                /*wait for time and re-check*/
-                msleep(1);
-
-                retry--;
-        }
-        pr_debug("in Stalled State\n");
-        return retval;
-}
-
-void free_stream_context(unsigned int str_id)
-{
-        struct stream_info *stream;
-
-        if (!sst_validate_strid(str_id)) {
-                /* str_id is valid, so stream is alloacted */
-                stream = &sst_drv_ctx->streams[str_id];
-                if (sst_free_stream(str_id))
-                        sst_clean_stream(&sst_drv_ctx->streams[str_id]);
-                if (stream->ops == STREAM_OPS_PLAYBACK ||
-                                stream->ops == STREAM_OPS_PLAYBACK_DRM) {
-                        sst_drv_ctx->pb_streams--;
-                        if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID)
-                                sst_drv_ctx->scard_ops->power_down_pmic_pb(
-                                                stream->device);
-                        else {
-                                if (sst_drv_ctx->pb_streams == 0)
-                                        sst_drv_ctx->scard_ops->
-                                        power_down_pmic_pb(stream->device);
-                        }
-                } else if (stream->ops == STREAM_OPS_CAPTURE) {
-                        sst_drv_ctx->cp_streams--;
-                        if (sst_drv_ctx->cp_streams == 0)
-                                sst_drv_ctx->scard_ops->power_down_pmic_cp(
-                                                stream->device);
-                }
-                if (sst_drv_ctx->pb_streams == 0
-                                && sst_drv_ctx->cp_streams == 0)
-                        sst_drv_ctx->scard_ops->power_down_pmic();
-        }
-}
-
-/*
- * sst_get_stream_allocated - this function gets a stream allocated with
- * the given params
- *
- * @str_param : stream params
- * @lib_dnld : pointer to pointer of lib downlaod struct
- *
- * This creates new stream id for a stream, in case lib is to be downloaded to
- * DSP, it downloads that
- */
-int sst_get_stream_allocated(struct snd_sst_params *str_param,
-                struct snd_sst_lib_download **lib_dnld)
-{
-        int retval, str_id;
-        struct stream_info *str_info;
-
-        retval = sst_alloc_stream((char *) &str_param->sparams, str_param->ops,
-                                str_param->codec, str_param->device_type);
-        if (retval < 0) {
-                pr_err("sst_alloc_stream failed %d\n", retval);
-                return retval;
-        }
-        pr_debug("Stream allocated %d\n", retval);
-        str_id = retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-        /* Block the call for reply */
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-        if ((retval != 0) || (str_info->ctrl_blk.ret_code != 0)) {
-                pr_debug("FW alloc failed retval %d, ret_code %d\n",
-                                retval, str_info->ctrl_blk.ret_code);
-                str_id = -str_info->ctrl_blk.ret_code; /*return error*/
-                *lib_dnld = str_info->ctrl_blk.data;
-                sst_clean_stream(str_info);
-        } else
-                pr_debug("FW Stream allocated success\n");
-        return str_id; /*will ret either error (in above if) or correct str id*/
-}
-
-/*
- * sst_get_sfreq - this function returns the frequency of the stream
- *
- * @str_param : stream params
- */
-static int sst_get_sfreq(struct snd_sst_params *str_param)
-{
-        switch (str_param->codec) {
-        case SST_CODEC_TYPE_PCM:
-                return 48000; /*str_param->sparams.uc.pcm_params.sfreq;*/
-        case SST_CODEC_TYPE_MP3:
-                return str_param->sparams.uc.mp3_params.sfreq;
-        case SST_CODEC_TYPE_AAC:
-                return str_param->sparams.uc.aac_params.sfreq;
-        case SST_CODEC_TYPE_WMA9:
-                return str_param->sparams.uc.wma_params.sfreq;
-        default:
-                return 0;
-        }
-}
-
-/*
- * sst_get_stream - this function prepares for stream allocation
- *
- * @str_param : stream param
- */
-int sst_get_stream(struct snd_sst_params *str_param)
-{
-        int i, retval;
-        struct stream_info *str_info;
-        struct snd_sst_lib_download *lib_dnld;
-
-        /* stream is not allocated, we are allocating */
-        retval = sst_get_stream_allocated(str_param, &lib_dnld);
-        if (retval == -(SST_LIB_ERR_LIB_DNLD_REQUIRED)) {
-                /* codec download is required */
-                struct snd_sst_alloc_response *response;
-
-                pr_debug("Codec is required.... trying that\n");
-                if (lib_dnld == NULL) {
-                        pr_err("lib download null!!! abort\n");
-                        return -EIO;
-                }
-                i = sst_get_block_stream(sst_drv_ctx);
-                response = sst_drv_ctx->alloc_block[i].ops_block.data;
-                pr_debug("alloc block allocated = %d\n", i);
-                if (i < 0) {
-                        kfree(lib_dnld);
-                        return -ENOMEM;
-                }
-                retval = sst_load_library(lib_dnld, str_param->ops);
-                kfree(lib_dnld);
-
-                sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-                if (!retval) {
-                        pr_debug("codec was downloaded successfully\n");
-
-                        retval = sst_get_stream_allocated(str_param, &lib_dnld);
-                        if (retval <= 0)
-                                goto err;
-
-                        pr_debug("Alloc done stream id %d\n", retval);
-                } else {
-                        pr_debug("codec download failed\n");
-                        retval = -EIO;
-                        goto err;
-                }
-        } else if  (retval <= 0)
-                goto err;
-        /*else
-                set_port_params(str_param, str_param->ops);*/
-
-        /* store sampling freq */
-        str_info = &sst_drv_ctx->streams[retval];
-        str_info->sfreq = sst_get_sfreq(str_param);
-
-        /* power on the analog, if reqd */
-        if (str_param->ops == STREAM_OPS_PLAYBACK ||
-                        str_param->ops == STREAM_OPS_PLAYBACK_DRM) {
-                if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-                        sst_drv_ctx->scard_ops->power_up_pmic_pb(
-                                        sst_drv_ctx->pmic_port_instance);
-                else
-                        sst_drv_ctx->scard_ops->power_up_pmic_pb(
-                                                        str_info->device);
-                /*Only if the playback is MP3 - Send a message*/
-                sst_drv_ctx->pb_streams++;
-        } else if (str_param->ops == STREAM_OPS_CAPTURE) {
-
-                sst_drv_ctx->scard_ops->power_up_pmic_cp(
-                                sst_drv_ctx->pmic_port_instance);
-                /*Send a messageif not sent already*/
-                sst_drv_ctx->cp_streams++;
-        }
-
-err:
-        return retval;
-}
-
-void sst_process_mad_ops(struct work_struct *work)
-{
-
-        struct mad_ops_wq *mad_ops =
-                        container_of(work, struct mad_ops_wq, wq);
-        int retval = 0;
-
-        switch (mad_ops->control_op) {
-        case SST_SND_PAUSE:
-                retval = sst_pause_stream(mad_ops->stream_id);
-                break;
-        case SST_SND_RESUME:
-                retval = sst_resume_stream(mad_ops->stream_id);
-                break;
-        case SST_SND_DROP:
-                retval = sst_drop_stream(mad_ops->stream_id);
-                break;
-        case SST_SND_START:
-                        pr_debug("SST Debug: start stream\n");
-                retval = sst_start_stream(mad_ops->stream_id);
-                break;
-        case SST_SND_STREAM_PROCESS:
-                pr_debug("play/capt frames...\n");
-                break;
-        default:
-                pr_err(" wrong control_ops reported\n");
-        }
-        return;
-}
-
-void send_intial_rx_timeslot(void)
-{
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID &&
-                        sst_drv_ctx->rx_time_slot_status != RX_TIMESLOT_UNINIT
-                        && sst_drv_ctx->pmic_vendor != SND_NC)
-                sst_enable_rx_timeslot(sst_drv_ctx->rx_time_slot_status);
-}
-
-/*
- * sst_open_pcm_stream - Open PCM interface
- *
- * @str_param: parameters of pcm stream
- *
- * This function is called by MID sound card driver to open
- * a new pcm interface
- */
-int sst_open_pcm_stream(struct snd_sst_params *str_param)
-{
-        struct stream_info *str_info;
-        int retval;
-
-        pm_runtime_get_sync(&sst_drv_ctx->pci->dev);
-
-        if (sst_drv_ctx->sst_state == SST_SUSPENDED) {
-                /* LPE is suspended, resume it before proceeding*/
-                pr_debug("Resuming from Suspended state\n");
-                retval = intel_sst_resume(sst_drv_ctx->pci);
-                if (retval) {
-                        pr_err("Resume Failed = %#x, abort\n", retval);
-                        pm_runtime_put(&sst_drv_ctx->pci->dev);
-                        return retval;
-                }
-        }
-        if (sst_drv_ctx->sst_state == SST_UN_INIT) {
-                /* FW is not downloaded */
-                pr_debug("DSP Downloading FW now...\n");
-                retval = sst_download_fw();
-                if (retval) {
-                        pr_err("FW download fail %x, abort\n", retval);
-                        pm_runtime_put(&sst_drv_ctx->pci->dev);
-                        return retval;
-                }
-                send_intial_rx_timeslot();
-        }
-
-        if (!str_param) {
-                pm_runtime_put(&sst_drv_ctx->pci->dev);
-                return -EINVAL;
-        }
-
-        retval = sst_get_stream(str_param);
-        if (retval > 0) {
-                sst_drv_ctx->stream_cnt++;
-                str_info = &sst_drv_ctx->streams[retval];
-                str_info->src = MAD_DRV;
-        } else
-                pm_runtime_put(&sst_drv_ctx->pci->dev);
-
-        return retval;
-}
-
-/*
- * sst_close_pcm_stream - Close PCM interface
- *
- * @str_id: stream id to be closed
- *
- * This function is called by MID sound card driver to close
- * an existing pcm interface
- */
-int sst_close_pcm_stream(unsigned int str_id)
-{
-        struct stream_info *stream;
-
-        pr_debug("sst: stream free called\n");
-        if (sst_validate_strid(str_id))
-                return -EINVAL;
-        stream = &sst_drv_ctx->streams[str_id];
-        free_stream_context(str_id);
-        stream->pcm_substream = NULL;
-        stream->status = STREAM_UN_INIT;
-        stream->period_elapsed = NULL;
-        sst_drv_ctx->stream_cnt--;
-        pr_debug("sst: will call runtime put now\n");
-        pm_runtime_put(&sst_drv_ctx->pci->dev);
-        return 0;
-}
-
-/*
- * sst_device_control - Set Control params
- *
- * @cmd: control cmd to be set
- * @arg: command argument
- *
- * This function is called by MID sound card driver to set
- * SST/Sound card controls for an opened stream.
- * This is registered with MID driver
- */
-int sst_device_control(int cmd, void *arg)
-{
-        int retval = 0, str_id = 0;
-
-        switch (cmd) {
-        case SST_SND_PAUSE:
-        case SST_SND_RESUME:
-        case SST_SND_DROP:
-        case SST_SND_START:
-                sst_drv_ctx->mad_ops.control_op = cmd;
-                sst_drv_ctx->mad_ops.stream_id = *(int *)arg;
-                queue_work(sst_drv_ctx->mad_wq, &sst_drv_ctx->mad_ops.wq);
-                break;
-
-        case SST_SND_STREAM_INIT: {
-                struct pcm_stream_info *str_info;
-                struct stream_info *stream;
-
-                pr_debug("stream init called\n");
-                str_info = (struct pcm_stream_info *)arg;
-                str_id = str_info->str_id;
-                retval = sst_validate_strid(str_id);
-                if (retval)
-                        break;
-
-                stream = &sst_drv_ctx->streams[str_id];
-                pr_debug("setting the period ptrs\n");
-                stream->pcm_substream = str_info->mad_substream;
-                stream->period_elapsed = str_info->period_elapsed;
-                stream->sfreq = str_info->sfreq;
-                stream->prev = stream->status;
-                stream->status = STREAM_INIT;
-                break;
-        }
-
-        case SST_SND_BUFFER_POINTER: {
-                struct pcm_stream_info *stream_info;
-                struct snd_sst_tstamp fw_tstamp = {0,};
-                struct stream_info *stream;
-
-
-                stream_info = (struct pcm_stream_info *)arg;
-                str_id = stream_info->str_id;
-                retval = sst_validate_strid(str_id);
-                if (retval)
-                        break;
-                stream = &sst_drv_ctx->streams[str_id];
-
-                if (!stream->pcm_substream)
-                        break;
-                memcpy_fromio(&fw_tstamp,
-                        ((void *)(sst_drv_ctx->mailbox + SST_TIME_STAMP)
-                        +(str_id * sizeof(fw_tstamp))),
-                        sizeof(fw_tstamp));
-
-                pr_debug("Pointer Query on strid = %d ops %d\n",
-                                                str_id, stream->ops);
-
-                if (stream->ops == STREAM_OPS_PLAYBACK)
-                        stream_info->buffer_ptr = fw_tstamp.samples_rendered;
-                else
-                        stream_info->buffer_ptr = fw_tstamp.samples_processed;
-                pr_debug("Samples rendered = %llu, buffer ptr %llu\n",
-                        fw_tstamp.samples_rendered, stream_info->buffer_ptr);
-                break;
-        }
-        case SST_ENABLE_RX_TIME_SLOT: {
-                int status = *(int *)arg;
-                sst_drv_ctx->rx_time_slot_status = status ;
-                sst_enable_rx_timeslot(status);
-                break;
-        }
-        default:
-                /* Illegal case */
-                pr_warn("illegal req\n");
-                return -EINVAL;
-        }
-
-        return retval;
-}
-
-
-struct intel_sst_pcm_control pcm_ops = {
-        .open = sst_open_pcm_stream,
-        .device_control = sst_device_control,
-        .close = sst_close_pcm_stream,
-};
-
-struct intel_sst_card_ops sst_pmic_ops = {
-        .pcm_control = &pcm_ops,
-};
-
-/*
- * register_sst_card - function for sound card to register
- *
- * @card: pointer to structure of operations
- *
- * This function is called card driver loads and is ready for registration
- */
-int register_sst_card(struct intel_sst_card_ops *card)
-{
-        if (!sst_drv_ctx) {
-                pr_err("No SST driver register card reject\n");
-                return -ENODEV;
-        }
-
-        if (!card || !card->module_name) {
-                pr_err("Null Pointer Passed\n");
-                return -EINVAL;
-        }
-        if (sst_drv_ctx->pmic_state == SND_MAD_UN_INIT) {
-                /* register this driver */
-                if ((strncmp(SST_CARD_NAMES, card->module_name,
-                                strlen(SST_CARD_NAMES))) == 0) {
-                        sst_drv_ctx->pmic_vendor = card->vendor_id;
-                        sst_drv_ctx->scard_ops =  card->scard_ops;
-                        sst_pmic_ops.module_name = card->module_name;
-                        sst_drv_ctx->pmic_state = SND_MAD_INIT_DONE;
-                        sst_drv_ctx->rx_time_slot_status = 0; /*default AMIC*/
-                        card->pcm_control = sst_pmic_ops.pcm_control;
-                        return 0;
-                } else {
-                        pr_err("strcmp fail %s\n", card->module_name);
-                        return -EINVAL;
-                }
-
-        } else {
-                /* already registered a driver */
-                pr_err("Repeat for registration..denied\n");
-                return -EBADRQC;
-        }
-        /* The ASoC code doesn't set scard_ops */
-        if (sst_drv_ctx->scard_ops)
-                sst_drv_ctx->scard_ops->card_status = SND_CARD_UN_INIT;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(register_sst_card);
-
-/*
- * unregister_sst_card- function for sound card to un-register
- *
- * @card: pointer to structure of operations
- *
- * This function is called when card driver unloads
- */
-void unregister_sst_card(struct intel_sst_card_ops *card)
-{
-        if (sst_pmic_ops.pcm_control == card->pcm_control) {
-                /* unreg */
-                sst_pmic_ops.module_name = "";
-                sst_drv_ctx->pmic_state = SND_MAD_UN_INIT;
-                pr_debug("Unregistered %s\n", card->module_name);
-        }
-        return;
-}
-EXPORT_SYMBOL_GPL(unregister_sst_card);
diff --git a/drivers/staging/intel_sst/intel_sst_dsp.c b/drivers/staging/intel_sst/intel_sst_dsp.c
deleted file mode 100644
index 426d2b92073a..000000000000
--- a/drivers/staging/intel_sst/intel_sst_dsp.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
- *  intel_sst_dsp.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10       Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This driver exposes the audio engine functionalities to the ALSA
- *      and middleware.
- *
- *  This file contains all dsp controlling functions like firmware download,
- * setting/resetting dsp cores, etc
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/fs.h>
-#include <linux/firmware.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-
-/**
- * intel_sst_reset_dsp_mrst - Resetting SST DSP
- *
- * This resets DSP in case of MRST platfroms
- */
-static int intel_sst_reset_dsp_mrst(void)
-{
-        union config_status_reg csr;
-
-        pr_debug("Resetting the DSP in mrst\n");
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.full |= 0x382;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.strb_cntr_rst = 0;
-        csr.part.run_stall = 0x1;
-        csr.part.bypass = 0x7;
-        csr.part.sst_reset = 0x1;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        return 0;
-}
-
-/**
- * intel_sst_reset_dsp_medfield - Resetting SST DSP
- *
- * This resets DSP in case of Medfield platfroms
- */
-static int intel_sst_reset_dsp_medfield(void)
-{
-        union config_status_reg csr;
-
-        pr_debug("Resetting the DSP in medfield\n");
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.full |= 0x382;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-
-        return 0;
-}
-
-/**
- * sst_start_mrst - Start the SST DSP processor
- *
- * This starts the DSP in MRST platfroms
- */
-static int sst_start_mrst(void)
-{
-        union config_status_reg csr;
-
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.bypass = 0;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        csr.part.run_stall = 0;
-        csr.part.sst_reset = 0;
-        csr.part.strb_cntr_rst = 1;
-        pr_debug("Setting SST to execute_mrst 0x%x\n", csr.full);
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-
-        return 0;
-}
-
-/**
- * sst_start_medfield - Start the SST DSP processor
- *
- * This starts the DSP in Medfield platfroms
- */
-static int sst_start_medfield(void)
-{
-        union config_status_reg csr;
-
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.bypass = 0;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.mfld_strb = 1;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.run_stall = 0;
-        csr.part.sst_reset = 0;
-        pr_debug("Starting the DSP_medfld %x\n", csr.full);
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-        pr_debug("Starting the DSP_medfld\n");
-
-        return 0;
-}
-
-/**
- * sst_parse_module - Parse audio FW modules
- *
- * @module: FW module header
- *
- * Parses modules that need to be placed in SST IRAM and DRAM
- * returns error or 0 if module sizes are proper
- */
-static int sst_parse_module(struct fw_module_header *module)
-{
-        struct dma_block_info *block;
-        u32 count;
-        void __iomem *ram;
-
-        pr_debug("module sign %s size %x blocks %x type %x\n",
-                        module->signature, module->mod_size,
-                        module->blocks, module->type);
-        pr_debug("module entrypoint 0x%x\n", module->entry_point);
-
-        block = (void *)module + sizeof(*module);
-
-        for (count = 0; count < module->blocks; count++) {
-                if (block->size <= 0) {
-                        pr_err("block size invalid\n");
-                        return -EINVAL;
-                }
-                switch (block->type) {
-                case SST_IRAM:
-                        ram = sst_drv_ctx->iram;
-                        break;
-                case SST_DRAM:
-                        ram = sst_drv_ctx->dram;
-                        break;
-                default:
-                        pr_err("wrong ram type0x%x in block0x%x\n",
-                                        block->type, count);
-                        return -EINVAL;
-                }
-                memcpy_toio(ram + block->ram_offset,
-                                (void *)block + sizeof(*block), block->size);
-                block = (void *)block + sizeof(*block) + block->size;
-        }
-        return 0;
-}
-
-/**
- * sst_parse_fw_image - parse and load FW
- *
- * @sst_fw: pointer to audio fw
- *
- * This function is called to parse and download the FW image
- */
-static int sst_parse_fw_image(const struct firmware *sst_fw)
-{
-        struct fw_header *header;
-        u32 count;
-        int ret_val;
-        struct fw_module_header *module;
-
-        BUG_ON(!sst_fw);
-
-        /* Read the header information from the data pointer */
-        header = (struct fw_header *)sst_fw->data;
-
-        /* verify FW */
-        if ((strncmp(header->signature, SST_FW_SIGN, 4) != 0) ||
-                        (sst_fw->size != header->file_size + sizeof(*header))) {
-                /* Invalid FW signature */
-                pr_err("Invalid FW sign/filesize mismatch\n");
-                return -EINVAL;
-        }
-        pr_debug("header sign=%s size=%x modules=%x fmt=%x size=%x\n",
-                        header->signature, header->file_size, header->modules,
-                        header->file_format, sizeof(*header));
-        module = (void *)sst_fw->data + sizeof(*header);
-        for (count = 0; count < header->modules; count++) {
-                /* module */
-                ret_val = sst_parse_module(module);
-                if (ret_val)
-                        return ret_val;
-                module = (void *)module + sizeof(*module) + module->mod_size ;
-        }
-
-        return 0;
-}
-
-/**
- * sst_load_fw - function to load FW into DSP
- *
- * @fw: Pointer to driver loaded FW
- * @context: driver context
- *
- * This function is called by OS when the FW is loaded into kernel
- */
-int sst_load_fw(const struct firmware *fw, void *context)
-{
-        int ret_val;
-
-        pr_debug("load_fw called\n");
-        BUG_ON(!fw);
-
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-                ret_val = intel_sst_reset_dsp_mrst();
-        else if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID)
-                ret_val = intel_sst_reset_dsp_medfield();
-        if (ret_val)
-                return ret_val;
-
-        ret_val = sst_parse_fw_image(fw);
-        if (ret_val)
-                return ret_val;
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_FW_LOADED;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        /*  7. ask scu to reset the bypass bits */
-        /*  8.bring sst out of reset  */
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-                ret_val = sst_start_mrst();
-        else if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID)
-                ret_val = sst_start_medfield();
-        if (ret_val)
-                return ret_val;
-
-        pr_debug("fw loaded successful!!!\n");
-        return ret_val;
-}
-
-/*This function is called when any codec/post processing library
- needs to be downloaded*/
-static int sst_download_library(const struct firmware *fw_lib,
-                                struct snd_sst_lib_download_info *lib)
-{
-        /* send IPC message and wait */
-        int i;
-        u8 pvt_id;
-        struct ipc_post *msg = NULL;
-        union config_status_reg csr;
-        struct snd_sst_str_type str_type = {0};
-        int retval = 0;
-
-        if (sst_create_large_msg(&msg))
-                return -ENOMEM;
-
-        pvt_id = sst_assign_pvt_id(sst_drv_ctx);
-        i = sst_get_block_stream(sst_drv_ctx);
-        pr_debug("alloc block allocated = %d, pvt_id %d\n", i, pvt_id);
-        if (i < 0) {
-                kfree(msg);
-                return -ENOMEM;
-        }
-        sst_drv_ctx->alloc_block[i].sst_id = pvt_id;
-        sst_fill_header(&msg->header, IPC_IA_PREP_LIB_DNLD, 1, pvt_id);
-        msg->header.part.data = sizeof(u32) + sizeof(str_type);
-        str_type.codec_type = lib->dload_lib.lib_info.lib_type;
-        /*str_type.pvt_id = pvt_id;*/
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), &str_type, sizeof(str_type));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_timeout(sst_drv_ctx, &sst_drv_ctx->alloc_block[i]);
-        if (retval) {
-                /* error */
-                sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-                pr_err("Prep codec downloaded failed %d\n",
-                                retval);
-                return -EIO;
-        }
-        pr_debug("FW responded, ready for download now...\n");
-        /* downloading on success */
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_FW_LOADED;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        csr.full = readl(sst_drv_ctx->shim + SST_CSR);
-        csr.part.run_stall = 1;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.bypass = 0x7;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-
-        sst_parse_fw_image(fw_lib);
-
-        /* set the FW to running again */
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.bypass = 0x0;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-
-        csr.full = sst_shim_read(sst_drv_ctx->shim, SST_CSR);
-        csr.part.run_stall = 0;
-        sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
-
-        /* send download complete and wait */
-        if (sst_create_large_msg(&msg)) {
-                sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-                return -ENOMEM;
-        }
-
-        sst_fill_header(&msg->header, IPC_IA_LIB_DNLD_CMPLT, 1, pvt_id);
-        sst_drv_ctx->alloc_block[i].sst_id = pvt_id;
-        msg->header.part.data = sizeof(u32) + sizeof(*lib);
-        lib->pvt_id = pvt_id;
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), lib, sizeof(*lib));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        pr_debug("Waiting for FW response Download complete\n");
-        sst_drv_ctx->alloc_block[i].ops_block.condition = false;
-        retval = sst_wait_timeout(sst_drv_ctx, &sst_drv_ctx->alloc_block[i]);
-        if (retval) {
-                /* error */
-                mutex_lock(&sst_drv_ctx->sst_lock);
-                sst_drv_ctx->sst_state = SST_UN_INIT;
-                mutex_unlock(&sst_drv_ctx->sst_lock);
-                sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-                return -EIO;
-        }
-
-        pr_debug("FW success on Download complete\n");
-        sst_drv_ctx->alloc_block[i].sst_id = BLOCK_UNINIT;
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_FW_RUNNING;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        return 0;
-
-}
-
-/* This function is called before downloading the codec/postprocessing
-library is set for download to SST DSP*/
-static int sst_validate_library(const struct firmware *fw_lib,
-                struct lib_slot_info *slot,
-                u32 *entry_point)
-{
-        struct fw_header *header;
-        struct fw_module_header *module;
-        struct dma_block_info *block;
-        unsigned int n_blk, isize = 0, dsize = 0;
-        int err = 0;
-
-        header = (struct fw_header *)fw_lib->data;
-        if (header->modules != 1) {
-                pr_err("Module no mismatch found\n");
-                err = -EINVAL;
-                goto exit;
-        }
-        module = (void *)fw_lib->data + sizeof(*header);
-        *entry_point = module->entry_point;
-        pr_debug("Module entry point 0x%x\n", *entry_point);
-        pr_debug("Module Sign %s, Size 0x%x, Blocks 0x%x Type 0x%x\n",
-                        module->signature, module->mod_size,
-                        module->blocks, module->type);
-
-        block = (void *)module + sizeof(*module);
-        for (n_blk = 0; n_blk < module->blocks; n_blk++) {
-                switch (block->type) {
-                case SST_IRAM:
-                        isize += block->size;
-                        break;
-                case SST_DRAM:
-                        dsize += block->size;
-                        break;
-                default:
-                        pr_err("Invalid block type for 0x%x\n", n_blk);
-                        err = -EINVAL;
-                        goto exit;
-                }
-                block = (void *)block + sizeof(*block) + block->size;
-        }
-        if (isize > slot->iram_size || dsize > slot->dram_size) {
-                pr_err("library exceeds size allocated\n");
-                err = -EINVAL;
-                goto exit;
-        } else
-                pr_debug("Library is safe for download...\n");
-
-        pr_debug("iram 0x%x, dram 0x%x, iram 0x%x, dram 0x%x\n",
-                        isize, dsize, slot->iram_size, slot->dram_size);
-exit:
-        return err;
-
-}
-
-/* This function is called when FW requests for a particular library download
-This function prepares the library to download*/
-int sst_load_library(struct snd_sst_lib_download *lib, u8 ops)
-{
-        char buf[20];
-        const char *type, *dir;
-        int len = 0, error = 0;
-        u32 entry_point;
-        const struct firmware *fw_lib;
-        struct snd_sst_lib_download_info dload_info = {{{0},},};
-
-        memset(buf, 0, sizeof(buf));
-
-        pr_debug("Lib Type 0x%x, Slot 0x%x, ops 0x%x\n",
-                        lib->lib_info.lib_type, lib->slot_info.slot_num, ops);
-        pr_debug("Version 0x%x, name %s, caps 0x%x media type 0x%x\n",
-                lib->lib_info.lib_version, lib->lib_info.lib_name,
-                lib->lib_info.lib_caps, lib->lib_info.media_type);
-
-        pr_debug("IRAM Size 0x%x, offset 0x%x\n",
-                lib->slot_info.iram_size, lib->slot_info.iram_offset);
-        pr_debug("DRAM Size 0x%x, offset 0x%x\n",
-                lib->slot_info.dram_size, lib->slot_info.dram_offset);
-
-        switch (lib->lib_info.lib_type) {
-        case SST_CODEC_TYPE_MP3:
-                type = "mp3_";
-                break;
-        case SST_CODEC_TYPE_AAC:
-                type = "aac_";
-                break;
-        case SST_CODEC_TYPE_AACP:
-                type = "aac_v1_";
-                break;
-        case SST_CODEC_TYPE_eAACP:
-                type = "aac_v2_";
-                break;
-        case SST_CODEC_TYPE_WMA9:
-                type = "wma9_";
-                break;
-        default:
-                pr_err("Invalid codec type\n");
-                error = -EINVAL;
-                goto wake;
-        }
-
-        if (ops == STREAM_OPS_CAPTURE)
-                dir = "enc_";
-        else
-                dir = "dec_";
-        len = strlen(type) + strlen(dir);
-        strncpy(buf, type, sizeof(buf)-1);
-        strncpy(buf + strlen(type), dir, sizeof(buf)-strlen(type)-1);
-        len += snprintf(buf + len, sizeof(buf) - len, "%d",
-                        lib->slot_info.slot_num);
-        len += snprintf(buf + len, sizeof(buf) - len, ".bin");
-
-        pr_debug("Requesting %s\n", buf);
-
-        error = request_firmware(&fw_lib, buf, &sst_drv_ctx->pci->dev);
-        if (error) {
-                pr_err("library load failed %d\n", error);
-                goto wake;
-        }
-        error = sst_validate_library(fw_lib, &lib->slot_info, &entry_point);
-        if (error)
-                goto wake_free;
-
-        lib->mod_entry_pt = entry_point;
-        memcpy(&dload_info.dload_lib, lib, sizeof(*lib));
-        error = sst_download_library(fw_lib, &dload_info);
-        if (error)
-                goto wake_free;
-
-        /* lib is downloaded and init send alloc again */
-        pr_debug("Library is downloaded now...\n");
-wake_free:
-        /* sst_wake_up_alloc_block(sst_drv_ctx, pvt_id, error, NULL); */
-        release_firmware(fw_lib);
-wake:
-        return error;
-}
-
diff --git a/drivers/staging/intel_sst/intel_sst_fw_ipc.h b/drivers/staging/intel_sst/intel_sst_fw_ipc.h
deleted file mode 100644
index 5d0cc56aaef9..000000000000
--- a/drivers/staging/intel_sst/intel_sst_fw_ipc.h
+++ /dev/null
@@ -1,416 +0,0 @@
-#ifndef __INTEL_SST_FW_IPC_H__
-#define __INTEL_SST_FW_IPC_H__
-/*
-*  intel_sst_fw_ipc.h - Intel SST Driver for audio engine
-*
-*  Copyright (C) 2008-10 Intel Corporation
-*  Author:      Vinod Koul <vinod.koul@intel.com>
-*               Harsha Priya <priya.harsha@intel.com>
-*               Dharageswari R <dharageswari.r@intel.com>
-*               KP Jeeja <jeeja.kp@intel.com>
-*  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*
-*  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; version 2 of the License.
-*
-*  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.
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*
-*  This driver exposes the audio engine functionalities to the ALSA
-*       and middleware.
-*  This file has definitions shared between the firmware and driver
-*/
-
-#define MAX_NUM_STREAMS_MRST 3
-#define MAX_NUM_STREAMS_MFLD 6
-#define MAX_NUM_STREAMS 6
-#define MAX_DBG_RW_BYTES 80
-#define MAX_NUM_SCATTER_BUFFERS 8
-#define MAX_LOOP_BACK_DWORDS 8
-/* IPC base address and mailbox, timestamp offsets */
-#define SST_MAILBOX_SIZE 0x0400
-#define SST_MAILBOX_SEND 0x0000
-#define SST_MAILBOX_RCV 0x0804
-#define SST_TIME_STAMP 0x1800
-#define SST_RESERVED_OFFSET 0x1A00
-#define SST_CHEKPOINT_OFFSET 0x1C00
-#define REPLY_MSG 0x80
-
-/* Message ID's for IPC messages */
-/* Bits B7: SST or IA/SC ; B6-B4: Msg Category; B3-B0: Msg Type */
-
-/* I2L Firmware/Codec Download msgs */
-#define IPC_IA_PREP_LIB_DNLD 0x01
-#define IPC_IA_LIB_DNLD_CMPLT 0x02
-
-#define IPC_IA_SET_PMIC_TYPE 0x03
-#define IPC_IA_GET_FW_VERSION 0x04
-#define IPC_IA_GET_FW_BUILD_INF 0x05
-#define IPC_IA_GET_FW_INFO 0x06
-#define IPC_IA_GET_FW_CTXT 0x07
-#define IPC_IA_SET_FW_CTXT 0x08
-
-/* I2L Codec Config/control msgs */
-#define IPC_IA_SET_CODEC_PARAMS 0x10
-#define IPC_IA_GET_CODEC_PARAMS 0x11
-#define IPC_IA_SET_PPP_PARAMS 0x12
-#define IPC_IA_GET_PPP_PARAMS 0x13
-#define IPC_IA_PLAY_FRAMES 0x14
-#define IPC_IA_CAPT_FRAMES 0x15
-#define IPC_IA_PLAY_VOICE 0x16
-#define IPC_IA_CAPT_VOICE 0x17
-#define IPC_IA_DECODE_FRAMES 0x18
-
-#define IPC_IA_ALG_PARAMS 0x1A
-#define IPC_IA_TUNING_PARAMS 0x1B
-
-/* I2L Stream config/control msgs */
-#define IPC_IA_ALLOC_STREAM 0x20 /* Allocate a stream ID */
-#define IPC_IA_FREE_STREAM 0x21 /* Free the stream ID */
-#define IPC_IA_SET_STREAM_PARAMS 0x22
-#define IPC_IA_GET_STREAM_PARAMS 0x23
-#define IPC_IA_PAUSE_STREAM 0x24
-#define IPC_IA_RESUME_STREAM 0x25
-#define IPC_IA_DROP_STREAM 0x26
-#define IPC_IA_DRAIN_STREAM 0x27 /* Short msg with str_id */
-#define IPC_IA_TARGET_DEV_SELECT 0x28
-#define IPC_IA_CONTROL_ROUTING 0x29
-
-#define IPC_IA_SET_STREAM_VOL 0x2A /*Vol for stream, pre mixer */
-#define IPC_IA_GET_STREAM_VOL 0x2B
-#define IPC_IA_SET_STREAM_MUTE 0x2C
-#define IPC_IA_GET_STREAM_MUTE 0x2D
-#define IPC_IA_ENABLE_RX_TIME_SLOT 0x2E /* Enable Rx time slot 0 or 1 */
-
-#define IPC_IA_START_STREAM 0x30 /* Short msg with str_id */
-
-/* Debug msgs */
-#define IPC_IA_DBG_MEM_READ 0x40
-#define IPC_IA_DBG_MEM_WRITE 0x41
-#define IPC_IA_DBG_LOOP_BACK 0x42
-
-/* L2I Firmware/Codec Download msgs */
-#define IPC_IA_FW_INIT_CMPLT 0x81
-#define IPC_IA_LPE_GETTING_STALLED 0x82
-#define IPC_IA_LPE_UNSTALLED 0x83
-
-/* L2I Codec Config/control msgs */
-#define IPC_SST_GET_PLAY_FRAMES 0x90 /* Request IA more data */
-#define IPC_SST_GET_CAPT_FRAMES 0x91 /* Request IA more data */
-#define IPC_SST_BUF_UNDER_RUN 0x92 /* PB Under run and stopped */
-#define IPC_SST_BUF_OVER_RUN 0x93 /* CAP Under run and stopped */
-#define IPC_SST_DRAIN_END 0x94 /* PB Drain complete and stopped */
-#define IPC_SST_CHNGE_SSP_PARAMS 0x95 /* PB SSP parameters changed */
-#define IPC_SST_STREAM_PROCESS_FATAL_ERR 0x96/* error in processing a stream */
-#define IPC_SST_PERIOD_ELAPSED 0x97 /* period elapsed */
-#define IPC_IA_TARGET_DEV_CHNGD 0x98 /* error in processing a stream */
-
-#define IPC_SST_ERROR_EVENT 0x99 /* Buffer over run occurred */
-/* L2S messages */
-#define IPC_SC_DDR_LINK_UP 0xC0
-#define IPC_SC_DDR_LINK_DOWN 0xC1
-#define IPC_SC_SET_LPECLK_REQ 0xC2
-#define IPC_SC_SSP_BIT_BANG 0xC3
-
-/* L2I Error reporting msgs */
-#define IPC_IA_MEM_ALLOC_FAIL 0xE0
-#define IPC_IA_PROC_ERR 0xE1 /* error in processing a
-                                        stream can be used by playback and
-                                        capture modules */
-
-/* L2I Debug msgs */
-#define IPC_IA_PRINT_STRING 0xF0
-
-
-
-/* Command Response or Acknowledge message to any IPC message will have
- * same message ID and stream ID information which is sent.
- * There is no specific Ack message ID. The data field is used as response
- * meaning.
- */
-enum ackData {
-        IPC_ACK_SUCCESS = 0,
-        IPC_ACK_FAILURE
-};
-
-
-enum sst_error_codes {
-        /* Error code,response to msgId: Description */
-        /* Common error codes */
-        SST_SUCCESS = 0,        /* Success */
-        SST_ERR_INVALID_STREAM_ID = 1,
-        SST_ERR_INVALID_MSG_ID = 2,
-        SST_ERR_INVALID_STREAM_OP = 3,
-        SST_ERR_INVALID_PARAMS = 4,
-        SST_ERR_INVALID_CODEC = 5,
-        SST_ERR_INVALID_MEDIA_TYPE = 6,
-        SST_ERR_STREAM_ERR = 7,
-
-        /* IPC specific error codes */
-        SST_IPC_ERR_CALL_BACK_NOT_REGD = 8,
-        SST_IPC_ERR_STREAM_NOT_ALLOCATED = 9,
-        SST_IPC_ERR_STREAM_ALLOC_FAILED = 10,
-        SST_IPC_ERR_GET_STREAM_FAILED = 11,
-        SST_ERR_MOD_NOT_AVAIL = 12,
-        SST_ERR_MOD_DNLD_RQD = 13,
-        SST_ERR_STREAM_STOPPED = 14,
-        SST_ERR_STREAM_IN_USE = 15,
-
-        /* Capture specific error codes */
-        SST_CAP_ERR_INCMPLTE_CAPTURE_MSG = 16,
-        SST_CAP_ERR_CAPTURE_FAIL = 17,
-        SST_CAP_ERR_GET_DDR_NEW_SGLIST = 18,
-        SST_CAP_ERR_UNDER_RUN = 19,
-        SST_CAP_ERR_OVERFLOW = 20,
-
-        /* Playback specific error codes*/
-        SST_PB_ERR_INCMPLTE_PLAY_MSG = 21,
-        SST_PB_ERR_PLAY_FAIL = 22,
-        SST_PB_ERR_GET_DDR_NEW_SGLIST = 23,
-
-        /* Codec manager specific error codes */
-        SST_LIB_ERR_LIB_DNLD_REQUIRED = 24,
-        SST_LIB_ERR_LIB_NOT_SUPPORTED = 25,
-
-        /* Library manager specific error codes */
-        SST_SCC_ERR_PREP_DNLD_FAILED = 26,
-        SST_SCC_ERR_LIB_DNLD_RES_FAILED = 27,
-        /* Scheduler specific error codes */
-        SST_SCH_ERR_FAIL = 28,
-
-        /* DMA specific error codes */
-        SST_DMA_ERR_NO_CHNL_AVAILABLE = 29,
-        SST_DMA_ERR_INVALID_INPUT_PARAMS = 30,
-        SST_DMA_ERR_CHNL_ALREADY_SUSPENDED = 31,
-        SST_DMA_ERR_CHNL_ALREADY_STARTED = 32,
-        SST_DMA_ERR_CHNL_NOT_ENABLED = 33,
-        SST_DMA_ERR_TRANSFER_FAILED = 34,
-
-        SST_SSP_ERR_ALREADY_ENABLED = 35,
-        SST_SSP_ERR_ALREADY_DISABLED = 36,
-        SST_SSP_ERR_NOT_INITIALIZED = 37,
-        SST_SSP_ERR_SRAM_NO_DMA_DATA = 38,
-
-        /* Other error codes */
-        SST_ERR_MOD_INIT_FAIL = 39,
-
-        /* FW init error codes */
-        SST_RDR_ERR_IO_DEV_SEL_NOT_ALLOWED = 40,
-        SST_RDR_ERR_ROUTE_ALREADY_STARTED = 41,
-        SST_RDR_ERR_IO_DEV_SEL_FAILED = 42,
-        SST_RDR_PREP_CODEC_DNLD_FAILED = 43,
-
-        /* Memory debug error codes */
-        SST_ERR_DBG_MEM_READ_FAIL = 44,
-        SST_ERR_DBG_MEM_WRITE_FAIL = 45,
-        SST_ERR_INSUFFICIENT_INPUT_SG_LIST = 46,
-        SST_ERR_INSUFFICIENT_OUTPUT_SG_LIST = 47,
-
-        SST_ERR_BUFFER_NOT_AVAILABLE = 48,
-        SST_ERR_BUFFER_NOT_ALLOCATED = 49,
-        SST_ERR_INVALID_REGION_TYPE = 50,
-        SST_ERR_NULL_PTR = 51,
-        SST_ERR_INVALID_BUFFER_SIZE = 52,
-        SST_ERR_INVALID_BUFFER_INDEX = 53,
-
-        /*IIPC specific error codes */
-        SST_IIPC_QUEUE_FULL = 54,
-        SST_IIPC_ERR_MSG_SND_FAILED = 55,
-        SST_PB_ERR_UNDERRUN_OCCURED = 56,
-        SST_RDR_INSUFFICIENT_MIXER_BUFFER = 57,
-        SST_INVALID_TIME_SLOTS = 58,
-};
-
-enum dbg_mem_data_type {
-        /* Data type of debug read/write */
-        DATA_TYPE_U32,
-        DATA_TYPE_U16,
-        DATA_TYPE_U8,
-};
-
-/* CAUTION NOTE: All IPC message body must be multiple of 32 bits.*/
-
-/* IPC Header */
-union ipc_header {
-        struct {
-                u32  msg_id:8; /* Message ID - Max 256 Message Types */
-                u32  str_id:5;
-                u32  large:1;   /* Large Message if large = 1 */
-                u32  reserved:2;        /* Reserved for future use */
-                u32  data:14;   /* Ack/Info for msg, size of msg in Mailbox */
-                u32  done:1; /* bit 30 */
-                u32  busy:1; /* bit 31 */
-        } part;
-        u32 full;
-} __attribute__ ((packed));
-
-/* Firmware build info */
-struct sst_fw_build_info {
-        unsigned char  date[16]; /* Firmware build date */
-        unsigned char  time[16]; /* Firmware build time */
-} __attribute__ ((packed));
-
-struct ipc_header_fw_init {
-        struct snd_sst_fw_version fw_version;/* Firmware version details */
-        struct sst_fw_build_info build_info;
-        u16 result;     /* Fw init result */
-        u8 module_id; /* Module ID in case of error */
-        u8 debug_info; /* Debug info from Module ID in case of fail */
-} __attribute__ ((packed));
-
-/* Address and size info of a frame buffer in DDR */
-struct sst_address_info {
-        u32 addr; /* Address at IA */
-        u32 size; /* Size of the buffer */
-} __attribute__ ((packed));
-
-/* Time stamp */
-struct snd_sst_tstamp {
-        u64 samples_processed;/* capture - data in DDR */
-        u64 samples_rendered;/* playback - data rendered */
-        u64 bytes_processed;/* bytes decoded or encoded */
-        u32 sampling_frequency;/* eg: 48000, 44100 */
-        u32 dma_base_address;/* DMA base address */
-        u16     dma_channel_no;/* DMA Channel used for the data transfer*/
-        u16     reserved;/* 32 bit alignment */
-};
-
-/* Frame info to play or capture */
-struct sst_frame_info {
-        u16  num_entries; /* number of entries to follow */
-        u16  rsrvd;
-        struct sst_address_info  addr[MAX_NUM_SCATTER_BUFFERS];
-} __attribute__ ((packed));
-
-/* Frames info for decode */
-struct snd_sst_decode_info {
-        unsigned long long input_bytes_consumed;
-        unsigned long long output_bytes_produced;
-        struct sst_frame_info frames_in;
-        struct sst_frame_info frames_out;
-} __attribute__ ((packed));
-
-/* SST to IA print debug message*/
-struct ipc_sst_ia_print_params {
-        u32 string_size;/* Max value is 160 */
-        u8 prt_string[160];/* Null terminated Char string */
-} __attribute__ ((packed));
-
-/* Voice data message  */
-struct snd_sst_voice_data {
-        u16 num_bytes;/* Number of valid voice data bytes */
-        u8  pcm_wd_size;/* 0=8 bit, 1=16 bit 2=32 bit */
-        u8  reserved;/* Reserved */
-        u8  voice_data_buf[0];/* Voice data buffer in bytes, little endian */
-} __attribute__ ((packed));
-
-/* SST to IA memory read debug message  */
-struct ipc_sst_ia_dbg_mem_rw  {
-        u16  num_bytes;/* Maximum of MAX_DBG_RW_BYTES */
-        u16  data_type;/* enum: dbg_mem_data_type */
-        u32  address;   /* Memory address of data memory of data_type */
-        u8      rw_bytes[MAX_DBG_RW_BYTES];/* Maximum of 64 bytes can be RW */
-} __attribute__ ((packed));
-
-struct ipc_sst_ia_dbg_loop_back {
-        u16 num_dwords; /* Maximum of MAX_DBG_RW_BYTES */
-        u16 increment_val;/* Increments dwords by this value, 0- no increment */
-        u32 lpbk_dwords[MAX_LOOP_BACK_DWORDS];/* Maximum of 8 dwords loopback */
-} __attribute__ ((packed));
-
-/* Stream type params struture for Alloc stream */
-struct snd_sst_str_type {
-        u8 codec_type;          /* Codec type */
-        u8 str_type;            /* 1 = voice 2 = music */
-        u8 operation;           /* Playback or Capture */
-        u8 protected_str;       /* 0=Non DRM, 1=DRM */
-        u8 time_slots;
-        u8 reserved;            /* Reserved */
-        u16 result;             /* Result used for acknowledgment */
-} __attribute__ ((packed));
-
-/* Library info structure */
-struct module_info {
-        u32 lib_version;
-        u32 lib_type;/*TBD- KLOCKWORK u8 lib_type;*/
-        u32 media_type;
-        u8  lib_name[12];
-        u32 lib_caps;
-        unsigned char  b_date[16]; /* Lib build date */
-        unsigned char  b_time[16]; /* Lib build time */
-} __attribute__ ((packed));
-
-/* Library slot info */
-struct lib_slot_info {
-        u8  slot_num; /* 1 or 2 */
-        u8  reserved1;
-        u16 reserved2;
-        u32 iram_size; /* slot size in IRAM */
-        u32 dram_size; /* slot size in DRAM */
-        u32 iram_offset; /* starting offset of slot in IRAM */
-        u32 dram_offset; /* starting offset of slot in DRAM */
-} __attribute__ ((packed));
-
-struct snd_sst_lib_download {
-        struct module_info lib_info; /* library info type, capabilities etc */
-        struct lib_slot_info slot_info; /* slot info to be downloaded */
-        u32 mod_entry_pt;
-};
-
-struct snd_sst_lib_download_info {
-        struct snd_sst_lib_download dload_lib;
-        u16 result;     /* Result used for acknowledgment */
-        u8 pvt_id; /* Private ID */
-        u8 reserved;  /* for alignment */
-};
-
-/* Alloc stream params structure */
-struct snd_sst_alloc_params {
-        struct snd_sst_str_type str_type;
-        struct snd_sst_stream_params stream_params;
-};
-
-struct snd_sst_fw_get_stream_params {
-        struct snd_sst_stream_params codec_params;
-        struct snd_sst_pmic_config pcm_params;
-};
-
-/* Alloc stream response message */
-struct snd_sst_alloc_response {
-        struct snd_sst_str_type str_type; /* Stream type for allocation */
-        struct snd_sst_lib_download lib_dnld; /* Valid only for codec dnld */
-};
-
-/* Drop response */
-struct snd_sst_drop_response {
-        u32 result;
-        u32 bytes;
-};
-
-/* CSV Voice call routing structure */
-struct snd_sst_control_routing {
-        u8 control; /* 0=start, 1=Stop */
-        u8 reserved[3]; /* Reserved- for 32 bit alignment */
-};
-
-
-struct ipc_post {
-        struct list_head node;
-        union ipc_header header; /* driver specific */
-        char *mailbox_data;
-};
-
-struct snd_sst_ctxt_params {
-        u32 address; /* Physical Address in DDR where the context is stored */
-        u32 size; /* size of the context */
-};
-#endif /* __INTEL_SST_FW_IPC_H__ */
diff --git a/drivers/staging/intel_sst/intel_sst_ioctl.h b/drivers/staging/intel_sst/intel_sst_ioctl.h
deleted file mode 100644
index 5da5ee092c69..000000000000
--- a/drivers/staging/intel_sst/intel_sst_ioctl.h
+++ /dev/null
@@ -1,440 +0,0 @@
-#ifndef __INTEL_SST_IOCTL_H__
-#define __INTEL_SST_IOCTL_H__
-/*
- *  intel_sst_ioctl.h - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file defines all sst ioctls
- */
-
-/* codec and post/pre processing related info */
-
-#include <linux/types.h>
-
-enum sst_codec_types {
-/*  AUDIO/MUSIC CODEC Type Definitions */
-        SST_CODEC_TYPE_UNKNOWN = 0,
-        SST_CODEC_TYPE_PCM,     /* Pass through Audio codec */
-        SST_CODEC_TYPE_MP3,
-        SST_CODEC_TYPE_MP24,
-        SST_CODEC_TYPE_AAC,
-        SST_CODEC_TYPE_AACP,
-        SST_CODEC_TYPE_eAACP,
-        SST_CODEC_TYPE_WMA9,
-        SST_CODEC_TYPE_WMA10,
-        SST_CODEC_TYPE_WMA10P,
-        SST_CODEC_TYPE_RA,
-        SST_CODEC_TYPE_DDAC3,
-        SST_CODEC_TYPE_STEREO_TRUE_HD,
-        SST_CODEC_TYPE_STEREO_HD_PLUS,
-
-        /*  VOICE CODEC Type Definitions */
-        SST_CODEC_TYPE_VOICE_PCM = 0x21, /* Pass through voice codec */
-};
-
-enum sst_algo_types {
-        SST_CODEC_SRC = 0x64,
-        SST_CODEC_MIXER = 0x65,
-        SST_CODEC_DOWN_MIXER = 0x66,
-        SST_CODEC_VOLUME_CONTROL = 0x67,
-        SST_CODEC_OEM1 = 0xC8,
-        SST_CODEC_OEM2 = 0xC9,
-};
-
-enum snd_sst_stream_ops {
-        STREAM_OPS_PLAYBACK = 0,        /* Decode */
-        STREAM_OPS_CAPTURE,             /* Encode */
-        STREAM_OPS_PLAYBACK_DRM,        /* Play Audio/Voice */
-        STREAM_OPS_PLAYBACK_ALERT,      /* Play Audio/Voice */
-        STREAM_OPS_CAPTURE_VOICE_CALL,  /* CSV Voice recording */
-};
-
-enum stream_mode {
-        SST_STREAM_MODE_NONE = 0,
-        SST_STREAM_MODE_DNR = 1,
-        SST_STREAM_MODE_FNF = 2,
-        SST_STREAM_MODE_CAPTURE = 3
-};
-
-enum stream_type {
-        SST_STREAM_TYPE_NONE = 0,
-        SST_STREAM_TYPE_MUSIC = 1,
-        SST_STREAM_TYPE_NORMAL = 2,
-        SST_STREAM_TYPE_LONG_PB = 3,
-        SST_STREAM_TYPE_LOW_LATENCY = 4,
-};
-
-enum snd_sst_audio_device_type {
-        SND_SST_DEVICE_HEADSET = 1,
-        SND_SST_DEVICE_IHF,
-        SND_SST_DEVICE_VIBRA,
-        SND_SST_DEVICE_HAPTIC,
-        SND_SST_DEVICE_CAPTURE,
-};
-
-/* Firmware Version info */
-struct snd_sst_fw_version {
-        __u8 build;     /* build number*/
-        __u8 minor;     /* minor number*/
-        __u8 major;     /* major number*/
-        __u8 type; /* build type */
-};
-
-/* Port info structure */
-struct snd_sst_port_info {
-        __u16 port_type;
-        __u16 reserved;
-};
-
-/* Mixer info structure */
-struct snd_sst_mix_info {
-        __u16 max_streams;
-        __u16 reserved;
-};
-
-/* PCM Parameters */
-struct snd_pcm_params {
-        __u16 codec;    /* codec type */
-        __u8 num_chan;  /* 1=Mono, 2=Stereo */
-        __u8 pcm_wd_sz; /* 16/24 - bit*/
-        __u32 reserved; /* Bitrate in bits per second */
-        __u32 sfreq;    /* Sampling rate in Hz */
-        __u32 ring_buffer_size;
-        __u32 period_count;     /* period elapsed in samples*/
-        __u32 ring_buffer_addr;
-};
-
-/* MP3 Music Parameters Message */
-struct snd_mp3_params {
-        __u16 codec;
-        __u8  num_chan; /* 1=Mono, 2=Stereo     */
-        __u8  pcm_wd_sz; /* 16/24 - bit*/
-        __u32 brate; /* Use the hard coded value. */
-        __u32 sfreq; /* Sampling freq eg. 8000, 441000, 48000 */
-        __u8  crc_check; /* crc_check - disable (0) or enable (1) */
-        __u8  op_align; /* op align 0- 16 bit, 1- MSB, 2 LSB*/
-        __u16 reserved; /* Unused */
-};
-
-#define AAC_BIT_STREAM_ADTS             0
-#define AAC_BIT_STREAM_ADIF             1
-#define AAC_BIT_STREAM_RAW              2
-
-/* AAC Music Parameters Message */
-struct snd_aac_params {
-        __u16 codec;
-        __u8 num_chan; /* 1=Mono, 2=Stereo*/
-        __u8 pcm_wd_sz; /* 16/24 - bit*/
-        __u32 brate;
-        __u32 sfreq; /* Sampling freq eg. 8000, 441000, 48000 */
-        __u32 aac_srate;        /* Plain AAC decoder operating sample rate */
-        __u8 mpg_id; /* 0=MPEG-2, 1=MPEG-4 */
-        __u8 bs_format; /* input bit stream format adts=0, adif=1, raw=2 */
-        __u8 aac_profile; /* 0=Main Profile, 1=LC profile, 3=SSR profile */
-        __u8 ext_chl; /* No.of external channels */
-        __u8 aot; /* Audio object type. 1=Main , 2=LC , 3=SSR, 4=SBR*/
-        __u8 op_align; /* output alignment 0=16 bit , 1=MSB, 2= LSB align */
-        __u8 brate_type; /* 0=CBR, 1=VBR */
-        __u8 crc_check; /* crc check 0= disable, 1=enable */
-        __s8 bit_stream_format[8]; /* input bit stream format adts/adif/raw */
-        __u8 jstereo; /* Joint stereo Flag */
-        __u8 sbr_present; /* 1 = SBR Present, 0 = SBR absent, for RAW */
-        __u8 downsample;       /* 1 = Downsampling ON, 0 = Downsampling OFF */
-        __u8 num_syntc_elems; /* 1- Mono/stereo, 0 - Dual Mono, 0 - for raw */
-        __s8 syntc_id[2]; /* 0 for ID_SCE(Dula Mono), -1 for raw */
-        __s8 syntc_tag[2]; /* raw - -1 and 0 -16 for rest of the streams */
-        __u8 pce_present; /* Flag. 1- present 0 - not present, for RAW */
-        __u8 sbr_type;          /* sbr_type: 0-plain aac, 1-aac-v1, 2-aac-v2 */
-        __u8 outchmode;  /*0- mono, 1-stereo, 2-dual mono 3-Parametric stereo */
-        __u8 ps_present;
-};
-
-/* WMA Music Parameters Message */
-struct snd_wma_params {
-        __u16 codec;
-        __u8  num_chan; /* 1=Mono, 2=Stereo */
-        __u8  pcm_wd_sz;        /* 16/24 - bit*/
-        __u32 brate;    /* Use the hard coded value. */
-        __u32 sfreq;    /* Sampling freq eg. 8000, 441000, 48000 */
-        __u32 channel_mask;  /* Channel Mask */
-        __u16 format_tag;       /* Format Tag */
-        __u16 block_align;      /* packet size */
-        __u16 wma_encode_opt;/* Encoder option */
-        __u8 op_align;  /* op align 0- 16 bit, 1- MSB, 2 LSB */
-        __u8 pcm_src;   /* input pcm bit width */
-};
-
-/* Pre processing param structure */
-struct snd_prp_params {
-        __u32 reserved; /* No pre-processing defined yet */
-};
-
-/* Pre and post processing params structure */
-struct snd_ppp_params {
-        __u8                    algo_id;/* Post/Pre processing algorithm ID  */
-        __u8                    str_id; /*Only 5 bits used 0 - 31 are valid*/
-        __u8                    enable; /* 0= disable, 1= enable*/
-        __u8                    reserved;
-        __u32                   size;   /*Size of parameters for all blocks*/
-        void                    *params;
-} __attribute__ ((packed));
-
-struct snd_sst_postproc_info {
-        __u32 src_min;          /* Supported SRC Min sampling freq */
-        __u32 src_max;          /* Supported SRC Max sampling freq */
-        __u8  src;              /* 0=Not supported, 1=Supported */
-        __u8  bass_boost;               /* 0=Not Supported, 1=Supported */
-        __u8  stereo_widening;  /* 0=Not Supported, 1=Supported */
-        __u8  volume_control;   /* 0=Not Supported, 1=Supported */
-        __s16 min_vol;          /* Minimum value of Volume in dB */
-        __s16 max_vol;          /* Maximum value of Volume in dB */
-        __u8 mute_control;      /* 0=No Mute, 1=Mute */
-        __u8 reserved1;
-        __u16 reserved2;
-};
-
-/* pre processing Capability info structure */
-struct snd_sst_prp_info {
-        __s16 min_vol;                  /* Minimum value of Volume in dB */
-        __s16 max_vol;                  /* Maximum value of Volume in dB */
-        __u8 volume_control;            /* 0=Not Supported, 1=Supported */
-        __u8 reserved1;                 /* for 32 bit alignment */
-        __u16 reserved2;                /* for 32 bit alignment */
-} __attribute__ ((packed));
-
-/*Pre / Post processing algorithms support*/
-struct snd_sst_ppp_info {
-        __u32 src:1;            /* 0=Not supported, 1=Supported */
-        __u32 mixer:1;          /* 0=Not supported, 1=Supported */
-        __u32 volume_control:1; /* 0=Not Supported, 1=Supported */
-        __u32 mute_control:1;   /* 0=Not Supported, 1=Supported */
-        __u32 anc:1;            /* 0=Not Supported, 1=Supported */
-        __u32 side_tone:1;      /* 0=Not Supported, 1=Supported */
-        __u32 dc_removal:1;     /* 0=Not Supported, 1=Supported */
-        __u32 equalizer:1;      /* 0=Not Supported, 1=Supported */
-        __u32 spkr_prot:1;      /* 0=Not Supported, 1=Supported */
-        __u32 bass_boost:1;     /* 0=Not Supported, 1=Supported */
-        __u32 stereo_widening:1;/* 0=Not Supported, 1=Supported */
-        __u32 rsvd1:21;
-        __u32 rsvd2;
-};
-
-/* Firmware capabilities info */
-struct snd_sst_fw_info {
-        struct snd_sst_fw_version fw_version; /* Firmware version */
-        __u8 audio_codecs_supported[8]; /* Codecs supported by FW */
-        __u32 recommend_min_duration; /* Min duration for Lowpower Playback */
-        __u8 max_pcm_streams_supported; /* Max num of PCM streams supported */
-        __u8 max_enc_streams_supported; /* Max number of Encoded streams  */
-        __u16 reserved;         /* 32 bit alignment*/
-        struct snd_sst_ppp_info ppp_info; /* pre_processing mod cap info */
-        struct snd_sst_postproc_info pop_info; /* Post processing cap info*/
-        struct snd_sst_port_info port_info[3]; /* Port info */
-        struct snd_sst_mix_info mix_info;/* Mixer info */
-        __u32 min_input_buf; /* minmum i/p buffer for decode */
-};
-
-/* Codec params struture */
-union  snd_sst_codec_params {
-        struct snd_pcm_params pcm_params;
-        struct snd_mp3_params mp3_params;
-        struct snd_aac_params aac_params;
-        struct snd_wma_params wma_params;
-};
-
-
-struct snd_sst_stream_params {
-        union snd_sst_codec_params uc;
-} __attribute__ ((packed));
-
-struct snd_sst_params {
-        __u32 result;
-        __u32 stream_id;
-        __u8 codec;
-        __u8 ops;
-        __u8 stream_type;
-        __u8 device_type;
-        struct snd_sst_stream_params sparams;
-};
-
-struct snd_sst_vol {
-        __u32   stream_id;
-        __s32   volume;
-        __u32   ramp_duration;
-        __u32   ramp_type;              /* Ramp type, default=0 */
-};
-
-struct snd_sst_mute {
-        __u32   stream_id;
-        __u32   mute;
-};
-
-/* ioctl related stuff here */
-struct snd_sst_pmic_config {
-        __u32  sfreq;                /* Sampling rate in Hz */
-        __u16  num_chan;             /* Mono =1 or Stereo =2 */
-        __u16  pcm_wd_sz;            /* Number of bits per sample */
-} __attribute__ ((packed));
-
-struct snd_sst_get_stream_params {
-        struct snd_sst_params codec_params;
-        struct snd_sst_pmic_config pcm_params;
-};
-
-enum snd_sst_target_type {
-        SND_SST_TARGET_PMIC = 1,
-        SND_SST_TARGET_LPE,
-        SND_SST_TARGET_MODEM,
-        SND_SST_TARGET_BT,
-        SND_SST_TARGET_FM,
-        SND_SST_TARGET_NONE,
-};
-
-enum snd_sst_device_type {
-        SND_SST_DEVICE_SSP = 1,
-        SND_SST_DEVICE_PCM,
-        SND_SST_DEVICE_OTHER,
-};
-
-enum snd_sst_device_mode {
-
-        SND_SST_DEV_MODE_PCM_MODE1 = 1, /*(16-bit word, bit-length frame sync)*/
-        SND_SST_DEV_MODE_PCM_MODE2,
-        SND_SST_DEV_MODE_PCM_MODE3,
-        SND_SST_DEV_MODE_PCM_MODE4_RIGHT_JUSTIFIED,
-        SND_SST_DEV_MODE_PCM_MODE4_LEFT_JUSTIFIED,
-        SND_SST_DEV_MODE_PCM_MODE4_I2S, /*(I2S mode, 16-bit words)*/
-        SND_SST_DEV_MODE_PCM_MODE5,
-        SND_SST_DEV_MODE_PCM_MODE6,
-};
-
-enum snd_sst_port_action {
-        SND_SST_PORT_PREPARE = 1,
-        SND_SST_PORT_ACTIVATE,
-};
-
-/* Target selection per device structure */
-struct snd_sst_slot_info {
-        __u8 mix_enable;        /* Mixer enable or disable */
-        __u8 device_type;
-        __u8 device_instance;   /* 0, 1, 2 */
-        __u8 target_device;
-        __u16 target_sink;
-        __u8 slot[2];
-        __u8 master;
-        __u8 action;
-        __u8 device_mode;
-        __u8 reserved;
-        struct snd_sst_pmic_config pcm_params;
-} __attribute__ ((packed));
-
-#define SST_MAX_TARGET_DEVICES 3
-/* Target device list structure */
-struct snd_sst_target_device  {
-        __u32 device_route;
-        struct snd_sst_slot_info devices[SST_MAX_TARGET_DEVICES];
-} __attribute__ ((packed));
-
-struct snd_sst_driver_info {
-        __u32 version;  /* Version of the driver */
-        __u32 active_pcm_streams;
-        __u32 active_enc_streams;
-        __u32 max_pcm_streams;
-        __u32 max_enc_streams;
-        __u32 buf_per_stream;
-};
-
-enum snd_sst_buff_type {
-        SST_BUF_USER = 1,
-        SST_BUF_MMAP,
-        SST_BUF_RAR,
-};
-
-struct snd_sst_mmap_buff_entry {
-        unsigned int offset;
-        unsigned int size;
-};
-
-struct snd_sst_mmap_buffs {
-        unsigned int entries;
-        enum snd_sst_buff_type type;
-        struct snd_sst_mmap_buff_entry *buff;
-};
-
-struct snd_sst_buff_entry {
-        void *buffer;
-        unsigned int size;
-};
-
-struct snd_sst_buffs {
-        unsigned int entries;
-        __u8 type;
-        struct snd_sst_buff_entry *buff_entry;
-};
-
-struct snd_sst_dbufs  {
-        unsigned long long input_bytes_consumed;
-        unsigned long long output_bytes_produced;
-        struct snd_sst_buffs *ibufs;
-        struct snd_sst_buffs *obufs;
-};
-
-struct snd_sst_tuning_params {
-        __u8 type;
-        __u8 str_id;
-        __u8 size;
-        __u8 rsvd;
-        __aligned_u64 addr;
-} __attribute__ ((packed));
-/*IOCTL defined here */
-/*SST MMF IOCTLS only */
-#define SNDRV_SST_STREAM_SET_PARAMS _IOR('L', 0x00, \
-                                        struct snd_sst_stream_params *)
-#define SNDRV_SST_STREAM_GET_PARAMS _IOWR('L', 0x01, \
-                                        struct snd_sst_get_stream_params *)
-#define SNDRV_SST_STREAM_GET_TSTAMP _IOWR('L', 0x02, __u64 *)
-#define SNDRV_SST_STREAM_DECODE _IOWR('L', 0x03, struct snd_sst_dbufs *)
-#define SNDRV_SST_STREAM_BYTES_DECODED _IOWR('L', 0x04, __u64 *)
-#define SNDRV_SST_STREAM_START  _IO('A', 0x42)
-#define SNDRV_SST_STREAM_DROP   _IO('A', 0x43)
-#define SNDRV_SST_STREAM_DRAIN  _IO('A', 0x44)
-#define SNDRV_SST_STREAM_PAUSE  _IOW('A', 0x45, int)
-#define SNDRV_SST_STREAM_RESUME _IO('A', 0x47)
-#define SNDRV_SST_MMAP_PLAY     _IOW('L', 0x05, struct snd_sst_mmap_buffs *)
-#define SNDRV_SST_MMAP_CAPTURE _IOW('L', 0x06, struct snd_sst_mmap_buffs *)
-/*SST common ioctls */
-#define SNDRV_SST_DRIVER_INFO   _IOR('L', 0x10, struct snd_sst_driver_info *)
-#define SNDRV_SST_SET_VOL       _IOW('L', 0x11, struct snd_sst_vol *)
-#define SNDRV_SST_GET_VOL       _IOW('L', 0x12, struct snd_sst_vol *)
-#define SNDRV_SST_MUTE          _IOW('L', 0x13, struct snd_sst_mute *)
-/*AM Ioctly only */
-#define SNDRV_SST_FW_INFO       _IOR('L', 0x20,  struct snd_sst_fw_info *)
-#define SNDRV_SST_SET_TARGET_DEVICE _IOW('L', 0x21, \
-                                        struct snd_sst_target_device *)
-/*DSP Ioctls on /dev/intel_sst_ctrl only*/
-#define SNDRV_SST_SET_ALGO      _IOW('L', 0x30,  struct snd_ppp_params *)
-#define SNDRV_SST_GET_ALGO      _IOWR('L', 0x31,  struct snd_ppp_params *)
-#define SNDRV_SST_TUNING_PARAMS _IOW('L', 0x32,  struct snd_sst_tuning_params *)
-
-#endif /* __INTEL_SST_IOCTL_H__ */
diff --git a/drivers/staging/intel_sst/intel_sst_ipc.c b/drivers/staging/intel_sst/intel_sst_ipc.c
deleted file mode 100644
index 5c3444f6ab41..000000000000
--- a/drivers/staging/intel_sst/intel_sst_ipc.c
+++ /dev/null
@@ -1,774 +0,0 @@
-/*
- *  intel_sst_ipc.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file defines all ipc functions
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/firmware.h>
-#include <linux/sched.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-/*
- * sst_send_sound_card_type - send sound card type
- *
- * this function sends the sound card type to sst dsp engine
- */
-static void sst_send_sound_card_type(void)
-{
-        struct ipc_post *msg = NULL;
-
-        if (sst_create_short_msg(&msg))
-                return;
-
-        sst_fill_header(&msg->header, IPC_IA_SET_PMIC_TYPE, 0, 0);
-        msg->header.part.data = sst_drv_ctx->pmic_vendor;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        return;
-}
-
-/**
-* sst_post_message - Posts message to SST
-*
-* @work: Pointer to work structure
-*
-* This function is called by any component in driver which
-* wants to send an IPC message. This will post message only if
-* busy bit is free
-*/
-void sst_post_message(struct work_struct *work)
-{
-        struct ipc_post *msg;
-        union ipc_header header;
-        union  interrupt_reg imr;
-        int retval = 0;
-        imr.full = 0;
-
-        /*To check if LPE is in stalled state.*/
-        retval = sst_stalled();
-        if (retval < 0) {
-                pr_err("in stalled state\n");
-                return;
-        }
-        pr_debug("post message called\n");
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-
-        /* check list */
-        if (list_empty(&sst_drv_ctx->ipc_dispatch_list)) {
-                /* list is empty, mask imr */
-                pr_debug("Empty msg queue... masking\n");
-                imr.full = readl(sst_drv_ctx->shim + SST_IMRX);
-                imr.part.done_interrupt = 1;
-                /* dummy register for shim workaround */
-                sst_shim_write(sst_drv_ctx->shim, SST_IMRX, imr.full);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                return;
-        }
-
-        /* check busy bit */
-        header.full = sst_shim_read(sst_drv_ctx->shim, SST_IPCX);
-        if (header.part.busy) {
-                /* busy, unmask */
-                pr_debug("Busy not free... unmasking\n");
-                imr.full = readl(sst_drv_ctx->shim + SST_IMRX);
-                imr.part.done_interrupt = 0;
-                /* dummy register for shim workaround */
-                sst_shim_write(sst_drv_ctx->shim, SST_IMRX, imr.full);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                return;
-        }
-        /* copy msg from list */
-        msg = list_entry(sst_drv_ctx->ipc_dispatch_list.next,
-                        struct ipc_post, node);
-        list_del(&msg->node);
-        pr_debug("Post message: header = %x\n", msg->header.full);
-        pr_debug("size: = %x\n", msg->header.part.data);
-        if (msg->header.part.large)
-                memcpy_toio(sst_drv_ctx->mailbox + SST_MAILBOX_SEND,
-                        msg->mailbox_data, msg->header.part.data);
-        /* dummy register for shim workaround */
-
-        sst_shim_write(sst_drv_ctx->shim, SST_IPCX, msg->header.full);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-
-        kfree(msg->mailbox_data);
-        kfree(msg);
-        return;
-}
-
-/*
- * sst_clear_interrupt - clear the SST FW interrupt
- *
- * This function clears the interrupt register after the interrupt
- * bottom half is complete allowing next interrupt to arrive
- */
-void sst_clear_interrupt(void)
-{
-        union interrupt_reg isr;
-        union interrupt_reg imr;
-        union ipc_header clear_ipc;
-
-        imr.full = sst_shim_read(sst_drv_ctx->shim, SST_IMRX);
-        isr.full = sst_shim_read(sst_drv_ctx->shim, SST_ISRX);
-        /*  write 1 to clear  */;
-        isr.part.busy_interrupt = 1;
-        sst_shim_write(sst_drv_ctx->shim, SST_ISRX, isr.full);
-        /* Set IA done bit */
-        clear_ipc.full = sst_shim_read(sst_drv_ctx->shim, SST_IPCD);
-        clear_ipc.part.busy = 0;
-        clear_ipc.part.done = 1;
-        clear_ipc.part.data = IPC_ACK_SUCCESS;
-        sst_shim_write(sst_drv_ctx->shim, SST_IPCD, clear_ipc.full);
-        /* un mask busy interrupt */
-        imr.part.busy_interrupt = 0;
-        sst_shim_write(sst_drv_ctx->shim, SST_IMRX, imr.full);
-}
-
-void sst_restore_fw_context(void)
-{
-        struct snd_sst_ctxt_params fw_context;
-        struct ipc_post *msg = NULL;
-
-        pr_debug("restore_fw_context\n");
-        /*check cpu type*/
-        if (sst_drv_ctx->pci_id != SST_MFLD_PCI_ID)
-                return;
-                /*not supported for rest*/
-        if (!sst_drv_ctx->fw_cntx_size)
-                return;
-                /*nothing to restore*/
-        pr_debug("restoring context......\n");
-        /*send msg to fw*/
-        if (sst_create_large_msg(&msg))
-                return;
-
-        sst_fill_header(&msg->header, IPC_IA_SET_FW_CTXT, 1, 0);
-        msg->header.part.data = sizeof(fw_context) + sizeof(u32);
-        fw_context.address = virt_to_phys((void *)sst_drv_ctx->fw_cntx);
-        fw_context.size = sst_drv_ctx->fw_cntx_size;
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32),
-                                &fw_context, sizeof(fw_context));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        return;
-}
-/*
- * process_fw_init - process the FW init msg
- *
- * @msg: IPC message from FW
- *
- * This function processes the FW init msg from FW
- * marks FW state and prints debug info of loaded FW
- */
-int process_fw_init(struct sst_ipc_msg_wq *msg)
-{
-        struct ipc_header_fw_init *init =
-                (struct ipc_header_fw_init *)msg->mailbox;
-        int retval = 0;
-
-        pr_debug("*** FW Init msg came***\n");
-        if (init->result) {
-                mutex_lock(&sst_drv_ctx->sst_lock);
-                sst_drv_ctx->sst_state = SST_ERROR;
-                mutex_unlock(&sst_drv_ctx->sst_lock);
-                pr_debug("FW Init failed, Error %x\n", init->result);
-                pr_err("FW Init failed, Error %x\n", init->result);
-                retval = -init->result;
-                return retval;
-        }
-        if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-                sst_send_sound_card_type();
-        mutex_lock(&sst_drv_ctx->sst_lock);
-        sst_drv_ctx->sst_state = SST_FW_RUNNING;
-        sst_drv_ctx->lpe_stalled = 0;
-        mutex_unlock(&sst_drv_ctx->sst_lock);
-        pr_debug("FW Version %02x.%02x.%02x\n", init->fw_version.major,
-                        init->fw_version.minor, init->fw_version.build);
-        pr_debug("Build Type %x\n", init->fw_version.type);
-        pr_debug(" Build date %s Time %s\n",
-                        init->build_info.date, init->build_info.time);
-        sst_wake_up_alloc_block(sst_drv_ctx, FW_DWNL_ID, retval, NULL);
-        sst_restore_fw_context();
-        return retval;
-}
-/**
-* sst_process_message - Processes message from SST
-*
-* @work:        Pointer to work structure
-*
-* This function is scheduled by ISR
-* It take a msg from process_queue and does action based on msg
-*/
-void sst_process_message(struct work_struct *work)
-{
-        struct sst_ipc_msg_wq *msg =
-                        container_of(work, struct sst_ipc_msg_wq, wq);
-        int str_id = msg->header.part.str_id;
-
-        pr_debug("IPC process for %x\n", msg->header.full);
-
-        /* based on msg in list call respective handler */
-        switch (msg->header.part.msg_id) {
-        case IPC_SST_BUF_UNDER_RUN:
-        case IPC_SST_BUF_OVER_RUN:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("stream id %d invalid\n", str_id);
-                        break;
-                }
-                pr_err("Buffer under/overrun for %d\n",
-                                msg->header.part.str_id);
-                pr_err("Got Underrun & not to send data...ignore\n");
-                break;
-
-        case IPC_SST_GET_PLAY_FRAMES:
-                if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
-                        struct stream_info *stream ;
-
-                        if (sst_validate_strid(str_id)) {
-                                pr_err("strid %d invalid\n", str_id);
-                                break;
-                        }
-                        /* call sst_play_frame */
-                        stream = &sst_drv_ctx->streams[str_id];
-                        pr_debug("sst_play_frames for %d\n",
-                                        msg->header.part.str_id);
-                        mutex_lock(&sst_drv_ctx->streams[str_id].lock);
-                        sst_play_frame(msg->header.part.str_id);
-                        mutex_unlock(&sst_drv_ctx->streams[str_id].lock);
-                        break;
-                } else
-                        pr_err("sst_play_frames for Penwell!!\n");
-
-        case IPC_SST_GET_CAPT_FRAMES:
-                if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID) {
-                        struct stream_info *stream;
-                        /* call sst_capture_frame */
-                        if (sst_validate_strid(str_id)) {
-                                pr_err("str id %d invalid\n", str_id);
-                                break;
-                        }
-                        stream = &sst_drv_ctx->streams[str_id];
-                        pr_debug("sst_capture_frames for %d\n",
-                                        msg->header.part.str_id);
-                        mutex_lock(&stream->lock);
-                        if (stream->mmapped == false &&
-                                        stream->src == SST_DRV) {
-                                pr_debug("waking up block for copy.\n");
-                                stream->data_blk.ret_code = 0;
-                                stream->data_blk.condition = true;
-                                stream->data_blk.on = false;
-                                wake_up(&sst_drv_ctx->wait_queue);
-                        } else
-                                sst_capture_frame(msg->header.part.str_id);
-                        mutex_unlock(&stream->lock);
-                } else
-                        pr_err("sst_play_frames for Penwell!!\n");
-                break;
-
-        case IPC_IA_PRINT_STRING:
-                pr_debug("been asked to print something by fw\n");
-                /* TBD */
-                break;
-
-        case IPC_IA_FW_INIT_CMPLT: {
-                /* send next data to FW */
-                process_fw_init(msg);
-                break;
-        }
-
-        case IPC_SST_STREAM_PROCESS_FATAL_ERR:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("stream id %d invalid\n", str_id);
-                        break;
-                }
-                pr_err("codec fatal error %x stream %d...\n",
-                                msg->header.full, msg->header.part.str_id);
-                pr_err("Dropping the stream\n");
-                sst_drop_stream(msg->header.part.str_id);
-                break;
-        case IPC_IA_LPE_GETTING_STALLED:
-                sst_drv_ctx->lpe_stalled = 1;
-                break;
-        case IPC_IA_LPE_UNSTALLED:
-                sst_drv_ctx->lpe_stalled = 0;
-                break;
-        default:
-                /* Illegal case */
-                pr_err("Unhandled msg %x header %x\n",
-                msg->header.part.msg_id, msg->header.full);
-        }
-        sst_clear_interrupt();
-        return;
-}
-
-/**
-* sst_process_reply - Processes reply message from SST
-*
-* @work:        Pointer to work structure
-*
-* This function is scheduled by ISR
-* It take a reply msg from response_queue and
-* does action based on msg
-*/
-void sst_process_reply(struct work_struct *work)
-{
-        struct sst_ipc_msg_wq *msg =
-                        container_of(work, struct sst_ipc_msg_wq, wq);
-
-        int str_id = msg->header.part.str_id;
-        struct stream_info *str_info;
-
-        switch (msg->header.part.msg_id) {
-        case IPC_IA_TARGET_DEV_SELECT:
-                if (!msg->header.part.data) {
-                        sst_drv_ctx->tgt_dev_blk.ret_code = 0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                        msg->header.part.msg_id, msg->header.part.data);
-                        sst_drv_ctx->tgt_dev_blk.ret_code =
-                                        -msg->header.part.data;
-                }
-
-                if (sst_drv_ctx->tgt_dev_blk.on == true) {
-                                sst_drv_ctx->tgt_dev_blk.condition = true;
-                                wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_ALG_PARAMS: {
-                pr_debug("sst:IPC_ALG_PARAMS response %x\n", msg->header.full);
-                pr_debug("sst: data value %x\n", msg->header.part.data);
-                pr_debug("sst: large value %x\n", msg->header.part.large);
-
-                if (!msg->header.part.large) {
-                        if (!msg->header.part.data) {
-                                pr_debug("sst: alg set success\n");
-                                sst_drv_ctx->ppp_params_blk.ret_code = 0;
-                        } else {
-                                pr_debug("sst: alg set failed\n");
-                                sst_drv_ctx->ppp_params_blk.ret_code =
-                                                        -msg->header.part.data;
-                        }
-
-                } else if (msg->header.part.data) {
-                        struct snd_ppp_params *mailbox_params, *get_params;
-                        char *params;
-
-                        pr_debug("sst: alg get success\n");
-                        mailbox_params = (struct snd_ppp_params *)msg->mailbox;
-                        get_params = kzalloc(sizeof(*get_params), GFP_KERNEL);
-                        if (get_params == NULL) {
-                                pr_err("sst: out of memory for ALG PARAMS");
-                                break;
-                        }
-                        memcpy_fromio(get_params, mailbox_params,
-                                                        sizeof(*get_params));
-                        get_params->params = kzalloc(mailbox_params->size,
-                                                        GFP_KERNEL);
-                        if (get_params->params == NULL) {
-                                kfree(get_params);
-                                pr_err("sst: out of memory for ALG PARAMS block");
-                                break;
-                        }
-                        params = msg->mailbox;
-                        params = params + sizeof(*mailbox_params) - sizeof(u32);
-                        memcpy_fromio(get_params->params, params,
-                                                        get_params->size);
-                        sst_drv_ctx->ppp_params_blk.ret_code = 0;
-                        sst_drv_ctx->ppp_params_blk.data = get_params;
-                }
-
-                if (sst_drv_ctx->ppp_params_blk.on == true) {
-                        sst_drv_ctx->ppp_params_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        }
-
-        case IPC_IA_TUNING_PARAMS: {
-                pr_debug("sst:IPC_TUNING_PARAMS resp: %x\n", msg->header.full);
-                pr_debug("data value %x\n", msg->header.part.data);
-                if (msg->header.part.large) {
-                        pr_debug("alg set failed\n");
-                        sst_drv_ctx->ppp_params_blk.ret_code =
-                                                        -msg->header.part.data;
-                } else {
-                        pr_debug("alg set success\n");
-                        sst_drv_ctx->ppp_params_blk.ret_code = 0;
-                }
-                if (sst_drv_ctx->ppp_params_blk.on == true) {
-                        sst_drv_ctx->ppp_params_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-        }
-
-        case IPC_IA_GET_FW_INFO: {
-                struct snd_sst_fw_info *fw_info =
-                        (struct snd_sst_fw_info *)msg->mailbox;
-                if (msg->header.part.large) {
-                        int major = fw_info->fw_version.major;
-                        int minor = fw_info->fw_version.minor;
-                        int build = fw_info->fw_version.build;
-                        pr_debug("Msg succeeded %x\n",
-                                       msg->header.part.msg_id);
-                        pr_debug("INFO: ***FW*** = %02d.%02d.%02d\n",
-                                        major, minor, build);
-                        memcpy_fromio(sst_drv_ctx->fw_info_blk.data,
-                                ((struct snd_sst_fw_info *)(msg->mailbox)),
-                                sizeof(struct snd_sst_fw_info));
-                        sst_drv_ctx->fw_info_blk.ret_code = 0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                        msg->header.part.msg_id, msg->header.part.data);
-                        sst_drv_ctx->fw_info_blk.ret_code =
-                                        -msg->header.part.data;
-                }
-                if (sst_drv_ctx->fw_info_blk.on == true) {
-                        pr_debug("Memcopy succeeded\n");
-                        sst_drv_ctx->fw_info_blk.on = false;
-                        sst_drv_ctx->fw_info_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        }
-        case IPC_IA_SET_STREAM_MUTE:
-                if (!msg->header.part.data) {
-                        pr_debug("Msg succeeded %x\n",
-                                       msg->header.part.msg_id);
-                        sst_drv_ctx->mute_info_blk.ret_code = 0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                        msg->header.part.msg_id, msg->header.part.data);
-                        sst_drv_ctx->mute_info_blk.ret_code =
-                                        -msg->header.part.data;
-
-                }
-                if (sst_drv_ctx->mute_info_blk.on == true) {
-                        sst_drv_ctx->mute_info_blk.on = false;
-                        sst_drv_ctx->mute_info_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_SET_STREAM_VOL:
-                if (!msg->header.part.data) {
-                        pr_debug("Msg succeeded %x\n",
-                                       msg->header.part.msg_id);
-                        sst_drv_ctx->vol_info_blk.ret_code = 0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                                        msg->header.part.msg_id,
-                        msg->header.part.data);
-                        sst_drv_ctx->vol_info_blk.ret_code =
-                                        -msg->header.part.data;
-
-                }
-
-                if (sst_drv_ctx->vol_info_blk.on == true) {
-                        sst_drv_ctx->vol_info_blk.on = false;
-                        sst_drv_ctx->vol_info_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_GET_STREAM_VOL:
-                if (msg->header.part.large) {
-                        pr_debug("Large Msg Received Successfully\n");
-                        pr_debug("Msg succeeded %x\n",
-                                       msg->header.part.msg_id);
-                        memcpy_fromio(sst_drv_ctx->vol_info_blk.data,
-                                (void *) msg->mailbox,
-                                sizeof(struct snd_sst_vol));
-                        sst_drv_ctx->vol_info_blk.ret_code = 0;
-                } else {
-                        pr_err("Msg %x reply error %x\n",
-                        msg->header.part.msg_id, msg->header.part.data);
-                        sst_drv_ctx->vol_info_blk.ret_code =
-                                        -msg->header.part.data;
-                }
-                if (sst_drv_ctx->vol_info_blk.on == true) {
-                        sst_drv_ctx->vol_info_blk.on = false;
-                        sst_drv_ctx->vol_info_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-
-        case IPC_IA_GET_STREAM_PARAMS:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("stream id %d invalid\n", str_id);
-                        break;
-                }
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (msg->header.part.large) {
-                        pr_debug("Get stream large success\n");
-                        memcpy_fromio(str_info->ctrl_blk.data,
-                                ((void *)(msg->mailbox)),
-                                sizeof(struct snd_sst_fw_get_stream_params));
-                        str_info->ctrl_blk.ret_code = 0;
-                } else {
-                        pr_err("Msg %x reply error %x\n",
-                                msg->header.part.msg_id, msg->header.part.data);
-                        str_info->ctrl_blk.ret_code = -msg->header.part.data;
-                }
-                if (str_info->ctrl_blk.on == true) {
-                        str_info->ctrl_blk.on = false;
-                        str_info->ctrl_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_DECODE_FRAMES:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("stream id %d invalid\n", str_id);
-                        break;
-                }
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (msg->header.part.large) {
-                        pr_debug("Msg succeeded %x\n",
-                                       msg->header.part.msg_id);
-                        memcpy_fromio(str_info->data_blk.data,
-                                        ((void *)(msg->mailbox)),
-                                        sizeof(struct snd_sst_decode_info));
-                        str_info->data_blk.ret_code = 0;
-                } else {
-                        pr_err("Msg %x reply error %x\n",
-                                msg->header.part.msg_id, msg->header.part.data);
-                        str_info->data_blk.ret_code = -msg->header.part.data;
-                }
-                if (str_info->data_blk.on == true) {
-                        str_info->data_blk.on = false;
-                        str_info->data_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_DRAIN_STREAM:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("stream id %d invalid\n", str_id);
-                        break;
-                }
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (!msg->header.part.data) {
-                        pr_debug("Msg succeeded %x\n",
-                                        msg->header.part.msg_id);
-                        str_info->ctrl_blk.ret_code = 0;
-
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                                msg->header.part.msg_id, msg->header.part.data);
-                        str_info->ctrl_blk.ret_code = -msg->header.part.data;
-
-                }
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (str_info->data_blk.on == true) {
-                        str_info->data_blk.on = false;
-                        str_info->data_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-
-        case IPC_IA_DROP_STREAM:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("str id %d invalid\n", str_id);
-                        break;
-                }
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (msg->header.part.large) {
-                        struct snd_sst_drop_response *drop_resp =
-                                (struct snd_sst_drop_response *)msg->mailbox;
-
-                        pr_debug("Drop ret bytes %x\n", drop_resp->bytes);
-
-                        str_info->curr_bytes = drop_resp->bytes;
-                        str_info->ctrl_blk.ret_code =  0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                                msg->header.part.msg_id, msg->header.part.data);
-                        str_info->ctrl_blk.ret_code = -msg->header.part.data;
-                }
-                if (str_info->ctrl_blk.on == true) {
-                        str_info->ctrl_blk.on = false;
-                        str_info->ctrl_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_ENABLE_RX_TIME_SLOT:
-                if (!msg->header.part.data) {
-                        pr_debug("RX_TIME_SLOT success\n");
-                        sst_drv_ctx->hs_info_blk.ret_code = 0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                                msg->header.part.msg_id,
-                                msg->header.part.data);
-                        sst_drv_ctx->hs_info_blk.ret_code =
-                                -msg->header.part.data;
-                }
-                if (sst_drv_ctx->hs_info_blk.on == true) {
-                        sst_drv_ctx->hs_info_blk.on = false;
-                        sst_drv_ctx->hs_info_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_PAUSE_STREAM:
-        case IPC_IA_RESUME_STREAM:
-        case IPC_IA_SET_STREAM_PARAMS:
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (!msg->header.part.data) {
-                        pr_debug("Msg succeeded %x\n",
-                                        msg->header.part.msg_id);
-                        str_info->ctrl_blk.ret_code = 0;
-                } else {
-                        pr_err(" Msg %x reply error %x\n",
-                                        msg->header.part.msg_id,
-                                        msg->header.part.data);
-                        str_info->ctrl_blk.ret_code = -msg->header.part.data;
-                }
-                if (sst_validate_strid(str_id)) {
-                        pr_err(" stream id %d invalid\n", str_id);
-                        break;
-                }
-
-                if (str_info->ctrl_blk.on == true) {
-                        str_info->ctrl_blk.on = false;
-                        str_info->ctrl_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-
-        case IPC_IA_FREE_STREAM:
-                str_info = &sst_drv_ctx->streams[str_id];
-                if (!msg->header.part.data) {
-                        pr_debug("Stream %d freed\n", str_id);
-                } else {
-                        pr_err("Free for %d ret error %x\n",
-                                       str_id, msg->header.part.data);
-                }
-                if (str_info->ctrl_blk.on == true) {
-                        str_info->ctrl_blk.on = false;
-                        str_info->ctrl_blk.condition = true;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                break;
-        case IPC_IA_ALLOC_STREAM: {
-                /* map to stream, call play */
-                struct snd_sst_alloc_response *resp =
-                                (struct snd_sst_alloc_response *)msg->mailbox;
-                if (resp->str_type.result)
-                        pr_err("error alloc stream = %x\n",
-                                       resp->str_type.result);
-                sst_alloc_stream_response(str_id, resp);
-                break;
-        }
-
-        case IPC_IA_PLAY_FRAMES:
-        case IPC_IA_CAPT_FRAMES:
-                if (sst_validate_strid(str_id)) {
-                        pr_err("stream id %d invalid\n", str_id);
-                        break;
-                }
-                pr_debug("Ack for play/capt frames received\n");
-                break;
-
-        case IPC_IA_PREP_LIB_DNLD: {
-                struct snd_sst_str_type *str_type =
-                        (struct snd_sst_str_type *)msg->mailbox;
-                pr_debug("Prep Lib download %x\n",
-                                msg->header.part.msg_id);
-                if (str_type->result)
-                        pr_err("Prep lib download %x\n", str_type->result);
-                else
-                        pr_debug("Can download codec now...\n");
-                sst_wake_up_alloc_block(sst_drv_ctx, str_id,
-                                str_type->result, NULL);
-                break;
-        }
-
-        case IPC_IA_LIB_DNLD_CMPLT: {
-                struct snd_sst_lib_download_info *resp =
-                        (struct snd_sst_lib_download_info *)msg->mailbox;
-                int retval = resp->result;
-
-                pr_debug("Lib downloaded %x\n", msg->header.part.msg_id);
-                if (resp->result) {
-                        pr_err("err in lib dload %x\n", resp->result);
-                } else {
-                        pr_debug("Codec download complete...\n");
-                        pr_debug("codec Type %d Ver %d Built %s: %s\n",
-                                resp->dload_lib.lib_info.lib_type,
-                                resp->dload_lib.lib_info.lib_version,
-                                resp->dload_lib.lib_info.b_date,
-                                resp->dload_lib.lib_info.b_time);
-                }
-                sst_wake_up_alloc_block(sst_drv_ctx, str_id,
-                                                retval, NULL);
-                break;
-        }
-
-        case IPC_IA_GET_FW_VERSION: {
-                struct ipc_header_fw_init *version =
-                                (struct ipc_header_fw_init *)msg->mailbox;
-                int major = version->fw_version.major;
-                int minor = version->fw_version.minor;
-                int build = version->fw_version.build;
-                dev_info(&sst_drv_ctx->pci->dev,
-                        "INFO: ***LOADED SST FW VERSION*** = %02d.%02d.%02d\n",
-                major, minor, build);
-                break;
-        }
-        case IPC_IA_GET_FW_BUILD_INF: {
-                struct sst_fw_build_info *build =
-                        (struct sst_fw_build_info *)msg->mailbox;
-                pr_debug("Build date:%sTime:%s", build->date, build->time);
-                break;
-        }
-        case IPC_IA_SET_PMIC_TYPE:
-                break;
-        case IPC_IA_START_STREAM:
-                pr_debug("reply for START STREAM %x\n", msg->header.full);
-                break;
-
-        case IPC_IA_GET_FW_CTXT:
-                pr_debug("reply for get fw ctxt  %x\n", msg->header.full);
-                if (msg->header.part.data)
-                        sst_drv_ctx->fw_cntx_size = 0;
-                else
-                        sst_drv_ctx->fw_cntx_size = *sst_drv_ctx->fw_cntx;
-                pr_debug("fw copied data %x\n", sst_drv_ctx->fw_cntx_size);
-                sst_wake_up_alloc_block(
-                        sst_drv_ctx, str_id, msg->header.part.data, NULL);
-                break;
-        default:
-                /* Illegal case */
-                pr_err("process reply:default = %x\n", msg->header.full);
-        }
-        sst_clear_interrupt();
-        return;
-}
diff --git a/drivers/staging/intel_sst/intel_sst_pvt.c b/drivers/staging/intel_sst/intel_sst_pvt.c
deleted file mode 100644
index e034bea56f14..000000000000
--- a/drivers/staging/intel_sst/intel_sst_pvt.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- *  intel_sst_pvt.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10       Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This driver exposes the audio engine functionalities to the ALSA
- *      and middleware.
- *
- *  This file contains all private functions
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/fs.h>
-#include <linux/firmware.h>
-#include <linux/sched.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-/*
- * sst_get_block_stream - get a new block stream
- *
- * @sst_drv_ctx: Driver context structure
- *
- * This function assigns a block for the calls that dont have stream context yet
- * the blocks are used for waiting on Firmware's response for any operation
- * Should be called with stream lock held
- */
-int sst_get_block_stream(struct intel_sst_drv *sst_drv_ctx)
-{
-        int i;
-
-        for (i = 0; i < MAX_ACTIVE_STREAM; i++) {
-                if (sst_drv_ctx->alloc_block[i].sst_id == BLOCK_UNINIT) {
-                        sst_drv_ctx->alloc_block[i].ops_block.condition = false;
-                        sst_drv_ctx->alloc_block[i].ops_block.ret_code = 0;
-                        sst_drv_ctx->alloc_block[i].sst_id = 0;
-                        break;
-                }
-        }
-        if (i == MAX_ACTIVE_STREAM) {
-                pr_err("max alloc_stream reached\n");
-                i = -EBUSY; /* active stream limit reached */
-        }
-        return i;
-}
-
-/*
- * sst_wait_interruptible - wait on event
- *
- * @sst_drv_ctx: Driver context
- * @block: Driver block to wait on
- *
- * This function waits without a timeout (and is interruptable) for a
- * given block event
- */
-int sst_wait_interruptible(struct intel_sst_drv *sst_drv_ctx,
-                                struct sst_block *block)
-{
-        int retval = 0;
-
-        if (!wait_event_interruptible(sst_drv_ctx->wait_queue,
-                                block->condition)) {
-                /* event wake */
-                if (block->ret_code < 0) {
-                        pr_err("stream failed %d\n", block->ret_code);
-                        retval = -EBUSY;
-                } else {
-                        pr_debug("event up\n");
-                        retval = 0;
-                }
-        } else {
-                pr_err("signal interrupted\n");
-                retval = -EINTR;
-        }
-        return retval;
-
-}
-
-
-/*
- * sst_wait_interruptible_timeout - wait on event interruptable
- *
- * @sst_drv_ctx: Driver context
- * @block: Driver block to wait on
- * @timeout: time for wait on
- *
- * This function waits with a timeout value (and is interruptible) on a
- * given block event
- */
-int sst_wait_interruptible_timeout(
-                        struct intel_sst_drv *sst_drv_ctx,
-                        struct sst_block *block, int timeout)
-{
-        int retval = 0;
-
-        pr_debug("sst_wait_interruptible_timeout - waiting....\n");
-        if (wait_event_interruptible_timeout(sst_drv_ctx->wait_queue,
-                                                block->condition,
-                                                msecs_to_jiffies(timeout))) {
-                if (block->ret_code < 0)
-                        pr_err("stream failed %d\n", block->ret_code);
-                else
-                        pr_debug("event up\n");
-                retval = block->ret_code;
-        } else {
-                block->on = false;
-                pr_err("timeout occurred...\n");
-                /*setting firmware state as uninit so that the
-                firmware will get re-downloaded on next request
-                this is because firmare not responding for 5 sec
-                is equalant to some unrecoverable error of FW
-                sst_drv_ctx->sst_state = SST_UN_INIT;*/
-                retval = -EBUSY;
-        }
-        return retval;
-
-}
-
-
-/*
- * sst_wait_timeout - wait on event for timeout
- *
- * @sst_drv_ctx: Driver context
- * @block: Driver block to wait on
- *
- * This function waits with a timeout value (and is not interruptible) on a
- * given block event
- */
-int sst_wait_timeout(struct intel_sst_drv *sst_drv_ctx,
-                struct stream_alloc_block *block)
-{
-        int retval = 0;
-
-        /* NOTE:
-        Observed that FW processes the alloc msg and replies even
-        before the alloc thread has finished execution */
-        pr_debug("waiting for %x, condition %x\n",
-                       block->sst_id, block->ops_block.condition);
-        if (wait_event_interruptible_timeout(sst_drv_ctx->wait_queue,
-                                block->ops_block.condition,
-                                msecs_to_jiffies(SST_BLOCK_TIMEOUT))) {
-                /* event wake */
-                pr_debug("Event wake %x\n", block->ops_block.condition);
-                pr_debug("message ret: %d\n", block->ops_block.ret_code);
-                retval = block->ops_block.ret_code;
-        } else {
-                block->ops_block.on = false;
-                pr_err("Wait timed-out %x\n", block->ops_block.condition);
-                /* settign firmware state as uninit so that the
-                firmware will get redownloaded on next request
-                this is because firmare not responding for 5 sec
-                is equalant to some unrecoverable error of FW
-                sst_drv_ctx->sst_state = SST_UN_INIT;*/
-                retval = -EBUSY;
-        }
-        return retval;
-
-}
-
-/*
- * sst_create_large_msg - create a large IPC message
- *
- * @arg: ipc message
- *
- * this function allocates structures to send a large message to the firmware
- */
-int sst_create_large_msg(struct ipc_post **arg)
-{
-        struct ipc_post *msg;
-
-        msg = kzalloc(sizeof(struct ipc_post), GFP_ATOMIC);
-        if (!msg) {
-                pr_err("kzalloc msg failed\n");
-                return -ENOMEM;
-        }
-
-        msg->mailbox_data = kzalloc(SST_MAILBOX_SIZE, GFP_ATOMIC);
-        if (!msg->mailbox_data) {
-                kfree(msg);
-                pr_err("kzalloc mailbox_data failed");
-                return -ENOMEM;
-        }
-        *arg = msg;
-        return 0;
-}
-
-/*
- * sst_create_short_msg - create a short IPC message
- *
- * @arg: ipc message
- *
- * this function allocates structures to send a short message to the firmware
- */
-int sst_create_short_msg(struct ipc_post **arg)
-{
-        struct ipc_post *msg;
-
-        msg = kzalloc(sizeof(*msg), GFP_ATOMIC);
-        if (!msg) {
-                pr_err("kzalloc msg failed\n");
-                return -ENOMEM;
-        }
-        msg->mailbox_data = NULL;
-        *arg = msg;
-        return 0;
-}
-
-/*
- * sst_clean_stream - clean the stream context
- *
- * @stream: stream structure
- *
- * this function resets the stream contexts
- * should be called in free
- */
-void sst_clean_stream(struct stream_info *stream)
-{
-        struct sst_stream_bufs *bufs = NULL, *_bufs;
-        stream->status = STREAM_UN_INIT;
-        stream->prev = STREAM_UN_INIT;
-        mutex_lock(&stream->lock);
-        list_for_each_entry_safe(bufs, _bufs, &stream->bufs, node) {
-                list_del(&bufs->node);
-                kfree(bufs);
-        }
-        mutex_unlock(&stream->lock);
-
-        if (stream->ops != STREAM_OPS_PLAYBACK_DRM)
-                kfree(stream->decode_ibuf);
-}
-
-/*
- * sst_wake_up_alloc_block - wake up waiting block
- *
- * @sst_drv_ctx: Driver context
- * @sst_id: stream id
- * @status: status of wakeup
- * @data: data pointer of wakeup
- *
- * This function wakes up a sleeping block event based on the response
- */
-void sst_wake_up_alloc_block(struct intel_sst_drv *sst_drv_ctx,
-                u8 sst_id, int status, void *data)
-{
-        int i;
-
-        /* Unblock with retval code */
-        for (i = 0; i < MAX_ACTIVE_STREAM; i++) {
-                if (sst_id == sst_drv_ctx->alloc_block[i].sst_id) {
-                        sst_drv_ctx->alloc_block[i].ops_block.condition = true;
-                        sst_drv_ctx->alloc_block[i].ops_block.ret_code = status;
-                        sst_drv_ctx->alloc_block[i].ops_block.data = data;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                        break;
-                }
-        }
-}
-
-/*
- * sst_enable_rx_timeslot - Send msg to query for stream parameters
- * @status: rx timeslot to be enabled
- *
- * This function is called when the RX timeslot is required to be enabled
- */
-int sst_enable_rx_timeslot(int status)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-
-        if (sst_create_short_msg(&msg)) {
-                pr_err("mem allocation failed\n");
-                        return -ENOMEM;
-        }
-        pr_debug("ipc message sending: ENABLE_RX_TIME_SLOT\n");
-        sst_fill_header(&msg->header, IPC_IA_ENABLE_RX_TIME_SLOT, 0, 0);
-        msg->header.part.data = status;
-        sst_drv_ctx->hs_info_blk.condition = false;
-        sst_drv_ctx->hs_info_blk.ret_code = 0;
-        sst_drv_ctx->hs_info_blk.on = true;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node,
-                        &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &sst_drv_ctx->hs_info_blk, SST_BLOCK_TIMEOUT);
-        return retval;
-}
-
diff --git a/drivers/staging/intel_sst/intel_sst_stream.c b/drivers/staging/intel_sst/intel_sst_stream.c
deleted file mode 100644
index be4565e74f8c..000000000000
--- a/drivers/staging/intel_sst/intel_sst_stream.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- *  intel_sst_stream.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file contains the stream operations of SST driver
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/firmware.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
-#include "intel_sst_ioctl.h"
-#include "intel_sst.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-
-/*
- * sst_check_device_type - Check the medfield device type
- *
- * @device: Device to be checked
- * @num_ch: Number of channels queried
- * @pcm_slot: slot to be enabled for this device
- *
- * This checks the deivce against the map and calculates pcm_slot value
- */
-int sst_check_device_type(u32 device, u32 num_chan, u32 *pcm_slot)
-{
-        if (device >= MAX_NUM_STREAMS_MFLD) {
-                pr_debug("device type invalid %d\n", device);
-                return -EINVAL;
-        }
-        if (sst_drv_ctx->streams[device].status == STREAM_UN_INIT) {
-                if (device == SND_SST_DEVICE_VIBRA && num_chan == 1)
-                        *pcm_slot = 0x10;
-                else if (device == SND_SST_DEVICE_HAPTIC && num_chan == 1)
-                        *pcm_slot = 0x20;
-                else if (device == SND_SST_DEVICE_IHF && num_chan == 1)
-                        *pcm_slot = 0x04;
-                else if (device == SND_SST_DEVICE_IHF && num_chan == 2)
-                        *pcm_slot = 0x0C;
-                else if (device == SND_SST_DEVICE_HEADSET && num_chan == 1)
-                        *pcm_slot = 0x01;
-                else if (device == SND_SST_DEVICE_HEADSET && num_chan == 2)
-                        *pcm_slot = 0x03;
-                else if (device == SND_SST_DEVICE_CAPTURE && num_chan == 1)
-                        *pcm_slot = 0x01;
-                else if (device == SND_SST_DEVICE_CAPTURE && num_chan == 2)
-                        *pcm_slot = 0x03;
-                else if (device == SND_SST_DEVICE_CAPTURE && num_chan == 3)
-                        *pcm_slot = 0x07;
-                else if (device == SND_SST_DEVICE_CAPTURE && num_chan == 4)
-                        *pcm_slot = 0x0F;
-                else if (device == SND_SST_DEVICE_CAPTURE && num_chan > 4)
-                        *pcm_slot = 0x1F;
-                else {
-                        pr_debug("No condition satisfied.. ret err\n");
-                        return -EINVAL;
-                }
-        } else {
-                pr_debug("this stream state is not uni-init, is %d\n",
-                                sst_drv_ctx->streams[device].status);
-                return -EBADRQC;
-        }
-        pr_debug("returning slot %x\n", *pcm_slot);
-        return 0;
-}
-/**
- * get_mrst_stream_id   -       gets a new stream id for use
- *
- * This functions searches the current streams and allocated an empty stream
- * lock stream_lock required to be held before calling this
- */
-static unsigned int get_mrst_stream_id(void)
-{
-        int i;
-
-        for (i = 1; i <= MAX_NUM_STREAMS_MRST; i++) {
-                if (sst_drv_ctx->streams[i].status == STREAM_UN_INIT)
-                        return i;
-        }
-        pr_debug("Didn't find empty stream for mrst\n");
-        return -EBUSY;
-}
-
-/**
- * sst_alloc_stream - Send msg for a new stream ID
- *
- * @params:     stream params
- * @stream_ops: operation of stream PB/capture
- * @codec:      codec for stream
- * @device:     device stream to be allocated for
- *
- * This function is called by any function which wants to start
- * a new stream. This also check if a stream exists which is idle
- * it initializes idle stream id to this request
- */
-int sst_alloc_stream(char *params, unsigned int stream_ops,
-               u8 codec, unsigned int device)
-{
-        struct ipc_post *msg = NULL;
-        struct snd_sst_alloc_params alloc_param;
-        unsigned int pcm_slot = 0, num_ch;
-        int str_id;
-        struct snd_sst_stream_params *sparams;
-        struct stream_info *str_info;
-
-        pr_debug("SST DBG:entering sst_alloc_stream\n");
-        pr_debug("SST DBG:%d %d %d\n", stream_ops, codec, device);
-
-        BUG_ON(!params);
-        sparams = (struct snd_sst_stream_params *)params;
-        num_ch = sparams->uc.pcm_params.num_chan;
-        /*check the device type*/
-        if (sst_drv_ctx->pci_id == SST_MFLD_PCI_ID) {
-                if (sst_check_device_type(device, num_ch, &pcm_slot))
-                        return -EINVAL;
-                mutex_lock(&sst_drv_ctx->stream_lock);
-                str_id = device;
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-                pr_debug("SST_DBG: slot %x\n", pcm_slot);
-        } else {
-                mutex_lock(&sst_drv_ctx->stream_lock);
-                str_id = get_mrst_stream_id();
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-                if (str_id <= 0)
-                        return -EBUSY;
-        }
-        /*allocate device type context*/
-        sst_init_stream(&sst_drv_ctx->streams[str_id], codec,
-                        str_id, stream_ops, pcm_slot, device);
-        /* send msg to FW to allocate a stream */
-        if (sst_create_large_msg(&msg))
-                return -ENOMEM;
-
-        sst_fill_header(&msg->header, IPC_IA_ALLOC_STREAM, 1, str_id);
-        msg->header.part.data = sizeof(alloc_param) + sizeof(u32);
-        alloc_param.str_type.codec_type = codec;
-        alloc_param.str_type.str_type = SST_STREAM_TYPE_MUSIC;
-        alloc_param.str_type.operation = stream_ops;
-        alloc_param.str_type.protected_str = 0; /* non drm */
-        alloc_param.str_type.time_slots = pcm_slot;
-        alloc_param.str_type.result = alloc_param.str_type.reserved = 0;
-        memcpy(&alloc_param.stream_params, params,
-                        sizeof(struct snd_sst_stream_params));
-
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), &alloc_param,
-                        sizeof(alloc_param));
-        str_info = &sst_drv_ctx->streams[str_id];
-        str_info->ctrl_blk.condition = false;
-        str_info->ctrl_blk.ret_code = 0;
-        str_info->ctrl_blk.on = true;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        pr_debug("SST DBG:alloc stream done\n");
-        return str_id;
-}
-
-
-/*
- * sst_alloc_stream_response - process alloc reply
- *
- * @str_id:     stream id for which the stream has been allocated
- * @resp                the stream response from firware
- *
- * This function is called by firmware as a response to stream allcoation
- * request
- */
-int sst_alloc_stream_response(unsigned int str_id,
-                                struct snd_sst_alloc_response *resp)
-{
-        int retval = 0;
-        struct stream_info *str_info;
-        struct snd_sst_lib_download *lib_dnld;
-
-        pr_debug("SST DEBUG: stream number given = %d\n", str_id);
-        str_info = &sst_drv_ctx->streams[str_id];
-        if (resp->str_type.result == SST_LIB_ERR_LIB_DNLD_REQUIRED) {
-                lib_dnld = kzalloc(sizeof(*lib_dnld), GFP_KERNEL);
-                memcpy(lib_dnld, &resp->lib_dnld, sizeof(*lib_dnld));
-        } else
-                lib_dnld = NULL;
-        if (str_info->ctrl_blk.on == true) {
-                str_info->ctrl_blk.on = false;
-                str_info->ctrl_blk.data = lib_dnld;
-                str_info->ctrl_blk.condition = true;
-                str_info->ctrl_blk.ret_code = resp->str_type.result;
-                pr_debug("SST DEBUG: sst_alloc_stream_response: waking up.\n");
-                wake_up(&sst_drv_ctx->wait_queue);
-        }
-        return retval;
-}
-
-
-/**
-* sst_get_fw_info - Send msg to query for firmware configurations
-* @info: out param that holds the firmare configurations
-*
-* This function is called when the firmware configurations are queiried for
-*/
-int sst_get_fw_info(struct snd_sst_fw_info *info)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-
-        pr_debug("SST DBG:sst_get_fw_info called\n");
-
-        if (sst_create_short_msg(&msg)) {
-                pr_err("SST ERR: message creation failed\n");
-                return -ENOMEM;
-        }
-
-        sst_fill_header(&msg->header, IPC_IA_GET_FW_INFO, 0, 0);
-        sst_drv_ctx->fw_info_blk.condition = false;
-        sst_drv_ctx->fw_info_blk.ret_code = 0;
-        sst_drv_ctx->fw_info_blk.on = true;
-        sst_drv_ctx->fw_info_blk.data = info;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &sst_drv_ctx->fw_info_blk, SST_BLOCK_TIMEOUT);
-        if (retval) {
-                pr_err("SST ERR: error in fw_info = %d\n", retval);
-                retval = -EIO;
-        }
-        return retval;
-}
-
-
-/**
-* sst_pause_stream - Send msg for a pausing stream
-* @str_id:       stream ID
-*
-* This function is called by any function which wants to pause
-* an already running stream.
-*/
-int sst_start_stream(int str_id)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-
-        pr_debug("sst_start_stream for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-        if (str_info->status != STREAM_INIT)
-                return -EBADRQC;
-        if (sst_create_short_msg(&msg))
-                return -ENOMEM;
-
-        sst_fill_header(&msg->header, IPC_IA_START_STREAM, 0, str_id);
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        return retval;
-}
-
-/*
- * sst_pause_stream - Send msg for a pausing stream
- * @str_id:      stream ID
- *
- * This function is called by any function which wants to pause
- * an already running stream.
- */
-int sst_pause_stream(int str_id)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-
-        pr_debug("SST DBG:sst_pause_stream for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-        if (str_info->status == STREAM_PAUSED)
-                return 0;
-        if (str_info->status == STREAM_RUNNING ||
-                str_info->status == STREAM_INIT) {
-                if (str_info->prev == STREAM_UN_INIT)
-                        return -EBADRQC;
-                if (str_info->ctrl_blk.on == true) {
-                        pr_err("SST ERR: control path is in use\n");
-                        return -EINVAL;
-                }
-                if (sst_create_short_msg(&msg))
-                        return -ENOMEM;
-
-                sst_fill_header(&msg->header, IPC_IA_PAUSE_STREAM, 0, str_id);
-                str_info->ctrl_blk.condition = false;
-                str_info->ctrl_blk.ret_code = 0;
-                str_info->ctrl_blk.on = true;
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node,
-                                &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-                if (retval == 0) {
-                        str_info->prev = str_info->status;
-                        str_info->status = STREAM_PAUSED;
-                } else if (retval == SST_ERR_INVALID_STREAM_ID) {
-                        retval = -EINVAL;
-                        mutex_lock(&sst_drv_ctx->stream_lock);
-                        sst_clean_stream(str_info);
-                        mutex_unlock(&sst_drv_ctx->stream_lock);
-                }
-        } else {
-                retval = -EBADRQC;
-                pr_err("SST ERR: BADQRC for stream\n");
-        }
-
-        return retval;
-}
-
-/**
- * sst_resume_stream - Send msg for resuming stream
- * @str_id:             stream ID
- *
- * This function is called by any function which wants to resume
- * an already paused stream.
- */
-int sst_resume_stream(int str_id)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-
-        pr_debug("SST DBG:sst_resume_stream for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-        if (str_info->status == STREAM_RUNNING)
-                        return 0;
-        if (str_info->status == STREAM_PAUSED) {
-                if (str_info->ctrl_blk.on == true) {
-                        pr_err("SST ERR: control path in use\n");
-                        return -EINVAL;
-                }
-                if (sst_create_short_msg(&msg)) {
-                        pr_err("SST ERR: mem allocation failed\n");
-                        return -ENOMEM;
-                }
-                sst_fill_header(&msg->header, IPC_IA_RESUME_STREAM, 0, str_id);
-                str_info->ctrl_blk.condition = false;
-                str_info->ctrl_blk.ret_code = 0;
-                str_info->ctrl_blk.on = true;
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node,
-                                &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-                if (!retval) {
-                        if (str_info->prev == STREAM_RUNNING)
-                                str_info->status = STREAM_RUNNING;
-                        else
-                                str_info->status = STREAM_INIT;
-                        str_info->prev = STREAM_PAUSED;
-                } else if (retval == -SST_ERR_INVALID_STREAM_ID) {
-                        retval = -EINVAL;
-                        mutex_lock(&sst_drv_ctx->stream_lock);
-                        sst_clean_stream(str_info);
-                        mutex_unlock(&sst_drv_ctx->stream_lock);
-                }
-        } else {
-                retval = -EBADRQC;
-                pr_err("SST ERR: BADQRC for stream\n");
-        }
-
-        return retval;
-}
-
-
-/**
- * sst_drop_stream - Send msg for stopping stream
- * @str_id:             stream ID
- *
- * This function is called by any function which wants to stop
- * a stream.
- */
-int sst_drop_stream(int str_id)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct sst_stream_bufs *bufs = NULL, *_bufs;
-        struct stream_info *str_info;
-
-        pr_debug("SST DBG:sst_drop_stream for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-
-        if (str_info->status != STREAM_UN_INIT &&
-                str_info->status != STREAM_DECODE) {
-                if (str_info->ctrl_blk.on == true) {
-                        pr_err("SST ERR: control path in use\n");
-                        return -EINVAL;
-                }
-                if (sst_create_short_msg(&msg)) {
-                        pr_err("SST ERR: mem allocation failed\n");
-                        return -ENOMEM;
-                }
-                sst_fill_header(&msg->header, IPC_IA_DROP_STREAM, 0, str_id);
-                str_info->ctrl_blk.condition = false;
-                str_info->ctrl_blk.ret_code = 0;
-                str_info->ctrl_blk.on = true;
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node,
-                                &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-                if (!retval) {
-                        pr_debug("SST DBG:drop success\n");
-                        str_info->prev = STREAM_UN_INIT;
-                        str_info->status = STREAM_INIT;
-                        if (str_info->src != MAD_DRV) {
-                                mutex_lock(&str_info->lock);
-                                list_for_each_entry_safe(bufs, _bufs,
-                                                        &str_info->bufs, node) {
-                                        list_del(&bufs->node);
-                                        kfree(bufs);
-                                }
-                                mutex_unlock(&str_info->lock);
-                        }
-                        str_info->cumm_bytes += str_info->curr_bytes;
-                } else if (retval == -SST_ERR_INVALID_STREAM_ID) {
-                        retval = -EINVAL;
-                        mutex_lock(&sst_drv_ctx->stream_lock);
-                        sst_clean_stream(str_info);
-                        mutex_unlock(&sst_drv_ctx->stream_lock);
-                }
-                if (str_info->data_blk.on == true) {
-                        str_info->data_blk.condition = true;
-                        str_info->data_blk.ret_code = retval;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-        } else {
-                retval = -EBADRQC;
-                pr_err("SST ERR: BADQRC for stream\n");
-        }
-        return retval;
-}
-
-/**
-* sst_drain_stream - Send msg for draining stream
-* @str_id:              stream ID
-*
-* This function is called by any function which wants to drain
-* a stream.
-*/
-int sst_drain_stream(int str_id)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-
-        pr_debug("SST DBG:sst_drain_stream for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-
-        if (str_info->status != STREAM_RUNNING &&
-                str_info->status != STREAM_INIT &&
-                str_info->status != STREAM_PAUSED) {
-                        pr_err("SST ERR: BADQRC for stream = %d\n",
-                                       str_info->status);
-                        return -EBADRQC;
-        }
-
-        if (str_info->status == STREAM_INIT) {
-                if (sst_create_short_msg(&msg)) {
-                        pr_err("SST ERR: mem allocation failed\n");
-                        return -ENOMEM;
-                }
-                sst_fill_header(&msg->header, IPC_IA_DRAIN_STREAM, 0, str_id);
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        } else
-                str_info->need_draining = true;
-        str_info->data_blk.condition = false;
-        str_info->data_blk.ret_code = 0;
-        str_info->data_blk.on = true;
-        retval = sst_wait_interruptible(sst_drv_ctx, &str_info->data_blk);
-        str_info->need_draining = false;
-        return retval;
-}
-
-/**
- * sst_free_stream - Frees a stream
- * @str_id:             stream ID
- *
- * This function is called by any function which wants to free
- * a stream.
- */
-int sst_free_stream(int str_id)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-
-        pr_debug("SST DBG:sst_free_stream for %d\n", str_id);
-
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        str_info = &sst_drv_ctx->streams[str_id];
-
-        if (str_info->status != STREAM_UN_INIT) {
-                if (sst_create_short_msg(&msg)) {
-                        pr_err("SST ERR: mem allocation failed\n");
-                        return -ENOMEM;
-                }
-                sst_fill_header(&msg->header, IPC_IA_FREE_STREAM, 0, str_id);
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                str_info->prev =  str_info->status;
-                str_info->status = STREAM_UN_INIT;
-                if (str_info->data_blk.on == true) {
-                        str_info->data_blk.condition = true;
-                        str_info->data_blk.ret_code = 0;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                str_info->data_blk.on = true;
-                str_info->data_blk.condition = false;
-                retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-                pr_debug("wait for free returned %d\n", retval);
-                msleep(100);
-                mutex_lock(&sst_drv_ctx->stream_lock);
-                sst_clean_stream(str_info);
-                mutex_unlock(&sst_drv_ctx->stream_lock);
-                pr_debug("SST DBG:Stream freed\n");
-        } else {
-                retval = -EBADRQC;
-                pr_debug("SST DBG:BADQRC for stream\n");
-        }
-
-        return retval;
-}
-
-
diff --git a/drivers/staging/intel_sst/intel_sst_stream_encoded.c b/drivers/staging/intel_sst/intel_sst_stream_encoded.c
deleted file mode 100644
index 2be58c5cba02..000000000000
--- a/drivers/staging/intel_sst/intel_sst_stream_encoded.c
+++ /dev/null
@@ -1,1273 +0,0 @@
-/*
- *  intel_sst_stream.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file contains the stream operations of SST driver
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/syscalls.h>
-#include <linux/firmware.h>
-#include <linux/sched.h>
-#ifdef CONFIG_MRST_RAR_HANDLER
-#include <linux/rar_register.h>
-#include "../memrar/memrar.h"
-#endif
-#include "intel_sst_ioctl.h"
-#include "intel_sst.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-/**
-* sst_get_stream_params - Send msg to query for stream parameters
-* @str_id:      stream id for which the parameters are queried for
-* @get_params:  out parameters to which the parameters are copied to
-*
-* This function is called when the stream parameters are queiried for
-*/
-int sst_get_stream_params(int str_id,
-                        struct snd_sst_get_stream_params *get_params)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-        struct snd_sst_fw_get_stream_params *fw_params;
-
-        pr_debug("get_stream for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-
-        str_info = &sst_drv_ctx->streams[str_id];
-        if (str_info->status != STREAM_UN_INIT) {
-                if (str_info->ctrl_blk.on == true) {
-                        pr_err("control path in use\n");
-                        return -EINVAL;
-                }
-                if (sst_create_short_msg(&msg)) {
-                        pr_err("message creation failed\n");
-                        return -ENOMEM;
-                }
-                fw_params = kzalloc(sizeof(*fw_params), GFP_ATOMIC);
-                if (!fw_params) {
-                        pr_err("mem allocation failed\n");
-                        kfree(msg);
-                        return -ENOMEM;
-                }
-
-                sst_fill_header(&msg->header, IPC_IA_GET_STREAM_PARAMS,
-                                        0, str_id);
-                str_info->ctrl_blk.condition = false;
-                str_info->ctrl_blk.ret_code = 0;
-                str_info->ctrl_blk.on = true;
-                str_info->ctrl_blk.data = (void *) fw_params;
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-                if (retval) {
-                        get_params->codec_params.result = retval;
-                        kfree(fw_params);
-                        return -EIO;
-                }
-                memcpy(&get_params->pcm_params, &fw_params->pcm_params,
-                                sizeof(fw_params->pcm_params));
-                memcpy(&get_params->codec_params.sparams,
-                                &fw_params->codec_params,
-                                sizeof(fw_params->codec_params));
-                get_params->codec_params.result = 0;
-                get_params->codec_params.stream_id = str_id;
-                get_params->codec_params.codec = str_info->codec;
-                get_params->codec_params.ops = str_info->ops;
-                get_params->codec_params.stream_type = str_info->str_type;
-                kfree(fw_params);
-        } else {
-                pr_debug("Stream is not in the init state\n");
-        }
-        return retval;
-}
-
-/**
- * sst_set_stream_param - Send msg for setting stream parameters
- *
- * @str_id: stream id
- * @str_param: stream params
- *
- * This function sets stream params during runtime
- */
-int sst_set_stream_param(int str_id, struct snd_sst_params *str_param)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct stream_info *str_info;
-
-        BUG_ON(!str_param);
-        if (sst_drv_ctx->streams[str_id].ops != str_param->ops) {
-                pr_err("Invalid operation\n");
-                return -EINVAL;
-        }
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        pr_debug("set_stream for %d\n", str_id);
-        str_info =  &sst_drv_ctx->streams[str_id];
-        if (sst_drv_ctx->streams[str_id].status == STREAM_INIT) {
-                if (str_info->ctrl_blk.on == true) {
-                        pr_err("control path in use\n");
-                        return -EAGAIN;
-                }
-                if (sst_create_large_msg(&msg))
-                        return -ENOMEM;
-
-                sst_fill_header(&msg->header,
-                                IPC_IA_SET_STREAM_PARAMS, 1, str_id);
-                str_info->ctrl_blk.condition = false;
-                str_info->ctrl_blk.ret_code = 0;
-                str_info->ctrl_blk.on = true;
-                msg->header.part.data = sizeof(u32) +
-                                sizeof(str_param->sparams);
-                memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-                memcpy(msg->mailbox_data + sizeof(u32), &str_param->sparams,
-                                sizeof(str_param->sparams));
-                spin_lock(&sst_drv_ctx->list_spin_lock);
-                list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-                spin_unlock(&sst_drv_ctx->list_spin_lock);
-                sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                                &str_info->ctrl_blk, SST_BLOCK_TIMEOUT);
-                if (retval < 0) {
-                        retval = -EIO;
-                        sst_clean_stream(str_info);
-                }
-        } else {
-                retval = -EBADRQC;
-                pr_err("BADQRC for stream\n");
-        }
-        return retval;
-}
-
-/**
-* sst_get_vol - This function allows to get the premix gain or gain of a stream
-*
-* @get_vol: this is an output param through which the volume
-*       structure is passed back to user
-*
-* This function is called when the premix gain or stream gain is queried for
-*/
-int sst_get_vol(struct snd_sst_vol *get_vol)
-{
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-        struct snd_sst_vol *fw_get_vol;
-        int str_id = get_vol->stream_id;
-
-        pr_debug("get vol called\n");
-
-        if (sst_create_short_msg(&msg))
-                return -ENOMEM;
-
-        sst_fill_header(&msg->header,
-                                IPC_IA_GET_STREAM_VOL, 0, str_id);
-        sst_drv_ctx->vol_info_blk.condition = false;
-        sst_drv_ctx->vol_info_blk.ret_code = 0;
-        sst_drv_ctx->vol_info_blk.on = true;
-        fw_get_vol = kzalloc(sizeof(*fw_get_vol), GFP_ATOMIC);
-        if (!fw_get_vol) {
-                pr_err("mem allocation failed\n");
-                kfree(msg);
-                return -ENOMEM;
-        }
-        sst_drv_ctx->vol_info_blk.data = (void *)fw_get_vol;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &sst_drv_ctx->vol_info_blk, SST_BLOCK_TIMEOUT);
-        if (retval)
-                retval = -EIO;
-        else {
-                pr_debug("stream id %d\n", fw_get_vol->stream_id);
-                pr_debug("volume %d\n", fw_get_vol->volume);
-                pr_debug("ramp duration %d\n", fw_get_vol->ramp_duration);
-                pr_debug("ramp_type %d\n", fw_get_vol->ramp_type);
-                memcpy(get_vol, fw_get_vol, sizeof(*fw_get_vol));
-        }
-        return retval;
-}
-
-/**
-* sst_set_vol - This function allows to set the premix gain or gain of a stream
-*
-* @set_vol:     this holds the volume structure that needs to be set
-*
-* This function is called when premix gain or stream gain is requested to be set
-*/
-int sst_set_vol(struct snd_sst_vol *set_vol)
-{
-
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-
-        pr_debug("set vol called\n");
-
-        if (sst_create_large_msg(&msg)) {
-                pr_err("message creation failed\n");
-                return -ENOMEM;
-        }
-        sst_fill_header(&msg->header, IPC_IA_SET_STREAM_VOL, 1,
-                                set_vol->stream_id);
-
-        msg->header.part.data = sizeof(u32) + sizeof(*set_vol);
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), set_vol, sizeof(*set_vol));
-        sst_drv_ctx->vol_info_blk.condition = false;
-        sst_drv_ctx->vol_info_blk.ret_code = 0;
-        sst_drv_ctx->vol_info_blk.on = true;
-        sst_drv_ctx->vol_info_blk.data = set_vol;
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &sst_drv_ctx->vol_info_blk, SST_BLOCK_TIMEOUT);
-        if (retval) {
-                pr_err("error in set_vol = %d\n", retval);
-                retval = -EIO;
-        }
-        return retval;
-}
-
-/**
-* sst_set_mute - This function sets premix mute or soft mute of a stream
-*
-* @set_mute:    this holds the mute structure that needs to be set
-*
-* This function is called when premix mute or stream mute requested to be set
-*/
-int sst_set_mute(struct snd_sst_mute *set_mute)
-{
-
-        int retval = 0;
-        struct ipc_post *msg = NULL;
-
-        pr_debug("set mute called\n");
-
-        if (sst_create_large_msg(&msg)) {
-                pr_err("message creation failed\n");
-                return -ENOMEM;
-        }
-        sst_fill_header(&msg->header, IPC_IA_SET_STREAM_MUTE, 1,
-                                set_mute->stream_id);
-        sst_drv_ctx->mute_info_blk.condition = false;
-        sst_drv_ctx->mute_info_blk.ret_code = 0;
-        sst_drv_ctx->mute_info_blk.on = true;
-        sst_drv_ctx->mute_info_blk.data = set_mute;
-
-        msg->header.part.data = sizeof(u32) + sizeof(*set_mute);
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), set_mute,
-                        sizeof(*set_mute));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &sst_drv_ctx->mute_info_blk, SST_BLOCK_TIMEOUT);
-        if (retval) {
-                pr_err("error in set_mute = %d\n", retval);
-                retval = -EIO;
-        }
-        return retval;
-}
-
-int sst_prepare_target(struct snd_sst_slot_info *slot)
-{
-        if (slot->target_device == SND_SST_TARGET_PMIC
-                && slot->device_instance == 1) {
-                        /*music mode*/
-                        if (sst_drv_ctx->pmic_port_instance == 0)
-                                sst_drv_ctx->scard_ops->set_voice_port(
-                                        DEACTIVATE);
-        } else if ((slot->target_device == SND_SST_TARGET_PMIC ||
-                        slot->target_device == SND_SST_TARGET_MODEM) &&
-                        slot->device_instance == 0) {
-                                /*voip mode where pcm0 is active*/
-                                if (sst_drv_ctx->pmic_port_instance == 1)
-                                        sst_drv_ctx->scard_ops->set_audio_port(
-                                                DEACTIVATE);
-        }
-        return 0;
-}
-
-int sst_activate_target(struct snd_sst_slot_info *slot)
-{
-        if (slot->target_device == SND_SST_TARGET_PMIC &&
-                slot->device_instance == 1) {
-                        /*music mode*/
-                        sst_drv_ctx->pmic_port_instance = 1;
-                        sst_drv_ctx->scard_ops->set_audio_port(ACTIVATE);
-                        sst_drv_ctx->scard_ops->set_pcm_audio_params(
-                                slot->pcm_params.sfreq,
-                                slot->pcm_params.pcm_wd_sz,
-                                slot->pcm_params.num_chan);
-                        if (sst_drv_ctx->pb_streams)
-                                sst_drv_ctx->scard_ops->power_up_pmic_pb(1);
-                        if (sst_drv_ctx->cp_streams)
-                                sst_drv_ctx->scard_ops->power_up_pmic_cp(1);
-        } else if ((slot->target_device == SND_SST_TARGET_PMIC ||
-                        slot->target_device == SND_SST_TARGET_MODEM) &&
-                        slot->device_instance == 0) {
-                                /*voip mode where pcm0 is active*/
-                                sst_drv_ctx->pmic_port_instance = 0;
-                                sst_drv_ctx->scard_ops->set_voice_port(
-                                        ACTIVATE);
-                                sst_drv_ctx->scard_ops->power_up_pmic_pb(0);
-                                /*sst_drv_ctx->scard_ops->power_up_pmic_cp(0);*/
-        }
-        return 0;
-}
-
-int sst_parse_target(struct snd_sst_slot_info *slot)
-{
-        int retval = 0;
-
-        if (slot->action == SND_SST_PORT_ACTIVATE &&
-                slot->device_type == SND_SST_DEVICE_PCM) {
-                        retval = sst_activate_target(slot);
-                        if (retval)
-                                pr_err("SST_Activate_target_fail\n");
-                        else
-                                pr_err("SST_Activate_target_pass\n");
-        } else if (slot->action == SND_SST_PORT_PREPARE &&
-                        slot->device_type == SND_SST_DEVICE_PCM) {
-                                retval = sst_prepare_target(slot);
-                        if (retval)
-                                pr_err("SST_prepare_target_fail\n");
-                        else
-                                pr_err("SST_prepare_target_pass\n");
-        } else {
-                pr_err("slot_action : %d, device_type: %d\n",
-                                slot->action, slot->device_type);
-        }
-        return retval;
-}
-
-int sst_send_target(struct snd_sst_target_device *target)
-{
-        int retval;
-        struct ipc_post *msg;
-
-        if (sst_create_large_msg(&msg)) {
-                pr_err("message creation failed\n");
-                return -ENOMEM;
-        }
-        sst_fill_header(&msg->header, IPC_IA_TARGET_DEV_SELECT, 1, 0);
-        sst_drv_ctx->tgt_dev_blk.condition = false;
-        sst_drv_ctx->tgt_dev_blk.ret_code = 0;
-        sst_drv_ctx->tgt_dev_blk.on = true;
-
-        msg->header.part.data = sizeof(u32) + sizeof(*target);
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), target,
-                        sizeof(*target));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        pr_debug("message sent- waiting\n");
-        retval = sst_wait_interruptible_timeout(sst_drv_ctx,
-                        &sst_drv_ctx->tgt_dev_blk, TARGET_DEV_BLOCK_TIMEOUT);
-        if (retval)
-                pr_err("target device ipc failed = 0x%x\n", retval);
-        return retval;
-
-}
-
-int sst_target_device_validate(struct snd_sst_target_device *target)
-{
-        int retval = 0;
-       int i;
-
-        for (i = 0; i < SST_MAX_TARGET_DEVICES; i++) {
-                if (target->devices[i].device_type == SND_SST_DEVICE_PCM) {
-                        /*pcm device, check params*/
-                        if (target->devices[i].device_instance == 1) {
-                                if ((target->devices[i].device_mode !=
-                                SND_SST_DEV_MODE_PCM_MODE4_I2S) &&
-                                (target->devices[i].device_mode !=
-                                SND_SST_DEV_MODE_PCM_MODE4_RIGHT_JUSTIFIED)
-                                && (target->devices[i].device_mode !=
-                                SND_SST_DEV_MODE_PCM_MODE1))
-                                        goto err;
-                        } else if (target->devices[i].device_instance == 0) {
-                                if ((target->devices[i].device_mode !=
-                                                SND_SST_DEV_MODE_PCM_MODE2)
-                                        && (target->devices[i].device_mode !=
-                                                SND_SST_DEV_MODE_PCM_MODE4_I2S)
-                                        && (target->devices[i].device_mode !=
-                                                SND_SST_DEV_MODE_PCM_MODE1))
-                                        goto err;
-                                if (target->devices[i].pcm_params.sfreq != 8000
-                                || target->devices[i].pcm_params.num_chan != 1
-                                || target->devices[i].pcm_params.pcm_wd_sz !=
-                                                                        16)
-                                        goto err;
-                        } else {
-err:
-                                pr_err("i/p params incorrect\n");
-                                return -EINVAL;
-                        }
-                }
-        }
-    return retval;
-}
-
-/**
- * sst_target_device_select - This function sets the target device configurations
- *
- * @target: this parameter holds the configurations to be set
- *
- * This function is called when the user layer wants to change the target
- * device's configurations
- */
-
-int sst_target_device_select(struct snd_sst_target_device *target)
-{
-        int retval, i, prepare_count = 0;
-
-        pr_debug("Target Device Select\n");
-
-        if (target->device_route < 0 || target->device_route > 2) {
-                pr_err("device route is invalid\n");
-                return -EINVAL;
-        }
-
-        if (target->device_route != 0) {
-                pr_err("Unsupported config\n");
-                return -EIO;
-        }
-        retval = sst_target_device_validate(target);
-        if (retval)
-                return retval;
-
-        retval = sst_send_target(target);
-        if (retval)
-                return retval;
-        for (i = 0; i < SST_MAX_TARGET_DEVICES; i++) {
-                if (target->devices[i].action == SND_SST_PORT_ACTIVATE) {
-                        pr_debug("activate called in %d\n", i);
-                        retval = sst_parse_target(&target->devices[i]);
-                        if (retval)
-                                return retval;
-                } else if (target->devices[i].action == SND_SST_PORT_PREPARE) {
-                        pr_debug("PREPARE in %d, Forwarding\n", i);
-                        retval = sst_parse_target(&target->devices[i]);
-                        if (retval) {
-                                pr_err("Parse Target fail %d\n", retval);
-                                return retval;
-                        }
-                        pr_debug("Parse Target successful %d\n", retval);
-                        if (target->devices[i].device_type ==
-                                                SND_SST_DEVICE_PCM)
-                                prepare_count++;
-                }
-        }
-        if (target->devices[0].action == SND_SST_PORT_PREPARE &&
-                prepare_count == 0)
-                        sst_drv_ctx->scard_ops->power_down_pmic();
-
-        return retval;
-}
-#ifdef CONFIG_MRST_RAR_HANDLER
-/*This function gets the physical address of the secure memory from the handle*/
-static inline int sst_get_RAR(struct RAR_buffer *buffers, int count)
-{
-        int retval = 0, rar_status = 0;
-
-        rar_status = rar_handle_to_bus(buffers, count);
-
-        if (count != rar_status) {
-                pr_err("The rar CALL Failed");
-                retval = -EIO;
-        }
-        if (buffers->info.type != RAR_TYPE_AUDIO) {
-                pr_err("Invalid RAR type\n");
-                return -EINVAL;
-        }
-        return retval;
-}
-
-#endif
-
-/* This function creates the scatter gather list to be sent to firmware to
-capture/playback data*/
-static int sst_create_sg_list(struct stream_info *stream,
-                struct sst_frame_info *sg_list)
-{
-        struct sst_stream_bufs *kbufs = NULL;
-#ifdef CONFIG_MRST_RAR_HANDLER
-        struct RAR_buffer rar_buffers;
-        int retval = 0;
-#endif
-        int i = 0;
-        list_for_each_entry(kbufs, &stream->bufs, node) {
-                if (kbufs->in_use == false) {
-#ifdef CONFIG_MRST_RAR_HANDLER
-                        if (stream->ops == STREAM_OPS_PLAYBACK_DRM) {
-                                pr_debug("DRM playback handling\n");
-                                rar_buffers.info.handle = (__u32)kbufs->addr;
-                                rar_buffers.info.size = kbufs->size;
-                                pr_debug("rar handle 0x%x size=0x%x\n",
-                                        rar_buffers.info.handle,
-                                        rar_buffers.info.size);
-                                retval =  sst_get_RAR(&rar_buffers, 1);
-
-                                if (retval)
-                                        return retval;
-                                sg_list->addr[i].addr = rar_buffers.bus_address;
-                                /* rar_buffers.info.size; */
-                                sg_list->addr[i].size = (__u32)kbufs->size;
-                                pr_debug("phyaddr[%d] 0x%x Size:0x%x\n"
-                                        , i, sg_list->addr[i].addr,
-                                        sg_list->addr[i].size);
-                        }
-#endif
-                        if (stream->ops != STREAM_OPS_PLAYBACK_DRM) {
-                                sg_list->addr[i].addr =
-                                        virt_to_phys((void *)
-                                                kbufs->addr + kbufs->offset);
-                                sg_list->addr[i].size = kbufs->size;
-                                pr_debug("phyaddr[%d]:0x%x Size:0x%x\n"
-                                , i , sg_list->addr[i].addr, kbufs->size);
-                        }
-                        stream->curr_bytes += sg_list->addr[i].size;
-                        kbufs->in_use = true;
-                        i++;
-                }
-                if (i >= MAX_NUM_SCATTER_BUFFERS)
-                        break;
-        }
-
-        sg_list->num_entries = i;
-        pr_debug("sg list entries = %d\n", sg_list->num_entries);
-        return i;
-}
-
-
-/**
- * sst_play_frame - Send msg for sending stream frames
- *
- * @str_id:     ID of stream
- *
- * This function is called to send data to be played out
- * to the firmware
- */
-int sst_play_frame(int str_id)
-{
-        int i = 0, retval = 0;
-        struct ipc_post *msg = NULL;
-        struct sst_frame_info sg_list = {0};
-        struct sst_stream_bufs *kbufs = NULL, *_kbufs;
-        struct stream_info *stream;
-
-        pr_debug("play frame for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-
-        stream = &sst_drv_ctx->streams[str_id];
-        /* clear prev sent buffers */
-        list_for_each_entry_safe(kbufs, _kbufs, &stream->bufs, node) {
-                if (kbufs->in_use == true) {
-                        spin_lock(&stream->pcm_lock);
-                        list_del(&kbufs->node);
-                        spin_unlock(&stream->pcm_lock);
-                        kfree(kbufs);
-                }
-        }
-        /* update bytes sent */
-        stream->cumm_bytes += stream->curr_bytes;
-        stream->curr_bytes = 0;
-        if (list_empty(&stream->bufs)) {
-                /* no user buffer available */
-                pr_debug("Null buffer stream status %d\n", stream->status);
-                stream->prev = stream->status;
-                stream->status = STREAM_INIT;
-                pr_debug("new stream status = %d\n", stream->status);
-                if (stream->need_draining == true) {
-                        pr_debug("draining stream\n");
-                        if (sst_create_short_msg(&msg)) {
-                                pr_err("mem allocation failed\n");
-                                return -ENOMEM;
-                        }
-                        sst_fill_header(&msg->header, IPC_IA_DRAIN_STREAM,
-                                                0, str_id);
-                        spin_lock(&sst_drv_ctx->list_spin_lock);
-                        list_add_tail(&msg->node,
-                                        &sst_drv_ctx->ipc_dispatch_list);
-                        spin_unlock(&sst_drv_ctx->list_spin_lock);
-                        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-                } else if (stream->data_blk.on == true) {
-                        pr_debug("user list empty.. wake\n");
-                        /* unblock */
-                        stream->data_blk.ret_code = 0;
-                        stream->data_blk.condition = true;
-                        stream->data_blk.on = false;
-                        wake_up(&sst_drv_ctx->wait_queue);
-                }
-                return 0;
-        }
-
-        /* create list */
-        i = sst_create_sg_list(stream, &sg_list);
-
-        /* post msg */
-        if (sst_create_large_msg(&msg))
-                return -ENOMEM;
-
-        sst_fill_header(&msg->header, IPC_IA_PLAY_FRAMES, 1, str_id);
-        msg->header.part.data = sizeof(u32) + sizeof(sg_list);
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), &sg_list, sizeof(sg_list));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        return 0;
-
-}
-
-/**
- * sst_capture_frame - Send msg for sending stream frames
- *
- * @str_id:     ID of stream
- *
- * This function is called to capture data from the firmware
- */
-int sst_capture_frame(int str_id)
-{
-        int i = 0, retval = 0;
-        struct ipc_post *msg = NULL;
-        struct sst_frame_info sg_list = {0};
-        struct sst_stream_bufs *kbufs = NULL, *_kbufs;
-        struct stream_info *stream;
-
-
-        pr_debug("capture frame for %d\n", str_id);
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-        stream = &sst_drv_ctx->streams[str_id];
-        /* clear prev sent buffers */
-        list_for_each_entry_safe(kbufs, _kbufs, &stream->bufs, node) {
-                if (kbufs->in_use == true) {
-                        list_del(&kbufs->node);
-                        kfree(kbufs);
-                        pr_debug("del node\n");
-                }
-        }
-        if (list_empty(&stream->bufs)) {
-                /* no user buffer available */
-                pr_debug("Null buffer!!!!stream status %d\n",
-                               stream->status);
-                stream->prev = stream->status;
-                stream->status = STREAM_INIT;
-                pr_debug("new stream status = %d\n",
-                               stream->status);
-                if (stream->data_blk.on == true) {
-                        pr_debug("user list empty.. wake\n");
-                        /* unblock */
-                        stream->data_blk.ret_code = 0;
-                        stream->data_blk.condition = true;
-                        stream->data_blk.on = false;
-                        wake_up(&sst_drv_ctx->wait_queue);
-
-                }
-                return 0;
-        }
-        /* create new sg list */
-        i = sst_create_sg_list(stream, &sg_list);
-
-        /* post msg */
-        if (sst_create_large_msg(&msg))
-                return -ENOMEM;
-
-        sst_fill_header(&msg->header, IPC_IA_CAPT_FRAMES, 1, str_id);
-        msg->header.part.data = sizeof(u32) + sizeof(sg_list);
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), &sg_list, sizeof(sg_list));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-
-
-        /*update bytes recevied*/
-        stream->cumm_bytes += stream->curr_bytes;
-        stream->curr_bytes = 0;
-
-    pr_debug("Cum bytes  = %d\n", stream->cumm_bytes);
-        return 0;
-}
-
-/*This function is used to calculate the minimum size of input buffers given*/
-static unsigned int calculate_min_size(struct snd_sst_buffs *bufs)
-{
-        int i, min_val = bufs->buff_entry[0].size;
-        for (i = 1 ; i < bufs->entries; i++) {
-                if (bufs->buff_entry[i].size < min_val)
-                        min_val = bufs->buff_entry[i].size;
-        }
-        pr_debug("min_val = %d\n", min_val);
-        return min_val;
-}
-
-static unsigned int calculate_max_size(struct snd_sst_buffs *bufs)
-{
-        int i, max_val = bufs->buff_entry[0].size;
-        for (i = 1 ; i < bufs->entries; i++) {
-                if (bufs->buff_entry[i].size > max_val)
-                        max_val = bufs->buff_entry[i].size;
-        }
-        pr_debug("max_val = %d\n", max_val);
-        return max_val;
-}
-
-/*This function is used to allocate input and output buffers to be sent to
-the firmware that will take encoded data and return decoded data*/
-static int sst_allocate_decode_buf(struct stream_info *str_info,
-                                struct snd_sst_dbufs *dbufs,
-                                unsigned int cum_input_given,
-                                unsigned int cum_output_given)
-{
-#ifdef CONFIG_MRST_RAR_HANDLER
-        if (str_info->ops == STREAM_OPS_PLAYBACK_DRM) {
-
-                if (dbufs->ibufs->type == SST_BUF_RAR  &&
-                        dbufs->obufs->type == SST_BUF_RAR) {
-                        if (dbufs->ibufs->entries == dbufs->obufs->entries)
-                                return 0;
-                        else {
-                                pr_err("RAR entries dont match\n");
-                                 return -EINVAL;
-                        }
-                } else
-                        str_info->decode_osize = cum_output_given;
-                return 0;
-
-        }
-#endif
-        if (!str_info->decode_ibuf) {
-                pr_debug("no i/p buffers, trying full size\n");
-                str_info->decode_isize = cum_input_given;
-                str_info->decode_ibuf = kzalloc(str_info->decode_isize,
-                                                GFP_KERNEL);
-                str_info->idecode_alloc = str_info->decode_isize;
-        }
-        if (!str_info->decode_ibuf) {
-                pr_debug("buff alloc failed, try max size\n");
-                str_info->decode_isize = calculate_max_size(dbufs->ibufs);
-                str_info->decode_ibuf = kzalloc(
-                                str_info->decode_isize, GFP_KERNEL);
-                str_info->idecode_alloc = str_info->decode_isize;
-        }
-        if (!str_info->decode_ibuf) {
-                pr_debug("buff alloc failed, try min size\n");
-                str_info->decode_isize = calculate_min_size(dbufs->ibufs);
-                str_info->decode_ibuf = kzalloc(str_info->decode_isize,
-                                                GFP_KERNEL);
-                if (!str_info->decode_ibuf) {
-                        pr_err("mem allocation failed\n");
-                        return -ENOMEM;
-                }
-                str_info->idecode_alloc = str_info->decode_isize;
-        }
-        str_info->decode_osize = cum_output_given;
-        if (str_info->decode_osize > sst_drv_ctx->mmap_len)
-                str_info->decode_osize = sst_drv_ctx->mmap_len;
-        return 0;
-}
-
-/*This function is used to send the message to firmware to decode the data*/
-static int sst_send_decode_mess(int str_id, struct stream_info *str_info,
-                                struct snd_sst_decode_info *dec_info)
-{
-        struct ipc_post *msg = NULL;
-        int retval = 0;
-
-        pr_debug("SST DBG:sst_set_mute:called\n");
-
-        if (str_info->decode_ibuf_type == SST_BUF_RAR) {
-#ifdef CONFIG_MRST_RAR_HANDLER
-                        dec_info->frames_in.addr[0].addr =
-                                (unsigned long)str_info->decode_ibuf;
-                        dec_info->frames_in.addr[0].size =
-                                                        str_info->decode_isize;
-#endif
-
-        } else {
-                dec_info->frames_in.addr[0].addr = virt_to_phys((void *)
-                                        str_info->decode_ibuf);
-                dec_info->frames_in.addr[0].size = str_info->decode_isize;
-        }
-
-
-        if (str_info->decode_obuf_type == SST_BUF_RAR) {
-#ifdef CONFIG_MRST_RAR_HANDLER
-                dec_info->frames_out.addr[0].addr =
-                                (unsigned long)str_info->decode_obuf;
-                dec_info->frames_out.addr[0].size = str_info->decode_osize;
-#endif
-
-        } else {
-                dec_info->frames_out.addr[0].addr = virt_to_phys((void *)
-                                                str_info->decode_obuf) ;
-                dec_info->frames_out.addr[0].size = str_info->decode_osize;
-        }
-
-        dec_info->frames_in.num_entries = 1;
-        dec_info->frames_out.num_entries = 1;
-        dec_info->frames_in.rsrvd = 0;
-        dec_info->frames_out.rsrvd = 0;
-        dec_info->input_bytes_consumed = 0;
-        dec_info->output_bytes_produced = 0;
-        if (sst_create_large_msg(&msg)) {
-                pr_err("message creation failed\n");
-                return -ENOMEM;
-        }
-
-        sst_fill_header(&msg->header, IPC_IA_DECODE_FRAMES, 1, str_id);
-        msg->header.part.data = sizeof(u32) + sizeof(*dec_info);
-        memcpy(msg->mailbox_data, &msg->header, sizeof(u32));
-        memcpy(msg->mailbox_data + sizeof(u32), dec_info,
-                        sizeof(*dec_info));
-        spin_lock(&sst_drv_ctx->list_spin_lock);
-        list_add_tail(&msg->node, &sst_drv_ctx->ipc_dispatch_list);
-        spin_unlock(&sst_drv_ctx->list_spin_lock);
-        str_info->data_blk.condition = false;
-        str_info->data_blk.ret_code = 0;
-        str_info->data_blk.on = true;
-        str_info->data_blk.data = dec_info;
-        sst_post_message(&sst_drv_ctx->ipc_post_msg_wq);
-        retval = sst_wait_interruptible(sst_drv_ctx, &str_info->data_blk);
-        return retval;
-}
-
-#ifdef CONFIG_MRST_RAR_HANDLER
-static int sst_prepare_input_buffers_rar(struct stream_info *str_info,
-                        struct snd_sst_dbufs *dbufs,
-                        int *input_index, int *in_copied,
-                        int *input_index_valid_size, int *new_entry_flag)
-{
-        int retval = 0, i;
-
-        if (str_info->ops == STREAM_OPS_PLAYBACK_DRM) {
-                struct RAR_buffer rar_buffers;
-                __u32 info;
-                retval = copy_from_user((void *) &info,
-                                dbufs->ibufs->buff_entry[i].buffer,
-                                sizeof(__u32));
-                if (retval) {
-                        pr_err("cpy from user fail\n");
-                        return -EAGAIN;
-                }
-                rar_buffers.info.type = dbufs->ibufs->type;
-                rar_buffers.info.size = dbufs->ibufs->buff_entry[i].size;
-                rar_buffers.info.handle =  info;
-                pr_debug("rar in DnR(input buffer function)=0x%x size=0x%x",
-                                rar_buffers.info.handle,
-                                rar_buffers.info.size);
-                retval =  sst_get_RAR(&rar_buffers, 1);
-                if (retval) {
-                        pr_debug("SST ERR: RAR API failed\n");
-                        return retval;
-                }
-                str_info->decode_ibuf =
-                (void *) ((unsigned long) rar_buffers.bus_address);
-                pr_debug("RAR buf addr in DnR (input buffer function)0x%lu",
-                                 (unsigned long) str_info->decode_ibuf);
-                pr_debug("rar in DnR decode function/output b_add rar =0x%lu",
-                                (unsigned long) rar_buffers.bus_address);
-                *input_index = i + 1;
-                str_info->decode_isize = dbufs->ibufs->buff_entry[i].size;
-                str_info->decode_ibuf_type = dbufs->ibufs->type;
-                *in_copied = str_info->decode_isize;
-        }
-        return retval;
-}
-#endif
-/*This function is used to prepare the kernel input buffers with contents
-before sending for decode*/
-static int sst_prepare_input_buffers(struct stream_info *str_info,
-                        struct snd_sst_dbufs *dbufs,
-                        int *input_index, int *in_copied,
-                        int *input_index_valid_size, int *new_entry_flag)
-{
-        int i, cpy_size, retval = 0;
-
-        pr_debug("input_index = %d, input entries = %d\n",
-                         *input_index, dbufs->ibufs->entries);
-        for (i = *input_index; i < dbufs->ibufs->entries; i++) {
-#ifdef CONFIG_MRST_RAR_HANDLER
-                retval = sst_prepare_input_buffers_rar(str_info,
-                        dbufs, input_index, in_copied,
-                                input_index_valid_size, new_entry_flag);
-                if (retval) {
-                        pr_err("In prepare input buffers for RAR\n");
-                        return -EIO;
-                }
-#endif
-                *input_index = i;
-                if (*input_index_valid_size == 0)
-                        *input_index_valid_size =
-                                dbufs->ibufs->buff_entry[i].size;
-                pr_debug("inout addr = %p, size = %d\n",
-                        dbufs->ibufs->buff_entry[i].buffer,
-                        *input_index_valid_size);
-                pr_debug("decode_isize = %d, in_copied %d\n",
-                        str_info->decode_isize, *in_copied);
-                if (*input_index_valid_size <=
-                                        (str_info->decode_isize - *in_copied))
-                        cpy_size = *input_index_valid_size;
-                else
-                        cpy_size = str_info->decode_isize - *in_copied;
-
-                pr_debug("cpy size = %d\n", cpy_size);
-                if (!dbufs->ibufs->buff_entry[i].buffer) {
-                        pr_err("i/p buffer is null\n");
-                        return -EINVAL;
-                }
-                pr_debug("Try copy To %p, From %p, size %d\n",
-                                str_info->decode_ibuf + *in_copied,
-                                dbufs->ibufs->buff_entry[i].buffer, cpy_size);
-
-                retval =
-                copy_from_user((void *)(str_info->decode_ibuf + *in_copied),
-                                (void *) dbufs->ibufs->buff_entry[i].buffer,
-                                cpy_size);
-                if (retval) {
-                        pr_err("copy from user failed\n");
-                        return -EIO;
-                }
-                *in_copied += cpy_size;
-                *input_index_valid_size -= cpy_size;
-                pr_debug("in buff size = %d, in_copied = %d\n",
-                        *input_index_valid_size, *in_copied);
-                if (*input_index_valid_size != 0) {
-                        pr_debug("more input buffers left\n");
-                        dbufs->ibufs->buff_entry[i].buffer += cpy_size;
-                        break;
-                }
-                if (*in_copied == str_info->decode_isize &&
-                        *input_index_valid_size == 0 &&
-                        (i+1) <= dbufs->ibufs->entries) {
-                        pr_debug("all input buffers copied\n");
-                        *new_entry_flag = true;
-                        *input_index = i + 1;
-                        break;
-                }
-        }
-        return retval;
-}
-
-/* This function is used to copy the decoded data from kernel buffers to
-the user output buffers with contents after decode*/
-static int sst_prepare_output_buffers(struct stream_info *str_info,
-                        struct snd_sst_dbufs *dbufs,
-                        int *output_index, int output_size,
-                        int *out_copied)
-
-{
-        int i, cpy_size, retval = 0;
-        pr_debug("output_index = %d, output entries = %d\n",
-                                *output_index,
-                                dbufs->obufs->entries);
-        for (i = *output_index; i < dbufs->obufs->entries; i++) {
-                *output_index = i;
-                pr_debug("output addr = %p, size = %d\n",
-                        dbufs->obufs->buff_entry[i].buffer,
-                        dbufs->obufs->buff_entry[i].size);
-                pr_debug("output_size = %d, out_copied = %d\n",
-                                output_size, *out_copied);
-                if (dbufs->obufs->buff_entry[i].size <
-                                (output_size - *out_copied))
-                        cpy_size = dbufs->obufs->buff_entry[i].size;
-                else
-                        cpy_size = output_size - *out_copied;
-                pr_debug("cpy size = %d\n", cpy_size);
-                pr_debug("Try copy To: %p, From %p, size %d\n",
-                                dbufs->obufs->buff_entry[i].buffer,
-                                sst_drv_ctx->mmap_mem + *out_copied,
-                                cpy_size);
-                retval = copy_to_user(dbufs->obufs->buff_entry[i].buffer,
-                                        sst_drv_ctx->mmap_mem + *out_copied,
-                                        cpy_size);
-                if (retval) {
-                        pr_err("copy to user failed\n");
-                        return -EIO;
-                } else
-                        pr_debug("copy to user passed\n");
-                *out_copied += cpy_size;
-                dbufs->obufs->buff_entry[i].size -= cpy_size;
-                pr_debug("o/p buff size %d, out_copied %d\n",
-                        dbufs->obufs->buff_entry[i].size, *out_copied);
-                if (dbufs->obufs->buff_entry[i].size != 0) {
-                        *output_index = i;
-                        dbufs->obufs->buff_entry[i].buffer += cpy_size;
-                        break;
-                } else if (*out_copied == output_size) {
-                        *output_index = i + 1;
-                        break;
-                }
-        }
-        return retval;
-}
-
-/**
- * sst_decode - Send msg for decoding frames
- *
- * @str_id: ID of stream
- * @dbufs: param that holds the user input and output buffers and size
- *
- * This function is called to decode data from the firmware
- */
-int sst_decode(int str_id, struct snd_sst_dbufs *dbufs)
-{
-        int retval = 0, i;
-        unsigned long long total_input = 0 , total_output = 0;
-        unsigned int cum_input_given = 0 , cum_output_given = 0;
-        int copy_in_done = false, copy_out_done = false;
-        int input_index = 0, output_index = 0;
-        int input_index_valid_size = 0;
-        int in_copied, out_copied;
-        int new_entry_flag;
-        u64 output_size;
-        struct stream_info *str_info;
-        struct snd_sst_decode_info dec_info;
-        unsigned long long input_bytes, output_bytes;
-
-        sst_drv_ctx->scard_ops->power_down_pmic();
-        pr_debug("Powering_down_PMIC...\n");
-
-        retval = sst_validate_strid(str_id);
-        if (retval)
-                return retval;
-
-        str_info = &sst_drv_ctx->streams[str_id];
-        if (str_info->status != STREAM_INIT) {
-                pr_err("invalid stream state = %d\n",
-                               str_info->status);
-                return -EINVAL;
-        }
-
-        str_info->prev = str_info->status;
-        str_info->status = STREAM_DECODE;
-
-        for (i = 0; i < dbufs->ibufs->entries; i++)
-                cum_input_given += dbufs->ibufs->buff_entry[i].size;
-        for (i = 0; i < dbufs->obufs->entries; i++)
-                cum_output_given += dbufs->obufs->buff_entry[i].size;
-
-        /* input and output buffer allocation */
-        retval =  sst_allocate_decode_buf(str_info, dbufs,
-                                cum_input_given, cum_output_given);
-        if (retval) {
-                pr_err("mem allocation failed, abort!!!\n");
-                retval = -ENOMEM;
-                goto finish;
-        }
-
-        str_info->decode_isize = str_info->idecode_alloc;
-        str_info->decode_ibuf_type = dbufs->ibufs->type;
-        str_info->decode_obuf_type = dbufs->obufs->type;
-
-        while ((copy_out_done == false) && (copy_in_done == false)) {
-                in_copied = 0;
-                new_entry_flag = false;
-                retval = sst_prepare_input_buffers(str_info,\
-                        dbufs, &input_index, &in_copied,
-                        &input_index_valid_size, &new_entry_flag);
-                if (retval) {
-                        pr_err("prepare in buffers failed\n");
-                        goto finish;
-                }
-
-                if (str_info->ops != STREAM_OPS_PLAYBACK_DRM)
-                        str_info->decode_obuf = sst_drv_ctx->mmap_mem;
-
-#ifdef CONFIG_MRST_RAR_HANDLER
-                else {
-                        if (dbufs->obufs->type == SST_BUF_RAR) {
-                                struct RAR_buffer rar_buffers;
-                                __u32 info;
-
-                                pr_debug("DRM");
-                                retval = copy_from_user((void *) &info,
-                                                dbufs->obufs->
-                                                buff_entry[output_index].buffer,
-                                                sizeof(__u32));
-
-                                rar_buffers.info.size = dbufs->obufs->
-                                        buff_entry[output_index].size;
-                                rar_buffers.info.handle =  info;
-                                retval =  sst_get_RAR(&rar_buffers, 1);
-                                if (retval)
-                                        return retval;
-
-                                str_info->decode_obuf = (void *)((unsigned long)
-                                                rar_buffers.bus_address);
-                                str_info->decode_osize = dbufs->obufs->
-                                        buff_entry[output_index].size;
-                                str_info->decode_obuf_type = dbufs->obufs->type;
-                                pr_debug("DRM handling\n");
-                                pr_debug("o/p_add=0x%lu Size=0x%x\n",
-                                        (unsigned long) str_info->decode_obuf,
-                                        str_info->decode_osize);
-                        } else {
-                                str_info->decode_obuf = sst_drv_ctx->mmap_mem;
-                                str_info->decode_osize = dbufs->obufs->
-                                        buff_entry[output_index].size;
-
-                        }
-                }
-#endif
-                if (str_info->ops != STREAM_OPS_PLAYBACK_DRM) {
-                        if (str_info->decode_isize > in_copied) {
-                                str_info->decode_isize = in_copied;
-                                pr_debug("i/p size = %d\n",
-                                                str_info->decode_isize);
-                        }
-                }
-
-
-                retval = sst_send_decode_mess(str_id, str_info, &dec_info);
-                if (retval || dec_info.input_bytes_consumed == 0) {
-                        pr_err("SST ERR: mess failed or no input consumed\n");
-                        goto finish;
-                }
-                input_bytes = dec_info.input_bytes_consumed;
-                output_bytes = dec_info.output_bytes_produced;
-
-                pr_debug("in_copied=%d, con=%lld, prod=%lld\n",
-                        in_copied, input_bytes, output_bytes);
-                if (dbufs->obufs->type == SST_BUF_RAR) {
-                        output_index += 1;
-                        if (output_index == dbufs->obufs->entries) {
-                                copy_in_done = true;
-                                pr_debug("all i/p cpy done\n");
-                        }
-                        total_output += output_bytes;
-                } else {
-                        out_copied = 0;
-                        output_size = output_bytes;
-                        retval = sst_prepare_output_buffers(str_info, dbufs,
-                                &output_index, output_size, &out_copied);
-                        if (retval) {
-                                pr_err("prep out buff fail\n");
-                                goto finish;
-                        }
-                        if (str_info->ops != STREAM_OPS_PLAYBACK_DRM) {
-                                if (in_copied != input_bytes) {
-                                        int bytes_left = in_copied -
-                                                                input_bytes;
-                                        pr_debug("bytes %d\n",
-                                                        bytes_left);
-                                        if (new_entry_flag == true)
-                                                input_index--;
-                                        while (bytes_left) {
-                                                struct snd_sst_buffs *ibufs;
-                                                struct snd_sst_buff_entry
-                                                                *buff_entry;
-                                                unsigned int size_sent;
-
-                                                ibufs = dbufs->ibufs;
-                                                buff_entry =
-                                                &ibufs->buff_entry[input_index];
-                                                size_sent = buff_entry->size -\
-                                                        input_index_valid_size;
-                                                if (bytes_left == size_sent) {
-                                                                bytes_left = 0;
-                                                } else if (bytes_left <
-                                                                size_sent) {
-                                                        buff_entry->buffer +=
-                                                         (size_sent -
-                                                                bytes_left);
-                                                        buff_entry->size -=
-                                                         (size_sent -
-                                                                bytes_left);
-                                                        bytes_left = 0;
-                                                } else {
-                                                        bytes_left -= size_sent;
-                                                        input_index--;
-                                                        input_index_valid_size =
-                                                                        0;
-                                                }
-                                        }
-
-                                }
-                        }
-
-                        total_output += out_copied;
-                        if (str_info->decode_osize != out_copied) {
-                                str_info->decode_osize -= out_copied;
-                                pr_debug("output size modified = %d\n",
-                                                str_info->decode_osize);
-                        }
-                }
-                total_input += input_bytes;
-
-                if (str_info->ops == STREAM_OPS_PLAYBACK_DRM) {
-                        if (total_input == cum_input_given)
-                                copy_in_done = true;
-                        copy_out_done = true;
-
-                } else {
-                        if (total_output == cum_output_given) {
-                                copy_out_done = true;
-                                pr_debug("all o/p cpy done\n");
-                        }
-
-                        if (total_input == cum_input_given) {
-                                copy_in_done = true;
-                                pr_debug("all i/p cpy done\n");
-                        }
-                }
-
-                pr_debug("copy_out = %d, copy_in = %d\n",
-                                copy_out_done, copy_in_done);
-        }
-
-finish:
-        dbufs->input_bytes_consumed = total_input;
-        dbufs->output_bytes_produced = total_output;
-        str_info->status = str_info->prev;
-        str_info->prev = STREAM_DECODE;
-        kfree(str_info->decode_ibuf);
-        str_info->decode_ibuf = NULL;
-        return retval;
-}
diff --git a/drivers/staging/intel_sst/intelmid.c b/drivers/staging/intel_sst/intelmid.c
deleted file mode 100644
index 492b660246b4..000000000000
--- a/drivers/staging/intel_sst/intelmid.c
+++ /dev/null
@@ -1,1022 +0,0 @@
-/*
- *   intelmid.c - Intel Sound card driver for MID
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Harsha Priya <priya.harsha@intel.com>
- *              Vinod Koul <vinod.koul@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * ALSA driver for Intel MID sound card chipset
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/sched.h>
-#include <linux/firmware.h>
-#include <linux/input.h>
-#include <sound/control.h>
-#include <asm/mrst.h>
-#include <sound/pcm.h>
-#include <sound/jack.h>
-#include <sound/pcm_params.h>
-#include <sound/initval.h>
-#include <linux/gpio.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intel_sst_fw_ipc.h"
-#include "intel_sst_common.h"
-#include "intelmid_snd_control.h"
-#include "intelmid_adc_control.h"
-#include "intelmid.h"
-
-MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
-MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
-MODULE_AUTHOR("Dharageswari R <dharageswari.r@intel.com>");
-MODULE_AUTHOR("KP Jeeja <jeeja.kp@intel.com>");
-MODULE_DESCRIPTION("Intel MAD Sound card driver");
-MODULE_LICENSE("GPL v2");
-MODULE_SUPPORTED_DEVICE("{Intel,Intel_MAD}");
-
-
-static int card_index = SNDRV_DEFAULT_IDX1;/* Index 0-MAX */
-static char *card_id = SNDRV_DEFAULT_STR1;      /* ID for this card */
-
-module_param(card_index, int, 0444);
-MODULE_PARM_DESC(card_index, "Index value for INTELMAD soundcard.");
-module_param(card_id, charp, 0444);
-MODULE_PARM_DESC(card_id, "ID string for INTELMAD soundcard.");
-
-int     sst_card_vendor_id;
-int intelmid_audio_interrupt_enable;/*checkpatch fix*/
-struct snd_intelmad *intelmad_drv;
-
-#define INFO(_cpu_id, _irq_cache, _size) \
-        ((kernel_ulong_t)&(struct snd_intelmad_probe_info) {    \
-                .cpu_id = (_cpu_id),                    \
-                .irq_cache = (_irq_cache),                      \
-                .size = (_size),                                \
-        })
-/* Data path functionalities */
-static struct snd_pcm_hardware snd_intelmad_stream = {
-        .info = (SNDRV_PCM_INFO_INTERLEAVED |
-                        SNDRV_PCM_INFO_DOUBLE |
-                        SNDRV_PCM_INFO_PAUSE |
-                        SNDRV_PCM_INFO_RESUME |
-                        SNDRV_PCM_INFO_MMAP|
-                        SNDRV_PCM_INFO_MMAP_VALID |
-                        SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                        SNDRV_PCM_INFO_SYNC_START),
-        .formats = (SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_U16 |
-                        SNDRV_PCM_FMTBIT_S24 | SNDRV_PCM_FMTBIT_U24 |
-                        SNDRV_PCM_FMTBIT_S32 | SNDRV_PCM_FMTBIT_U32),
-        .rates = (SNDRV_PCM_RATE_8000|
-                        SNDRV_PCM_RATE_44100 |
-                        SNDRV_PCM_RATE_48000),
-        .rate_min = MIN_RATE,
-
-        .rate_max = MAX_RATE,
-        .channels_min = MIN_CHANNEL,
-        .channels_max = MAX_CHANNEL_AMIC,
-        .buffer_bytes_max = MAX_BUFFER,
-        .period_bytes_min = MIN_PERIOD_BYTES,
-        .period_bytes_max = MAX_PERIOD_BYTES,
-        .periods_min = MIN_PERIODS,
-        .periods_max = MAX_PERIODS,
-        .fifo_size = FIFO_SIZE,
-};
-
-
-/**
- * snd_intelmad_pcm_trigger - stream activities are handled here
- *
- * @substream:substream for which the stream function is called
- * @cmd:the stream commamd that requested from upper layer
- *
- * This function is called whenever an a stream activity is invoked
- */
-static int snd_intelmad_pcm_trigger(struct snd_pcm_substream *substream,
-                                        int cmd)
-{
-        int ret_val = 0, str_id;
-        struct snd_intelmad *intelmaddata;
-        struct mad_stream_pvt *stream;
-        struct intel_sst_pcm_control *sst_ops;
-
-        WARN_ON(!substream);
-
-        intelmaddata = snd_pcm_substream_chip(substream);
-        stream = substream->runtime->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-        WARN_ON(!intelmaddata->sstdrv_ops->scard_ops);
-        sst_ops  = intelmaddata->sstdrv_ops->pcm_control;
-        str_id = stream->stream_info.str_id;
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                pr_debug("Trigger Start\n");
-                ret_val = sst_ops->device_control(SST_SND_START, &str_id);
-                if (ret_val)
-                        return ret_val;
-                stream->stream_status = RUNNING;
-                stream->substream = substream;
-                break;
-        case SNDRV_PCM_TRIGGER_STOP:
-                pr_debug("in stop\n");
-                ret_val = sst_ops->device_control(SST_SND_DROP, &str_id);
-                if (ret_val)
-                        return ret_val;
-                stream->stream_status = DROPPED;
-                break;
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                pr_debug("in pause\n");
-                ret_val = sst_ops->device_control(SST_SND_PAUSE, &str_id);
-                if (ret_val)
-                        return ret_val;
-                stream->stream_status = PAUSED;
-                break;
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                pr_debug("in pause release\n");
-                ret_val = sst_ops->device_control(SST_SND_RESUME, &str_id);
-                if (ret_val)
-                        return ret_val;
-                stream->stream_status = RUNNING;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return ret_val;
-}
-
-/**
-* snd_intelmad_pcm_prepare- internal preparation before starting a stream
-*
-* @substream:  substream for which the function is called
-*
-* This function is called when a stream is started for internal preparation.
-*/
-static int snd_intelmad_pcm_prepare(struct snd_pcm_substream *substream)
-{
-        struct mad_stream_pvt *stream;
-        int ret_val = 0;
-        struct snd_intelmad *intelmaddata;
-
-        pr_debug("pcm_prepare called\n");
-
-        WARN_ON(!substream);
-        stream = substream->runtime->private_data;
-        intelmaddata = snd_pcm_substream_chip(substream);
-        pr_debug("pb cnt = %d cap cnt = %d\n",\
-                intelmaddata->playback_cnt,
-                intelmaddata->capture_cnt);
-
-        if (stream->stream_info.str_id) {
-                pr_debug("Prepare called for already set stream\n");
-                ret_val = intelmaddata->sstdrv_ops->pcm_control->device_control(
-                                SST_SND_DROP, &stream->stream_info.str_id);
-                return ret_val;
-        }
-
-        ret_val = snd_intelmad_alloc_stream(substream);
-        if (ret_val < 0)
-                return ret_val;
-        stream->dbg_cum_bytes = 0;
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        intelmaddata->playback_cnt++;
-        else
-                intelmaddata->capture_cnt++;
-        /* return back the stream id */
-        snprintf(substream->pcm->id, sizeof(substream->pcm->id),
-                        "%d", stream->stream_info.str_id);
-        pr_debug("stream id to user = %s\n",
-                        substream->pcm->id);
-
-        ret_val = snd_intelmad_init_stream(substream);
-        if (ret_val)
-                return ret_val;
-        substream->runtime->hw.info = SNDRV_PCM_INFO_BLOCK_TRANSFER;
-        return ret_val;
-}
-
-static int snd_intelmad_hw_params(struct snd_pcm_substream *substream,
-                                    struct snd_pcm_hw_params *hw_params)
-{
-        int ret_val;
-
-        pr_debug("snd_intelmad_hw_params called\n");
-        ret_val = snd_pcm_lib_malloc_pages(substream,
-                        params_buffer_bytes(hw_params));
-        memset(substream->runtime->dma_area, 0,
-                        params_buffer_bytes(hw_params));
-
-        return ret_val;
-}
-
-static int snd_intelmad_hw_free(struct snd_pcm_substream *substream)
-{
-        pr_debug("snd_intelmad_hw_free called\n");
-        return snd_pcm_lib_free_pages(substream);
-}
-
-/**
- * snd_intelmad_pcm_pointer- to send the current buffer pointer processed by hw
- *
- * @substream:  substream for which the function is called
- *
- * This function is called by ALSA framework to get the current hw buffer ptr
- * when a period is elapsed
- */
-static snd_pcm_uframes_t snd_intelmad_pcm_pointer
-                        (struct snd_pcm_substream *substream)
-{
-        /* struct snd_pcm_runtime *runtime = substream->runtime; */
-        struct mad_stream_pvt *stream;
-        struct snd_intelmad *intelmaddata;
-        int ret_val;
-
-        WARN_ON(!substream);
-
-        intelmaddata = snd_pcm_substream_chip(substream);
-        stream = substream->runtime->private_data;
-        if (stream->stream_status == INIT)
-                return 0;
-
-        ret_val = intelmaddata->sstdrv_ops->pcm_control->device_control(
-                        SST_SND_BUFFER_POINTER, &stream->stream_info);
-        if (ret_val) {
-                pr_err("error code = 0x%x\n", ret_val);
-                return ret_val;
-        }
-        pr_debug("samples reported out 0x%llx\n",
-                        stream->stream_info.buffer_ptr);
-        pr_debug("Frame bits:: %d period_count :: %d\n",
-                        (int)substream->runtime->frame_bits,
-                        (int)substream->runtime->period_size);
-
-        return stream->stream_info.buffer_ptr;
-
-}
-
-/**
- * snd_intelmad_close- to free parameteres when stream is stopped
- *
- * @substream:  substream for which the function is called
- *
- * This function is called by ALSA framework when stream is stopped
- */
-static int snd_intelmad_close(struct snd_pcm_substream *substream)
-{
-        struct snd_intelmad *intelmaddata;
-        struct mad_stream_pvt *stream;
-        int ret_val = 0, str_id;
-
-        WARN_ON(!substream);
-
-        stream = substream->runtime->private_data;
-        str_id = stream->stream_info.str_id;
-
-        pr_debug("sst: snd_intelmad_close called for %d\n", str_id);
-        intelmaddata = snd_pcm_substream_chip(substream);
-
-        pr_debug("str id = %d\n", stream->stream_info.str_id);
-        if (stream->stream_info.str_id) {
-                /* SST API to actually stop/free the stream */
-                ret_val = intelmaddata->sstdrv_ops->pcm_control->close(str_id);
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                        intelmaddata->playback_cnt--;
-                else
-                        intelmaddata->capture_cnt--;
-        }
-        pr_debug("snd_intelmad_close : pb cnt = %d cap cnt = %d\n",
-                intelmaddata->playback_cnt, intelmaddata->capture_cnt);
-        kfree(substream->runtime->private_data);
-        return ret_val;
-}
-
-/**
- * snd_intelmad_open- to set runtime parameters during stream start
- *
- * @substream:  substream for which the function is called
- * @type: audio device type
- *
- * This function is called by ALSA framework when stream is started
- */
-static int snd_intelmad_open(struct snd_pcm_substream *substream,
-                        enum snd_sst_audio_device_type type)
-{
-        struct snd_intelmad *intelmaddata;
-        struct snd_pcm_runtime *runtime;
-        struct mad_stream_pvt *stream;
-
-        WARN_ON(!substream);
-
-        pr_debug("snd_intelmad_open called\n");
-
-        intelmaddata = snd_pcm_substream_chip(substream);
-        runtime = substream->runtime;
-        /* set the runtime hw parameter with local snd_pcm_hardware struct */
-        runtime->hw = snd_intelmad_stream;
-        if (intelmaddata->cpu_id == CPU_CHIP_LINCROFT) {
-                /*
-                 * MRST firmware currently denies stereo recording requests.
-                 */
-                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
-                        runtime->hw.formats = (SNDRV_PCM_FMTBIT_S16 |
-                                               SNDRV_PCM_FMTBIT_U16);
-                        runtime->hw.channels_max = 1;
-                }
-        }
-        if (intelmaddata->cpu_id == CPU_CHIP_PENWELL) {
-                runtime->hw = snd_intelmad_stream;
-                runtime->hw.rates = SNDRV_PCM_RATE_48000;
-                runtime->hw.rate_min = MAX_RATE;
-                runtime->hw.formats = (SNDRV_PCM_FMTBIT_S24 |
-                                                SNDRV_PCM_FMTBIT_U24);
-                if (intelmaddata->sstdrv_ops->scard_ops->input_dev_id == AMIC)
-                        runtime->hw.channels_max = MAX_CHANNEL_AMIC;
-                else
-                        runtime->hw.channels_max = MAX_CHANNEL_DMIC;
-
-        }
-        /* setup the internal datastruture stream pointers based on it being
-        playback or capture stream */
-        stream = kzalloc(sizeof(*stream), GFP_KERNEL);
-        if (!stream)
-                return -ENOMEM;
-        stream->stream_info.str_id = 0;
-        stream->device = type;
-        stream->stream_status = INIT;
-        runtime->private_data = stream;
-        return snd_pcm_hw_constraint_integer(runtime,
-                         SNDRV_PCM_HW_PARAM_PERIODS);
-}
-
-static int snd_intelmad_headset_open(struct snd_pcm_substream *substream)
-{
-        return snd_intelmad_open(substream, SND_SST_DEVICE_HEADSET);
-}
-
-static int snd_intelmad_ihf_open(struct snd_pcm_substream *substream)
-{
-        return snd_intelmad_open(substream, SND_SST_DEVICE_IHF);
-}
-
-static int snd_intelmad_vibra_open(struct snd_pcm_substream *substream)
-{
-        return snd_intelmad_open(substream, SND_SST_DEVICE_VIBRA);
-}
-
-static int snd_intelmad_haptic_open(struct snd_pcm_substream *substream)
-{
-        return snd_intelmad_open(substream, SND_SST_DEVICE_HAPTIC);
-}
-
-static struct snd_pcm_ops snd_intelmad_headset_ops = {
-        .open = snd_intelmad_headset_open,
-        .close = snd_intelmad_close,
-        .ioctl = snd_pcm_lib_ioctl,
-        .hw_params = snd_intelmad_hw_params,
-        .hw_free = snd_intelmad_hw_free,
-        .prepare = snd_intelmad_pcm_prepare,
-        .trigger = snd_intelmad_pcm_trigger,
-        .pointer = snd_intelmad_pcm_pointer,
-};
-
-static struct snd_pcm_ops snd_intelmad_ihf_ops = {
-        .open = snd_intelmad_ihf_open,
-        .close = snd_intelmad_close,
-        .ioctl = snd_pcm_lib_ioctl,
-        .hw_params = snd_intelmad_hw_params,
-        .hw_free = snd_intelmad_hw_free,
-        .prepare = snd_intelmad_pcm_prepare,
-        .trigger = snd_intelmad_pcm_trigger,
-        .pointer = snd_intelmad_pcm_pointer,
-};
-
-static struct snd_pcm_ops snd_intelmad_vibra_ops = {
-        .open = snd_intelmad_vibra_open,
-        .close = snd_intelmad_close,
-        .ioctl = snd_pcm_lib_ioctl,
-        .hw_params = snd_intelmad_hw_params,
-        .hw_free = snd_intelmad_hw_free,
-        .prepare = snd_intelmad_pcm_prepare,
-        .trigger = snd_intelmad_pcm_trigger,
-        .pointer = snd_intelmad_pcm_pointer,
-};
-
-static struct snd_pcm_ops snd_intelmad_haptic_ops = {
-        .open = snd_intelmad_haptic_open,
-        .close = snd_intelmad_close,
-        .ioctl = snd_pcm_lib_ioctl,
-        .hw_params = snd_intelmad_hw_params,
-        .hw_free = snd_intelmad_hw_free,
-        .prepare = snd_intelmad_pcm_prepare,
-        .trigger = snd_intelmad_pcm_trigger,
-        .pointer = snd_intelmad_pcm_pointer,
-};
-
-static struct snd_pcm_ops snd_intelmad_capture_ops = {
-        .open = snd_intelmad_headset_open,
-        .close = snd_intelmad_close,
-        .ioctl = snd_pcm_lib_ioctl,
-        .hw_params = snd_intelmad_hw_params,
-        .hw_free = snd_intelmad_hw_free,
-        .prepare = snd_intelmad_pcm_prepare,
-        .trigger = snd_intelmad_pcm_trigger,
-        .pointer = snd_intelmad_pcm_pointer,
-};
-
-int intelmad_get_mic_bias(void)
-{
-        struct snd_pmic_ops *pmic_ops;
-
-        if (!intelmad_drv || !intelmad_drv->sstdrv_ops)
-                return -ENODEV;
-        pmic_ops = intelmad_drv->sstdrv_ops->scard_ops;
-        if (pmic_ops && pmic_ops->pmic_get_mic_bias)
-                return pmic_ops->pmic_get_mic_bias(intelmad_drv);
-        else
-                return -ENODEV;
-}
-EXPORT_SYMBOL_GPL(intelmad_get_mic_bias);
-
-int intelmad_set_headset_state(int state)
-{
-        struct snd_pmic_ops *pmic_ops;
-
-        if (!intelmad_drv || !intelmad_drv->sstdrv_ops)
-                return -ENODEV;
-        pmic_ops = intelmad_drv->sstdrv_ops->scard_ops;
-        if (pmic_ops && pmic_ops->pmic_set_headset_state)
-                return pmic_ops->pmic_set_headset_state(state);
-        else
-                return -ENODEV;
-}
-EXPORT_SYMBOL_GPL(intelmad_set_headset_state);
-
-void sst_process_mad_jack_detection(struct work_struct *work)
-{
-        u8 interrupt_status;
-        struct mad_jack_msg_wq *mad_jack_detect =
-                        container_of(work, struct mad_jack_msg_wq, wq);
-
-        struct snd_intelmad *intelmaddata =
-                        mad_jack_detect->intelmaddata;
-
-        if (!intelmaddata)
-                return;
-
-        interrupt_status = mad_jack_detect->intsts;
-        if (intelmaddata->sstdrv_ops && intelmaddata->sstdrv_ops->scard_ops
-                        && intelmaddata->sstdrv_ops->scard_ops->pmic_irq_cb) {
-                intelmaddata->sstdrv_ops->scard_ops->pmic_irq_cb(
-                        (void *)intelmaddata, interrupt_status);
-                intelmaddata->sstdrv_ops->scard_ops->pmic_jack_enable();
-        }
-        kfree(mad_jack_detect);
-}
-/**
- * snd_intelmad_intr_handler- interrupt handler
- *
- * @irq :  irq number of the interrupt received
- * @dev: device context
- *
- * This function is called when an interrupt is raised at the sound card
- */
-static irqreturn_t snd_intelmad_intr_handler(int irq, void *dev)
-{
-        struct snd_intelmad *intelmaddata =
-                        (struct snd_intelmad *)dev;
-        u8 interrupt_status;
-        struct mad_jack_msg_wq  *mad_jack_msg;
-        memcpy_fromio(&interrupt_status,
-                        ((void *)(intelmaddata->int_base)),
-                        sizeof(u8));
-
-        mad_jack_msg = kzalloc(sizeof(*mad_jack_msg), GFP_ATOMIC);
-        mad_jack_msg->intsts = interrupt_status;
-        mad_jack_msg->intelmaddata = intelmaddata;
-        INIT_WORK(&mad_jack_msg->wq, sst_process_mad_jack_detection);
-        queue_work(intelmaddata->mad_jack_wq, &mad_jack_msg->wq);
-
-        return IRQ_HANDLED;
-}
-
-void sst_mad_send_jack_report(struct snd_jack *jack,
-                                int buttonpressevent , int status)
-{
-
-        if (!jack) {
-                pr_debug("MAD error jack empty\n");
-
-        } else {
-                snd_jack_report(jack, status);
-                /* button pressed and released */
-                if (buttonpressevent)
-                        snd_jack_report(jack, 0);
-                pr_debug("MAD sending jack report Done !!!\n");
-        }
-}
-
-static int __devinit snd_intelmad_register_irq(
-                struct snd_intelmad *intelmaddata, unsigned int regbase,
-                unsigned int regsize)
-{
-        int ret_val;
-        char *drv_name;
-
-        pr_debug("irq reg regbase 0x%x, regsize 0x%x\n",
-                                        regbase, regsize);
-        intelmaddata->int_base = ioremap_nocache(regbase, regsize);
-        if (!intelmaddata->int_base)
-                pr_err("Mapping of cache failed\n");
-        pr_debug("irq = 0x%x\n", intelmaddata->irq);
-        if (intelmaddata->cpu_id == CPU_CHIP_PENWELL)
-                drv_name = DRIVER_NAME_MFLD;
-        else
-                drv_name = DRIVER_NAME_MRST;
-        ret_val = request_irq(intelmaddata->irq,
-                                snd_intelmad_intr_handler,
-                                IRQF_SHARED, drv_name,
-                                intelmaddata);
-        if (ret_val)
-                pr_err("cannot register IRQ\n");
-        return ret_val;
-}
-
-static int __devinit snd_intelmad_sst_register(
-                        struct snd_intelmad *intelmaddata)
-{
-        int ret_val = 0;
-        struct snd_pmic_ops *intelmad_vendor_ops[MAX_VENDORS] = {
-                &snd_pmic_ops_fs,
-                &snd_pmic_ops_mx,
-                &snd_pmic_ops_nc,
-                &snd_msic_ops
-        };
-
-        struct sc_reg_access vendor_addr = {0x00, 0x00, 0x00};
-
-        if (intelmaddata->cpu_id == CPU_CHIP_LINCROFT) {
-                ret_val = sst_sc_reg_access(&vendor_addr, PMIC_READ, 1);
-                if (ret_val)
-                        return ret_val;
-                sst_card_vendor_id = (vendor_addr.value & (MASK2|MASK1|MASK0));
-                pr_debug("original n extrated vendor id = 0x%x %d\n",
-                                vendor_addr.value, sst_card_vendor_id);
-                if (sst_card_vendor_id < 0 || sst_card_vendor_id > 2) {
-                        pr_err("vendor card not supported!!\n");
-                        return -EIO;
-                }
-        } else
-                sst_card_vendor_id = 0x3;
-
-        intelmaddata->sstdrv_ops->module_name = SST_CARD_NAMES;
-        intelmaddata->sstdrv_ops->vendor_id = sst_card_vendor_id;
-        BUG_ON(!intelmad_vendor_ops[sst_card_vendor_id]);
-        intelmaddata->sstdrv_ops->scard_ops =
-                        intelmad_vendor_ops[sst_card_vendor_id];
-
-        if (intelmaddata->cpu_id == CPU_CHIP_PENWELL) {
-                intelmaddata->sstdrv_ops->scard_ops->pb_on = 0;
-                intelmaddata->sstdrv_ops->scard_ops->cap_on = 0;
-                intelmaddata->sstdrv_ops->scard_ops->input_dev_id = DMIC;
-                intelmaddata->sstdrv_ops->scard_ops->output_dev_id =
-                                                        STEREO_HEADPHONE;
-                intelmaddata->sstdrv_ops->scard_ops->lineout_dev_id = NONE;
-        }
-
-        /* registering with SST driver to get access to SST APIs to use */
-        ret_val = register_sst_card(intelmaddata->sstdrv_ops);
-        if (ret_val) {
-                pr_err("sst card registration failed\n");
-                return ret_val;
-        }
-        sst_card_vendor_id = intelmaddata->sstdrv_ops->vendor_id;
-        intelmaddata->pmic_status = PMIC_UNINIT;
-        return ret_val;
-}
-
-static void snd_intelmad_page_free(struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-/* Driver Init/exit functionalities */
-/**
- * snd_intelmad_pcm_new - to setup pcm for the card
- *
- * @card:  pointer to the sound card structure
- * @intelmaddata: pointer to internal context
- * @pb: playback count for this card
- * @cap: capture count for this card
- * @index: device index
- *
- * This function is called from probe function to set up pcm params
- * and functions
- */
-static int __devinit snd_intelmad_pcm_new(struct snd_card *card,
-                        struct snd_intelmad *intelmaddata,
-                        unsigned int pb, unsigned int cap, unsigned int index)
-{
-        int ret_val = 0;
-        struct snd_pcm *pcm;
-        char name[32] = INTEL_MAD;
-        struct snd_pcm_ops *pb_ops = NULL, *cap_ops = NULL;
-
-        pr_debug("called for pb %d, cp %d, idx %d\n", pb, cap, index);
-        ret_val = snd_pcm_new(card, name, index, pb, cap, &pcm);
-        if (ret_val)
-                return ret_val;
-        /* setup the ops for playback and capture streams */
-        switch (index) {
-        case 0:
-                pb_ops = &snd_intelmad_headset_ops;
-                cap_ops = &snd_intelmad_capture_ops;
-                break;
-        case 1:
-                pb_ops = &snd_intelmad_ihf_ops;
-                cap_ops = &snd_intelmad_capture_ops;
-                break;
-        case 2:
-                pb_ops = &snd_intelmad_vibra_ops;
-                cap_ops = &snd_intelmad_capture_ops;
-                break;
-        case 3:
-                pb_ops = &snd_intelmad_haptic_ops;
-                cap_ops = &snd_intelmad_capture_ops;
-                break;
-        }
-        if (pb)
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, pb_ops);
-        if (cap)
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, cap_ops);
-        /* setup private data which can be retrieved when required */
-        pcm->private_data = intelmaddata;
-        pcm->private_free = snd_intelmad_page_free;
-        pcm->info_flags = 0;
-        strncpy(pcm->name, card->shortname, strlen(card->shortname));
-        /* allocate dma pages for ALSA stream operations */
-        snd_pcm_lib_preallocate_pages_for_all(pcm,
-                        SNDRV_DMA_TYPE_CONTINUOUS,
-                        snd_dma_continuous_data(GFP_KERNEL),
-                        MIN_BUFFER, MAX_BUFFER);
-        return ret_val;
-}
-
-static int __devinit snd_intelmad_pcm(struct snd_card *card,
-                                struct snd_intelmad *intelmaddata)
-{
-        int ret_val = 0;
-
-        WARN_ON(!card);
-        WARN_ON(!intelmaddata);
-        pr_debug("snd_intelmad_pcm called\n");
-        ret_val = snd_intelmad_pcm_new(card, intelmaddata, 1, 1, 0);
-        if (intelmaddata->cpu_id == CPU_CHIP_LINCROFT)
-                return ret_val;
-        ret_val = snd_intelmad_pcm_new(card, intelmaddata, 1, 0, 1);
-        if (ret_val)
-                return ret_val;
-        ret_val = snd_intelmad_pcm_new(card, intelmaddata, 1, 0, 2);
-        if (ret_val)
-                return ret_val;
-        return snd_intelmad_pcm_new(card, intelmaddata, 1, 0, 3);
-}
-
-/**
- * snd_intelmad_jack- to setup jack settings of the card
- *
- * @intelmaddata: pointer to internal context
- *
- * This function is called send jack events
- */
-static int snd_intelmad_jack(struct snd_intelmad *intelmaddata)
-{
-        struct snd_jack *jack;
-        int retval;
-
-        pr_debug("snd_intelmad_jack called\n");
-        jack = &intelmaddata->jack[0].jack;
-        snd_jack_set_key(jack, SND_JACK_BTN_0, KEY_PHONE);
-        retval = snd_jack_new(intelmaddata->card, "Intel(R) MID Audio Jack",
-                SND_JACK_HEADPHONE | SND_JACK_HEADSET |
-                SW_JACK_PHYSICAL_INSERT | SND_JACK_BTN_0
-                | SND_JACK_BTN_1, &jack);
-        pr_debug("snd_intelmad_jack called\n");
-        if (retval < 0)
-                return retval;
-        snd_jack_report(jack, 0);
-
-        jack->private_data = jack;
-        intelmaddata->jack[0].jack = *jack;
-
-        return retval;
-}
-
-/**
- * snd_intelmad_mixer- to setup mixer settings of the card
- *
- * @intelmaddata: pointer to internal context
- *
- * This function is called from probe function to set up mixer controls
- */
-static int __devinit snd_intelmad_mixer(struct snd_intelmad *intelmaddata)
-{
-        struct snd_card *card;
-        unsigned int idx;
-        int ret_val = 0, max_controls = 0;
-        char *mixername = "IntelMAD Controls";
-        struct snd_kcontrol_new *controls;
-
-        WARN_ON(!intelmaddata);
-
-        card = intelmaddata->card;
-        strncpy(card->mixername, mixername, sizeof(card->mixername)-1);
-        /* add all widget controls and expose the same */
-        if (intelmaddata->cpu_id == CPU_CHIP_PENWELL) {
-                max_controls = MAX_CTRL_MFLD;
-                controls = snd_intelmad_controls_mfld;
-        } else {
-                max_controls = MAX_CTRL_MRST;
-                controls = snd_intelmad_controls_mrst;
-        }
-        for (idx = 0; idx < max_controls; idx++) {
-                ret_val = snd_ctl_add(card,
-                                snd_ctl_new1(&controls[idx],
-                                intelmaddata));
-                pr_debug("mixer[idx]=%d added\n", idx);
-                if (ret_val) {
-                        pr_err("in adding of control index = %d\n", idx);
-                        break;
-                }
-        }
-        return ret_val;
-}
-
-static int snd_intelmad_dev_free(struct snd_device *device)
-{
-        struct snd_intelmad *intelmaddata;
-
-        WARN_ON(!device);
-
-        intelmaddata = device->device_data;
-
-        pr_debug("snd_intelmad_dev_free called\n");
-        unregister_sst_card(intelmaddata->sstdrv_ops);
-
-        /* free allocated memory for internal context */
-        destroy_workqueue(intelmaddata->mad_jack_wq);
-        device->device_data = NULL;
-        kfree(intelmaddata->sstdrv_ops);
-        kfree(intelmaddata);
-
-        return 0;
-}
-
-static int __devinit snd_intelmad_create(
-                struct snd_intelmad *intelmaddata,
-                struct snd_card *card)
-{
-        int ret_val;
-        static struct snd_device_ops ops = {
-                .dev_free =     snd_intelmad_dev_free,
-        };
-
-        WARN_ON(!intelmaddata);
-        WARN_ON(!card);
-        /* ALSA api to register for the device */
-        ret_val = snd_device_new(card, SNDRV_DEV_LOWLEVEL, intelmaddata, &ops);
-        return ret_val;
-}
-
-/**
-* snd_intelmad_probe- function registred for init
-* @pdev :  pointer to the device struture
-* This function is called when the device is initialized
-*/
-int __devinit snd_intelmad_probe(struct platform_device *pdev)
-{
-        struct snd_card *card;
-        int ret_val;
-        struct snd_intelmad *intelmaddata;
-        const struct platform_device_id *id = platform_get_device_id(pdev);
-        struct snd_intelmad_probe_info *info = (void *)id->driver_data;
-
-        pr_debug("probe for %s cpu_id %d\n", pdev->name, info->cpu_id);
-        pr_debug("rq_chache %x of size %x\n", info->irq_cache, info->size);
-        if (!strcmp(pdev->name, DRIVER_NAME_MRST))
-                pr_debug("detected MRST\n");
-        else if (!strcmp(pdev->name, DRIVER_NAME_MFLD))
-                pr_debug("detected MFLD\n");
-        else {
-                pr_err("detected unknown device abort!!\n");
-                return -EIO;
-        }
-        if ((info->cpu_id < CPU_CHIP_LINCROFT) ||
-                                (info->cpu_id > CPU_CHIP_PENWELL)) {
-                pr_err("detected unknown cpu_id abort!!\n");
-                return -EIO;
-        }
-        /* allocate memory for saving internal context and working */
-        intelmaddata = kzalloc(sizeof(*intelmaddata), GFP_KERNEL);
-        if (!intelmaddata) {
-                pr_debug("mem alloctn fail\n");
-                return -ENOMEM;
-        }
-        intelmad_drv = intelmaddata;
-
-        /* allocate memory for LPE API set */
-        intelmaddata->sstdrv_ops = kzalloc(sizeof(struct intel_sst_card_ops),
-                                        GFP_KERNEL);
-        if (!intelmaddata->sstdrv_ops) {
-                pr_err("mem allocation for ops fail\n");
-                kfree(intelmaddata);
-                return -ENOMEM;
-        }
-
-        intelmaddata->cpu_id = info->cpu_id;
-        /* create a card instance with ALSA framework */
-        ret_val = snd_card_create(card_index, card_id, THIS_MODULE, 0, &card);
-        if (ret_val) {
-                pr_err("snd_card_create fail\n");
-                goto free_allocs;
-        }
-
-        intelmaddata->pdev = pdev;
-        intelmaddata->irq = platform_get_irq(pdev, 0);
-        platform_set_drvdata(pdev, intelmaddata);
-        intelmaddata->card = card;
-        intelmaddata->card_id = card_id;
-        intelmaddata->card_index = card_index;
-        intelmaddata->master_mute = UNMUTE;
-        intelmaddata->playback_cnt =  intelmaddata->capture_cnt = 0;
-        strncpy(card->driver, INTEL_MAD, strlen(INTEL_MAD));
-        strncpy(card->shortname, INTEL_MAD, strlen(INTEL_MAD));
-
-        intelmaddata->sstdrv_ops->module_name = SST_CARD_NAMES;
-        /* registering with LPE driver to get access to SST APIs to use */
-        ret_val = snd_intelmad_sst_register(intelmaddata);
-        if (ret_val) {
-                pr_err("snd_intelmad_sst_register failed\n");
-                goto set_null_data;
-        }
-
-        intelmaddata->pmic_status = PMIC_INIT;
-
-        ret_val = snd_intelmad_pcm(card, intelmaddata);
-        if (ret_val) {
-                pr_err("snd_intelmad_pcm failed\n");
-                goto free_sst;
-        }
-
-        ret_val = snd_intelmad_mixer(intelmaddata);
-        if (ret_val) {
-                pr_err("snd_intelmad_mixer failed\n");
-                goto free_card;
-        }
-
-        ret_val = snd_intelmad_jack(intelmaddata);
-        if (ret_val) {
-                pr_err("snd_intelmad_jack failed\n");
-                goto free_card;
-        }
-        intelmaddata->adc_address = mid_initialize_adc();
-
-        /*create work queue for jack interrupt*/
-        INIT_WORK(&intelmaddata->mad_jack_msg.wq,
-                sst_process_mad_jack_detection);
-
-        intelmaddata->mad_jack_wq = create_workqueue("sst_mad_jack_wq");
-        if (!intelmaddata->mad_jack_wq)
-                goto free_card;
-
-        ret_val = snd_intelmad_register_irq(intelmaddata,
-                                        info->irq_cache, info->size);
-        if (ret_val) {
-                pr_err("snd_intelmad_register_irq fail\n");
-                goto free_mad_jack_wq;
-        }
-
-        /* internal function call to register device with ALSA */
-        ret_val = snd_intelmad_create(intelmaddata, card);
-        if (ret_val) {
-                pr_err("snd_intelmad_create failed\n");
-                goto set_pvt_data;
-        }
-        card->private_data = &intelmaddata;
-        snd_card_set_dev(card, &pdev->dev);
-        ret_val = snd_card_register(card);
-        if (ret_val) {
-                pr_err("snd_card_register failed\n");
-                goto set_pvt_data;
-        }
-        if (pdev->dev.platform_data) {
-                int gpio_amp = *(int *)pdev->dev.platform_data;
-                if (gpio_request_one(gpio_amp, GPIOF_OUT_INIT_LOW, "amp power"))
-                        gpio_amp = 0;
-                intelmaddata->sstdrv_ops->scard_ops->gpio_amp = gpio_amp;
-        }
-
-        pr_debug("snd_intelmad_probe complete\n");
-        return ret_val;
-
-set_pvt_data:
-        card->private_data = NULL;
-free_mad_jack_wq:
-        destroy_workqueue(intelmaddata->mad_jack_wq);
-free_card:
-        snd_card_free(intelmaddata->card);
-free_sst:
-        unregister_sst_card(intelmaddata->sstdrv_ops);
-set_null_data:
-        platform_set_drvdata(pdev, NULL);
-free_allocs:
-        pr_err("probe failed\n");
-        snd_card_free(card);
-        kfree(intelmaddata->sstdrv_ops);
-        kfree(intelmaddata);
-        return ret_val;
-}
-
-
-static int snd_intelmad_remove(struct platform_device *pdev)
-{
-        struct snd_intelmad *intelmaddata = platform_get_drvdata(pdev);
-
-        if (intelmaddata) {
-                if (intelmaddata->sstdrv_ops->scard_ops->gpio_amp)
-                        gpio_free(intelmaddata->sstdrv_ops->scard_ops->gpio_amp);
-                free_irq(intelmaddata->irq, intelmaddata);
-                snd_card_free(intelmaddata->card);
-        }
-        intelmad_drv = NULL;
-        platform_set_drvdata(pdev, NULL);
-        return 0;
-}
-
-/*********************************************************************
- *              Driver initialization and exit
- *********************************************************************/
-static const struct platform_device_id snd_intelmad_ids[] = {
-        {DRIVER_NAME_MRST, INFO(CPU_CHIP_LINCROFT, AUDINT_BASE, 1)},
-        {DRIVER_NAME_MFLD, INFO(CPU_CHIP_PENWELL, 0xFFFF7FCD, 1)},
-        {"", 0},
-
-};
-
-static struct platform_driver snd_intelmad_driver = {
-        .driver = {
-                .owner = THIS_MODULE,
-                .name = "intel_mid_sound_card",
-        },
-        .id_table = snd_intelmad_ids,
-        .probe = snd_intelmad_probe,
-        .remove = __devexit_p(snd_intelmad_remove),
-};
-
-/*
- * alsa_card_intelmad_init- driver init function
- *
- * This function is called when driver module is inserted
- */
-static int __init alsa_card_intelmad_init(void)
-{
-        pr_debug("mad_init called\n");
-        return platform_driver_register(&snd_intelmad_driver);
-}
-
-/**
- * alsa_card_intelmad_exit- driver exit function
- *
- * This function is called when driver module is removed
- */
-static void __exit alsa_card_intelmad_exit(void)
-{
-        pr_debug("mad_exit called\n");
-        return platform_driver_unregister(&snd_intelmad_driver);
-}
-
-module_init(alsa_card_intelmad_init)
-module_exit(alsa_card_intelmad_exit)
-
diff --git a/drivers/staging/intel_sst/intelmid.h b/drivers/staging/intel_sst/intelmid.h
deleted file mode 100644
index 14a7ba078b7c..000000000000
--- a/drivers/staging/intel_sst/intelmid.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  intelmid.h - Intel Sound card driver for MID
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Harsha Priya <priya.harsha@intel.com>
- *              Vinod Koul <vinod.koul@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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 version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *  ALSA driver header for Intel MAD chipset
- */
-#ifndef __INTELMID_H
-#define __INTELMID_H
-
-#include <linux/time.h>
-#include <sound/jack.h>
-
-#define DRIVER_NAME_MFLD "msic_audio"
-#define DRIVER_NAME_MRST "pmic_audio"
-#define DRIVER_NAME "intelmid_audio"
-#define PMIC_SOUND_IRQ_TYPE_MASK (1 << 15)
-#define AUDINT_BASE (0xFFFFEFF8 + (6 * sizeof(u8)))
-#define REG_IRQ
-/* values #defined   */
-/* will differ for different hw - to be taken from config  */
-#define MAX_DEVICES             1
-#define MIN_RATE                8000
-#define MAX_RATE                48000
-#define MAX_BUFFER              (800*1024) /* for PCM */
-#define MIN_BUFFER              (800*1024)
-#define MAX_PERIODS             (1024*2)
-#define MIN_PERIODS             2
-#define MAX_PERIOD_BYTES MAX_BUFFER
-#define MIN_PERIOD_BYTES 32
-/*#define MIN_PERIOD_BYTES 160*/
-#define MAX_MUTE                1
-#define MIN_MUTE                0
-#define MONO_CNTL               1
-#define STEREO_CNTL             2
-#define MIN_CHANNEL             1
-#define MAX_CHANNEL_AMIC        2
-#define MAX_CHANNEL_DMIC        5
-#define FIFO_SIZE               0 /* fifo not being used */
-#define INTEL_MAD               "Intel MAD"
-#define MAX_CTRL_MRST           8
-#define MAX_CTRL_MFLD           7
-#define MAX_CTRL                8
-#define MAX_VENDORS             4
-/* TODO +6 db */
-#define MAX_VOL         64
-/* TODO -57 db */
-#define MIN_VOL         0
-#define PLAYBACK_COUNT  1
-#define CAPTURE_COUNT   1
-#define ADC_ONE_LSB_MULTIPLIER 2346
-
-#define MID_JACK_HS_LONG_PRESS SND_JACK_BTN_0
-#define MID_JACK_HS_SHORT_PRESS SND_JACK_BTN_1
-
-extern int      sst_card_vendor_id;
-
-struct mad_jack {
-        struct snd_jack jack;
-        int jack_status;
-        int jack_dev_state;
-        struct timeval buttonpressed;
-        struct timeval  buttonreleased;
-};
-
-struct mad_jack_msg_wq {
-        u8 intsts;
-        struct snd_intelmad *intelmaddata;
-        struct work_struct      wq;
-
-};
-
-struct snd_intelmad_probe_info {
-        unsigned int cpu_id;
-        unsigned int irq_cache;
-        unsigned int size;
-};
-
-/**
- * struct snd_intelmad - intelmad driver structure
- *
- * @card: ptr to the card details
- * @card_index: sound card index
- * @card_id: sound card id detected
- * @sstdrv_ops: ptr to sst driver ops
- * @pdev: ptr to platform device
- * @irq: interrupt number detected
- * @pmic_status: Device status of sound card
- * @int_base: ptr to MMIO interrupt region
- * @output_sel: device selected as o/p
- * @input_sel: device selected as i/p
- * @master_mute: master mute status
- * @jack: jack status
- * @playback_cnt: active pb streams
- * @capture_cnt: active cp streams
- * @mad_jack_msg: wq struct for jack interrupt processing
- * @mad_jack_wq: wq for jack interrupt processing
- * @jack_prev_state: Previos state of jack detected
- * @cpu_id: current cpu id loaded for
- */
-struct snd_intelmad {
-        struct snd_card *card; /* ptr to the card details */
-        int             card_index;/*  card index  */
-        char            *card_id; /* card id */
-        struct intel_sst_card_ops *sstdrv_ops;/* ptr to sst driver ops */
-        struct platform_device *pdev;
-        int irq;
-        int pmic_status;
-        void __iomem *int_base;
-        int output_sel;
-        int input_sel;
-        int lineout_sel;
-        int master_mute;
-        struct mad_jack jack[4];
-        int playback_cnt;
-        int capture_cnt;
-        u16 adc_address;
-        struct mad_jack_msg_wq  mad_jack_msg;
-        struct workqueue_struct *mad_jack_wq;
-        u8 jack_prev_state;
-        unsigned int cpu_id;
-};
-
-struct snd_control_val {
-        int     playback_vol_max;
-        int     playback_vol_min;
-        int     capture_vol_max;
-        int     capture_vol_min;
-        int     master_vol_max;
-        int     master_vol_min;
-};
-
-struct mad_stream_pvt {
-        int                     stream_status;
-        int                     stream_ops;
-        struct snd_pcm_substream *substream;
-        struct pcm_stream_info stream_info;
-        ssize_t         dbg_cum_bytes;
-        enum snd_sst_device_type device;
-};
-
-enum mad_drv_status {
-    INIT = 1,
-    STARTED,
-    RUNNING,
-    PAUSED,
-    DROPPED,
-};
-
-enum mad_pmic_status {
-        PMIC_UNINIT = 1,
-        PMIC_INIT,
-};
-enum _widget_ctrl {
-        OUTPUT_SEL = 1,
-        INPUT_SEL,
-        PLAYBACK_VOL,
-        PLAYBACK_MUTE,
-        CAPTURE_VOL,
-        CAPTURE_MUTE,
-        MASTER_VOL,
-        MASTER_MUTE
-};
-enum _widget_ctrl_mfld {
-        LINEOUT_SEL_MFLD = 3,
-};
-enum hw_chs {
-        HW_CH0 = 0,
-        HW_CH1,
-        HW_CH2,
-        HW_CH3
-};
-
-void period_elapsed(void *mad_substream);
-int snd_intelmad_alloc_stream(struct snd_pcm_substream *substream);
-int snd_intelmad_init_stream(struct snd_pcm_substream *substream);
-
-int sst_sc_reg_access(struct sc_reg_access *sc_access,
-                                        int type, int num_val);
-#define CPU_CHIP_LINCROFT       1 /* System running lincroft */
-#define CPU_CHIP_PENWELL        2 /* System running penwell */
-
-extern struct snd_control_val intelmad_ctrl_val[];
-extern struct snd_kcontrol_new snd_intelmad_controls_mrst[];
-extern struct snd_kcontrol_new snd_intelmad_controls_mfld[];
-extern struct snd_pmic_ops *intelmad_vendor_ops[];
-void sst_mad_send_jack_report(struct snd_jack *jack,
-                        int buttonpressevent , int status);
-
-#endif /* __INTELMID_H */
diff --git a/drivers/staging/intel_sst/intelmid_adc_control.h b/drivers/staging/intel_sst/intelmid_adc_control.h
deleted file mode 100644
index 65d5c3988762..000000000000
--- a/drivers/staging/intel_sst/intelmid_adc_control.h
+++ /dev/null
@@ -1,193 +0,0 @@
-#ifndef __INTELMID_ADC_CONTROL_H__
-#define __INTELMID_ADC_CONTROL_H_
-/*
- *  intelmid_adc_control.h - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    R Durgadadoss <r.durgadoss@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  Common private ADC declarations for SST
- */
-
-
-#define MSIC_ADC1CNTL1          0x1C0
-#define MSIC_ADC_ENBL           0x10
-#define MSIC_ADC_START          0x08
-
-#define MSIC_ADC1CNTL3          0x1C2
-#define MSIC_ADCTHERM_ENBL      0x04
-#define MSIC_ADCRRDATA_ENBL     0x05
-
-#define MSIC_STOPBIT_MASK       16
-#define MSIC_ADCTHERM_MASK      4
-
-#define ADC_CHANLS_MAX          15 /* Number of ADC channels */
-#define ADC_LOOP_MAX            (ADC_CHANLS_MAX - 1)
-
-/* ADC channel code values */
-#define AUDIO_DETECT_CODE       0x06
-
-/* ADC base addresses */
-#define ADC_CHNL_START_ADDR     0x1C5   /* increments by 1 */
-#define ADC_DATA_START_ADDR     0x1D4   /* increments by 2 */
-
-
-/**
- * configure_adc - enables/disables the ADC for conversion
- * @val: zero: disables the ADC non-zero:enables the ADC
- *
- * Enable/Disable the ADC depending on the argument
- *
- * Can sleep
- */
-static inline int configure_adc(int val)
-{
-        int ret;
-        struct sc_reg_access sc_access = {0,};
-
-
-        sc_access.reg_addr = MSIC_ADC1CNTL1;
-        ret = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        if (ret)
-                return ret;
-
-        if (val)
-                /* Enable and start the ADC */
-                sc_access.value |= (MSIC_ADC_ENBL | MSIC_ADC_START);
-        else
-                /* Just stop the ADC */
-                sc_access.value &= (~MSIC_ADC_START);
-        sc_access.reg_addr = MSIC_ADC1CNTL1;
-        return sst_sc_reg_access(&sc_access, PMIC_WRITE, 1);
-}
-
-/**
- * reset_stopbit - sets the stop bit to 0 on the given channel
- * @addr: address of the channel
- *
- * Can sleep
- */
-static inline int reset_stopbit(uint16_t addr)
-{
-        int ret;
-        struct sc_reg_access sc_access = {0,};
-        sc_access.reg_addr = addr;
-        ret = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        if (ret)
-                return ret;
-        /* Set the stop bit to zero */
-        sc_access.reg_addr = addr;
-        sc_access.value = (sc_access.value) & 0xEF;
-        return sst_sc_reg_access(&sc_access, PMIC_WRITE, 1);
-}
-
-/**
- * find_free_channel - finds an empty channel for conversion
- *
- * If the ADC is not enabled then start using 0th channel
- * itself. Otherwise find an empty channel by looking for a
- * channel in which the stopbit is set to 1. returns the index
- * of the first free channel if succeeds or an error code.
- *
- * Context: can sleep
- *
- */
-static inline int find_free_channel(void)
-{
-        int ret;
-        int i;
-
-        struct sc_reg_access sc_access = {0,};
-
-        /* check whether ADC is enabled */
-        sc_access.reg_addr = MSIC_ADC1CNTL1;
-        ret = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        if (ret)
-                return ret;
-
-        if ((sc_access.value & MSIC_ADC_ENBL) == 0)
-                return 0;
-
-        /* ADC is already enabled; Looking for an empty channel */
-        for (i = 0; i < ADC_CHANLS_MAX; i++) {
-
-                sc_access.reg_addr = ADC_CHNL_START_ADDR + i;
-                ret = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-                if (ret)
-                        return ret;
-
-                if (sc_access.value & MSIC_STOPBIT_MASK) {
-                        ret = i;
-                        break;
-                }
-        }
-        return (ret > ADC_LOOP_MAX) ? (-EINVAL) : ret;
-}
-
-/**
- * mid_initialize_adc - initializing the ADC
- * @dev: our device structure
- *
- * Initialize the ADC for reading thermistor values. Can sleep.
- */
-static inline int mid_initialize_adc(void)
-{
-        int base_addr, chnl_addr;
-        int ret;
-        static int channel_index;
-        struct sc_reg_access sc_access = {0,};
-
-        /* Index of the first channel in which the stop bit is set */
-        channel_index = find_free_channel();
-        if (channel_index < 0) {
-                pr_err("No free ADC channels");
-                return channel_index;
-        }
-
-        base_addr = ADC_CHNL_START_ADDR + channel_index;
-
-        if (!(channel_index == 0 || channel_index == ADC_LOOP_MAX)) {
-                /* Reset stop bit for channels other than 0 and 12 */
-                ret = reset_stopbit(base_addr);
-                if (ret)
-                        return ret;
-
-                /* Index of the first free channel */
-                base_addr++;
-                channel_index++;
-        }
-
-        /* Since this is the last channel, set the stop bit
-           to 1 by ORing the DIE_SENSOR_CODE with 0x10 */
-        sc_access.reg_addr = base_addr;
-        sc_access.value = AUDIO_DETECT_CODE | 0x10;
-        ret = sst_sc_reg_access(&sc_access, PMIC_WRITE, 1);
-        if (ret) {
-                pr_err("unable to enable ADC");
-                return ret;
-        }
-
-        chnl_addr = ADC_DATA_START_ADDR + 2 * channel_index;
-        pr_debug("mid_initialize : %x", chnl_addr);
-        configure_adc(1);
-        return chnl_addr;
-}
-#endif
-
diff --git a/drivers/staging/intel_sst/intelmid_ctrl.c b/drivers/staging/intel_sst/intelmid_ctrl.c
deleted file mode 100644
index 19ec474b362a..000000000000
--- a/drivers/staging/intel_sst/intelmid_ctrl.c
+++ /dev/null
@@ -1,921 +0,0 @@
-/*
- *  intelmid_ctrl.c - Intel Sound card driver for MID
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Harsha Priya <priya.harsha@intel.com>
- *              Vinod Koul <vinod.koul@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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 version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *  ALSA driver handling mixer controls for Intel MAD chipset
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <sound/core.h>
-#include <sound/control.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intelmid_snd_control.h"
-#include "intelmid.h"
-
-#define HW_CH_BASE 4
-
-
-#define HW_CH_0 "Hw1"
-#define HW_CH_1 "Hw2"
-#define HW_CH_2 "Hw3"
-#define HW_CH_3 "Hw4"
-
-static char *router_dmics[] = { "DMIC1",
-                                "DMIC2",
-                                "DMIC3",
-                                "DMIC4",
-                                "DMIC5",
-                                "DMIC6"
-                                };
-
-static char *out_names_mrst[] = {"Headphones",
-                                "Internal speakers"};
-static char *in_names_mrst[] = {"AMIC",
-                                "DMIC",
-                                "HS_MIC"};
-static char *line_out_names_mfld[] = {"Headset",
-                                "IHF    ",
-                                "Vibra1 ",
-                                "Vibra2 ",
-                                "NONE   "};
-static char *out_names_mfld[] = {"Headset ",
-                                "EarPiece  "};
-static char *in_names_mfld[] = {"AMIC",
-                                "DMIC"};
-
-struct snd_control_val intelmad_ctrl_val[MAX_VENDORS] = {
-        {
-                .playback_vol_max = 63,
-                .playback_vol_min = 0,
-                .capture_vol_max = 63,
-                .capture_vol_min = 0,
-        },
-        {
-                .playback_vol_max = 0,
-                .playback_vol_min = -31,
-                .capture_vol_max = 0,
-                .capture_vol_min = -20,
-        },
-        {
-                .playback_vol_max = 0,
-                .playback_vol_min = -31,
-                .capture_vol_max = 0,
-                .capture_vol_min = -31,
-                .master_vol_max = 0,
-                .master_vol_min = -126,
-        },
-};
-
-/* control path functionalities */
-
-static inline int snd_intelmad_volume_info(struct snd_ctl_elem_info *uinfo,
-                                        int control_type, int max, int min)
-{
-        WARN_ON(!uinfo);
-
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = control_type;
-        uinfo->value.integer.min = min;
-        uinfo->value.integer.max = max;
-        return 0;
-}
-
-/**
-* snd_intelmad_mute_info - provides information about the mute controls
-*
-* @kcontrol:    pointer to the control
-* @uinfo:       pointer to the structure where the control's info need
-*               to be filled
-*
-* This function is called when a mixer application requests for control's info
-*/
-static int snd_intelmad_mute_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        WARN_ON(!uinfo);
-        WARN_ON(!kcontrol);
-
-        /* set up the mute as a boolean mono control with min-max values */
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = MONO_CNTL;
-        uinfo->value.integer.min = MIN_MUTE;
-        uinfo->value.integer.max = MAX_MUTE;
-        return 0;
-}
-
-/**
-* snd_intelmad_capture_volume_info - provides info about the volume control
-*
-* @kcontrol:    pointer to the control
-* @uinfo:       pointer to the structure where the control's info need
-*               to be filled
-*
-* This function is called when a mixer application requests for control's info
-*/
-static int snd_intelmad_capture_volume_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        snd_intelmad_volume_info(uinfo, MONO_CNTL,
-                intelmad_ctrl_val[sst_card_vendor_id].capture_vol_max,
-                intelmad_ctrl_val[sst_card_vendor_id].capture_vol_min);
-        return 0;
-}
-
-/**
-* snd_intelmad_playback_volume_info - provides info about the volume control
-*
-* @kcontrol:    pointer to the control
-* @uinfo:       pointer to the structure where the control's info need
-*               to be filled
-*
-* This function is called when a mixer application requests for control's info
-*/
-static int snd_intelmad_playback_volume_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        snd_intelmad_volume_info(uinfo, STEREO_CNTL,
-                intelmad_ctrl_val[sst_card_vendor_id].playback_vol_max,
-                intelmad_ctrl_val[sst_card_vendor_id].playback_vol_min);
-        return 0;
-}
-
-static int snd_intelmad_master_volume_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        snd_intelmad_volume_info(uinfo, STEREO_CNTL,
-                intelmad_ctrl_val[sst_card_vendor_id].master_vol_max,
-                intelmad_ctrl_val[sst_card_vendor_id].master_vol_min);
-        return 0;
-}
-
-/**
-* snd_intelmad_device_info_mrst - provides information about the devices available
-*
-* @kcontrol:    pointer to the control
-* @uinfo:       pointer to the structure where the devices's info need
-*               to be filled
-*
-* This function is called when a mixer application requests for device's info
-*/
-static int snd_intelmad_device_info_mrst(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-
-        WARN_ON(!kcontrol);
-        WARN_ON(!uinfo);
-
-        /* setup device select as drop down controls with different values */
-        if (kcontrol->id.numid == OUTPUT_SEL)
-                uinfo->value.enumerated.items = ARRAY_SIZE(out_names_mrst);
-        else
-                uinfo->value.enumerated.items = ARRAY_SIZE(in_names_mrst);
-        uinfo->count = MONO_CNTL;
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item = 1;
-        if (kcontrol->id.numid == OUTPUT_SEL)
-                strncpy(uinfo->value.enumerated.name,
-                        out_names_mrst[uinfo->value.enumerated.item],
-                        sizeof(uinfo->value.enumerated.name)-1);
-        else
-                strncpy(uinfo->value.enumerated.name,
-                        in_names_mrst[uinfo->value.enumerated.item],
-                        sizeof(uinfo->value.enumerated.name)-1);
-        return 0;
-}
-
-static int snd_intelmad_device_info_mfld(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        struct snd_pmic_ops *scard_ops;
-        struct snd_intelmad *intelmaddata;
-
-        WARN_ON(!kcontrol);
-        WARN_ON(!uinfo);
-
-        intelmaddata = kcontrol->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-        /* setup device select as drop down controls with different values */
-        if (kcontrol->id.numid == OUTPUT_SEL)
-                uinfo->value.enumerated.items = ARRAY_SIZE(out_names_mfld);
-        else if (kcontrol->id.numid == INPUT_SEL)
-                uinfo->value.enumerated.items = ARRAY_SIZE(in_names_mfld);
-        else if (kcontrol->id.numid == LINEOUT_SEL_MFLD) {
-                uinfo->value.enumerated.items = ARRAY_SIZE(line_out_names_mfld);
-                scard_ops->line_out_names_cnt = uinfo->value.enumerated.items;
-        } else
-                return -EINVAL;
-        uinfo->count = MONO_CNTL;
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item = 1;
-        if (kcontrol->id.numid == OUTPUT_SEL)
-                strncpy(uinfo->value.enumerated.name,
-                        out_names_mfld[uinfo->value.enumerated.item],
-                        sizeof(uinfo->value.enumerated.name)-1);
-        else if (kcontrol->id.numid == INPUT_SEL)
-                strncpy(uinfo->value.enumerated.name,
-                        in_names_mfld[uinfo->value.enumerated.item],
-                        sizeof(uinfo->value.enumerated.name)-1);
-        else if (kcontrol->id.numid == LINEOUT_SEL_MFLD)
-                strncpy(uinfo->value.enumerated.name,
-                        line_out_names_mfld[uinfo->value.enumerated.item],
-                        sizeof(uinfo->value.enumerated.name)-1);
-        else
-                return -EINVAL;
-        return 0;
-}
-
-/**
-* snd_intelmad_volume_get - gets the current volume for the control
-*
-* @kcontrol:    pointer to the control
-* @uval:        pointer to the structure where the control's info need
-*               to be filled
-*
-* This function is called when .get function of a control is invoked from app
-*/
-static int snd_intelmad_volume_get(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_value *uval)
-{
-        int ret_val = 0, cntl_list[2] = {0,};
-        int value = 0;
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-
-        pr_debug("snd_intelmad_volume_get called\n");
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-
-        WARN_ON(!scard_ops);
-
-        switch (kcontrol->id.numid) {
-        case PLAYBACK_VOL:
-                cntl_list[0] = PMIC_SND_RIGHT_PB_VOL;
-                cntl_list[1] = PMIC_SND_LEFT_PB_VOL;
-                break;
-
-        case CAPTURE_VOL:
-                cntl_list[0] = PMIC_SND_CAPTURE_VOL;
-                break;
-
-        case MASTER_VOL:
-                cntl_list[0] = PMIC_SND_RIGHT_MASTER_VOL;
-                cntl_list[1] = PMIC_SND_LEFT_MASTER_VOL;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        ret_val = scard_ops->get_vol(cntl_list[0], &value);
-        uval->value.integer.value[0] = value;
-
-        if (ret_val)
-                return ret_val;
-
-        if (kcontrol->id.numid == PLAYBACK_VOL ||
-                kcontrol->id.numid == MASTER_VOL) {
-                ret_val = scard_ops->get_vol(cntl_list[1], &value);
-                uval->value.integer.value[1] = value;
-        }
-        return ret_val;
-}
-
-/**
-* snd_intelmad_mute_get - gets the current mute status for the control
-*
-* @kcontrol:    pointer to the control
-* @uval:        pointer to the structure where the control's info need
-*               to be filled
-*
-* This function is called when .get function of a control is invoked from app
-*/
-static int snd_intelmad_mute_get(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-
-        int cntl_list = 0, ret_val = 0;
-        u8 value = 0;
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-
-        pr_debug("Mute_get called\n");
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-
-        WARN_ON(!scard_ops);
-
-        switch (kcontrol->id.numid) {
-        case PLAYBACK_MUTE:
-                if (intelmaddata->output_sel == STEREO_HEADPHONE)
-                        cntl_list = PMIC_SND_LEFT_HP_MUTE;
-                else if ((intelmaddata->output_sel == INTERNAL_SPKR) ||
-                        (intelmaddata->output_sel == MONO_EARPIECE))
-                        cntl_list = PMIC_SND_LEFT_SPEAKER_MUTE;
-                break;
-
-        case CAPTURE_MUTE:
-                if (intelmaddata->input_sel == DMIC)
-                        cntl_list = PMIC_SND_DMIC_MUTE;
-                else if (intelmaddata->input_sel == AMIC)
-                        cntl_list = PMIC_SND_AMIC_MUTE;
-                else if (intelmaddata->input_sel == HS_MIC)
-                        cntl_list = PMIC_SND_HP_MIC_MUTE;
-                break;
-        case MASTER_MUTE:
-                uval->value.integer.value[0] = intelmaddata->master_mute;
-                return 0;
-        default:
-                return -EINVAL;
-        }
-
-        ret_val = scard_ops->get_mute(cntl_list, &value);
-        uval->value.integer.value[0] = value;
-        return ret_val;
-}
-
-/**
-* snd_intelmad_volume_set - sets the volume control's info
-*
-* @kcontrol:    pointer to the control
-* @uval:        pointer to the structure where the control's info is
-*               available to be set
-*
-* This function is called when .set function of a control is invoked from app
-*/
-static int snd_intelmad_volume_set(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-
-        int ret_val, cntl_list[2] = {0,};
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-
-        pr_debug("volume set called:%ld %ld\n",
-                        uval->value.integer.value[0],
-                        uval->value.integer.value[1]);
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-
-        WARN_ON(!scard_ops);
-
-        switch (kcontrol->id.numid) {
-        case PLAYBACK_VOL:
-                cntl_list[0] = PMIC_SND_LEFT_PB_VOL;
-                cntl_list[1] = PMIC_SND_RIGHT_PB_VOL;
-                break;
-
-        case CAPTURE_VOL:
-                cntl_list[0] = PMIC_SND_CAPTURE_VOL;
-                break;
-
-        case MASTER_VOL:
-                cntl_list[0] = PMIC_SND_LEFT_MASTER_VOL;
-                cntl_list[1] = PMIC_SND_RIGHT_MASTER_VOL;
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        ret_val = scard_ops->set_vol(cntl_list[0],
-                                uval->value.integer.value[0]);
-        if (ret_val)
-                return ret_val;
-
-        if (kcontrol->id.numid == PLAYBACK_VOL ||
-                kcontrol->id.numid == MASTER_VOL)
-                ret_val = scard_ops->set_vol(cntl_list[1],
-                                uval->value.integer.value[1]);
-        return ret_val;
-}
-
-/**
-* snd_intelmad_mute_set - sets the mute control's info
-*
-* @kcontrol:    pointer to the control
-* @uval:        pointer to the structure where the control's info is
-*               available to be set
-*
-* This function is called when .set function of a control is invoked from app
-*/
-static int snd_intelmad_mute_set(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-        int cntl_list[2] = {0,}, ret_val;
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-
-        pr_debug("snd_intelmad_mute_set called\n");
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-
-        WARN_ON(!scard_ops);
-
-        kcontrol->private_value = uval->value.integer.value[0];
-
-        switch (kcontrol->id.numid) {
-        case PLAYBACK_MUTE:
-                if (intelmaddata->output_sel == STEREO_HEADPHONE) {
-                        cntl_list[0] = PMIC_SND_LEFT_HP_MUTE;
-                        cntl_list[1] = PMIC_SND_RIGHT_HP_MUTE;
-                } else if ((intelmaddata->output_sel == INTERNAL_SPKR) ||
-                                (intelmaddata->output_sel == MONO_EARPIECE)) {
-                        cntl_list[0] = PMIC_SND_LEFT_SPEAKER_MUTE;
-                        cntl_list[1] = PMIC_SND_RIGHT_SPEAKER_MUTE;
-                }
-                break;
-
-        case CAPTURE_MUTE:/*based on sel device mute the i/p dev*/
-                if (intelmaddata->input_sel == DMIC)
-                        cntl_list[0] = PMIC_SND_DMIC_MUTE;
-                else if (intelmaddata->input_sel == AMIC)
-                        cntl_list[0] = PMIC_SND_AMIC_MUTE;
-                else if (intelmaddata->input_sel == HS_MIC)
-                        cntl_list[0] = PMIC_SND_HP_MIC_MUTE;
-                break;
-        case MASTER_MUTE:
-                cntl_list[0] = PMIC_SND_MUTE_ALL;
-                intelmaddata->master_mute = uval->value.integer.value[0];
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        ret_val = scard_ops->set_mute(cntl_list[0],
-                                uval->value.integer.value[0]);
-        if (ret_val)
-                return ret_val;
-
-        if (kcontrol->id.numid == PLAYBACK_MUTE)
-                ret_val = scard_ops->set_mute(cntl_list[1],
-                                        uval->value.integer.value[0]);
-        return ret_val;
-}
-
-/**
-* snd_intelmad_device_get - get the device select control's info
-*
-* @kcontrol:    pointer to the control
-* @uval:        pointer to the structure where the control's info is
-*               to be filled
-*
-* This function is called when .get function of a control is invoked from app
-*/
-static int snd_intelmad_device_get(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-        pr_debug("device_get called\n");
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-        if (intelmaddata->cpu_id == CPU_CHIP_PENWELL) {
-                if (kcontrol->id.numid == OUTPUT_SEL)
-                        uval->value.enumerated.item[0] =
-                                        scard_ops->output_dev_id;
-                else if (kcontrol->id.numid == INPUT_SEL)
-                        uval->value.enumerated.item[0] =
-                                        scard_ops->input_dev_id;
-                else if (kcontrol->id.numid == LINEOUT_SEL_MFLD)
-                        uval->value.enumerated.item[0] =
-                                        scard_ops->lineout_dev_id;
-                else
-                        return -EINVAL;
-        } else if (intelmaddata->cpu_id == CPU_CHIP_LINCROFT) {
-                if (kcontrol->id.numid == OUTPUT_SEL)
-                        /* There is a mismatch here.
-                         * ALSA expects 1 for internal speaker.
-                         * But internally, we may give 2 for internal speaker.
-                         */
-                        if (scard_ops->output_dev_id == MONO_EARPIECE ||
-                            scard_ops->output_dev_id == INTERNAL_SPKR)
-                                uval->value.enumerated.item[0] = MONO_EARPIECE;
-                        else if (scard_ops->output_dev_id == STEREO_HEADPHONE)
-                                uval->value.enumerated.item[0] =
-                                        STEREO_HEADPHONE;
-                        else
-                                return -EINVAL;
-                else if (kcontrol->id.numid == INPUT_SEL)
-                        uval->value.enumerated.item[0] =
-                                        scard_ops->input_dev_id;
-                else
-                        return -EINVAL;
-        } else
-        uval->value.enumerated.item[0] = kcontrol->private_value;
-        return 0;
-}
-
-/**
-* snd_intelmad_device_set - set the device select control's info
-*
-* @kcontrol:    pointer to the control
-* @uval:        pointer to the structure where the control's info is
-*               available to be set
-*
-* This function is called when .set function of a control is invoked from app
-*/
-static int snd_intelmad_device_set(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-        int ret_val = 0, vendor, status;
-        struct intel_sst_pcm_control *pcm_control;
-
-        pr_debug("snd_intelmad_device_set called\n");
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-        status = -1;
-
-        intelmaddata = kcontrol->private_data;
-
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-
-        WARN_ON(!scard_ops);
-
-        /* store value with driver */
-        kcontrol->private_value = uval->value.enumerated.item[0];
-
-        switch (kcontrol->id.numid) {
-        case OUTPUT_SEL:
-                ret_val = scard_ops->set_output_dev(
-                                uval->value.enumerated.item[0]);
-                intelmaddata->output_sel = uval->value.enumerated.item[0];
-                break;
-        case INPUT_SEL:
-                vendor = intelmaddata->sstdrv_ops->vendor_id;
-                if ((vendor == SND_MX) || (vendor == SND_FS)) {
-                        pcm_control = intelmaddata->sstdrv_ops->pcm_control;
-                        if (uval->value.enumerated.item[0] == HS_MIC)
-                                status = 1;
-                        else
-                                status = 0;
-                        pcm_control->device_control(
-                                        SST_ENABLE_RX_TIME_SLOT, &status);
-                }
-                ret_val = scard_ops->set_input_dev(
-                                uval->value.enumerated.item[0]);
-                intelmaddata->input_sel = uval->value.enumerated.item[0];
-                break;
-        case LINEOUT_SEL_MFLD:
-                ret_val = scard_ops->set_lineout_dev(
-                                        uval->value.enumerated.item[0]);
-                intelmaddata->lineout_sel = uval->value.enumerated.item[0];
-                break;
-        default:
-                return -EINVAL;
-        }
-        kcontrol->private_value = uval->value.enumerated.item[0];
-        return ret_val;
-}
-
-static int snd_intelmad_device_dmic_get(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-
-        if (scard_ops->input_dev_id != DMIC) {
-                pr_debug("input dev = 0x%x\n", scard_ops->input_dev_id);
-                return 0;
-        }
-
-        if (intelmaddata->cpu_id == CPU_CHIP_PENWELL)
-                uval->value.enumerated.item[0] = kcontrol->private_value;
-        else
-                pr_debug(" CPU id = 0x%xis invalid.\n",
-                        intelmaddata->cpu_id);
-        return 0;
-}
-
-void msic_set_bit(u8 index, unsigned int *available_dmics)
-{
-        *available_dmics |= (1 << index);
-}
-
-void msic_clear_bit(u8 index, unsigned int *available_dmics)
-{
-        *available_dmics &= ~(1 << index);
-}
-
-int msic_is_set_bit(u8 index, unsigned int *available_dmics)
-{
-        int ret_val;
-
-        ret_val = (*available_dmics & (1 << index));
-        return ret_val;
-}
-
-static int snd_intelmad_device_dmic_set(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_value *uval)
-{
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-        int i, dmic_index;
-        unsigned int available_dmics;
-        int jump_count;
-        int max_dmics = ARRAY_SIZE(router_dmics);
-
-        WARN_ON(!uval);
-        WARN_ON(!kcontrol);
-
-        intelmaddata = kcontrol->private_data;
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-        WARN_ON(!scard_ops);
-
-        if (scard_ops->input_dev_id != DMIC) {
-                pr_debug("input dev = 0x%x\n", scard_ops->input_dev_id);
-                return 0;
-        }
-
-        available_dmics = scard_ops->available_dmics;
-
-        if (kcontrol->private_value > uval->value.enumerated.item[0]) {
-                pr_debug("jump count -1.\n");
-                jump_count = -1;
-        } else {
-                pr_debug("jump count 1.\n");
-                jump_count = 1;
-        }
-
-        dmic_index =  uval->value.enumerated.item[0];
-        pr_debug("set function. dmic_index = %d, avl_dmic = 0x%x\n",
-                         dmic_index, available_dmics);
-        for (i = 0; i < max_dmics; i++) {
-                pr_debug("set function. loop index = 0x%x.  dmic_index = 0x%x\n",
-                         i, dmic_index);
-                if (!msic_is_set_bit(dmic_index, &available_dmics)) {
-                        msic_clear_bit(kcontrol->private_value,
-                                                &available_dmics);
-                        msic_set_bit(dmic_index, &available_dmics);
-                        kcontrol->private_value = dmic_index;
-                        scard_ops->available_dmics = available_dmics;
-                        scard_ops->hw_dmic_map[kcontrol->id.numid-HW_CH_BASE] =
-                                kcontrol->private_value;
-                        scard_ops->set_hw_dmic_route
-                                (kcontrol->id.numid-HW_CH_BASE);
-                        return 0;
-                }
-
-                dmic_index += jump_count;
-
-                if (dmic_index > (max_dmics - 1) && jump_count == 1) {
-                        pr_debug("Resettingthe dmic index to 0.\n");
-                        dmic_index = 0;
-                } else if (dmic_index == -1 && jump_count == -1) {
-                        pr_debug("Resetting the dmic index to 5.\n");
-                        dmic_index = max_dmics - 1;
-                }
-        }
-
-        return -EINVAL;
-}
-
-static int snd_intelmad_device_dmic_info_mfld(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        struct snd_intelmad *intelmaddata;
-        struct snd_pmic_ops *scard_ops;
-
-        uinfo->count                  = MONO_CNTL;
-        uinfo->type                   = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->value.enumerated.items = ARRAY_SIZE(router_dmics);
-
-        intelmaddata = kcontrol->private_data;
-        WARN_ON(!intelmaddata->sstdrv_ops);
-
-        scard_ops = intelmaddata->sstdrv_ops->scard_ops;
-        WARN_ON(!scard_ops);
-
-        if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
-                uinfo->value.enumerated.item =
-                        uinfo->value.enumerated.items - 1;
-
-        strncpy(uinfo->value.enumerated.name,
-        router_dmics[uinfo->value.enumerated.item],
-        sizeof(uinfo->value.enumerated.name)-1);
-
-
-        msic_set_bit(kcontrol->private_value, &scard_ops->available_dmics);
-        pr_debug("info function. avl_dmic = 0x%x",
-                scard_ops->available_dmics);
-
-        scard_ops->hw_dmic_map[kcontrol->id.numid-HW_CH_BASE] =
-                kcontrol->private_value;
-
-        return 0;
-}
-
-struct snd_kcontrol_new snd_intelmad_controls_mrst[MAX_CTRL] __devinitdata = {
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Playback Source",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_info_mrst,
-        .get            =       snd_intelmad_device_get,
-        .put            =       snd_intelmad_device_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Capture Source",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_info_mrst,
-        .get            =       snd_intelmad_device_get,
-        .put            =       snd_intelmad_device_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Playback Volume",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_playback_volume_info,
-        .get            =       snd_intelmad_volume_get,
-        .put            =       snd_intelmad_volume_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Playback Switch",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_mute_info,
-        .get            =       snd_intelmad_mute_get,
-        .put            =       snd_intelmad_mute_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Capture Volume",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_capture_volume_info,
-        .get            =       snd_intelmad_volume_get,
-        .put            =       snd_intelmad_volume_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Capture Switch",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_mute_info,
-        .get            =       snd_intelmad_mute_get,
-        .put            =       snd_intelmad_mute_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "Master Playback Volume",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_master_volume_info,
-        .get            =       snd_intelmad_volume_get,
-        .put            =       snd_intelmad_volume_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "Master Playback Switch",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_mute_info,
-        .get            =       snd_intelmad_mute_get,
-        .put            =       snd_intelmad_mute_set,
-        .private_value  =       0,
-},
-};
-
-struct snd_kcontrol_new
-snd_intelmad_controls_mfld[MAX_CTRL_MFLD] __devinitdata = {
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Playback Source",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_info_mfld,
-        .get            =       snd_intelmad_device_get,
-        .put            =       snd_intelmad_device_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "PCM Capture Source",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_info_mfld,
-        .get            =       snd_intelmad_device_get,
-        .put            =       snd_intelmad_device_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       "Line out",
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_info_mfld,
-        .get            =       snd_intelmad_device_get,
-        .put            =       snd_intelmad_device_set,
-        .private_value  =       0,
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       HW_CH_0,
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_dmic_info_mfld,
-        .get            =       snd_intelmad_device_dmic_get,
-        .put            =       snd_intelmad_device_dmic_set,
-        .private_value  =       0
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       HW_CH_1,
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_dmic_info_mfld,
-        .get            =       snd_intelmad_device_dmic_get,
-        .put            =       snd_intelmad_device_dmic_set,
-        .private_value  =       1
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       HW_CH_2,
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_dmic_info_mfld,
-        .get            =       snd_intelmad_device_dmic_get,
-        .put            =       snd_intelmad_device_dmic_set,
-        .private_value  =       2
-},
-{
-        .iface          =       SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name           =       HW_CH_3,
-        .access         =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .info           =       snd_intelmad_device_dmic_info_mfld,
-        .get            =       snd_intelmad_device_dmic_get,
-        .put            =       snd_intelmad_device_dmic_set,
-        .private_value  =       3
-}
-};
-
diff --git a/drivers/staging/intel_sst/intelmid_msic_control.c b/drivers/staging/intel_sst/intelmid_msic_control.c
deleted file mode 100644
index 70cdb1697815..000000000000
--- a/drivers/staging/intel_sst/intelmid_msic_control.c
+++ /dev/null
@@ -1,1047 +0,0 @@
-/*
- *  intelmid_vm_control.c - Intel Sound card driver for MID
- *
- *  Copyright (C) 2010 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * This file contains the control operations of msic vendors
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/file.h>
-#include <linux/delay.h>
-#include <sound/control.h>
-#include "intel_sst.h"
-#include <linux/input.h>
-#include "intelmid_snd_control.h"
-#include "intelmid.h"
-
-#define AUDIOMUX12  0x24c
-#define AUDIOMUX34  0x24d
-
-static int msic_init_card(void)
-{
-        struct sc_reg_access sc_access[] = {
-                /* dmic configuration */
-                {0x241, 0x85, 0},
-                {0x242, 0x02, 0},
-                /* audio paths config */
-                {0x24C, 0x10, 0},
-                {0x24D, 0x32, 0},
-                /* PCM2 interface slots */
-                /* preconfigured slots for 0-5 both tx, rx */
-                {0x272, 0x10, 0},
-                {0x273, 0x32, 0},
-                {0x274, 0xFF, 0},
-                {0x275, 0x10, 0},
-                {0x276, 0x32, 0},
-                {0x277, 0x54, 0},
-                /*Sinc5 decimator*/
-                {0x24E, 0x28, 0},
-                /*TI vibra w/a settings*/
-                {0x384, 0x80, 0},
-                {0x385, 0x80, 0},
-                {0x267, 0x00, 0},
-                {0x261, 0x00, 0},
-                /* pcm port setting */
-                {0x278, 0x00, 0},
-                {0x27B, 0x01, 0},
-                {0x27C, 0x0a, 0},
-                /* Set vol HSLRVOLCTRL, IHFVOL */
-                {0x259, 0x08, 0},
-                {0x25A, 0x08, 0},
-                {0x25B, 0x08, 0},
-                {0x25C, 0x08, 0},
-                /* HSEPRXCTRL  Enable the headset left and right FIR filters  */
-                {0x250, 0x30, 0},
-                /* HSMIXER */
-                {0x256, 0x11, 0},
-                /* amic configuration */
-                {0x249, 0x01, 0x0},
-                {0x24A, 0x01, 0x0},
-                /* unmask ocaudio/accdet interrupts */
-                {0x1d, 0x00, 0x00},
-                {0x1e, 0x00, 0x00},
-        };
-        snd_msic_ops.card_status = SND_CARD_INIT_DONE;
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 28);
-        snd_msic_ops.pb_on = 0;
-        snd_msic_ops.pbhs_on = 0;
-        snd_msic_ops.cap_on = 0;
-        snd_msic_ops.input_dev_id = DMIC; /*def dev*/
-        snd_msic_ops.output_dev_id = STEREO_HEADPHONE;
-        snd_msic_ops.jack_interrupt_status = false;
-        pr_debug("msic init complete!!\n");
-        return 0;
-}
-static int msic_line_out_restore(u8 value)
-{
-        struct sc_reg_access hs_drv_en[] = {
-                {0x25d, 0x03, 0x03},
-        };
-        struct sc_reg_access ep_drv_en[] = {
-                {0x25d, 0x40, 0x40},
-        };
-        struct sc_reg_access ihf_drv_en[] = {
-                {0x25d, 0x0c, 0x0c},
-        };
-        struct sc_reg_access vib1_drv_en[] = {
-                {0x25d, 0x10, 0x10},
-        };
-        struct sc_reg_access vib2_drv_en[] = {
-                {0x25d, 0x20, 0x20},
-        };
-        struct sc_reg_access pmode_enable[] = {
-                {0x381, 0x10, 0x10},
-        };
-        int retval = 0;
-
-        pr_debug("msic_lineout_restore_lineout_dev:%d\n", value);
-
-        switch (value) {
-        case HEADSET:
-                pr_debug("Selecting Lineout-HEADSET-restore\n");
-                if (snd_msic_ops.output_dev_id == STEREO_HEADPHONE)
-                        retval = sst_sc_reg_access(hs_drv_en,
-                                                        PMIC_READ_MODIFY, 1);
-                else
-                        retval = sst_sc_reg_access(ep_drv_en,
-                                                        PMIC_READ_MODIFY, 1);
-                break;
-        case IHF:
-                pr_debug("Selecting Lineout-IHF-restore\n");
-                retval = sst_sc_reg_access(ihf_drv_en, PMIC_READ_MODIFY, 1);
-                if (retval)
-                        return retval;
-                retval = sst_sc_reg_access(pmode_enable, PMIC_READ_MODIFY, 1);
-                break;
-        case VIBRA1:
-                pr_debug("Selecting Lineout-Vibra1-restore\n");
-                retval = sst_sc_reg_access(vib1_drv_en, PMIC_READ_MODIFY, 1);
-                break;
-        case VIBRA2:
-                pr_debug("Selecting Lineout-VIBRA2-restore\n");
-                retval = sst_sc_reg_access(vib2_drv_en, PMIC_READ_MODIFY, 1);
-                break;
-        case NONE:
-                pr_debug("Selecting Lineout-NONE-restore\n");
-                break;
-        default:
-                return -EINVAL;
-        }
-        return retval;
-}
-static int msic_get_lineout_prvstate(void)
-{
-        struct sc_reg_access hs_ihf_drv[2] = {
-                {0x257, 0x0, 0x0},
-                {0x25d, 0x0, 0x0},
-        };
-        struct sc_reg_access vib1drv[2] = {
-                {0x264, 0x0, 0x0},
-                {0x25D, 0x0, 0x0},
-        };
-        struct sc_reg_access vib2drv[2] = {
-                {0x26A, 0x0, 0x0},
-                {0x25D, 0x0, 0x0},
-        };
-        int retval = 0, drv_en, dac_en, dev_id, mask;
-        for (dev_id = 0; dev_id < snd_msic_ops.line_out_names_cnt; dev_id++) {
-                switch (dev_id) {
-                case HEADSET:
-                        pr_debug("msic_get_lineout_prvs_state: HEADSET\n");
-                        sst_sc_reg_access(hs_ihf_drv, PMIC_READ, 2);
-
-                        mask = (MASK0|MASK1);
-                        dac_en = (hs_ihf_drv[0].value) & mask;
-
-                        mask = ((MASK0|MASK1)|MASK6);
-                        drv_en = (hs_ihf_drv[1].value) & mask;
-
-                        if (dac_en && (!drv_en)) {
-                                snd_msic_ops.prev_lineout_dev_id = HEADSET;
-                                return retval;
-                        }
-                        break;
-                case IHF:
-                        pr_debug("msic_get_lineout_prvstate: IHF\n");
-                        sst_sc_reg_access(hs_ihf_drv, PMIC_READ, 2);
-
-                        mask = (MASK2 | MASK3);
-                        dac_en = (hs_ihf_drv[0].value) & mask;
-
-                        mask = (MASK2 | MASK3);
-                        drv_en = (hs_ihf_drv[1].value) & mask;
-
-                        if (dac_en && (!drv_en)) {
-                                snd_msic_ops.prev_lineout_dev_id = IHF;
-                                return retval;
-                        }
-                        break;
-                case VIBRA1:
-                        pr_debug("msic_get_lineout_prvstate: vibra1\n");
-                        sst_sc_reg_access(vib1drv, PMIC_READ, 2);
-
-                        mask = MASK1;
-                        dac_en = (vib1drv[0].value) & mask;
-
-                        mask = MASK4;
-                        drv_en = (vib1drv[1].value) & mask;
-
-                        if (dac_en && (!drv_en)) {
-                                snd_msic_ops.prev_lineout_dev_id = VIBRA1;
-                                return retval;
-                        }
-                        break;
-                case VIBRA2:
-                        pr_debug("msic_get_lineout_prvstate: vibra2\n");
-                        sst_sc_reg_access(vib2drv, PMIC_READ, 2);
-
-                        mask = MASK1;
-                        dac_en = (vib2drv[0].value) & mask;
-
-                        mask = MASK5;
-                        drv_en = ((vib2drv[1].value) & mask);
-
-                        if (dac_en && (!drv_en)) {
-                                snd_msic_ops.prev_lineout_dev_id = VIBRA2;
-                                return retval;
-                        }
-                        break;
-                case NONE:
-                        pr_debug("msic_get_lineout_prvstate: NONE\n");
-                        snd_msic_ops.prev_lineout_dev_id = NONE;
-                        return retval;
-                default:
-                        pr_debug("Invalid device id\n");
-                        snd_msic_ops.prev_lineout_dev_id = NONE;
-                        return -EINVAL;
-                }
-        }
-        return retval;
-}
-static int msic_set_selected_lineout_dev(u8 value)
-{
-        struct sc_reg_access lout_hs[] = {
-                {0x25e, 0x33, 0xFF},
-                {0x25d, 0x0, 0x43},
-        };
-        struct sc_reg_access lout_ihf[] = {
-                {0x25e, 0x55, 0xff},
-                {0x25d, 0x0, 0x0c},
-        };
-        struct sc_reg_access lout_vibra1[] = {
-
-                {0x25e, 0x61, 0xff},
-                {0x25d, 0x0, 0x10},
-        };
-        struct sc_reg_access lout_vibra2[] = {
-
-                {0x25e, 0x16, 0xff},
-                {0x25d, 0x0, 0x20},
-        };
-        struct sc_reg_access lout_def[] = {
-                {0x25e, 0x66, 0x0},
-        };
-        struct sc_reg_access pmode_disable[] = {
-                {0x381, 0x00, 0x10},
-        };
-        struct sc_reg_access pmode_enable[] = {
-                {0x381, 0x10, 0x10},
-        };
-        int retval = 0;
-
-        pr_debug("msic_set_selected_lineout_dev:%d\n", value);
-        msic_get_lineout_prvstate();
-        msic_line_out_restore(snd_msic_ops.prev_lineout_dev_id);
-        snd_msic_ops.lineout_dev_id = value;
-
-        switch (value) {
-        case HEADSET:
-                pr_debug("Selecting Lineout-HEADSET\n");
-                if (snd_msic_ops.pb_on)
-                        retval = sst_sc_reg_access(lout_hs,
-                                        PMIC_READ_MODIFY, 2);
-                        if (retval)
-                                return retval;
-                        retval = sst_sc_reg_access(pmode_disable,
-                                        PMIC_READ_MODIFY, 1);
-                break;
-        case IHF:
-                pr_debug("Selecting Lineout-IHF\n");
-                if (snd_msic_ops.pb_on)
-                        retval = sst_sc_reg_access(lout_ihf,
-                                                        PMIC_READ_MODIFY, 2);
-                        if (retval)
-                                return retval;
-                        retval = sst_sc_reg_access(pmode_enable,
-                                        PMIC_READ_MODIFY, 1);
-                break;
-        case VIBRA1:
-                pr_debug("Selecting Lineout-Vibra1\n");
-                if (snd_msic_ops.pb_on)
-                        retval = sst_sc_reg_access(lout_vibra1,
-                                                        PMIC_READ_MODIFY, 2);
-                        if (retval)
-                                return retval;
-                        retval = sst_sc_reg_access(pmode_disable,
-                                        PMIC_READ_MODIFY, 1);
-                break;
-        case VIBRA2:
-                pr_debug("Selecting Lineout-VIBRA2\n");
-                if (snd_msic_ops.pb_on)
-                        retval = sst_sc_reg_access(lout_vibra2,
-                                                        PMIC_READ_MODIFY, 2);
-                        if (retval)
-                                return retval;
-                        retval = sst_sc_reg_access(pmode_disable,
-                                        PMIC_READ_MODIFY, 1);
-                break;
-        case NONE:
-                pr_debug("Selecting Lineout-NONE\n");
-                        retval = sst_sc_reg_access(lout_def,
-                                                        PMIC_WRITE, 1);
-                        if (retval)
-                                return retval;
-                        retval = sst_sc_reg_access(pmode_disable,
-                                        PMIC_READ_MODIFY, 1);
-                break;
-        default:
-                return -EINVAL;
-        }
-        return retval;
-}
-
-
-static int msic_power_up_pb(unsigned int device)
-{
-        struct sc_reg_access vaud[] = {
-                /* turn on the audio power supplies */
-                {0x0DB, 0x07, 0},
-        };
-        struct sc_reg_access pll[] = {
-                /* turn on PLL */
-                {0x240, 0x20, 0},
-        };
-        struct sc_reg_access vhs[] = {
-                /*  VHSP */
-                {0x0DC, 0x3D, 0},
-                /*  VHSN */
-                {0x0DD, 0x3F, 0},
-        };
-        struct sc_reg_access hsdac[] = {
-                {0x382, 0x40, 0x40},
-                /*  disable driver */
-                {0x25D, 0x0, 0x43},
-                /* DAC CONFIG ; both HP, LP on */
-                {0x257, 0x03, 0x03},
-        };
-        struct sc_reg_access hs_filter[] = {
-                /* HSEPRXCTRL  Enable the headset left and right FIR filters  */
-                {0x250, 0x30, 0},
-                /* HSMIXER */
-                {0x256, 0x11, 0},
-        };
-        struct sc_reg_access hs_enable[] = {
-                /* enable driver */
-                {0x25D, 0x3, 0x3},
-                {0x26C, 0x0, 0x2},
-                /* unmute the headset */
-                { 0x259, 0x80, 0x80},
-                { 0x25A, 0x80, 0x80},
-        };
-        struct sc_reg_access vihf[] = {
-                /*  VIHF ON */
-                {0x0C9, 0x27, 0x00},
-        };
-        struct sc_reg_access ihf_filter[] = {
-                /*  disable driver */
-                {0x25D, 0x00, 0x0C},
-                /*Filer DAC enable*/
-                {0x251, 0x03, 0x03},
-                {0x257, 0x0C, 0x0C},
-        };
-        struct sc_reg_access ihf_en[] = {
-                /*enable drv*/
-                {0x25D, 0x0C, 0x0c},
-        };
-        struct sc_reg_access ihf_unmute[] = {
-                /*unmute headset*/
-                {0x25B, 0x80, 0x80},
-                {0x25C, 0x80, 0x80},
-        };
-        struct sc_reg_access epdac[] = {
-                /*  disable driver */
-                {0x25D, 0x0, 0x43},
-                /* DAC CONFIG ; both HP, LP on */
-                {0x257, 0x03, 0x03},
-        };
-        struct sc_reg_access ep_enable[] = {
-                /* enable driver */
-                {0x25D, 0x40, 0x40},
-                /* unmute the headset */
-                { 0x259, 0x80, 0x80},
-                { 0x25A, 0x80, 0x80},
-        };
-        struct sc_reg_access vib1_en[] = {
-                /* enable driver, ADC */
-                {0x25D, 0x10, 0x10},
-                {0x264, 0x02, 0x82},
-        };
-        struct sc_reg_access vib2_en[] = {
-                /* enable driver, ADC */
-                {0x25D, 0x20, 0x20},
-                {0x26A, 0x02, 0x82},
-        };
-        struct sc_reg_access pcm2_en[] = {
-                /* enable pcm 2 */
-                {0x27C, 0x1, 0x1},
-        };
-        int retval = 0;
-
-        if (snd_msic_ops.card_status == SND_CARD_UN_INIT) {
-                retval = msic_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        pr_debug("powering up pb.... Device %d\n", device);
-        sst_sc_reg_access(vaud, PMIC_WRITE, 1);
-        msleep(1);
-        sst_sc_reg_access(pll, PMIC_WRITE, 1);
-        msleep(1);
-        switch (device) {
-        case SND_SST_DEVICE_HEADSET:
-                snd_msic_ops.pb_on = 1;
-                snd_msic_ops.pbhs_on = 1;
-                if (snd_msic_ops.output_dev_id == STEREO_HEADPHONE) {
-                        sst_sc_reg_access(vhs, PMIC_WRITE, 2);
-                        sst_sc_reg_access(hsdac, PMIC_READ_MODIFY, 3);
-                        sst_sc_reg_access(hs_filter, PMIC_WRITE, 2);
-                        sst_sc_reg_access(hs_enable, PMIC_READ_MODIFY, 4);
-                } else {
-                        sst_sc_reg_access(epdac, PMIC_READ_MODIFY, 2);
-                        sst_sc_reg_access(hs_filter, PMIC_WRITE, 2);
-                        sst_sc_reg_access(ep_enable, PMIC_READ_MODIFY, 3);
-                }
-                if (snd_msic_ops.lineout_dev_id == HEADSET)
-                        msic_set_selected_lineout_dev(HEADSET);
-                break;
-        case SND_SST_DEVICE_IHF:
-                snd_msic_ops.pb_on = 1;
-                sst_sc_reg_access(vihf, PMIC_WRITE, 1);
-                sst_sc_reg_access(ihf_filter, PMIC_READ_MODIFY, 3);
-                sst_sc_reg_access(ihf_en, PMIC_READ_MODIFY, 1);
-                sst_sc_reg_access(ihf_unmute, PMIC_READ_MODIFY, 2);
-                if (snd_msic_ops.lineout_dev_id == IHF)
-                        msic_set_selected_lineout_dev(IHF);
-                break;
-
-        case SND_SST_DEVICE_VIBRA:
-                snd_msic_ops.pb_on = 1;
-                sst_sc_reg_access(vib1_en, PMIC_READ_MODIFY, 2);
-                if (snd_msic_ops.lineout_dev_id == VIBRA1)
-                        msic_set_selected_lineout_dev(VIBRA1);
-                break;
-
-        case SND_SST_DEVICE_HAPTIC:
-                snd_msic_ops.pb_on = 1;
-                sst_sc_reg_access(vib2_en, PMIC_READ_MODIFY, 2);
-                if (snd_msic_ops.lineout_dev_id == VIBRA2)
-                        msic_set_selected_lineout_dev(VIBRA2);
-                break;
-
-        default:
-                pr_warn("Wrong Device %d, selected %d\n",
-                               device, snd_msic_ops.output_dev_id);
-        }
-        return sst_sc_reg_access(pcm2_en, PMIC_READ_MODIFY, 1);
-}
-
-static int msic_power_up_cp(unsigned int device)
-{
-        struct sc_reg_access vaud[] = {
-                /* turn on the audio power supplies */
-                {0x0DB, 0x07, 0},
-        };
-        struct sc_reg_access pll[] = {
-                /* turn on PLL */
-                {0x240, 0x20, 0},
-        };
-        struct sc_reg_access dmic_bias[] = {
-                /*  Turn on AMIC supply  */
-                {0x247, 0xA0, 0xA0},
-        };
-        struct sc_reg_access dmic[] = {
-                /* mic demux enable */
-                {0x245, 0x3F, 0x3F},
-                {0x246, 0x07, 0x07},
-
-        };
-        struct sc_reg_access amic_bias[] = {
-                /*  Turn on AMIC supply  */
-                {0x247, 0xFC, 0xFC},
-        };
-        struct sc_reg_access amic[] = {
-                /*MIC EN*/
-                {0x249, 0x01, 0x01},
-                {0x24A, 0x01, 0x01},
-                /*ADC EN*/
-                {0x248, 0x05, 0x0F},
-
-        };
-        struct sc_reg_access pcm2[] = {
-                /* enable pcm 2 */
-                {0x27C, 0x1, 0x1},
-        };
-        struct sc_reg_access tx_on[] = {
-                /*wait for mic to stabalize before turning on audio channels*/
-                {0x24F, 0x3C, 0x0},
-        };
-        int retval = 0;
-
-        if (snd_msic_ops.card_status == SND_CARD_UN_INIT) {
-                retval = msic_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        pr_debug("powering up cp....%d\n", snd_msic_ops.input_dev_id);
-        sst_sc_reg_access(vaud, PMIC_WRITE, 1);
-        msleep(500);/*FIXME need optimzed value here*/
-        sst_sc_reg_access(pll, PMIC_WRITE, 1);
-        msleep(1);
-        snd_msic_ops.cap_on = 1;
-        if (snd_msic_ops.input_dev_id == AMIC) {
-                sst_sc_reg_access(amic_bias, PMIC_READ_MODIFY, 1);
-                msleep(1);
-                sst_sc_reg_access(amic, PMIC_READ_MODIFY, 3);
-        } else {
-                sst_sc_reg_access(dmic_bias, PMIC_READ_MODIFY, 1);
-                msleep(1);
-                sst_sc_reg_access(dmic, PMIC_READ_MODIFY, 2);
-        }
-        msleep(1);
-        sst_sc_reg_access(tx_on, PMIC_WRITE, 1);
-        return sst_sc_reg_access(pcm2, PMIC_READ_MODIFY, 1);
-}
-
-static int msic_power_down(void)
-{
-        struct sc_reg_access power_dn[] = {
-                /*  VHSP */
-                {0x0DC, 0xC4, 0},
-                /*  VHSN */
-                {0x0DD, 0x04, 0},
-                /*  VIHF */
-                {0x0C9, 0x24, 0},
-        };
-        struct sc_reg_access pll[] = {
-                /* turn off PLL*/
-                {0x240, 0x00, 0x0},
-        };
-        struct sc_reg_access vaud[] = {
-                /* turn off VAUD*/
-                {0x0DB, 0x04, 0},
-        };
-
-        pr_debug("powering dn msic\n");
-        snd_msic_ops.pbhs_on = 0;
-        snd_msic_ops.pb_on = 0;
-        snd_msic_ops.cap_on = 0;
-        sst_sc_reg_access(power_dn, PMIC_WRITE, 3);
-        msleep(1);
-        sst_sc_reg_access(pll, PMIC_WRITE, 1);
-        msleep(1);
-        sst_sc_reg_access(vaud, PMIC_WRITE, 1);
-        return 0;
-}
-
-static int msic_power_down_pb(unsigned int device)
-{
-        struct sc_reg_access drv_enable[] = {
-                {0x25D, 0x00, 0x00},
-        };
-        struct sc_reg_access hs_mute[] = {
-                {0x259, 0x80, 0x80},
-                {0x25A, 0x80, 0x80},
-                {0x26C, 0x02, 0x02},
-        };
-        struct sc_reg_access hs_off[] = {
-                {0x257, 0x00, 0x03},
-                {0x250, 0x00, 0x30},
-                {0x382, 0x00, 0x40},
-        };
-        struct sc_reg_access ihf_mute[] = {
-                {0x25B, 0x80, 0x80},
-                {0x25C, 0x80, 0x80},
-        };
-        struct sc_reg_access ihf_off[] = {
-                {0x257, 0x00, 0x0C},
-                {0x251, 0x00, 0x03},
-        };
-        struct sc_reg_access vib1_off[] = {
-                {0x264, 0x00, 0x82},
-        };
-        struct sc_reg_access vib2_off[] = {
-                {0x26A, 0x00, 0x82},
-        };
-        struct sc_reg_access lout_off[] = {
-                {0x25e, 0x66, 0x00},
-        };
-        struct sc_reg_access pmode_disable[] = {
-                {0x381, 0x00, 0x10},
-        };
-
-
-
-        pr_debug("powering dn pb for device %d\n", device);
-        switch (device) {
-        case SND_SST_DEVICE_HEADSET:
-                snd_msic_ops.pbhs_on = 0;
-                sst_sc_reg_access(hs_mute, PMIC_READ_MODIFY, 3);
-                drv_enable[0].mask = 0x43;
-                sst_sc_reg_access(drv_enable, PMIC_READ_MODIFY, 1);
-                sst_sc_reg_access(hs_off, PMIC_READ_MODIFY, 3);
-                if (snd_msic_ops.lineout_dev_id == HEADSET)
-                        sst_sc_reg_access(lout_off, PMIC_WRITE, 1);
-                break;
-
-        case SND_SST_DEVICE_IHF:
-                sst_sc_reg_access(ihf_mute, PMIC_READ_MODIFY, 2);
-                drv_enable[0].mask = 0x0C;
-                sst_sc_reg_access(drv_enable, PMIC_READ_MODIFY, 1);
-                sst_sc_reg_access(ihf_off, PMIC_READ_MODIFY, 2);
-                if (snd_msic_ops.lineout_dev_id == IHF) {
-                        sst_sc_reg_access(lout_off, PMIC_WRITE, 1);
-                        sst_sc_reg_access(pmode_disable, PMIC_READ_MODIFY, 1);
-                }
-                break;
-
-        case SND_SST_DEVICE_VIBRA:
-                sst_sc_reg_access(vib1_off, PMIC_READ_MODIFY, 1);
-                drv_enable[0].mask = 0x10;
-                sst_sc_reg_access(drv_enable, PMIC_READ_MODIFY, 1);
-                if (snd_msic_ops.lineout_dev_id == VIBRA1)
-                        sst_sc_reg_access(lout_off, PMIC_WRITE, 1);
-                break;
-
-        case SND_SST_DEVICE_HAPTIC:
-                sst_sc_reg_access(vib2_off, PMIC_READ_MODIFY, 1);
-                drv_enable[0].mask = 0x20;
-                sst_sc_reg_access(drv_enable, PMIC_READ_MODIFY, 1);
-                if (snd_msic_ops.lineout_dev_id == VIBRA2)
-                        sst_sc_reg_access(lout_off, PMIC_WRITE, 1);
-                break;
-        }
-        return 0;
-}
-
-static int msic_power_down_cp(unsigned int device)
-{
-        struct sc_reg_access dmic[] = {
-                {0x247, 0x00, 0xA0},
-                {0x245, 0x00, 0x38},
-                {0x246, 0x00, 0x07},
-        };
-        struct sc_reg_access amic[] = {
-                {0x248, 0x00, 0x05},
-                {0x249, 0x00, 0x01},
-                {0x24A, 0x00, 0x01},
-                {0x247, 0x00, 0xA3},
-        };
-        struct sc_reg_access tx_off[] = {
-                {0x24F, 0x00, 0x3C},
-        };
-
-        pr_debug("powering dn cp....\n");
-        snd_msic_ops.cap_on = 0;
-        sst_sc_reg_access(tx_off, PMIC_READ_MODIFY, 1);
-        if (snd_msic_ops.input_dev_id == DMIC)
-                sst_sc_reg_access(dmic, PMIC_READ_MODIFY, 3);
-        else
-                sst_sc_reg_access(amic, PMIC_READ_MODIFY, 4);
-        return 0;
-}
-
-static int msic_set_selected_output_dev(u8 value)
-{
-        int retval = 0;
-
-        pr_debug("msic set selected output:%d\n", value);
-        snd_msic_ops.output_dev_id = value;
-        if (snd_msic_ops.pbhs_on)
-                msic_power_up_pb(SND_SST_DEVICE_HEADSET);
-        return retval;
-}
-
-static int msic_set_selected_input_dev(u8 value)
-{
-
-        struct sc_reg_access sc_access_dmic[] = {
-                {0x24C, 0x10, 0x0},
-        };
-        struct sc_reg_access sc_access_amic[] = {
-                {0x24C, 0x76, 0x0},
-
-        };
-        int retval = 0;
-
-        pr_debug("msic_set_selected_input_dev:%d\n", value);
-        snd_msic_ops.input_dev_id = value;
-        switch (value) {
-        case AMIC:
-                pr_debug("Selecting AMIC1\n");
-                retval = sst_sc_reg_access(sc_access_amic, PMIC_WRITE, 1);
-                break;
-        case DMIC:
-                pr_debug("Selecting DMIC1\n");
-                retval = sst_sc_reg_access(sc_access_dmic, PMIC_WRITE, 1);
-                break;
-        default:
-                return -EINVAL;
-
-        }
-        if (snd_msic_ops.cap_on)
-                retval = msic_power_up_cp(SND_SST_DEVICE_CAPTURE);
-        return retval;
-}
-
-static int msic_set_hw_dmic_route(u8 hw_ch_index)
-{
-        struct sc_reg_access sc_access_router;
-        int    retval = -EINVAL;
-
-        switch (hw_ch_index) {
-        case HW_CH0:
-                sc_access_router.reg_addr = AUDIOMUX12;
-                sc_access_router.value    = snd_msic_ops.hw_dmic_map[0];
-                sc_access_router.mask     = (MASK2 | MASK1 | MASK0);
-                pr_debug("hw_ch0.  value = 0x%x\n",
-                                sc_access_router.value);
-                retval = sst_sc_reg_access(&sc_access_router,
-                                PMIC_READ_MODIFY, 1);
-                break;
-
-        case HW_CH1:
-                sc_access_router.reg_addr = AUDIOMUX12;
-                sc_access_router.value    = (snd_msic_ops.hw_dmic_map[1]) << 4;
-                sc_access_router.mask     = (MASK6 | MASK5 | MASK4);
-                pr_debug("### hw_ch1.  value = 0x%x\n",
-                                sc_access_router.value);
-                retval = sst_sc_reg_access(&sc_access_router,
-                                PMIC_READ_MODIFY, 1);
-                break;
-
-        case HW_CH2:
-                sc_access_router.reg_addr = AUDIOMUX34;
-                sc_access_router.value    = snd_msic_ops.hw_dmic_map[2];
-                sc_access_router.mask     = (MASK2 | MASK1 | MASK0);
-                pr_debug("hw_ch2.  value = 0x%x\n",
-                                sc_access_router.value);
-                retval = sst_sc_reg_access(&sc_access_router,
-                                PMIC_READ_MODIFY, 1);
-                break;
-
-        case HW_CH3:
-                sc_access_router.reg_addr = AUDIOMUX34;
-                sc_access_router.value    = (snd_msic_ops.hw_dmic_map[3]) << 4;
-                sc_access_router.mask     = (MASK6 | MASK5 | MASK4);
-                pr_debug("hw_ch3.  value = 0x%x\n",
-                                sc_access_router.value);
-                retval = sst_sc_reg_access(&sc_access_router,
-                                PMIC_READ_MODIFY, 1);
-                break;
-        }
-
-        return retval;
-}
-
-
-static int msic_set_pcm_voice_params(void)
-{
-        return 0;
-}
-
-static int msic_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
-{
-        return 0;
-}
-
-static int msic_set_audio_port(int status)
-{
-        return 0;
-}
-
-static int msic_set_voice_port(int status)
-{
-        return 0;
-}
-
-static int msic_set_mute(int dev_id, u8 value)
-{
-        return 0;
-}
-
-static int msic_set_vol(int dev_id, int value)
-{
-        return 0;
-}
-
-static int msic_get_mute(int dev_id, u8 *value)
-{
-        return 0;
-}
-
-static int msic_get_vol(int dev_id, int *value)
-{
-        return 0;
-}
-
-static int msic_set_headset_state(int state)
-{
-        struct sc_reg_access hs_enable[] = {
-                {0x25D, 0x03, 0x03},
-        };
-
-        if (state)
-                /*enable*/
-                sst_sc_reg_access(hs_enable, PMIC_READ_MODIFY, 1);
-        else {
-                hs_enable[0].value = 0;
-                sst_sc_reg_access(hs_enable, PMIC_READ_MODIFY, 1);
-        }
-        return 0;
-}
-
-static int msic_enable_mic_bias(void)
-{
-        struct sc_reg_access jack_interrupt_reg[] = {
-                {0x0DB, 0x07, 0x00},
-
-        };
-        struct sc_reg_access jack_bias_reg[] = {
-                {0x247, 0x0C, 0x0C},
-        };
-
-        sst_sc_reg_access(jack_interrupt_reg, PMIC_WRITE, 1);
-        sst_sc_reg_access(jack_bias_reg, PMIC_READ_MODIFY, 1);
-        return 0;
-}
-
-static int msic_disable_mic_bias(void)
-{
-        if (snd_msic_ops.jack_interrupt_status == true)
-                return 0;
-        if (!(snd_msic_ops.pb_on || snd_msic_ops.cap_on))
-                msic_power_down();
-        return 0;
-}
-
-static int msic_disable_jack_btn(void)
-{
-        struct sc_reg_access btn_disable[] = {
-                {0x26C, 0x00, 0x01}
-        };
-
-        if (!(snd_msic_ops.pb_on || snd_msic_ops.cap_on))
-                msic_power_down();
-        snd_msic_ops.jack_interrupt_status = false;
-        return sst_sc_reg_access(btn_disable, PMIC_READ_MODIFY, 1);
-}
-
-static int msic_enable_jack_btn(void)
-{
-        struct sc_reg_access btn_enable[] = {
-                        {0x26b, 0x77, 0x00},
-                        {0x26C, 0x01, 0x00},
-        };
-        return sst_sc_reg_access(btn_enable, PMIC_WRITE, 2);
-}
-static int msic_convert_adc_to_mvolt(unsigned int mic_bias)
-{
-        return (ADC_ONE_LSB_MULTIPLIER * mic_bias) / 1000;
-}
-int msic_get_headset_state(int mic_bias)
-{
-        struct sc_reg_access msic_hs_toggle[] = {
-                {0x070, 0x00, 0x01},
-        };
-        if (mic_bias >= 0 && mic_bias < 400) {
-
-                pr_debug("Detected Headphone!!!\n");
-                sst_sc_reg_access(msic_hs_toggle, PMIC_READ_MODIFY, 1);
-
-        } else if (mic_bias > 400 && mic_bias < 650) {
-
-                pr_debug("Detected American headset\n");
-                msic_hs_toggle[0].value = 0x01;
-                sst_sc_reg_access(msic_hs_toggle, PMIC_READ_MODIFY, 1);
-
-        } else if (mic_bias >= 650 && mic_bias < 2000) {
-
-                pr_debug("Detected Headset!!!\n");
-                sst_sc_reg_access(msic_hs_toggle, PMIC_READ_MODIFY, 1);
-                /*power on jack and btn*/
-                snd_msic_ops.jack_interrupt_status = true;
-                msic_enable_jack_btn();
-                msic_enable_mic_bias();
-                return SND_JACK_HEADSET;
-
-        } else
-                pr_debug("Detected Open Cable!!!\n");
-
-        return SND_JACK_HEADPHONE;
-}
-
-static int msic_get_mic_bias(void *arg)
-{
-        struct snd_intelmad *intelmad_drv = (struct snd_intelmad *)arg;
-        u16 adc_adr = intelmad_drv->adc_address;
-        u16 adc_val;
-        int ret;
-        struct sc_reg_access adc_ctrl3[2] = {
-                        {0x1C2, 0x05, 0x0},
-        };
-
-        struct sc_reg_access audio_adc_reg1 = {0,};
-        struct sc_reg_access audio_adc_reg2 = {0,};
-
-        msic_enable_mic_bias();
-        /* Enable the msic for conversion before reading */
-        ret = sst_sc_reg_access(adc_ctrl3, PMIC_WRITE, 1);
-        if (ret)
-                return ret;
-        adc_ctrl3[0].value = 0x04;
-        /* Re-toggle the RRDATARD bit */
-        ret = sst_sc_reg_access(adc_ctrl3, PMIC_WRITE, 1);
-        if (ret)
-                return ret;
-
-        audio_adc_reg1.reg_addr = adc_adr;
-        /* Read the higher bits of data */
-        msleep(1000);
-        ret = sst_sc_reg_access(&audio_adc_reg1, PMIC_READ, 1);
-        if (ret)
-                return ret;
-        pr_debug("adc read value %x", audio_adc_reg1.value);
-
-        /* Shift bits to accomodate the lower two data bits */
-        adc_val = (audio_adc_reg1.value << 2);
-        adc_adr++;
-        audio_adc_reg2. reg_addr = adc_adr;
-        ret = sst_sc_reg_access(&audio_adc_reg2, PMIC_READ, 1);
-        if (ret)
-                return ret;
-        pr_debug("adc read value %x", audio_adc_reg2.value);
-
-        /* Adding lower two bits to the higher bits */
-        audio_adc_reg2.value &= 03;
-        adc_val += audio_adc_reg2.value;
-
-        pr_debug("ADC value 0x%x", adc_val);
-        msic_disable_mic_bias();
-        return adc_val;
-}
-
-static void msic_pmic_irq_cb(void *cb_data, u8 intsts)
-{
-        struct mad_jack *mjack = NULL;
-        unsigned int present = 0, jack_event_flag = 0, buttonpressflag = 0;
-        struct snd_intelmad *intelmaddata = cb_data;
-        int retval = 0;
-
-        pr_debug("value returned = 0x%x\n", intsts);
-
-        if (snd_msic_ops.card_status == SND_CARD_UN_INIT) {
-                retval = msic_init_card();
-                if (retval)
-                        return;
-          }
-
-        mjack = &intelmaddata->jack[0];
-        if (intsts & 0x1) {
-                pr_debug("MAD short_push detected\n");
-                present = SND_JACK_BTN_0;
-                jack_event_flag = buttonpressflag = 1;
-                mjack->jack.type = SND_JACK_BTN_0;
-                mjack->jack.key[0] = BTN_0 ;
-        }
-
-        if (intsts & 0x2) {
-                pr_debug(":MAD long_push detected\n");
-                jack_event_flag = buttonpressflag = 1;
-                mjack->jack.type = present = SND_JACK_BTN_1;
-                mjack->jack.key[1] = BTN_1;
-        }
-
-        if (intsts & 0x4) {
-                unsigned int mic_bias;
-                jack_event_flag = 1;
-                buttonpressflag = 0;
-                mic_bias = msic_get_mic_bias(intelmaddata);
-                pr_debug("mic_bias = %d\n", mic_bias);
-                mic_bias = msic_convert_adc_to_mvolt(mic_bias);
-                pr_debug("mic_bias after conversion = %d mV\n", mic_bias);
-                mjack->jack_dev_state = msic_get_headset_state(mic_bias);
-                mjack->jack.type = present = mjack->jack_dev_state;
-        }
-
-        if (intsts & 0x8) {
-                mjack->jack.type = mjack->jack_dev_state;
-                present = 0;
-                jack_event_flag = 1;
-                buttonpressflag = 0;
-                msic_disable_jack_btn();
-                msic_disable_mic_bias();
-        }
-        if (jack_event_flag)
-                sst_mad_send_jack_report(&mjack->jack,
-                                        buttonpressflag, present);
-}
-
-
-
-struct snd_pmic_ops snd_msic_ops = {
-        .set_input_dev  =       msic_set_selected_input_dev,
-        .set_output_dev =       msic_set_selected_output_dev,
-        .set_lineout_dev =      msic_set_selected_lineout_dev,
-        .set_hw_dmic_route =    msic_set_hw_dmic_route,
-        .set_mute       =       msic_set_mute,
-        .get_mute       =       msic_get_mute,
-        .set_vol        =       msic_set_vol,
-        .get_vol        =       msic_get_vol,
-        .init_card      =       msic_init_card,
-        .set_pcm_audio_params   = msic_set_pcm_audio_params,
-        .set_pcm_voice_params   = msic_set_pcm_voice_params,
-        .set_voice_port = msic_set_voice_port,
-        .set_audio_port = msic_set_audio_port,
-        .power_up_pmic_pb =     msic_power_up_pb,
-        .power_up_pmic_cp =     msic_power_up_cp,
-        .power_down_pmic_pb =   msic_power_down_pb,
-        .power_down_pmic_cp =   msic_power_down_cp,
-        .power_down_pmic        =       msic_power_down,
-        .pmic_irq_cb    =       msic_pmic_irq_cb,
-        .pmic_jack_enable = msic_enable_mic_bias,
-        .pmic_get_mic_bias      = msic_get_mic_bias,
-        .pmic_set_headset_state = msic_set_headset_state,
-};
diff --git a/drivers/staging/intel_sst/intelmid_pvt.c b/drivers/staging/intel_sst/intelmid_pvt.c
deleted file mode 100644
index 90e0e64c0ab0..000000000000
--- a/drivers/staging/intel_sst/intelmid_pvt.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- *   intelmid_pvt.h - Intel Sound card driver for MID
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Harsha Priya <priya.harsha@intel.com>
- *              Vinod Koul <vinod.koul@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * ALSA driver for Intel MID sound card chipset - holding private functions
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/io.h>
-#include <asm/intel_scu_ipc.h>
-#include <sound/core.h>
-#include <sound/control.h>
-#include <sound/pcm.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intelmid_snd_control.h"
-#include "intelmid.h"
-
-
-void period_elapsed(void *mad_substream)
-{
-        struct snd_pcm_substream *substream = mad_substream;
-        struct mad_stream_pvt *stream;
-
-
-
-        if (!substream || !substream->runtime)
-                return;
-        stream = substream->runtime->private_data;
-        if (!stream)
-                return;
-
-        if (stream->stream_status != RUNNING)
-                return;
-        pr_debug("calling period elapsed\n");
-        snd_pcm_period_elapsed(substream);
-        return;
-}
-
-
-int snd_intelmad_alloc_stream(struct snd_pcm_substream *substream)
-{
-        struct snd_intelmad *intelmaddata = snd_pcm_substream_chip(substream);
-        struct mad_stream_pvt *stream = substream->runtime->private_data;
-        struct snd_sst_stream_params param = {{{0,},},};
-        struct snd_sst_params str_params = {0};
-        int ret_val;
-
-        /* set codec params and inform SST driver the same */
-
-        param.uc.pcm_params.codec = SST_CODEC_TYPE_PCM;
-        param.uc.pcm_params.num_chan = (u8) substream->runtime->channels;
-        param.uc.pcm_params.pcm_wd_sz = substream->runtime->sample_bits;
-        param.uc.pcm_params.reserved = 0;
-        param.uc.pcm_params.sfreq = substream->runtime->rate;
-        param.uc.pcm_params.ring_buffer_size =
-                                        snd_pcm_lib_buffer_bytes(substream);
-        param.uc.pcm_params.period_count = substream->runtime->period_size;
-        param.uc.pcm_params.ring_buffer_addr =
-                                virt_to_phys(substream->runtime->dma_area);
-        pr_debug("period_cnt = %d\n", param.uc.pcm_params.period_count);
-        pr_debug("sfreq= %d, wd_sz = %d\n",
-                 param.uc.pcm_params.sfreq, param.uc.pcm_params.pcm_wd_sz);
-
-        str_params.sparams = param;
-        str_params.codec = SST_CODEC_TYPE_PCM;
-
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                str_params.ops = STREAM_OPS_PLAYBACK;
-                pr_debug("Playbck stream,Device %d\n", stream->device);
-        } else {
-                str_params.ops = STREAM_OPS_CAPTURE;
-                stream->device = SND_SST_DEVICE_CAPTURE;
-                pr_debug("Capture stream,Device %d\n", stream->device);
-        }
-        str_params.device_type = stream->device;
-        ret_val = intelmaddata->sstdrv_ops->pcm_control->open(&str_params);
-        pr_debug("sst: SST_SND_PLAY/CAPTURE ret_val = %x\n", ret_val);
-        if (ret_val < 0)
-                return ret_val;
-
-        stream->stream_info.str_id = ret_val;
-        stream->stream_status = INIT;
-        stream->stream_info.buffer_ptr = 0;
-        pr_debug("str id :  %d\n", stream->stream_info.str_id);
-
-        return ret_val;
-}
-
-int snd_intelmad_init_stream(struct snd_pcm_substream *substream)
-{
-        struct mad_stream_pvt *stream = substream->runtime->private_data;
-        struct snd_intelmad *intelmaddata = snd_pcm_substream_chip(substream);
-        int ret_val;
-
-        pr_debug("setting buffer ptr param\n");
-        stream->stream_info.period_elapsed = period_elapsed;
-        stream->stream_info.mad_substream = substream;
-        stream->stream_info.buffer_ptr = 0;
-        stream->stream_info.sfreq = substream->runtime->rate;
-        ret_val = intelmaddata->sstdrv_ops->pcm_control->device_control(
-                        SST_SND_STREAM_INIT, &stream->stream_info);
-        if (ret_val)
-                pr_err("control_set ret error %d\n", ret_val);
-        return ret_val;
-
-}
-
-
-/**
- * sst_sc_reg_access - IPC read/write wrapper
- *
- * @sc_access:  array of data, addresses and mask
- * @type: operation type
- * @num_val: number of reg to opertae on
- *
- * Reads/writes/read-modify operations on registers accessed through SCU (sound
- * card and few SST DSP regsisters that are not accissible to IA)
- */
-int sst_sc_reg_access(struct sc_reg_access *sc_access,
-                                        int type, int num_val)
-{
-        int i, retval = 0;
-        if (type == PMIC_WRITE) {
-                for (i = 0; i < num_val; i++) {
-                        retval = intel_scu_ipc_iowrite8(sc_access[i].reg_addr,
-                                                        sc_access[i].value);
-                        if (retval)
-                                goto err;
-                }
-        } else if (type == PMIC_READ) {
-                for (i = 0; i < num_val; i++) {
-                        retval = intel_scu_ipc_ioread8(sc_access[i].reg_addr,
-                                                        &(sc_access[i].value));
-                        if (retval)
-                                goto err;
-                }
-        } else {
-                for (i = 0; i < num_val; i++) {
-                        retval = intel_scu_ipc_update_register(
-                                sc_access[i].reg_addr, sc_access[i].value,
-                                sc_access[i].mask);
-                        if (retval)
-                                goto err;
-                }
-        }
-        return 0;
-err:
-        pr_err("IPC failed for cmd %d, %d\n", retval, type);
-        pr_err("reg:0x%2x addr:0x%2x\n",
-                sc_access[i].reg_addr, sc_access[i].value);
-        return retval;
-}
diff --git a/drivers/staging/intel_sst/intelmid_snd_control.h b/drivers/staging/intel_sst/intelmid_snd_control.h
deleted file mode 100644
index 06ad3a10099c..000000000000
--- a/drivers/staging/intel_sst/intelmid_snd_control.h
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef __INTELMID_SND_CTRL_H__
-#define __INTELMID_SND_CTRL_H__
-/*
- *  intelmid_snd_control.h - Intel Sound card driver for MID
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file defines all snd control functions
- */
-
-/*
-Mask bits
-*/
-#define MASK0 0x01      /* 0000 0001 */
-#define MASK1 0x02      /* 0000 0010 */
-#define MASK2 0x04      /* 0000 0100 */
-#define MASK3 0x08      /* 0000 1000 */
-#define MASK4 0x10      /* 0001 0000 */
-#define MASK5 0x20      /* 0010 0000 */
-#define MASK6 0x40      /* 0100 0000 */
-#define MASK7 0x80      /* 1000 0000 */
-/*
-value bits
-*/
-#define VALUE0  0x01    /* 0000 0001 */
-#define VALUE1  0x02    /* 0000 0010 */
-#define VALUE2  0x04    /* 0000 0100 */
-#define VALUE3  0x08    /* 0000 1000 */
-#define VALUE4  0x10    /* 0001 0000 */
-#define VALUE5  0x20    /* 0010 0000 */
-#define VALUE6  0x40    /* 0100 0000 */
-#define VALUE7  0x80    /* 1000 0000 */
-
-#define MUTE 0    /* ALSA Passes 0 for mute */
-#define UNMUTE 1  /* ALSA Passes 1 for unmute */
-
-#define MAX_VOL_PMIC_VENDOR0    0x3f /* max vol in dB for stereo & voice DAC */
-#define MIN_VOL_PMIC_VENDOR0    0 /* min vol in dB for stereo & voice DAC */
-/* Head phone volume control  */
-#define MAX_HP_VOL_PMIC_VENDOR1    6 /* max volume in dB for HP */
-#define MIN_HP_VOL_PMIC_VENDOR1    (-84) /* min volume in dB for HP */
-#define MAX_HP_VOL_INDX_PMIC_VENDOR1 40 /* Number of HP volume control values */
-
-/* Mono Earpiece Volume control */
-#define MAX_EP_VOL_PMIC_VENDOR1    0 /* max volume in dB for EP */
-#define MIN_EP_VOL_PMIC_VENDOR1    (-75) /* min volume in dB for EP */
-#define MAX_EP_VOL_INDX_PMIC_VENDOR1 32 /* Number of EP volume control values */
-
-int sst_sc_reg_access(struct sc_reg_access *sc_access,
-                                        int type, int num_val);
-extern struct snd_pmic_ops snd_pmic_ops_fs;
-extern struct snd_pmic_ops snd_pmic_ops_mx;
-extern struct snd_pmic_ops snd_pmic_ops_nc;
-extern struct snd_pmic_ops snd_msic_ops;
-
-/* device */
-enum SND_INPUT_DEVICE {
-        AMIC,
-        DMIC,
-        HS_MIC,
-        IN_UNDEFINED
-};
-enum SND_LINE_OUT_DEVICE {
-        HEADSET,
-        IHF,
-        VIBRA1,
-        VIBRA2,
-        NONE,
-};
-
-enum SND_OUTPUT_DEVICE {
-        STEREO_HEADPHONE,
-        MONO_EARPIECE,
-
-        INTERNAL_SPKR,
-        RECEIVER,
-        OUT_UNDEFINED
-};
-
-enum pmic_controls {
-        PMIC_SND_HP_MIC_MUTE =                  0x0001,
-        PMIC_SND_AMIC_MUTE =                    0x0002,
-        PMIC_SND_DMIC_MUTE =                    0x0003,
-        PMIC_SND_CAPTURE_VOL =                  0x0004,
-/* Output controls */
-        PMIC_SND_LEFT_PB_VOL =                  0x0010,
-        PMIC_SND_RIGHT_PB_VOL =                 0x0011,
-        PMIC_SND_LEFT_HP_MUTE =                 0x0012,
-        PMIC_SND_RIGHT_HP_MUTE =                0x0013,
-        PMIC_SND_LEFT_SPEAKER_MUTE =            0x0014,
-        PMIC_SND_RIGHT_SPEAKER_MUTE =           0x0015,
-        PMIC_SND_RECEIVER_VOL =                 0x0016,
-        PMIC_SND_RECEIVER_MUTE =                0x0017,
-        PMIC_SND_LEFT_MASTER_VOL =              0x0018,
-        PMIC_SND_RIGHT_MASTER_VOL =             0x0019,
-/* Other controls */
-        PMIC_SND_MUTE_ALL =                     0x0020,
-        PMIC_MAX_CONTROLS =                     0x0020,
-};
-
-#endif /* __INTELMID_SND_CTRL_H__ */
-
-
diff --git a/drivers/staging/intel_sst/intelmid_v0_control.c b/drivers/staging/intel_sst/intelmid_v0_control.c
deleted file mode 100644
index b8dfdb9bc1aa..000000000000
--- a/drivers/staging/intel_sst/intelmid_v0_control.c
+++ /dev/null
@@ -1,866 +0,0 @@
-/*
- *  intel_sst_v0_control.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corporation
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file contains the control operations of vendor 1
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/file.h>
-#include <sound/control.h>
-#include "intel_sst.h"
-#include "intelmid_snd_control.h"
-#include "intelmid.h"
-
-enum _reg_v1 {
-        VOICEPORT1 = 0x180,
-        VOICEPORT2 = 0x181,
-        AUDIOPORT1 = 0x182,
-        AUDIOPORT2 = 0x183,
-        MISCVOICECTRL = 0x184,
-        MISCAUDCTRL = 0x185,
-        DMICCTRL1 = 0x186,
-        AUDIOBIAS = 0x187,
-        MICCTRL = 0x188,
-        MICLICTRL1 = 0x189,
-        MICLICTRL2 = 0x18A,
-        MICLICTRL3 = 0x18B,
-        VOICEDACCTRL1 = 0x18C,
-        STEREOADCCTRL = 0x18D,
-        AUD15 = 0x18E,
-        AUD16 = 0x18F,
-        AUD17 = 0x190,
-        AUD18 = 0x191,
-        RMIXOUTSEL = 0x192,
-        ANALOGLBR = 0x193,
-        ANALOGLBL = 0x194,
-        POWERCTRL1 = 0x195,
-        POWERCTRL2 = 0x196,
-        HEADSETDETECTINT = 0x197,
-        HEADSETDETECTINTMASK = 0x198,
-        TRIMENABLE = 0x199,
-};
-
-int rev_id = 0x20;
-static bool jack_det_enabled;
-
-/****
- * fs_init_card - initialize the sound card
- *
- * This initializes the audio paths to know values in case of this sound card
- */
-static int fs_init_card(void)
-{
-        struct sc_reg_access sc_access[] = {
-                {0x180, 0x00, 0x0},
-                {0x181, 0x00, 0x0},
-                {0x182, 0xF8, 0x0},
-                {0x183, 0x08, 0x0},
-                {0x184, 0x00, 0x0},
-                {0x185, 0x40, 0x0},
-                {0x186, 0x06, 0x0},
-                {0x187, 0x80, 0x0},
-                {0x188, 0x40, 0x0},
-                {0x189, 0x39, 0x0},
-                {0x18a, 0x39, 0x0},
-                {0x18b, 0x1F, 0x0},
-                {0x18c, 0x00, 0x0},
-                {0x18d, 0x00, 0x0},
-                {0x18e, 0x39, 0x0},
-                {0x18f, 0x39, 0x0},
-                {0x190, 0x39, 0x0},
-                {0x191, 0x11, 0x0},
-                {0x192, 0x0E, 0x0},
-                {0x193, 0x00, 0x0},
-                {0x194, 0x00, 0x0},
-                {0x195, 0x00, 0x0},
-                {0x196, 0x7C, 0x0},
-                {0x197, 0x00, 0x0},
-                {0x198, 0x0B, 0x0},
-                {0x199, 0x00, 0x0},
-                {0x037, 0x3F, 0x0},
-        };
-
-        snd_pmic_ops_fs.card_status = SND_CARD_INIT_DONE;
-        snd_pmic_ops_fs.master_mute = UNMUTE;
-        snd_pmic_ops_fs.mute_status = UNMUTE;
-        snd_pmic_ops_fs.num_channel = 2;
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, 27);
-}
-
-static int fs_enable_audiodac(int value)
-{
-        struct sc_reg_access sc_access[3];
-        sc_access[0].reg_addr = AUD16;
-        sc_access[1].reg_addr = AUD17;
-        sc_access[2].reg_addr = AUD15;
-        sc_access[0].mask = sc_access[1].mask = sc_access[2].mask = MASK7;
-
-        if (snd_pmic_ops_fs.mute_status == MUTE)
-                return 0;
-        if (value == MUTE) {
-                        sc_access[0].value = sc_access[1].value =
-                                sc_access[2].value = 0x80;
-
-                } else {
-                        sc_access[0].value = sc_access[1].value =
-                        sc_access[2].value =  0x0;
-                }
-        if (snd_pmic_ops_fs.num_channel == 1)
-                sc_access[1].value = sc_access[2].value = 0x80;
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 3);
-
-}
-
-static int fs_power_up_pb(unsigned int port)
-{
-        struct sc_reg_access sc_access[] = {
-                {AUDIOBIAS, 0x00, MASK7},
-                {POWERCTRL1, 0xC6, 0xC6},
-                {POWERCTRL2, 0x30, 0x30},
-
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        retval = fs_enable_audiodac(MUTE);
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 3);
-
-        if (retval)
-                return retval;
-
-        pr_debug("in fs power up pb\n");
-        return fs_enable_audiodac(UNMUTE);
-}
-
-static int fs_power_down_pb(unsigned int device)
-{
-        struct sc_reg_access sc_access[] = {
-                {POWERCTRL1, 0x00, 0xC6},
-                {POWERCTRL2, 0x00, 0x30},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        retval = fs_enable_audiodac(MUTE);
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-        if (retval)
-                return retval;
-
-        pr_debug("in fsl power down pb\n");
-        return fs_enable_audiodac(UNMUTE);
-}
-
-static int fs_power_up_cp(unsigned int port)
-{
-        struct sc_reg_access sc_access[] = {
-                {POWERCTRL2, 0x32, 0x32}, /*NOTE power up A ADC only as*/
-                {AUDIOBIAS, 0x00, MASK7},
-                                        /*as turning on V ADC causes noise*/
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-}
-
-static int fs_power_down_cp(unsigned int device)
-{
-        struct sc_reg_access sc_access[] = {
-                {POWERCTRL2, 0x00, 0x03},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-}
-
-static int fs_power_down(void)
-{
-        int retval = 0;
-        struct sc_reg_access sc_access[] = {
-                {AUDIOBIAS, MASK7, MASK7},
-        };
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-}
-
-static int fs_set_pcm_voice_params(void)
-{
-        struct sc_reg_access sc_access[] = {
-                {0x180, 0xA0, 0},
-                {0x181, 0x04, 0},
-                {0x182, 0x0, 0},
-                {0x183, 0x0, 0},
-                {0x184, 0x18, 0},
-                {0x185, 0x40, 0},
-                {0x186, 0x06, 0},
-                {0x187, 0x0, 0},
-                {0x188, 0x10, 0},
-                {0x189, 0x39, 0},
-                {0x18a, 0x39, 0},
-                {0x18b, 0x02, 0},
-                {0x18c, 0x0, 0},
-                {0x18d, 0x0, 0},
-                {0x18e, 0x39, 0},
-                {0x18f, 0x0, 0},
-                {0x190, 0x0, 0},
-                {0x191, 0x20, 0},
-                {0x192, 0x20, 0},
-                {0x193, 0x0, 0},
-                {0x194, 0x0, 0},
-                {0x195, 0x06, 0},
-                {0x196, 0x25, 0},
-                {0x197, 0x0, 0},
-                {0x198, 0xF, 0},
-                {0x199, 0x0, 0},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, 26);
-}
-
-static int fs_set_audio_port(int status)
-{
-        struct sc_reg_access sc_access[2];
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        if (status == DEACTIVATE) {
-                /* Deactivate audio port-tristate and power */
-                sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK6|MASK7;
-                sc_access[0].reg_addr = AUDIOPORT1;
-                sc_access[1].value = 0x00;
-                sc_access[1].mask = MASK4|MASK5;
-                sc_access[1].reg_addr = POWERCTRL2;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-        } else if (status == ACTIVATE) {
-                /* activate audio port */
-                sc_access[0].value = 0xC0;
-                sc_access[0].mask = MASK6|MASK7;
-                sc_access[0].reg_addr = AUDIOPORT1;
-                sc_access[1].value = 0x30;
-                sc_access[1].mask = MASK4|MASK5;
-                sc_access[1].reg_addr = POWERCTRL2;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-        } else
-                return -EINVAL;
-}
-
-static int fs_set_voice_port(int status)
-{
-        struct sc_reg_access sc_access[2];
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        if (status == DEACTIVATE) {
-                /* Deactivate audio port-tristate and power */
-                sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK6|MASK7;
-                sc_access[0].reg_addr = VOICEPORT1;
-                sc_access[1].value = 0x00;
-                sc_access[1].mask = MASK0|MASK1;
-                sc_access[1].reg_addr = POWERCTRL2;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-        } else if (status == ACTIVATE) {
-                /* activate audio port */
-                sc_access[0].value = 0xC0;
-                sc_access[0].mask = MASK6|MASK7;
-                sc_access[0].reg_addr = VOICEPORT1;
-                sc_access[1].value = 0x03;
-                sc_access[1].mask = MASK0|MASK1;
-                sc_access[1].reg_addr = POWERCTRL2;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-        } else
-                return -EINVAL;
-}
-
-static int fs_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
-{
-        u8 config1 = 0;
-        struct sc_reg_access sc_access[4];
-        int retval = 0, num_value = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-        switch (sfreq) {
-        case 8000:
-                config1 = 0x00;
-                break;
-        case 11025:
-                config1 = 0x01;
-                break;
-        case 12000:
-                config1 = 0x02;
-                break;
-        case 16000:
-                config1 = 0x03;
-                break;
-        case 22050:
-                config1 = 0x04;
-                break;
-        case 24000:
-                config1 = 0x05;
-                break;
-        case 26000:
-                config1 = 0x06;
-                break;
-        case 32000:
-                config1 = 0x07;
-                break;
-        case 44100:
-                config1 = 0x08;
-                break;
-        case 48000:
-                config1 = 0x09;
-                break;
-        }
-        snd_pmic_ops_fs.num_channel = num_channel;
-        if (snd_pmic_ops_fs.num_channel == 1)   {
-                sc_access[0].reg_addr = AUD17;
-                sc_access[1].reg_addr = AUD15;
-                sc_access[0].mask = sc_access[1].mask = MASK7;
-                sc_access[0].value = sc_access[1].value = 0x80;
-                sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-        } else {
-                sc_access[0].reg_addr = AUD17;
-                sc_access[1].reg_addr = AUD15;
-                sc_access[0].mask = sc_access[1].mask = MASK7;
-                sc_access[0].value = sc_access[1].value = 0x00;
-                sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-        }
-        pr_debug("sfreq:%d,Register value = %x\n", sfreq, config1);
-
-        if (word_size == 24) {
-                sc_access[0].reg_addr  = AUDIOPORT1;
-                sc_access[0].mask = MASK0|MASK1|MASK2|MASK3;
-                sc_access[0].value = 0xFB;
-
-
-                sc_access[1].reg_addr  = AUDIOPORT2;
-                sc_access[1].value = config1 | 0x10;
-                sc_access[1].mask = MASK0 | MASK1 | MASK2 | MASK3
-                                        | MASK4 | MASK5 | MASK6;
-
-                sc_access[2].reg_addr  = MISCAUDCTRL;
-                sc_access[2].value = 0x02;
-                sc_access[2].mask = 0x02;
-
-                num_value = 3 ;
-
-        } else {
-
-                sc_access[0].reg_addr  = AUDIOPORT2;
-                sc_access[0].value = config1;
-                sc_access[0].mask = MASK0|MASK1|MASK2|MASK3;
-
-                sc_access[1].reg_addr  = MISCAUDCTRL;
-                sc_access[1].value = 0x00;
-                sc_access[1].mask = 0x02;
-                num_value = 2;
-        }
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, num_value);
-
-}
-
-static int fs_set_selected_input_dev(u8 value)
-{
-        struct sc_reg_access sc_access_dmic[] = {
-                {MICCTRL, 0x81, 0xf7},
-                {MICLICTRL3, 0x00, 0xE0},
-        };
-        struct sc_reg_access sc_access_mic[] = {
-                {MICCTRL, 0x40, MASK2|MASK4|MASK5|MASK6|MASK7},
-                {MICLICTRL3, 0x00, 0xE0},
-        };
-        struct sc_reg_access sc_access_hsmic[] = {
-                {MICCTRL, 0x10, MASK2|MASK4|MASK5|MASK6|MASK7},
-                {MICLICTRL3, 0x00, 0xE0},
-        };
-
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-
-        switch (value) {
-        case AMIC:
-                pr_debug("Selecting amic not supported in mono cfg\n");
-                return sst_sc_reg_access(sc_access_mic, PMIC_READ_MODIFY, 2);
-                break;
-
-        case HS_MIC:
-                pr_debug("Selecting hsmic\n");
-                return sst_sc_reg_access(sc_access_hsmic,
-                                PMIC_READ_MODIFY, 2);
-                break;
-
-        case DMIC:
-                pr_debug("Selecting dmic\n");
-                return sst_sc_reg_access(sc_access_dmic, PMIC_READ_MODIFY, 2);
-                break;
-
-        default:
-                return -EINVAL;
-
-        }
-}
-
-static int fs_set_selected_output_dev(u8 value)
-{
-        struct sc_reg_access sc_access_hp[] = {
-                {0x191, 0x11, 0x0},
-                {0x192, 0x0E, 0x0},
-        };
-        struct sc_reg_access sc_access_is[] = {
-                {0x191, 0x17, 0xFF},
-                {0x192, 0x08, 0xFF},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-
-        switch (value) {
-        case STEREO_HEADPHONE:
-                pr_debug("SST DBG:Selecting headphone\n");
-                return sst_sc_reg_access(sc_access_hp, PMIC_WRITE, 2);
-                break;
-        case MONO_EARPIECE:
-        case INTERNAL_SPKR:
-                pr_debug("SST DBG:Selecting internal spkr\n");
-                return sst_sc_reg_access(sc_access_is, PMIC_READ_MODIFY, 2);
-                break;
-
-        default:
-                return -EINVAL;
-
-        }
-}
-
-static int fs_set_mute(int dev_id, u8 value)
-{
-        struct sc_reg_access sc_access[6] = {{0,},};
-        int reg_num = 0;
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-
-
-        pr_debug("dev_id:0x%x value:0x%x\n", dev_id, value);
-        switch (dev_id) {
-        case PMIC_SND_DMIC_MUTE:
-                sc_access[0].reg_addr = MICCTRL;
-                sc_access[1].reg_addr = MICLICTRL1;
-                sc_access[2].reg_addr = MICLICTRL2;
-                sc_access[0].mask = MASK5;
-                sc_access[1].mask = sc_access[2].mask = MASK6;
-                if (value == MUTE) {
-                        sc_access[0].value = 0x20;
-                        sc_access[2].value = sc_access[1].value = 0x40;
-                } else
-                        sc_access[0].value = sc_access[1].value
-                        = sc_access[2].value = 0x0;
-                reg_num = 3;
-                break;
-        case PMIC_SND_HP_MIC_MUTE:
-        case PMIC_SND_AMIC_MUTE:
-                sc_access[0].reg_addr = MICLICTRL1;
-                sc_access[1].reg_addr = MICLICTRL2;
-                sc_access[0].mask = sc_access[1].mask = MASK6;
-                if (value == MUTE)
-                        sc_access[0].value = sc_access[1].value = 0x40;
-                else
-                        sc_access[0].value = sc_access[1].value = 0x0;
-                reg_num = 2;
-                break;
-        case PMIC_SND_LEFT_SPEAKER_MUTE:
-        case PMIC_SND_LEFT_HP_MUTE:
-                sc_access[0].reg_addr = AUD16;
-                sc_access[1].reg_addr = AUD15;
-
-                sc_access[0].mask = sc_access[1].mask = MASK7;
-                if (value == MUTE)
-                        sc_access[0].value = sc_access[1].value = 0x80;
-                else
-                        sc_access[0].value = sc_access[1].value = 0x0;
-                reg_num = 2;
-                snd_pmic_ops_fs.mute_status = value;
-                break;
-        case PMIC_SND_RIGHT_HP_MUTE:
-        case PMIC_SND_RIGHT_SPEAKER_MUTE:
-                sc_access[0].reg_addr = AUD17;
-                sc_access[1].reg_addr = AUD15;
-                sc_access[0].mask = sc_access[1].mask = MASK7;
-                if (value == MUTE)
-                        sc_access[0].value = sc_access[1].value = 0x80;
-                else
-                        sc_access[0].value = sc_access[1].value = 0x0;
-                snd_pmic_ops_fs.mute_status = value;
-                if (snd_pmic_ops_fs.num_channel == 1)
-                        sc_access[0].value = sc_access[1].value = 0x80;
-                reg_num = 2;
-                break;
-        case PMIC_SND_MUTE_ALL:
-                sc_access[0].reg_addr = AUD16;
-                sc_access[1].reg_addr = AUD17;
-                sc_access[2].reg_addr = AUD15;
-                sc_access[3].reg_addr = MICCTRL;
-                sc_access[4].reg_addr = MICLICTRL1;
-                sc_access[5].reg_addr = MICLICTRL2;
-                sc_access[0].mask = sc_access[1].mask =
-                                sc_access[2].mask = MASK7;
-                sc_access[3].mask = MASK5;
-                sc_access[4].mask = sc_access[5].mask = MASK6;
-
-                if (value == MUTE) {
-                        sc_access[0].value =
-                        sc_access[1].value = sc_access[2].value = 0x80;
-                        sc_access[3].value = 0x20;
-                        sc_access[4].value = sc_access[5].value = 0x40;
-
-                } else {
-                        sc_access[0].value = sc_access[1].value =
-                        sc_access[2].value = sc_access[3].value =
-                        sc_access[4].value = sc_access[5].value = 0x0;
-                }
-                if (snd_pmic_ops_fs.num_channel == 1)
-                        sc_access[1].value = sc_access[2].value = 0x80;
-                reg_num = 6;
-                snd_pmic_ops_fs.mute_status = value;
-                snd_pmic_ops_fs.master_mute = value;
-                break;
-
-        }
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, reg_num);
-}
-
-static int fs_set_vol(int dev_id, int value)
-{
-        struct sc_reg_access sc_acces, sc_access[4] = {{0},};
-        int reg_num = 0;
-        int retval = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-
-        switch (dev_id) {
-        case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("PMIC_SND_LEFT_PB_VOL:%d\n", value);
-                sc_access[0].value = sc_access[1].value = value;
-                sc_access[0].reg_addr = AUD16;
-                sc_access[1].reg_addr = AUD15;
-                sc_access[0].mask = sc_access[1].mask =
-                        (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                reg_num = 2;
-                break;
-
-        case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("PMIC_SND_RIGHT_PB_VOL:%d\n", value);
-                sc_access[0].value = sc_access[1].value = value;
-                sc_access[0].reg_addr = AUD17;
-                sc_access[1].reg_addr = AUD15;
-                sc_access[0].mask = sc_access[1].mask =
-                        (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                if (snd_pmic_ops_fs.num_channel == 1) {
-                        sc_access[0].value = sc_access[1].value = 0x80;
-                        sc_access[0].mask = sc_access[1].mask = MASK7;
-                }
-                reg_num = 2;
-                break;
-        case PMIC_SND_CAPTURE_VOL:
-                pr_debug("PMIC_SND_CAPTURE_VOL:%d\n", value);
-                sc_access[0].reg_addr = MICLICTRL1;
-                sc_access[1].reg_addr = MICLICTRL2;
-                sc_access[2].reg_addr = DMICCTRL1;
-                sc_access[2].value = value;
-                sc_access[0].value = sc_access[1].value = value;
-                sc_acces.reg_addr = MICLICTRL3;
-                sc_acces.value = value;
-                sc_acces.mask = (MASK0|MASK1|MASK2|MASK3|MASK5|MASK6|MASK7);
-                retval = sst_sc_reg_access(&sc_acces, PMIC_READ_MODIFY, 1);
-                sc_access[0].mask = sc_access[1].mask =
-                sc_access[2].mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                reg_num = 3;
-                break;
-
-        default:
-                return -EINVAL;
-        }
-
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, reg_num);
-}
-
-static int fs_get_mute(int dev_id, u8 *value)
-{
-        struct sc_reg_access sc_access[6] = {{0,},};
-
-        int retval = 0, temp_value = 0, mask = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-
-        switch (dev_id) {
-
-        case PMIC_SND_AMIC_MUTE:
-        case PMIC_SND_HP_MIC_MUTE:
-                sc_access[0].reg_addr = MICLICTRL1;
-                mask = MASK6;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ, 1);
-                if (sc_access[0].value & mask)
-                        *value = MUTE;
-                else
-                        *value = UNMUTE;
-                break;
-        case PMIC_SND_DMIC_MUTE:
-                sc_access[0].reg_addr = MICCTRL;
-                mask = MASK5;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ, 1);
-                temp_value = (sc_access[0].value & mask);
-                if (temp_value == 0)
-                        *value = UNMUTE;
-                else
-                        *value = MUTE;
-                break;
-
-        case PMIC_SND_LEFT_HP_MUTE:
-        case PMIC_SND_LEFT_SPEAKER_MUTE:
-                sc_access[0].reg_addr = AUD16;
-                mask = MASK7;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ, 1);
-                temp_value = sc_access[0].value & mask;
-                if (temp_value == 0)
-                        *value = UNMUTE;
-                else
-                        *value = MUTE;
-                break;
-        case PMIC_SND_RIGHT_HP_MUTE:
-        case PMIC_SND_RIGHT_SPEAKER_MUTE:
-                sc_access[0].reg_addr = AUD17;
-                mask = MASK7;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ, 1);
-                temp_value = sc_access[0].value & mask;
-                if (temp_value == 0)
-                        *value = UNMUTE;
-                else
-                        *value = MUTE;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return retval;
-}
-
-static int fs_get_vol(int dev_id, int *value)
-{
-        struct sc_reg_access sc_access = {0,};
-        int retval = 0, mask = 0;
-
-        if (snd_pmic_ops_fs.card_status == SND_CARD_UN_INIT)
-                retval = fs_init_card();
-        if (retval)
-                return retval;
-
-        switch (dev_id) {
-        case PMIC_SND_CAPTURE_VOL:
-                pr_debug("PMIC_SND_CAPTURE_VOL\n");
-                sc_access.reg_addr = MICLICTRL1;
-                mask = (MASK5|MASK4|MASK3|MASK2|MASK1|MASK0);
-                break;
-        case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("PMIC_SND_LEFT_PB_VOL\n");
-                sc_access.reg_addr = AUD16;
-                mask = (MASK5|MASK4|MASK3|MASK2|MASK1|MASK0);
-                break;
-        case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("PMIC_SND_RT_PB_VOL\n");
-                sc_access.reg_addr = AUD17;
-                mask = (MASK5|MASK4|MASK3|MASK2|MASK1|MASK0);
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        retval = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        pr_debug("value read = 0x%x\n", sc_access.value);
-        *value = (int) (sc_access.value & mask);
-        pr_debug("value returned = 0x%x\n", *value);
-        return retval;
-}
-
-static void fs_pmic_irq_enable(void *data)
-{
-        struct snd_intelmad *intelmaddata = data;
-        struct sc_reg_access sc_access[] = {
-                                {0x187, 0x00, MASK7},
-                                {0x188, 0x10, MASK4},
-                                {0x18b, 0x10, MASK4},
-        };
-
-        struct sc_reg_access sc_access_write[] = {
-                                {0x198, 0x00, 0x0},
-        };
-        pr_debug("Audio interrupt enable\n");
-        sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 3);
-        sst_sc_reg_access(sc_access_write, PMIC_WRITE, 1);
-
-        intelmaddata->jack[0].jack_status = 0;
-        /*intelmaddata->jack[1].jack_status = 0;*/
-
-        jack_det_enabled = true;
-        return;
-}
-
-static void fs_pmic_irq_cb(void *cb_data, u8 value)
-{
-        struct mad_jack *mjack = NULL;
-        struct snd_intelmad *intelmaddata = cb_data;
-        unsigned int present = 0, jack_event_flag = 0, buttonpressflag = 0;
-
-        mjack = &intelmaddata->jack[0];
-
-        if (value & 0x4) {
-                if (!jack_det_enabled)
-                        fs_pmic_irq_enable(intelmaddata);
-
-                /* send headphone detect */
-                pr_debug(":MAD headphone %d\n", value & 0x4);
-                present = !(mjack->jack_status);
-                mjack->jack_status = present;
-                jack_event_flag = 1;
-                mjack->jack.type = SND_JACK_HEADPHONE;
-        }
-
-        if (value & 0x2) {
-                /* send short push */
-                pr_debug(":MAD short push %d\n", value & 0x2);
-                present = 1;
-                jack_event_flag = 1;
-                buttonpressflag = 1;
-                mjack->jack.type = MID_JACK_HS_SHORT_PRESS;
-        }
-
-        if (value & 0x1) {
-                /* send long push */
-                pr_debug(":MAD long push %d\n", value & 0x1);
-                present = 1;
-                jack_event_flag = 1;
-                buttonpressflag = 1;
-                mjack->jack.type = MID_JACK_HS_LONG_PRESS;
-        }
-
-        if (value & 0x8) {
-                if (!jack_det_enabled)
-                        fs_pmic_irq_enable(intelmaddata);
-                /* send headset detect */
-                pr_debug(":MAD headset = %d\n", value & 0x8);
-                present = !(mjack->jack_status);
-                mjack->jack_status = present;
-                jack_event_flag = 1;
-                mjack->jack.type = SND_JACK_HEADSET;
-        }
-
-
-        if (jack_event_flag)
-                sst_mad_send_jack_report(&mjack->jack,
-                                                buttonpressflag, present);
-
-        return;
-}
-static int fs_jack_enable(void)
-{
-        return 0;
-}
-
-struct snd_pmic_ops snd_pmic_ops_fs = {
-        .set_input_dev = fs_set_selected_input_dev,
-        .set_output_dev = fs_set_selected_output_dev,
-        .set_mute = fs_set_mute,
-        .get_mute = fs_get_mute,
-        .set_vol = fs_set_vol,
-        .get_vol = fs_get_vol,
-        .init_card = fs_init_card,
-        .set_pcm_audio_params = fs_set_pcm_audio_params,
-        .set_pcm_voice_params = fs_set_pcm_voice_params,
-        .set_voice_port = fs_set_voice_port,
-        .set_audio_port = fs_set_audio_port,
-        .power_up_pmic_pb =     fs_power_up_pb,
-        .power_up_pmic_cp =     fs_power_up_cp,
-        .power_down_pmic_pb =   fs_power_down_pb,
-        .power_down_pmic_cp =   fs_power_down_cp,
-        .power_down_pmic        =       fs_power_down,
-        .pmic_irq_cb    =       fs_pmic_irq_cb,
-        /*
-         * Jack detection enabling
-         * need be delayed till first IRQ happen.
-         */
-        .pmic_irq_enable =      NULL,
-        .pmic_jack_enable = fs_jack_enable,
-};
diff --git a/drivers/staging/intel_sst/intelmid_v1_control.c b/drivers/staging/intel_sst/intelmid_v1_control.c
deleted file mode 100644
index 9d00728d8deb..000000000000
--- a/drivers/staging/intel_sst/intelmid_v1_control.c
+++ /dev/null
@@ -1,978 +0,0 @@
-/*  intel_sst_v1_control.c - Intel SST Driver for audio engine
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *      Harsha Priya <priya.harsha@intel.com>
- *      Dharageswari R <dharageswari.r@intel.com>
- *      KP Jeeja <jeeja.kp@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file contains the control operations of vendor 2
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/file.h>
-#include <asm/mrst.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/control.h>
-#include <sound/initval.h>
-#include "intel_sst.h"
-#include "intel_sst_ioctl.h"
-#include "intelmid.h"
-#include "intelmid_snd_control.h"
-
-#include <linux/gpio.h>
-#define KOSKI_VOICE_CODEC_ENABLE 46
-
-enum _reg_v2 {
-
-        MASTER_CLOCK_PRESCALAR  = 0x205,
-        SET_MASTER_AND_LR_CLK1  = 0x20b,
-        SET_MASTER_AND_LR_CLK2  = 0x20c,
-        MASTER_MODE_AND_DATA_DELAY = 0x20d,
-        DIGITAL_INTERFACE_TO_DAI2 = 0x20e,
-        CLK_AND_FS1 = 0x208,
-        CLK_AND_FS2 = 0x209,
-        DAI2_TO_DAC_HP = 0x210,
-        HP_OP_SINGLE_ENDED = 0x224,
-        ENABLE_OPDEV_CTRL = 0x226,
-        ENABLE_DEV_AND_USE_XTAL = 0x227,
-
-        /* Max audio subsystem (PQ49) MAX 8921 */
-        AS_IP_MODE_CTL = 0xF9,
-        AS_LEFT_SPKR_VOL_CTL = 0xFA, /* Mono Earpiece volume control */
-        AS_RIGHT_SPKR_VOL_CTL = 0xFB,
-        AS_LEFT_HP_VOL_CTL = 0xFC,
-        AS_RIGHT_HP_VOL_CTL = 0xFD,
-        AS_OP_MIX_CTL = 0xFE,
-        AS_CONFIG = 0xFF,
-
-        /* Headphone volume control & mute registers */
-        VOL_CTRL_LT = 0x21c,
-        VOL_CTRL_RT = 0x21d,
-
-};
-/**
- * mx_init_card - initialize the sound card
- *
- * This initializes the audio paths to know values in case of this sound card
- */
-static int mx_init_card(void)
-{
-        struct sc_reg_access sc_access[] = {
-                {0x200, 0x80, 0x00},
-                {0x201, 0xC0, 0x00},
-                {0x202, 0x00, 0x00},
-                {0x203, 0x00, 0x00},
-                {0x204, 0x02, 0x00},
-                {0x205, 0x10, 0x00},
-                {0x206, 0x60, 0x00},
-                {0x207, 0x00, 0x00},
-                {0x208, 0x90, 0x00},
-                {0x209, 0x51, 0x00},
-                {0x20a, 0x00, 0x00},
-                {0x20b, 0x10, 0x00},
-                {0x20c, 0x00, 0x00},
-                {0x20d, 0x00, 0x00},
-                {0x20e, 0x21, 0x00},
-                {0x20f, 0x00, 0x00},
-                {0x210, 0x84, 0x00},
-                {0x211, 0xB3, 0x00},
-                {0x212, 0x00, 0x00},
-                {0x213, 0x00, 0x00},
-                {0x214, 0x41, 0x00},
-                {0x215, 0x00, 0x00},
-                {0x216, 0x00, 0x00},
-                {0x217, 0x00, 0x00},
-                {0x218, 0x03, 0x00},
-                {0x219, 0x03, 0x00},
-                {0x21a, 0x00, 0x00},
-                {0x21b, 0x00, 0x00},
-                {0x21c, 0x00, 0x00},
-                {0x21d, 0x00, 0x00},
-                {0x21e, 0x00, 0x00},
-                {0x21f, 0x00, 0x00},
-                {0x220, 0x20, 0x00},
-                {0x221, 0x20, 0x00},
-                {0x222, 0x51, 0x00},
-                {0x223, 0x20, 0x00},
-                {0x224, 0x04, 0x00},
-                {0x225, 0x80, 0x00},
-                {0x226, 0x0F, 0x00},
-                {0x227, 0x08, 0x00},
-                {0xf9,  0x40, 0x00},
-                {0xfa,  0x1f, 0x00},
-                {0xfb,  0x1f, 0x00},
-                {0xfc,  0x1f, 0x00},
-                {0xfd,  0x1f, 0x00},
-                {0xfe,  0x00, 0x00},
-                {0xff,  0x0c, 0x00},
-        };
-        snd_pmic_ops_mx.card_status = SND_CARD_INIT_DONE;
-        snd_pmic_ops_mx.num_channel = 2;
-        snd_pmic_ops_mx.master_mute = UNMUTE;
-        snd_pmic_ops_mx.mute_status = UNMUTE;
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, 47);
-}
-
-static int mx_enable_audiodac(int value)
-{
-        struct sc_reg_access sc_access[3];
-        int mute_val = 0;
-        int mute_val1 = 0;
-        int retval = 0;
-
-        sc_access[0].reg_addr = AS_LEFT_HP_VOL_CTL;
-        sc_access[1].reg_addr = AS_RIGHT_HP_VOL_CTL;
-
-        if (value == UNMUTE) {
-                mute_val = 0x1F;
-                mute_val1 = 0x00;
-        } else {
-                mute_val = 0x00;
-                mute_val1 = 0x40;
-        }
-        sc_access[0].mask = sc_access[1].mask = MASK0|MASK1|MASK2|MASK3|MASK4;
-        sc_access[0].value = sc_access[1].value = (u8)mute_val;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-        if (retval)
-                return retval;
-        pr_debug("mute status = %d\n", snd_pmic_ops_mx.mute_status);
-        if (snd_pmic_ops_mx.mute_status == MUTE ||
-                                snd_pmic_ops_mx.master_mute == MUTE)
-                return retval;
-
-        sc_access[0].reg_addr = VOL_CTRL_LT;
-        sc_access[1].reg_addr = VOL_CTRL_RT;
-        sc_access[0].mask = sc_access[1].mask = MASK6;
-        sc_access[0].value = sc_access[1].value = mute_val1;
-        if (snd_pmic_ops_mx.num_channel == 1)
-                sc_access[1].value = 0x40;
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-}
-
-static int mx_power_up_pb(unsigned int port)
-{
-
-        int retval = 0;
-        struct sc_reg_access sc_access[3];
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        retval = mx_enable_audiodac(MUTE);
-        if (retval)
-                return retval;
-
-        msleep(10);
-
-        sc_access[0].reg_addr = AS_CONFIG;
-        sc_access[0].mask  = MASK7;
-        sc_access[0].value = 0x80;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        sc_access[0].reg_addr = ENABLE_OPDEV_CTRL;
-        sc_access[0].mask  = 0xff;
-        sc_access[0].value = 0x3C;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        sc_access[0].reg_addr = ENABLE_DEV_AND_USE_XTAL;
-        sc_access[0].mask  = 0x80;
-        sc_access[0].value = 0x80;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        return mx_enable_audiodac(UNMUTE);
-}
-
-static int mx_power_down_pb(unsigned int device)
-{
-        struct sc_reg_access sc_access[3];
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        retval = mx_enable_audiodac(MUTE);
-        if (retval)
-                return retval;
-
-        sc_access[0].reg_addr = ENABLE_OPDEV_CTRL;
-        sc_access[0].mask  = MASK3|MASK2;
-        sc_access[0].value = 0x00;
-
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        return mx_enable_audiodac(UNMUTE);
-}
-
-static int mx_power_up_cp(unsigned int port)
-{
-        int retval = 0;
-        struct sc_reg_access sc_access[] = {
-                {ENABLE_DEV_AND_USE_XTAL, 0x80, MASK7},
-                {ENABLE_OPDEV_CTRL, 0x3, 0x3},
-        };
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-}
-
-static int mx_power_down_cp(unsigned int device)
-{
-        struct sc_reg_access sc_access[] = {
-                {ENABLE_OPDEV_CTRL, 0x00, MASK1|MASK0},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-}
-
-static int mx_power_down(void)
-{
-        int retval = 0;
-        struct sc_reg_access sc_access[3];
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        retval = mx_enable_audiodac(MUTE);
-        if (retval)
-                return retval;
-
-        sc_access[0].reg_addr = AS_CONFIG;
-        sc_access[0].mask  = MASK7;
-        sc_access[0].value = 0x00;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        sc_access[0].reg_addr = ENABLE_DEV_AND_USE_XTAL;
-        sc_access[0].mask  = MASK7;
-        sc_access[0].value = 0x00;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        sc_access[0].reg_addr = ENABLE_OPDEV_CTRL;
-        sc_access[0].mask  = MASK3|MASK2;
-        sc_access[0].value = 0x00;
-        retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        if (retval)
-                return retval;
-
-        return mx_enable_audiodac(UNMUTE);
-}
-
-static int mx_set_pcm_voice_params(void)
-{
-        int retval = 0;
-        struct sc_reg_access sc_access[] = {
-                {0x200, 0x80, 0x00},
-                {0x201, 0xC0, 0x00},
-                {0x202, 0x00, 0x00},
-                {0x203, 0x00, 0x00},
-                {0x204, 0x0e, 0x00},
-                {0x205, 0x20, 0x00},
-                {0x206, 0x8f, 0x00},
-                {0x207, 0x21, 0x00},
-                {0x208, 0x18, 0x00},
-                {0x209, 0x32, 0x00},
-                {0x20a, 0x00, 0x00},
-                {0x20b, 0x5A, 0x00},
-                {0x20c, 0xBE, 0x00},/* 0x00 -> 0xBE Koski */
-                {0x20d, 0x00, 0x00}, /* DAI2 'off' */
-                {0x20e, 0x40, 0x00},
-                {0x20f, 0x00, 0x00},
-                {0x210, 0x84, 0x00},
-                {0x211, 0x33, 0x00}, /* Voice filter */
-                {0x212, 0x00, 0x00},
-                {0x213, 0x00, 0x00},
-                {0x214, 0x41, 0x00},
-                {0x215, 0x00, 0x00},
-                {0x216, 0x00, 0x00},
-                {0x217, 0x20, 0x00},
-                {0x218, 0x00, 0x00},
-                {0x219, 0x00, 0x00},
-                {0x21a, 0x40, 0x00},
-                {0x21b, 0x40, 0x00},
-                {0x21c, 0x09, 0x00},
-                {0x21d, 0x09, 0x00},
-                {0x21e, 0x00, 0x00},
-                {0x21f, 0x00, 0x00},
-                {0x220, 0x00, 0x00}, /* Microphone configurations */
-                {0x221, 0x00, 0x00}, /* Microphone configurations */
-                {0x222, 0x50, 0x00}, /* Microphone configurations */
-                {0x223, 0x21, 0x00}, /* Microphone configurations */
-                {0x224, 0x00, 0x00},
-                {0x225, 0x80, 0x00},
-                {0xf9, 0x40, 0x00},
-                {0xfa, 0x19, 0x00},
-                {0xfb, 0x19, 0x00},
-                {0xfc, 0x12, 0x00},
-                {0xfd, 0x12, 0x00},
-                {0xfe, 0x00, 0x00},
-        };
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        pr_debug("SST DBG:mx_set_pcm_voice_params called\n");
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, 44);
-}
-
-static int mx_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
-{
-        int retval = 0;
-
-        int config1 = 0, config2 = 0, filter = 0xB3;
-        struct sc_reg_access sc_access[5];
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        switch (sfreq) {
-        case 8000:
-                config1 = 0x10;
-                config2 = 0x00;
-                filter = 0x33;
-                break;
-        case 11025:
-                config1 = 0x16;
-                config2 = 0x0d;
-                break;
-        case 12000:
-                config1 = 0x18;
-                config2 = 0x00;
-                break;
-        case 16000:
-                config1 = 0x20;
-                config2 = 0x00;
-                break;
-        case 22050:
-                config1 = 0x2c;
-                config2 = 0x1a;
-                break;
-        case 24000:
-                config1 = 0x30;
-                config2 = 0x00;
-                break;
-        case 32000:
-                config1 = 0x40;
-                config2 = 0x00;
-                break;
-        case 44100:
-                config1 = 0x58;
-                config2 = 0x33;
-                break;
-        case 48000:
-                config1 = 0x60;
-                config2 = 0x00;
-                break;
-        }
-        snd_pmic_ops_mx.num_channel = num_channel;
-        /*mute the right channel if MONO*/
-        if (snd_pmic_ops_mx.num_channel == 1)   {
-                sc_access[0].reg_addr = VOL_CTRL_RT;
-                sc_access[0].value = 0x40;
-                sc_access[0].mask = MASK6;
-
-                sc_access[1].reg_addr = 0x224;
-                sc_access[1].value = 0x05;
-                sc_access[1].mask = MASK0|MASK1|MASK2;
-
-                retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-                if (retval)
-                        return retval;
-        } else {
-                sc_access[0].reg_addr = VOL_CTRL_RT;
-                sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK6;
-
-                sc_access[1].reg_addr = 0x224;
-                sc_access[1].value = 0x04;
-                sc_access[1].mask = MASK0|MASK1|MASK2;
-
-                retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-                if (retval)
-                        return retval;
-        }
-        sc_access[0].reg_addr = 0x206;
-        sc_access[0].value = config1;
-        sc_access[1].reg_addr = 0x207;
-        sc_access[1].value = config2;
-
-        if (word_size == 16) {
-                sc_access[2].value = 0x51;
-                sc_access[3].value = 0x31;
-        } else if (word_size == 24) {
-                sc_access[2].value = 0x52;
-                sc_access[3].value = 0x92;
-        }
-
-        sc_access[2].reg_addr = 0x209;
-        sc_access[3].reg_addr = 0x20e;
-
-        sc_access[4].reg_addr = 0x211;
-        sc_access[4].value = filter;
-
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, 5);
-}
-
-static int mx_set_selected_output_dev(u8 dev_id)
-{
-        struct sc_reg_access sc_access[2];
-        int num_reg = 0;
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-        pr_debug("mx_set_selected_output_dev dev_id:0x%x\n", dev_id);
-        snd_pmic_ops_mx.output_dev_id = dev_id;
-        switch (dev_id) {
-        case STEREO_HEADPHONE:
-                sc_access[0].reg_addr = 0xFF;
-                sc_access[0].value = 0x8C;
-                sc_access[0].mask =
-                        MASK2|MASK3|MASK5|MASK6|MASK4;
-
-                num_reg = 1;
-                break;
-        case MONO_EARPIECE:
-        case INTERNAL_SPKR:
-                sc_access[0].reg_addr = 0xFF;
-                sc_access[0].value = 0xb0;
-                sc_access[0].mask =  MASK2|MASK3|MASK5|MASK6|MASK4;
-
-                num_reg = 1;
-                break;
-        case RECEIVER:
-                pr_debug("RECEIVER Koski selected\n");
-
-                /* configuration - AS enable, receiver enable */
-                sc_access[0].reg_addr = 0xFF;
-                sc_access[0].value = 0x81;
-                sc_access[0].mask = 0xff;
-
-                num_reg = 1;
-                break;
-        default:
-                pr_err("Not a valid output dev\n");
-                return 0;
-        }
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, num_reg);
-}
-
-
-static int mx_set_voice_port(int status)
-{
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        if (status == ACTIVATE)
-                retval = mx_set_pcm_voice_params();
-
-        return retval;
-}
-
-static int mx_set_audio_port(int status)
-{
-        return 0;
-}
-
-static int mx_set_selected_input_dev(u8 dev_id)
-{
-        struct sc_reg_access sc_access[2];
-        int num_reg = 0;
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        snd_pmic_ops_mx.input_dev_id = dev_id;
-        pr_debug("mx_set_selected_input_dev dev_id:0x%x\n", dev_id);
-
-        switch (dev_id) {
-        case AMIC:
-                sc_access[0].reg_addr = 0x223;
-                sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK7|MASK6|MASK5|MASK4|MASK0;
-                sc_access[1].reg_addr = 0x222;
-                sc_access[1].value = 0x50;
-                sc_access[1].mask = MASK7|MASK6|MASK5|MASK4;
-                num_reg = 2;
-                break;
-
-        case HS_MIC:
-                sc_access[0].reg_addr = 0x223;
-                sc_access[0].value = 0x20;
-                sc_access[0].mask = MASK7|MASK6|MASK5|MASK4|MASK0;
-                sc_access[1].reg_addr = 0x222;
-                sc_access[1].value = 0x51;
-                sc_access[1].mask = MASK7|MASK6|MASK5|MASK4;
-                num_reg = 2;
-                break;
-        case DMIC:
-                sc_access[1].reg_addr = 0x222;
-                sc_access[1].value = 0x00;
-                sc_access[1].mask = MASK7|MASK6|MASK5|MASK4|MASK0;
-                sc_access[0].reg_addr = 0x223;
-                sc_access[0].value = 0x20;
-                sc_access[0].mask = MASK7|MASK6|MASK5|MASK4|MASK0;
-                num_reg = 2;
-                break;
-        }
-        return sst_sc_reg_access(sc_access, PMIC_WRITE, num_reg);
-}
-
-static int mx_set_mute(int dev_id, u8 value)
-{
-        struct sc_reg_access sc_access[5];
-        int num_reg = 0;
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-
-
-        pr_debug("set_mute dev_id:0x%x , value:%d\n", dev_id, value);
-
-        switch (dev_id) {
-        case PMIC_SND_DMIC_MUTE:
-        case PMIC_SND_AMIC_MUTE:
-        case PMIC_SND_HP_MIC_MUTE:
-                sc_access[0].reg_addr = 0x220;
-                sc_access[1].reg_addr = 0x221;
-                sc_access[2].reg_addr = 0x223;
-                if (value == MUTE) {
-                        sc_access[0].value = 0x00;
-                        sc_access[1].value = 0x00;
-                        if (snd_pmic_ops_mx.input_dev_id == DMIC)
-                                sc_access[2].value = 0x00;
-                        else
-                                sc_access[2].value = 0x20;
-                } else {
-                        sc_access[0].value = 0x20;
-                        sc_access[1].value = 0x20;
-                        if (snd_pmic_ops_mx.input_dev_id == DMIC)
-                                sc_access[2].value = 0x20;
-                        else
-                                sc_access[2].value = 0x00;
-                }
-                sc_access[0].mask = MASK5|MASK6;
-                sc_access[1].mask = MASK5|MASK6;
-                sc_access[2].mask = MASK5|MASK6;
-                num_reg = 3;
-                break;
-        case PMIC_SND_LEFT_SPEAKER_MUTE:
-        case PMIC_SND_LEFT_HP_MUTE:
-                sc_access[0].reg_addr = VOL_CTRL_LT;
-                if (value == MUTE)
-                        sc_access[0].value = 0x40;
-                else
-                        sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK6;
-                num_reg = 1;
-                snd_pmic_ops_mx.mute_status = value;
-                break;
-        case PMIC_SND_RIGHT_SPEAKER_MUTE:
-        case PMIC_SND_RIGHT_HP_MUTE:
-                sc_access[0].reg_addr = VOL_CTRL_RT;
-                if (snd_pmic_ops_mx.num_channel == 1)
-                        value = MUTE;
-                if (value == MUTE)
-                        sc_access[0].value = 0x40;
-                else
-                        sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK6;
-                num_reg = 1;
-                snd_pmic_ops_mx.mute_status = value;
-                break;
-        case PMIC_SND_MUTE_ALL:
-                sc_access[0].reg_addr = VOL_CTRL_RT;
-                sc_access[1].reg_addr = VOL_CTRL_LT;
-                sc_access[2].reg_addr = 0x220;
-                sc_access[3].reg_addr = 0x221;
-                sc_access[4].reg_addr = 0x223;
-                snd_pmic_ops_mx.master_mute = value;
-                if (value == MUTE) {
-                        sc_access[0].value = sc_access[1].value = 0x40;
-                        sc_access[2].value = 0x00;
-                        sc_access[3].value = 0x00;
-                        if (snd_pmic_ops_mx.input_dev_id == DMIC)
-                                sc_access[4].value = 0x00;
-                        else
-                                sc_access[4].value = 0x20;
-
-                } else {
-                        sc_access[0].value = sc_access[1].value = 0x00;
-                        sc_access[2].value = sc_access[3].value = 0x20;
-                                sc_access[4].value = 0x20;
-                        if (snd_pmic_ops_mx.input_dev_id == DMIC)
-                                sc_access[4].value = 0x20;
-                        else
-                                sc_access[4].value = 0x00;
-
-
-                }
-                if (snd_pmic_ops_mx.num_channel == 1)
-                        sc_access[0].value = 0x40;
-                sc_access[0].mask = sc_access[1].mask = MASK6;
-                sc_access[2].mask = MASK5|MASK6;
-                sc_access[3].mask = MASK5|MASK6|MASK2|MASK4;
-                sc_access[4].mask = MASK5|MASK6|MASK4;
-
-                num_reg = 5;
-                break;
-        case PMIC_SND_RECEIVER_MUTE:
-                sc_access[0].reg_addr =  VOL_CTRL_RT;
-                if (value == MUTE)
-                        sc_access[0].value = 0x40;
-                else
-                        sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK6;
-                num_reg = 1;
-                break;
-        }
-
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, num_reg);
-}
-
-static int mx_set_vol(int dev_id, int value)
-{
-        struct sc_reg_access sc_access[2] = {{0},};
-        int num_reg = 0;
-        int retval = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        pr_debug("set_vol dev_id:0x%x ,value:%d\n", dev_id, value);
-        switch (dev_id) {
-        case PMIC_SND_RECEIVER_VOL:
-                return 0;
-                break;
-        case PMIC_SND_CAPTURE_VOL:
-                sc_access[0].reg_addr = 0x220;
-                sc_access[1].reg_addr = 0x221;
-                sc_access[0].value = sc_access[1].value = -value;
-                sc_access[0].mask = sc_access[1].mask =
-                        (MASK0|MASK1|MASK2|MASK3|MASK4);
-                num_reg = 2;
-                break;
-        case PMIC_SND_LEFT_PB_VOL:
-                sc_access[0].value = -value;
-                sc_access[0].reg_addr = VOL_CTRL_LT;
-                sc_access[0].mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                num_reg = 1;
-                break;
-        case PMIC_SND_RIGHT_PB_VOL:
-                sc_access[0].value = -value;
-                sc_access[0].reg_addr = VOL_CTRL_RT;
-                sc_access[0].mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                if (snd_pmic_ops_mx.num_channel == 1) {
-                        sc_access[0].value = 0x40;
-                        sc_access[0].mask = MASK6;
-                        sc_access[0].reg_addr = VOL_CTRL_RT;
-                }
-                num_reg = 1;
-                break;
-        }
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, num_reg);
-}
-
-static int mx_get_mute(int dev_id, u8 *value)
-{
-        struct sc_reg_access sc_access[4] = {{0},};
-        int retval = 0, num_reg = 0, mask = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        switch (dev_id) {
-        case PMIC_SND_DMIC_MUTE:
-        case PMIC_SND_AMIC_MUTE:
-        case PMIC_SND_HP_MIC_MUTE:
-                sc_access[0].reg_addr = 0x220;
-                mask = MASK5|MASK6;
-                num_reg = 1;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ, num_reg);
-                if (retval)
-                        return retval;
-                *value = sc_access[0].value & mask;
-                if (*value)
-                        *value = UNMUTE;
-                else
-                        *value = MUTE;
-                return retval;
-        case PMIC_SND_LEFT_HP_MUTE:
-        case PMIC_SND_LEFT_SPEAKER_MUTE:
-                sc_access[0].reg_addr = VOL_CTRL_LT;
-                num_reg = 1;
-                mask = MASK6;
-                break;
-        case PMIC_SND_RIGHT_HP_MUTE:
-        case PMIC_SND_RIGHT_SPEAKER_MUTE:
-                sc_access[0].reg_addr = VOL_CTRL_RT;
-                num_reg = 1;
-                mask = MASK6;
-                break;
-        }
-        retval = sst_sc_reg_access(sc_access, PMIC_READ, num_reg);
-        if (retval)
-                return retval;
-        *value = sc_access[0].value & mask;
-        if (*value)
-                *value = MUTE;
-        else
-                *value = UNMUTE;
-        return retval;
-}
-
-static int mx_get_vol(int dev_id, int *value)
-{
-        struct sc_reg_access sc_access = {0,};
-        int retval = 0, mask = 0, num_reg = 0;
-
-        if (snd_pmic_ops_mx.card_status == SND_CARD_UN_INIT) {
-                retval = mx_init_card();
-                if (retval)
-                        return retval;
-        }
-        switch (dev_id) {
-        case PMIC_SND_CAPTURE_VOL:
-                sc_access.reg_addr = 0x220;
-                mask = MASK0|MASK1|MASK2|MASK3|MASK4;
-                num_reg = 1;
-                break;
-        case PMIC_SND_LEFT_PB_VOL:
-                sc_access.reg_addr = VOL_CTRL_LT;
-                mask = MASK0|MASK1|MASK2|MASK3|MASK4|MASK5;
-                num_reg = 1;
-                break;
-        case PMIC_SND_RIGHT_PB_VOL:
-                sc_access.reg_addr = VOL_CTRL_RT;
-                mask = MASK0|MASK1|MASK2|MASK3|MASK4|MASK5;
-                num_reg = 1;
-                break;
-        }
-        retval = sst_sc_reg_access(&sc_access, PMIC_READ, num_reg);
-        if (retval)
-                return retval;
-        *value = -(sc_access.value & mask);
-        pr_debug("get volume value extracted %d\n", *value);
-        return retval;
-}
-
-static u8 mx_get_jack_status(void)
-{
-        struct sc_reg_access sc_access_read = {0,};
-
-        sc_access_read.reg_addr = 0x201;
-        sst_sc_reg_access(&sc_access_read, PMIC_READ, 1);
-        pr_debug("value returned = 0x%x\n", sc_access_read.value);
-        return sc_access_read.value;
-}
-
-static void mx_pmic_irq_enable(void *data)
-{
-        struct snd_intelmad *intelmaddata = data;
-
-        intelmaddata->jack_prev_state = 0xc0;
-        return;
-}
-
-static void mx_pmic_irq_cb(void *cb_data, u8 intsts)
-{
-        u8 jack_cur_status, jack_prev_state = 0;
-        struct mad_jack *mjack = NULL;
-        unsigned int present = 0, jack_event_flag = 0, buttonpressflag = 0;
-        time_t  timediff;
-        struct snd_intelmad *intelmaddata = cb_data;
-
-        mjack = &intelmaddata->jack[0];
-        if (intsts & 0x2) {
-                jack_cur_status = mx_get_jack_status();
-                jack_prev_state = intelmaddata->jack_prev_state;
-                if ((jack_prev_state == 0xc0) && (jack_cur_status == 0x40)) {
-                        /*headset insert detected. */
-                        pr_debug("MAD headset inserted\n");
-                        present = 1;
-                        jack_event_flag = 1;
-                        mjack->jack_status = 1;
-                        mjack->jack.type = SND_JACK_HEADSET;
-                }
-
-                if ((jack_prev_state == 0xc0) && (jack_cur_status == 0x00)) {
-                        /* headphone insert detected. */
-                        pr_debug("MAD headphone inserted\n");
-                        present = 1;
-                        jack_event_flag = 1;
-                        mjack->jack.type = SND_JACK_HEADPHONE;
-                }
-
-                if ((jack_prev_state == 0x40) && (jack_cur_status == 0xc0)) {
-                        /* headset remove detected. */
-                        pr_debug("MAD headset removed\n");
-
-                        present = 0;
-                        jack_event_flag = 1;
-                        mjack->jack_status = 0;
-                        mjack->jack.type = SND_JACK_HEADSET;
-                }
-
-                if ((jack_prev_state == 0x00) && (jack_cur_status == 0xc0)) {
-                        /* headphone remove detected. */
-                        pr_debug("MAD headphone removed\n");
-                        present = 0;
-                        jack_event_flag = 1;
-                        mjack->jack.type = SND_JACK_HEADPHONE;
-                }
-
-                if ((jack_prev_state == 0x40) && (jack_cur_status == 0x00)) {
-                        /* button pressed */
-                        do_gettimeofday(&mjack->buttonpressed);
-                        pr_debug("MAD button press detected\n");
-                }
-
-                if ((jack_prev_state == 0x00) && (jack_cur_status == 0x40)) {
-                        if (mjack->jack_status) {
-                                /*button pressed */
-                                do_gettimeofday(
-                                        &mjack->buttonreleased);
-                                /*button pressed */
-                                pr_debug("MAD Button Released detected\n");
-                                timediff = mjack->buttonreleased.tv_sec -
-                                        mjack->buttonpressed.tv_sec;
-                                buttonpressflag = 1;
-
-                                if (timediff > 1) {
-                                        pr_debug("MAD long press dtd\n");
-                                        /* send headphone detect/undetect */
-                                        present = 1;
-                                        jack_event_flag = 1;
-                                        mjack->jack.type =
-                                                        MID_JACK_HS_LONG_PRESS;
-                                } else {
-                                        pr_debug("MAD short press dtd\n");
-                                        /* send headphone detect/undetect */
-                                        present = 1;
-                                        jack_event_flag = 1;
-                                        mjack->jack.type =
-                                                MID_JACK_HS_SHORT_PRESS;
-                                }
-                        } else {
-                                /***workaround for maxim
-                                hw issue,0x00 t 0x40 is not
-                                a valid transiton for Headset insertion */
-                                /*headset insert detected. */
-                                pr_debug("MAD headset inserted\n");
-                                present = 1;
-                                jack_event_flag = 1;
-                                mjack->jack_status = 1;
-                                mjack->jack.type = SND_JACK_HEADSET;
-                        }
-                }
-                intelmaddata->jack_prev_state  = jack_cur_status;
-                pr_debug("mx_pmic_irq_cb prv_state= 0x%x\n",
-                                        intelmaddata->jack_prev_state);
-        }
-
-        if (jack_event_flag)
-                sst_mad_send_jack_report(&mjack->jack,
-                                                buttonpressflag, present);
-}
-static int mx_jack_enable(void)
-{
-        return 0;
-}
-
-struct snd_pmic_ops snd_pmic_ops_mx = {
-        .set_input_dev = mx_set_selected_input_dev,
-        .set_output_dev = mx_set_selected_output_dev,
-        .set_mute = mx_set_mute,
-        .get_mute = mx_get_mute,
-        .set_vol = mx_set_vol,
-        .get_vol = mx_get_vol,
-        .init_card = mx_init_card,
-        .set_pcm_audio_params = mx_set_pcm_audio_params,
-        .set_pcm_voice_params = mx_set_pcm_voice_params,
-        .set_voice_port = mx_set_voice_port,
-        .set_audio_port = mx_set_audio_port,
-        .power_up_pmic_pb =     mx_power_up_pb,
-        .power_up_pmic_cp =     mx_power_up_cp,
-        .power_down_pmic_pb =   mx_power_down_pb,
-        .power_down_pmic_cp =   mx_power_down_cp,
-        .power_down_pmic =      mx_power_down,
-        .pmic_irq_cb     =      mx_pmic_irq_cb,
-        .pmic_irq_enable =      mx_pmic_irq_enable,
-        .pmic_jack_enable =     mx_jack_enable,
-};
-
diff --git a/drivers/staging/intel_sst/intelmid_v2_control.c b/drivers/staging/intel_sst/intelmid_v2_control.c
deleted file mode 100644
index 46ab55eb8097..000000000000
--- a/drivers/staging/intel_sst/intelmid_v2_control.c
+++ /dev/null
@@ -1,1156 +0,0 @@
-/*
- *  intelmid_v2_control.c - Intel Sound card driver for MID
- *
- *  Copyright (C) 2008-10 Intel Corp
- *  Authors:    Vinod Koul <vinod.koul@intel.com>
- *              Harsha Priya <priya.harsha@intel.com>
- *              KP Jeeja <jeeja.kp@intel.com>
- *              Dharageswari R <dharageswari.r@intel.com>
- *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  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; version 2 of the License.
- *
- *  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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This file contains the control operations of vendor 3
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/gpio.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/file.h>
-#include <sound/control.h>
-#include "intel_sst.h"
-#include "intelmid_snd_control.h"
-#include "intelmid.h"
-
-enum reg_v3 {
-        VAUDIOCNT = 0x51,
-        VOICEPORT1 = 0x100,
-        VOICEPORT2 = 0x101,
-        AUDIOPORT1 = 0x102,
-        AUDIOPORT2 = 0x103,
-        ADCSAMPLERATE = 0x104,
-        DMICCTRL1 = 0x105,
-        DMICCTRL2 = 0x106,
-        MICCTRL = 0x107,
-        MICSELVOL = 0x108,
-        LILSEL = 0x109,
-        LIRSEL = 0x10a,
-        VOICEVOL = 0x10b,
-        AUDIOLVOL = 0x10c,
-        AUDIORVOL = 0x10d,
-        LMUTE = 0x10e,
-        RMUTE = 0x10f,
-        POWERCTRL1 = 0x110,
-        POWERCTRL2 = 0x111,
-        DRVPOWERCTRL = 0x112,
-        VREFPLL = 0x113,
-        PCMBUFCTRL = 0x114,
-        SOFTMUTE = 0x115,
-        DTMFPATH = 0x116,
-        DTMFVOL = 0x117,
-        DTMFFREQ = 0x118,
-        DTMFHFREQ = 0x119,
-        DTMFLFREQ = 0x11a,
-        DTMFCTRL = 0x11b,
-        DTMFASON = 0x11c,
-        DTMFASOFF = 0x11d,
-        DTMFASINUM = 0x11e,
-        CLASSDVOL = 0x11f,
-        VOICEDACAVOL = 0x120,
-        AUDDACAVOL = 0x121,
-        LOMUTEVOL = 0x122,
-        HPLVOL = 0x123,
-        HPRVOL = 0x124,
-        MONOVOL = 0x125,
-        LINEOUTMIXVOL = 0x126,
-        EPMIXVOL = 0x127,
-        LINEOUTLSEL = 0x128,
-        LINEOUTRSEL = 0x129,
-        EPMIXOUTSEL = 0x12a,
-        HPLMIXSEL = 0x12b,
-        HPRMIXSEL = 0x12c,
-        LOANTIPOP = 0x12d,
-        AUXDBNC = 0x12f,
-};
-
-static void nc_set_amp_power(int power)
-{
-        if (snd_pmic_ops_nc.gpio_amp)
-                gpio_set_value(snd_pmic_ops_nc.gpio_amp, power);
-}
-
-/****
- * nc_init_card - initialize the sound card
- *
- * This initializes the audio paths to know values in case of this sound card
- */
-static int nc_init_card(void)
-{
-        struct sc_reg_access sc_access[] = {
-                {VAUDIOCNT, 0x25, 0},
-                {VOICEPORT1, 0x00, 0},
-                {VOICEPORT2, 0x00, 0},
-                {AUDIOPORT1, 0x98, 0},
-                {AUDIOPORT2, 0x09, 0},
-                {AUDIOLVOL, 0x00, 0},
-                {AUDIORVOL, 0x00, 0},
-                {LMUTE, 0x03, 0},
-                {RMUTE, 0x03, 0},
-                {POWERCTRL1, 0x00, 0},
-                {POWERCTRL2, 0x00, 0},
-                {DRVPOWERCTRL, 0x00, 0},
-                {VREFPLL, 0x10, 0},
-                {HPLMIXSEL, 0xee, 0},
-                {HPRMIXSEL, 0xf6, 0},
-                {PCMBUFCTRL, 0x0, 0},
-                {VOICEVOL, 0x0e, 0},
-                {HPLVOL, 0x06, 0},
-                {HPRVOL, 0x06, 0},
-                {MICCTRL, 0x51, 0x00},
-                {ADCSAMPLERATE, 0x8B, 0x00},
-                {MICSELVOL, 0x5B, 0x00},
-                {LILSEL, 0x06, 0},
-                {LIRSEL, 0x46, 0},
-                {LOANTIPOP, 0x00, 0},
-                {DMICCTRL1, 0x40, 0},
-                {AUXDBNC, 0xff, 0},
-        };
-        snd_pmic_ops_nc.card_status = SND_CARD_INIT_DONE;
-        snd_pmic_ops_nc.master_mute = UNMUTE;
-        snd_pmic_ops_nc.mute_status = UNMUTE;
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 27);
-        mutex_init(&snd_pmic_ops_nc.lock);
-        pr_debug("init complete!!\n");
-        return 0;
-}
-
-static int nc_enable_audiodac(int value)
-{
-        struct sc_reg_access sc_access[3];
-        int mute_val = 0;
-
-        if (snd_pmic_ops_nc.mute_status == MUTE)
-                return 0;
-
-        if (((snd_pmic_ops_nc.output_dev_id == MONO_EARPIECE) ||
-                (snd_pmic_ops_nc.output_dev_id == INTERNAL_SPKR)) &&
-                (value == UNMUTE))
-                return 0;
-        if (value == UNMUTE) {
-                        /* unmute the system, set the 7th bit to zero */
-                        mute_val = 0x00;
-                } else {
-                        /* MUTE:Set the seventh bit */
-                        mute_val = 0x04;
-
-                }
-                sc_access[0].reg_addr = LMUTE;
-                sc_access[1].reg_addr = RMUTE;
-                sc_access[0].mask = sc_access[1].mask = MASK2;
-                sc_access[0].value = sc_access[1].value = mute_val;
-
-                if (snd_pmic_ops_nc.num_channel == 1)
-                        sc_access[1].value = 0x04;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-}
-
-static int nc_power_up_pb(unsigned int port)
-{
-        struct sc_reg_access sc_access[7];
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-        if (port == 0xFF)
-                return 0;
-        mutex_lock(&snd_pmic_ops_nc.lock);
-        nc_enable_audiodac(MUTE);
-        msleep(30);
-
-        pr_debug("powering up pb....\n");
-
-        sc_access[0].reg_addr = VAUDIOCNT;
-        sc_access[0].value = 0x27;
-        sc_access[0].mask = 0x27;
-        sc_access[1].reg_addr = VREFPLL;
-        if (port == 0) {
-                sc_access[1].value = 0x3A;
-                sc_access[1].mask = 0x3A;
-        } else if (port == 1) {
-                sc_access[1].value = 0x35;
-                sc_access[1].mask = 0x35;
-        }
-        retval =  sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-
-
-        sc_access[0].reg_addr = POWERCTRL1;
-        if (port == 0) {
-                sc_access[0].value = 0x40;
-                sc_access[0].mask = 0x40;
-        } else if (port == 1) {
-                sc_access[0].value = 0x01;
-                sc_access[0].mask = 0x01;
-        }
-        sc_access[1].reg_addr = POWERCTRL2;
-        sc_access[1].value = 0x0C;
-        sc_access[1].mask = 0x0C;
-
-        sc_access[2].reg_addr = DRVPOWERCTRL;
-        sc_access[2].value = 0x86;
-        sc_access[2].mask = 0x86;
-
-        sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 3);
-
-        msleep(30);
-
-        snd_pmic_ops_nc.pb_on = 1;
-
-        /*
-         * There is a mismatch between Playback Sources and the enumerated
-         * values of output sources.  This mismatch causes ALSA upper to send
-         * Item 1 for Internal Speaker, but the expected enumeration is 2!  For
-         * now, treat MONO_EARPIECE and INTERNAL_SPKR identically and power up
-         * the needed resources
-         */
-        if (snd_pmic_ops_nc.output_dev_id == MONO_EARPIECE ||
-            snd_pmic_ops_nc.output_dev_id == INTERNAL_SPKR)
-                nc_set_amp_power(1);
-        nc_enable_audiodac(UNMUTE);
-        mutex_unlock(&snd_pmic_ops_nc.lock);
-        return 0;
-}
-
-static int nc_power_up_cp(unsigned int port)
-{
-        struct sc_reg_access sc_access[5];
-        int retval = 0;
-
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-
-        pr_debug("powering up cp....\n");
-
-        if (port == 0xFF)
-                return 0;
-        sc_access[0].reg_addr = VAUDIOCNT;
-        sc_access[0].value = 0x27;
-        sc_access[0].mask = 0x27;
-        sc_access[1].reg_addr = VREFPLL;
-        if (port == 0) {
-                sc_access[1].value = 0x3E;
-                sc_access[1].mask = 0x3E;
-        } else if (port == 1) {
-                sc_access[1].value = 0x35;
-                sc_access[1].mask = 0x35;
-        }
-
-        retval =  sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-
-        sc_access[0].reg_addr = POWERCTRL1;
-        if (port == 0) {
-                sc_access[0].value = 0xB4;
-                sc_access[0].mask = 0xB4;
-        } else if (port == 1) {
-                sc_access[0].value = 0xBF;
-                sc_access[0].mask = 0xBF;
-        }
-        sc_access[1].reg_addr = POWERCTRL2;
-        if (port == 0) {
-                sc_access[1].value = 0x0C;
-                sc_access[1].mask = 0x0C;
-        } else if (port == 1) {
-                sc_access[1].value = 0x02;
-                sc_access[1].mask = 0x02;
-        }
-
-        return  sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-}
-
-static int nc_power_down(void)
-{
-        int retval = 0;
-        struct sc_reg_access sc_access[5];
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-        nc_enable_audiodac(MUTE);
-
-
-        pr_debug("powering dn nc_power_down ....\n");
-
-        if (snd_pmic_ops_nc.output_dev_id == MONO_EARPIECE ||
-            snd_pmic_ops_nc.output_dev_id == INTERNAL_SPKR)
-                nc_set_amp_power(0);
-
-        msleep(30);
-
-        sc_access[0].reg_addr = DRVPOWERCTRL;
-        sc_access[0].value = 0x00;
-        sc_access[0].mask = 0x00;
-
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 1);
-
-        sc_access[0].reg_addr = POWERCTRL1;
-        sc_access[0].value = 0x00;
-        sc_access[0].mask = 0x00;
-
-        sc_access[1].reg_addr = POWERCTRL2;
-        sc_access[1].value = 0x00;
-        sc_access[1].mask = 0x00;
-
-
-
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 2);
-
-        msleep(30);
-        sc_access[0].reg_addr = VREFPLL;
-        sc_access[0].value = 0x10;
-        sc_access[0].mask = 0x10;
-
-        sc_access[1].reg_addr = VAUDIOCNT;
-        sc_access[1].value = 0x25;
-        sc_access[1].mask = 0x25;
-
-
-        retval =  sst_sc_reg_access(sc_access, PMIC_WRITE, 2);
-
-        msleep(30);
-        return nc_enable_audiodac(UNMUTE);
-}
-
-static int nc_power_down_pb(unsigned int device)
-{
-
-        int retval = 0;
-        struct sc_reg_access sc_access[5];
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        pr_debug("powering dn pb....\n");
-        mutex_lock(&snd_pmic_ops_nc.lock);
-        nc_enable_audiodac(MUTE);
-
-
-        msleep(30);
-
-
-        sc_access[0].reg_addr = DRVPOWERCTRL;
-        sc_access[0].value = 0x00;
-        sc_access[0].mask = 0x00;
-
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 1);
-
-        msleep(30);
-
-        sc_access[0].reg_addr = POWERCTRL1;
-        sc_access[0].value = 0x00;
-        sc_access[0].mask = 0x41;
-
-        sc_access[1].reg_addr = POWERCTRL2;
-        sc_access[1].value = 0x00;
-        sc_access[1].mask = 0x0C;
-
-        sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2);
-
-        msleep(30);
-
-        snd_pmic_ops_nc.pb_on = 0;
-
-        nc_enable_audiodac(UNMUTE);
-        mutex_unlock(&snd_pmic_ops_nc.lock);
-        return 0;
-}
-
-static int nc_power_down_cp(unsigned int device)
-{
-        struct sc_reg_access sc_access[] = {
-                {POWERCTRL1, 0x00, 0xBE},
-                {POWERCTRL2, 0x00, 0x02},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        pr_debug("powering dn cp....\n");
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-}
-
-static int nc_set_pcm_voice_params(void)
-{
-        struct sc_reg_access sc_access[] = {
-                        {0x100, 0xD5, 0},
-                        {0x101, 0x08, 0},
-                        {0x104, 0x03, 0},
-                        {0x107, 0x10, 0},
-                        {0x10B, 0x0E, 0},
-                        {0x10E, 0x03, 0},
-                        {0x10F, 0x03, 0},
-                        {0x114, 0x13, 0},
-                        {0x115, 0x00, 0},
-                        {0x128, 0xFE, 0},
-                        {0x129, 0xFE, 0},
-                        {0x12A, 0xFE, 0},
-                        {0x12B, 0xDE, 0},
-                        {0x12C, 0xDE, 0},
-        };
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 14);
-        pr_debug("Voice parameters set successfully!!\n");
-        return 0;
-}
-
-
-static int nc_set_pcm_audio_params(int sfreq, int word_size, int num_channel)
-{
-        int config2 = 0;
-        struct sc_reg_access sc_access;
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        switch (sfreq) {
-        case 8000:
-                config2 = 0x00;
-                break;
-        case 11025:
-                config2 = 0x01;
-                break;
-        case 12000:
-                config2 = 0x02;
-                break;
-        case 16000:
-                config2 = 0x03;
-                break;
-        case 22050:
-                config2 = 0x04;
-                break;
-        case 24000:
-                config2 = 0x05;
-                break;
-        case 32000:
-                config2 = 0x07;
-                break;
-        case 44100:
-                config2 = 0x08;
-                break;
-        case 48000:
-                config2 = 0x09;
-                break;
-        }
-
-        snd_pmic_ops_nc.num_channel = num_channel;
-        if (snd_pmic_ops_nc.num_channel == 1)   {
-
-                sc_access.value = 0x07;
-                sc_access.reg_addr = RMUTE;
-                pr_debug("RIGHT_HP_MUTE value%d\n", sc_access.value);
-                sc_access.mask = MASK2;
-                sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
-        } else {
-                sc_access.value = 0x00;
-                sc_access.reg_addr = RMUTE;
-                pr_debug("RIGHT_HP_MUTE value %d\n", sc_access.value);
-                sc_access.mask = MASK2;
-                sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
-
-
-        }
-
-        pr_debug("word_size = %d\n", word_size);
-
-        if (word_size == 24) {
-                sc_access.reg_addr = AUDIOPORT2;
-                sc_access.value = config2 | 0x10;
-                sc_access.mask = 0x1F;
-        } else {
-                sc_access.value = config2;
-                sc_access.mask = 0x1F;
-                sc_access.reg_addr = AUDIOPORT2;
-        }
-        sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
-
-        pr_debug("word_size = %d\n", word_size);
-        sc_access.reg_addr = AUDIOPORT1;
-        sc_access.mask = MASK5|MASK4|MASK1|MASK0;
-        if (word_size == 16)
-                sc_access.value = 0x98;
-        else if (word_size == 24)
-                sc_access.value = 0xAB;
-
-        return sst_sc_reg_access(&sc_access, PMIC_READ_MODIFY, 1);
-
-
-
-}
-
-static int nc_set_selected_output_dev(u8 value)
-{
-        struct sc_reg_access sc_access_HP[] = {
-                {LMUTE, 0x02, 0x06},
-                {RMUTE, 0x02, 0x06},
-                {DRVPOWERCTRL, 0x06, 0x06},
-        };
-        struct sc_reg_access sc_access_IS[] = {
-                {LMUTE, 0x04, 0x06},
-                {RMUTE, 0x04, 0x06},
-                {DRVPOWERCTRL, 0x00, 0x06},
-        };
-        int retval = 0;
-
-        snd_pmic_ops_nc.output_dev_id = value;
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-        pr_debug("nc set selected output:%d\n", value);
-        mutex_lock(&snd_pmic_ops_nc.lock);
-        switch (value) {
-        case STEREO_HEADPHONE:
-                if (snd_pmic_ops_nc.pb_on)
-                        sst_sc_reg_access(sc_access_HP+2, PMIC_WRITE, 1);
-                retval = sst_sc_reg_access(sc_access_HP, PMIC_WRITE, 2);
-                nc_set_amp_power(0);
-                break;
-        case MONO_EARPIECE:
-        case INTERNAL_SPKR:
-                retval = sst_sc_reg_access(sc_access_IS, PMIC_WRITE, 3);
-                if (snd_pmic_ops_nc.pb_on)
-                        nc_set_amp_power(1);
-                break;
-        default:
-                pr_err("rcvd illegal request: %d\n", value);
-                mutex_unlock(&snd_pmic_ops_nc.lock);
-                return -EINVAL;
-        }
-        mutex_unlock(&snd_pmic_ops_nc.lock);
-        return retval;
-}
-
-static int nc_audio_init(void)
-{
-        struct sc_reg_access sc_acces, sc_access[] = {
-                        {0x100, 0x00, 0},
-                        {0x101, 0x00, 0},
-                        {0x104, 0x8B, 0},
-                        {0x107, 0x11, 0},
-                        {0x10B, 0x0E, 0},
-                        {0x114, 0x00, 0},
-                        {0x115, 0x00, 0},
-                        {0x128, 0x00, 0},
-                        {0x129, 0x00, 0},
-                        {0x12A, 0x00, 0},
-                        {0x12B, 0xee, 0},
-                        {0x12C, 0xf6, 0},
-        };
-
-        sst_sc_reg_access(sc_access, PMIC_WRITE, 12);
-        pr_debug("Audio Init successfully!!\n");
-
-        /*set output device */
-        nc_set_selected_output_dev(snd_pmic_ops_nc.output_dev_id);
-
-        if (snd_pmic_ops_nc.num_channel == 1) {
-                sc_acces.value = 0x07;
-                sc_acces.reg_addr = RMUTE;
-                pr_debug("RIGHT_HP_MUTE value%d\n", sc_acces.value);
-                sc_acces.mask = MASK2;
-                sst_sc_reg_access(&sc_acces, PMIC_READ_MODIFY, 1);
-        } else {
-                sc_acces.value = 0x00;
-                sc_acces.reg_addr = RMUTE;
-                pr_debug("RIGHT_HP_MUTE value%d\n", sc_acces.value);
-                sc_acces.mask = MASK2;
-                sst_sc_reg_access(&sc_acces, PMIC_READ_MODIFY, 1);
-        }
-
-        return 0;
-}
-
-static int nc_set_audio_port(int status)
-{
-        struct sc_reg_access sc_access[2] = {{0,},};
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        if (status == DEACTIVATE) {
-                /* Deactivate audio port-tristate and power */
-                sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK4|MASK5;
-                sc_access[0].reg_addr = AUDIOPORT1;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        } else if (status == ACTIVATE) {
-                /* activate audio port */
-                nc_audio_init();
-                sc_access[0].value = 0x10;
-                sc_access[0].mask =  MASK4|MASK5 ;
-                sc_access[0].reg_addr = AUDIOPORT1;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        } else
-                return -EINVAL;
-
-}
-
-static int nc_set_voice_port(int status)
-{
-        struct sc_reg_access sc_access[2] = {{0,},};
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        if (status == DEACTIVATE) {
-                /* Activate Voice port */
-                sc_access[0].value = 0x00;
-                sc_access[0].mask = MASK4;
-                sc_access[0].reg_addr = VOICEPORT1;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        } else if (status == ACTIVATE) {
-                /* Deactivate voice port */
-                nc_set_pcm_voice_params();
-                sc_access[0].value = 0x10;
-                sc_access[0].mask = MASK4;
-                sc_access[0].reg_addr = VOICEPORT1;
-                return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-        } else
-                return -EINVAL;
-}
-
-static int nc_set_mute(int dev_id, u8 value)
-{
-        struct sc_reg_access sc_access[3];
-        u8 mute_val, cap_mute;
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        pr_debug("set device id::%d, value %d\n", dev_id, value);
-
-        switch (dev_id) {
-        case PMIC_SND_MUTE_ALL:
-                pr_debug("PMIC_SND_MUTE_ALL value %d\n", value);
-                snd_pmic_ops_nc.mute_status = value;
-                snd_pmic_ops_nc.master_mute = value;
-                if (value == UNMUTE) {
-                        /* unmute the system, set the 7th bit to zero */
-                        mute_val = cap_mute = 0x00;
-                } else {
-                        /* MUTE:Set the seventh bit */
-                        mute_val = 0x80;
-                        cap_mute = 0x40;
-                }
-                sc_access[0].reg_addr = AUDIOLVOL;
-                sc_access[1].reg_addr = AUDIORVOL;
-                sc_access[0].mask = sc_access[1].mask = MASK7;
-                sc_access[0].value = sc_access[1].value = mute_val;
-                if (snd_pmic_ops_nc.num_channel == 1)
-                                sc_access[1].value = 0x80;
-                if (!sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 2)) {
-                        sc_access[0].reg_addr = 0x109;
-                        sc_access[1].reg_addr = 0x10a;
-                        sc_access[2].reg_addr = 0x105;
-                        sc_access[0].mask = sc_access[1].mask =
-                                sc_access[2].mask = MASK6;
-                        sc_access[0].value = sc_access[1].value =
-                                sc_access[2].value = cap_mute;
-
-                        if ((snd_pmic_ops_nc.input_dev_id == AMIC) ||
-                                (snd_pmic_ops_nc.input_dev_id == DMIC))
-                                        sc_access[1].value = 0x40;
-                        if (snd_pmic_ops_nc.input_dev_id == HS_MIC)
-                                        sc_access[0].value = 0x40;
-                        retval = sst_sc_reg_access(sc_access,
-                                        PMIC_READ_MODIFY, 3);
-                }
-                break;
-        case PMIC_SND_HP_MIC_MUTE:
-                pr_debug("PMIC_SND_HPMIC_MUTE value %d\n", value);
-                if (value == UNMUTE) {
-                        /* unmute the system, set the 6th bit to one */
-                        sc_access[0].value = 0x00;
-                } else {
-                        /* mute the system, reset the 6th bit to zero */
-                        sc_access[0].value = 0x40;
-                }
-                sc_access[0].reg_addr = LIRSEL;
-                sc_access[0].mask = MASK6;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-                break;
-        case PMIC_SND_AMIC_MUTE:
-                pr_debug("PMIC_SND_AMIC_MUTE value %d\n", value);
-                if (value == UNMUTE) {
-                        /* unmute the system, set the 6th bit to one */
-                        sc_access[0].value = 0x00;
-                } else {
-                        /* mute the system, reset the 6th bit to zero */
-                        sc_access[0].value = 0x40;
-                }
-                sc_access[0].reg_addr = LILSEL;
-                sc_access[0].mask = MASK6;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-                break;
-
-        case PMIC_SND_DMIC_MUTE:
-                pr_debug("INPUT_MUTE_DMIC value%d\n", value);
-                if (value == UNMUTE) {
-                        /* unmute the system, set the 6th bit to one */
-                        sc_access[1].value = 0x00;
-                        sc_access[0].value = 0x00;
-                } else {
-                        /* mute the system, reset the 6th bit to zero */
-                        sc_access[1].value = 0x40;
-                        sc_access[0].value = 0x40;
-                }
-                sc_access[0].reg_addr = DMICCTRL1;
-                sc_access[0].mask = MASK6;
-                sc_access[1].reg_addr = LILSEL;
-                sc_access[1].mask = MASK6;
-                retval = sst_sc_reg_access(sc_access,
-                                        PMIC_READ_MODIFY, 2);
-                break;
-
-        case PMIC_SND_LEFT_HP_MUTE:
-        case PMIC_SND_RIGHT_HP_MUTE:
-                snd_pmic_ops_nc.mute_status = value;
-                if (value == UNMUTE)
-                        sc_access[0].value = 0x0;
-                else
-                        sc_access[0].value = 0x04;
-
-                if (dev_id == PMIC_SND_LEFT_HP_MUTE) {
-                        sc_access[0].reg_addr = LMUTE;
-                        pr_debug("LEFT_HP_MUTE value %d\n",
-                                        sc_access[0].value);
-                } else {
-                        if (snd_pmic_ops_nc.num_channel == 1)
-                                sc_access[0].value = 0x04;
-                        sc_access[0].reg_addr = RMUTE;
-                        pr_debug("RIGHT_HP_MUTE value %d\n",
-                                        sc_access[0].value);
-                }
-                sc_access[0].mask = MASK2;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-                break;
-        case PMIC_SND_LEFT_SPEAKER_MUTE:
-        case PMIC_SND_RIGHT_SPEAKER_MUTE:
-                if (value == UNMUTE)
-                        sc_access[0].value = 0x00;
-                else
-                        sc_access[0].value = 0x03;
-                sc_access[0].reg_addr = LMUTE;
-                pr_debug("SPEAKER_MUTE %d\n", sc_access[0].value);
-                sc_access[0].mask = MASK1;
-                retval = sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, 1);
-                break;
-        default:
-                return -EINVAL;
-        }
-        return retval ;
-
-}
-
-static int nc_set_vol(int dev_id, int value)
-{
-        struct sc_reg_access sc_access[3];
-        int retval = 0, entries = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        pr_debug("set volume:%d\n", dev_id);
-        switch (dev_id) {
-        case PMIC_SND_CAPTURE_VOL:
-                pr_debug("PMIC_SND_CAPTURE_VOL:value::%d\n", value);
-                sc_access[0].value = sc_access[1].value =
-                                        sc_access[2].value = -value;
-                sc_access[0].mask = sc_access[1].mask = sc_access[2].mask =
-                                        (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                sc_access[0].reg_addr = 0x10a;
-                sc_access[1].reg_addr = 0x109;
-                sc_access[2].reg_addr = 0x105;
-                entries = 3;
-                break;
-
-        case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("PMIC_SND_LEFT_HP_VOL %d\n", value);
-                sc_access[0].value = -value;
-                sc_access[0].reg_addr  = HPLVOL;
-                sc_access[0].mask = (MASK0|MASK1|MASK2|MASK3|MASK4);
-                entries = 1;
-                break;
-
-        case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("PMIC_SND_RIGHT_HP_VOL value %d\n", value);
-                if (snd_pmic_ops_nc.num_channel == 1) {
-                        sc_access[0].value = 0x04;
-                        sc_access[0].reg_addr = RMUTE;
-                        sc_access[0].mask = MASK2;
-                } else {
-                        sc_access[0].value = -value;
-                        sc_access[0].reg_addr  = HPRVOL;
-                        sc_access[0].mask = (MASK0|MASK1|MASK2|MASK3|MASK4);
-                }
-                entries = 1;
-                break;
-
-        case PMIC_SND_LEFT_MASTER_VOL:
-                pr_debug("PMIC_SND_LEFT_MASTER_VOL value %d\n", value);
-                sc_access[0].value = -value;
-                sc_access[0].reg_addr = AUDIOLVOL;
-                sc_access[0].mask =
-                        (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5|MASK6);
-                entries = 1;
-                break;
-
-        case PMIC_SND_RIGHT_MASTER_VOL:
-                pr_debug("PMIC_SND_RIGHT_MASTER_VOL value %d\n", value);
-                sc_access[0].value = -value;
-                sc_access[0].reg_addr = AUDIORVOL;
-                sc_access[0].mask =
-                                (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5|MASK6);
-                entries = 1;
-                break;
-
-        default:
-                return -EINVAL;
-
-        }
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, entries);
-}
-
-static int nc_set_selected_input_dev(u8 value)
-{
-        struct sc_reg_access sc_access[6];
-        u8 num_val;
-        int retval = 0;
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-        snd_pmic_ops_nc.input_dev_id = value;
-
-        pr_debug("nc set selected input:%d\n", value);
-
-        switch (value) {
-        case AMIC:
-                pr_debug("Selecting AMIC\n");
-                sc_access[0].reg_addr = 0x107;
-                sc_access[0].value = 0x40;
-                sc_access[0].mask =  MASK6|MASK3|MASK1|MASK0;
-                sc_access[1].reg_addr = 0x10a;
-                sc_access[1].value = 0x40;
-                sc_access[1].mask = MASK6;
-                sc_access[2].reg_addr = 0x109;
-                sc_access[2].value = 0x00;
-                sc_access[2].mask = MASK6;
-                sc_access[3].reg_addr = 0x105;
-                sc_access[3].value = 0x40;
-                sc_access[3].mask = MASK6;
-                num_val = 4;
-                break;
-
-        case HS_MIC:
-                pr_debug("Selecting HS_MIC\n");
-                sc_access[0].reg_addr = MICCTRL;
-                sc_access[0].mask =  MASK6|MASK3|MASK1|MASK0;
-                sc_access[0].value = 0x00;
-                sc_access[1].reg_addr = 0x109;
-                sc_access[1].mask = MASK6;
-                sc_access[1].value = 0x40;
-                sc_access[2].reg_addr = 0x10a;
-                sc_access[2].mask = MASK6;
-                sc_access[2].value = 0x00;
-                sc_access[3].reg_addr = 0x105;
-                sc_access[3].value = 0x40;
-                sc_access[3].mask = MASK6;
-                sc_access[4].reg_addr = ADCSAMPLERATE;
-                sc_access[4].mask = MASK7|MASK6|MASK5|MASK4|MASK3;
-                sc_access[4].value = 0xc8;
-                num_val = 5;
-                break;
-
-        case DMIC:
-                pr_debug("DMIC\n");
-                sc_access[0].reg_addr = MICCTRL;
-                sc_access[0].mask = MASK6|MASK3|MASK1|MASK0;
-                sc_access[0].value = 0x0B;
-                sc_access[1].reg_addr = 0x105;
-                sc_access[1].value = 0x80;
-                sc_access[1].mask = MASK7|MASK6;
-                sc_access[2].reg_addr = 0x10a;
-                sc_access[2].value = 0x40;
-                sc_access[2].mask = MASK6;
-                sc_access[3].reg_addr = LILSEL;
-                sc_access[3].mask = MASK6;
-                sc_access[3].value = 0x00;
-                sc_access[4].reg_addr = ADCSAMPLERATE;
-                sc_access[4].mask =  MASK7|MASK6|MASK5|MASK4|MASK3;
-                sc_access[4].value = 0x33;
-                num_val = 5;
-                break;
-        default:
-                return -EINVAL;
-        }
-        return sst_sc_reg_access(sc_access, PMIC_READ_MODIFY, num_val);
-}
-
-static int nc_get_mute(int dev_id, u8 *value)
-{
-        int retval = 0, mask = 0;
-        struct sc_reg_access sc_access = {0,};
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        pr_debug("get mute::%d\n", dev_id);
-
-        switch (dev_id) {
-        case PMIC_SND_AMIC_MUTE:
-                pr_debug("PMIC_SND_INPUT_MUTE_MIC1\n");
-                sc_access.reg_addr = LILSEL;
-                mask = MASK6;
-                break;
-        case PMIC_SND_HP_MIC_MUTE:
-                pr_debug("PMIC_SND_INPUT_MUTE_MIC2\n");
-                sc_access.reg_addr = LIRSEL;
-                mask = MASK6;
-                break;
-        case PMIC_SND_LEFT_HP_MUTE:
-        case PMIC_SND_RIGHT_HP_MUTE:
-                mask = MASK2;
-                pr_debug("PMIC_SN_LEFT/RIGHT_HP_MUTE\n");
-                if (dev_id == PMIC_SND_RIGHT_HP_MUTE)
-                        sc_access.reg_addr = RMUTE;
-                else
-                        sc_access.reg_addr = LMUTE;
-                break;
-
-        case PMIC_SND_LEFT_SPEAKER_MUTE:
-                pr_debug("PMIC_MONO_EARPIECE_MUTE\n");
-                sc_access.reg_addr = RMUTE;
-                mask = MASK1;
-                break;
-        case PMIC_SND_DMIC_MUTE:
-                pr_debug("PMIC_SND_INPUT_MUTE_DMIC\n");
-                sc_access.reg_addr = 0x105;
-                mask = MASK6;
-                break;
-        default:
-                return -EINVAL;
-
-        }
-        retval = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        pr_debug("reg value = %d\n", sc_access.value);
-        if (retval)
-                return retval;
-        *value = (sc_access.value) & mask;
-        pr_debug("masked value = %d\n", *value);
-        if (*value)
-                *value = 0;
-        else
-                *value = 1;
-        pr_debug("value returned = 0x%x\n", *value);
-        return retval;
-}
-
-static int nc_get_vol(int dev_id, int *value)
-{
-        int retval = 0, mask = 0;
-        struct sc_reg_access sc_access = {0,};
-
-        if (snd_pmic_ops_nc.card_status == SND_CARD_UN_INIT)
-                retval = nc_init_card();
-        if (retval)
-                return retval;
-
-        switch (dev_id) {
-        case PMIC_SND_CAPTURE_VOL:
-                pr_debug("PMIC_SND_INPUT_CAPTURE_VOL\n");
-                sc_access.reg_addr =  LILSEL;
-                mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5);
-                break;
-
-        case PMIC_SND_LEFT_MASTER_VOL:
-                pr_debug("GET_VOLUME_PMIC_LEFT_MASTER_VOL\n");
-                sc_access.reg_addr = AUDIOLVOL;
-                mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5|MASK6);
-                break;
-
-        case PMIC_SND_RIGHT_MASTER_VOL:
-                pr_debug("GET_VOLUME_PMIC_RIGHT_MASTER_VOL\n");
-                sc_access.reg_addr = AUDIORVOL;
-                mask = (MASK0|MASK1|MASK2|MASK3|MASK4|MASK5|MASK6);
-                break;
-
-        case PMIC_SND_RIGHT_PB_VOL:
-                pr_debug("GET_VOLUME_PMIC_RIGHT_HP_VOL\n");
-                sc_access.reg_addr = HPRVOL;
-                mask = (MASK0|MASK1|MASK2|MASK3|MASK4);
-                break;
-
-        case PMIC_SND_LEFT_PB_VOL:
-                pr_debug("GET_VOLUME_PMIC_LEFT_HP_VOL\n");
-                sc_access.reg_addr = HPLVOL;
-                mask = (MASK0|MASK1|MASK2|MASK3|MASK4);
-                break;
-
-        default:
-                return -EINVAL;
-
-        }
-        retval = sst_sc_reg_access(&sc_access, PMIC_READ, 1);
-        pr_debug("value read = 0x%x\n", sc_access.value);
-        *value = -((sc_access.value) & mask);
-        pr_debug("get vol value returned = %d\n", *value);
-        return retval;
-}
-
-static void hp_automute(enum snd_jack_types type, int present)
-{
-        u8 in = DMIC;
-        u8 out = INTERNAL_SPKR;
-        if (present) {
-                if (type == SND_JACK_HEADSET)
-                        in = HS_MIC;
-                out = STEREO_HEADPHONE;
-        }
-        nc_set_selected_input_dev(in);
-        nc_set_selected_output_dev(out);
-}
-
-static void nc_pmic_irq_cb(void *cb_data, u8 intsts)
-{
-        u8 value = 0;
-        struct mad_jack *mjack = NULL;
-        unsigned int present = 0, jack_event_flag = 0, buttonpressflag = 0;
-        struct snd_intelmad *intelmaddata = cb_data;
-        struct sc_reg_access sc_access_read = {0,};
-
-        sc_access_read.reg_addr = 0x132;
-        sst_sc_reg_access(&sc_access_read, PMIC_READ, 1);
-        value = (sc_access_read.value);
-        pr_debug("value returned = 0x%x\n", value);
-
-        mjack = &intelmaddata->jack[0];
-        if (intsts & 0x1) {
-                pr_debug("SST DBG:MAD headset detected\n");
-                /* send headset detect/undetect */
-                present = (value == 0x1) ? 3 : 0;
-                jack_event_flag = 1;
-                mjack->jack.type = SND_JACK_HEADSET;
-                hp_automute(SND_JACK_HEADSET, present);
-        }
-
-        if (intsts & 0x2) {
-                pr_debug(":MAD headphone detected\n");
-                /* send headphone detect/undetect */
-                present = (value == 0x2) ? 1 : 0;
-                jack_event_flag = 1;
-                mjack->jack.type = SND_JACK_HEADPHONE;
-                hp_automute(SND_JACK_HEADPHONE, present);
-        }
-
-        if (intsts & 0x4) {
-                pr_debug("MAD short push detected\n");
-                /* send short push */
-                present = 1;
-                jack_event_flag = 1;
-                buttonpressflag = 1;
-                mjack->jack.type = MID_JACK_HS_SHORT_PRESS;
-        }
-
-        if (intsts & 0x8) {
-                pr_debug(":MAD long push detected\n");
-                /* send long push */
-                present = 1;
-                jack_event_flag = 1;
-                buttonpressflag = 1;
-                mjack->jack.type = MID_JACK_HS_LONG_PRESS;
-        }
-
-        if (jack_event_flag)
-                sst_mad_send_jack_report(&mjack->jack,
-                                        buttonpressflag, present);
-}
-static int nc_jack_enable(void)
-{
-        return 0;
-}
-
-struct snd_pmic_ops snd_pmic_ops_nc = {
-        .input_dev_id   =       DMIC,
-        .output_dev_id  =       INTERNAL_SPKR,
-        .set_input_dev  =       nc_set_selected_input_dev,
-        .set_output_dev =       nc_set_selected_output_dev,
-        .set_mute       =       nc_set_mute,
-        .get_mute       =       nc_get_mute,
-        .set_vol        =       nc_set_vol,
-        .get_vol        =       nc_get_vol,
-        .init_card      =       nc_init_card,
-        .set_pcm_audio_params   = nc_set_pcm_audio_params,
-        .set_pcm_voice_params   = nc_set_pcm_voice_params,
-        .set_voice_port = nc_set_voice_port,
-        .set_audio_port = nc_set_audio_port,
-        .power_up_pmic_pb =     nc_power_up_pb,
-        .power_up_pmic_cp =     nc_power_up_cp,
-        .power_down_pmic_pb =   nc_power_down_pb,
-        .power_down_pmic_cp =   nc_power_down_cp,
-        .power_down_pmic        =       nc_power_down,
-        .pmic_irq_cb    =       nc_pmic_irq_cb,
-        .pmic_jack_enable =     nc_jack_enable,
-};
diff --git a/drivers/staging/line6/Makefile b/drivers/staging/line6/Makefile
index de6bd12e9736..34a2ddacc7e9 100644
--- a/drivers/staging/line6/Makefile
+++ b/drivers/staging/line6/Makefile
@@ -12,4 +12,5 @@ line6usb-y := 		\
                 playback.o      \
                 pod.o           \
                 toneport.o      \
-                variax.o
+                variax.o        \
+                podhd.o
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c
index 9647154a4923..127f95247749 100644
--- a/drivers/staging/line6/capture.c
+++ b/drivers/staging/line6/capture.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -192,6 +193,31 @@ void line6_capture_check_period(struct snd_line6_pcm *line6pcm, int length)
         }
 }
 
+int line6_alloc_capture_buffer(struct snd_line6_pcm *line6pcm)
+{
+        /* We may be invoked multiple times in a row so allocate once only */
+        if (line6pcm->buffer_in)
+                return 0;
+
+        line6pcm->buffer_in =
+                kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
+                        line6pcm->max_packet_size, GFP_KERNEL);
+
+        if (!line6pcm->buffer_in) {
+                dev_err(line6pcm->line6->ifcdev,
+                        "cannot malloc capture buffer\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+void line6_free_capture_buffer(struct snd_line6_pcm *line6pcm)
+{
+        kfree(line6pcm->buffer_in);
+        line6pcm->buffer_in = NULL;
+}
+
 /*
  * Callback for completed capture URB.
  */
@@ -243,11 +269,7 @@ static void audio_in_callback(struct urb *urb)
                 length += fsize;
 
                 /* the following assumes LINE6_ISO_PACKETS == 1: */
-#if LINE6_BACKUP_MONITOR_SIGNAL
-                memcpy(line6pcm->prev_fbuf, fbuf, fsize);
-#else
                 line6pcm->prev_fbuf = fbuf;
-#endif
                 line6pcm->prev_fsize = fsize;
 
 #ifdef CONFIG_LINE6_USB_IMPULSE_RESPONSE
@@ -319,6 +341,13 @@ static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream,
         }
         /* -- [FD] end */
 
+        if ((line6pcm->flags & MASK_CAPTURE) == 0) {
+                ret = line6_alloc_capture_buffer(line6pcm);
+
+                if (ret < 0)
+                        return ret;
+        }
+
         ret = snd_pcm_lib_malloc_pages(substream,
                                        params_buffer_bytes(hw_params));
         if (ret < 0)
@@ -331,6 +360,13 @@ static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream,
 /* hw_free capture callback */
 static int snd_line6_capture_hw_free(struct snd_pcm_substream *substream)
 {
+        struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
+
+        if ((line6pcm->flags & MASK_CAPTURE) == 0) {
+                line6_unlink_wait_clear_audio_in_urbs(line6pcm);
+                line6_free_capture_buffer(line6pcm);
+        }
+
         return snd_pcm_lib_free_pages(substream);
 }
 
diff --git a/drivers/staging/line6/capture.h b/drivers/staging/line6/capture.h
index a7509fbbb954..366cbaa7c88d 100644
--- a/drivers/staging/line6/capture.h
+++ b/drivers/staging/line6/capture.h
@@ -19,11 +19,13 @@
 
 extern struct snd_pcm_ops snd_line6_capture_ops;
 
+extern int line6_alloc_capture_buffer(struct snd_line6_pcm *line6pcm);
 extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf,
                                int fsize);
 extern void line6_capture_check_period(struct snd_line6_pcm *line6pcm,
                                        int length);
 extern int line6_create_audio_in_urbs(struct snd_line6_pcm *line6pcm);
+extern void line6_free_capture_buffer(struct snd_line6_pcm *line6pcm);
 extern int line6_submit_audio_in_all_urbs(struct snd_line6_pcm *line6pcm);
 extern void line6_unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm);
 extern void line6_unlink_wait_clear_audio_in_urbs(struct snd_line6_pcm
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index 851b762319cf..6a1959e16e00 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -21,6 +21,7 @@
 #include "midi.h"
 #include "playback.h"
 #include "pod.h"
+#include "podhd.h"
 #include "revision.h"
 #include "toneport.h"
 #include "usbdefs.h"
@@ -37,6 +38,8 @@ static const struct usb_device_id line6_id_table[] = {
         {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_BASSPODXTPRO)},
         {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)},
         {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)},
+        {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)},
+        {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)},
         {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},
         {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},
         {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX2)},
@@ -56,23 +59,25 @@ MODULE_DEVICE_TABLE(usb, line6_id_table);
 
 /* *INDENT-OFF* */
 static struct line6_properties line6_properties_table[] = {
-        { "BassPODxt",     "BassPODxt",        LINE6_BIT_BASSPODXT,     LINE6_BIT_CONTROL_PCM_HWMON },
-        { "BassPODxtLive", "BassPODxt Live",   LINE6_BIT_BASSPODXTLIVE, LINE6_BIT_CONTROL_PCM_HWMON },
-        { "BassPODxtPro",  "BassPODxt Pro",    LINE6_BIT_BASSPODXTPRO,  LINE6_BIT_CONTROL_PCM_HWMON },
-        { "GuitarPort",    "GuitarPort",       LINE6_BIT_GUITARPORT,    LINE6_BIT_PCM               },
-        { "PocketPOD",     "Pocket POD",       LINE6_BIT_POCKETPOD,     LINE6_BIT_CONTROL           },
-        { "PODStudioGX",   "POD Studio GX",    LINE6_BIT_PODSTUDIO_GX,  LINE6_BIT_PCM               },
-        { "PODStudioUX1",  "POD Studio UX1",   LINE6_BIT_PODSTUDIO_UX1, LINE6_BIT_PCM               },
-        { "PODStudioUX2",  "POD Studio UX2",   LINE6_BIT_PODSTUDIO_UX2, LINE6_BIT_PCM               },
-        { "PODX3",         "POD X3",           LINE6_BIT_PODX3,         LINE6_BIT_PCM               },
-        { "PODX3Live",     "POD X3 Live",      LINE6_BIT_PODX3LIVE,     LINE6_BIT_PCM               },
-        { "PODxt",         "PODxt",            LINE6_BIT_PODXT,         LINE6_BIT_CONTROL_PCM_HWMON },
-        { "PODxtLive",     "PODxt Live",       LINE6_BIT_PODXTLIVE,     LINE6_BIT_CONTROL_PCM_HWMON },
-        { "PODxtPro",      "PODxt Pro",        LINE6_BIT_PODXTPRO,      LINE6_BIT_CONTROL_PCM_HWMON },
-        { "TonePortGX",    "TonePort GX",      LINE6_BIT_TONEPORT_GX,   LINE6_BIT_PCM               },
-        { "TonePortUX1",   "TonePort UX1",     LINE6_BIT_TONEPORT_UX1,  LINE6_BIT_PCM               },
-        { "TonePortUX2",   "TonePort UX2",     LINE6_BIT_TONEPORT_UX2,  LINE6_BIT_PCM               },
-        { "Variax",        "Variax Workbench", LINE6_BIT_VARIAX,        LINE6_BIT_CONTROL           }
+        { LINE6_BIT_BASSPODXT,     "BassPODxt",     "BassPODxt",        LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_BASSPODXTLIVE, "BassPODxtLive", "BassPODxt Live",   LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_BASSPODXTPRO,  "BassPODxtPro",  "BassPODxt Pro",    LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_GUITARPORT,    "GuitarPort",    "GuitarPort",       LINE6_BIT_PCM               },
+        { LINE6_BIT_POCKETPOD,     "PocketPOD",     "Pocket POD",       LINE6_BIT_CONTROL           },
+        { LINE6_BIT_PODHD300,      "PODHD300",      "POD HD300",        LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_PODHD500,      "PODHD500",      "POD HD500",        LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX",    LINE6_BIT_PCM               },
+        { LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1",   LINE6_BIT_PCM               },
+        { LINE6_BIT_PODSTUDIO_UX2, "PODStudioUX2",  "POD Studio UX2",   LINE6_BIT_PCM               },
+        { LINE6_BIT_PODX3,         "PODX3",         "POD X3",           LINE6_BIT_PCM               },
+        { LINE6_BIT_PODX3LIVE,     "PODX3Live",     "POD X3 Live",      LINE6_BIT_PCM               },
+        { LINE6_BIT_PODXT,         "PODxt",         "PODxt",            LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_PODXTLIVE,     "PODxtLive",     "PODxt Live",       LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_PODXTPRO,      "PODxtPro",      "PODxt Pro",        LINE6_BIT_CONTROL_PCM_HWMON },
+        { LINE6_BIT_TONEPORT_GX,   "TonePortGX",    "TonePort GX",      LINE6_BIT_PCM               },
+        { LINE6_BIT_TONEPORT_UX1,  "TonePortUX1",   "TonePort UX1",     LINE6_BIT_PCM               },
+        { LINE6_BIT_TONEPORT_UX2,  "TonePortUX2",   "TonePort UX2",     LINE6_BIT_PCM               },
+        { LINE6_BIT_VARIAX,        "Variax",        "Variax Workbench", LINE6_BIT_CONTROL           },
 };
 /* *INDENT-ON* */
 
@@ -437,6 +442,10 @@ static void line6_data_received(struct urb *urb)
                                                   line6);
                         break;
 
+                case LINE6_DEVID_PODHD300:
+                case LINE6_DEVID_PODHD500:
+                        break; /* let userspace handle MIDI */
+
                 case LINE6_DEVID_PODXTLIVE:
                         switch (line6->interface_number) {
                         case PODXTLIVE_INTERFACE_POD:
@@ -720,8 +729,8 @@ static int line6_probe(struct usb_interface *interface,
                        const struct usb_device_id *id)
 {
         int devtype;
-        struct usb_device *usbdev = NULL;
-        struct usb_line6 *line6 = NULL;
+        struct usb_device *usbdev;
+        struct usb_line6 *line6;
         const struct line6_properties *properties;
         int devnum;
         int interface_number, alternate = 0;
@@ -794,6 +803,7 @@ static int line6_probe(struct usb_interface *interface,
                 }
                 break;
 
+        case LINE6_DEVID_PODHD500:
         case LINE6_DEVID_PODX3:
         case LINE6_DEVID_PODX3LIVE:
                 switch (interface_number) {
@@ -812,6 +822,7 @@ static int line6_probe(struct usb_interface *interface,
         case LINE6_DEVID_BASSPODXTPRO:
         case LINE6_DEVID_PODXT:
         case LINE6_DEVID_PODXTPRO:
+        case LINE6_DEVID_PODHD300:
                 alternate = 5;
                 break;
 
@@ -865,6 +876,18 @@ static int line6_probe(struct usb_interface *interface,
                 ep_write = 0x03;
                 break;
 
+        case LINE6_DEVID_PODHD300:
+                size = sizeof(struct usb_line6_podhd);
+                ep_read = 0x84;
+                ep_write = 0x03;
+                break;
+
+        case LINE6_DEVID_PODHD500:
+                size = sizeof(struct usb_line6_podhd);
+                ep_read = 0x81;
+                ep_write = 0x01;
+                break;
+
         case LINE6_DEVID_POCKETPOD:
                 size = sizeof(struct usb_line6_pod);
                 ep_read = 0x82;
@@ -923,7 +946,7 @@ static int line6_probe(struct usb_interface *interface,
         }
 
         if (size == 0) {
-                dev_err(line6->ifcdev,
+                dev_err(&interface->dev,
                         "driver bug: interface data size not set\n");
                 ret = -ENODEV;
                 goto err_put;
@@ -1017,6 +1040,12 @@ static int line6_probe(struct usb_interface *interface,
                 ret = line6_pod_init(interface, (struct usb_line6_pod *)line6);
                 break;
 
+        case LINE6_DEVID_PODHD300:
+        case LINE6_DEVID_PODHD500:
+                ret = line6_podhd_init(interface,
+                                       (struct usb_line6_podhd *)line6);
+                break;
+
         case LINE6_DEVID_PODXTLIVE:
                 switch (interface_number) {
                 case PODXTLIVE_INTERFACE_POD:
@@ -1139,6 +1168,11 @@ static void line6_disconnect(struct usb_interface *interface)
                         line6_pod_disconnect(interface);
                         break;
 
+                case LINE6_DEVID_PODHD300:
+                case LINE6_DEVID_PODHD500:
+                        line6_podhd_disconnect(interface);
+                        break;
+
                 case LINE6_DEVID_PODXTLIVE:
                         switch (interface_number) {
                         case PODXTLIVE_INTERFACE_POD:
diff --git a/drivers/staging/line6/driver.h b/drivers/staging/line6/driver.h
index 553192f49317..117bf9943568 100644
--- a/drivers/staging/line6/driver.h
+++ b/drivers/staging/line6/driver.h
@@ -88,6 +88,11 @@ static const int SYSEX_EXTRA_SIZE = sizeof(line6_midi_id) + 4;
 */
 struct line6_properties {
         /**
+                 Bit identifying this device in the line6usb driver.
+        */
+        int device_bit;
+
+        /**
                  Card id string (maximum 16 characters).
                  This can be used to address the device in ALSA programs as
                  "default:CARD=<id>"
@@ -100,11 +105,6 @@ struct line6_properties {
         const char *name;
 
         /**
-                 Bit identifying this device in the line6usb driver.
-        */
-        int device_bit;
-
-        /**
                  Bit vector defining this device's capabilities in the
                  line6usb driver.
         */
diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c
index e554a2da643a..13d02939c3cb 100644
--- a/drivers/staging/line6/midi.c
+++ b/drivers/staging/line6/midi.c
@@ -135,7 +135,7 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
         line6_write_hexdump(line6, 'S', data, length);
 #endif
 
-        transfer_buffer = kmalloc(length, GFP_ATOMIC);
+        transfer_buffer = kmemdup(data, length, GFP_ATOMIC);
 
         if (transfer_buffer == NULL) {
                 usb_free_urb(urb);
@@ -143,7 +143,6 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
                 return -ENOMEM;
         }
 
-        memcpy(transfer_buffer, data, length);
         usb_fill_int_urb(urb, line6->usbdev,
                          usb_sndbulkpipe(line6->usbdev,
                                          line6->ep_control_write),
@@ -173,6 +172,8 @@ static int send_midi_async(struct usb_line6 *line6, unsigned char *data,
                 break;
 
         case LINE6_DEVID_VARIAX:
+        case LINE6_DEVID_PODHD300:
+        case LINE6_DEVID_PODHD500:
                 break;
 
         default:
@@ -307,10 +308,10 @@ static ssize_t midi_set_midi_mask_transmit(struct device *dev,
 {
         struct usb_interface *interface = to_usb_interface(dev);
         struct usb_line6 *line6 = usb_get_intfdata(interface);
-        unsigned long value;
+        unsigned short value;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &value);
+        ret = kstrtou16(buf, 10, &value);
         if (ret)
                 return ret;
 
@@ -339,10 +340,10 @@ static ssize_t midi_set_midi_mask_receive(struct device *dev,
 {
         struct usb_interface *interface = to_usb_interface(dev);
         struct usb_line6 *line6 = usb_get_intfdata(interface);
-        unsigned long value;
+        unsigned short value;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &value);
+        ret = kstrtou16(buf, 10, &value);
         if (ret)
                 return ret;
 
@@ -391,16 +392,32 @@ int line6_init_midi(struct usb_line6 *line6)
                 return -ENOMEM;
 
         err = line6_midibuf_init(&line6midi->midibuf_in, MIDI_BUFFER_SIZE, 0);
-        if (err < 0)
+        if (err < 0) {
+                kfree(line6midi);
                 return err;
+        }
 
         err = line6_midibuf_init(&line6midi->midibuf_out, MIDI_BUFFER_SIZE, 1);
-        if (err < 0)
+        if (err < 0) {
+                kfree(line6midi->midibuf_in.buf);
+                kfree(line6midi);
                 return err;
+        }
 
         line6midi->line6 = line6;
-        line6midi->midi_mask_transmit = 1;
-        line6midi->midi_mask_receive = 4;
+
+        switch(line6->product) {
+        case LINE6_DEVID_PODHD300:
+        case LINE6_DEVID_PODHD500:
+                line6midi->midi_mask_transmit = 1;
+                line6midi->midi_mask_receive = 1;
+                break;
+
+        default:
+                line6midi->midi_mask_transmit = 1;
+                line6midi->midi_mask_receive = 4;
+        }
+
         line6->line6midi = line6midi;
 
         err = snd_device_new(line6->card, SNDRV_DEV_RAWMIDI, line6midi,
diff --git a/drivers/staging/line6/midi.h b/drivers/staging/line6/midi.h
index b73a025d8be9..4a9e9f947297 100644
--- a/drivers/staging/line6/midi.h
+++ b/drivers/staging/line6/midi.h
@@ -57,12 +57,12 @@ struct snd_line6_midi {
         /**
                  Bit mask for output MIDI channels.
         */
-        int midi_mask_transmit;
+        unsigned short midi_mask_transmit;
 
         /**
                  Bit mask for input MIDI channels.
         */
-        int midi_mask_receive;
+        unsigned short midi_mask_receive;
 
         /**
                  Buffer for incoming MIDI stream.
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c
index 9d4c8a606eea..37675e66da81 100644
--- a/drivers/staging/line6/pcm.c
+++ b/drivers/staging/line6/pcm.c
@@ -86,31 +86,22 @@ static DEVICE_ATTR(impulse_period, S_IWUSR | S_IRUGO, pcm_get_impulse_period,
 
 #endif
 
+static bool test_flags(unsigned long flags0, unsigned long flags1,
+                       unsigned long mask)
+{
+        return ((flags0 & mask) == 0) && ((flags1 & mask) != 0);
+}
+
 int line6_pcm_start(struct snd_line6_pcm *line6pcm, int channels)
 {
         unsigned long flags_old =
             __sync_fetch_and_or(&line6pcm->flags, channels);
         unsigned long flags_new = flags_old | channels;
         int err = 0;
-
-#if LINE6_BACKUP_MONITOR_SIGNAL
-        if (!(line6pcm->line6->properties->capabilities & LINE6_BIT_HWMON)) {
-                line6pcm->prev_fbuf =
-                    kmalloc(LINE6_ISO_PACKETS * line6pcm->max_packet_size,
-                            GFP_KERNEL);
-
-                if (!line6pcm->prev_fbuf) {
-                        dev_err(line6pcm->line6->ifcdev,
-                                "cannot malloc monitor buffer\n");
-                        return -ENOMEM;
-                }
-        }
-#else
+        
         line6pcm->prev_fbuf = NULL;
-#endif
 
-        if (((flags_old & MASK_CAPTURE) == 0) &&
-            ((flags_new & MASK_CAPTURE) != 0)) {
+        if (test_flags(flags_old, flags_new, MASK_CAPTURE)) {
                 /*
                    Waiting for completion of active URBs in the stop handler is
                    a bug, we therefore report an error if capturing is restarted
@@ -119,54 +110,47 @@ int line6_pcm_start(struct snd_line6_pcm *line6pcm, int channels)
                 if (line6pcm->active_urb_in | line6pcm->unlink_urb_in)
                         return -EBUSY;
 
-                line6pcm->buffer_in =
-                    kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
-                            line6pcm->max_packet_size, GFP_KERNEL);
+                if (!(flags_new & MASK_PCM_ALSA_CAPTURE)) {
+                        err = line6_alloc_capture_buffer(line6pcm);
 
-                if (!line6pcm->buffer_in) {
-                        dev_err(line6pcm->line6->ifcdev,
-                                "cannot malloc capture buffer\n");
-                        return -ENOMEM;
+                        if (err < 0)
+                                goto pcm_start_error;
                 }
 
                 line6pcm->count_in = 0;
                 line6pcm->prev_fsize = 0;
                 err = line6_submit_audio_in_all_urbs(line6pcm);
 
-                if (err < 0) {
-                        __sync_fetch_and_and(&line6pcm->flags, ~channels);
-                        return err;
-                }
+                if (err < 0)
+                        goto pcm_start_error;
         }
 
-        if (((flags_old & MASK_PLAYBACK) == 0) &&
-            ((flags_new & MASK_PLAYBACK) != 0)) {
+        if (test_flags(flags_old, flags_new, MASK_PLAYBACK)) {
                 /*
                    See comment above regarding PCM restart.
                  */
                 if (line6pcm->active_urb_out | line6pcm->unlink_urb_out)
                         return -EBUSY;
 
-                line6pcm->buffer_out =
-                    kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
-                            line6pcm->max_packet_size, GFP_KERNEL);
+                if (!(flags_new & MASK_PCM_ALSA_PLAYBACK)) {
+                        err = line6_alloc_playback_buffer(line6pcm);
 
-                if (!line6pcm->buffer_out) {
-                        dev_err(line6pcm->line6->ifcdev,
-                                "cannot malloc playback buffer\n");
-                        return -ENOMEM;
+                        if (err < 0)
+                                goto pcm_start_error;
                 }
 
                 line6pcm->count_out = 0;
                 err = line6_submit_audio_out_all_urbs(line6pcm);
 
-                if (err < 0) {
-                        __sync_fetch_and_and(&line6pcm->flags, ~channels);
-                        return err;
-                }
+                if (err < 0)
+                        goto pcm_start_error;
         }
 
         return 0;
+
+pcm_start_error:
+        __sync_fetch_and_and(&line6pcm->flags, ~channels);
+        return err;
 }
 
 int line6_pcm_stop(struct snd_line6_pcm *line6pcm, int channels)
@@ -175,22 +159,19 @@ int line6_pcm_stop(struct snd_line6_pcm *line6pcm, int channels)
             __sync_fetch_and_and(&line6pcm->flags, ~channels);
         unsigned long flags_new = flags_old & ~channels;
 
-        if (((flags_old & MASK_CAPTURE) != 0) &&
-            ((flags_new & MASK_CAPTURE) == 0)) {
+        if (test_flags(flags_new, flags_old, MASK_CAPTURE)) {
                 line6_unlink_audio_in_urbs(line6pcm);
-                kfree(line6pcm->buffer_in);
-                line6pcm->buffer_in = NULL;
+
+                if (!(flags_old & MASK_PCM_ALSA_CAPTURE))
+                        line6_free_capture_buffer(line6pcm);
         }
 
-        if (((flags_old & MASK_PLAYBACK) != 0) &&
-            ((flags_new & MASK_PLAYBACK) == 0)) {
+        if (test_flags(flags_new, flags_old, MASK_PLAYBACK)) {
                 line6_unlink_audio_out_urbs(line6pcm);
-                kfree(line6pcm->buffer_out);
-                line6pcm->buffer_out = NULL;
+
+                if (!(flags_old & MASK_PCM_ALSA_PLAYBACK))
+                        line6_free_playback_buffer(line6pcm);
         }
-#if LINE6_BACKUP_MONITOR_SIGNAL
-        kfree(line6pcm->prev_fbuf);
-#endif
 
         return 0;
 }
@@ -403,10 +384,12 @@ int line6_init_pcm(struct usb_line6 *line6,
         case LINE6_DEVID_PODXT:
         case LINE6_DEVID_PODXTLIVE:
         case LINE6_DEVID_PODXTPRO:
+        case LINE6_DEVID_PODHD300:
                 ep_read = 0x82;
                 ep_write = 0x01;
                 break;
 
+        case LINE6_DEVID_PODHD500:
         case LINE6_DEVID_PODX3:
         case LINE6_DEVID_PODX3LIVE:
                 ep_read = 0x86;
@@ -451,9 +434,14 @@ int line6_init_pcm(struct usb_line6 *line6,
         line6pcm->line6 = line6;
         line6pcm->ep_audio_read = ep_read;
         line6pcm->ep_audio_write = ep_write;
-        line6pcm->max_packet_size = usb_maxpacket(line6->usbdev,
-                                                  usb_rcvintpipe(line6->usbdev,
-                                                                 ep_read), 0);
+
+        /* Read and write buffers are sized identically, so choose minimum */
+        line6pcm->max_packet_size = min(
+                        usb_maxpacket(line6->usbdev,
+                                usb_rcvisocpipe(line6->usbdev, ep_read), 0),
+                        usb_maxpacket(line6->usbdev,
+                                usb_sndisocpipe(line6->usbdev, ep_write), 1));
+
         line6pcm->properties = properties;
         line6->line6pcm = line6pcm;
 
@@ -508,6 +496,23 @@ int snd_line6_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
 
+        switch (substream->stream) {
+        case SNDRV_PCM_STREAM_PLAYBACK:
+                if ((line6pcm->flags & MASK_PLAYBACK) == 0)
+                        line6_unlink_wait_clear_audio_out_urbs(line6pcm);
+
+                break;
+
+        case SNDRV_PCM_STREAM_CAPTURE:
+                if ((line6pcm->flags & MASK_CAPTURE) == 0)
+                        line6_unlink_wait_clear_audio_in_urbs(line6pcm);
+
+                break;
+
+        default:
+                MISSING_CASE;
+        }
+
         if (!test_and_set_bit(BIT_PREPARED, &line6pcm->flags)) {
                 line6pcm->count_out = 0;
                 line6pcm->pos_out = 0;
diff --git a/drivers/staging/line6/pcm.h b/drivers/staging/line6/pcm.h
index 77055b3724ad..55d8297dd3d9 100644
--- a/drivers/staging/line6/pcm.h
+++ b/drivers/staging/line6/pcm.h
@@ -39,9 +39,6 @@
 #define LINE6_IMPULSE_DEFAULT_PERIOD 100
 #endif
 
-#define LINE6_BACKUP_MONITOR_SIGNAL 0
-#define LINE6_REUSE_DMA_AREA_FOR_PLAYBACK 0
-
 /*
         Get substream from Line6 PCM data structure
 */
@@ -149,11 +146,6 @@ struct snd_line6_pcm {
         unsigned char *buffer_in;
 
         /**
-                 Temporary buffer index for playback.
-        */
-        int index_out;
-
-        /**
                  Previously captured frame (for software monitoring).
         */
         unsigned char *prev_fbuf;
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index 10c543836583..4152db2328b7 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -191,13 +192,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
         urb_frames = urb_size / bytes_per_frame;
         urb_out->transfer_buffer =
             line6pcm->buffer_out +
-            line6pcm->max_packet_size * line6pcm->index_out;
+            index * LINE6_ISO_PACKETS * line6pcm->max_packet_size;
         urb_out->transfer_buffer_length = urb_size;
         urb_out->context = line6pcm;
 
-        if (++line6pcm->index_out == LINE6_ISO_BUFFERS)
-                line6pcm->index_out = 0;
-
         if (test_bit(BIT_PCM_ALSA_PLAYBACK, &line6pcm->flags) &&
             !test_bit(BIT_PAUSE_PLAYBACK, &line6pcm->flags)) {
                 struct snd_pcm_runtime *runtime =
@@ -222,18 +220,10 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
                         } else
                                 dev_err(line6pcm->line6->ifcdev, "driver bug: len = %d\n", len);        /* this is somewhat paranoid */
                 } else {
-#if LINE6_REUSE_DMA_AREA_FOR_PLAYBACK
-                        /* set the buffer pointer */
-                        urb_out->transfer_buffer =
-                            runtime->dma_area +
-                            line6pcm->pos_out * bytes_per_frame;
-#else
-                        /* copy data */
                         memcpy(urb_out->transfer_buffer,
                                runtime->dma_area +
                                line6pcm->pos_out * bytes_per_frame,
                                urb_out->transfer_buffer_length);
-#endif
                 }
 
                 line6pcm->pos_out += urb_frames;
@@ -361,6 +351,31 @@ void line6_unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm)
         wait_clear_audio_out_urbs(line6pcm);
 }
 
+int line6_alloc_playback_buffer(struct snd_line6_pcm *line6pcm)
+{
+        /* We may be invoked multiple times in a row so allocate once only */
+        if (line6pcm->buffer_out)
+                return 0;
+
+        line6pcm->buffer_out =
+                kmalloc(LINE6_ISO_BUFFERS * LINE6_ISO_PACKETS *
+                        line6pcm->max_packet_size, GFP_KERNEL);
+
+        if (!line6pcm->buffer_out) {
+                dev_err(line6pcm->line6->ifcdev,
+                        "cannot malloc playback buffer\n");
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+void line6_free_playback_buffer(struct snd_line6_pcm *line6pcm)
+{
+        kfree(line6pcm->buffer_out);
+        line6pcm->buffer_out = NULL;
+}
+
 /*
         Callback for completed playback URB.
 */
@@ -469,6 +484,13 @@ static int snd_line6_playback_hw_params(struct snd_pcm_substream *substream,
         }
         /* -- [FD] end */
 
+        if ((line6pcm->flags & MASK_PLAYBACK) == 0) {
+                ret = line6_alloc_playback_buffer(line6pcm);
+
+                if (ret < 0)
+                        return ret;
+        }
+
         ret = snd_pcm_lib_malloc_pages(substream,
                                        params_buffer_bytes(hw_params));
         if (ret < 0)
@@ -481,6 +503,13 @@ static int snd_line6_playback_hw_params(struct snd_pcm_substream *substream,
 /* hw_free playback callback */
 static int snd_line6_playback_hw_free(struct snd_pcm_substream *substream)
 {
+        struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
+
+        if ((line6pcm->flags & MASK_PLAYBACK) == 0) {
+                line6_unlink_wait_clear_audio_out_urbs(line6pcm);
+                line6_free_playback_buffer(line6pcm);
+        }
+
         return snd_pcm_lib_free_pages(substream);
 }
 
diff --git a/drivers/staging/line6/playback.h b/drivers/staging/line6/playback.h
index f2fc8c0526e3..02487ff24538 100644
--- a/drivers/staging/line6/playback.h
+++ b/drivers/staging/line6/playback.h
@@ -29,7 +29,9 @@
 
 extern struct snd_pcm_ops snd_line6_playback_ops;
 
+extern int line6_alloc_playback_buffer(struct snd_line6_pcm *line6pcm);
 extern int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm);
+extern void line6_free_playback_buffer(struct snd_line6_pcm *line6pcm);
 extern int line6_submit_audio_out_all_urbs(struct snd_line6_pcm *line6pcm);
 extern void line6_unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm);
 extern void line6_unlink_wait_clear_audio_out_urbs(struct snd_line6_pcm
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index d9b30212585c..4dadc571d961 100644
--- a/drivers/staging/line6/pod.c
+++ b/drivers/staging/line6/pod.c
@@ -1149,14 +1149,10 @@ static struct snd_kcontrol_new pod_control_monitor = {
 static void pod_destruct(struct usb_interface *interface)
 {
         struct usb_line6_pod *pod = usb_get_intfdata(interface);
-        struct usb_line6 *line6;
 
         if (pod == NULL)
                 return;
-        line6 = &pod->line6;
-        if (line6 == NULL)
-                return;
-        line6_cleanup_audio(line6);
+        line6_cleanup_audio(&pod->line6);
 
         del_timer(&pod->startup_timer);
         cancel_work_sync(&pod->startup_work);
diff --git a/drivers/staging/line6/podhd.c b/drivers/staging/line6/podhd.c
new file mode 100644
index 000000000000..7ef45437b4f2
--- /dev/null
+++ b/drivers/staging/line6/podhd.c
@@ -0,0 +1,154 @@
+/*
+ * Line6 Pod HD
+ *
+ * Copyright (C) 2011 Stefan Hajnoczi <stefanha@gmail.com>
+ *
+ *      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, version 2.
+ *
+ */
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+
+#include "audio.h"
+#include "driver.h"
+#include "pcm.h"
+#include "podhd.h"
+
+#define PODHD_BYTES_PER_FRAME 6 /* 24bit audio (stereo) */
+
+static struct snd_ratden podhd_ratden = {
+        .num_min = 48000,
+        .num_max = 48000,
+        .num_step = 1,
+        .den = 1,
+};
+
+static struct line6_pcm_properties podhd_pcm_properties = {
+        .snd_line6_playback_hw = {
+                                  .info = (SNDRV_PCM_INFO_MMAP |
+                                           SNDRV_PCM_INFO_INTERLEAVED |
+                                           SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                           SNDRV_PCM_INFO_MMAP_VALID |
+                                           SNDRV_PCM_INFO_PAUSE |
+#ifdef CONFIG_PM
+                                           SNDRV_PCM_INFO_RESUME |
+#endif
+                                           SNDRV_PCM_INFO_SYNC_START),
+                                  .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+                                  .rates = SNDRV_PCM_RATE_48000,
+                                  .rate_min = 48000,
+                                  .rate_max = 48000,
+                                  .channels_min = 2,
+                                  .channels_max = 2,
+                                  .buffer_bytes_max = 60000,
+                                  .period_bytes_min = 64,
+                                  .period_bytes_max = 8192,
+                                  .periods_min = 1,
+                                  .periods_max = 1024},
+        .snd_line6_capture_hw = {
+                                 .info = (SNDRV_PCM_INFO_MMAP |
+                                          SNDRV_PCM_INFO_INTERLEAVED |
+                                          SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                          SNDRV_PCM_INFO_MMAP_VALID |
+#ifdef CONFIG_PM
+                                          SNDRV_PCM_INFO_RESUME |
+#endif
+                                          SNDRV_PCM_INFO_SYNC_START),
+                                 .formats = SNDRV_PCM_FMTBIT_S24_3LE,
+                                 .rates = SNDRV_PCM_RATE_48000,
+                                 .rate_min = 48000,
+                                 .rate_max = 48000,
+                                 .channels_min = 2,
+                                 .channels_max = 2,
+                                 .buffer_bytes_max = 60000,
+                                 .period_bytes_min = 64,
+                                 .period_bytes_max = 8192,
+                                 .periods_min = 1,
+                                 .periods_max = 1024},
+        .snd_line6_rates = {
+                            .nrats = 1,
+                            .rats = &podhd_ratden},
+        .bytes_per_frame = PODHD_BYTES_PER_FRAME
+};
+
+/*
+        POD HD destructor.
+*/
+static void podhd_destruct(struct usb_interface *interface)
+{
+        struct usb_line6_podhd *podhd = usb_get_intfdata(interface);
+
+        if (podhd == NULL)
+                return;
+        line6_cleanup_audio(&podhd->line6);
+}
+
+/*
+        Try to init POD HD device.
+*/
+static int podhd_try_init(struct usb_interface *interface,
+                          struct usb_line6_podhd *podhd)
+{
+        int err;
+        struct usb_line6 *line6 = &podhd->line6;
+
+        if ((interface == NULL) || (podhd == NULL))
+                return -ENODEV;
+
+        /* initialize audio system: */
+        err = line6_init_audio(line6);
+        if (err < 0)
+                return err;
+
+        /* initialize MIDI subsystem: */
+        err = line6_init_midi(line6);
+        if (err < 0)
+                return err;
+
+        /* initialize PCM subsystem: */
+        err = line6_init_pcm(line6, &podhd_pcm_properties);
+        if (err < 0)
+                return err;
+
+        /* register USB audio system: */
+        err = line6_register_audio(line6);
+        return err;
+}
+
+/*
+        Init POD HD device (and clean up in case of failure).
+*/
+int line6_podhd_init(struct usb_interface *interface,
+                     struct usb_line6_podhd *podhd)
+{
+        int err = podhd_try_init(interface, podhd);
+
+        if (err < 0)
+                podhd_destruct(interface);
+
+        return err;
+}
+
+/*
+        POD HD device disconnected.
+*/
+void line6_podhd_disconnect(struct usb_interface *interface)
+{
+        struct usb_line6_podhd *podhd;
+
+        if (interface == NULL)
+                return;
+        podhd = usb_get_intfdata(interface);
+
+        if (podhd != NULL) {
+                struct snd_line6_pcm *line6pcm = podhd->line6.line6pcm;
+
+                if (line6pcm != NULL)
+                        line6_pcm_disconnect(line6pcm);
+        }
+
+        podhd_destruct(interface);
+}
diff --git a/drivers/staging/line6/podhd.h b/drivers/staging/line6/podhd.h
new file mode 100644
index 000000000000..652f74056bb9
--- /dev/null
+++ b/drivers/staging/line6/podhd.h
@@ -0,0 +1,30 @@
+/*
+ * Line6 Pod HD
+ *
+ * Copyright (C) 2011 Stefan Hajnoczi <stefanha@gmail.com>
+ *
+ *      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, version 2.
+ *
+ */
+
+#ifndef PODHD_H
+#define PODHD_H
+
+#include <linux/usb.h>
+
+#include "driver.h"
+
+struct usb_line6_podhd {
+        /**
+                Generic Line6 USB data.
+        */
+        struct usb_line6 line6;
+};
+
+extern void line6_podhd_disconnect(struct usb_interface *interface);
+extern int line6_podhd_init(struct usb_interface *interface,
+                            struct usb_line6_podhd *podhd);
+
+#endif /* PODHD_H */
diff --git a/drivers/staging/line6/revision.h b/drivers/staging/line6/revision.h
index 350d0dfff8f8..b4eee2b73831 100644
--- a/drivers/staging/line6/revision.h
+++ b/drivers/staging/line6/revision.h
@@ -1,4 +1,4 @@
 #ifndef DRIVER_REVISION
 /* current subversion revision */
-#define DRIVER_REVISION " (revision 690)"
+#define DRIVER_REVISION " (904)"
 #endif
diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
index 879e6992bbc6..f31057830dbc 100644
--- a/drivers/staging/line6/toneport.c
+++ b/drivers/staging/line6/toneport.c
@@ -295,14 +295,10 @@ static struct snd_kcontrol_new toneport_control_source = {
 static void toneport_destruct(struct usb_interface *interface)
 {
         struct usb_line6_toneport *toneport = usb_get_intfdata(interface);
-        struct usb_line6 *line6;
 
         if (toneport == NULL)
                 return;
-        line6 = &toneport->line6;
-        if (line6 == NULL)
-                return;
-        line6_cleanup_audio(line6);
+        line6_cleanup_audio(&toneport->line6);
 }
 
 /*
diff --git a/drivers/staging/line6/usbdefs.h b/drivers/staging/line6/usbdefs.h
index c6dffe6bc1a5..aff9e5caea46 100644
--- a/drivers/staging/line6/usbdefs.h
+++ b/drivers/staging/line6/usbdefs.h
@@ -24,6 +24,8 @@
 #define LINE6_DEVID_BASSPODXTPRO  0x4252
 #define LINE6_DEVID_GUITARPORT    0x4750
 #define LINE6_DEVID_POCKETPOD     0x5051
+#define LINE6_DEVID_PODHD300      0x5057
+#define LINE6_DEVID_PODHD500      0x414D
 #define LINE6_DEVID_PODSTUDIO_GX  0x4153
 #define LINE6_DEVID_PODSTUDIO_UX1 0x4150
 #define LINE6_DEVID_PODSTUDIO_UX2 0x4151
@@ -37,48 +39,71 @@
 #define LINE6_DEVID_TONEPORT_UX2  0x4142
 #define LINE6_DEVID_VARIAX        0x534d
 
-#define LINE6_BIT_BASSPODXT       (1 <<  0)
-#define LINE6_BIT_BASSPODXTLIVE   (1 <<  1)
-#define LINE6_BIT_BASSPODXTPRO    (1 <<  2)
-#define LINE6_BIT_GUITARPORT      (1 <<  3)
-#define LINE6_BIT_POCKETPOD       (1 <<  4)
-#define LINE6_BIT_PODSTUDIO_GX    (1 <<  5)
-#define LINE6_BIT_PODSTUDIO_UX1   (1 <<  6)
-#define LINE6_BIT_PODSTUDIO_UX2   (1 <<  7)
-#define LINE6_BIT_PODX3           (1 <<  8)
-#define LINE6_BIT_PODX3LIVE       (1 <<  9)
-#define LINE6_BIT_PODXT           (1 << 10)
-#define LINE6_BIT_PODXTLIVE       (1 << 11)
-#define LINE6_BIT_PODXTPRO        (1 << 12)
-#define LINE6_BIT_TONEPORT_GX     (1 << 13)
-#define LINE6_BIT_TONEPORT_UX1    (1 << 14)
-#define LINE6_BIT_TONEPORT_UX2    (1 << 15)
-#define LINE6_BIT_VARIAX          (1 << 16)
+enum {
+        LINE6_ID_BASSPODXT,
+        LINE6_ID_BASSPODXTLIVE,
+        LINE6_ID_BASSPODXTPRO,
+        LINE6_ID_GUITARPORT,
+        LINE6_ID_POCKETPOD,
+        LINE6_ID_PODHD300,
+        LINE6_ID_PODHD500,
+        LINE6_ID_PODSTUDIO_GX,
+        LINE6_ID_PODSTUDIO_UX1,
+        LINE6_ID_PODSTUDIO_UX2,
+        LINE6_ID_PODX3,
+        LINE6_ID_PODX3LIVE,
+        LINE6_ID_PODXT,
+        LINE6_ID_PODXTLIVE,
+        LINE6_ID_PODXTPRO,
+        LINE6_ID_TONEPORT_GX,
+        LINE6_ID_TONEPORT_UX1,
+        LINE6_ID_TONEPORT_UX2,
+        LINE6_ID_VARIAX
+};
 
-#define LINE6_BITS_PRO          (LINE6_BIT_BASSPODXTPRO | \
-                                 LINE6_BIT_PODXTPRO)
-#define LINE6_BITS_LIVE         (LINE6_BIT_BASSPODXTLIVE | \
-                                 LINE6_BIT_PODXTLIVE | \
-                                 LINE6_BIT_PODX3LIVE)
-#define LINE6_BITS_PODXTALL     (LINE6_BIT_PODXT | \
-                                 LINE6_BIT_PODXTLIVE | \
-                                 LINE6_BIT_PODXTPRO)
-#define LINE6_BITS_BASSPODXTALL (LINE6_BIT_BASSPODXT | \
-                                 LINE6_BIT_BASSPODXTLIVE | \
-                                 LINE6_BIT_BASSPODXTPRO)
+#define LINE6_BIT(x) LINE6_BIT_ ## x = 1 << LINE6_ID_ ## x
+
+enum {
+        LINE6_BIT(BASSPODXT),
+        LINE6_BIT(BASSPODXTLIVE),
+        LINE6_BIT(BASSPODXTPRO),
+        LINE6_BIT(GUITARPORT),
+        LINE6_BIT(POCKETPOD),
+        LINE6_BIT(PODHD300),
+        LINE6_BIT(PODHD500),
+        LINE6_BIT(PODSTUDIO_GX),
+        LINE6_BIT(PODSTUDIO_UX1),
+        LINE6_BIT(PODSTUDIO_UX2),
+        LINE6_BIT(PODX3),
+        LINE6_BIT(PODX3LIVE),
+        LINE6_BIT(PODXT),
+        LINE6_BIT(PODXTLIVE),
+        LINE6_BIT(PODXTPRO),
+        LINE6_BIT(TONEPORT_GX),
+        LINE6_BIT(TONEPORT_UX1),
+        LINE6_BIT(TONEPORT_UX2),
+        LINE6_BIT(VARIAX),
+
+        LINE6_BITS_PRO = LINE6_BIT_BASSPODXTPRO | LINE6_BIT_PODXTPRO,
+        LINE6_BITS_LIVE = LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_PODXTLIVE | LINE6_BIT_PODX3LIVE,
+        LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE | LINE6_BIT_PODXTPRO,
+        LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE,
+        LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500,
+        LINE6_BITS_BASSPODXTALL = LINE6_BIT_BASSPODXT | LINE6_BIT_BASSPODXTLIVE | LINE6_BIT_BASSPODXTPRO
+};
 
 /* device supports settings parameter via USB */
-#define LINE6_BIT_CONTROL       (1 << 0)
+#define LINE6_BIT_CONTROL (1 << 0)
 /* device supports PCM input/output via USB */
-#define LINE6_BIT_PCM           (1 << 1)
+#define LINE6_BIT_PCM (1 << 1)
 /* device support hardware monitoring */
-#define LINE6_BIT_HWMON         (1 << 2)
+#define LINE6_BIT_HWMON (1 << 2)
 
 #define LINE6_BIT_CONTROL_PCM_HWMON     (LINE6_BIT_CONTROL |    \
                                          LINE6_BIT_PCM |        \
                                          LINE6_BIT_HWMON)
 
-#define LINE6_FALLBACK_INTERVAL         10
-#define LINE6_FALLBACK_MAXPACKETSIZE    16
+#define LINE6_FALLBACK_INTERVAL 10
+#define LINE6_FALLBACK_MAXPACKETSIZE 16
 
 #endif
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index 81241cdf1be9..d36622228b2d 100644
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -572,14 +572,10 @@ static DEVICE_ATTR(raw2, S_IWUSR, line6_nop_read, variax_set_raw2);
 static void variax_destruct(struct usb_interface *interface)
 {
         struct usb_line6_variax *variax = usb_get_intfdata(interface);
-        struct usb_line6 *line6;
 
         if (variax == NULL)
                 return;
-        line6 = &variax->line6;
-        if (line6 == NULL)
-                return;
-        line6_cleanup_audio(line6);
+        line6_cleanup_audio(&variax->line6);
 
         del_timer(&variax->startup_timer1);
         del_timer(&variax->startup_timer2);
diff --git a/drivers/staging/mei/init.c b/drivers/staging/mei/init.c
index 8bf34794489c..4ac3696883cb 100644
--- a/drivers/staging/mei/init.c
+++ b/drivers/staging/mei/init.c
@@ -38,7 +38,6 @@ void mei_io_list_init(struct mei_io_list *list)
 {
         /* initialize our queue list */
         INIT_LIST_HEAD(&list->mei_cb.cb_list);
-        list->status = 0;
 }
 
 /**
@@ -49,22 +48,15 @@ void mei_io_list_init(struct mei_io_list *list)
  */
 void mei_io_list_flush(struct mei_io_list *list, struct mei_cl *cl)
 {
-        struct mei_cl_cb *cb_pos = NULL;
-        struct mei_cl_cb *cb_next = NULL;
+        struct mei_cl_cb *pos;
+        struct mei_cl_cb *next;
 
-        if (list->status != 0)
-                return;
-
-        if (list_empty(&list->mei_cb.cb_list))
-                return;
-
-        list_for_each_entry_safe(cb_pos, cb_next,
-                                 &list->mei_cb.cb_list, cb_list) {
-                if (cb_pos) {
+        list_for_each_entry_safe(pos, next, &list->mei_cb.cb_list, cb_list) {
+                if (pos->file_private) {
                         struct mei_cl *cl_tmp;
-                        cl_tmp = (struct mei_cl *)cb_pos->file_private;
+                        cl_tmp = (struct mei_cl *)pos->file_private;
                         if (mei_cl_cmp_id(cl, cl_tmp))
-                                list_del(&cb_pos->cb_list);
+                                list_del(&pos->cb_list);
                 }
         }
 }
@@ -338,16 +330,10 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
                 }
         }
         /* remove all waiting requests */
-        if (dev->write_list.status == 0 &&
-                !list_empty(&dev->write_list.mei_cb.cb_list)) {
-                list_for_each_entry_safe(cb_pos, cb_next,
-                                &dev->write_list.mei_cb.cb_list, cb_list) {
-                        if (cb_pos) {
-                                list_del(&cb_pos->cb_list);
-                                mei_free_cb_private(cb_pos);
-                                cb_pos = NULL;
-                        }
-                }
+        list_for_each_entry_safe(cb_pos, cb_next,
+                        &dev->write_list.mei_cb.cb_list, cb_list) {
+                list_del(&cb_pos->cb_list);
+                mei_free_cb_private(cb_pos);
         }
 }
 
@@ -380,8 +366,7 @@ void mei_host_start_message(struct mei_device *dev)
         host_start_req->host_version.major_version = HBM_MAJOR_VERSION;
         host_start_req->host_version.minor_version = HBM_MINOR_VERSION;
         dev->recvd_msg = false;
-        if (!mei_write_message(dev, mei_hdr,
-                                       (unsigned char *) (host_start_req),
+        if (!mei_write_message(dev, mei_hdr, (unsigned char *)host_start_req,
                                        mei_hdr->length)) {
                 dev_dbg(&dev->pdev->dev, "write send version message to FW fail.\n");
                 dev->mei_state = MEI_RESETING;
@@ -414,8 +399,7 @@ void mei_host_enum_clients_message(struct mei_device *dev)
         host_enum_req = (struct hbm_host_enum_request *) &dev->wr_msg_buf[1];
         memset(host_enum_req, 0, sizeof(struct hbm_host_enum_request));
         host_enum_req->cmd.cmd = HOST_ENUM_REQ_CMD;
-        if (!mei_write_message(dev, mei_hdr,
-                               (unsigned char *) (host_enum_req),
+        if (!mei_write_message(dev, mei_hdr, (unsigned char *)host_enum_req,
                                 mei_hdr->length)) {
                 dev->mei_state = MEI_RESETING;
                 dev_dbg(&dev->pdev->dev, "write send enumeration request message to FW fail.\n");
@@ -605,15 +589,10 @@ void mei_host_init_iamthif(struct mei_device *dev)
                 return;
         }
 
-        /* Do not render the system unusable when iamthif_mtu is not equal to
-        the value received from ME.
-        Assign iamthif_mtu to the value received from ME in order to solve the
-        hardware macro incompatibility. */
+        /* Assign iamthif_mtu to the value received from ME  */
 
-        dev_dbg(&dev->pdev->dev, "[DEFAULT] IAMTHIF = %d\n", dev->iamthif_mtu);
         dev->iamthif_mtu = dev->me_clients[i].props.max_msg_length;
-        dev_dbg(&dev->pdev->dev,
-                        "IAMTHIF = %d\n",
+        dev_dbg(&dev->pdev->dev, "IAMTHIF_MTU = %d\n",
                         dev->me_clients[i].props.max_msg_length);
 
         kfree(dev->iamthif_msg_buf);
diff --git a/drivers/staging/mei/interface.c b/drivers/staging/mei/interface.c
index a65dacf00213..eb5df7fc2269 100644
--- a/drivers/staging/mei/interface.c
+++ b/drivers/staging/mei/interface.c
@@ -128,9 +128,9 @@ int mei_count_empty_write_slots(struct mei_device *dev)
  * returns 1 if success, 0 - otherwise.
  */
 int mei_write_message(struct mei_device *dev,
-                             struct mei_msg_hdr *header,
-                             unsigned char *write_buffer,
-                             unsigned long write_length)
+                      struct mei_msg_hdr *header,
+                      unsigned char *write_buffer,
+                      unsigned long write_length)
 {
         u32 temp_msg = 0;
         unsigned long bytes_written = 0;
@@ -216,7 +216,7 @@ int mei_count_full_read_slots(struct mei_device *dev)
  * @buffer_length: message size will be read
  */
 void mei_read_slots(struct mei_device *dev,
-                     unsigned char *buffer, unsigned long buffer_length)
+                    unsigned char *buffer, unsigned long buffer_length)
 {
         u32 i = 0;
         unsigned char temp_buf[sizeof(u32)];
diff --git a/drivers/staging/mei/interface.h b/drivers/staging/mei/interface.h
index 7bd38ae2c233..aeae511419c7 100644
--- a/drivers/staging/mei/interface.h
+++ b/drivers/staging/mei/interface.h
@@ -52,6 +52,17 @@ int mei_wd_send(struct mei_device *dev);
 int mei_wd_stop(struct mei_device *dev, bool preserve);
 bool mei_wd_host_init(struct mei_device *dev);
 void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout);
+/*
+ * mei_watchdog_register  - Registering watchdog interface
+ *   once we got connection to the WD Client
+ * @dev - mei device
+ */
+void mei_watchdog_register(struct mei_device *dev);
+/*
+ * mei_watchdog_unregister  - Uegistering watchdog interface
+ * @dev - mei device
+ */
+void mei_watchdog_unregister(struct mei_device *dev);
 
 int mei_flow_ctrl_reduce(struct mei_device *dev, struct mei_cl *cl);
 
diff --git a/drivers/staging/mei/interrupt.c b/drivers/staging/mei/interrupt.c
index 882d106d54e5..3544fee34e48 100644
--- a/drivers/staging/mei/interrupt.c
+++ b/drivers/staging/mei/interrupt.c
@@ -198,8 +198,7 @@ static int mei_irq_thread_read_client_message(struct mei_io_list *complete_list,
         unsigned char *buffer = NULL;
 
         dev_dbg(&dev->pdev->dev, "start client msg\n");
-        if (!(dev->read_list.status == 0 &&
-              !list_empty(&dev->read_list.mei_cb.cb_list)))
+        if (list_empty(&dev->read_list.mei_cb.cb_list))
                 goto quit;
 
         list_for_each_entry_safe(cb_pos, cb_next,
@@ -210,9 +209,6 @@ static int mei_irq_thread_read_client_message(struct mei_io_list *complete_list,
                         buffer = (unsigned char *)
                                 (cb_pos->response_buffer.data +
                                 cb_pos->information);
-                        BUG_ON(cb_pos->response_buffer.size <
-                                        mei_hdr->length +
-                                        cb_pos->information);
 
                         if (cb_pos->response_buffer.size <
                                         mei_hdr->length + cb_pos->information) {
@@ -390,24 +386,10 @@ static void mei_client_connect_response(struct mei_device *dev,
         /* if WD or iamthif client treat specially */
 
         if (is_treat_specially_client(&(dev->wd_cl), rs)) {
-                dev_dbg(&dev->pdev->dev, "dev->wd_timeout =%d.\n",
-                                dev->wd_timeout);
-
-                dev->wd_due_counter = (dev->wd_timeout) ? 1 : 0;
-
                 dev_dbg(&dev->pdev->dev, "successfully connected to WD client.\n");
+                mei_watchdog_register(dev);
 
-                /* Registering watchdog interface device once we got connection
-                   to the WD Client
-                */
-                if (watchdog_register_device(&amt_wd_dev)) {
-                        printk(KERN_ERR "mei: unable to register watchdog device.\n");
-                        dev->wd_interface_reg = false;
-                } else {
-                        dev_dbg(&dev->pdev->dev, "successfully register watchdog interface.\n");
-                        dev->wd_interface_reg = true;
-                }
-
+                /* next step in the state maching */
                 mei_host_init_iamthif(dev);
                 return;
         }
@@ -416,22 +398,20 @@ static void mei_client_connect_response(struct mei_device *dev,
                 dev->iamthif_state = MEI_IAMTHIF_IDLE;
                 return;
         }
-        if (!dev->ctrl_rd_list.status &&
-            !list_empty(&dev->ctrl_rd_list.mei_cb.cb_list)) {
-                list_for_each_entry_safe(cb_pos, cb_next,
-                        &dev->ctrl_rd_list.mei_cb.cb_list, cb_list) {
-                        cl = (struct mei_cl *)cb_pos->file_private;
-                        if (!cl) {
+        list_for_each_entry_safe(cb_pos, cb_next,
+                                &dev->ctrl_rd_list.mei_cb.cb_list, cb_list) {
+
+                cl = (struct mei_cl *)cb_pos->file_private;
+                if (!cl) {
+                        list_del(&cb_pos->cb_list);
+                        return;
+                }
+                if (MEI_IOCTL == cb_pos->major_file_operations) {
+                        if (is_treat_specially_client(cl, rs)) {
                                 list_del(&cb_pos->cb_list);
-                                return;
-                        }
-                        if (MEI_IOCTL == cb_pos->major_file_operations) {
-                                if (is_treat_specially_client(cl, rs)) {
-                                        list_del(&cb_pos->cb_list);
-                                        cl->status = 0;
-                                        cl->timer_count = 0;
-                                        break;
-                                }
+                                cl->status = 0;
+                                cl->timer_count = 0;
+                                break;
                         }
                 }
         }
@@ -458,29 +438,26 @@ static void mei_client_disconnect_response(struct mei_device *dev,
                         rs->host_addr,
                         rs->status);
 
-        if (!dev->ctrl_rd_list.status &&
-            !list_empty(&dev->ctrl_rd_list.mei_cb.cb_list)) {
-                list_for_each_entry_safe(cb_pos, cb_next,
-                                &dev->ctrl_rd_list.mei_cb.cb_list, cb_list) {
-                        cl = (struct mei_cl *)cb_pos->file_private;
+        list_for_each_entry_safe(cb_pos, cb_next,
+                        &dev->ctrl_rd_list.mei_cb.cb_list, cb_list) {
+                cl = (struct mei_cl *)cb_pos->file_private;
 
-                        if (!cl) {
-                                list_del(&cb_pos->cb_list);
-                                return;
-                        }
+                if (!cl) {
+                        list_del(&cb_pos->cb_list);
+                        return;
+                }
 
-                        dev_dbg(&dev->pdev->dev, "list_for_each_entry_safe in ctrl_rd_list.\n");
-                        if (cl->host_client_id == rs->host_addr &&
-                            cl->me_client_id == rs->me_addr) {
+                dev_dbg(&dev->pdev->dev, "list_for_each_entry_safe in ctrl_rd_list.\n");
+                if (cl->host_client_id == rs->host_addr &&
+                    cl->me_client_id == rs->me_addr) {
 
-                                list_del(&cb_pos->cb_list);
-                                if (!rs->status)
-                                        cl->state = MEI_FILE_DISCONNECTED;
+                        list_del(&cb_pos->cb_list);
+                        if (!rs->status)
+                                cl->state = MEI_FILE_DISCONNECTED;
 
-                                cl->status = 0;
-                                cl->timer_count = 0;
-                                break;
-                        }
+                        cl->status = 0;
+                        cl->timer_count = 0;
+                        break;
                 }
         }
 }
@@ -718,7 +695,7 @@ static void mei_irq_thread_read_bus_message(struct mei_device *dev,
         case CLIENT_DISCONNECT_RES_CMD:
                 disconnect_res =
                         (struct hbm_client_connect_response *) mei_msg;
-                mei_client_disconnect_response(dev,      disconnect_res);
+                mei_client_disconnect_response(dev, disconnect_res);
                 dev_dbg(&dev->pdev->dev, "client disconnect response message received.\n");
                 wake_up(&dev->wait_recvd_msg);
                 break;
@@ -736,7 +713,7 @@ static void mei_irq_thread_read_bus_message(struct mei_device *dev,
                         mei_reset(dev, 1);
                         return;
                 }
-               if (dev->me_clients[dev->me_client_presentation_num]
+                if (dev->me_clients[dev->me_client_presentation_num]
                                         .client_id == props_res->address) {
 
                         dev->me_clients[dev->me_client_presentation_num].props
@@ -1228,7 +1205,7 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
 {
 
         struct mei_cl *cl;
-        struct mei_cl_cb *cb_pos = NULL, *cb_next = NULL;
+        struct mei_cl_cb *pos = NULL, *next = NULL;
         struct mei_io_list *list;
         int ret;
 
@@ -1241,36 +1218,31 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
         dev_dbg(&dev->pdev->dev, "complete all waiting for write cb.\n");
 
         list = &dev->write_waiting_list;
-        if (!list->status && !list_empty(&list->mei_cb.cb_list)) {
-                list_for_each_entry_safe(cb_pos, cb_next,
-                                &list->mei_cb.cb_list, cb_list) {
-                        cl = (struct mei_cl *)cb_pos->file_private;
-                        if (cl) {
-                                cl->status = 0;
-                                list_del(&cb_pos->cb_list);
-                                if (MEI_WRITING == cl->writing_state &&
-                                   (cb_pos->major_file_operations ==
-                                                MEI_WRITE) &&
-                                   (cl != &dev->iamthif_cl)) {
-                                        dev_dbg(&dev->pdev->dev,
-                                                "MEI WRITE COMPLETE\n");
-                                        cl->writing_state =
-                                                        MEI_WRITE_COMPLETE;
-                                        list_add_tail(&cb_pos->cb_list,
-                                                &cmpl_list->mei_cb.cb_list);
-                                }
-                                if (cl == &dev->iamthif_cl) {
-                                        dev_dbg(&dev->pdev->dev, "check iamthif flow control.\n");
-                                        if (dev->iamthif_flow_control_pending) {
-                                                ret =
-                                                _mei_irq_thread_iamthif_read(
-                                                                dev, slots);
-                                                if (ret)
-                                                        return ret;
-                                        }
-                                }
+        list_for_each_entry_safe(pos, next,
+                        &list->mei_cb.cb_list, cb_list) {
+                cl = (struct mei_cl *)pos->file_private;
+                if (cl == NULL)
+                        continue;
+
+                cl->status = 0;
+                list_del(&pos->cb_list);
+                if (MEI_WRITING == cl->writing_state &&
+                   (pos->major_file_operations == MEI_WRITE) &&
+                   (cl != &dev->iamthif_cl)) {
+                        dev_dbg(&dev->pdev->dev,
+                                "MEI WRITE COMPLETE\n");
+                        cl->writing_state = MEI_WRITE_COMPLETE;
+                        list_add_tail(&pos->cb_list,
+                                &cmpl_list->mei_cb.cb_list);
+                }
+                if (cl == &dev->iamthif_cl) {
+                        dev_dbg(&dev->pdev->dev, "check iamthif flow control.\n");
+                        if (dev->iamthif_flow_control_pending) {
+                                ret = _mei_irq_thread_iamthif_read(
+                                                dev, slots);
+                                if (ret)
+                                        return ret;
                         }
-
                 }
         }
 
@@ -1317,101 +1289,88 @@ static int mei_irq_thread_write_handler(struct mei_io_list *cmpl_list,
                 return ~ENODEV;
 
         /* complete control write list CB */
-        if (!dev->ctrl_wr_list.status) {
-                /* complete control write list CB */
-                dev_dbg(&dev->pdev->dev, "complete control write list cb.\n");
-                list_for_each_entry_safe(cb_pos, cb_next,
+        dev_dbg(&dev->pdev->dev, "complete control write list cb.\n");
+        list_for_each_entry_safe(pos, next,
                                 &dev->ctrl_wr_list.mei_cb.cb_list, cb_list) {
-                        cl = (struct mei_cl *)
-                                cb_pos->file_private;
-                        if (!cl) {
-                                list_del(&cb_pos->cb_list);
-                                return -ENODEV;
-                        }
-                        switch (cb_pos->major_file_operations) {
-                        case MEI_CLOSE:
-                                /* send disconnect message */
-                                ret = _mei_irq_thread_close(dev, slots,
-                                                     cb_pos, cl, cmpl_list);
-                                if (ret)
-                                        return ret;
-
-                                break;
-                        case MEI_READ:
-                                /* send flow control message */
-                                ret = _mei_irq_thread_read(dev, slots,
-                                                    cb_pos, cl, cmpl_list);
-                                if (ret)
-                                        return ret;
+                cl = (struct mei_cl *) pos->file_private;
+                if (!cl) {
+                        list_del(&pos->cb_list);
+                        return -ENODEV;
+                }
+                switch (pos->major_file_operations) {
+                case MEI_CLOSE:
+                        /* send disconnect message */
+                        ret = _mei_irq_thread_close(dev, slots, pos, cl, cmpl_list);
+                        if (ret)
+                                return ret;
 
-                                break;
-                        case MEI_IOCTL:
-                                /* connect message */
-                                if (!mei_other_client_is_connecting(dev,
-                                                cl))
-                                        continue;
-                                ret = _mei_irq_thread_ioctl(dev, slots,
-                                                     cb_pos, cl, cmpl_list);
-                                if (ret)
-                                        return ret;
+                        break;
+                case MEI_READ:
+                        /* send flow control message */
+                        ret = _mei_irq_thread_read(dev, slots, pos, cl, cmpl_list);
+                        if (ret)
+                                return ret;
 
-                                break;
+                        break;
+                case MEI_IOCTL:
+                        /* connect message */
+                        if (mei_other_client_is_connecting(dev, cl))
+                                continue;
+                        ret = _mei_irq_thread_ioctl(dev, slots, pos, cl, cmpl_list);
+                        if (ret)
+                                return ret;
 
-                        default:
-                                BUG();
-                        }
+                        break;
 
+                default:
+                        BUG();
                 }
+
         }
         /* complete  write list CB */
-        if (!dev->write_list.status &&
-            !list_empty(&dev->write_list.mei_cb.cb_list)) {
-                dev_dbg(&dev->pdev->dev, "complete write list cb.\n");
-                list_for_each_entry_safe(cb_pos, cb_next,
-                                &dev->write_list.mei_cb.cb_list, cb_list) {
-                        cl = (struct mei_cl *)cb_pos->file_private;
-
-                        if (cl) {
-                                if (cl != &dev->iamthif_cl) {
-                                        if (!mei_flow_ctrl_creds(dev,
-                                                cl)) {
-                                                dev_dbg(&dev->pdev->dev,
-                                                        "No flow control"
-                                                    " credentials for client"
-                                                    " %d, not sending.\n",
-                                                    cl->host_client_id);
-                                                continue;
-                                        }
-                                        ret = _mei_irq_thread_cmpl(dev, slots,
-                                                            cb_pos,
-                                                            cl, cmpl_list);
-                                        if (ret)
-                                                return ret;
-
-                                } else if (cl == &dev->iamthif_cl) {
-                                        /* IAMTHIF IOCTL */
-                                        dev_dbg(&dev->pdev->dev, "complete amthi write cb.\n");
-                                        if (!mei_flow_ctrl_creds(dev,
-                                                        cl)) {
-                                                dev_dbg(&dev->pdev->dev,
-                                                        "No flow control"
-                                                    " credentials for amthi"
-                                                    " client %d.\n",
-                                                    cl->host_client_id);
-                                                continue;
-                                        }
-                                        ret = _mei_irq_thread_cmpl_iamthif(dev,
-                                                                slots,
-                                                                cb_pos,
-                                                                cl,
-                                                                cmpl_list);
-                                        if (ret)
-                                                return ret;
-
-                                }
+        dev_dbg(&dev->pdev->dev, "complete write list cb.\n");
+        list_for_each_entry_safe(pos, next,
+                        &dev->write_list.mei_cb.cb_list, cb_list) {
+                cl = (struct mei_cl *)pos->file_private;
+                if (cl == NULL)
+                        continue;
+
+                if (cl != &dev->iamthif_cl) {
+                        if (!mei_flow_ctrl_creds(dev, cl)) {
+                                dev_dbg(&dev->pdev->dev,
+                                        "No flow control"
+                                    " credentials for client"
+                                    " %d, not sending.\n",
+                                    cl->host_client_id);
+                                continue;
+                        }
+                        ret = _mei_irq_thread_cmpl(dev, slots,
+                                            pos,
+                                            cl, cmpl_list);
+                        if (ret)
+                                return ret;
+
+                } else if (cl == &dev->iamthif_cl) {
+                        /* IAMTHIF IOCTL */
+                        dev_dbg(&dev->pdev->dev, "complete amthi write cb.\n");
+                        if (!mei_flow_ctrl_creds(dev, cl)) {
+                                dev_dbg(&dev->pdev->dev,
+                                        "No flow control"
+                                    " credentials for amthi"
+                                    " client %d.\n",
+                                    cl->host_client_id);
+                                continue;
                         }
+                        ret = _mei_irq_thread_cmpl_iamthif(dev,
+                                                slots,
+                                                pos,
+                                                cl,
+                                                cmpl_list);
+                        if (ret)
+                                return ret;
 
                 }
+
         }
         return 0;
 }
@@ -1502,18 +1461,13 @@ void mei_timer(struct work_struct *work)
                         amthi_complete_list = &dev->amthi_read_complete_list.
                                         mei_cb.cb_list;
 
-                        if (!list_empty(amthi_complete_list)) {
-
-                                list_for_each_entry_safe(cb_pos, cb_next,
-                                                        amthi_complete_list,
-                                                        cb_list) {
+                        list_for_each_entry_safe(cb_pos, cb_next, amthi_complete_list, cb_list) {
 
-                                        cl_pos = cb_pos->file_object->private_data;
+                                cl_pos = cb_pos->file_object->private_data;
 
-                                        /* Finding the AMTHI entry. */
-                                        if (cl_pos ==   &dev->iamthif_cl)
-                                                list_del(&cb_pos->cb_list);
-                                }
+                                /* Finding the AMTHI entry. */
+                                if (cl_pos == &dev->iamthif_cl)
+                                        list_del(&cb_pos->cb_list);
                         }
                         if (dev->iamthif_current_cb)
                                 mei_free_cb_private(dev->iamthif_current_cb);
@@ -1527,8 +1481,8 @@ void mei_timer(struct work_struct *work)
                 }
         }
 out:
-         schedule_delayed_work(&dev->timer_work, 2 * HZ);
-         mutex_unlock(&dev->device_lock);
+        schedule_delayed_work(&dev->timer_work, 2 * HZ);
+        mutex_unlock(&dev->device_lock);
 }
 
 /**
@@ -1624,7 +1578,7 @@ end:
                 wake_up_interruptible(&dev->wait_recvd_msg);
                 bus_message_received = false;
         }
-        if (complete_list.status || list_empty(&complete_list.mei_cb.cb_list))
+        if (list_empty(&complete_list.mei_cb.cb_list))
                 return IRQ_HANDLED;
 
 
diff --git a/drivers/staging/mei/iorw.c b/drivers/staging/mei/iorw.c
index 8a61d1266515..0752ead4269a 100644
--- a/drivers/staging/mei/iorw.c
+++ b/drivers/staging/mei/iorw.c
@@ -228,18 +228,15 @@ struct mei_cl_cb *find_amthi_read_list_entry(
                 struct file *file)
 {
         struct mei_cl *cl_temp;
-        struct mei_cl_cb *cb_pos = NULL;
-        struct mei_cl_cb *cb_next = NULL;
-
-        if (!dev->amthi_read_complete_list.status &&
-            !list_empty(&dev->amthi_read_complete_list.mei_cb.cb_list)) {
-                list_for_each_entry_safe(cb_pos, cb_next,
-                    &dev->amthi_read_complete_list.mei_cb.cb_list, cb_list) {
-                        cl_temp = (struct mei_cl *)cb_pos->file_private;
-                        if (cl_temp && cl_temp == &dev->iamthif_cl &&
-                                cb_pos->file_object == file)
-                                return cb_pos;
-                }
+        struct mei_cl_cb *pos = NULL;
+        struct mei_cl_cb *next = NULL;
+
+        list_for_each_entry_safe(pos, next,
+            &dev->amthi_read_complete_list.mei_cb.cb_list, cb_list) {
+                cl_temp = (struct mei_cl *)pos->file_private;
+                if (cl_temp && cl_temp == &dev->iamthif_cl &&
+                        pos->file_object == file)
+                        return pos;
         }
         return NULL;
 }
@@ -262,7 +259,7 @@ struct mei_cl_cb *find_amthi_read_list_entry(
  *  negative on failure.
  */
 int amthi_read(struct mei_device *dev, struct file *file,
-              char __user *ubuf, size_t length, loff_t *offset)
+               char __user *ubuf, size_t length, loff_t *offset)
 {
         int rets;
         int wait_ret;
@@ -334,8 +331,7 @@ int amthi_read(struct mei_device *dev, struct file *file,
                 }
         }
         /* if the whole message will fit remove it from the list */
-        if (cb->information >= *offset &&
-            length >= (cb->information - *offset))
+        if (cb->information >= *offset && length >= (cb->information - *offset))
                 list_del(&cb->cb_list);
         else if (cb->information > 0 && cb->information <= *offset) {
                 /* end of the message has been reached */
@@ -356,9 +352,7 @@ int amthi_read(struct mei_device *dev, struct file *file,
          * the information may be longer */
         length = min_t(size_t, length, (cb->information - *offset));
 
-        if (copy_to_user(ubuf,
-                         cb->response_buffer.data + *offset,
-                         length))
+        if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length))
                 rets = -EFAULT;
         else {
                 rets = length;
@@ -427,7 +421,7 @@ int mei_start_read(struct mei_device *dev, struct mei_cl *cl)
 
         cb->response_buffer.size = dev->me_clients[i].props.max_msg_length;
         cb->response_buffer.data =
-            kmalloc(cb->response_buffer.size, GFP_KERNEL);
+                        kmalloc(cb->response_buffer.size, GFP_KERNEL);
         if (!cb->response_buffer.data) {
                 rets = -ENOMEM;
                 goto unlock;
@@ -448,8 +442,7 @@ int mei_start_read(struct mei_device *dev, struct mei_cl *cl)
                                       &dev->read_list.mei_cb.cb_list);
                 }
         } else {
-                list_add_tail(&cb->cb_list,
-                              &dev->ctrl_wr_list.mei_cb.cb_list);
+                list_add_tail(&cb->cb_list, &dev->ctrl_wr_list.mei_cb.cb_list);
         }
         return rets;
 unlock:
@@ -482,7 +475,7 @@ int amthi_write(struct mei_device *dev, struct mei_cl_cb *cb)
         dev->iamthif_ioctl = true;
         dev->iamthif_msg_buf_size = cb->request_buffer.size;
         memcpy(dev->iamthif_msg_buf, cb->request_buffer.data,
-            cb->request_buffer.size);
+               cb->request_buffer.size);
 
         ret = mei_flow_ctrl_creds(dev, &dev->iamthif_cl);
         if (ret < 0)
@@ -534,8 +527,7 @@ int amthi_write(struct mei_device *dev, struct mei_cl_cb *cb)
 
                 dev_dbg(&dev->pdev->dev, "No flow control credentials, "
                                 "so add iamthif cb to write list.\n");
-                list_add_tail(&cb->cb_list,
-                              &dev->write_list.mei_cb.cb_list);
+                list_add_tail(&cb->cb_list, &dev->write_list.mei_cb.cb_list);
         }
         return 0;
 }
@@ -550,8 +542,8 @@ int amthi_write(struct mei_device *dev, struct mei_cl_cb *cb)
 void mei_run_next_iamthif_cmd(struct mei_device *dev)
 {
         struct mei_cl *cl_tmp;
-        struct mei_cl_cb *cb_pos = NULL;
-        struct mei_cl_cb *cb_next = NULL;
+        struct mei_cl_cb *pos = NULL;
+        struct mei_cl_cb *next = NULL;
         int status;
 
         if (!dev)
@@ -565,25 +557,22 @@ void mei_run_next_iamthif_cmd(struct mei_device *dev)
         dev->iamthif_timer = 0;
         dev->iamthif_file_object = NULL;
 
-        if (dev->amthi_cmd_list.status == 0 &&
-            !list_empty(&dev->amthi_cmd_list.mei_cb.cb_list)) {
-                dev_dbg(&dev->pdev->dev, "complete amthi cmd_list cb.\n");
-
-                list_for_each_entry_safe(cb_pos, cb_next,
-                    &dev->amthi_cmd_list.mei_cb.cb_list, cb_list) {
-                        list_del(&cb_pos->cb_list);
-                        cl_tmp = (struct mei_cl *)cb_pos->file_private;
-
-                        if (cl_tmp && cl_tmp == &dev->iamthif_cl) {
-                                status = amthi_write(dev, cb_pos);
-                                if (status) {
-                                        dev_dbg(&dev->pdev->dev,
-                                                "amthi write failed status = %d\n",
-                                                        status);
-                                        return;
-                                }
-                                break;
+        dev_dbg(&dev->pdev->dev, "complete amthi cmd_list cb.\n");
+
+        list_for_each_entry_safe(pos, next,
+                        &dev->amthi_cmd_list.mei_cb.cb_list, cb_list) {
+                list_del(&pos->cb_list);
+                cl_tmp = (struct mei_cl *)pos->file_private;
+
+                if (cl_tmp && cl_tmp == &dev->iamthif_cl) {
+                        status = amthi_write(dev, pos);
+                        if (status) {
+                                dev_dbg(&dev->pdev->dev,
+                                        "amthi write failed status = %d\n",
+                                                status);
+                                return;
                         }
+                        break;
                 }
         }
 }
diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c
index eb05c36f45d4..1e1a9f996e7c 100644
--- a/drivers/staging/mei/main.c
+++ b/drivers/staging/mei/main.c
@@ -33,6 +33,7 @@
 #include <linux/compat.h>
 #include <linux/jiffies.h>
 #include <linux/interrupt.h>
+#include <linux/miscdevice.h>
 
 #include "mei_dev.h"
 #include "mei.h"
@@ -51,18 +52,10 @@ static char mei_driver_name[] = MEI_DRIVER_NAME;
 static const char mei_driver_string[] = "Intel(R) Management Engine Interface";
 static const char mei_driver_version[] = MEI_DRIVER_VERSION;
 
-/* mei char device for registration */
-static struct cdev mei_cdev;
-
-/* major number for device */
-static int mei_major;
 /* The device pointer */
 /* Currently this driver works as long as there is only a single AMT device. */
 struct pci_dev *mei_device;
 
-static struct class *mei_class;
-
-
 /* mei_pci_tbl - PCI Device ID Table */
 static DEFINE_PCI_DEVICE_TABLE(mei_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82946GZ)},
@@ -105,173 +98,6 @@ MODULE_DEVICE_TABLE(pci, mei_pci_tbl);
 
 static DEFINE_MUTEX(mei_mutex);
 
-/**
- * mei_probe - Device Initialization Routine
- *
- * @pdev: PCI device structure
- * @ent: entry in kcs_pci_tbl
- *
- * returns 0 on success, <0 on failure.
- */
-static int __devinit mei_probe(struct pci_dev *pdev,
-                                const struct pci_device_id *ent)
-{
-        struct mei_device *dev;
-        int err;
-
-        mutex_lock(&mei_mutex);
-        if (mei_device) {
-                err = -EEXIST;
-                goto end;
-        }
-        /* enable pci dev */
-        err = pci_enable_device(pdev);
-        if (err) {
-                printk(KERN_ERR "mei: Failed to enable pci device.\n");
-                goto end;
-        }
-        /* set PCI host mastering  */
-        pci_set_master(pdev);
-        /* pci request regions for mei driver */
-        err = pci_request_regions(pdev, mei_driver_name);
-        if (err) {
-                printk(KERN_ERR "mei: Failed to get pci regions.\n");
-                goto disable_device;
-        }
-        /* allocates and initializes the mei dev structure */
-        dev = mei_device_init(pdev);
-        if (!dev) {
-                err = -ENOMEM;
-                goto release_regions;
-        }
-        /* mapping  IO device memory */
-        dev->mem_addr = pci_iomap(pdev, 0, 0);
-        if (!dev->mem_addr) {
-                printk(KERN_ERR "mei: mapping I/O device memory failure.\n");
-                err = -ENOMEM;
-                goto free_device;
-        }
-        pci_enable_msi(pdev);
-
-         /* request and enable interrupt */
-        if (pci_dev_msi_enabled(pdev))
-                err = request_threaded_irq(pdev->irq,
-                        NULL,
-                        mei_interrupt_thread_handler,
-                        0, mei_driver_name, dev);
-        else
-                err = request_threaded_irq(pdev->irq,
-                        mei_interrupt_quick_handler,
-                        mei_interrupt_thread_handler,
-                        IRQF_SHARED, mei_driver_name, dev);
-
-        if (err) {
-                printk(KERN_ERR "mei: request_threaded_irq failure. irq = %d\n",
-                       pdev->irq);
-                goto unmap_memory;
-        }
-        INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
-        if (mei_hw_init(dev)) {
-                printk(KERN_ERR "mei: Init hw failure.\n");
-                err = -ENODEV;
-                goto release_irq;
-        }
-        mei_device = pdev;
-        pci_set_drvdata(pdev, dev);
-        schedule_delayed_work(&dev->timer_work, HZ);
-
-        mutex_unlock(&mei_mutex);
-
-        pr_debug("mei: Driver initialization successful.\n");
-
-        return 0;
-
-release_irq:
-        /* disable interrupts */
-        dev->host_hw_state = mei_hcsr_read(dev);
-        mei_disable_interrupts(dev);
-        flush_scheduled_work();
-        free_irq(pdev->irq, dev);
-        pci_disable_msi(pdev);
-unmap_memory:
-        pci_iounmap(pdev, dev->mem_addr);
-free_device:
-        kfree(dev);
-release_regions:
-        pci_release_regions(pdev);
-disable_device:
-        pci_disable_device(pdev);
-end:
-        mutex_unlock(&mei_mutex);
-        printk(KERN_ERR "mei: Driver initialization failed.\n");
-        return err;
-}
-
-/**
- * mei_remove - Device Removal Routine
- *
- * @pdev: PCI device structure
- *
- * mei_remove is called by the PCI subsystem to alert the driver
- * that it should release a PCI device.
- */
-static void __devexit mei_remove(struct pci_dev *pdev)
-{
-        struct mei_device *dev;
-
-        if (mei_device != pdev)
-                return;
-
-        dev = pci_get_drvdata(pdev);
-        if (!dev)
-                return;
-
-        mutex_lock(&dev->device_lock);
-
-        mei_wd_stop(dev, false);
-
-        mei_device = NULL;
-
-        if (dev->iamthif_cl.state == MEI_FILE_CONNECTED) {
-                dev->iamthif_cl.state = MEI_FILE_DISCONNECTING;
-                mei_disconnect_host_client(dev, &dev->iamthif_cl);
-        }
-        if (dev->wd_cl.state == MEI_FILE_CONNECTED) {
-                dev->wd_cl.state = MEI_FILE_DISCONNECTING;
-                mei_disconnect_host_client(dev, &dev->wd_cl);
-        }
-
-        /* Unregistering watchdog device */
-        if (dev->wd_interface_reg)
-                watchdog_unregister_device(&amt_wd_dev);
-
-        /* remove entry if already in list */
-        dev_dbg(&pdev->dev, "list del iamthif and wd file list.\n");
-        mei_remove_client_from_file_list(dev, dev->wd_cl.host_client_id);
-        mei_remove_client_from_file_list(dev, dev->iamthif_cl.host_client_id);
-
-        dev->iamthif_current_cb = NULL;
-        dev->me_clients_num = 0;
-
-        mutex_unlock(&dev->device_lock);
-
-        flush_scheduled_work();
-
-        /* disable interrupts */
-        mei_disable_interrupts(dev);
-
-        free_irq(pdev->irq, dev);
-        pci_disable_msi(pdev);
-        pci_set_drvdata(pdev, NULL);
-
-        if (dev->mem_addr)
-                pci_iounmap(pdev, dev->mem_addr);
-
-        kfree(dev);
-
-        pci_release_regions(pdev);
-        pci_disable_device(pdev);
-}
 
 /**
  * mei_clear_list - removes all callbacks associated with file
@@ -372,21 +198,17 @@ static struct mei_cl_cb *find_read_list_entry(
                 struct mei_device *dev,
                 struct mei_cl *cl)
 {
-        struct mei_cl_cb *cb_pos = NULL;
-        struct mei_cl_cb *cb_next = NULL;
-
-        if (!dev->read_list.status &&
-            !list_empty(&dev->read_list.mei_cb.cb_list)) {
+        struct mei_cl_cb *pos = NULL;
+        struct mei_cl_cb *next = NULL;
 
-                dev_dbg(&dev->pdev->dev, "remove read_list CB\n");
-                list_for_each_entry_safe(cb_pos, cb_next,
-                                &dev->read_list.mei_cb.cb_list, cb_list) {
-                        struct mei_cl *cl_temp;
-                        cl_temp = (struct mei_cl *)cb_pos->file_private;
+        dev_dbg(&dev->pdev->dev, "remove read_list CB\n");
+        list_for_each_entry_safe(pos, next,
+                        &dev->read_list.mei_cb.cb_list, cb_list) {
+                struct mei_cl *cl_temp;
+                cl_temp = (struct mei_cl *)pos->file_private;
 
-                        if (mei_cl_cmp_id(cl, cl_temp))
-                                return cb_pos;
-                }
+                if (mei_cl_cmp_id(cl, cl_temp))
+                        return pos;
         }
         return NULL;
 }
@@ -402,15 +224,16 @@ static struct mei_cl_cb *find_read_list_entry(
 static int mei_open(struct inode *inode, struct file *file)
 {
         struct mei_cl *cl;
-        int if_num = iminor(inode), err;
         struct mei_device *dev;
+        unsigned long cl_id;
+        int err;
 
         err = -ENODEV;
         if (!mei_device)
                 goto out;
 
         dev = pci_get_drvdata(mei_device);
-        if (if_num != MEI_MINOR_NUMBER || !dev)
+        if (!dev)
                 goto out;
 
         mutex_lock(&dev->device_lock);
@@ -429,14 +252,16 @@ static int mei_open(struct inode *inode, struct file *file)
         if (dev->open_handle_count >= MEI_MAX_OPEN_HANDLE_COUNT)
                 goto out_unlock;
 
-        cl->host_client_id = find_first_zero_bit(dev->host_clients_map,
-                                                        MEI_CLIENTS_MAX);
-        if (cl->host_client_id > MEI_CLIENTS_MAX)
+        cl_id = find_first_zero_bit(dev->host_clients_map, MEI_CLIENTS_MAX);
+        if (cl_id >= MEI_CLIENTS_MAX)
                 goto out_unlock;
 
+        cl->host_client_id  = cl_id;
+
         dev_dbg(&dev->pdev->dev, "client_id = %d\n", cl->host_client_id);
 
         dev->open_handle_count++;
+
         list_add_tail(&cl->link, &dev->file_list);
 
         set_bit(cl->host_client_id, dev->host_clients_map);
@@ -446,7 +271,7 @@ static int mei_open(struct inode *inode, struct file *file)
         file->private_data = cl;
         mutex_unlock(&dev->device_lock);
 
-        return 0;
+        return nonseekable_open(inode, file);
 
 out_unlock:
         mutex_unlock(&dev->device_lock);
@@ -492,8 +317,7 @@ static int mei_release(struct inode *inode, struct file *file)
                     cl->me_client_id);
 
                 if (dev->open_handle_count > 0) {
-                        clear_bit(cl->host_client_id,
-                                  dev->host_clients_map);
+                        clear_bit(cl->host_client_id, dev->host_clients_map);
                         dev->open_handle_count--;
                 }
                 mei_remove_client_from_file_list(dev, cl->host_client_id);
@@ -554,7 +378,7 @@ static int mei_release(struct inode *inode, struct file *file)
  * returns >=0 data length on success , <0 on error
  */
 static ssize_t mei_read(struct file *file, char __user *ubuf,
-                         size_t length, loff_t *offset)
+                        size_t length, loff_t *offset)
 {
         struct mei_cl *cl = file->private_data;
         struct mei_cl_cb *cb_pos = NULL;
@@ -673,9 +497,7 @@ copy_buffer:
         /* information size may be longer */
         length = min_t(size_t, length, (cb->information - *offset));
 
-        if (copy_to_user(ubuf,
-                         cb->response_buffer.data + *offset,
-                         length)) {
+        if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length)) {
                 rets = -EFAULT;
                 goto free;
         }
@@ -711,7 +533,7 @@ out:
  * returns >=0 data length on success , <0 on error
  */
 static ssize_t mei_write(struct file *file, const char __user *ubuf,
-                          size_t length, loff_t *offset)
+                         size_t length, loff_t *offset)
 {
         struct mei_cl *cl = file->private_data;
         struct mei_cl_cb *write_cb = NULL;
@@ -762,8 +584,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                         cl->read_cb = NULL;
                         cl->read_pending = 0;
                 }
-        } else if (cl->reading_state == MEI_IDLE &&
-                   !cl->read_pending)
+        } else if (cl->reading_state == MEI_IDLE && !cl->read_pending)
                 *offset = 0;
 
 
@@ -1034,7 +855,7 @@ out:
  */
 #ifdef CONFIG_COMPAT
 static long mei_compat_ioctl(struct file *file,
-                      unsigned int cmd, unsigned long data)
+                        unsigned int cmd, unsigned long data)
 {
         return mei_ioctl(file, cmd, (unsigned long)compat_ptr(data));
 }
@@ -1090,6 +911,206 @@ out:
         return mask;
 }
 
+/*
+ * file operations structure will be used for mei char device.
+ */
+static const struct file_operations mei_fops = {
+        .owner = THIS_MODULE,
+        .read = mei_read,
+        .unlocked_ioctl = mei_ioctl,
+#ifdef CONFIG_COMPAT
+        .compat_ioctl = mei_compat_ioctl,
+#endif
+        .open = mei_open,
+        .release = mei_release,
+        .write = mei_write,
+        .poll = mei_poll,
+        .llseek = no_llseek
+};
+
+
+/*
+ * Misc Device Struct
+ */
+static struct miscdevice  mei_misc_device = {
+                .name = MEI_DRIVER_NAME,
+                .fops = &mei_fops,
+                .minor = MISC_DYNAMIC_MINOR,
+};
+
+/**
+ * mei_probe - Device Initialization Routine
+ *
+ * @pdev: PCI device structure
+ * @ent: entry in kcs_pci_tbl
+ *
+ * returns 0 on success, <0 on failure.
+ */
+static int __devinit mei_probe(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        struct mei_device *dev;
+        int err;
+
+        mutex_lock(&mei_mutex);
+        if (mei_device) {
+                err = -EEXIST;
+                goto end;
+        }
+        /* enable pci dev */
+        err = pci_enable_device(pdev);
+        if (err) {
+                printk(KERN_ERR "mei: Failed to enable pci device.\n");
+                goto end;
+        }
+        /* set PCI host mastering  */
+        pci_set_master(pdev);
+        /* pci request regions for mei driver */
+        err = pci_request_regions(pdev, mei_driver_name);
+        if (err) {
+                printk(KERN_ERR "mei: Failed to get pci regions.\n");
+                goto disable_device;
+        }
+        /* allocates and initializes the mei dev structure */
+        dev = mei_device_init(pdev);
+        if (!dev) {
+                err = -ENOMEM;
+                goto release_regions;
+        }
+        /* mapping  IO device memory */
+        dev->mem_addr = pci_iomap(pdev, 0, 0);
+        if (!dev->mem_addr) {
+                printk(KERN_ERR "mei: mapping I/O device memory failure.\n");
+                err = -ENOMEM;
+                goto free_device;
+        }
+        pci_enable_msi(pdev);
+
+         /* request and enable interrupt */
+        if (pci_dev_msi_enabled(pdev))
+                err = request_threaded_irq(pdev->irq,
+                        NULL,
+                        mei_interrupt_thread_handler,
+                        0, mei_driver_name, dev);
+        else
+                err = request_threaded_irq(pdev->irq,
+                        mei_interrupt_quick_handler,
+                        mei_interrupt_thread_handler,
+                        IRQF_SHARED, mei_driver_name, dev);
+
+        if (err) {
+                printk(KERN_ERR "mei: request_threaded_irq failure. irq = %d\n",
+                       pdev->irq);
+                goto unmap_memory;
+        }
+        INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
+        if (mei_hw_init(dev)) {
+                printk(KERN_ERR "mei: Init hw failure.\n");
+                err = -ENODEV;
+                goto release_irq;
+        }
+
+        err = misc_register(&mei_misc_device);
+        if (err)
+                goto release_irq;
+
+        mei_device = pdev;
+        pci_set_drvdata(pdev, dev);
+
+
+        schedule_delayed_work(&dev->timer_work, HZ);
+
+        mutex_unlock(&mei_mutex);
+
+        pr_debug("mei: Driver initialization successful.\n");
+
+        return 0;
+
+release_irq:
+        /* disable interrupts */
+        dev->host_hw_state = mei_hcsr_read(dev);
+        mei_disable_interrupts(dev);
+        flush_scheduled_work();
+        free_irq(pdev->irq, dev);
+        pci_disable_msi(pdev);
+unmap_memory:
+        pci_iounmap(pdev, dev->mem_addr);
+free_device:
+        kfree(dev);
+release_regions:
+        pci_release_regions(pdev);
+disable_device:
+        pci_disable_device(pdev);
+end:
+        mutex_unlock(&mei_mutex);
+        printk(KERN_ERR "mei: Driver initialization failed.\n");
+        return err;
+}
+
+/**
+ * mei_remove - Device Removal Routine
+ *
+ * @pdev: PCI device structure
+ *
+ * mei_remove is called by the PCI subsystem to alert the driver
+ * that it should release a PCI device.
+ */
+static void __devexit mei_remove(struct pci_dev *pdev)
+{
+        struct mei_device *dev;
+
+        if (mei_device != pdev)
+                return;
+
+        dev = pci_get_drvdata(pdev);
+        if (!dev)
+                return;
+
+        mutex_lock(&dev->device_lock);
+
+        mei_wd_stop(dev, false);
+
+        mei_device = NULL;
+
+        if (dev->iamthif_cl.state == MEI_FILE_CONNECTED) {
+                dev->iamthif_cl.state = MEI_FILE_DISCONNECTING;
+                mei_disconnect_host_client(dev, &dev->iamthif_cl);
+        }
+        if (dev->wd_cl.state == MEI_FILE_CONNECTED) {
+                dev->wd_cl.state = MEI_FILE_DISCONNECTING;
+                mei_disconnect_host_client(dev, &dev->wd_cl);
+        }
+
+        /* Unregistering watchdog device */
+        mei_watchdog_unregister(dev);
+
+        /* remove entry if already in list */
+        dev_dbg(&pdev->dev, "list del iamthif and wd file list.\n");
+        mei_remove_client_from_file_list(dev, dev->wd_cl.host_client_id);
+        mei_remove_client_from_file_list(dev, dev->iamthif_cl.host_client_id);
+
+        dev->iamthif_current_cb = NULL;
+        dev->me_clients_num = 0;
+
+        mutex_unlock(&dev->device_lock);
+
+        flush_scheduled_work();
+
+        /* disable interrupts */
+        mei_disable_interrupts(dev);
+
+        free_irq(pdev->irq, dev);
+        pci_disable_msi(pdev);
+        pci_set_drvdata(pdev, NULL);
+
+        if (dev->mem_addr)
+                pci_iounmap(pdev, dev->mem_addr);
+
+        kfree(dev);
+
+        pci_release_regions(pdev);
+        pci_disable_device(pdev);
+}
 #ifdef CONFIG_PM
 static int mei_pci_suspend(struct device *device)
 {
@@ -1173,131 +1194,6 @@ static struct pci_driver mei_driver = {
         .driver.pm = MEI_PM_OPS,
 };
 
-/*
- * file operations structure will be used for mei char device.
- */
-static const struct file_operations mei_fops = {
-        .owner = THIS_MODULE,
-        .read = mei_read,
-        .unlocked_ioctl = mei_ioctl,
-#ifdef CONFIG_COMPAT
-        .compat_ioctl = mei_compat_ioctl,
-#endif
-        .open = mei_open,
-        .release = mei_release,
-        .write = mei_write,
-        .poll = mei_poll,
-};
-
-/**
- * mei_registration_cdev - sets up the cdev structure for mei device.
- *
- * @dev: char device struct
- * @hminor: minor number for registration char device
- * @fops: file operations structure
- *
- * returns 0 on success, <0 on failure.
- */
-static int mei_registration_cdev(struct cdev *dev, int hminor,
-                                  const struct file_operations *fops)
-{
-        int ret, devno = MKDEV(mei_major, hminor);
-
-        cdev_init(dev, fops);
-        dev->owner = THIS_MODULE;
-        ret = cdev_add(dev, devno, 1);
-        /* Fail gracefully if need be */
-        if (ret)
-                printk(KERN_ERR "mei: Error %d registering mei device %d\n",
-                       ret, hminor);
-        return ret;
-}
-
-/**
- * mei_register_cdev - registers mei char device
- *
- * returns 0 on success, <0 on failure.
- */
-static int mei_register_cdev(void)
-{
-        int ret;
-        dev_t dev;
-
-        /* registration of char devices */
-        ret = alloc_chrdev_region(&dev, MEI_MINORS_BASE, MEI_MINORS_COUNT,
-                                  MEI_DRIVER_NAME);
-        if (ret) {
-                printk(KERN_ERR "mei: Error allocating char device region.\n");
-                return ret;
-        }
-
-        mei_major = MAJOR(dev);
-
-        ret = mei_registration_cdev(&mei_cdev, MEI_MINOR_NUMBER,
-                                     &mei_fops);
-        if (ret)
-                unregister_chrdev_region(MKDEV(mei_major, MEI_MINORS_BASE),
-                                         MEI_MINORS_COUNT);
-
-        return ret;
-}
-
-/**
- * mei_unregister_cdev - unregisters mei char device
- */
-static void mei_unregister_cdev(void)
-{
-        cdev_del(&mei_cdev);
-        unregister_chrdev_region(MKDEV(mei_major, MEI_MINORS_BASE),
-                                 MEI_MINORS_COUNT);
-}
-
-/**
- * mei_sysfs_device_create - adds device entry to sysfs
- *
- * returns 0 on success, <0 on failure.
- */
-static int mei_sysfs_device_create(void)
-{
-        struct class *class;
-        void *tmphdev;
-        int err;
-
-        class = class_create(THIS_MODULE, MEI_DRIVER_NAME);
-        if (IS_ERR(class)) {
-                err = PTR_ERR(class);
-                printk(KERN_ERR "mei: Error creating mei class.\n");
-                goto err_out;
-        }
-
-        tmphdev = device_create(class, NULL, mei_cdev.dev, NULL,
-                                        MEI_DEV_NAME);
-        if (IS_ERR(tmphdev)) {
-                err = PTR_ERR(tmphdev);
-                goto err_destroy;
-        }
-
-        mei_class = class;
-        return 0;
-
-err_destroy:
-        class_destroy(class);
-err_out:
-        return err;
-}
-
-/**
- * mei_sysfs_device_remove - unregisters the device entry on sysfs
- */
-static void mei_sysfs_device_remove(void)
-{
-        if (IS_ERR_OR_NULL(mei_class))
-                return;
-
-        device_destroy(mei_class, mei_cdev.dev);
-        class_destroy(mei_class);
-}
-
 /**
  * mei_init_module - Driver Registration Routine
  *
@@ -1314,26 +1210,9 @@ static int __init mei_init_module(void)
                 mei_driver_string, mei_driver_version);
         /* init pci module */
         ret = pci_register_driver(&mei_driver);
-        if (ret < 0) {
+        if (ret < 0)
                 printk(KERN_ERR "mei: Error registering driver.\n");
-                goto end;
-        }
 
-        ret = mei_register_cdev();
-        if (ret)
-                goto unregister_pci;
-
-        ret = mei_sysfs_device_create();
-        if (ret)
-                goto unregister_cdev;
-
-        return ret;
-
-unregister_cdev:
-        mei_unregister_cdev();
-unregister_pci:
-        pci_unregister_driver(&mei_driver);
-end:
         return ret;
 }
 
@@ -1347,8 +1226,7 @@ module_init(mei_init_module);
  */
 static void __exit mei_exit_module(void)
 {
-        mei_sysfs_device_remove();
-        mei_unregister_cdev();
+        misc_deregister(&mei_misc_device);
         pci_unregister_driver(&mei_driver);
 
         pr_debug("mei: Driver unloaded successfully.\n");
diff --git a/drivers/staging/mei/mei.txt b/drivers/staging/mei/mei.txt
index 17302ad2531f..516bfe7319a6 100644
--- a/drivers/staging/mei/mei.txt
+++ b/drivers/staging/mei/mei.txt
@@ -1,78 +1,74 @@
-Intel MEI
+Intel(R) Management Engine Interface (Intel(R) MEI)
 =======================
 
 Introduction
 =======================
 
-The Intel Management Engine (Intel ME) is an isolated and
-protected computing resource (Coprocessor) residing inside
-Intel chipsets. The Intel ME provides support for computer/IT
-management features.
-The Feature set depends on the Intel chipset SKU.
+The Intel Management Engine (Intel ME) is an isolated andprotected computing
+resource (Co-processor) residing inside certain Intel chipsets. The Intel ME
+provides support for computer/IT management features. The feature set
+depends on the Intel chipset SKU.
 
-The Intel Management Engine Interface (Intel MEI, previously known
-as HECI) is the interface between the Host and Intel ME.
-This interface is exposed to the host as a PCI device.
-The Intel MEI Driver is in charge of the communication channel
-between a host application and the ME feature.
+The Intel Management Engine Interface (Intel MEI, previously known as HECI)
+is the interface between the Host and Intel ME. This interface is exposed
+to the host as a PCI device. The Intel MEI Driver is in charge of the
+communication channel between a host application and the Intel ME feature.
 
-Each Intel ME feature (Intel ME Client) is addressed by
-GUID/UUID and each feature defines its own protocol.
-The protocol is message-based with a header and payload up to
-512 bytes.
+Each Intel ME feature (Intel ME Client) is addressed by a GUID/UUID and
+each client has its own protocol. The protocol is message-based with a
+header and payload up to 512 bytes.
 
-[place holder to URL to protocol definitions]
-
-Prominent usage of the Interface is to communicate with
-Intel Active Management Technology (Intel AMT)
-implemented in firmware running on the Intel ME.
+Prominent usage of the Intel ME Interface is to communicate with Intel(R)
+Active Management Technology (Intel AMT)implemented in firmware running on
+the Intel ME.
 
 Intel AMT provides the ability to manage a host remotely out-of-band (OOB)
-even when the host processor has crashed or is in a sleep state.
+even when the operating system running on the host processor has crashed or
+is in a sleep state.
 
 Some examples of Intel AMT usage are:
    - Monitoring hardware state and platform components
-   - Remote power off/on (useful for green computing or overnight IT maintenance)
+   - Remote power off/on (useful for green computing or overnight IT
+     maintenance)
    - OS updates
    - Storage of useful platform information such as software assets
-   - built-in hardware KVM
-   - selective network isolation of Ethernet and IP protocol flows based on
-     policies set by a remote management console
+   - Built-in hardware KVM
+   - Selective network isolation of Ethernet and IP protocol flows based
+     on policies set by a remote management console
    - IDE device redirection from remote management console
 
 Intel AMT (OOB) communication is based on SOAP (deprecated
-starting with Release 6.0) over HTTP/HTTPS or WS-Management protocol
-over HTTP and HTTPS that are received from a remote
-management console application.
+starting with Release 6.0) over HTTP/S or WS-Management protocol over
+HTTP/S that are received from a remote management console application.
 
 For more information about Intel AMT:
-http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/aboutintelamt.htm
-
+http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide
 
-MEI Driver
+Intel MEI Driver
 =======================
 
-The driver exposes a character device called /dev/mei.
+The driver exposes a misc device called /dev/mei.
 
-An application maintains communication with an ME feature while
-/dev/mei is open. The binding to a specific features is performed
-by calling MEI_CONNECT_CLIENT_IOCTL, which passes the desired UUID.
-The number of instances of an ME feature that can be opened
-at the same time depends on the ME feature, but most of the
+An application maintains communication with an Intel ME feature while
+/dev/mei is open. The binding to a specific features is performed by calling
+MEI_CONNECT_CLIENT_IOCTL, which passes the desired UUID.
+The number of instances of an Intel ME feature that can be opened
+at the same time depends on the Intel ME feature, but most of the
 features allow only a single instance.
 
-
-The Intel AMT Host Interface (AMTHI) feature requires multiple
-simultaneous user applications, therefore the MEI driver handles
+The Intel AMT Host Interface (Intel AMTHI) feature supports multiple
+simultaneous user applications. Therefore, the Intel MEI driver handles
 this internally by maintaining request queues for the applications.
 
-The driver is oblivious to data that are passed between
+The driver is oblivious to data that is passed between firmware feature
+and host application.
 
-Because some of the ME features can change the system
-configuration, the driver by default allows only privileged
+Because some of the Intel ME features can change the system
+configuration, the driver by default allows only a privileged
 user to access it.
 
-A Code snippet for application communicating with AMTHI client:
+A code snippet for an application communicating with
+Intel AMTHI client:
         struct mei_connect_client_data data;
         fd = open(MEI_DEVICE);
 
@@ -80,7 +76,7 @@ A Code snippet for application communicating with AMTHI client:
 
         ioctl(fd, IOCTL_MEI_CONNECT_CLIENT, &data);
 
-        printf(“Ver=%d, MaxLen=%ld\n”,
+        printf("Ver=%d, MaxLen=%ld\n",
                         data.d.in_client_uuid.protocol_version,
                         data.d.in_client_uuid.max_msg_length);
 
@@ -95,76 +91,106 @@ A Code snippet for application communicating with AMTHI client:
         [...]
         close(fd);
 
-ME Applications:
+IOCTL:
+======
+The Intel MEI Driver supports the following IOCTL command:
+        IOCTL_MEI_CONNECT_CLIENT        Connect to firmware Feature (client).
+
+        usage:
+                struct mei_connect_client_data clientData;
+                ioctl(fd, IOCTL_MEI_CONNECT_CLIENT, &clientData);
+
+        inputs:
+                mei_connect_client_data struct contain the following
+                input field:
+
+                in_client_uuid -        UUID of the FW Feature that needs
+                                        to connect to.
+        outputs:
+                out_client_properties - Client Properties: MTU and Protocol Version.
+
+        error returns:
+                EINVAL  Wrong IOCTL Number
+                ENODEV  Device or Connection is not initialized or ready.
+                        (e.g. Wrong UUID)
+                ENOMEM  Unable to allocate memory to client internal data.
+                EFAULT  Fatal Error (e.g. Unable to access user input data)
+                EBUSY   Connection Already Open
+
+        Notes:
+        max_msg_length (MTU) in client properties describes the maximum
+        data that can be sent or received. (e.g. if MTU=2K, can send
+        requests up to bytes 2k and received responses upto 2k bytes).
+
+Intel ME Applications:
 ==============
 
 1) Intel Local Management Service (Intel LMS)
-        Applications running locally on the platform communicate with
-        Intel AMT Release 2.0 and later releases in the same way
-        that network applications do via SOAP over HTTP (deprecated
-        starting with Release 6.0) or with WS-Management over SOAP over
-        HTTP. which means that some Intel AMT feature can be access
-        from a local application using same Network interface as for
-        remote application.
-
-        When a local application sends a message addressed to the local
-        Intel AMT host name, the Local Manageability Service (LMS),
-        which listens for traffic directed to the host name, intercepts
-        the message and routes it to the Intel Management Engine Interface.
+
+        Applications running locally on the platform communicate with Intel AMT Release
+        2.0 and later releases in the same way that network applications do via SOAP
+        over HTTP (deprecated starting with Release 6.0) or with WS-Management over
+        SOAP over HTTP. This means that some Intel AMT features can be accessed from a
+        local application using the same network interface as a remote application
+        communicating with Intel AMT over the network.
+
+        When a local application sends a message addressed to the local Intel AMT host
+        name, the Intel LMS, which listens for traffic directed to the host name,
+        intercepts the message and routes it to the Intel MEI.
         For more information:
-        http://software.intel.com/sites/manageability/AMT_Implementation_and_
-        Reference_Guide/WordDocuments/localaccess1.htm
-
-        The LMS opens a connection using the MEI driver to the LMS
-        FW feature using a defined UUID and then communicates with the
-        feature using a protocol
-        called Intel(R) AMT Port Forwarding Protocol (APF protocol).
-        The protocol is used to maintain multiple sessions with
-        Intel AMT from a single application.
-        See the protocol specification in
-        the Intel(R) AMT Implementation and Reference Guide
-        http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/HTMLDocuments/MPSDocuments/Intel%20AMT%20Port%20Forwarding%20Protocol%20Reference%20Manual.pdf
-
-  2) Intel AMT Remote configuration using a Local Agent:
+        http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide
+        Under "About Intel AMT" => "Local Access"
+
+        For downloading Intel LMS:
+        http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers/
+
+        The Intel LMS opens a connection using the Intel MEI driver to the Intel LMS
+        firmware feature using a defined UUID and then communicates with the feature
+        using a protocol called Intel AMT Port Forwarding Protocol(Intel APF protocol).
+        The protocol is used to maintain multiple sessions with Intel AMT from a
+        single application.
+
+        See the protocol specification in the Intel AMT Software Development Kit(SDK)
+        http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide
+        Under "SDK Resources" => "Intel(R) vPro(TM) Gateway(MPS)"
+        => "Information for Intel(R) vPro(TM) Gateway Developers"
+        => "Description of the Intel AMT Port Forwarding (APF)Protocol"
+
+  2) Intel AMT Remote configuration using a Local Agent
         A Local Agent enables IT personnel to configure Intel AMT out-of-the-box
-        without requiring installing additional data to enable setup.
-        The remote configuration process may involve an ISV-developed remote
-        configuration agent that runs on the host.
+        without requiring installing additional data to enable setup. The remote
+        configuration process may involve an ISV-developed remote configuration
+        agent that runs on the host.
         For more information:
-        http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/remoteconfigurationwithalocalagent.htm
+        http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide
+        Under "Setup and Configuration of Intel AMT" =>
+        "SDK Tools Supporting Setup and Configuration" =>
+        "Using the Local Agent Sample"
+
+        An open source Intel AMT configuration utility, implementing a local agent
+        that accesses the Intel MEI driver, can be found here:
+        http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers/
 
-        How the Local Agent Works (including Command structs):
-        http://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/howthelocalagentsampleworks.htm
 
 Intel AMT OS Health Watchdog:
 =============================
 The Intel AMT Watchdog is an OS Health (Hang/Crash) watchdog.
 Whenever the OS hangs or crashes, Intel AMT will send an event
-to whoever subscribed to this event. This mechanism means that
-IT knows when a platform crashes even when there is a hard failure
-on the host.
-The AMT Watchdog is composed of two parts:
-        1) FW Feature - that receives the heartbeats
-           and sends an event when the heartbeats stop.
-        2) MEI driver – connects to the watchdog (WD) feature,
-           configures the watchdog and sends the heartbeats.
-
-The MEI driver configures the Watchdog to expire by default
-every 120sec unless set by the user using module parameters.
-The Driver then sends heartbeats every 2sec.
+to any subsciber to this event. This mechanism means that
+IT knows when a platform crashes even when there is a hard failureon the host.
 
-If WD feature does not exist (i.e. the connection failed),
-the MEI driver will disable the sending of heartbeats.
+The Intel AMT Watchdog is composed of two parts:
+        1) Firmware feature - receives the heartbeats
+           and sends an event when the heartbeats stop.
+        2) Intel MEI driver - connects to the watchdog feature, configures the
+           watchdog and sends the heartbeats.
 
-Module Parameters
-=================
-watchdog_timeout - the user can use this module parameter
-to change the watchdog timeout setting.
+The Intel MEI driver uses the kernel watchdog to configure the Intel AMT
+Watchdog and to send heartbeats to it. The default timeout of the
+watchdog is 120 seconds.
 
-This value sets the Intel AMT watchdog timeout interval in seconds;
-the default value is 120sec.
-in order to disable the watchdog activites set the value to 0.
-Normal values should be between 120 and 65535
+If the Intel AMT Watchdog feature does not exist (i.e. the connection failed),
+the Intel MEI driver will disable the sending of heartbeats.
 
 Supported Chipsets:
 ==================
diff --git a/drivers/staging/mei/mei_dev.h b/drivers/staging/mei/mei_dev.h
index af4b1af9eeac..82bacfc624c5 100644
--- a/drivers/staging/mei/mei_dev.h
+++ b/drivers/staging/mei/mei_dev.h
@@ -23,13 +23,6 @@
 #include "hw.h"
 
 /*
- * MEI Char Driver Minors
- */
-#define MEI_MINORS_BASE 1
-#define MEI_MINORS_COUNT        1
-#define MEI_MINOR_NUMBER        1
-
-/*
  * watch dog definition
  */
 #define MEI_WATCHDOG_DATA_SIZE         16
@@ -42,11 +35,6 @@
  */
 extern struct pci_dev *mei_device;
 
-/*
- * AMT Watchdog Device
- */
-#define INTEL_AMT_WATCHDOG_ID "INTCAMT"
-extern struct watchdog_device amt_wd_dev;
 
 /*
  * AMTHI Client UUID
@@ -175,7 +163,6 @@ struct mei_cl {
 
 struct mei_io_list {
         struct mei_cl_cb mei_cb;
-        int status;
 };
 
 /* MEI private device struct */
diff --git a/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c
index ffca7ca32658..8094941a98f1 100644
--- a/drivers/staging/mei/wd.c
+++ b/drivers/staging/mei/wd.c
@@ -35,12 +35,16 @@ const u8 mei_wd_state_independence_msg[3][4] = {
         {0x07, 0x02, 0x01, 0x10}
 };
 
+/*
+ * AMT Watchdog Device
+ */
+#define INTEL_AMT_WATCHDOG_ID "INTCAMT"
+
 /* UUIDs for AMT F/W clients */
 const uuid_le mei_wd_guid = UUID_LE(0x05B79A6F, 0x4628, 0x4D7F, 0x89,
                                                 0x9D, 0xA9, 0x15, 0x14, 0xCB,
                                                 0x32, 0xAB);
 
-
 void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout)
 {
         dev_dbg(&dev->pdev->dev, "timeout=%d.\n", timeout);
@@ -331,14 +335,14 @@ static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev, unsigned int t
 /*
  * Watchdog Device structs
  */
-const struct watchdog_ops wd_ops = {
+static const struct watchdog_ops wd_ops = {
                 .owner = THIS_MODULE,
                 .start = mei_wd_ops_start,
                 .stop = mei_wd_ops_stop,
                 .ping = mei_wd_ops_ping,
                 .set_timeout = mei_wd_ops_set_timeout,
 };
-const struct watchdog_info wd_info = {
+static const struct watchdog_info wd_info = {
                 .identity = INTEL_AMT_WATCHDOG_ID,
                 .options = WDIOF_KEEPALIVEPING,
 };
@@ -352,3 +356,25 @@ struct watchdog_device amt_wd_dev = {
 };
 
 
+void  mei_watchdog_register(struct mei_device *dev)
+{
+        dev_dbg(&dev->pdev->dev, "dev->wd_timeout =%d.\n", dev->wd_timeout);
+
+        dev->wd_due_counter = !!dev->wd_timeout;
+
+        if (watchdog_register_device(&amt_wd_dev)) {
+                dev_err(&dev->pdev->dev, "unable to register watchdog device.\n");
+                dev->wd_interface_reg = false;
+        } else {
+                dev_dbg(&dev->pdev->dev, "successfully register watchdog interface.\n");
+                dev->wd_interface_reg = true;
+        }
+}
+
+void mei_watchdog_unregister(struct mei_device *dev)
+{
+        if (dev->wd_interface_reg)
+                watchdog_unregister_device(&amt_wd_dev);
+        dev->wd_interface_reg = false;
+}
+
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index e06b867d1e0c..fafdfa25e139 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -27,6 +27,8 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
 #include <linux/list.h>
 #include <linux/mfd/core.h>
 #include <linux/mutex.h>
@@ -727,8 +729,24 @@ static int __devinit tegra_nvec_probe(struct platform_device *pdev)
         }
         platform_set_drvdata(pdev, nvec);
         nvec->dev = &pdev->dev;
-        nvec->gpio = pdata->gpio;
-        nvec->i2c_addr = pdata->i2c_addr;
+
+        if (pdata) {
+                nvec->gpio = pdata->gpio;
+                nvec->i2c_addr = pdata->i2c_addr;
+        } else if (nvec->dev->of_node) {
+                nvec->gpio = of_get_named_gpio(nvec->dev->of_node, "request-gpios", 0);
+                if (nvec->gpio < 0) {
+                        dev_err(&pdev->dev, "no gpio specified");
+                        goto failed;
+                }
+                if (of_property_read_u32(nvec->dev->of_node, "slave-addr", &nvec->i2c_addr)) {
+                        dev_err(&pdev->dev, "no i2c address specified");
+                        goto failed;
+                }
+        } else {
+                dev_err(&pdev->dev, "no platform data\n");
+                goto failed;
+        }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -893,6 +911,13 @@ static int tegra_nvec_resume(struct platform_device *pdev)
 #define tegra_nvec_resume NULL
 #endif
 
+/* Match table for of_platform binding */
+static const struct of_device_id nvidia_nvec_of_match[] __devinitconst = {
+        { .compatible = "nvidia,nvec", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match);
+
 static struct platform_driver nvec_device_driver = {
         .probe   = tegra_nvec_probe,
         .remove  = __devexit_p(tegra_nvec_remove),
@@ -901,6 +926,7 @@ static struct platform_driver nvec_device_driver = {
         .driver  = {
                 .name = "nvec",
                 .owner = THIS_MODULE,
+                .of_match_table = nvidia_nvec_of_match,
         }
 };
 
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index af24ddfb58c9..3d9199320d86 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -34,8 +34,8 @@
 
 /* Module definitions */
 
-static int resumeline = 898;
-module_param(resumeline, int, 0444);
+static ushort resumeline = 898;
+module_param(resumeline, ushort, 0444);
 
 /* Default off since it doesn't work on DCON ASIC in B-test OLPC board */
 static int useaa = 1;
@@ -456,7 +456,7 @@ static ssize_t dcon_mono_store(struct device *dev,
         unsigned long enable_mono;
         int rc;
 
-        rc = strict_strtoul(buf, 10, &enable_mono);
+        rc = kstrtoul(buf, 10, &enable_mono);
         if (rc)
                 return rc;
 
@@ -472,7 +472,7 @@ static ssize_t dcon_freeze_store(struct device *dev,
         unsigned long output;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &output);
+        ret = kstrtoul(buf, 10, &output);
         if (ret)
                 return ret;
 
@@ -498,10 +498,10 @@ static ssize_t dcon_freeze_store(struct device *dev,
 static ssize_t dcon_resumeline_store(struct device *dev,
         struct device_attribute *attr, const char *buf, size_t count)
 {
-        unsigned long rl;
+        unsigned short rl;
         int rc;
 
-        rc = strict_strtoul(buf, 10, &rl);
+        rc = kstrtou16(buf, 10, &rl);
         if (rc)
                 return rc;
 
@@ -517,7 +517,7 @@ static ssize_t dcon_sleep_store(struct device *dev,
         unsigned long output;
         int ret;
 
-        ret = strict_strtoul(buf, 10, &output);
+        ret = kstrtoul(buf, 10, &output);
         if (ret)
                 return ret;
 
@@ -755,9 +755,9 @@ static int dcon_resume(struct i2c_client *client)
 irqreturn_t dcon_interrupt(int irq, void *id)
 {
         struct dcon_priv *dcon = id;
-        int status = pdata->read_status();
+        u8 status;
 
-        if (status == -1)
+        if (pdata->read_status(&status))
                 return IRQ_NONE;
 
         switch (status & 3) {
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.h b/drivers/staging/olpc_dcon/olpc_dcon.h
index 0264c94375aa..167a41778be6 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.h
+++ b/drivers/staging/olpc_dcon/olpc_dcon.h
@@ -84,7 +84,7 @@ struct dcon_platform_data {
         int (*init)(struct dcon_priv *);
         void (*bus_stabilize_wiggle)(void);
         void (*set_dconload)(int);
-        u8 (*read_status)(void);
+        int (*read_status)(u8 *);
 };
 
 #include <linux/interrupt.h>
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index 2245213df607..cb6ce0cf92a0 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -183,17 +183,15 @@ static void dcon_set_dconload_1(int val)
         gpio_set_value(OLPC_GPIO_DCON_LOAD, val);
 }
 
-static u8 dcon_read_status_xo_1(void)
+static int dcon_read_status_xo_1(u8 *status)
 {
-        u8 status;
-
-        status = gpio_get_value(OLPC_GPIO_DCON_STAT0);
-        status |= gpio_get_value(OLPC_GPIO_DCON_STAT1) << 1;
+        *status = gpio_get_value(OLPC_GPIO_DCON_STAT0);
+        *status |= gpio_get_value(OLPC_GPIO_DCON_STAT1) << 1;
 
         /* Clear the negative edge status for GPIO7 */
         cs5535_gpio_set(OLPC_GPIO_DCON_IRQ, GPIO_NEGATIVE_EDGE_STS);
 
-        return status;
+        return 0;
 }
 
 struct dcon_platform_data dcon_pdata_xo_1 = {
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
index a6a6cf2adc4d..69415eec425c 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
@@ -167,20 +167,18 @@ static void dcon_set_dconload_xo_1_5(int val)
         gpio_set_value(VX855_GPIO(1), val);
 }
 
-static u8 dcon_read_status_xo_1_5(void)
+static int dcon_read_status_xo_1_5(u8 *status)
 {
-        u8 status;
-
         if (!dcon_was_irq())
                 return -1;
 
         /* i believe this is the same as "inb(0x44b) & 3" */
-        status = gpio_get_value(VX855_GPI(10));
-        status |= gpio_get_value(VX855_GPI(11)) << 1;
+        *status = gpio_get_value(VX855_GPI(10));
+        *status |= gpio_get_value(VX855_GPI(11)) << 1;
 
         dcon_clear_irq();
 
-        return status;
+        return 0;
 }
 
 struct dcon_platform_data dcon_pdata_xo_1_5 = {
diff --git a/drivers/staging/omapdrm/Kconfig b/drivers/staging/omapdrm/Kconfig
new file mode 100644
index 000000000000..81a7cba4a0c5
--- /dev/null
+++ b/drivers/staging/omapdrm/Kconfig
@@ -0,0 +1,25 @@
+
+config DRM_OMAP
+        tristate "OMAP DRM"
+        depends on DRM && !CONFIG_FB_OMAP2
+        depends on ARCH_OMAP2PLUS
+        select DRM_KMS_HELPER
+        select OMAP2_DSS
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        default n
+        help
+          DRM display driver for OMAP2/3/4 based boards.
+
+config DRM_OMAP_NUM_CRTCS
+        int "Number of CRTCs"
+        range 1 10
+        default 1  if ARCH_OMAP2 || ARCH_OMAP3
+        default 2  if ARCH_OMAP4
+        depends on DRM_OMAP
+        help
+          Select the number of video overlays which can be used as framebuffers.
+          The remaining overlays are reserved for video.
+
diff --git a/drivers/staging/omapdrm/Makefile b/drivers/staging/omapdrm/Makefile
new file mode 100644
index 000000000000..592cf69020cd
--- /dev/null
+++ b/drivers/staging/omapdrm/Makefile
@@ -0,0 +1,21 @@
+#
+# Makefile for the drm device driver.  This driver provides support for the
+# Direct Rendering Infrastructure (DRI)
+#
+
+ccflags-y := -Iinclude/drm -Werror
+omapdrm-y := omap_drv.o \
+        omap_debugfs.o \
+        omap_crtc.o \
+        omap_encoder.o \
+        omap_connector.o \
+        omap_fb.o \
+        omap_fbdev.o \
+        omap_gem.o \
+        omap_dmm_tiler.o \
+        tcm-sita.o
+
+# temporary:
+omapdrm-y += omap_gem_helpers.o
+
+obj-$(CONFIG_DRM_OMAP)  += omapdrm.o
diff --git a/drivers/staging/omapdrm/TODO b/drivers/staging/omapdrm/TODO
new file mode 100644
index 000000000000..55b18377ac4f
--- /dev/null
+++ b/drivers/staging/omapdrm/TODO
@@ -0,0 +1,38 @@
+TODO
+. check error handling/cleanup paths
+. add drm_plane / overlay support
+. add video decode/encode support (via syslink3 + codec-engine)
+. still some rough edges with flipping.. event back to userspace should
+  really come after VSYNC interrupt
+. where should we do eviction (detatch_pages())?  We aren't necessarily
+  accessing the pages via a GART, so maybe we need some other threshold
+  to put a cap on the # of pages that can be pin'd.  (It is mostly only
+  of interest in case you have a swap partition/file.. which a lot of
+  these devices do not.. but it doesn't hurt for the driver to do the
+  right thing anyways.)
+  . Use mm_shrinker to trigger unpinning pages.  Need to figure out how
+    to handle next issue first (I think?)
+  . Note TTM already has some mm_shrinker stuff..  maybe an argument to
+    move to TTM?  Or maybe something that could be factored out in common?
+. GEM/shmem backed pages can have existing mappings (kernel linear map,
+  etc..), which isn't really ideal.
+. Revisit GEM sync object infrastructure.. TTM has some framework for this
+  already.  Possibly this could be refactored out and made more common?
+  There should be some way to do this with less wheel-reinvention.
+. Review DSS vs KMS mismatches.  The omap_dss_device is sort of part encoder,
+  part connector.  Which results in a bit of duct tape to fwd calls from
+  encoder to connector.  Possibly this could be done a bit better.
+. Solve PM sequencing on resume.  DMM/TILER must be reloaded before any
+  access is made from any component in the system.  Which means on suspend
+  CRTC's should be disabled, and on resume the LUT should be reprogrammed
+  before CRTC's are re-enabled, to prevent DSS from trying to DMA from a
+  buffer mapped in DMM/TILER before LUT is reloaded.
+. Add debugfs information for DMM/TILER
+
+Userspace:
+. git://github.com/robclark/xf86-video-omap.git
+
+Currently tested on
+. OMAP3530 beagleboard
+. OMAP4430 pandaboard
+. OMAP4460 pandaboard
diff --git a/drivers/staging/omapdrm/omap_connector.c b/drivers/staging/omapdrm/omap_connector.c
new file mode 100644
index 000000000000..5e2856c0e0bb
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_connector.c
@@ -0,0 +1,371 @@
+/*
+ * drivers/staging/omapdrm/omap_connector.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+
+/*
+ * connector funcs
+ */
+
+#define to_omap_connector(x) container_of(x, struct omap_connector, base)
+
+struct omap_connector {
+        struct drm_connector base;
+        struct omap_dss_device *dssdev;
+};
+
+static inline void copy_timings_omap_to_drm(struct drm_display_mode *mode,
+                struct omap_video_timings *timings)
+{
+        mode->clock = timings->pixel_clock;
+
+        mode->hdisplay = timings->x_res;
+        mode->hsync_start = mode->hdisplay + timings->hfp;
+        mode->hsync_end = mode->hsync_start + timings->hsw;
+        mode->htotal = mode->hsync_end + timings->hbp;
+
+        mode->vdisplay = timings->y_res;
+        mode->vsync_start = mode->vdisplay + timings->vfp;
+        mode->vsync_end = mode->vsync_start + timings->vsw;
+        mode->vtotal = mode->vsync_end + timings->vbp;
+
+        /* note: whether or not it is interlaced, +/- h/vsync, etc,
+         * which should be set in the mode flags, is not exposed in
+         * the omap_video_timings struct.. but hdmi driver tracks
+         * those separately so all we have to have to set the mode
+         * is the way to recover these timings values, and the
+         * omap_dss_driver would do the rest.
+         */
+}
+
+static inline void copy_timings_drm_to_omap(struct omap_video_timings *timings,
+                struct drm_display_mode *mode)
+{
+        timings->pixel_clock = mode->clock;
+
+        timings->x_res = mode->hdisplay;
+        timings->hfp = mode->hsync_start - mode->hdisplay;
+        timings->hsw = mode->hsync_end - mode->hsync_start;
+        timings->hbp = mode->htotal - mode->hsync_end;
+
+        timings->y_res = mode->vdisplay;
+        timings->vfp = mode->vsync_start - mode->vdisplay;
+        timings->vsw = mode->vsync_end - mode->vsync_start;
+        timings->vbp = mode->vtotal - mode->vsync_end;
+}
+
+static void omap_connector_dpms(struct drm_connector *connector, int mode)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *dssdev = omap_connector->dssdev;
+        int old_dpms;
+
+        DBG("%s: %d", dssdev->name, mode);
+
+        old_dpms = connector->dpms;
+
+        /* from off to on, do from crtc to connector */
+        if (mode < old_dpms)
+                drm_helper_connector_dpms(connector, mode);
+
+        if (mode == DRM_MODE_DPMS_ON) {
+                /* store resume info for suspended displays */
+                switch (dssdev->state) {
+                case OMAP_DSS_DISPLAY_SUSPENDED:
+                        dssdev->activate_after_resume = true;
+                        break;
+                case OMAP_DSS_DISPLAY_DISABLED: {
+                        int ret = dssdev->driver->enable(dssdev);
+                        if (ret) {
+                                DBG("%s: failed to enable: %d",
+                                                dssdev->name, ret);
+                                dssdev->driver->disable(dssdev);
+                        }
+                        break;
+                }
+                default:
+                        break;
+                }
+        } else {
+                /* TODO */
+        }
+
+        /* from on to off, do from connector to crtc */
+        if (mode > old_dpms)
+                drm_helper_connector_dpms(connector, mode);
+}
+
+enum drm_connector_status omap_connector_detect(
+                struct drm_connector *connector, bool force)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *dssdev = omap_connector->dssdev;
+        struct omap_dss_driver *dssdrv = dssdev->driver;
+        enum drm_connector_status ret;
+
+        if (dssdrv->detect) {
+                if (dssdrv->detect(dssdev)) {
+                        ret = connector_status_connected;
+                } else {
+                        ret = connector_status_disconnected;
+                }
+        } else {
+                ret = connector_status_unknown;
+        }
+
+        VERB("%s: %d (force=%d)", omap_connector->dssdev->name, ret, force);
+
+        return ret;
+}
+
+static void omap_connector_destroy(struct drm_connector *connector)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *dssdev = omap_connector->dssdev;
+
+        dssdev->driver->disable(dssdev);
+
+        DBG("%s", omap_connector->dssdev->name);
+        drm_sysfs_connector_remove(connector);
+        drm_connector_cleanup(connector);
+        kfree(omap_connector);
+
+        omap_dss_put_device(dssdev);
+}
+
+#define MAX_EDID  512
+
+static int omap_connector_get_modes(struct drm_connector *connector)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *dssdev = omap_connector->dssdev;
+        struct omap_dss_driver *dssdrv = dssdev->driver;
+        struct drm_device *dev = connector->dev;
+        int n = 0;
+
+        DBG("%s", omap_connector->dssdev->name);
+
+        /* if display exposes EDID, then we parse that in the normal way to
+         * build table of supported modes.. otherwise (ie. fixed resolution
+         * LCD panels) we just return a single mode corresponding to the
+         * currently configured timings:
+         */
+        if (dssdrv->read_edid) {
+                void *edid = kzalloc(MAX_EDID, GFP_KERNEL);
+
+                if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
+                                drm_edid_is_valid(edid)) {
+                        drm_mode_connector_update_edid_property(
+                                        connector, edid);
+                        n = drm_add_edid_modes(connector, edid);
+                        kfree(connector->display_info.raw_edid);
+                        connector->display_info.raw_edid = edid;
+                } else {
+                        drm_mode_connector_update_edid_property(
+                                        connector, NULL);
+                        connector->display_info.raw_edid = NULL;
+                        kfree(edid);
+                }
+        } else {
+                struct drm_display_mode *mode = drm_mode_create(dev);
+                struct omap_video_timings timings;
+
+                dssdrv->get_timings(dssdev, &timings);
+
+                copy_timings_omap_to_drm(mode, &timings);
+
+                mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
+                drm_mode_set_name(mode);
+                drm_mode_probed_add(connector, mode);
+
+                n = 1;
+        }
+
+        return n;
+}
+
+static int omap_connector_mode_valid(struct drm_connector *connector,
+                                 struct drm_display_mode *mode)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *dssdev = omap_connector->dssdev;
+        struct omap_dss_driver *dssdrv = dssdev->driver;
+        struct omap_video_timings timings = {0};
+        struct drm_device *dev = connector->dev;
+        struct drm_display_mode *new_mode;
+        int ret = MODE_BAD;
+
+        copy_timings_drm_to_omap(&timings, mode);
+        mode->vrefresh = drm_mode_vrefresh(mode);
+
+        if (!dssdrv->check_timings(dssdev, &timings)) {
+                /* check if vrefresh is still valid */
+                new_mode = drm_mode_duplicate(dev, mode);
+                new_mode->clock = timings.pixel_clock;
+                new_mode->vrefresh = 0;
+                if (mode->vrefresh == drm_mode_vrefresh(new_mode))
+                        ret = MODE_OK;
+                drm_mode_destroy(dev, new_mode);
+        }
+
+        DBG("connector: mode %s: "
+                        "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
+                        (ret == MODE_OK) ? "valid" : "invalid",
+                        mode->base.id, mode->name, mode->vrefresh, mode->clock,
+                        mode->hdisplay, mode->hsync_start,
+                        mode->hsync_end, mode->htotal,
+                        mode->vdisplay, mode->vsync_start,
+                        mode->vsync_end, mode->vtotal, mode->type, mode->flags);
+
+        return ret;
+}
+
+struct drm_encoder *omap_connector_attached_encoder(
+                struct drm_connector *connector)
+{
+        int i;
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+
+        for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
+                struct drm_mode_object *obj;
+
+                if (connector->encoder_ids[i] == 0)
+                        break;
+
+                obj = drm_mode_object_find(connector->dev,
+                                connector->encoder_ids[i],
+                                DRM_MODE_OBJECT_ENCODER);
+
+                if (obj) {
+                        struct drm_encoder *encoder = obj_to_encoder(obj);
+                        struct omap_overlay_manager *mgr =
+                                        omap_encoder_get_manager(encoder);
+                        DBG("%s: found %s", omap_connector->dssdev->name,
+                                        mgr->name);
+                        return encoder;
+                }
+        }
+
+        DBG("%s: no encoder", omap_connector->dssdev->name);
+
+        return NULL;
+}
+
+static const struct drm_connector_funcs omap_connector_funcs = {
+        .dpms = omap_connector_dpms,
+        .detect = omap_connector_detect,
+        .fill_modes = drm_helper_probe_single_connector_modes,
+        .destroy = omap_connector_destroy,
+};
+
+static const struct drm_connector_helper_funcs omap_connector_helper_funcs = {
+        .get_modes = omap_connector_get_modes,
+        .mode_valid = omap_connector_mode_valid,
+        .best_encoder = omap_connector_attached_encoder,
+};
+
+/* called from encoder when mode is set, to propagate settings to the dssdev */
+void omap_connector_mode_set(struct drm_connector *connector,
+                struct drm_display_mode *mode)
+{
+        struct drm_device *dev = connector->dev;
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+        struct omap_dss_device *dssdev = omap_connector->dssdev;
+        struct omap_dss_driver *dssdrv = dssdev->driver;
+        struct omap_video_timings timings;
+
+        copy_timings_drm_to_omap(&timings, mode);
+
+        DBG("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x",
+                        omap_connector->dssdev->name,
+                        mode->base.id, mode->name, mode->vrefresh, mode->clock,
+                        mode->hdisplay, mode->hsync_start,
+                        mode->hsync_end, mode->htotal,
+                        mode->vdisplay, mode->vsync_start,
+                        mode->vsync_end, mode->vtotal, mode->type, mode->flags);
+
+        if (dssdrv->check_timings(dssdev, &timings)) {
+                dev_err(dev->dev, "could not set timings\n");
+                return;
+        }
+
+        dssdrv->set_timings(dssdev, &timings);
+}
+
+/* flush an area of the framebuffer (in case of manual update display that
+ * is not automatically flushed)
+ */
+void omap_connector_flush(struct drm_connector *connector,
+                int x, int y, int w, int h)
+{
+        struct omap_connector *omap_connector = to_omap_connector(connector);
+
+        /* TODO: enable when supported in dss */
+        VERB("%s: %d,%d, %dx%d", omap_connector->dssdev->name, x, y, w, h);
+}
+
+/* initialize connector */
+struct drm_connector *omap_connector_init(struct drm_device *dev,
+                int connector_type, struct omap_dss_device *dssdev)
+{
+        struct drm_connector *connector = NULL;
+        struct omap_connector *omap_connector;
+
+        DBG("%s", dssdev->name);
+
+        omap_dss_get_device(dssdev);
+
+        omap_connector = kzalloc(sizeof(struct omap_connector), GFP_KERNEL);
+        if (!omap_connector) {
+                dev_err(dev->dev, "could not allocate connector\n");
+                goto fail;
+        }
+
+        omap_connector->dssdev = dssdev;
+        connector = &omap_connector->base;
+
+        drm_connector_init(dev, connector, &omap_connector_funcs,
+                                connector_type);
+        drm_connector_helper_add(connector, &omap_connector_helper_funcs);
+
+#if 0 /* enable when dss2 supports hotplug */
+        if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_HPD)
+                connector->polled = 0;
+        else
+#endif
+                connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+                                DRM_CONNECTOR_POLL_DISCONNECT;
+
+        connector->interlace_allowed = 1;
+        connector->doublescan_allowed = 0;
+
+        drm_sysfs_connector_add(connector);
+
+        return connector;
+
+fail:
+        if (connector) {
+                omap_connector_destroy(connector);
+        }
+
+        return NULL;
+}
diff --git a/drivers/staging/omapdrm/omap_crtc.c b/drivers/staging/omapdrm/omap_crtc.c
new file mode 100644
index 000000000000..cffdf5e12394
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_crtc.c
@@ -0,0 +1,326 @@
+/*
+ * drivers/staging/omapdrm/omap_crtc.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+#include "drm_mode.h"
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+
+#define to_omap_crtc(x) container_of(x, struct omap_crtc, base)
+
+struct omap_crtc {
+        struct drm_crtc base;
+        struct omap_overlay *ovl;
+        struct omap_overlay_info info;
+        int id;
+
+        /* if there is a pending flip, this will be non-null: */
+        struct drm_pending_vblank_event *event;
+};
+
+/* 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);
+}
+
+static void omap_crtc_destroy(struct drm_crtc *crtc)
+{
+        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+        DBG("%s", omap_crtc->ovl->name);
+        drm_crtc_cleanup(crtc);
+        kfree(omap_crtc);
+}
+
+static void omap_crtc_dpms(struct drm_crtc *crtc, int mode)
+{
+        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+
+        DBG("%s: %d", omap_crtc->ovl->name, mode);
+
+        if (mode == DRM_MODE_DPMS_ON) {
+                update_scanout(crtc);
+                omap_crtc->info.enabled = true;
+        } else {
+                omap_crtc->info.enabled = false;
+        }
+
+        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 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 omap_crtc *omap_crtc = to_omap_crtc(crtc);
+
+        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;
+}
+
+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);
+
+        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);
+        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 omap_crtc *omap_crtc = to_omap_crtc(crtc);
+
+        DBG("%s %d,%d: fb=%p", omap_crtc->ovl->name, x, y, old_fb);
+
+        update_scanout(crtc);
+
+        return commit(crtc);
+}
+
+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)
+{
+        struct drm_crtc *crtc = 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 timeval now;
+        unsigned long flags;
+
+        WARN_ON(!event);
+
+        omap_crtc->event = NULL;
+
+        update_scanout(crtc);
+        WARN_ON(commit(crtc));
+
+        /* wakeup userspace */
+        /* TODO: this should happen *after* flip in vsync IRQ handler */
+        if (event) {
+                spin_lock_irqsave(&dev->event_lock, flags);
+                event->event.sequence = drm_vblank_count_and_time(
+                                dev, omap_crtc->id, &now);
+                event->event.tv_sec = now.tv_sec;
+                event->event.tv_usec = now.tv_usec;
+                list_add_tail(&event->base.link,
+                                &event->base.file_priv->event_list);
+                wake_up_interruptible(&event->base.file_priv->event_wait);
+                spin_unlock_irqrestore(&dev->event_lock, flags);
+        }
+}
+
+static int omap_crtc_page_flip_locked(struct drm_crtc *crtc,
+                 struct drm_framebuffer *fb,
+                 struct drm_pending_vblank_event *event)
+{
+        struct drm_device *dev = crtc->dev;
+        struct omap_crtc *omap_crtc = to_omap_crtc(crtc);
+
+        DBG("%d -> %d", crtc->fb ? crtc->fb->base.id : -1, fb->base.id);
+
+        if (omap_crtc->event) {
+                dev_err(dev->dev, "already a pending flip\n");
+                return -EINVAL;
+        }
+
+        crtc->fb = fb;
+        omap_crtc->event = event;
+
+        omap_gem_op_async(omap_framebuffer_bo(fb), OMAP_GEM_READ,
+                        page_flip_cb, crtc);
+
+        return 0;
+}
+
+static const struct drm_crtc_funcs omap_crtc_funcs = {
+        .gamma_set = omap_crtc_gamma_set,
+        .set_config = drm_crtc_helper_set_config,
+        .destroy = omap_crtc_destroy,
+        .page_flip = omap_crtc_page_flip_locked,
+};
+
+static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = {
+        .dpms = omap_crtc_dpms,
+        .mode_fixup = omap_crtc_mode_fixup,
+        .mode_set = omap_crtc_mode_set,
+        .prepare = omap_crtc_prepare,
+        .commit = omap_crtc_commit,
+        .mode_set_base = omap_crtc_mode_set_base,
+        .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)
+{
+        struct drm_crtc *crtc = NULL;
+        struct omap_crtc *omap_crtc = kzalloc(sizeof(*omap_crtc), GFP_KERNEL);
+
+        DBG("%s", ovl->name);
+
+        if (!omap_crtc) {
+                dev_err(dev->dev, "could not allocate CRTC\n");
+                goto fail;
+        }
+
+        omap_crtc->ovl = ovl;
+        omap_crtc->id = id;
+        crtc = &omap_crtc->base;
+        drm_crtc_init(dev, crtc, &omap_crtc_funcs);
+        drm_crtc_helper_add(crtc, &omap_crtc_helper_funcs);
+
+        return crtc;
+
+fail:
+        if (crtc) {
+                omap_crtc_destroy(crtc);
+        }
+        return NULL;
+}
diff --git a/drivers/staging/omapdrm/omap_debugfs.c b/drivers/staging/omapdrm/omap_debugfs.c
new file mode 100644
index 000000000000..da920dfdc59c
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_debugfs.c
@@ -0,0 +1,42 @@
+/*
+ * drivers/staging/omapdrm/omap_debugfs.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"
+#include "omap_dmm_tiler.h"
+
+#ifdef CONFIG_DEBUG_FS
+
+static struct drm_info_list omap_debugfs_list[] = {
+        {"tiler_map", tiler_map_show, 0},
+};
+
+int omap_debugfs_init(struct drm_minor *minor)
+{
+        return drm_debugfs_create_files(omap_debugfs_list,
+                        ARRAY_SIZE(omap_debugfs_list),
+                        minor->debugfs_root, minor);
+}
+
+void omap_debugfs_cleanup(struct drm_minor *minor)
+{
+        drm_debugfs_remove_files(omap_debugfs_list,
+                        ARRAY_SIZE(omap_debugfs_list), minor);
+}
+
+#endif
diff --git a/drivers/staging/omapdrm/omap_dmm_priv.h b/drivers/staging/omapdrm/omap_dmm_priv.h
new file mode 100644
index 000000000000..2f529ab4b7c7
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_dmm_priv.h
@@ -0,0 +1,187 @@
+/*
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ * Author: Rob Clark <rob@ti.com>
+ *         Andy Gross <andy.gross@ti.com>
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef OMAP_DMM_PRIV_H
+#define OMAP_DMM_PRIV_H
+
+#define DMM_REVISION          0x000
+#define DMM_HWINFO            0x004
+#define DMM_LISA_HWINFO       0x008
+#define DMM_DMM_SYSCONFIG     0x010
+#define DMM_LISA_LOCK         0x01C
+#define DMM_LISA_MAP__0       0x040
+#define DMM_LISA_MAP__1       0x044
+#define DMM_TILER_HWINFO      0x208
+#define DMM_TILER_OR__0       0x220
+#define DMM_TILER_OR__1       0x224
+#define DMM_PAT_HWINFO        0x408
+#define DMM_PAT_GEOMETRY      0x40C
+#define DMM_PAT_CONFIG        0x410
+#define DMM_PAT_VIEW__0       0x420
+#define DMM_PAT_VIEW__1       0x424
+#define DMM_PAT_VIEW_MAP__0   0x440
+#define DMM_PAT_VIEW_MAP_BASE 0x460
+#define DMM_PAT_IRQ_EOI       0x478
+#define DMM_PAT_IRQSTATUS_RAW 0x480
+#define DMM_PAT_IRQSTATUS     0x490
+#define DMM_PAT_IRQENABLE_SET 0x4A0
+#define DMM_PAT_IRQENABLE_CLR 0x4B0
+#define DMM_PAT_STATUS__0     0x4C0
+#define DMM_PAT_STATUS__1     0x4C4
+#define DMM_PAT_STATUS__2     0x4C8
+#define DMM_PAT_STATUS__3     0x4CC
+#define DMM_PAT_DESCR__0      0x500
+#define DMM_PAT_DESCR__1      0x510
+#define DMM_PAT_DESCR__2      0x520
+#define DMM_PAT_DESCR__3      0x530
+#define DMM_PEG_HWINFO        0x608
+#define DMM_PEG_PRIO          0x620
+#define DMM_PEG_PRIO_PAT      0x640
+
+#define DMM_IRQSTAT_DST                 (1<<0)
+#define DMM_IRQSTAT_LST                 (1<<1)
+#define DMM_IRQSTAT_ERR_INV_DSC         (1<<2)
+#define DMM_IRQSTAT_ERR_INV_DATA        (1<<3)
+#define DMM_IRQSTAT_ERR_UPD_AREA        (1<<4)
+#define DMM_IRQSTAT_ERR_UPD_CTRL        (1<<5)
+#define DMM_IRQSTAT_ERR_UPD_DATA        (1<<6)
+#define DMM_IRQSTAT_ERR_LUT_MISS        (1<<7)
+
+#define DMM_IRQSTAT_ERR_MASK    (DMM_IRQ_STAT_ERR_INV_DSC | \
+                                DMM_IRQ_STAT_ERR_INV_DATA | \
+                                DMM_IRQ_STAT_ERR_UPD_AREA | \
+                                DMM_IRQ_STAT_ERR_UPD_CTRL | \
+                                DMM_IRQ_STAT_ERR_UPD_DATA | \
+                                DMM_IRQ_STAT_ERR_LUT_MISS)
+
+#define DMM_PATSTATUS_READY             (1<<0)
+#define DMM_PATSTATUS_VALID             (1<<1)
+#define DMM_PATSTATUS_RUN               (1<<2)
+#define DMM_PATSTATUS_DONE              (1<<3)
+#define DMM_PATSTATUS_LINKED            (1<<4)
+#define DMM_PATSTATUS_BYPASSED          (1<<7)
+#define DMM_PATSTATUS_ERR_INV_DESCR     (1<<10)
+#define DMM_PATSTATUS_ERR_INV_DATA      (1<<11)
+#define DMM_PATSTATUS_ERR_UPD_AREA      (1<<12)
+#define DMM_PATSTATUS_ERR_UPD_CTRL      (1<<13)
+#define DMM_PATSTATUS_ERR_UPD_DATA      (1<<14)
+#define DMM_PATSTATUS_ERR_ACCESS        (1<<15)
+
+/* note: don't treat DMM_PATSTATUS_ERR_ACCESS as an error */
+#define DMM_PATSTATUS_ERR       (DMM_PATSTATUS_ERR_INV_DESCR | \
+                                DMM_PATSTATUS_ERR_INV_DATA | \
+                                DMM_PATSTATUS_ERR_UPD_AREA | \
+                                DMM_PATSTATUS_ERR_UPD_CTRL | \
+                                DMM_PATSTATUS_ERR_UPD_DATA)
+
+
+
+enum {
+        PAT_STATUS,
+        PAT_DESCR
+};
+
+struct pat_ctrl {
+        u32 start:4;
+        u32 dir:4;
+        u32 lut_id:8;
+        u32 sync:12;
+        u32 ini:4;
+};
+
+struct pat {
+        uint32_t next_pa;
+        struct pat_area area;
+        struct pat_ctrl ctrl;
+        uint32_t data_pa;
+};
+
+#define DMM_FIXED_RETRY_COUNT 1000
+
+/* create refill buffer big enough to refill all slots, plus 3 descriptors..
+ * 3 descriptors is probably the worst-case for # of 2d-slices in a 1d area,
+ * but I guess you don't hit that worst case at the same time as full area
+ * refill
+ */
+#define DESCR_SIZE 128
+#define REFILL_BUFFER_SIZE ((4 * 128 * 256) + (3 * DESCR_SIZE))
+
+struct dmm;
+
+struct dmm_txn {
+        void *engine_handle;
+        struct tcm *tcm;
+
+        uint8_t *current_va;
+        dma_addr_t current_pa;
+
+        struct pat *last_pat;
+};
+
+struct refill_engine {
+        int id;
+        struct dmm *dmm;
+        struct tcm *tcm;
+
+        uint8_t *refill_va;
+        dma_addr_t refill_pa;
+
+        /* only one trans per engine for now */
+        struct dmm_txn txn;
+
+        /* offset to lut associated with container */
+        u32 *lut_offset;
+
+        wait_queue_head_t wait_for_refill;
+
+        struct list_head idle_node;
+};
+
+struct dmm {
+        struct device *dev;
+        void __iomem *base;
+        int irq;
+
+        struct page *dummy_page;
+        dma_addr_t dummy_pa;
+
+        void *refill_va;
+        dma_addr_t refill_pa;
+
+        /* refill engines */
+        struct semaphore engine_sem;
+        struct list_head idle_head;
+        struct refill_engine *engines;
+        int num_engines;
+
+        /* container information */
+        int container_width;
+        int container_height;
+        int lut_width;
+        int lut_height;
+        int num_lut;
+
+        /* array of LUT - TCM containers */
+        struct tcm **tcm;
+
+        /* LUT table storage */
+        u32 *lut;
+
+        /* allocation list and lock */
+        struct list_head alloc_head;
+        spinlock_t list_lock;
+};
+
+#endif
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c
new file mode 100644
index 000000000000..852d9440f725
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -0,0 +1,830 @@
+/*
+ * DMM IOMMU driver support functions for TI OMAP processors.
+ *
+ * Author: Rob Clark <rob@ti.com>
+ *         Andy Gross <andy.gross@ti.com>
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h> /* platform_device() */
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/wait.h>
+#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/time.h>
+#include <linux/list.h>
+#include <linux/semaphore.h>
+
+#include "omap_dmm_tiler.h"
+#include "omap_dmm_priv.h"
+
+/* mappings for associating views to luts */
+static struct tcm *containers[TILFMT_NFORMATS];
+static struct dmm *omap_dmm;
+
+/* Geometry table */
+#define GEOM(xshift, yshift, bytes_per_pixel) { \
+                .x_shft = (xshift), \
+                .y_shft = (yshift), \
+                .cpp    = (bytes_per_pixel), \
+                .slot_w = 1 << (SLOT_WIDTH_BITS - (xshift)), \
+                .slot_h = 1 << (SLOT_HEIGHT_BITS - (yshift)), \
+        }
+
+static const struct {
+        uint32_t x_shft;        /* unused X-bits (as part of bpp) */
+        uint32_t y_shft;        /* unused Y-bits (as part of bpp) */
+        uint32_t cpp;           /* bytes/chars per pixel */
+        uint32_t slot_w;        /* width of each slot (in pixels) */
+        uint32_t slot_h;        /* height of each slot (in pixels) */
+} geom[TILFMT_NFORMATS] = {
+                [TILFMT_8BIT]  = GEOM(0, 0, 1),
+                [TILFMT_16BIT] = GEOM(0, 1, 2),
+                [TILFMT_32BIT] = GEOM(1, 1, 4),
+                [TILFMT_PAGE]  = GEOM(SLOT_WIDTH_BITS, SLOT_HEIGHT_BITS, 1),
+};
+
+
+/* lookup table for registers w/ per-engine instances */
+static const uint32_t reg[][4] = {
+                [PAT_STATUS] = {DMM_PAT_STATUS__0, DMM_PAT_STATUS__1,
+                                DMM_PAT_STATUS__2, DMM_PAT_STATUS__3},
+                [PAT_DESCR]  = {DMM_PAT_DESCR__0, DMM_PAT_DESCR__1,
+                                DMM_PAT_DESCR__2, DMM_PAT_DESCR__3},
+};
+
+/* simple allocator to grab next 16 byte aligned memory from txn */
+static void *alloc_dma(struct dmm_txn *txn, size_t sz, dma_addr_t *pa)
+{
+        void *ptr;
+        struct refill_engine *engine = txn->engine_handle;
+
+        /* dmm programming requires 16 byte aligned addresses */
+        txn->current_pa = round_up(txn->current_pa, 16);
+        txn->current_va = (void *)round_up((long)txn->current_va, 16);
+
+        ptr = txn->current_va;
+        *pa = txn->current_pa;
+
+        txn->current_pa += sz;
+        txn->current_va += sz;
+
+        BUG_ON((txn->current_va - engine->refill_va) > REFILL_BUFFER_SIZE);
+
+        return ptr;
+}
+
+/* check status and spin until wait_mask comes true */
+static int wait_status(struct refill_engine *engine, uint32_t wait_mask)
+{
+        struct dmm *dmm = engine->dmm;
+        uint32_t r = 0, err, i;
+
+        i = DMM_FIXED_RETRY_COUNT;
+        while (true) {
+                r = readl(dmm->base + reg[PAT_STATUS][engine->id]);
+                err = r & DMM_PATSTATUS_ERR;
+                if (err)
+                        return -EFAULT;
+
+                if ((r & wait_mask) == wait_mask)
+                        break;
+
+                if (--i == 0)
+                        return -ETIMEDOUT;
+
+                udelay(1);
+        }
+
+        return 0;
+}
+
+irqreturn_t omap_dmm_irq_handler(int irq, void *arg)
+{
+        struct dmm *dmm = arg;
+        uint32_t status = readl(dmm->base + DMM_PAT_IRQSTATUS);
+        int i;
+
+        /* ack IRQ */
+        writel(status, dmm->base + DMM_PAT_IRQSTATUS);
+
+        for (i = 0; i < dmm->num_engines; i++) {
+                if (status & DMM_IRQSTAT_LST)
+                        wake_up_interruptible(&dmm->engines[i].wait_for_refill);
+
+                status >>= 8;
+        }
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * Get a handle for a DMM transaction
+ */
+static struct dmm_txn *dmm_txn_init(struct dmm *dmm, struct tcm *tcm)
+{
+        struct dmm_txn *txn = NULL;
+        struct refill_engine *engine = NULL;
+
+        down(&dmm->engine_sem);
+
+        /* grab an idle engine */
+        spin_lock(&dmm->list_lock);
+        if (!list_empty(&dmm->idle_head)) {
+                engine = list_entry(dmm->idle_head.next, struct refill_engine,
+                                        idle_node);
+                list_del(&engine->idle_node);
+        }
+        spin_unlock(&dmm->list_lock);
+
+        BUG_ON(!engine);
+
+        txn = &engine->txn;
+        engine->tcm = tcm;
+        txn->engine_handle = engine;
+        txn->last_pat = NULL;
+        txn->current_va = engine->refill_va;
+        txn->current_pa = engine->refill_pa;
+
+        return txn;
+}
+
+/**
+ * Add region to DMM transaction.  If pages or pages[i] is NULL, then the
+ * corresponding slot is cleared (ie. dummy_pa is programmed)
+ */
+static int dmm_txn_append(struct dmm_txn *txn, struct pat_area *area,
+                struct page **pages, uint32_t npages, uint32_t roll)
+{
+        dma_addr_t pat_pa = 0;
+        uint32_t *data;
+        struct pat *pat;
+        struct refill_engine *engine = txn->engine_handle;
+        int columns = (1 + area->x1 - area->x0);
+        int rows = (1 + area->y1 - area->y0);
+        int i = columns*rows;
+        u32 *lut = omap_dmm->lut + (engine->tcm->lut_id * omap_dmm->lut_width *
+                        omap_dmm->lut_height) +
+                        (area->y0 * omap_dmm->lut_width) + area->x0;
+
+        pat = alloc_dma(txn, sizeof(struct pat), &pat_pa);
+
+        if (txn->last_pat)
+                txn->last_pat->next_pa = (uint32_t)pat_pa;
+
+        pat->area = *area;
+        pat->ctrl = (struct pat_ctrl){
+                        .start = 1,
+                        .lut_id = engine->tcm->lut_id,
+                };
+
+        data = alloc_dma(txn, 4*i, &pat->data_pa);
+
+        while (i--) {
+                int n = i + roll;
+                if (n >= npages)
+                        n -= npages;
+                data[i] = (pages && pages[n]) ?
+                        page_to_phys(pages[n]) : engine->dmm->dummy_pa;
+        }
+
+        /* fill in lut with new addresses */
+        for (i = 0; i < rows; i++, lut += omap_dmm->lut_width)
+                memcpy(lut, &data[i*columns], columns * sizeof(u32));
+
+        txn->last_pat = pat;
+
+        return 0;
+}
+
+/**
+ * Commit the DMM transaction.
+ */
+static int dmm_txn_commit(struct dmm_txn *txn, bool wait)
+{
+        int ret = 0;
+        struct refill_engine *engine = txn->engine_handle;
+        struct dmm *dmm = engine->dmm;
+
+        if (!txn->last_pat) {
+                dev_err(engine->dmm->dev, "need at least one txn\n");
+                ret = -EINVAL;
+                goto cleanup;
+        }
+
+        txn->last_pat->next_pa = 0;
+
+        /* write to PAT_DESCR to clear out any pending transaction */
+        writel(0x0, dmm->base + reg[PAT_DESCR][engine->id]);
+
+        /* wait for engine ready: */
+        ret = wait_status(engine, DMM_PATSTATUS_READY);
+        if (ret) {
+                ret = -EFAULT;
+                goto cleanup;
+        }
+
+        /* kick reload */
+        writel(engine->refill_pa,
+                dmm->base + reg[PAT_DESCR][engine->id]);
+
+        if (wait) {
+                if (wait_event_interruptible_timeout(engine->wait_for_refill,
+                                wait_status(engine, DMM_PATSTATUS_READY) == 0,
+                                msecs_to_jiffies(1)) <= 0) {
+                        dev_err(dmm->dev, "timed out waiting for done\n");
+                        ret = -ETIMEDOUT;
+                }
+        }
+
+cleanup:
+        spin_lock(&dmm->list_lock);
+        list_add(&engine->idle_node, &dmm->idle_head);
+        spin_unlock(&dmm->list_lock);
+
+        up(&omap_dmm->engine_sem);
+        return ret;
+}
+
+/*
+ * DMM programming
+ */
+static int fill(struct tcm_area *area, struct page **pages,
+                uint32_t npages, uint32_t roll, bool wait)
+{
+        int ret = 0;
+        struct tcm_area slice, area_s;
+        struct dmm_txn *txn;
+
+        txn = dmm_txn_init(omap_dmm, area->tcm);
+        if (IS_ERR_OR_NULL(txn))
+                return PTR_ERR(txn);
+
+        tcm_for_each_slice(slice, *area, area_s) {
+                struct pat_area p_area = {
+                                .x0 = slice.p0.x,  .y0 = slice.p0.y,
+                                .x1 = slice.p1.x,  .y1 = slice.p1.y,
+                };
+
+                ret = dmm_txn_append(txn, &p_area, pages, npages, roll);
+                if (ret)
+                        goto fail;
+
+                roll += tcm_sizeof(slice);
+        }
+
+        ret = dmm_txn_commit(txn, wait);
+
+fail:
+        return ret;
+}
+
+/*
+ * Pin/unpin
+ */
+
+/* note: slots for which pages[i] == NULL are filled w/ dummy page
+ */
+int tiler_pin(struct tiler_block *block, struct page **pages,
+                uint32_t npages, uint32_t roll, bool wait)
+{
+        int ret;
+
+        ret = fill(&block->area, pages, npages, roll, wait);
+
+        if (ret)
+                tiler_unpin(block);
+
+        return ret;
+}
+
+int tiler_unpin(struct tiler_block *block)
+{
+        return fill(&block->area, NULL, 0, 0, false);
+}
+
+/*
+ * Reserve/release
+ */
+struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w,
+                uint16_t h, uint16_t align)
+{
+        struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL);
+        u32 min_align = 128;
+        int ret;
+
+        BUG_ON(!validfmt(fmt));
+
+        /* convert width/height to slots */
+        w = DIV_ROUND_UP(w, geom[fmt].slot_w);
+        h = DIV_ROUND_UP(h, geom[fmt].slot_h);
+
+        /* convert alignment to slots */
+        min_align = max(min_align, (geom[fmt].slot_w * geom[fmt].cpp));
+        align = ALIGN(align, min_align);
+        align /= geom[fmt].slot_w * geom[fmt].cpp;
+
+        block->fmt = fmt;
+
+        ret = tcm_reserve_2d(containers[fmt], w, h, align, &block->area);
+        if (ret) {
+                kfree(block);
+                return 0;
+        }
+
+        /* add to allocation list */
+        spin_lock(&omap_dmm->list_lock);
+        list_add(&block->alloc_node, &omap_dmm->alloc_head);
+        spin_unlock(&omap_dmm->list_lock);
+
+        return block;
+}
+
+struct tiler_block *tiler_reserve_1d(size_t size)
+{
+        struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL);
+        int num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+        if (!block)
+                return 0;
+
+        block->fmt = TILFMT_PAGE;
+
+        if (tcm_reserve_1d(containers[TILFMT_PAGE], num_pages,
+                                &block->area)) {
+                kfree(block);
+                return 0;
+        }
+
+        spin_lock(&omap_dmm->list_lock);
+        list_add(&block->alloc_node, &omap_dmm->alloc_head);
+        spin_unlock(&omap_dmm->list_lock);
+
+        return block;
+}
+
+/* note: if you have pin'd pages, you should have already unpin'd first! */
+int tiler_release(struct tiler_block *block)
+{
+        int ret = tcm_free(&block->area);
+
+        if (block->area.tcm)
+                dev_err(omap_dmm->dev, "failed to release block\n");
+
+        spin_lock(&omap_dmm->list_lock);
+        list_del(&block->alloc_node);
+        spin_unlock(&omap_dmm->list_lock);
+
+        kfree(block);
+        return ret;
+}
+
+/*
+ * Utils
+ */
+
+/* calculate the tiler space address of a pixel in a view orientation */
+static u32 tiler_get_address(u32 orient, enum tiler_fmt fmt, u32 x, u32 y)
+{
+        u32 x_bits, y_bits, tmp, x_mask, y_mask, alignment;
+
+        x_bits = CONT_WIDTH_BITS - geom[fmt].x_shft;
+        y_bits = CONT_HEIGHT_BITS - geom[fmt].y_shft;
+        alignment = geom[fmt].x_shft + geom[fmt].y_shft;
+
+        /* validate coordinate */
+        x_mask = MASK(x_bits);
+        y_mask = MASK(y_bits);
+
+        if (x < 0 || x > x_mask || y < 0 || y > y_mask)
+                return 0;
+
+        /* account for mirroring */
+        if (orient & MASK_X_INVERT)
+                x ^= x_mask;
+        if (orient & MASK_Y_INVERT)
+                y ^= y_mask;
+
+        /* get coordinate address */
+        if (orient & MASK_XY_FLIP)
+                tmp = ((x << y_bits) + y);
+        else
+                tmp = ((y << x_bits) + x);
+
+        return TIL_ADDR((tmp << alignment), orient, fmt);
+}
+
+dma_addr_t tiler_ssptr(struct tiler_block *block)
+{
+        BUG_ON(!validfmt(block->fmt));
+
+        return TILVIEW_8BIT + tiler_get_address(0, block->fmt,
+                        block->area.p0.x * geom[block->fmt].slot_w,
+                        block->area.p0.y * geom[block->fmt].slot_h);
+}
+
+void tiler_align(enum tiler_fmt fmt, uint16_t *w, uint16_t *h)
+{
+        BUG_ON(!validfmt(fmt));
+        *w = round_up(*w, geom[fmt].slot_w);
+        *h = round_up(*h, geom[fmt].slot_h);
+}
+
+uint32_t tiler_stride(enum tiler_fmt fmt)
+{
+        BUG_ON(!validfmt(fmt));
+
+        return 1 << (CONT_WIDTH_BITS + geom[fmt].y_shft);
+}
+
+size_t tiler_size(enum tiler_fmt fmt, uint16_t w, uint16_t h)
+{
+        tiler_align(fmt, &w, &h);
+        return geom[fmt].cpp * w * h;
+}
+
+size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h)
+{
+        BUG_ON(!validfmt(fmt));
+        return round_up(geom[fmt].cpp * w, PAGE_SIZE) * h;
+}
+
+int omap_dmm_remove(void)
+{
+        struct tiler_block *block, *_block;
+        int i;
+
+        if (omap_dmm) {
+                /* free all area regions */
+                spin_lock(&omap_dmm->list_lock);
+                list_for_each_entry_safe(block, _block, &omap_dmm->alloc_head,
+                                        alloc_node) {
+                        list_del(&block->alloc_node);
+                        kfree(block);
+                }
+                spin_unlock(&omap_dmm->list_lock);
+
+                for (i = 0; i < omap_dmm->num_lut; i++)
+                        if (omap_dmm->tcm && omap_dmm->tcm[i])
+                                omap_dmm->tcm[i]->deinit(omap_dmm->tcm[i]);
+                kfree(omap_dmm->tcm);
+
+                kfree(omap_dmm->engines);
+                if (omap_dmm->refill_va)
+                        dma_free_coherent(omap_dmm->dev,
+                                REFILL_BUFFER_SIZE * omap_dmm->num_engines,
+                                omap_dmm->refill_va,
+                                omap_dmm->refill_pa);
+                if (omap_dmm->dummy_page)
+                        __free_page(omap_dmm->dummy_page);
+
+                vfree(omap_dmm->lut);
+
+                if (omap_dmm->irq != -1)
+                        free_irq(omap_dmm->irq, omap_dmm);
+
+                kfree(omap_dmm);
+        }
+
+        return 0;
+}
+
+int omap_dmm_init(struct drm_device *dev)
+{
+        int ret = -EFAULT, i;
+        struct tcm_area area = {0};
+        u32 hwinfo, pat_geom, lut_table_size;
+        struct omap_drm_platform_data *pdata = dev->dev->platform_data;
+
+        if (!pdata || !pdata->dmm_pdata) {
+                dev_err(dev->dev, "dmm platform data not present, skipping\n");
+                return ret;
+        }
+
+        omap_dmm = kzalloc(sizeof(*omap_dmm), GFP_KERNEL);
+        if (!omap_dmm) {
+                dev_err(dev->dev, "failed to allocate driver data section\n");
+                goto fail;
+        }
+
+        /* lookup hwmod data - base address and irq */
+        omap_dmm->base = pdata->dmm_pdata->base;
+        omap_dmm->irq = pdata->dmm_pdata->irq;
+        omap_dmm->dev = dev->dev;
+
+        if (!omap_dmm->base) {
+                dev_err(dev->dev, "failed to get dmm base address\n");
+                goto fail;
+        }
+
+        hwinfo = readl(omap_dmm->base + DMM_PAT_HWINFO);
+        omap_dmm->num_engines = (hwinfo >> 24) & 0x1F;
+        omap_dmm->num_lut = (hwinfo >> 16) & 0x1F;
+        omap_dmm->container_width = 256;
+        omap_dmm->container_height = 128;
+
+        /* read out actual LUT width and height */
+        pat_geom = readl(omap_dmm->base + DMM_PAT_GEOMETRY);
+        omap_dmm->lut_width = ((pat_geom >> 16) & 0xF) << 5;
+        omap_dmm->lut_height = ((pat_geom >> 24) & 0xF) << 5;
+
+        /* initialize DMM registers */
+        writel(0x88888888, omap_dmm->base + DMM_PAT_VIEW__0);
+        writel(0x88888888, omap_dmm->base + DMM_PAT_VIEW__1);
+        writel(0x80808080, omap_dmm->base + DMM_PAT_VIEW_MAP__0);
+        writel(0x80000000, omap_dmm->base + DMM_PAT_VIEW_MAP_BASE);
+        writel(0x88888888, omap_dmm->base + DMM_TILER_OR__0);
+        writel(0x88888888, omap_dmm->base + DMM_TILER_OR__1);
+
+        ret = request_irq(omap_dmm->irq, omap_dmm_irq_handler, IRQF_SHARED,
+                                "omap_dmm_irq_handler", omap_dmm);
+
+        if (ret) {
+                dev_err(dev->dev, "couldn't register IRQ %d, error %d\n",
+                        omap_dmm->irq, ret);
+                omap_dmm->irq = -1;
+                goto fail;
+        }
+
+        /* Enable all interrupts for each refill engine except
+         * ERR_LUT_MISS<n> (which is just advisory, and we don't care
+         * about because we want to be able to refill live scanout
+         * buffers for accelerated pan/scroll) and FILL_DSC<n> which
+         * we just generally don't care about.
+         */
+        writel(0x7e7e7e7e, omap_dmm->base + DMM_PAT_IRQENABLE_SET);
+
+        lut_table_size = omap_dmm->lut_width * omap_dmm->lut_height *
+                        omap_dmm->num_lut;
+
+        omap_dmm->lut = vmalloc(lut_table_size * sizeof(*omap_dmm->lut));
+        if (!omap_dmm->lut) {
+                dev_err(dev->dev, "could not allocate lut table\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        omap_dmm->dummy_page = alloc_page(GFP_KERNEL | __GFP_DMA32);
+        if (!omap_dmm->dummy_page) {
+                dev_err(dev->dev, "could not allocate dummy page\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+        omap_dmm->dummy_pa = page_to_phys(omap_dmm->dummy_page);
+
+        /* alloc refill memory */
+        omap_dmm->refill_va = dma_alloc_coherent(dev->dev,
+                                REFILL_BUFFER_SIZE * omap_dmm->num_engines,
+                                &omap_dmm->refill_pa, GFP_KERNEL);
+        if (!omap_dmm->refill_va) {
+                dev_err(dev->dev, "could not allocate refill memory\n");
+                goto fail;
+        }
+
+        /* alloc engines */
+        omap_dmm->engines = kzalloc(
+                        omap_dmm->num_engines * sizeof(struct refill_engine),
+                        GFP_KERNEL);
+        if (!omap_dmm->engines) {
+                dev_err(dev->dev, "could not allocate engines\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        sema_init(&omap_dmm->engine_sem, omap_dmm->num_engines);
+        INIT_LIST_HEAD(&omap_dmm->idle_head);
+        for (i = 0; i < omap_dmm->num_engines; i++) {
+                omap_dmm->engines[i].id = i;
+                omap_dmm->engines[i].dmm = omap_dmm;
+                omap_dmm->engines[i].refill_va = omap_dmm->refill_va +
+                                                (REFILL_BUFFER_SIZE * i);
+                omap_dmm->engines[i].refill_pa = omap_dmm->refill_pa +
+                                                (REFILL_BUFFER_SIZE * i);
+                init_waitqueue_head(&omap_dmm->engines[i].wait_for_refill);
+
+                list_add(&omap_dmm->engines[i].idle_node, &omap_dmm->idle_head);
+        }
+
+        omap_dmm->tcm = kzalloc(omap_dmm->num_lut * sizeof(*omap_dmm->tcm),
+                                GFP_KERNEL);
+        if (!omap_dmm->tcm) {
+                dev_err(dev->dev, "failed to allocate lut ptrs\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        /* init containers */
+        for (i = 0; i < omap_dmm->num_lut; i++) {
+                omap_dmm->tcm[i] = sita_init(omap_dmm->container_width,
+                                                omap_dmm->container_height,
+                                                NULL);
+
+                if (!omap_dmm->tcm[i]) {
+                        dev_err(dev->dev, "failed to allocate container\n");
+                        ret = -ENOMEM;
+                        goto fail;
+                }
+
+                omap_dmm->tcm[i]->lut_id = i;
+        }
+
+        /* assign access mode containers to applicable tcm container */
+        /* OMAP 4 has 1 container for all 4 views */
+        containers[TILFMT_8BIT] = omap_dmm->tcm[0];
+        containers[TILFMT_16BIT] = omap_dmm->tcm[0];
+        containers[TILFMT_32BIT] = omap_dmm->tcm[0];
+        containers[TILFMT_PAGE] = omap_dmm->tcm[0];
+
+        INIT_LIST_HEAD(&omap_dmm->alloc_head);
+        spin_lock_init(&omap_dmm->list_lock);
+
+        area = (struct tcm_area) {
+                .is2d = true,
+                .tcm = NULL,
+                .p1.x = omap_dmm->container_width - 1,
+                .p1.y = omap_dmm->container_height - 1,
+        };
+
+        for (i = 0; i < lut_table_size; i++)
+                omap_dmm->lut[i] = omap_dmm->dummy_pa;
+
+        /* initialize all LUTs to dummy page entries */
+        for (i = 0; i < omap_dmm->num_lut; i++) {
+                area.tcm = omap_dmm->tcm[i];
+                if (fill(&area, NULL, 0, 0, true))
+                        dev_err(omap_dmm->dev, "refill failed");
+        }
+
+        dev_info(omap_dmm->dev, "initialized all PAT entries\n");
+
+        return 0;
+
+fail:
+        omap_dmm_remove();
+        return ret;
+}
+
+/*
+ * debugfs support
+ */
+
+#ifdef CONFIG_DEBUG_FS
+
+static const char *alphabet = "abcdefghijklmnopqrstuvwxyz"
+                                "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+static const char *special = ".,:;'\"`~!^-+";
+
+static void fill_map(char **map, int xdiv, int ydiv, struct tcm_area *a,
+                                                        char c, bool ovw)
+{
+        int x, y;
+        for (y = a->p0.y / ydiv; y <= a->p1.y / ydiv; y++)
+                for (x = a->p0.x / xdiv; x <= a->p1.x / xdiv; x++)
+                        if (map[y][x] == ' ' || ovw)
+                                map[y][x] = c;
+}
+
+static void fill_map_pt(char **map, int xdiv, int ydiv, struct tcm_pt *p,
+                                                                        char c)
+{
+        map[p->y / ydiv][p->x / xdiv] = c;
+}
+
+static char read_map_pt(char **map, int xdiv, int ydiv, struct tcm_pt *p)
+{
+        return map[p->y / ydiv][p->x / xdiv];
+}
+
+static int map_width(int xdiv, int x0, int x1)
+{
+        return (x1 / xdiv) - (x0 / xdiv) + 1;
+}
+
+static void text_map(char **map, int xdiv, char *nice, int yd, int x0, int x1)
+{
+        char *p = map[yd] + (x0 / xdiv);
+        int w = (map_width(xdiv, x0, x1) - strlen(nice)) / 2;
+        if (w >= 0) {
+                p += w;
+                while (*nice)
+                        *p++ = *nice++;
+        }
+}
+
+static void map_1d_info(char **map, int xdiv, int ydiv, char *nice,
+                                                        struct tcm_area *a)
+{
+        sprintf(nice, "%dK", tcm_sizeof(*a) * 4);
+        if (a->p0.y + 1 < a->p1.y) {
+                text_map(map, xdiv, nice, (a->p0.y + a->p1.y) / 2 / ydiv, 0,
+                                                        256 - 1);
+        } else if (a->p0.y < a->p1.y) {
+                if (strlen(nice) < map_width(xdiv, a->p0.x, 256 - 1))
+                        text_map(map, xdiv, nice, a->p0.y / ydiv,
+                                        a->p0.x + xdiv, 256 - 1);
+                else if (strlen(nice) < map_width(xdiv, 0, a->p1.x))
+                        text_map(map, xdiv, nice, a->p1.y / ydiv,
+                                        0, a->p1.y - xdiv);
+        } else if (strlen(nice) + 1 < map_width(xdiv, a->p0.x, a->p1.x)) {
+                text_map(map, xdiv, nice, a->p0.y / ydiv, a->p0.x, a->p1.x);
+        }
+}
+
+static void map_2d_info(char **map, int xdiv, int ydiv, char *nice,
+                                                        struct tcm_area *a)
+{
+        sprintf(nice, "(%d*%d)", tcm_awidth(*a), tcm_aheight(*a));
+        if (strlen(nice) + 1 < map_width(xdiv, a->p0.x, a->p1.x))
+                text_map(map, xdiv, nice, (a->p0.y + a->p1.y) / 2 / ydiv,
+                                                        a->p0.x, a->p1.x);
+}
+
+int tiler_map_show(struct seq_file *s, void *arg)
+{
+        int xdiv = 2, ydiv = 1;
+        char **map = NULL, *global_map;
+        struct tiler_block *block;
+        struct tcm_area a, p;
+        int i;
+        const char *m2d = alphabet;
+        const char *a2d = special;
+        const char *m2dp = m2d, *a2dp = a2d;
+        char nice[128];
+        int h_adj = omap_dmm->lut_height / ydiv;
+        int w_adj = omap_dmm->lut_width / xdiv;
+        unsigned long flags;
+
+        map = kzalloc(h_adj * sizeof(*map), GFP_KERNEL);
+        global_map = kzalloc((w_adj + 1) * h_adj, GFP_KERNEL);
+
+        if (!map || !global_map)
+                goto error;
+
+        memset(global_map, ' ', (w_adj + 1) * h_adj);
+        for (i = 0; i < omap_dmm->lut_height; i++) {
+                map[i] = global_map + i * (w_adj + 1);
+                map[i][w_adj] = 0;
+        }
+        spin_lock_irqsave(&omap_dmm->list_lock, flags);
+
+        list_for_each_entry(block, &omap_dmm->alloc_head, alloc_node) {
+                if (block->fmt != TILFMT_PAGE) {
+                        fill_map(map, xdiv, ydiv, &block->area, *m2dp, true);
+                        if (!*++a2dp)
+                                a2dp = a2d;
+                        if (!*++m2dp)
+                                m2dp = m2d;
+                        map_2d_info(map, xdiv, ydiv, nice, &block->area);
+                } else {
+                        bool start = read_map_pt(map, xdiv, ydiv,
+                                                        &block->area.p0)
+                                                                        == ' ';
+                        bool end = read_map_pt(map, xdiv, ydiv, &block->area.p1)
+                                                                        == ' ';
+                        tcm_for_each_slice(a, block->area, p)
+                                fill_map(map, xdiv, ydiv, &a, '=', true);
+                        fill_map_pt(map, xdiv, ydiv, &block->area.p0,
+                                                        start ? '<' : 'X');
+                        fill_map_pt(map, xdiv, ydiv, &block->area.p1,
+                                                        end ? '>' : 'X');
+                        map_1d_info(map, xdiv, ydiv, nice, &block->area);
+                }
+        }
+
+        spin_unlock_irqrestore(&omap_dmm->list_lock, flags);
+
+        if (s) {
+                seq_printf(s, "BEGIN DMM TILER MAP\n");
+                for (i = 0; i < 128; i++)
+                        seq_printf(s, "%03d:%s\n", i, map[i]);
+                seq_printf(s, "END TILER MAP\n");
+        } else {
+                dev_dbg(omap_dmm->dev, "BEGIN DMM TILER MAP\n");
+                for (i = 0; i < 128; i++)
+                        dev_dbg(omap_dmm->dev, "%03d:%s\n", i, map[i]);
+                dev_dbg(omap_dmm->dev, "END TILER MAP\n");
+        }
+
+error:
+        kfree(map);
+        kfree(global_map);
+
+        return 0;
+}
+#endif
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.h b/drivers/staging/omapdrm/omap_dmm_tiler.h
new file mode 100644
index 000000000000..f87cb657d683
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.h
@@ -0,0 +1,135 @@
+/*
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ * Author: Rob Clark <rob@ti.com>
+ *         Andy Gross <andy.gross@ti.com>
+ *
+ * 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 version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+#ifndef OMAP_DMM_TILER_H
+#define OMAP_DMM_TILER_H
+
+#include "omap_drv.h"
+#include "tcm.h"
+
+enum tiler_fmt {
+        TILFMT_8BIT = 0,
+        TILFMT_16BIT,
+        TILFMT_32BIT,
+        TILFMT_PAGE,
+        TILFMT_NFORMATS
+};
+
+struct pat_area {
+        u32 x0:8;
+        u32 y0:8;
+        u32 x1:8;
+        u32 y1:8;
+};
+
+struct tiler_block {
+        struct list_head alloc_node;    /* node for global block list */
+        struct tcm_area area;           /* area */
+        enum tiler_fmt fmt;             /* format */
+};
+
+/* bits representing the same slot in DMM-TILER hw-block */
+#define SLOT_WIDTH_BITS         6
+#define SLOT_HEIGHT_BITS        6
+
+/* bits reserved to describe coordinates in DMM-TILER hw-block */
+#define CONT_WIDTH_BITS         14
+#define CONT_HEIGHT_BITS        13
+
+/* calculated constants */
+#define TILER_PAGE              (1 << (SLOT_WIDTH_BITS + SLOT_HEIGHT_BITS))
+#define TILER_WIDTH             (1 << (CONT_WIDTH_BITS - SLOT_WIDTH_BITS))
+#define TILER_HEIGHT            (1 << (CONT_HEIGHT_BITS - SLOT_HEIGHT_BITS))
+
+/* tiler space addressing bitfields */
+#define MASK_XY_FLIP            (1 << 31)
+#define MASK_Y_INVERT           (1 << 30)
+#define MASK_X_INVERT           (1 << 29)
+#define SHIFT_ACC_MODE          27
+#define MASK_ACC_MODE           3
+
+#define MASK(bits) ((1 << (bits)) - 1)
+
+#define TILVIEW_8BIT    0x60000000u
+#define TILVIEW_16BIT   (TILVIEW_8BIT  + VIEW_SIZE)
+#define TILVIEW_32BIT   (TILVIEW_16BIT + VIEW_SIZE)
+#define TILVIEW_PAGE    (TILVIEW_32BIT + VIEW_SIZE)
+#define TILVIEW_END     (TILVIEW_PAGE  + VIEW_SIZE)
+
+/* create tsptr by adding view orientation and access mode */
+#define TIL_ADDR(x, orient, a)\
+        ((u32) (x) | (orient) | ((a) << SHIFT_ACC_MODE))
+
+/* externally accessible functions */
+int omap_dmm_init(struct drm_device *dev);
+int omap_dmm_remove(void);
+
+#ifdef CONFIG_DEBUG_FS
+int tiler_map_show(struct seq_file *s, void *arg);
+#endif
+
+/* pin/unpin */
+int tiler_pin(struct tiler_block *block, struct page **pages,
+                uint32_t npages, uint32_t roll, bool wait);
+int tiler_unpin(struct tiler_block *block);
+
+/* reserve/release */
+struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w, uint16_t h,
+                                uint16_t align);
+struct tiler_block *tiler_reserve_1d(size_t size);
+int tiler_release(struct tiler_block *block);
+
+/* utilities */
+dma_addr_t tiler_ssptr(struct tiler_block *block);
+uint32_t tiler_stride(enum tiler_fmt fmt);
+size_t tiler_size(enum tiler_fmt fmt, uint16_t w, uint16_t h);
+size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h);
+void tiler_align(enum tiler_fmt fmt, uint16_t *w, uint16_t *h);
+
+
+/* GEM bo flags -> tiler fmt */
+static inline enum tiler_fmt gem2fmt(uint32_t flags)
+{
+        switch (flags & OMAP_BO_TILED) {
+        case OMAP_BO_TILED_8:
+                return TILFMT_8BIT;
+        case OMAP_BO_TILED_16:
+                return TILFMT_16BIT;
+        case OMAP_BO_TILED_32:
+                return TILFMT_32BIT;
+        default:
+                return TILFMT_PAGE;
+        }
+}
+
+static inline bool validfmt(enum tiler_fmt fmt)
+{
+        switch (fmt) {
+        case TILFMT_8BIT:
+        case TILFMT_16BIT:
+        case TILFMT_32BIT:
+        case TILFMT_PAGE:
+                return true;
+        default:
+                return false;
+        }
+}
+
+struct omap_dmm_platform_data {
+        void __iomem *base;
+        int irq;
+};
+
+#endif
diff --git a/drivers/staging/omapdrm/omap_drm.h b/drivers/staging/omapdrm/omap_drm.h
new file mode 100644
index 000000000000..f0ac34a8973e
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_drm.h
@@ -0,0 +1,123 @@
+/*
+ * include/drm/omap_drm.h
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OMAP_DRM_H__
+#define __OMAP_DRM_H__
+
+#include <drm/drm.h>
+
+/* Please note that modifications to all structs defined here are
+ * subject to backwards-compatibility constraints.
+ */
+
+#define OMAP_PARAM_CHIPSET_ID   1       /* ie. 0x3430, 0x4430, etc */
+
+struct drm_omap_param {
+        uint64_t param;                 /* in */
+        uint64_t value;                 /* in (set_param), out (get_param) */
+};
+
+#define OMAP_BO_SCANOUT         0x00000001      /* scanout capable (phys contiguous) */
+#define OMAP_BO_CACHE_MASK      0x00000006      /* cache type mask, see cache modes */
+#define OMAP_BO_TILED_MASK      0x00000f00      /* tiled mapping mask, see tiled modes */
+
+/* cache modes */
+#define OMAP_BO_CACHED          0x00000000      /* default */
+#define OMAP_BO_WC              0x00000002      /* write-combine */
+#define OMAP_BO_UNCACHED        0x00000004      /* strongly-ordered (uncached) */
+
+/* tiled modes */
+#define OMAP_BO_TILED_8         0x00000100
+#define OMAP_BO_TILED_16        0x00000200
+#define OMAP_BO_TILED_32        0x00000300
+#define OMAP_BO_TILED           (OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32)
+
+union omap_gem_size {
+        uint32_t bytes;         /* (for non-tiled formats) */
+        struct {
+                uint16_t width;
+                uint16_t height;
+        } tiled;                /* (for tiled formats) */
+};
+
+struct drm_omap_gem_new {
+        union omap_gem_size size;       /* in */
+        uint32_t flags;                 /* in */
+        uint32_t handle;                /* out */
+        uint32_t __pad;
+};
+
+/* mask of operations: */
+enum omap_gem_op {
+        OMAP_GEM_READ = 0x01,
+        OMAP_GEM_WRITE = 0x02,
+};
+
+struct drm_omap_gem_cpu_prep {
+        uint32_t handle;                /* buffer handle (in) */
+        uint32_t op;                    /* mask of omap_gem_op (in) */
+};
+
+struct drm_omap_gem_cpu_fini {
+        uint32_t handle;                /* buffer handle (in) */
+        uint32_t op;                    /* mask of omap_gem_op (in) */
+        /* TODO maybe here we pass down info about what regions are touched
+         * by sw so we can be clever about cache ops?  For now a placeholder,
+         * set to zero and we just do full buffer flush..
+         */
+        uint32_t nregions;
+        uint32_t __pad;
+};
+
+struct drm_omap_gem_info {
+        uint32_t handle;                /* buffer handle (in) */
+        uint32_t pad;
+        uint64_t offset;                /* mmap offset (out) */
+        /* note: in case of tiled buffers, the user virtual size can be
+         * different from the physical size (ie. how many pages are needed
+         * to back the object) which is returned in DRM_IOCTL_GEM_OPEN..
+         * This size here is the one that should be used if you want to
+         * mmap() the buffer:
+         */
+        uint32_t size;                  /* virtual size for mmap'ing (out) */
+        uint32_t __pad;
+};
+
+#define DRM_OMAP_GET_PARAM              0x00
+#define DRM_OMAP_SET_PARAM              0x01
+/* placeholder for plugin-api
+#define DRM_OMAP_GET_BASE               0x02
+*/
+#define DRM_OMAP_GEM_NEW                0x03
+#define DRM_OMAP_GEM_CPU_PREP           0x04
+#define DRM_OMAP_GEM_CPU_FINI           0x05
+#define DRM_OMAP_GEM_INFO               0x06
+#define DRM_OMAP_NUM_IOCTLS             0x07
+
+#define DRM_IOCTL_OMAP_GET_PARAM        DRM_IOWR(DRM_COMMAND_BASE + DRM_OMAP_GET_PARAM, struct drm_omap_param)
+#define DRM_IOCTL_OMAP_SET_PARAM        DRM_IOW (DRM_COMMAND_BASE + DRM_OMAP_SET_PARAM, struct drm_omap_param)
+/* placeholder for plugin-api
+#define DRM_IOCTL_OMAP_GET_BASE         DRM_IOWR(DRM_COMMAND_BASE + DRM_OMAP_GET_BASE, struct drm_omap_get_base)
+*/
+#define DRM_IOCTL_OMAP_GEM_NEW          DRM_IOWR(DRM_COMMAND_BASE + DRM_OMAP_GEM_NEW, struct drm_omap_gem_new)
+#define DRM_IOCTL_OMAP_GEM_CPU_PREP     DRM_IOW (DRM_COMMAND_BASE + DRM_OMAP_GEM_CPU_PREP, struct drm_omap_gem_cpu_prep)
+#define DRM_IOCTL_OMAP_GEM_CPU_FINI     DRM_IOW (DRM_COMMAND_BASE + DRM_OMAP_GEM_CPU_FINI, struct drm_omap_gem_cpu_fini)
+#define DRM_IOCTL_OMAP_GEM_INFO         DRM_IOWR(DRM_COMMAND_BASE + DRM_OMAP_GEM_INFO, struct drm_omap_gem_info)
+
+#endif /* __OMAP_DRM_H__ */
diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
new file mode 100644
index 000000000000..602aa2dd49c8
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_drv.c
@@ -0,0 +1,821 @@
+/*
+ * drivers/staging/omapdrm/omap_drv.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+#include "drm_crtc_helper.h"
+#include "drm_fb_helper.h"
+
+#define DRIVER_NAME             MODULE_NAME
+#define DRIVER_DESC             "OMAP DRM"
+#define DRIVER_DATE             "20110917"
+#define DRIVER_MAJOR            1
+#define DRIVER_MINOR            0
+#define DRIVER_PATCHLEVEL       0
+
+struct drm_device *drm_device;
+
+static int num_crtc = CONFIG_DRM_OMAP_NUM_CRTCS;
+
+MODULE_PARM_DESC(num_crtc, "Number of overlays to use as CRTCs");
+module_param(num_crtc, int, 0600);
+
+/*
+ * mode config funcs
+ */
+
+/* Notes about mapping DSS and DRM entities:
+ *    CRTC:        overlay
+ *    encoder:     manager.. with some extension to allow one primary CRTC
+ *                 and zero or more video CRTC's to be mapped to one encoder?
+ *    connector:   dssdev.. manager can be attached/detached from different
+ *                 devices
+ */
+
+static void omap_fb_output_poll_changed(struct drm_device *dev)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        DBG("dev=%p", dev);
+        if (priv->fbdev) {
+                drm_fb_helper_hotplug_event(priv->fbdev);
+        }
+}
+
+static struct drm_mode_config_funcs omap_mode_config_funcs = {
+        .fb_create = omap_framebuffer_create,
+        .output_poll_changed = omap_fb_output_poll_changed,
+};
+
+static int get_connector_type(struct omap_dss_device *dssdev)
+{
+        switch (dssdev->type) {
+        case OMAP_DISPLAY_TYPE_HDMI:
+                return DRM_MODE_CONNECTOR_HDMIA;
+        case OMAP_DISPLAY_TYPE_DPI:
+                if (!strcmp(dssdev->name, "dvi"))
+                        return DRM_MODE_CONNECTOR_DVID;
+                /* fallthrough */
+        default:
+                return DRM_MODE_CONNECTOR_Unknown;
+        }
+}
+
+#if 0 /* enable when dss2 supports hotplug */
+static int omap_drm_notifier(struct notifier_block *nb,
+                unsigned long evt, void *arg)
+{
+        switch (evt) {
+        case OMAP_DSS_SIZE_CHANGE:
+        case OMAP_DSS_HOTPLUG_CONNECT:
+        case OMAP_DSS_HOTPLUG_DISCONNECT: {
+                struct drm_device *dev = drm_device;
+                DBG("hotplug event: evt=%d, dev=%p", evt, dev);
+                if (dev) {
+                        drm_sysfs_hotplug_event(dev);
+                }
+                return NOTIFY_OK;
+        }
+        default:  /* don't care about other events for now */
+                return NOTIFY_DONE;
+        }
+}
+#endif
+
+static void dump_video_chains(void)
+{
+        int i;
+
+        DBG("dumping video chains: ");
+        for (i = 0; i < omap_dss_get_num_overlays(); i++) {
+                struct omap_overlay *ovl = omap_dss_get_overlay(i);
+                struct omap_overlay_manager *mgr = ovl->manager;
+                struct omap_dss_device *dssdev = mgr ? mgr->device : NULL;
+                if (dssdev) {
+                        DBG("%d: %s -> %s -> %s", i, ovl->name, mgr->name,
+                                                dssdev->name);
+                } else if (mgr) {
+                        DBG("%d: %s -> %s", i, ovl->name, mgr->name);
+                } else {
+                        DBG("%d: %s", i, ovl->name);
+                }
+        }
+}
+
+/* create encoders for each manager */
+static int create_encoder(struct drm_device *dev,
+                struct omap_overlay_manager *mgr)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        struct drm_encoder *encoder = omap_encoder_init(dev, mgr);
+
+        if (!encoder) {
+                dev_err(dev->dev, "could not create encoder: %s\n",
+                                mgr->name);
+                return -ENOMEM;
+        }
+
+        BUG_ON(priv->num_encoders >= ARRAY_SIZE(priv->encoders));
+
+        priv->encoders[priv->num_encoders++] = encoder;
+
+        return 0;
+}
+
+/* create connectors for each display device */
+static int create_connector(struct drm_device *dev,
+                struct omap_dss_device *dssdev)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        static struct notifier_block *notifier;
+        struct drm_connector *connector;
+        int j;
+
+        if (!dssdev->driver) {
+                dev_warn(dev->dev, "%s has no driver.. skipping it\n",
+                                dssdev->name);
+                return 0;
+        }
+
+        if (!(dssdev->driver->get_timings ||
+                                dssdev->driver->read_edid)) {
+                dev_warn(dev->dev, "%s driver does not support "
+                        "get_timings or read_edid.. skipping it!\n",
+                        dssdev->name);
+                return 0;
+        }
+
+        connector = omap_connector_init(dev,
+                        get_connector_type(dssdev), dssdev);
+
+        if (!connector) {
+                dev_err(dev->dev, "could not create connector: %s\n",
+                                dssdev->name);
+                return -ENOMEM;
+        }
+
+        BUG_ON(priv->num_connectors >= ARRAY_SIZE(priv->connectors));
+
+        priv->connectors[priv->num_connectors++] = connector;
+
+#if 0 /* enable when dss2 supports hotplug */
+        notifier = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
+        notifier->notifier_call = omap_drm_notifier;
+        omap_dss_add_notify(dssdev, notifier);
+#else
+        notifier = NULL;
+#endif
+
+        for (j = 0; j < priv->num_encoders; j++) {
+                struct omap_overlay_manager *mgr =
+                        omap_encoder_get_manager(priv->encoders[j]);
+                if (mgr->device == dssdev) {
+                        drm_mode_connector_attach_encoder(connector,
+                                        priv->encoders[j]);
+                }
+        }
+
+        return 0;
+}
+
+/* create up to max_overlays CRTCs mapping to overlays.. by default,
+ * connect the overlays to different managers/encoders, giving priority
+ * to encoders connected to connectors with a detected connection
+ */
+static int create_crtc(struct drm_device *dev, struct omap_overlay *ovl,
+                int *j, unsigned int connected_connectors)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        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) {
+                if (connected_connectors & (1 << *j)) {
+                        struct drm_encoder *encoder =
+                                omap_connector_attached_encoder(
+                                                priv->connectors[*j]);
+                        if (encoder) {
+                                mgr = omap_encoder_get_manager(encoder);
+                        }
+                }
+                (*j)++;
+        }
+
+        /* if we couldn't find another connected connector, lets start
+         * looking at the unconnected connectors:
+         *
+         * note: it might not be immediately apparent, but thanks to
+         * the !mgr check in both this loop and the one above, the only
+         * way to enter this loop is with *j == priv->num_connectors,
+         * so idx can never go negative.
+         */
+        while (*j < 2 * priv->num_connectors && !mgr) {
+                int idx = *j - priv->num_connectors;
+                if (!(connected_connectors & (1 << idx))) {
+                        struct drm_encoder *encoder =
+                                omap_connector_attached_encoder(
+                                                priv->connectors[idx]);
+                        if (encoder) {
+                                mgr = omap_encoder_get_manager(encoder);
+                        }
+                }
+                (*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) {
+                dev_err(dev->dev, "could not create CRTC: %s\n",
+                                ovl->name);
+                return -ENOMEM;
+        }
+
+        BUG_ON(priv->num_crtcs >= ARRAY_SIZE(priv->crtcs));
+
+        priv->crtcs[priv->num_crtcs++] = crtc;
+
+        return 0;
+}
+
+static int match_dev_name(struct omap_dss_device *dssdev, void *data)
+{
+        return !strcmp(dssdev->name, data);
+}
+
+static unsigned int detect_connectors(struct drm_device *dev)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        unsigned int connected_connectors = 0;
+        int i;
+
+        for (i = 0; i < priv->num_connectors; i++) {
+                struct drm_connector *connector = priv->connectors[i];
+                if (omap_connector_detect(connector, true) ==
+                                connector_status_connected) {
+                        connected_connectors |= (1 << i);
+                }
+        }
+
+        return connected_connectors;
+}
+
+static int omap_modeset_init(struct drm_device *dev)
+{
+        const struct omap_drm_platform_data *pdata = dev->dev->platform_data;
+        struct omap_kms_platform_data *kms_pdata = NULL;
+        struct omap_drm_private *priv = dev->dev_private;
+        struct omap_dss_device *dssdev = NULL;
+        int i, j;
+        unsigned int connected_connectors = 0;
+
+        drm_mode_config_init(dev);
+
+        if (pdata && pdata->kms_pdata) {
+                kms_pdata = pdata->kms_pdata;
+
+                /* if platform data is provided by the board file, use it to
+                 * control which overlays, managers, and devices we own.
+                 */
+                for (i = 0; i < kms_pdata->mgr_cnt; i++) {
+                        struct omap_overlay_manager *mgr =
+                                omap_dss_get_overlay_manager(
+                                                kms_pdata->mgr_ids[i]);
+                        create_encoder(dev, mgr);
+                }
+
+                for (i = 0; i < kms_pdata->dev_cnt; i++) {
+                        struct omap_dss_device *dssdev =
+                                omap_dss_find_device(
+                                        (void *)kms_pdata->dev_names[i],
+                                        match_dev_name);
+                        if (!dssdev) {
+                                dev_warn(dev->dev, "no such dssdev: %s\n",
+                                                kms_pdata->dev_names[i]);
+                                continue;
+                        }
+                        create_connector(dev, dssdev);
+                }
+
+                connected_connectors = detect_connectors(dev);
+
+                j = 0;
+                for (i = 0; i < kms_pdata->ovl_cnt; i++) {
+                        struct omap_overlay *ovl =
+                                omap_dss_get_overlay(kms_pdata->ovl_ids[i]);
+                        create_crtc(dev, ovl, &j, connected_connectors);
+                }
+        } else {
+                /* otherwise just grab up to CONFIG_DRM_OMAP_NUM_CRTCS and try
+                 * to make educated guesses about everything else
+                 */
+                int max_overlays = min(omap_dss_get_num_overlays(), num_crtc);
+
+                for (i = 0; i < omap_dss_get_num_overlay_managers(); i++) {
+                        create_encoder(dev, omap_dss_get_overlay_manager(i));
+                }
+
+                for_each_dss_dev(dssdev) {
+                        create_connector(dev, dssdev);
+                }
+
+                connected_connectors = detect_connectors(dev);
+
+                j = 0;
+                for (i = 0; i < max_overlays; i++) {
+                        create_crtc(dev, omap_dss_get_overlay(i),
+                                        &j, connected_connectors);
+                }
+        }
+
+        /* for now keep the mapping of CRTCs and encoders static.. */
+        for (i = 0; i < priv->num_encoders; i++) {
+                struct drm_encoder *encoder = priv->encoders[i];
+                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);
+                        }
+                }
+
+                DBG("%s: possible_crtcs=%08x", mgr->name,
+                                        encoder->possible_crtcs);
+        }
+
+        dump_video_chains();
+
+        dev->mode_config.min_width = 256;
+        dev->mode_config.min_height = 256;
+
+        /* note: eventually will need some cpu_is_omapXYZ() type stuff here
+         * to fill in these limits properly on different OMAP generations..
+         */
+        dev->mode_config.max_width = 2048;
+        dev->mode_config.max_height = 2048;
+
+        dev->mode_config.funcs = &omap_mode_config_funcs;
+
+        return 0;
+}
+
+static void omap_modeset_free(struct drm_device *dev)
+{
+        drm_mode_config_cleanup(dev);
+}
+
+/*
+ * drm ioctl funcs
+ */
+
+
+static int ioctl_get_param(struct drm_device *dev, void *data,
+                struct drm_file *file_priv)
+{
+        struct drm_omap_param *args = data;
+
+        DBG("%p: param=%llu", dev, args->param);
+
+        switch (args->param) {
+        case OMAP_PARAM_CHIPSET_ID:
+                args->value = GET_OMAP_TYPE;
+                break;
+        default:
+                DBG("unknown parameter %lld", args->param);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int ioctl_set_param(struct drm_device *dev, void *data,
+                struct drm_file *file_priv)
+{
+        struct drm_omap_param *args = data;
+
+        switch (args->param) {
+        default:
+                DBG("unknown parameter %lld", args->param);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int ioctl_gem_new(struct drm_device *dev, void *data,
+                struct drm_file *file_priv)
+{
+        struct drm_omap_gem_new *args = data;
+        DBG("%p:%p: size=0x%08x, flags=%08x", dev, file_priv,
+                        args->size.bytes, args->flags);
+        return omap_gem_new_handle(dev, file_priv, args->size,
+                        args->flags, &args->handle);
+}
+
+static int ioctl_gem_cpu_prep(struct drm_device *dev, void *data,
+                struct drm_file *file_priv)
+{
+        struct drm_omap_gem_cpu_prep *args = data;
+        struct drm_gem_object *obj;
+        int ret;
+
+        VERB("%p:%p: handle=%d, op=%x", dev, file_priv, args->handle, args->op);
+
+        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        if (!obj) {
+                return -ENOENT;
+        }
+
+        ret = omap_gem_op_sync(obj, args->op);
+
+        if (!ret) {
+                ret = omap_gem_op_start(obj, args->op);
+        }
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+static int ioctl_gem_cpu_fini(struct drm_device *dev, void *data,
+                struct drm_file *file_priv)
+{
+        struct drm_omap_gem_cpu_fini *args = data;
+        struct drm_gem_object *obj;
+        int ret;
+
+        VERB("%p:%p: handle=%d", dev, file_priv, args->handle);
+
+        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        if (!obj) {
+                return -ENOENT;
+        }
+
+        /* XXX flushy, flushy */
+        ret = 0;
+
+        if (!ret) {
+                ret = omap_gem_op_finish(obj, args->op);
+        }
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+static int ioctl_gem_info(struct drm_device *dev, void *data,
+                struct drm_file *file_priv)
+{
+        struct drm_omap_gem_info *args = data;
+        struct drm_gem_object *obj;
+        int ret = 0;
+
+        DBG("%p:%p: handle=%d", dev, file_priv, args->handle);
+
+        obj = drm_gem_object_lookup(dev, file_priv, args->handle);
+        if (!obj) {
+                return -ENOENT;
+        }
+
+        args->size = omap_gem_mmap_size(obj);
+        args->offset = omap_gem_mmap_offset(obj);
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return ret;
+}
+
+struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
+        DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param, DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
+        DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new, DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(OMAP_GEM_CPU_PREP, ioctl_gem_cpu_prep, DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(OMAP_GEM_CPU_FINI, ioctl_gem_cpu_fini, DRM_UNLOCKED|DRM_AUTH),
+        DRM_IOCTL_DEF_DRV(OMAP_GEM_INFO, ioctl_gem_info, DRM_UNLOCKED|DRM_AUTH),
+};
+
+/*
+ * drm driver funcs
+ */
+
+/**
+ * load - setup chip and create an initial config
+ * @dev: DRM device
+ * @flags: startup flags
+ *
+ * The driver load routine has to do several things:
+ *   - initialize the memory manager
+ *   - allocate initial config memory
+ *   - setup the DRM framebuffer with the allocated memory
+ */
+static int dev_load(struct drm_device *dev, unsigned long flags)
+{
+        struct omap_drm_private *priv;
+        int ret;
+
+        DBG("load: dev=%p", dev);
+
+        drm_device = dev;
+
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                dev_err(dev->dev, "could not allocate priv\n");
+                return -ENOMEM;
+        }
+
+        dev->dev_private = priv;
+
+        omap_gem_init(dev);
+
+        ret = omap_modeset_init(dev);
+        if (ret) {
+                dev_err(dev->dev, "omap_modeset_init failed: ret=%d\n", ret);
+                dev->dev_private = NULL;
+                kfree(priv);
+                return ret;
+        }
+
+        priv->fbdev = omap_fbdev_init(dev);
+        if (!priv->fbdev) {
+                dev_warn(dev->dev, "omap_fbdev_init failed\n");
+                /* well, limp along without an fbdev.. maybe X11 will work? */
+        }
+
+        drm_kms_helper_poll_init(dev);
+
+        ret = drm_vblank_init(dev, priv->num_crtcs);
+        if (ret) {
+                dev_warn(dev->dev, "could not init vblank\n");
+        }
+
+        return 0;
+}
+
+static int dev_unload(struct drm_device *dev)
+{
+        DBG("unload: dev=%p", dev);
+
+        drm_vblank_cleanup(dev);
+        drm_kms_helper_poll_fini(dev);
+
+        omap_fbdev_free(dev);
+        omap_modeset_free(dev);
+        omap_gem_deinit(dev);
+
+        kfree(dev->dev_private);
+        dev->dev_private = NULL;
+
+        return 0;
+}
+
+static int dev_open(struct drm_device *dev, struct drm_file *file)
+{
+        file->driver_priv = NULL;
+
+        DBG("open: dev=%p, file=%p", dev, file);
+
+        return 0;
+}
+
+static int dev_firstopen(struct drm_device *dev)
+{
+        DBG("firstopen: dev=%p", dev);
+        return 0;
+}
+
+/**
+ * lastclose - clean up after all DRM clients have exited
+ * @dev: DRM device
+ *
+ * Take care of cleaning up after all DRM clients have exited.  In the
+ * mode setting case, we want to restore the kernel's initial mode (just
+ * in case the last client left us in a bad state).
+ */
+static void dev_lastclose(struct drm_device *dev)
+{
+        /* we don't support vga-switcheroo.. so just make sure the fbdev
+         * mode is active
+         */
+        struct omap_drm_private *priv = dev->dev_private;
+        int ret;
+
+        DBG("lastclose: dev=%p", dev);
+
+        ret = drm_fb_helper_restore_fbdev_mode(priv->fbdev);
+        if (ret)
+                DBG("failed to restore crtc mode");
+}
+
+static void dev_preclose(struct drm_device *dev, struct drm_file *file)
+{
+        DBG("preclose: dev=%p", dev);
+}
+
+static void dev_postclose(struct drm_device *dev, struct drm_file *file)
+{
+        DBG("postclose: dev=%p, file=%p", dev, file);
+}
+
+/**
+ * enable_vblank - enable vblank interrupt events
+ * @dev: DRM device
+ * @crtc: which irq to enable
+ *
+ * Enable vblank interrupts for @crtc.  If the device doesn't have
+ * a hardware vblank counter, this routine should be a no-op, since
+ * interrupts will have to stay on to keep the count accurate.
+ *
+ * RETURNS
+ * Zero on success, appropriate errno if the given @crtc's vblank
+ * interrupt cannot be enabled.
+ */
+static int dev_enable_vblank(struct drm_device *dev, int crtc)
+{
+        DBG("enable_vblank: dev=%p, crtc=%d", dev, crtc);
+        return 0;
+}
+
+/**
+ * disable_vblank - disable vblank interrupt events
+ * @dev: DRM device
+ * @crtc: which irq to enable
+ *
+ * Disable vblank interrupts for @crtc.  If the device doesn't have
+ * a hardware vblank counter, this routine should be a no-op, since
+ * interrupts will have to stay on to keep the count accurate.
+ */
+static void dev_disable_vblank(struct drm_device *dev, int crtc)
+{
+        DBG("disable_vblank: dev=%p, crtc=%d", dev, crtc);
+}
+
+static irqreturn_t dev_irq_handler(DRM_IRQ_ARGS)
+{
+        return IRQ_HANDLED;
+}
+
+static void dev_irq_preinstall(struct drm_device *dev)
+{
+        DBG("irq_preinstall: dev=%p", dev);
+}
+
+static int dev_irq_postinstall(struct drm_device *dev)
+{
+        DBG("irq_postinstall: dev=%p", dev);
+        return 0;
+}
+
+static void dev_irq_uninstall(struct drm_device *dev)
+{
+        DBG("irq_uninstall: dev=%p", dev);
+}
+
+static struct vm_operations_struct omap_gem_vm_ops = {
+        .fault = omap_gem_fault,
+        .open = drm_gem_vm_open,
+        .close = drm_gem_vm_close,
+};
+
+static struct drm_driver omap_drm_driver = {
+                .driver_features =
+                                DRIVER_HAVE_IRQ | DRIVER_MODESET | DRIVER_GEM,
+                .load = dev_load,
+                .unload = dev_unload,
+                .open = dev_open,
+                .firstopen = dev_firstopen,
+                .lastclose = dev_lastclose,
+                .preclose = dev_preclose,
+                .postclose = dev_postclose,
+                .get_vblank_counter = drm_vblank_count,
+                .enable_vblank = dev_enable_vblank,
+                .disable_vblank = dev_disable_vblank,
+                .irq_preinstall = dev_irq_preinstall,
+                .irq_postinstall = dev_irq_postinstall,
+                .irq_uninstall = dev_irq_uninstall,
+                .irq_handler = dev_irq_handler,
+                .reclaim_buffers = drm_core_reclaim_buffers,
+#ifdef CONFIG_DEBUG_FS
+                .debugfs_init = omap_debugfs_init,
+                .debugfs_cleanup = omap_debugfs_cleanup,
+#endif
+                .gem_init_object = omap_gem_init_object,
+                .gem_free_object = omap_gem_free_object,
+                .gem_vm_ops = &omap_gem_vm_ops,
+                .dumb_create = omap_gem_dumb_create,
+                .dumb_map_offset = omap_gem_dumb_map_offset,
+                .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,
+                },
+                .name = DRIVER_NAME,
+                .desc = DRIVER_DESC,
+                .date = DRIVER_DATE,
+                .major = DRIVER_MAJOR,
+                .minor = DRIVER_MINOR,
+                .patchlevel = DRIVER_PATCHLEVEL,
+};
+
+static int pdev_suspend(struct platform_device *pDevice, pm_message_t state)
+{
+        DBG("");
+        return 0;
+}
+
+static int pdev_resume(struct platform_device *device)
+{
+        DBG("");
+        return 0;
+}
+
+static void pdev_shutdown(struct platform_device *device)
+{
+        DBG("");
+}
+
+static int pdev_probe(struct platform_device *device)
+{
+        DBG("%s", device->name);
+        return drm_platform_init(&omap_drm_driver, device);
+}
+
+static int pdev_remove(struct platform_device *device)
+{
+        DBG("");
+        drm_platform_exit(&omap_drm_driver, device);
+        return 0;
+}
+
+struct platform_driver pdev = {
+                .driver = {
+                        .name = DRIVER_NAME,
+                        .owner = THIS_MODULE,
+                },
+                .probe = pdev_probe,
+                .remove = pdev_remove,
+                .suspend = pdev_suspend,
+                .resume = pdev_resume,
+                .shutdown = pdev_shutdown,
+};
+
+static int __init omap_drm_init(void)
+{
+        DBG("init");
+        return platform_driver_register(&pdev);
+}
+
+static void __exit omap_drm_fini(void)
+{
+        DBG("fini");
+        platform_driver_unregister(&pdev);
+}
+
+/* need late_initcall() so we load after dss_driver's are loaded */
+late_initcall(omap_drm_init);
+module_exit(omap_drm_fini);
+
+MODULE_AUTHOR("Rob Clark <rob@ti.com>");
+MODULE_DESCRIPTION("OMAP DRM Display Driver");
+MODULE_ALIAS("platform:" DRIVER_NAME);
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/staging/omapdrm/omap_drv.h b/drivers/staging/omapdrm/omap_drv.h
new file mode 100644
index 000000000000..76c42515ecc5
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_drv.h
@@ -0,0 +1,135 @@
+/*
+ * drivers/staging/omapdrm/omap_drv.h
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OMAP_DRV_H__
+#define __OMAP_DRV_H__
+
+#include <video/omapdss.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <drm/drmP.h>
+#include "omap_drm.h"
+#include "omap_priv.h"
+
+#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)
+#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */
+
+#define MODULE_NAME     "omapdrm"
+
+/* max # of mapper-id's that can be assigned.. todo, come up with a better
+ * (but still inexpensive) way to store/access per-buffer mapper private
+ * data..
+ */
+#define MAX_MAPPERS 2
+
+struct omap_drm_private {
+        unsigned int num_crtcs;
+        struct drm_crtc *crtcs[8];
+        unsigned int num_encoders;
+        struct drm_encoder *encoders[8];
+        unsigned int num_connectors;
+        struct drm_connector *connectors[8];
+
+        struct drm_fb_helper *fbdev;
+
+        bool has_dmm;
+};
+
+#ifdef CONFIG_DEBUG_FS
+int omap_debugfs_init(struct drm_minor *minor);
+void omap_debugfs_cleanup(struct drm_minor *minor);
+#endif
+
+struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev);
+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_encoder *omap_encoder_init(struct drm_device *dev,
+                struct omap_overlay_manager *mgr);
+struct omap_overlay_manager *omap_encoder_get_manager(
+                struct drm_encoder *encoder);
+struct drm_encoder *omap_connector_attached_encoder(
+                struct drm_connector *connector);
+enum drm_connector_status omap_connector_detect(
+                struct drm_connector *connector, bool force);
+
+struct drm_connector *omap_connector_init(struct drm_device *dev,
+                int connector_type, struct omap_dss_device *dssdev);
+void omap_connector_mode_set(struct drm_connector *connector,
+                struct drm_display_mode *mode);
+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_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_connector *omap_framebuffer_get_next_connector(
+                struct drm_framebuffer *fb, struct drm_connector *from);
+void omap_framebuffer_flush(struct drm_framebuffer *fb,
+                int x, int y, int w, int h);
+
+void omap_gem_init(struct drm_device *dev);
+void omap_gem_deinit(struct drm_device *dev);
+
+struct drm_gem_object *omap_gem_new(struct drm_device *dev,
+                union omap_gem_size gsize, uint32_t flags);
+int omap_gem_new_handle(struct drm_device *dev, struct drm_file *file,
+                union omap_gem_size gsize, uint32_t flags, uint32_t *handle);
+void omap_gem_free_object(struct drm_gem_object *obj);
+int omap_gem_init_object(struct drm_gem_object *obj);
+void *omap_gem_vaddr(struct drm_gem_object *obj);
+int omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle, uint64_t *offset);
+int omap_gem_dumb_destroy(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle);
+int omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
+                struct drm_mode_create_dumb *args);
+int omap_gem_mmap(struct file *filp, struct vm_area_struct *vma);
+int omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
+int omap_gem_op_start(struct drm_gem_object *obj, enum omap_gem_op op);
+int omap_gem_op_finish(struct drm_gem_object *obj, enum omap_gem_op op);
+int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op);
+int omap_gem_op_async(struct drm_gem_object *obj, enum omap_gem_op op,
+                void (*fxn)(void *arg), void *arg);
+int omap_gem_roll(struct drm_gem_object *obj, uint32_t roll);
+int omap_gem_get_paddr(struct drm_gem_object *obj,
+                dma_addr_t *paddr, bool remap);
+int omap_gem_put_paddr(struct drm_gem_object *obj);
+uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj);
+size_t omap_gem_mmap_size(struct drm_gem_object *obj);
+
+static inline int align_pitch(int pitch, int width, int bpp)
+{
+        int bytespp = (bpp + 7) / 8;
+        /* in case someone tries to feed us a completely bogus stride: */
+        pitch = max(pitch, width * bytespp);
+        /* PVR needs alignment to 8 pixels.. right now that is the most
+         * restrictive stride requirement..
+         */
+        return ALIGN(pitch, 8 * bytespp);
+}
+
+#endif /* __OMAP_DRV_H__ */
diff --git a/drivers/staging/omapdrm/omap_encoder.c b/drivers/staging/omapdrm/omap_encoder.c
new file mode 100644
index 000000000000..06c52cb62d2f
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_encoder.c
@@ -0,0 +1,171 @@
+/*
+ * drivers/staging/omapdrm/omap_encoder.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+
+/*
+ * encoder funcs
+ */
+
+#define to_omap_encoder(x) container_of(x, struct omap_encoder, base)
+
+struct omap_encoder {
+        struct drm_encoder base;
+        struct omap_overlay_manager *mgr;
+};
+
+static void omap_encoder_destroy(struct drm_encoder *encoder)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        DBG("%s", omap_encoder->mgr->name);
+        drm_encoder_cleanup(encoder);
+        kfree(omap_encoder);
+}
+
+static void omap_encoder_dpms(struct drm_encoder *encoder, int mode)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        DBG("%s: %d", omap_encoder->mgr->name, mode);
+}
+
+static bool omap_encoder_mode_fixup(struct drm_encoder *encoder,
+                                  struct drm_display_mode *mode,
+                                  struct drm_display_mode *adjusted_mode)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        DBG("%s", omap_encoder->mgr->name);
+        return true;
+}
+
+static void omap_encoder_mode_set(struct drm_encoder *encoder,
+                                struct drm_display_mode *mode,
+                                struct drm_display_mode *adjusted_mode)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        struct drm_device *dev = encoder->dev;
+        struct omap_drm_private *priv = dev->dev_private;
+        int i;
+
+        mode = adjusted_mode;
+
+        DBG("%s: set mode: %dx%d", omap_encoder->mgr->name,
+                        mode->hdisplay, mode->vdisplay);
+
+        for (i = 0; i < priv->num_connectors; i++) {
+                struct drm_connector *connector = priv->connectors[i];
+                if (connector->encoder == encoder) {
+                        omap_connector_mode_set(connector, mode);
+                }
+        }
+}
+
+static void omap_encoder_prepare(struct drm_encoder *encoder)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        struct drm_encoder_helper_funcs *encoder_funcs =
+                                encoder->helper_private;
+        DBG("%s", omap_encoder->mgr->name);
+        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
+}
+
+static void omap_encoder_commit(struct drm_encoder *encoder)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        struct drm_encoder_helper_funcs *encoder_funcs =
+                                encoder->helper_private;
+        DBG("%s", omap_encoder->mgr->name);
+        omap_encoder->mgr->apply(omap_encoder->mgr);
+        encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON);
+}
+
+static const struct drm_encoder_funcs omap_encoder_funcs = {
+        .destroy = omap_encoder_destroy,
+};
+
+static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {
+        .dpms = omap_encoder_dpms,
+        .mode_fixup = omap_encoder_mode_fixup,
+        .mode_set = omap_encoder_mode_set,
+        .prepare = omap_encoder_prepare,
+        .commit = omap_encoder_commit,
+};
+
+struct omap_overlay_manager *omap_encoder_get_manager(
+                struct drm_encoder *encoder)
+{
+        struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
+        return omap_encoder->mgr;
+}
+
+/* initialize encoder */
+struct drm_encoder *omap_encoder_init(struct drm_device *dev,
+                struct omap_overlay_manager *mgr)
+{
+        struct drm_encoder *encoder = NULL;
+        struct omap_encoder *omap_encoder;
+        struct omap_overlay_manager_info info;
+        int ret;
+
+        DBG("%s", mgr->name);
+
+        omap_encoder = kzalloc(sizeof(*omap_encoder), GFP_KERNEL);
+        if (!omap_encoder) {
+                dev_err(dev->dev, "could not allocate encoder\n");
+                goto fail;
+        }
+
+        omap_encoder->mgr = mgr;
+        encoder = &omap_encoder->base;
+
+        drm_encoder_init(dev, encoder, &omap_encoder_funcs,
+                         DRM_MODE_ENCODER_TMDS);
+        drm_encoder_helper_add(encoder, &omap_encoder_helper_funcs);
+
+        mgr->get_manager_info(mgr, &info);
+
+        /* TODO: fix hard-coded setup.. */
+        info.default_color = 0x00000000;
+        info.trans_key = 0x00000000;
+        info.trans_key_type = OMAP_DSS_COLOR_KEY_GFX_DST;
+        info.trans_enabled = false;
+
+        ret = mgr->set_manager_info(mgr, &info);
+        if (ret) {
+                dev_err(dev->dev, "could not set manager info\n");
+                goto fail;
+        }
+
+        ret = mgr->apply(mgr);
+        if (ret) {
+                dev_err(dev->dev, "could not apply\n");
+                goto fail;
+        }
+
+        return encoder;
+
+fail:
+        if (encoder) {
+                omap_encoder_destroy(encoder);
+        }
+
+        return NULL;
+}
diff --git a/drivers/staging/omapdrm/omap_fb.c b/drivers/staging/omapdrm/omap_fb.c
new file mode 100644
index 000000000000..0b50c5b3b564
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_fb.c
@@ -0,0 +1,243 @@
+/*
+ * drivers/staging/omapdrm/omap_fb.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+#include "drm_crtc.h"
+#include "drm_crtc_helper.h"
+
+
+/*
+ * framebuffer funcs
+ */
+
+#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;
+};
+
+static int omap_framebuffer_create_handle(struct drm_framebuffer *fb,
+                struct drm_file *file_priv,
+                unsigned int *handle)
+{
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+    return drm_gem_handle_create(file_priv, omap_fb->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);
+
+        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);
+        }
+
+        kfree(omap_fb);
+}
+
+static int omap_framebuffer_dirty(struct drm_framebuffer *fb,
+                struct drm_file *file_priv, unsigned flags, unsigned color,
+                struct drm_clip_rect *clips, unsigned num_clips)
+{
+        int i;
+
+        for (i = 0; i < num_clips; i++) {
+                omap_framebuffer_flush(fb, clips[i].x1, clips[i].y1,
+                                        clips[i].x2 - clips[i].x1,
+                                        clips[i].y2 - clips[i].y1);
+        }
+
+        return 0;
+}
+
+static const struct drm_framebuffer_funcs omap_framebuffer_funcs = {
+        .create_handle = omap_framebuffer_create_handle,
+        .destroy = omap_framebuffer_destroy,
+        .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)
+{
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        int bpp = fb->bits_per_pixel / 8;
+        unsigned long offset;
+
+        offset = (x * bpp) + (y * fb->pitch);
+
+        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;
+        }
+
+        *paddr = omap_fb->paddr + offset;
+        *screen_width = fb->pitch / bpp;
+
+        return omap_fb->size - offset;
+}
+
+struct drm_gem_object *omap_framebuffer_bo(struct drm_framebuffer *fb)
+{
+        struct omap_framebuffer *omap_fb = to_omap_framebuffer(fb);
+        return omap_fb->bo;
+}
+
+/* iterate thru all the connectors, returning ones that are attached
+ * to the same fb..
+ */
+struct drm_connector *omap_framebuffer_get_next_connector(
+                struct drm_framebuffer *fb, struct drm_connector *from)
+{
+        struct drm_device *dev = fb->dev;
+        struct list_head *connector_list = &dev->mode_config.connector_list;
+        struct drm_connector *connector = from;
+
+        if (!from) {
+                return list_first_entry(connector_list, typeof(*from), head);
+        }
+
+        list_for_each_entry_from(connector, connector_list, head) {
+                if (connector != from) {
+                        struct drm_encoder *encoder = connector->encoder;
+                        struct drm_crtc *crtc = encoder ? encoder->crtc : NULL;
+                        if (crtc && crtc->fb == fb) {
+                                return connector;
+                        }
+                }
+        }
+
+        return NULL;
+}
+
+/* flush an area of the framebuffer (in case of manual update display that
+ * is not automatically flushed)
+ */
+void omap_framebuffer_flush(struct drm_framebuffer *fb,
+                int x, int y, int w, int h)
+{
+        struct drm_connector *connector = NULL;
+
+        VERB("flush: %d,%d %dx%d, fb=%p", x, y, w, h, fb);
+
+        while ((connector = omap_framebuffer_get_next_connector(fb, connector))) {
+                /* only consider connectors that are part of a chain */
+                if (connector->encoder && connector->encoder->crtc) {
+                        /* TODO: maybe this should propagate thru the crtc who
+                         * could do the coordinate translation..
+                         */
+                        struct drm_crtc *crtc = connector->encoder->crtc;
+                        int cx = max(0, x - crtc->x);
+                        int cy = max(0, y - crtc->y);
+                        int cw = w + (x - crtc->x) - cx;
+                        int ch = h + (y - crtc->y) - cy;
+
+                        omap_connector_flush(connector, cx, cy, cw, ch);
+                }
+        }
+}
+
+struct drm_framebuffer *omap_framebuffer_create(struct drm_device *dev,
+                struct drm_file *file, struct drm_mode_fb_cmd *mode_cmd)
+{
+        struct drm_gem_object *bo;
+        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);
+        }
+        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 omap_framebuffer *omap_fb;
+        struct drm_framebuffer *fb = NULL;
+        int size, ret;
+
+        DBG("create framebuffer: dev=%p, mode_cmd=%p (%dx%d@%d)",
+                        dev, mode_cmd, mode_cmd->width, mode_cmd->height,
+                        mode_cmd->bpp);
+
+        /* 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);
+
+        omap_fb = kzalloc(sizeof(*omap_fb), GFP_KERNEL);
+        if (!omap_fb) {
+                dev_err(dev->dev, "could not allocate fb\n");
+                goto fail;
+        }
+
+        fb = &omap_fb->base;
+        ret = drm_framebuffer_init(dev, fb, &omap_framebuffer_funcs);
+        if (ret) {
+                dev_err(dev->dev, "framebuffer init failed: %d\n", ret);
+                goto fail;
+        }
+
+        DBG("create: FB ID: %d (%p)", fb->base.id, fb);
+
+        size = PAGE_ALIGN(mode_cmd->pitch * mode_cmd->height);
+
+        if (size > bo->size) {
+                dev_err(dev->dev, "provided buffer object is too small!\n");
+                goto fail;
+        }
+
+        omap_fb->bo = bo;
+        omap_fb->size = size;
+
+        if (omap_gem_get_paddr(bo, &omap_fb->paddr, true)) {
+                dev_err(dev->dev, "could not map (paddr)!\n");
+                goto fail;
+        }
+
+        drm_helper_mode_fill_fb_struct(fb, mode_cmd);
+
+        return fb;
+
+fail:
+        if (fb) {
+                omap_framebuffer_destroy(fb);
+        }
+        return NULL;
+}
diff --git a/drivers/staging/omapdrm/omap_fbdev.c b/drivers/staging/omapdrm/omap_fbdev.c
new file mode 100644
index 000000000000..093ae2f87b20
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_fbdev.c
@@ -0,0 +1,372 @@
+/*
+ * drivers/staging/omapdrm/omap_fbdev.c
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "omap_drv.h"
+
+#include "drm_crtc.h"
+#include "drm_fb_helper.h"
+
+MODULE_PARM_DESC(ywrap, "Enable ywrap scrolling (omap44xx and later, default 'y')");
+static bool ywrap_enabled = true;
+module_param_named(ywrap, ywrap_enabled, bool, 0644);
+
+/*
+ * fbdev funcs, to implement legacy fbdev interface on top of drm driver
+ */
+
+#define to_omap_fbdev(x) container_of(x, struct omap_fbdev, base)
+
+struct omap_fbdev {
+        struct drm_fb_helper base;
+        struct drm_framebuffer *fb;
+        struct drm_gem_object *bo;
+        bool ywrap_enabled;
+};
+
+static void omap_fbdev_flush(struct fb_info *fbi, int x, int y, int w, int h);
+static struct drm_fb_helper *get_fb(struct fb_info *fbi);
+
+static ssize_t omap_fbdev_write(struct fb_info *fbi, const char __user *buf,
+                size_t count, loff_t *ppos)
+{
+        ssize_t res;
+
+        res = fb_sys_write(fbi, buf, count, ppos);
+        omap_fbdev_flush(fbi, 0, 0, fbi->var.xres, fbi->var.yres);
+
+        return res;
+}
+
+static void omap_fbdev_fillrect(struct fb_info *fbi,
+                const struct fb_fillrect *rect)
+{
+        sys_fillrect(fbi, rect);
+        omap_fbdev_flush(fbi, rect->dx, rect->dy, rect->width, rect->height);
+}
+
+static void omap_fbdev_copyarea(struct fb_info *fbi,
+                const struct fb_copyarea *area)
+{
+        sys_copyarea(fbi, area);
+        omap_fbdev_flush(fbi, area->dx, area->dy, area->width, area->height);
+}
+
+static void omap_fbdev_imageblit(struct fb_info *fbi,
+                const struct fb_image *image)
+{
+        sys_imageblit(fbi, image);
+        omap_fbdev_flush(fbi, image->dx, image->dy,
+                                image->width, image->height);
+}
+
+static int omap_fbdev_pan_display(struct fb_var_screeninfo *var,
+                struct fb_info *fbi)
+{
+        struct drm_fb_helper *helper = get_fb(fbi);
+        struct omap_fbdev *fbdev = to_omap_fbdev(helper);
+        int npages;
+
+        if (!helper)
+                goto fallback;
+
+        if (!fbdev->ywrap_enabled)
+                goto fallback;
+
+        /* DMM roll shifts in 4K pages: */
+        npages = fbi->fix.line_length >> PAGE_SHIFT;
+        omap_gem_roll(fbdev->bo, var->yoffset * npages);
+
+        return 0;
+
+fallback:
+        return drm_fb_helper_pan_display(var, fbi);
+}
+
+static struct fb_ops omap_fb_ops = {
+        .owner = THIS_MODULE,
+
+        /* Note: to properly handle manual update displays, we wrap the
+         * basic fbdev ops which write to the framebuffer
+         */
+        .fb_read = fb_sys_read,
+        .fb_write = omap_fbdev_write,
+        .fb_fillrect = omap_fbdev_fillrect,
+        .fb_copyarea = omap_fbdev_copyarea,
+        .fb_imageblit = omap_fbdev_imageblit,
+
+        .fb_check_var = drm_fb_helper_check_var,
+        .fb_set_par = drm_fb_helper_set_par,
+        .fb_pan_display = omap_fbdev_pan_display,
+        .fb_blank = drm_fb_helper_blank,
+        .fb_setcmap = drm_fb_helper_setcmap,
+
+        .fb_debug_enter = drm_fb_helper_debug_enter,
+        .fb_debug_leave = drm_fb_helper_debug_leave,
+};
+
+static int omap_fbdev_create(struct drm_fb_helper *helper,
+                struct drm_fb_helper_surface_size *sizes)
+{
+        struct omap_fbdev *fbdev = to_omap_fbdev(helper);
+        struct drm_device *dev = helper->dev;
+        struct omap_drm_private *priv = dev->dev_private;
+        struct drm_framebuffer *fb = NULL;
+        union omap_gem_size gsize;
+        struct fb_info *fbi = NULL;
+        struct drm_mode_fb_cmd 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
+         * with video overlays:
+         */
+        sizes->surface_bpp = 32;
+        sizes->surface_depth = 32;
+
+        DBG("create fbdev: %dx%d@%d (%dx%d)", sizes->surface_width,
+                        sizes->surface_height, sizes->surface_bpp,
+                        sizes->fb_width, sizes->fb_height);
+
+        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);
+
+        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);
+        }
+
+        /* allocate backing bo */
+        gsize = (union omap_gem_size){
+                .bytes = PAGE_ALIGN(mode_cmd.pitch * 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");
+                goto fail;
+        }
+
+        fb = omap_framebuffer_init(dev, &mode_cmd, fbdev->bo);
+        if (!fb) {
+                dev_err(dev->dev, "failed to allocate fb\n");
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        mutex_lock(&dev->struct_mutex);
+
+        fbi = framebuffer_alloc(0, dev->dev);
+        if (!fbi) {
+                dev_err(dev->dev, "failed to allocate fb info\n");
+                ret = -ENOMEM;
+                goto fail_unlock;
+        }
+
+        DBG("fbi=%p, dev=%p", fbi, dev);
+
+        fbdev->fb = fb;
+        helper->fb = fb;
+        helper->fbdev = fbi;
+
+        fbi->par = helper;
+        fbi->flags = FBINFO_DEFAULT;
+        fbi->fbops = &omap_fb_ops;
+
+        strcpy(fbi->fix.id, MODULE_NAME);
+
+        ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
+        if (ret) {
+                ret = -ENOMEM;
+                goto fail_unlock;
+        }
+
+        drm_fb_helper_fill_fix(fbi, fb->pitch, 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->fix.smem_start = paddr;
+        fbi->fix.smem_len = size;
+
+        /* if we have DMM, then we can use it for scrolling by just
+         * shuffling pages around in DMM rather than doing sw blit.
+         */
+        if (fbdev->ywrap_enabled) {
+                DRM_INFO("Enabling DMM ywrap scrolling\n");
+                fbi->flags |= FBINFO_HWACCEL_YWRAP | FBINFO_READS_FAST;
+                fbi->fix.ywrapstep = 1;
+        }
+
+
+        DBG("par=%p, %dx%d", fbi->par, fbi->var.xres, fbi->var.yres);
+        DBG("allocated %dx%d fb", fbdev->fb->width, fbdev->fb->height);
+
+        mutex_unlock(&dev->struct_mutex);
+
+        return 0;
+
+fail_unlock:
+        mutex_unlock(&dev->struct_mutex);
+fail:
+
+        if (ret) {
+                if (fbi)
+                        framebuffer_release(fbi);
+                if (fb)
+                        fb->funcs->destroy(fb);
+        }
+
+        return ret;
+}
+
+static void omap_crtc_fb_gamma_set(struct drm_crtc *crtc,
+                u16 red, u16 green, u16 blue, int regno)
+{
+        DBG("fbdev: set gamma");
+}
+
+static void omap_crtc_fb_gamma_get(struct drm_crtc *crtc,
+                u16 *red, u16 *green, u16 *blue, int regno)
+{
+        DBG("fbdev: get gamma");
+}
+
+static int omap_fbdev_probe(struct drm_fb_helper *helper,
+                struct drm_fb_helper_surface_size *sizes)
+{
+        int new_fb = 0;
+        int ret;
+
+        if (!helper->fb) {
+                ret = omap_fbdev_create(helper, sizes);
+                if (ret)
+                        return ret;
+                new_fb = 1;
+        }
+        return new_fb;
+}
+
+static struct drm_fb_helper_funcs omap_fb_helper_funcs = {
+        .gamma_set = omap_crtc_fb_gamma_set,
+        .gamma_get = omap_crtc_fb_gamma_get,
+        .fb_probe = omap_fbdev_probe,
+};
+
+static struct drm_fb_helper *get_fb(struct fb_info *fbi)
+{
+        if (!fbi || strcmp(fbi->fix.id, MODULE_NAME)) {
+                /* these are not the fb's you're looking for */
+                return NULL;
+        }
+        return fbi->par;
+}
+
+/* flush an area of the framebuffer (in case of manual update display that
+ * is not automatically flushed)
+ */
+static void omap_fbdev_flush(struct fb_info *fbi, int x, int y, int w, int h)
+{
+        struct drm_fb_helper *helper = get_fb(fbi);
+
+        if (!helper)
+                return;
+
+        VERB("flush fbdev: %d,%d %dx%d, fbi=%p", x, y, w, h, fbi);
+
+        omap_framebuffer_flush(helper->fb, x, y, w, h);
+}
+
+/* initialize fbdev helper */
+struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        struct omap_fbdev *fbdev = NULL;
+        struct drm_fb_helper *helper;
+        int ret = 0;
+
+        fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL);
+        if (!fbdev) {
+                dev_err(dev->dev, "could not allocate fbdev\n");
+                goto fail;
+        }
+
+        helper = &fbdev->base;
+
+        helper->funcs = &omap_fb_helper_funcs;
+
+        ret = drm_fb_helper_init(dev, helper,
+                        priv->num_crtcs, priv->num_connectors);
+        if (ret) {
+                dev_err(dev->dev, "could not init fbdev: ret=%d\n", ret);
+                goto fail;
+        }
+
+        drm_fb_helper_single_add_all_connectors(helper);
+        drm_fb_helper_initial_config(helper, 32);
+
+        priv->fbdev = helper;
+
+        return helper;
+
+fail:
+        kfree(fbdev);
+        return NULL;
+}
+
+void omap_fbdev_free(struct drm_device *dev)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        struct drm_fb_helper *helper = priv->fbdev;
+        struct omap_fbdev *fbdev;
+        struct fb_info *fbi;
+
+        DBG();
+
+        fbi = helper->fbdev;
+
+        unregister_framebuffer(fbi);
+        framebuffer_release(fbi);
+
+        drm_fb_helper_fini(helper);
+
+        fbdev = to_omap_fbdev(priv->fbdev);
+
+        kfree(fbdev);
+
+        /* this will free the backing object */
+        if (fbdev->fb)
+                fbdev->fb->funcs->destroy(fbdev->fb);
+
+        priv->fbdev = NULL;
+}
diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c
new file mode 100644
index 000000000000..e0ebd1d139f6
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -0,0 +1,1231 @@
+/*
+ * drivers/staging/omapdrm/omap_gem.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 <linux/spinlock.h>
+#include <linux/shmem_fs.h>
+
+#include "omap_drv.h"
+#include "omap_dmm_tiler.h"
+
+/* remove these once drm core helpers are merged */
+struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask);
+void _drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
+                bool dirty, bool accessed);
+int _drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size);
+
+/*
+ * GEM buffer object implementation.
+ */
+
+#define to_omap_bo(x) container_of(x, struct omap_gem_object, base)
+
+/* note: we use upper 8 bits of flags for driver-internal flags: */
+#define OMAP_BO_DMA                     0x01000000      /* actually is physically contiguous */
+#define OMAP_BO_EXT_SYNC        0x02000000      /* externally allocated sync object */
+#define OMAP_BO_EXT_MEM         0x04000000      /* externally allocated memory */
+
+
+struct omap_gem_object {
+        struct drm_gem_object base;
+
+        uint32_t flags;
+
+        /** width/height for tiled formats (rounded up to slot boundaries) */
+        uint16_t width, height;
+
+        /** roll applied when mapping to DMM */
+        uint32_t roll;
+
+        /**
+         * If buffer is allocated physically contiguous, the OMAP_BO_DMA flag
+         * is set and the paddr is valid.  Also if the buffer is remapped in
+         * TILER and paddr_cnt > 0, then paddr is valid.  But if you are using
+         * the physical address and OMAP_BO_DMA is not set, then you should
+         * be going thru omap_gem_{get,put}_paddr() to ensure the mapping is
+         * not removed from under your feet.
+         *
+         * Note that OMAP_BO_SCANOUT is a hint from userspace that DMA capable
+         * buffer is requested, but doesn't mean that it is.  Use the
+         * OMAP_BO_DMA flag to determine if the buffer has a DMA capable
+         * physical address.
+         */
+        dma_addr_t paddr;
+
+        /**
+         * # of users of paddr
+         */
+        uint32_t paddr_cnt;
+
+        /**
+         * tiler block used when buffer is remapped in DMM/TILER.
+         */
+        struct tiler_block *block;
+
+        /**
+         * Array of backing pages, if allocated.  Note that pages are never
+         * allocated for buffers originally allocated from contiguous memory
+         */
+        struct page **pages;
+
+        /** addresses corresponding to pages in above array */
+        dma_addr_t *addrs;
+
+        /**
+         * Virtual address, if mapped.
+         */
+        void *vaddr;
+
+        /**
+         * sync-object allocated on demand (if needed)
+         *
+         * Per-buffer sync-object for tracking pending and completed hw/dma
+         * read and write operations.  The layout in memory is dictated by
+         * the SGX firmware, which uses this information to stall the command
+         * stream if a surface is not ready yet.
+         *
+         * Note that when buffer is used by SGX, the sync-object needs to be
+         * allocated from a special heap of sync-objects.  This way many sync
+         * objects can be packed in a page, and not waste GPU virtual address
+         * space.  Because of this we have to have a omap_gem_set_sync_object()
+         * API to allow replacement of the syncobj after it has (potentially)
+         * already been allocated.  A bit ugly but I haven't thought of a
+         * better alternative.
+         */
+        struct {
+                uint32_t write_pending;
+                uint32_t write_complete;
+                uint32_t read_pending;
+                uint32_t read_complete;
+        } *sync;
+};
+
+/* 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
+ * regions in each of the 2d containers to use as a user-GART where we
+ * can create a second page-aligned mapping of parts of the buffer
+ * being accessed from userspace.
+ *
+ * Note that we could optimize slightly when we know that multiple
+ * tiler containers are backed by the same PAT.. but I'll leave that
+ * for later..
+ */
+#define NUM_USERGART_ENTRIES 2
+struct usergart_entry {
+        struct tiler_block *block;      /* the reserved tiler block */
+        dma_addr_t paddr;
+        struct drm_gem_object *obj;     /* the current pinned obj */
+        pgoff_t obj_pgoff;              /* page offset of obj currently
+                                           mapped in */
+};
+static struct {
+        struct usergart_entry entry[NUM_USERGART_ENTRIES];
+        int height;                             /* height in rows */
+        int height_shift;               /* ilog2(height in rows) */
+        int slot_shift;                 /* ilog2(width per slot) */
+        int stride_pfn;                 /* stride in pages */
+        int last;                               /* index of last used entry */
+} *usergart;
+
+static void evict_entry(struct drm_gem_object *obj,
+                enum tiler_fmt fmt, struct usergart_entry *entry)
+{
+        if (obj->dev->dev_mapping) {
+                size_t size = PAGE_SIZE * usergart[fmt].height;
+                loff_t off = omap_gem_mmap_offset(obj) +
+                                (entry->obj_pgoff << PAGE_SHIFT);
+                unmap_mapping_range(obj->dev->dev_mapping, off, size, 1);
+        }
+
+        entry->obj = NULL;
+}
+
+/* Evict a buffer from usergart, if it is mapped there */
+static void evict(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+
+        if (omap_obj->flags & OMAP_BO_TILED) {
+                enum tiler_fmt fmt = gem2fmt(omap_obj->flags);
+                int i;
+
+                if (!usergart)
+                        return;
+
+                for (i = 0; i < NUM_USERGART_ENTRIES; i++) {
+                        struct usergart_entry *entry = &usergart[fmt].entry[i];
+                        if (entry->obj == obj)
+                                evict_entry(obj, fmt, entry);
+                }
+        }
+}
+
+/* GEM objects can either be allocated from contiguous memory (in which
+ * case obj->filp==NULL), or w/ shmem backing (obj->filp!=NULL).  But non
+ * contiguous buffers can be remapped in TILER/DMM if they need to be
+ * contiguous... but we don't do this all the time to reduce pressure
+ * on TILER/DMM space when we know at allocation time that the buffer
+ * will need to be scanned out.
+ */
+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 */
+static int omap_gem_attach_pages(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        struct page **pages;
+
+        WARN_ON(omap_obj->pages);
+
+        /* TODO: __GFP_DMA32 .. but somehow GFP_HIGHMEM is coming from the
+         * mapping_gfp_mask(mapping) which conflicts w/ GFP_DMA32.. probably
+         * we actually want CMA memory for it all anyways..
+         */
+        pages = _drm_gem_get_pages(obj, GFP_KERNEL);
+        if (IS_ERR(pages)) {
+                dev_err(obj->dev->dev, "could not get pages: %ld\n", PTR_ERR(pages));
+                return PTR_ERR(pages);
+        }
+
+        /* for non-cached buffers, ensure the new pages are clean because
+         * DSS, GPU, etc. are not cache coherent:
+         */
+        if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) {
+                int i, npages = obj->size >> PAGE_SHIFT;
+                dma_addr_t *addrs = kmalloc(npages * sizeof(addrs), GFP_KERNEL);
+                for (i = 0; i < npages; i++) {
+                        addrs[i] = dma_map_page(obj->dev->dev, pages[i],
+                                        0, PAGE_SIZE, DMA_BIDIRECTIONAL);
+                }
+                omap_obj->addrs = addrs;
+        }
+
+        omap_obj->pages = pages;
+        return 0;
+}
+
+/** release backing pages */
+static void omap_gem_detach_pages(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+
+        /* for non-cached buffers, ensure the new pages are clean because
+         * DSS, GPU, etc. are not cache coherent:
+         */
+        if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) {
+                int i, npages = obj->size >> PAGE_SHIFT;
+                for (i = 0; i < npages; i++) {
+                        dma_unmap_page(obj->dev->dev, omap_obj->addrs[i],
+                                        PAGE_SIZE, DMA_BIDIRECTIONAL);
+                }
+                kfree(omap_obj->addrs);
+                omap_obj->addrs = NULL;
+        }
+
+        _drm_gem_put_pages(obj, omap_obj->pages, true, false);
+        omap_obj->pages = NULL;
+}
+
+/** get mmap offset */
+uint64_t omap_gem_mmap_offset(struct drm_gem_object *obj)
+{
+        if (!obj->map_list.map) {
+                /* Make it mmapable */
+                size_t size = omap_gem_mmap_size(obj);
+                int ret = _drm_gem_create_mmap_offset_size(obj, size);
+
+                if (ret) {
+                        dev_err(obj->dev->dev, "could not allocate mmap offset");
+                        return 0;
+                }
+        }
+
+        return (uint64_t)obj->map_list.hash.key << PAGE_SHIFT;
+}
+
+/** get mmap size */
+size_t omap_gem_mmap_size(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        size_t size = obj->size;
+
+        if (omap_obj->flags & OMAP_BO_TILED) {
+                /* for tiled buffers, the virtual size has stride rounded up
+                 * to 4kb.. (to hide the fact that row n+1 might start 16kb or
+                 * 32kb later!).  But we don't back the entire buffer with
+                 * pages, only the valid picture part.. so need to adjust for
+                 * this in the size used to mmap and generate mmap offset
+                 */
+                size = tiler_vsize(gem2fmt(omap_obj->flags),
+                                omap_obj->width, omap_obj->height);
+        }
+
+        return size;
+}
+
+
+/* Normal handling for the case of faulting in non-tiled buffers */
+static int fault_1d(struct drm_gem_object *obj,
+                struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        unsigned long pfn;
+        pgoff_t pgoff;
+
+        /* We don't use vmf->pgoff since that has the fake offset: */
+        pgoff = ((unsigned long)vmf->virtual_address -
+                        vma->vm_start) >> PAGE_SHIFT;
+
+        if (omap_obj->pages) {
+                pfn = page_to_pfn(omap_obj->pages[pgoff]);
+        } else {
+                BUG_ON(!(omap_obj->flags & OMAP_BO_DMA));
+                pfn = (omap_obj->paddr >> PAGE_SHIFT) + pgoff;
+        }
+
+        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+                        pfn, pfn << PAGE_SHIFT);
+
+        return vm_insert_mixed(vma, (unsigned long)vmf->virtual_address, pfn);
+}
+
+/* Special handling for the case of faulting in 2d tiled buffers */
+static int fault_2d(struct drm_gem_object *obj,
+                struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        struct usergart_entry *entry;
+        enum tiler_fmt fmt = gem2fmt(omap_obj->flags);
+        struct page *pages[64];  /* XXX is this too much to have on stack? */
+        unsigned long pfn;
+        pgoff_t pgoff, base_pgoff;
+        void __user *vaddr;
+        int i, ret, slots;
+
+        if (!usergart)
+                return -EFAULT;
+
+        /* TODO: this fxn might need a bit tweaking to deal w/ tiled buffers
+         * that are wider than 4kb
+         */
+
+        /* We don't use vmf->pgoff since that has the fake offset: */
+        pgoff = ((unsigned long)vmf->virtual_address -
+                        vma->vm_start) >> PAGE_SHIFT;
+
+        /* actual address we start mapping at is rounded down to previous slot
+         * boundary in the y direction:
+         */
+        base_pgoff = round_down(pgoff, usergart[fmt].height);
+        vaddr = vmf->virtual_address - ((pgoff - base_pgoff) << PAGE_SHIFT);
+        entry = &usergart[fmt].entry[usergart[fmt].last];
+
+        slots = omap_obj->width >> usergart[fmt].slot_shift;
+
+        /* evict previous buffer using this usergart entry, if any: */
+        if (entry->obj)
+                evict_entry(entry->obj, fmt, entry);
+
+        entry->obj = obj;
+        entry->obj_pgoff = base_pgoff;
+
+        /* now convert base_pgoff to phys offset from virt offset:
+         */
+        base_pgoff = (base_pgoff >> usergart[fmt].height_shift) * slots;
+
+        /* map in pages.  Note the height of the slot is also equal to the
+         * number of pages that need to be mapped in to fill 4kb wide CPU page.
+         * If the height is 64, then 64 pages fill a 4kb wide by 64 row region.
+         * Beyond the valid pixel part of the buffer, we set pages[i] to NULL to
+         * get a dummy page mapped in.. if someone reads/writes it they will get
+         * random/undefined content, but at least it won't be corrupting
+         * whatever other random page used to be mapped in, or other undefined
+         * behavior.
+         */
+        memcpy(pages, &omap_obj->pages[base_pgoff],
+                        sizeof(struct page *) * slots);
+        memset(pages + slots, 0,
+                        sizeof(struct page *) * (usergart[fmt].height - slots));
+
+        ret = tiler_pin(entry->block, pages, ARRAY_SIZE(pages), 0, true);
+        if (ret) {
+                dev_err(obj->dev->dev, "failed to pin: %d\n", ret);
+                return ret;
+        }
+
+        i = usergart[fmt].height;
+        pfn = entry->paddr >> PAGE_SHIFT;
+
+        VERB("Inserting %p pfn %lx, pa %lx", vmf->virtual_address,
+                        pfn, pfn << PAGE_SHIFT);
+
+        while (i--) {
+                vm_insert_mixed(vma, (unsigned long)vaddr, pfn);
+                pfn += usergart[fmt].stride_pfn;
+                vaddr += PAGE_SIZE;
+        }
+
+        /* simple round-robin: */
+        usergart[fmt].last = (usergart[fmt].last + 1) % NUM_USERGART_ENTRIES;
+
+        return 0;
+}
+
+/**
+ * omap_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.
+ *
+ * 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 omap_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+{
+        struct drm_gem_object *obj = vma->vm_private_data;
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        struct drm_device *dev = obj->dev;
+        struct page **pages;
+        int ret;
+
+        /* Make sure we don't parallel update on a fault, nor move or remove
+         * something from beneath our feet
+         */
+        mutex_lock(&dev->struct_mutex);
+
+        /* if a shmem backed object, make sure we have pages attached now */
+        ret = get_pages(obj, &pages);
+        if (ret) {
+                goto fail;
+        }
+
+        /* where should we do corresponding put_pages().. we are mapping
+         * the original page, rather than thru a GART, so we can't rely
+         * on eviction to trigger this.  But munmap() or all mappings should
+         * probably trigger put_pages()?
+         */
+
+        if (omap_obj->flags & OMAP_BO_TILED)
+                ret = fault_2d(obj, vma, vmf);
+        else
+                ret = fault_1d(obj, vma, vmf);
+
+
+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;
+        }
+}
+
+/** We override mainly to fix up some of the vm mapping flags.. */
+int omap_gem_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+        struct omap_gem_object *omap_obj;
+        int ret;
+
+        ret = drm_gem_mmap(filp, vma);
+        if (ret) {
+                DBG("mmap failed: %d", ret);
+                return ret;
+        }
+
+        /* after drm_gem_mmap(), it is safe to access the obj */
+        omap_obj = to_omap_bo(vma->vm_private_data);
+
+        vma->vm_flags &= ~VM_PFNMAP;
+        vma->vm_flags |= VM_MIXEDMAP;
+
+        if (omap_obj->flags & OMAP_BO_WC) {
+                vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+        } else if (omap_obj->flags & OMAP_BO_UNCACHED) {
+                vma->vm_page_prot = pgprot_noncached(vm_get_page_prot(vma->vm_flags));
+        } else {
+                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+        }
+
+        return ret;
+}
+
+/**
+ * omap_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 omap_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
+                struct drm_mode_create_dumb *args)
+{
+        union omap_gem_size gsize;
+
+        /* in case someone tries to feed us a completely bogus stride: */
+        args->pitch = align_pitch(args->pitch, args->width, args->bpp);
+        args->size = PAGE_ALIGN(args->pitch * args->height);
+
+        gsize = (union omap_gem_size){
+                .bytes = args->size,
+        };
+
+        return omap_gem_new_handle(dev, file, gsize,
+                        OMAP_BO_SCANOUT | OMAP_BO_WC, &args->handle);
+}
+
+/**
+ * omap_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 omap_gem_dumb_create.
+ */
+int omap_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);
+}
+
+/**
+ * omap_gem_dumb_map    -       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 omap_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,
+                uint32_t handle, uint64_t *offset)
+{
+        struct drm_gem_object *obj;
+        int ret = 0;
+
+        /* GEM does all our handle to object mapping */
+        obj = drm_gem_object_lookup(dev, file, handle);
+        if (obj == NULL) {
+                ret = -ENOENT;
+                goto fail;
+        }
+
+        *offset = omap_gem_mmap_offset(obj);
+
+        drm_gem_object_unreference_unlocked(obj);
+
+fail:
+        return ret;
+}
+
+/* Set scrolling position.  This allows us to implement fast scrolling
+ * for console.
+ */
+int omap_gem_roll(struct drm_gem_object *obj, uint32_t roll)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        uint32_t npages = obj->size >> PAGE_SHIFT;
+        int ret = 0;
+
+        if (roll > npages) {
+                dev_err(obj->dev->dev, "invalid roll: %d\n", roll);
+                return -EINVAL;
+        }
+
+        omap_obj->roll = roll;
+
+        if (in_atomic() || mutex_is_locked(&obj->dev->struct_mutex)) {
+                /* this can get called from fbcon in atomic context.. so
+                 * just ignore it and wait for next time called from
+                 * interruptible context to update the PAT.. the result
+                 * may be that user sees wrap-around instead of scrolling
+                 * momentarily on the screen.  If we wanted to be fancier
+                 * we could perhaps schedule some workqueue work at this
+                 * point.
+                 */
+                return 0;
+        }
+
+        mutex_lock(&obj->dev->struct_mutex);
+
+        /* if we aren't mapped yet, we don't need to do anything */
+        if (omap_obj->block) {
+                struct page **pages;
+                ret = get_pages(obj, &pages);
+                if (ret)
+                        goto fail;
+                ret = tiler_pin(omap_obj->block, pages, npages, roll, true);
+                if (ret)
+                        dev_err(obj->dev->dev, "could not repin: %d\n", ret);
+        }
+
+fail:
+        mutex_unlock(&obj->dev->struct_mutex);
+
+        return ret;
+}
+
+/* Get physical address for DMA.. if 'remap' is true, and the buffer is not
+ * already contiguous, remap it to pin in physically contiguous memory.. (ie.
+ * map in TILER)
+ */
+int omap_gem_get_paddr(struct drm_gem_object *obj,
+                dma_addr_t *paddr, bool remap)
+{
+        struct omap_drm_private *priv = obj->dev->dev_private;
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        int ret = 0;
+
+        mutex_lock(&obj->dev->struct_mutex);
+
+        if (remap && is_shmem(obj) && priv->has_dmm) {
+                if (omap_obj->paddr_cnt == 0) {
+                        struct page **pages;
+                        uint32_t npages = obj->size >> PAGE_SHIFT;
+                        enum tiler_fmt fmt = gem2fmt(omap_obj->flags);
+                        struct tiler_block *block;
+
+                        BUG_ON(omap_obj->block);
+
+                        ret = get_pages(obj, &pages);
+                        if (ret)
+                                goto fail;
+
+                        if (omap_obj->flags & OMAP_BO_TILED) {
+                                block = tiler_reserve_2d(fmt,
+                                                omap_obj->width,
+                                                omap_obj->height, 0);
+                        } else {
+                                block = tiler_reserve_1d(obj->size);
+                        }
+
+                        if (IS_ERR(block)) {
+                                ret = PTR_ERR(block);
+                                dev_err(obj->dev->dev,
+                                        "could not remap: %d (%d)\n", ret, fmt);
+                                goto fail;
+                        }
+
+                        /* TODO: enable async refill.. */
+                        ret = tiler_pin(block, pages, npages,
+                                        omap_obj->roll, true);
+                        if (ret) {
+                                tiler_release(block);
+                                dev_err(obj->dev->dev,
+                                                "could not pin: %d\n", ret);
+                                goto fail;
+                        }
+
+                        omap_obj->paddr = tiler_ssptr(block);
+                        omap_obj->block = block;
+
+                        DBG("got paddr: %08x", omap_obj->paddr);
+                }
+
+                omap_obj->paddr_cnt++;
+
+                *paddr = omap_obj->paddr;
+        } else if (omap_obj->flags & OMAP_BO_DMA) {
+                *paddr = omap_obj->paddr;
+        } else {
+                ret = -EINVAL;
+        }
+
+fail:
+        mutex_unlock(&obj->dev->struct_mutex);
+
+        return ret;
+}
+
+/* Release physical address, when DMA is no longer being performed.. this
+ * could potentially unpin and unmap buffers from TILER
+ */
+int omap_gem_put_paddr(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        int ret = 0;
+
+        mutex_lock(&obj->dev->struct_mutex);
+        if (omap_obj->paddr_cnt > 0) {
+                omap_obj->paddr_cnt--;
+                if (omap_obj->paddr_cnt == 0) {
+                        ret = tiler_unpin(omap_obj->block);
+                        if (ret) {
+                                dev_err(obj->dev->dev,
+                                        "could not unpin pages: %d\n", ret);
+                                goto fail;
+                        }
+                        ret = tiler_release(omap_obj->block);
+                        if (ret) {
+                                dev_err(obj->dev->dev,
+                                        "could not release unmap: %d\n", ret);
+                        }
+                        omap_obj->block = NULL;
+                }
+        }
+fail:
+        mutex_unlock(&obj->dev->struct_mutex);
+        return ret;
+}
+
+/* acquire pages when needed (for example, for DMA where physically
+ * contiguous buffer is not required
+ */
+static int get_pages(struct drm_gem_object *obj, struct page ***pages)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        int ret = 0;
+
+        if (is_shmem(obj) && !omap_obj->pages) {
+                ret = omap_gem_attach_pages(obj);
+                if (ret) {
+                        dev_err(obj->dev->dev, "could not attach pages\n");
+                        return ret;
+                }
+        }
+
+        /* TODO: even phys-contig.. we should have a list of pages? */
+        *pages = omap_obj->pages;
+
+        return 0;
+}
+
+int omap_gem_get_pages(struct drm_gem_object *obj, struct page ***pages)
+{
+        int ret;
+        mutex_lock(&obj->dev->struct_mutex);
+        ret = get_pages(obj, pages);
+        mutex_unlock(&obj->dev->struct_mutex);
+        return ret;
+}
+
+/* release pages when DMA no longer being performed */
+int omap_gem_put_pages(struct drm_gem_object *obj)
+{
+        /* do something here if we dynamically attach/detach pages.. at
+         * least they would no longer need to be pinned if everyone has
+         * released the pages..
+         */
+        return 0;
+}
+
+/* Get kernel virtual address for CPU access.. this more or less only
+ * exists for omap_fbdev.  This should be called with struct_mutex
+ * held.
+ */
+void *omap_gem_vaddr(struct drm_gem_object *obj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        WARN_ON(! mutex_is_locked(&obj->dev->struct_mutex));
+        if (!omap_obj->vaddr) {
+                struct page **pages;
+                int ret = get_pages(obj, &pages);
+                if (ret)
+                        return ERR_PTR(ret);
+                omap_obj->vaddr = vmap(pages, obj->size >> PAGE_SHIFT,
+                                VM_MAP, pgprot_writecombine(PAGE_KERNEL));
+        }
+        return omap_obj->vaddr;
+}
+
+/* Buffer Synchronization:
+ */
+
+struct omap_gem_sync_waiter {
+        struct list_head list;
+        struct omap_gem_object *omap_obj;
+        enum omap_gem_op op;
+        uint32_t read_target, write_target;
+        /* notify called w/ sync_lock held */
+        void (*notify)(void *arg);
+        void *arg;
+};
+
+/* list of omap_gem_sync_waiter.. the notify fxn gets called back when
+ * the read and/or write target count is achieved which can call a user
+ * callback (ex. to kick 3d and/or 2d), wakeup blocked task (prep for
+ * cpu access), etc.
+ */
+static LIST_HEAD(waiters);
+
+static inline bool is_waiting(struct omap_gem_sync_waiter *waiter)
+{
+        struct omap_gem_object *omap_obj = waiter->omap_obj;
+        if ((waiter->op & OMAP_GEM_READ) &&
+                        (omap_obj->sync->read_complete < waiter->read_target))
+                return true;
+        if ((waiter->op & OMAP_GEM_WRITE) &&
+                        (omap_obj->sync->write_complete < waiter->write_target))
+                return true;
+        return false;
+}
+
+/* macro for sync debug.. */
+#define SYNCDBG 0
+#define SYNC(fmt, ...) do { if (SYNCDBG) \
+                printk(KERN_ERR "%s:%d: "fmt"\n", \
+                                __func__, __LINE__, ##__VA_ARGS__); \
+        } while (0)
+
+
+static void sync_op_update(void)
+{
+        struct omap_gem_sync_waiter *waiter, *n;
+        list_for_each_entry_safe(waiter, n, &waiters, list) {
+                if (!is_waiting(waiter)) {
+                        list_del(&waiter->list);
+                        SYNC("notify: %p", waiter);
+                        waiter->notify(waiter->arg);
+                        kfree(waiter);
+                }
+        }
+}
+
+static inline int sync_op(struct drm_gem_object *obj,
+                enum omap_gem_op op, bool start)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        int ret = 0;
+
+        spin_lock(&sync_lock);
+
+        if (!omap_obj->sync) {
+                omap_obj->sync = kzalloc(sizeof(*omap_obj->sync), GFP_ATOMIC);
+                if (!omap_obj->sync) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
+        }
+
+        if (start) {
+                if (op & OMAP_GEM_READ)
+                        omap_obj->sync->read_pending++;
+                if (op & OMAP_GEM_WRITE)
+                        omap_obj->sync->write_pending++;
+        } else {
+                if (op & OMAP_GEM_READ)
+                        omap_obj->sync->read_complete++;
+                if (op & OMAP_GEM_WRITE)
+                        omap_obj->sync->write_complete++;
+                sync_op_update();
+        }
+
+unlock:
+        spin_unlock(&sync_lock);
+
+        return ret;
+}
+
+/* it is a bit lame to handle updates in this sort of polling way, but
+ * in case of PVR, the GPU can directly update read/write complete
+ * values, and not really tell us which ones it updated.. this also
+ * means that sync_lock is not quite sufficient.  So we'll need to
+ * do something a bit better when it comes time to add support for
+ * separate 2d hw..
+ */
+void omap_gem_op_update(void)
+{
+        spin_lock(&sync_lock);
+        sync_op_update();
+        spin_unlock(&sync_lock);
+}
+
+/* mark the start of read and/or write operation */
+int omap_gem_op_start(struct drm_gem_object *obj, enum omap_gem_op op)
+{
+        return sync_op(obj, op, true);
+}
+
+int omap_gem_op_finish(struct drm_gem_object *obj, enum omap_gem_op op)
+{
+        return sync_op(obj, op, false);
+}
+
+static DECLARE_WAIT_QUEUE_HEAD(sync_event);
+
+static void sync_notify(void *arg)
+{
+        struct task_struct **waiter_task = arg;
+        *waiter_task = NULL;
+        wake_up_all(&sync_event);
+}
+
+int omap_gem_op_sync(struct drm_gem_object *obj, enum omap_gem_op op)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        int ret = 0;
+        if (omap_obj->sync) {
+                struct task_struct *waiter_task = current;
+                struct omap_gem_sync_waiter *waiter =
+                                kzalloc(sizeof(*waiter), GFP_KERNEL);
+
+                if (!waiter) {
+                        return -ENOMEM;
+                }
+
+                waiter->omap_obj = omap_obj;
+                waiter->op = op;
+                waiter->read_target = omap_obj->sync->read_pending;
+                waiter->write_target = omap_obj->sync->write_pending;
+                waiter->notify = sync_notify;
+                waiter->arg = &waiter_task;
+
+                spin_lock(&sync_lock);
+                if (is_waiting(waiter)) {
+                        SYNC("waited: %p", waiter);
+                        list_add_tail(&waiter->list, &waiters);
+                        spin_unlock(&sync_lock);
+                        ret = wait_event_interruptible(sync_event,
+                                        (waiter_task == NULL));
+                        spin_lock(&sync_lock);
+                        if (waiter_task) {
+                                SYNC("interrupted: %p", waiter);
+                                /* we were interrupted */
+                                list_del(&waiter->list);
+                                waiter_task = NULL;
+                        } else {
+                                /* freed in sync_op_update() */
+                                waiter = NULL;
+                        }
+                }
+                spin_unlock(&sync_lock);
+
+                if (waiter) {
+                        kfree(waiter);
+                }
+        }
+        return ret;
+}
+
+/* call fxn(arg), either synchronously or asynchronously if the op
+ * is currently blocked..  fxn() can be called from any context
+ *
+ * (TODO for now fxn is called back from whichever context calls
+ * omap_gem_op_update().. but this could be better defined later
+ * if needed)
+ *
+ * TODO more code in common w/ _sync()..
+ */
+int omap_gem_op_async(struct drm_gem_object *obj, enum omap_gem_op op,
+                void (*fxn)(void *arg), void *arg)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        if (omap_obj->sync) {
+                struct omap_gem_sync_waiter *waiter =
+                                kzalloc(sizeof(*waiter), GFP_ATOMIC);
+
+                if (!waiter) {
+                        return -ENOMEM;
+                }
+
+                waiter->omap_obj = omap_obj;
+                waiter->op = op;
+                waiter->read_target = omap_obj->sync->read_pending;
+                waiter->write_target = omap_obj->sync->write_pending;
+                waiter->notify = fxn;
+                waiter->arg = arg;
+
+                spin_lock(&sync_lock);
+                if (is_waiting(waiter)) {
+                        SYNC("waited: %p", waiter);
+                        list_add_tail(&waiter->list, &waiters);
+                        spin_unlock(&sync_lock);
+                        return 0;
+                }
+
+                spin_unlock(&sync_lock);
+        }
+
+        /* no waiting.. */
+        fxn(arg);
+
+        return 0;
+}
+
+/* special API so PVR can update the buffer to use a sync-object allocated
+ * from it's sync-obj heap.  Only used for a newly allocated (from PVR's
+ * perspective) sync-object, so we overwrite the new syncobj w/ values
+ * from the already allocated syncobj (if there is one)
+ */
+int omap_gem_set_sync_object(struct drm_gem_object *obj, void *syncobj)
+{
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+        int ret = 0;
+
+        spin_lock(&sync_lock);
+
+        if ((omap_obj->flags & OMAP_BO_EXT_SYNC) && !syncobj) {
+                /* clearing a previously set syncobj */
+                syncobj = kzalloc(sizeof(*omap_obj->sync), GFP_ATOMIC);
+                if (!syncobj) {
+                        ret = -ENOMEM;
+                        goto unlock;
+                }
+                memcpy(syncobj, omap_obj->sync, sizeof(*omap_obj->sync));
+                omap_obj->flags &= ~OMAP_BO_EXT_SYNC;
+                omap_obj->sync = syncobj;
+        } else if (syncobj && !(omap_obj->flags & OMAP_BO_EXT_SYNC)) {
+                /* replacing an existing syncobj */
+                if (omap_obj->sync) {
+                        memcpy(syncobj, omap_obj->sync, sizeof(*omap_obj->sync));
+                        kfree(omap_obj->sync);
+                }
+                omap_obj->flags |= OMAP_BO_EXT_SYNC;
+                omap_obj->sync = syncobj;
+        }
+
+unlock:
+        spin_unlock(&sync_lock);
+        return ret;
+}
+
+int omap_gem_init_object(struct drm_gem_object *obj)
+{
+        return -EINVAL;          /* unused */
+}
+
+/* don't call directly.. called from GEM core when it is time to actually
+ * free the object..
+ */
+void omap_gem_free_object(struct drm_gem_object *obj)
+{
+        struct drm_device *dev = obj->dev;
+        struct omap_gem_object *omap_obj = to_omap_bo(obj);
+
+        evict(obj);
+
+        if (obj->map_list.map) {
+                drm_gem_free_mmap_offset(obj);
+        }
+
+        /* don't free externally allocated backing memory */
+        if (!(omap_obj->flags & OMAP_BO_EXT_MEM)) {
+                if (omap_obj->pages) {
+                        omap_gem_detach_pages(obj);
+                }
+                if (!is_shmem(obj)) {
+                        dma_free_writecombine(dev->dev, obj->size,
+                                        omap_obj->vaddr, omap_obj->paddr);
+                } else if (omap_obj->vaddr) {
+                        vunmap(omap_obj->vaddr);
+                }
+        }
+
+        /* don't free externally allocated syncobj */
+        if (!(omap_obj->flags & OMAP_BO_EXT_SYNC)) {
+                kfree(omap_obj->sync);
+        }
+
+        drm_gem_object_release(obj);
+
+        kfree(obj);
+}
+
+/* convenience method to construct a GEM buffer object, and userspace handle */
+int omap_gem_new_handle(struct drm_device *dev, struct drm_file *file,
+                union omap_gem_size gsize, uint32_t flags, uint32_t *handle)
+{
+        struct drm_gem_object *obj;
+        int ret;
+
+        obj = omap_gem_new(dev, gsize, flags);
+        if (!obj)
+                return -ENOMEM;
+
+        ret = drm_gem_handle_create(file, obj, handle);
+        if (ret) {
+                drm_gem_object_release(obj);
+                kfree(obj); /* TODO isn't there a dtor to call? just copying i915 */
+                return ret;
+        }
+
+        /* drop reference from allocate - handle holds it now */
+        drm_gem_object_unreference_unlocked(obj);
+
+        return 0;
+}
+
+/* GEM buffer object constructor */
+struct drm_gem_object *omap_gem_new(struct drm_device *dev,
+                union omap_gem_size gsize, uint32_t flags)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        struct omap_gem_object *omap_obj;
+        struct drm_gem_object *obj = NULL;
+        size_t size;
+        int ret;
+
+        if (flags & OMAP_BO_TILED) {
+                if (!usergart) {
+                        dev_err(dev->dev, "Tiled buffers require DMM\n");
+                        goto fail;
+                }
+
+                /* tiled buffers are always shmem paged backed.. when they are
+                 * scanned out, they are remapped into DMM/TILER
+                 */
+                flags &= ~OMAP_BO_SCANOUT;
+
+                /* currently don't allow cached buffers.. there is some caching
+                 * stuff that needs to be handled better
+                 */
+                flags &= ~(OMAP_BO_CACHED|OMAP_BO_UNCACHED);
+                flags |= OMAP_BO_WC;
+
+                /* align dimensions to slot boundaries... */
+                tiler_align(gem2fmt(flags),
+                                &gsize.tiled.width, &gsize.tiled.height);
+
+                /* ...and calculate size based on aligned dimensions */
+                size = tiler_size(gem2fmt(flags),
+                                gsize.tiled.width, gsize.tiled.height);
+        } else {
+                size = PAGE_ALIGN(gsize.bytes);
+        }
+
+        omap_obj = kzalloc(sizeof(*omap_obj), GFP_KERNEL);
+        if (!omap_obj) {
+                dev_err(dev->dev, "could not allocate GEM object\n");
+                goto fail;
+        }
+
+        obj = &omap_obj->base;
+
+        if ((flags & OMAP_BO_SCANOUT) && !priv->has_dmm) {
+                /* attempt to allocate contiguous memory if we don't
+                 * have DMM for remappign discontiguous buffers
+                 */
+                omap_obj->vaddr =  dma_alloc_writecombine(dev->dev, size,
+                                &omap_obj->paddr, GFP_KERNEL);
+                if (omap_obj->vaddr) {
+                        flags |= OMAP_BO_DMA;
+                }
+        }
+
+        omap_obj->flags = flags;
+
+        if (flags & OMAP_BO_TILED) {
+                omap_obj->width = gsize.tiled.width;
+                omap_obj->height = gsize.tiled.height;
+        }
+
+        if (flags & (OMAP_BO_DMA|OMAP_BO_EXT_MEM)) {
+                ret = drm_gem_private_object_init(dev, obj, size);
+        } else {
+                ret = drm_gem_object_init(dev, obj, size);
+        }
+
+        if (ret) {
+                goto fail;
+        }
+
+        return obj;
+
+fail:
+        if (obj) {
+                omap_gem_free_object(obj);
+        }
+        return NULL;
+}
+
+/* init/cleanup.. if DMM is used, we need to set some stuff up.. */
+void omap_gem_init(struct drm_device *dev)
+{
+        struct omap_drm_private *priv = dev->dev_private;
+        const enum tiler_fmt fmts[] = {
+                        TILFMT_8BIT, TILFMT_16BIT, TILFMT_32BIT
+        };
+        int i, j, ret;
+
+        ret = omap_dmm_init(dev);
+        if (ret) {
+                /* DMM only supported on OMAP4 and later, so this isn't fatal */
+                dev_warn(dev->dev, "omap_dmm_init failed, disabling DMM\n");
+                return;
+        }
+
+        usergart = kzalloc(3 * sizeof(*usergart), GFP_KERNEL);
+        if (!usergart) {
+                dev_warn(dev->dev, "could not allocate usergart\n");
+                return;
+        }
+
+        /* reserve 4k aligned/wide regions for userspace mappings: */
+        for (i = 0; i < ARRAY_SIZE(fmts); i++) {
+                uint16_t h = 1, w = PAGE_SIZE >> i;
+                tiler_align(fmts[i], &w, &h);
+                /* note: since each region is 1 4kb page wide, and minimum
+                 * number of rows, the height ends up being the same as the
+                 * # of pages in the region
+                 */
+                usergart[i].height = h;
+                usergart[i].height_shift = ilog2(h);
+                usergart[i].stride_pfn = tiler_stride(fmts[i]) >> PAGE_SHIFT;
+                usergart[i].slot_shift = ilog2((PAGE_SIZE / h) >> i);
+                for (j = 0; j < NUM_USERGART_ENTRIES; j++) {
+                        struct usergart_entry *entry = &usergart[i].entry[j];
+                        struct tiler_block *block =
+                                        tiler_reserve_2d(fmts[i], w, h,
+                                                        PAGE_SIZE);
+                        if (IS_ERR(block)) {
+                                dev_err(dev->dev,
+                                                "reserve failed: %d, %d, %ld\n",
+                                                i, j, PTR_ERR(block));
+                                return;
+                        }
+                        entry->paddr = tiler_ssptr(block);
+                        entry->block = block;
+
+                        DBG("%d:%d: %dx%d: paddr=%08x stride=%d", i, j, w, h,
+                                        entry->paddr,
+                                        usergart[i].stride_pfn << PAGE_SHIFT);
+                }
+        }
+
+        priv->has_dmm = true;
+}
+
+void omap_gem_deinit(struct drm_device *dev)
+{
+        /* I believe we can rely on there being no more outstanding GEM
+         * objects which could depend on usergart/dmm at this point.
+         */
+        omap_dmm_remove();
+        kfree(usergart);
+}
diff --git a/drivers/staging/omapdrm/omap_gem_helpers.c b/drivers/staging/omapdrm/omap_gem_helpers.c
new file mode 100644
index 000000000000..29275c7209e9
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_gem_helpers.c
@@ -0,0 +1,169 @@
+/*
+ * drivers/staging/omapdrm/omap_gem_helpers.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/>.
+ */
+
+/* temporary copy of drm_gem_{get,put}_pages() until the
+ * "drm/gem: add functions to get/put pages" patch is merged..
+ */
+
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/shmem_fs.h>
+
+#include <drm/drmP.h>
+
+/**
+ * drm_gem_get_pages - helper to allocate backing pages for a GEM object
+ * @obj: obj in question
+ * @gfpmask: gfp mask of requested pages
+ */
+struct page ** _drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
+{
+        struct inode *inode;
+        struct address_space *mapping;
+        struct page *p, **pages;
+        int i, npages;
+
+        /* This is the shared memory object that backs the GEM resource */
+        inode = obj->filp->f_path.dentry->d_inode;
+        mapping = inode->i_mapping;
+
+        npages = obj->size >> PAGE_SHIFT;
+
+        pages = drm_malloc_ab(npages, sizeof(struct page *));
+        if (pages == NULL)
+                return ERR_PTR(-ENOMEM);
+
+        gfpmask |= mapping_gfp_mask(mapping);
+
+        for (i = 0; i < npages; i++) {
+                p = shmem_read_mapping_page_gfp(mapping, i, gfpmask);
+                if (IS_ERR(p))
+                        goto fail;
+                pages[i] = p;
+
+                /* There is a hypothetical issue w/ drivers that require
+                 * buffer memory in the low 4GB.. if the pages are un-
+                 * pinned, and swapped out, they can end up swapped back
+                 * in above 4GB.  If pages are already in memory, then
+                 * shmem_read_mapping_page_gfp will ignore the gfpmask,
+                 * even if the already in-memory page disobeys the mask.
+                 *
+                 * It is only a theoretical issue today, because none of
+                 * the devices with this limitation can be populated with
+                 * enough memory to trigger the issue.  But this BUG_ON()
+                 * is here as a reminder in case the problem with
+                 * shmem_read_mapping_page_gfp() isn't solved by the time
+                 * it does become a real issue.
+                 *
+                 * See this thread: http://lkml.org/lkml/2011/7/11/238
+                 */
+                BUG_ON((gfpmask & __GFP_DMA32) &&
+                                (page_to_pfn(p) >= 0x00100000UL));
+        }
+
+        return pages;
+
+fail:
+        while (i--) {
+                page_cache_release(pages[i]);
+        }
+        drm_free_large(pages);
+        return ERR_PTR(PTR_ERR(p));
+}
+
+/**
+ * drm_gem_put_pages - helper to free backing pages for a GEM object
+ * @obj: obj in question
+ * @pages: pages to free
+ */
+void _drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
+                bool dirty, bool accessed)
+{
+        int i, npages;
+
+        npages = obj->size >> PAGE_SHIFT;
+
+        for (i = 0; i < npages; i++) {
+                if (dirty)
+                        set_page_dirty(pages[i]);
+
+                if (accessed)
+                        mark_page_accessed(pages[i]);
+
+                /* Undo the reference we took when populating the table */
+                page_cache_release(pages[i]);
+        }
+
+        drm_free_large(pages);
+}
+
+int
+_drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
+{
+        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 = 0;
+
+        /* Set the object up for mmap'ing */
+        list = &obj->map_list;
+        list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
+        if (!list->map)
+                return -ENOMEM;
+
+        map = list->map;
+        map->type = _DRM_GEM;
+        map->size = size;
+        map->handle = obj;
+
+        /* Get a DRM GEM mmap offset allocated... */
+        list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
+                        size / PAGE_SIZE, 0, 0);
+
+        if (!list->file_offset_node) {
+                DRM_ERROR("failed to allocate offset for bo %d\n", obj->name);
+                ret = -ENOSPC;
+                goto out_free_list;
+        }
+
+        list->file_offset_node = drm_mm_get_block(list->file_offset_node,
+                        size / PAGE_SIZE, 0);
+        if (!list->file_offset_node) {
+                ret = -ENOMEM;
+                goto out_free_list;
+        }
+
+        list->hash.key = list->file_offset_node->start;
+        ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
+        if (ret) {
+                DRM_ERROR("failed to add to map hash\n");
+                goto out_free_mm;
+        }
+
+        return 0;
+
+out_free_mm:
+        drm_mm_put_block(list->file_offset_node);
+out_free_list:
+        kfree(list->map);
+        list->map = NULL;
+
+        return ret;
+}
diff --git a/drivers/staging/omapdrm/omap_priv.h b/drivers/staging/omapdrm/omap_priv.h
new file mode 100644
index 000000000000..c324709aa9a1
--- /dev/null
+++ b/drivers/staging/omapdrm/omap_priv.h
@@ -0,0 +1,47 @@
+/*
+ * include/drm/omap_priv.h
+ *
+ * Copyright (C) 2011 Texas Instruments
+ * Author: Rob Clark <rob@ti.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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OMAP_PRIV_H__
+#define __OMAP_PRIV_H__
+
+/* Non-userspace facing APIs
+ */
+
+/* optional platform data to configure the default configuration of which
+ * 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.
+ */
+struct omap_kms_platform_data {
+        int ovl_cnt;
+        const int *ovl_ids;
+        int mgr_cnt;
+        const int *mgr_ids;
+        int dev_cnt;
+        const char **dev_names;
+};
+
+struct omap_drm_platform_data {
+        struct omap_kms_platform_data *kms_pdata;
+        struct omap_dmm_platform_data *dmm_pdata;
+};
+
+#endif /* __OMAP_DRM_H__ */
diff --git a/drivers/staging/omapdrm/tcm-sita.c b/drivers/staging/omapdrm/tcm-sita.c
new file mode 100644
index 000000000000..10d5ac3dae4b
--- /dev/null
+++ b/drivers/staging/omapdrm/tcm-sita.c
@@ -0,0 +1,703 @@
+/*
+ * tcm-sita.c
+ *
+ * SImple Tiler Allocator (SiTA): 2D and 1D allocation(reservation) algorithm
+ *
+ * Authors: Ravi Ramachandra <r.ramachandra@ti.com>,
+ *          Lajos Molnar <molnar@ti.com>
+ *
+ * Copyright (C) 2009-2010 Texas Instruments, Inc.
+ *
+ * This package 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 PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+
+#include "tcm-sita.h"
+
+#define ALIGN_DOWN(value, align) ((value) & ~((align) - 1))
+
+/* Individual selection criteria for different scan areas */
+static s32 CR_L2R_T2B = CR_BIAS_HORIZONTAL;
+static s32 CR_R2L_T2B = CR_DIAGONAL_BALANCE;
+
+/*********************************************
+ *      TCM API - Sita Implementation
+ *********************************************/
+static s32 sita_reserve_2d(struct tcm *tcm, u16 h, u16 w, u8 align,
+                           struct tcm_area *area);
+static s32 sita_reserve_1d(struct tcm *tcm, u32 slots, struct tcm_area *area);
+static s32 sita_free(struct tcm *tcm, struct tcm_area *area);
+static void sita_deinit(struct tcm *tcm);
+
+/*********************************************
+ *      Main Scanner functions
+ *********************************************/
+static s32 scan_areas_and_find_fit(struct tcm *tcm, u16 w, u16 h, u16 align,
+                                   struct tcm_area *area);
+
+static s32 scan_l2r_t2b(struct tcm *tcm, u16 w, u16 h, u16 align,
+                        struct tcm_area *field, struct tcm_area *area);
+
+static s32 scan_r2l_t2b(struct tcm *tcm, u16 w, u16 h, u16 align,
+                        struct tcm_area *field, struct tcm_area *area);
+
+static s32 scan_r2l_b2t_one_dim(struct tcm *tcm, u32 num_slots,
+                        struct tcm_area *field, struct tcm_area *area);
+
+/*********************************************
+ *      Support Infrastructure Methods
+ *********************************************/
+static s32 is_area_free(struct tcm_area ***map, u16 x0, u16 y0, u16 w, u16 h);
+
+static s32 update_candidate(struct tcm *tcm, u16 x0, u16 y0, u16 w, u16 h,
+                            struct tcm_area *field, s32 criteria,
+                            struct score *best);
+
+static void get_nearness_factor(struct tcm_area *field,
+                                struct tcm_area *candidate,
+                                struct nearness_factor *nf);
+
+static void get_neighbor_stats(struct tcm *tcm, struct tcm_area *area,
+                               struct neighbor_stats *stat);
+
+static void fill_area(struct tcm *tcm,
+                                struct tcm_area *area, struct tcm_area *parent);
+
+
+/*********************************************/
+
+/*********************************************
+ *      Utility Methods
+ *********************************************/
+struct tcm *sita_init(u16 width, u16 height, struct tcm_pt *attr)
+{
+        struct tcm *tcm;
+        struct sita_pvt *pvt;
+        struct tcm_area area = {0};
+        s32 i;
+
+        if (width == 0 || height == 0)
+                return NULL;
+
+        tcm = kmalloc(sizeof(*tcm), GFP_KERNEL);
+        pvt = kmalloc(sizeof(*pvt), GFP_KERNEL);
+        if (!tcm || !pvt)
+                goto error;
+
+        memset(tcm, 0, sizeof(*tcm));
+        memset(pvt, 0, sizeof(*pvt));
+
+        /* Updating the pointers to SiTA implementation APIs */
+        tcm->height = height;
+        tcm->width = width;
+        tcm->reserve_2d = sita_reserve_2d;
+        tcm->reserve_1d = sita_reserve_1d;
+        tcm->free = sita_free;
+        tcm->deinit = sita_deinit;
+        tcm->pvt = (void *)pvt;
+
+        spin_lock_init(&(pvt->lock));
+
+        /* Creating tam map */
+        pvt->map = kmalloc(sizeof(*pvt->map) * tcm->width, GFP_KERNEL);
+        if (!pvt->map)
+                goto error;
+
+        for (i = 0; i < tcm->width; i++) {
+                pvt->map[i] =
+                        kmalloc(sizeof(**pvt->map) * tcm->height,
+                                                                GFP_KERNEL);
+                if (pvt->map[i] == NULL) {
+                        while (i--)
+                                kfree(pvt->map[i]);
+                        kfree(pvt->map);
+                        goto error;
+                }
+        }
+
+        if (attr && attr->x <= tcm->width && attr->y <= tcm->height) {
+                pvt->div_pt.x = attr->x;
+                pvt->div_pt.y = attr->y;
+
+        } else {
+                /* Defaulting to 3:1 ratio on width for 2D area split */
+                /* Defaulting to 3:1 ratio on height for 2D and 1D split */
+                pvt->div_pt.x = (tcm->width * 3) / 4;
+                pvt->div_pt.y = (tcm->height * 3) / 4;
+        }
+
+        spin_lock(&(pvt->lock));
+        assign(&area, 0, 0, width - 1, height - 1);
+        fill_area(tcm, &area, NULL);
+        spin_unlock(&(pvt->lock));
+        return tcm;
+
+error:
+        kfree(tcm);
+        kfree(pvt);
+        return NULL;
+}
+
+static void sita_deinit(struct tcm *tcm)
+{
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+        struct tcm_area area = {0};
+        s32 i;
+
+        area.p1.x = tcm->width - 1;
+        area.p1.y = tcm->height - 1;
+
+        spin_lock(&(pvt->lock));
+        fill_area(tcm, &area, NULL);
+        spin_unlock(&(pvt->lock));
+
+        for (i = 0; i < tcm->height; i++)
+                kfree(pvt->map[i]);
+        kfree(pvt->map);
+        kfree(pvt);
+}
+
+/**
+ * Reserve a 1D area in the container
+ *
+ * @param num_slots     size of 1D area
+ * @param area          pointer to the area that will be populated with the
+ *                      reserved area
+ *
+ * @return 0 on success, non-0 error value on failure.
+ */
+static s32 sita_reserve_1d(struct tcm *tcm, u32 num_slots,
+                           struct tcm_area *area)
+{
+        s32 ret;
+        struct tcm_area field = {0};
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+
+        spin_lock(&(pvt->lock));
+
+        /* Scanning entire container */
+        assign(&field, tcm->width - 1, tcm->height - 1, 0, 0);
+
+        ret = scan_r2l_b2t_one_dim(tcm, num_slots, &field, area);
+        if (!ret)
+                /* update map */
+                fill_area(tcm, area, area);
+
+        spin_unlock(&(pvt->lock));
+        return ret;
+}
+
+/**
+ * Reserve a 2D area in the container
+ *
+ * @param w     width
+ * @param h     height
+ * @param area  pointer to the area that will be populated with the reesrved
+ *              area
+ *
+ * @return 0 on success, non-0 error value on failure.
+ */
+static s32 sita_reserve_2d(struct tcm *tcm, u16 h, u16 w, u8 align,
+                           struct tcm_area *area)
+{
+        s32 ret;
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+
+        /* not supporting more than 64 as alignment */
+        if (align > 64)
+                return -EINVAL;
+
+        /* we prefer 1, 32 and 64 as alignment */
+        align = align <= 1 ? 1 : align <= 32 ? 32 : 64;
+
+        spin_lock(&(pvt->lock));
+        ret = scan_areas_and_find_fit(tcm, w, h, align, area);
+        if (!ret)
+                /* update map */
+                fill_area(tcm, area, area);
+
+        spin_unlock(&(pvt->lock));
+        return ret;
+}
+
+/**
+ * Unreserve a previously allocated 2D or 1D area
+ * @param area  area to be freed
+ * @return 0 - success
+ */
+static s32 sita_free(struct tcm *tcm, struct tcm_area *area)
+{
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+
+        spin_lock(&(pvt->lock));
+
+        /* check that this is in fact an existing area */
+        WARN_ON(pvt->map[area->p0.x][area->p0.y] != area ||
+                pvt->map[area->p1.x][area->p1.y] != area);
+
+        /* Clear the contents of the associated tiles in the map */
+        fill_area(tcm, area, NULL);
+
+        spin_unlock(&(pvt->lock));
+
+        return 0;
+}
+
+/**
+ * Note: In general the cordinates in the scan field area relevant to the can
+ * sweep directions. The scan origin (e.g. top-left corner) will always be
+ * the p0 member of the field.  Therfore, for a scan from top-left p0.x <= p1.x
+ * and p0.y <= p1.y; whereas, for a scan from bottom-right p1.x <= p0.x and p1.y
+ * <= p0.y
+ */
+
+/**
+ * Raster scan horizontally right to left from top to bottom to find a place for
+ * a 2D area of given size inside a scan field.
+ *
+ * @param w     width of desired area
+ * @param h     height of desired area
+ * @param align desired area alignment
+ * @param area  pointer to the area that will be set to the best position
+ * @param field area to scan (inclusive)
+ *
+ * @return 0 on success, non-0 error value on failure.
+ */
+static s32 scan_r2l_t2b(struct tcm *tcm, u16 w, u16 h, u16 align,
+                        struct tcm_area *field, struct tcm_area *area)
+{
+        s32 x, y;
+        s16 start_x, end_x, start_y, end_y, found_x = -1;
+        struct tcm_area ***map = ((struct sita_pvt *)tcm->pvt)->map;
+        struct score best = {{0}, {0}, {0}, 0};
+
+        start_x = field->p0.x;
+        end_x = field->p1.x;
+        start_y = field->p0.y;
+        end_y = field->p1.y;
+
+        /* check scan area co-ordinates */
+        if (field->p0.x < field->p1.x ||
+            field->p1.y < field->p0.y)
+                return -EINVAL;
+
+        /* check if allocation would fit in scan area */
+        if (w > LEN(start_x, end_x) || h > LEN(end_y, start_y))
+                return -ENOSPC;
+
+        /* adjust start_x and end_y, as allocation would not fit beyond */
+        start_x = ALIGN_DOWN(start_x - w + 1, align); /* - 1 to be inclusive */
+        end_y = end_y - h + 1;
+
+        /* check if allocation would still fit in scan area */
+        if (start_x < end_x)
+                return -ENOSPC;
+
+        /* scan field top-to-bottom, right-to-left */
+        for (y = start_y; y <= end_y; y++) {
+                for (x = start_x; x >= end_x; x -= align) {
+                        if (is_area_free(map, x, y, w, h)) {
+                                found_x = x;
+
+                                /* update best candidate */
+                                if (update_candidate(tcm, x, y, w, h, field,
+                                                        CR_R2L_T2B, &best))
+                                        goto done;
+
+                                /* change upper x bound */
+                                end_x = x + 1;
+                                break;
+                        } else if (map[x][y] && map[x][y]->is2d) {
+                                /* step over 2D areas */
+                                x = ALIGN(map[x][y]->p0.x - w + 1, align);
+                        }
+                }
+
+                /* break if you find a free area shouldering the scan field */
+                if (found_x == start_x)
+                        break;
+        }
+
+        if (!best.a.tcm)
+                return -ENOSPC;
+done:
+        assign(area, best.a.p0.x, best.a.p0.y, best.a.p1.x, best.a.p1.y);
+        return 0;
+}
+
+/**
+ * Raster scan horizontally left to right from top to bottom to find a place for
+ * a 2D area of given size inside a scan field.
+ *
+ * @param w     width of desired area
+ * @param h     height of desired area
+ * @param align desired area alignment
+ * @param area  pointer to the area that will be set to the best position
+ * @param field area to scan (inclusive)
+ *
+ * @return 0 on success, non-0 error value on failure.
+ */
+static s32 scan_l2r_t2b(struct tcm *tcm, u16 w, u16 h, u16 align,
+                        struct tcm_area *field, struct tcm_area *area)
+{
+        s32 x, y;
+        s16 start_x, end_x, start_y, end_y, found_x = -1;
+        struct tcm_area ***map = ((struct sita_pvt *)tcm->pvt)->map;
+        struct score best = {{0}, {0}, {0}, 0};
+
+        start_x = field->p0.x;
+        end_x = field->p1.x;
+        start_y = field->p0.y;
+        end_y = field->p1.y;
+
+        /* check scan area co-ordinates */
+        if (field->p1.x < field->p0.x ||
+            field->p1.y < field->p0.y)
+                return -EINVAL;
+
+        /* check if allocation would fit in scan area */
+        if (w > LEN(end_x, start_x) || h > LEN(end_y, start_y))
+                return -ENOSPC;
+
+        start_x = ALIGN(start_x, align);
+
+        /* check if allocation would still fit in scan area */
+        if (w > LEN(end_x, start_x))
+                return -ENOSPC;
+
+        /* adjust end_x and end_y, as allocation would not fit beyond */
+        end_x = end_x - w + 1; /* + 1 to be inclusive */
+        end_y = end_y - h + 1;
+
+        /* scan field top-to-bottom, left-to-right */
+        for (y = start_y; y <= end_y; y++) {
+                for (x = start_x; x <= end_x; x += align) {
+                        if (is_area_free(map, x, y, w, h)) {
+                                found_x = x;
+
+                                /* update best candidate */
+                                if (update_candidate(tcm, x, y, w, h, field,
+                                                        CR_L2R_T2B, &best))
+                                        goto done;
+                                /* change upper x bound */
+                                end_x = x - 1;
+
+                                break;
+                        } else if (map[x][y] && map[x][y]->is2d) {
+                                /* step over 2D areas */
+                                x = ALIGN_DOWN(map[x][y]->p1.x, align);
+                        }
+                }
+
+                /* break if you find a free area shouldering the scan field */
+                if (found_x == start_x)
+                        break;
+        }
+
+        if (!best.a.tcm)
+                return -ENOSPC;
+done:
+        assign(area, best.a.p0.x, best.a.p0.y, best.a.p1.x, best.a.p1.y);
+        return 0;
+}
+
+/**
+ * Raster scan horizontally right to left from bottom to top to find a place
+ * for a 1D area of given size inside a scan field.
+ *
+ * @param num_slots     size of desired area
+ * @param align         desired area alignment
+ * @param area          pointer to the area that will be set to the best
+ *                      position
+ * @param field         area to scan (inclusive)
+ *
+ * @return 0 on success, non-0 error value on failure.
+ */
+static s32 scan_r2l_b2t_one_dim(struct tcm *tcm, u32 num_slots,
+                                struct tcm_area *field, struct tcm_area *area)
+{
+        s32 found = 0;
+        s16 x, y;
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+        struct tcm_area *p;
+
+        /* check scan area co-ordinates */
+        if (field->p0.y < field->p1.y)
+                return -EINVAL;
+
+        /**
+         * Currently we only support full width 1D scan field, which makes sense
+         * since 1D slot-ordering spans the full container width.
+         */
+        if (tcm->width != field->p0.x - field->p1.x + 1)
+                return -EINVAL;
+
+        /* check if allocation would fit in scan area */
+        if (num_slots > tcm->width * LEN(field->p0.y, field->p1.y))
+                return -ENOSPC;
+
+        x = field->p0.x;
+        y = field->p0.y;
+
+        /* find num_slots consecutive free slots to the left */
+        while (found < num_slots) {
+                if (y < 0)
+                        return -ENOSPC;
+
+                /* remember bottom-right corner */
+                if (found == 0) {
+                        area->p1.x = x;
+                        area->p1.y = y;
+                }
+
+                /* skip busy regions */
+                p = pvt->map[x][y];
+                if (p) {
+                        /* move to left of 2D areas, top left of 1D */
+                        x = p->p0.x;
+                        if (!p->is2d)
+                                y = p->p0.y;
+
+                        /* start over */
+                        found = 0;
+                } else {
+                        /* count consecutive free slots */
+                        found++;
+                        if (found == num_slots)
+                                break;
+                }
+
+                /* move to the left */
+                if (x == 0)
+                        y--;
+                x = (x ? : tcm->width) - 1;
+
+        }
+
+        /* set top-left corner */
+        area->p0.x = x;
+        area->p0.y = y;
+        return 0;
+}
+
+/**
+ * Find a place for a 2D area of given size inside a scan field based on its
+ * alignment needs.
+ *
+ * @param w     width of desired area
+ * @param h     height of desired area
+ * @param align desired area alignment
+ * @param area  pointer to the area that will be set to the best position
+ *
+ * @return 0 on success, non-0 error value on failure.
+ */
+static s32 scan_areas_and_find_fit(struct tcm *tcm, u16 w, u16 h, u16 align,
+                                   struct tcm_area *area)
+{
+        s32 ret = 0;
+        struct tcm_area field = {0};
+        u16 boundary_x, boundary_y;
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+
+        if (align > 1) {
+                /* prefer top-left corner */
+                boundary_x = pvt->div_pt.x - 1;
+                boundary_y = pvt->div_pt.y - 1;
+
+                /* expand width and height if needed */
+                if (w > pvt->div_pt.x)
+                        boundary_x = tcm->width - 1;
+                if (h > pvt->div_pt.y)
+                        boundary_y = tcm->height - 1;
+
+                assign(&field, 0, 0, boundary_x, boundary_y);
+                ret = scan_l2r_t2b(tcm, w, h, align, &field, area);
+
+                /* scan whole container if failed, but do not scan 2x */
+                if (ret != 0 && (boundary_x != tcm->width - 1 ||
+                                 boundary_y != tcm->height - 1)) {
+                        /* scan the entire container if nothing found */
+                        assign(&field, 0, 0, tcm->width - 1, tcm->height - 1);
+                        ret = scan_l2r_t2b(tcm, w, h, align, &field, area);
+                }
+        } else if (align == 1) {
+                /* prefer top-right corner */
+                boundary_x = pvt->div_pt.x;
+                boundary_y = pvt->div_pt.y - 1;
+
+                /* expand width and height if needed */
+                if (w > (tcm->width - pvt->div_pt.x))
+                        boundary_x = 0;
+                if (h > pvt->div_pt.y)
+                        boundary_y = tcm->height - 1;
+
+                assign(&field, tcm->width - 1, 0, boundary_x, boundary_y);
+                ret = scan_r2l_t2b(tcm, w, h, align, &field, area);
+
+                /* scan whole container if failed, but do not scan 2x */
+                if (ret != 0 && (boundary_x != 0 ||
+                                 boundary_y != tcm->height - 1)) {
+                        /* scan the entire container if nothing found */
+                        assign(&field, tcm->width - 1, 0, 0, tcm->height - 1);
+                        ret = scan_r2l_t2b(tcm, w, h, align, &field,
+                                           area);
+                }
+        }
+
+        return ret;
+}
+
+/* check if an entire area is free */
+static s32 is_area_free(struct tcm_area ***map, u16 x0, u16 y0, u16 w, u16 h)
+{
+        u16 x = 0, y = 0;
+        for (y = y0; y < y0 + h; y++) {
+                for (x = x0; x < x0 + w; x++) {
+                        if (map[x][y])
+                                return false;
+                }
+        }
+        return true;
+}
+
+/* fills an area with a parent tcm_area */
+static void fill_area(struct tcm *tcm, struct tcm_area *area,
+                        struct tcm_area *parent)
+{
+        s32 x, y;
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+        struct tcm_area a, a_;
+
+        /* set area's tcm; otherwise, enumerator considers it invalid */
+        area->tcm = tcm;
+
+        tcm_for_each_slice(a, *area, a_) {
+                for (x = a.p0.x; x <= a.p1.x; ++x)
+                        for (y = a.p0.y; y <= a.p1.y; ++y)
+                                pvt->map[x][y] = parent;
+
+        }
+}
+
+/**
+ * Compares a candidate area to the current best area, and if it is a better
+ * fit, it updates the best to this one.
+ *
+ * @param x0, y0, w, h          top, left, width, height of candidate area
+ * @param field                 scan field
+ * @param criteria              scan criteria
+ * @param best                  best candidate and its scores
+ *
+ * @return 1 (true) if the candidate area is known to be the final best, so no
+ * more searching should be performed
+ */
+static s32 update_candidate(struct tcm *tcm, u16 x0, u16 y0, u16 w, u16 h,
+                            struct tcm_area *field, s32 criteria,
+                            struct score *best)
+{
+        struct score me;        /* score for area */
+
+        /*
+         * NOTE: For horizontal bias we always give the first found, because our
+         * scan is horizontal-raster-based and the first candidate will always
+         * have the horizontal bias.
+         */
+        bool first = criteria & CR_BIAS_HORIZONTAL;
+
+        assign(&me.a, x0, y0, x0 + w - 1, y0 + h - 1);
+
+        /* calculate score for current candidate */
+        if (!first) {
+                get_neighbor_stats(tcm, &me.a, &me.n);
+                me.neighs = me.n.edge + me.n.busy;
+                get_nearness_factor(field, &me.a, &me.f);
+        }
+
+        /* the 1st candidate is always the best */
+        if (!best->a.tcm)
+                goto better;
+
+        BUG_ON(first);
+
+        /* diagonal balance check */
+        if ((criteria & CR_DIAGONAL_BALANCE) &&
+                best->neighs <= me.neighs &&
+                (best->neighs < me.neighs ||
+                 /* this implies that neighs and occupied match */
+                 best->n.busy < me.n.busy ||
+                 (best->n.busy == me.n.busy &&
+                  /* check the nearness factor */
+                  best->f.x + best->f.y > me.f.x + me.f.y)))
+                goto better;
+
+        /* not better, keep going */
+        return 0;
+
+better:
+        /* save current area as best */
+        memcpy(best, &me, sizeof(me));
+        best->a.tcm = tcm;
+        return first;
+}
+
+/**
+ * Calculate the nearness factor of an area in a search field.  The nearness
+ * factor is smaller if the area is closer to the search origin.
+ */
+static void get_nearness_factor(struct tcm_area *field, struct tcm_area *area,
+                                struct nearness_factor *nf)
+{
+        /**
+         * Using signed math as field coordinates may be reversed if
+         * search direction is right-to-left or bottom-to-top.
+         */
+        nf->x = (s32)(area->p0.x - field->p0.x) * 1000 /
+                (field->p1.x - field->p0.x);
+        nf->y = (s32)(area->p0.y - field->p0.y) * 1000 /
+                (field->p1.y - field->p0.y);
+}
+
+/* get neighbor statistics */
+static void get_neighbor_stats(struct tcm *tcm, struct tcm_area *area,
+                         struct neighbor_stats *stat)
+{
+        s16 x = 0, y = 0;
+        struct sita_pvt *pvt = (struct sita_pvt *)tcm->pvt;
+
+        /* Clearing any exisiting values */
+        memset(stat, 0, sizeof(*stat));
+
+        /* process top & bottom edges */
+        for (x = area->p0.x; x <= area->p1.x; x++) {
+                if (area->p0.y == 0)
+                        stat->edge++;
+                else if (pvt->map[x][area->p0.y - 1])
+                        stat->busy++;
+
+                if (area->p1.y == tcm->height - 1)
+                        stat->edge++;
+                else if (pvt->map[x][area->p1.y + 1])
+                        stat->busy++;
+        }
+
+        /* process left & right edges */
+        for (y = area->p0.y; y <= area->p1.y; ++y) {
+                if (area->p0.x == 0)
+                        stat->edge++;
+                else if (pvt->map[area->p0.x - 1][y])
+                        stat->busy++;
+
+                if (area->p1.x == tcm->width - 1)
+                        stat->edge++;
+                else if (pvt->map[area->p1.x + 1][y])
+                        stat->busy++;
+        }
+}
diff --git a/drivers/staging/omapdrm/tcm-sita.h b/drivers/staging/omapdrm/tcm-sita.h
new file mode 100644
index 000000000000..0444f868671c
--- /dev/null
+++ b/drivers/staging/omapdrm/tcm-sita.h
@@ -0,0 +1,95 @@
+/*
+ * tcm_sita.h
+ *
+ * SImple Tiler Allocator (SiTA) private structures.
+ *
+ * Author: Ravi Ramachandra <r.ramachandra@ti.com>
+ *
+ * Copyright (C) 2009-2011 Texas Instruments, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Texas Instruments Incorporated nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _TCM_SITA_H
+#define _TCM_SITA_H
+
+#include "tcm.h"
+
+/* length between two coordinates */
+#define LEN(a, b) ((a) > (b) ? (a) - (b) + 1 : (b) - (a) + 1)
+
+enum criteria {
+        CR_MAX_NEIGHS           = 0x01,
+        CR_FIRST_FOUND          = 0x10,
+        CR_BIAS_HORIZONTAL      = 0x20,
+        CR_BIAS_VERTICAL        = 0x40,
+        CR_DIAGONAL_BALANCE     = 0x80
+};
+
+/* nearness to the beginning of the search field from 0 to 1000 */
+struct nearness_factor {
+        s32 x;
+        s32 y;
+};
+
+/*
+ * Statistics on immediately neighboring slots.  Edge is the number of
+ * border segments that are also border segments of the scan field.  Busy
+ * refers to the number of neighbors that are occupied.
+ */
+struct neighbor_stats {
+        u16 edge;
+        u16 busy;
+};
+
+/* structure to keep the score of a potential allocation */
+struct score {
+        struct nearness_factor  f;
+        struct neighbor_stats   n;
+        struct tcm_area         a;
+        u16    neighs;          /* number of busy neighbors */
+};
+
+struct sita_pvt {
+        spinlock_t lock;        /* spinlock to protect access */
+        struct tcm_pt div_pt;   /* divider point splitting container */
+        struct tcm_area ***map; /* pointers to the parent area for each slot */
+};
+
+/* assign coordinates to area */
+static inline
+void assign(struct tcm_area *a, u16 x0, u16 y0, u16 x1, u16 y1)
+{
+        a->p0.x = x0;
+        a->p0.y = y0;
+        a->p1.x = x1;
+        a->p1.y = y1;
+}
+
+#endif
diff --git a/drivers/staging/omapdrm/tcm.h b/drivers/staging/omapdrm/tcm.h
new file mode 100644
index 000000000000..d273e3ee0b4c
--- /dev/null
+++ b/drivers/staging/omapdrm/tcm.h
@@ -0,0 +1,326 @@
+/*
+ * tcm.h
+ *
+ * TILER container manager specification and support functions for TI
+ * TILER driver.
+ *
+ * Author: Lajos Molnar <molnar@ti.com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Texas Instruments Incorporated nor the names of
+ *   its contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef TCM_H
+#define TCM_H
+
+struct tcm;
+
+/* point */
+struct tcm_pt {
+        u16 x;
+        u16 y;
+};
+
+/* 1d or 2d area */
+struct tcm_area {
+        bool is2d;              /* whether area is 1d or 2d */
+        struct tcm    *tcm;     /* parent */
+        struct tcm_pt  p0;
+        struct tcm_pt  p1;
+};
+
+struct tcm {
+        u16 width, height;      /* container dimensions */
+        int lut_id;             /* Lookup table identifier */
+
+        /* 'pvt' structure shall contain any tcm details (attr) along with
+        linked list of allocated areas and mutex for mutually exclusive access
+        to the list.  It may also contain copies of width and height to notice
+        any changes to the publicly available width and height fields. */
+        void *pvt;
+
+        /* function table */
+        s32 (*reserve_2d)(struct tcm *tcm, u16 height, u16 width, u8 align,
+                          struct tcm_area *area);
+        s32 (*reserve_1d)(struct tcm *tcm, u32 slots, struct tcm_area *area);
+        s32 (*free)      (struct tcm *tcm, struct tcm_area *area);
+        void (*deinit)   (struct tcm *tcm);
+};
+
+/*=============================================================================
+    BASIC TILER CONTAINER MANAGER INTERFACE
+=============================================================================*/
+
+/*
+ * NOTE:
+ *
+ * Since some basic parameter checking is done outside the TCM algorithms,
+ * TCM implementation do NOT have to check the following:
+ *
+ *   area pointer is NULL
+ *   width and height fits within container
+ *   number of pages is more than the size of the container
+ *
+ */
+
+struct tcm *sita_init(u16 width, u16 height, struct tcm_pt *attr);
+
+
+/**
+ * Deinitialize tiler container manager.
+ *
+ * @param tcm   Pointer to container manager.
+ *
+ * @return 0 on success, non-0 error value on error.  The call
+ *         should free as much memory as possible and meaningful
+ *         even on failure.  Some error codes: -ENODEV: invalid
+ *         manager.
+ */
+static inline void tcm_deinit(struct tcm *tcm)
+{
+        if (tcm)
+                tcm->deinit(tcm);
+}
+
+/**
+ * Reserves a 2D area in the container.
+ *
+ * @param tcm           Pointer to container manager.
+ * @param height        Height(in pages) of area to be reserved.
+ * @param width         Width(in pages) of area to be reserved.
+ * @param align         Alignment requirement for top-left corner of area. Not
+ *                      all values may be supported by the container manager,
+ *                      but it must support 0 (1), 32 and 64.
+ *                      0 value is equivalent to 1.
+ * @param area          Pointer to where the reserved area should be stored.
+ *
+ * @return 0 on success.  Non-0 error code on failure.  Also,
+ *         the tcm field of the area will be set to NULL on
+ *         failure.  Some error codes: -ENODEV: invalid manager,
+ *         -EINVAL: invalid area, -ENOMEM: not enough space for
+ *          allocation.
+ */
+static inline s32 tcm_reserve_2d(struct tcm *tcm, u16 width, u16 height,
+                                 u16 align, struct tcm_area *area)
+{
+        /* perform rudimentary error checking */
+        s32 res = tcm  == NULL ? -ENODEV :
+                (area == NULL || width == 0 || height == 0 ||
+                 /* align must be a 2 power */
+                 (align & (align - 1))) ? -EINVAL :
+                (height > tcm->height || width > tcm->width) ? -ENOMEM : 0;
+
+        if (!res) {
+                area->is2d = true;
+                res = tcm->reserve_2d(tcm, height, width, align, area);
+                area->tcm = res ? NULL : tcm;
+        }
+
+        return res;
+}
+
+/**
+ * Reserves a 1D area in the container.
+ *
+ * @param tcm           Pointer to container manager.
+ * @param slots         Number of (contiguous) slots to reserve.
+ * @param area          Pointer to where the reserved area should be stored.
+ *
+ * @return 0 on success.  Non-0 error code on failure.  Also,
+ *         the tcm field of the area will be set to NULL on
+ *         failure.  Some error codes: -ENODEV: invalid manager,
+ *         -EINVAL: invalid area, -ENOMEM: not enough space for
+ *          allocation.
+ */
+static inline s32 tcm_reserve_1d(struct tcm *tcm, u32 slots,
+                                 struct tcm_area *area)
+{
+        /* perform rudimentary error checking */
+        s32 res = tcm  == NULL ? -ENODEV :
+                (area == NULL || slots == 0) ? -EINVAL :
+                slots > (tcm->width * (u32) tcm->height) ? -ENOMEM : 0;
+
+        if (!res) {
+                area->is2d = false;
+                res = tcm->reserve_1d(tcm, slots, area);
+                area->tcm = res ? NULL : tcm;
+        }
+
+        return res;
+}
+
+/**
+ * Free a previously reserved area from the container.
+ *
+ * @param area  Pointer to area reserved by a prior call to
+ *              tcm_reserve_1d or tcm_reserve_2d call, whether
+ *              it was successful or not. (Note: all fields of
+ *              the structure must match.)
+ *
+ * @return 0 on success.  Non-0 error code on failure.  Also, the tcm
+ *         field of the area is set to NULL on success to avoid subsequent
+ *         freeing.  This call will succeed even if supplying
+ *         the area from a failed reserved call.
+ */
+static inline s32 tcm_free(struct tcm_area *area)
+{
+        s32 res = 0; /* free succeeds by default */
+
+        if (area && area->tcm) {
+                res = area->tcm->free(area->tcm, area);
+                if (res == 0)
+                        area->tcm = NULL;
+        }
+
+        return res;
+}
+
+/*=============================================================================
+    HELPER FUNCTION FOR ANY TILER CONTAINER MANAGER
+=============================================================================*/
+
+/**
+ * This method slices off the topmost 2D slice from the parent area, and stores
+ * it in the 'slice' parameter.  The 'parent' parameter will get modified to
+ * contain the remaining portion of the area.  If the whole parent area can
+ * fit in a 2D slice, its tcm pointer is set to NULL to mark that it is no
+ * longer a valid area.
+ *
+ * @param parent        Pointer to a VALID parent area that will get modified
+ * @param slice         Pointer to the slice area that will get modified
+ */
+static inline void tcm_slice(struct tcm_area *parent, struct tcm_area *slice)
+{
+        *slice = *parent;
+
+        /* check if we need to slice */
+        if (slice->tcm && !slice->is2d &&
+                slice->p0.y != slice->p1.y &&
+                (slice->p0.x || (slice->p1.x != slice->tcm->width - 1))) {
+                /* set end point of slice (start always remains) */
+                slice->p1.x = slice->tcm->width - 1;
+                slice->p1.y = (slice->p0.x) ? slice->p0.y : slice->p1.y - 1;
+                /* adjust remaining area */
+                parent->p0.x = 0;
+                parent->p0.y = slice->p1.y + 1;
+        } else {
+                /* mark this as the last slice */
+                parent->tcm = NULL;
+        }
+}
+
+/* Verify if a tcm area is logically valid */
+static inline bool tcm_area_is_valid(struct tcm_area *area)
+{
+        return area && area->tcm &&
+                /* coordinate bounds */
+                area->p1.x < area->tcm->width &&
+                area->p1.y < area->tcm->height &&
+                area->p0.y <= area->p1.y &&
+                /* 1D coordinate relationship + p0.x check */
+                ((!area->is2d &&
+                  area->p0.x < area->tcm->width &&
+                  area->p0.x + area->p0.y * area->tcm->width <=
+                  area->p1.x + area->p1.y * area->tcm->width) ||
+                 /* 2D coordinate relationship */
+                 (area->is2d &&
+                  area->p0.x <= area->p1.x));
+}
+
+/* see if a coordinate is within an area */
+static inline bool __tcm_is_in(struct tcm_pt *p, struct tcm_area *a)
+{
+        u16 i;
+
+        if (a->is2d) {
+                return p->x >= a->p0.x && p->x <= a->p1.x &&
+                       p->y >= a->p0.y && p->y <= a->p1.y;
+        } else {
+                i = p->x + p->y * a->tcm->width;
+                return i >= a->p0.x + a->p0.y * a->tcm->width &&
+                       i <= a->p1.x + a->p1.y * a->tcm->width;
+        }
+}
+
+/* calculate area width */
+static inline u16 __tcm_area_width(struct tcm_area *area)
+{
+        return area->p1.x - area->p0.x + 1;
+}
+
+/* calculate area height */
+static inline u16 __tcm_area_height(struct tcm_area *area)
+{
+        return area->p1.y - area->p0.y + 1;
+}
+
+/* calculate number of slots in an area */
+static inline u16 __tcm_sizeof(struct tcm_area *area)
+{
+        return area->is2d ?
+                __tcm_area_width(area) * __tcm_area_height(area) :
+                (area->p1.x - area->p0.x + 1) + (area->p1.y - area->p0.y) *
+                                                        area->tcm->width;
+}
+#define tcm_sizeof(area) __tcm_sizeof(&(area))
+#define tcm_awidth(area) __tcm_area_width(&(area))
+#define tcm_aheight(area) __tcm_area_height(&(area))
+#define tcm_is_in(pt, area) __tcm_is_in(&(pt), &(area))
+
+/* limit a 1D area to the first N pages */
+static inline s32 tcm_1d_limit(struct tcm_area *a, u32 num_pg)
+{
+        if (__tcm_sizeof(a) < num_pg)
+                return -ENOMEM;
+        if (!num_pg)
+                return -EINVAL;
+
+        a->p1.x = (a->p0.x + num_pg - 1) % a->tcm->width;
+        a->p1.y = a->p0.y + ((a->p0.x + num_pg - 1) / a->tcm->width);
+        return 0;
+}
+
+/**
+ * Iterate through 2D slices of a valid area. Behaves
+ * syntactically as a for(;;) statement.
+ *
+ * @param var           Name of a local variable of type 'struct
+ *                      tcm_area *' that will get modified to
+ *                      contain each slice.
+ * @param area          Pointer to the VALID parent area. This
+ *                      structure will not get modified
+ *                      throughout the loop.
+ *
+ */
+#define tcm_for_each_slice(var, area, safe) \
+        for (safe = area, \
+             tcm_slice(&safe, &var); \
+             var.tcm; tcm_slice(&safe, &var))
+
+#endif
diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
index 683657cb21f5..d77b21f1eb2d 100644
--- a/drivers/staging/phison/phison.c
+++ b/drivers/staging/phison/phison.c
@@ -70,7 +70,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 }
 
 static DEFINE_PCI_DEVICE_TABLE(phison_pci_tbl) = {
-        { PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID,
+        { PCI_DEVICE(PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000),
           PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
         { 0, },
 };
diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig
index 750c347bfbe1..f87e21101857 100644
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@ -1,9 +1,43 @@
-config RTL8192E
-        tristate "RealTek RTL8192E Wireless LAN NIC driver"
-        depends on PCI && WLAN
-        depends on m
-        select WIRELESS_EXT
-        select WEXT_PRIV
-        select CRYPTO
-        default N
+config RTLLIB
+        tristate "Support for rtllib wireless devices"
+        depends on WLAN && m
+        default n
+        select LIB80211
         ---help---
+          If you have a wireless card that uses rtllib, say
+          Y. Currently the only card is the rtl8192e.
+
+          If unsure, say N.
+
+if RTLLIB
+
+config RTLLIB_CRYPTO_CCMP
+        tristate "Support for rtllib CCMP crypto"
+        depends on RTLLIB
+        default y
+        ---help---
+          CCMP crypto driver for rtllib.
+
+          If you enabled RTLLIB, you want this.
+
+config RTLLIB_CRYPTO_TKIP
+        tristate "Support for rtllib TKIP crypto"
+        depends on RTLLIB
+        default y
+        ---help---
+          TKIP crypto driver for rtllib.
+
+          If you enabled RTLLIB, you want this.
+
+config RTLLIB_CRYPTO_WEP
+        tristate "Support for rtllib WEP crypto"
+        depends on RTLLIB
+        default y
+        ---help---
+          TKIP crypto driver for rtllib.
+
+          If you enabled RTLLIB, you want this.
+
+source "drivers/staging/rtl8192e/rtl8192e/Kconfig"
+
+endif
diff --git a/drivers/staging/rtl8192e/Makefile b/drivers/staging/rtl8192e/Makefile
index a66a9ad33686..cb18db74d78c 100644
--- a/drivers/staging/rtl8192e/Makefile
+++ b/drivers/staging/rtl8192e/Makefile
@@ -1,41 +1,21 @@
-ccflags-y += -DUSE_FW_SOURCE_IMG_FILE
-ccflags-y += -DCONFIG_PM_RTL
-ccflags-y += -DCONFIG_PM
-ccflags-y += -DHAVE_NET_DEVICE_OPS
-ccflags-y += -DENABLE_DOT11D
-
-r8192e_pci-objs :=              \
-        rtl_core.o              \
-        rtl_eeprom.o            \
-        rtl_ps.o                \
-        rtl_wx.o                \
-        rtl_cam.o               \
-        rtl_dm.o                \
-        rtl_pm.o                \
-        rtl_pci.o               \
-        rtl_debug.o             \
-        rtl_ethtool.o           \
-        r8192E_dev.o            \
-        r8192E_phy.o            \
-        r8192E_firmware.o       \
-        r8192E_cmdpkt.o         \
-        r8192E_hwimg.o          \
-        r8190P_rtl8256.o        \
+rtllib-objs :=                  \
+        dot11d.o                \
+        rtllib_module.o         \
         rtllib_rx.o             \
-        rtllib_softmac.o        \
         rtllib_tx.o             \
         rtllib_wx.o             \
-        rtllib_module.o         \
+        rtllib_softmac.o        \
         rtllib_softmac_wx.o     \
-        rtl819x_HTProc.o        \
-        rtl819x_TSProc.o        \
         rtl819x_BAProc.o        \
-        dot11d.o                \
-        rtllib_crypt.o          \
-        rtllib_crypt_tkip.o     \
-        rtllib_crypt_ccmp.o     \
-        rtllib_crypt_wep.o
+        rtl819x_HTProc.o        \
+        rtl819x_TSProc.o
+
+obj-$(CONFIG_RTLLIB) += rtllib.o
+
+obj-$(CONFIG_RTLLIB_CRYPTO_CCMP) += rtllib_crypt_ccmp.o
+obj-$(CONFIG_RTLLIB_CRYPTO_TKIP) += rtllib_crypt_tkip.o
+obj-$(CONFIG_RTLLIB_CRYPTO_WEP) += rtllib_crypt_wep.o
 
-obj-$(CONFIG_RTL8192E) += r8192e_pci.o
+obj-$(CONFIG_RTL8192E) += rtl8192e/
 
 ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/staging/rtl8192e/dot11d.c b/drivers/staging/rtl8192e/dot11d.c
index ee0381e0a81f..f7b14f8b7b83 100644
--- a/drivers/staging/rtl8192e/dot11d.c
+++ b/drivers/staging/rtl8192e/dot11d.c
@@ -46,7 +46,7 @@ static struct channel_list ChannelPlan[] = {
           56, 60, 64}, 21}
 };
 
-void Dot11d_Init(struct rtllib_device *ieee)
+void dot11d_init(struct rtllib_device *ieee)
 {
         struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee);
         pDot11dInfo->bEnabled = false;
@@ -58,6 +58,7 @@ void Dot11d_Init(struct rtllib_device *ieee)
         RESET_CIE_WATCHDOG(ieee);
 
 }
+EXPORT_SYMBOL(dot11d_init);
 
 void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)
 {
@@ -99,6 +100,7 @@ void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee)
                 break;
         }
 }
+EXPORT_SYMBOL(Dot11d_Channelmap);
 
 
 void Dot11d_Reset(struct rtllib_device *ieee)
diff --git a/drivers/staging/rtl8192e/dot11d.h b/drivers/staging/rtl8192e/dot11d.h
index 032f7004a7f0..71f4549a378f 100644
--- a/drivers/staging/rtl8192e/dot11d.h
+++ b/drivers/staging/rtl8192e/dot11d.h
@@ -93,7 +93,7 @@ static inline void cpMacAddr(unsigned char *des, unsigned char *src)
 #define IS_DOT11D_STATE_DONE(__pIeeeDev)                        \
         (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)
 
-void Dot11d_Init(struct rtllib_device *dev);
+void dot11d_init(struct rtllib_device *dev);
 void Dot11d_Channelmap(u8 channel_plan, struct rtllib_device *ieee);
 void Dot11d_Reset(struct rtllib_device *dev);
 void Dot11d_UpdateCountryIe(struct rtllib_device *dev, u8 *pTaddr,
diff --git a/drivers/staging/rtl8192e/rtl8192e/Kconfig b/drivers/staging/rtl8192e/rtl8192e/Kconfig
new file mode 100644
index 000000000000..50e0d91a409a
--- /dev/null
+++ b/drivers/staging/rtl8192e/rtl8192e/Kconfig
@@ -0,0 +1,9 @@
+config RTL8192E
+        tristate "RealTek RTL8192E Wireless LAN NIC driver"
+        depends on PCI && WLAN && RTLLIB
+        depends on m
+        select WIRELESS_EXT
+        select WEXT_PRIV
+        select CRYPTO
+        default N
+        ---help---
diff --git a/drivers/staging/rtl8192e/rtl8192e/Makefile b/drivers/staging/rtl8192e/rtl8192e/Makefile
new file mode 100644
index 000000000000..313a92ec6833
--- /dev/null
+++ b/drivers/staging/rtl8192e/rtl8192e/Makefile
@@ -0,0 +1,21 @@
+r8192e_pci-objs :=              \
+        r8192E_dev.o            \
+        r8192E_phy.o            \
+        r8192E_firmware.o       \
+        r8192E_cmdpkt.o         \
+        r8192E_hwimg.o          \
+        r8190P_rtl8256.o        \
+        rtl_cam.o               \
+        rtl_core.o              \
+        rtl_debug.o             \
+        rtl_dm.o                \
+        rtl_eeprom.o            \
+        rtl_ethtool.o           \
+        rtl_pci.o               \
+        rtl_pm.o                \
+        rtl_ps.o                \
+        rtl_wx.o                \
+
+obj-$(CONFIG_RTL8192E) += r8192e_pci.o
+
+ccflags-y += -D__CHECK_ENDIAN__
diff --git a/drivers/staging/rtl8192e/r8190P_def.h b/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h
index b7bb71fa9ecd..b7bb71fa9ecd 100644
--- a/drivers/staging/rtl8192e/r8190P_def.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_def.h
diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
index 0da56c80f088..0da56c80f088 100644
--- a/drivers/staging/rtl8192e/r8190P_rtl8256.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c
diff --git a/drivers/staging/rtl8192e/r8190P_rtl8256.h b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h
index 64e831d2f4e5..64e831d2f4e5 100644
--- a/drivers/staging/rtl8192e/r8190P_rtl8256.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h
diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
index 58d044ea5524..58d044ea5524 100644
--- a/drivers/staging/rtl8192e/r8192E_cmdpkt.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
diff --git a/drivers/staging/rtl8192e/r8192E_cmdpkt.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h
index 23219e17e5a1..23219e17e5a1 100644
--- a/drivers/staging/rtl8192e/r8192E_cmdpkt.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h
diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 808aab6fa5ef..808aab6fa5ef 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
diff --git a/drivers/staging/rtl8192e/r8192E_dev.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
index b9b3b52f9120..b9b3b52f9120 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h
diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 37719859bdae..37719859bdae 100644
--- a/drivers/staging/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
diff --git a/drivers/staging/rtl8192e/r8192E_firmware.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
index caa878833106..caa878833106 100644
--- a/drivers/staging/rtl8192e/r8192E_firmware.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.h
diff --git a/drivers/staging/rtl8192e/r8192E_hw.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
index 43c3fb859d10..43c3fb859d10 100644
--- a/drivers/staging/rtl8192e/r8192E_hw.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h
diff --git a/drivers/staging/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
index 08e7dbb6694b..08e7dbb6694b 100644
--- a/drivers/staging/rtl8192e/r8192E_hwimg.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
diff --git a/drivers/staging/rtl8192e/r8192E_hwimg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
index 019836bb36c2..019836bb36c2 100644
--- a/drivers/staging/rtl8192e/r8192E_hwimg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
diff --git a/drivers/staging/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 7fe69a3348d7..3e705efaaf22 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -23,7 +23,6 @@
 #include "r8190P_rtl8256.h"
 #include "r8192E_phy.h"
 #include "rtl_dm.h"
-#include "dot11d.h"
 
 #include "r8192E_hwimg.h"
 
@@ -859,7 +858,7 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel,
         RT_TRACE(COMP_TRACE, "====>%s()====stage:%d, step:%d, channel:%d\n",
                   __func__, *stage, *step, channel);
 
-        if (!IsLegalChannel(priv->rtllib, channel)) {
+        if (!rtllib_legal_channel(priv->rtllib, channel)) {
                 RT_TRACE(COMP_ERR, "=============>set to illegal channel:%d\n",
                          channel);
                 return true;
diff --git a/drivers/staging/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 7318f8857af2..7318f8857af2 100644
--- a/drivers/staging/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
diff --git a/drivers/staging/rtl8192e/r8192E_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
index 7899dd538dcd..7899dd538dcd 100644
--- a/drivers/staging/rtl8192e/r8192E_phyreg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h
diff --git a/drivers/staging/rtl8192e/r819xE_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
index d5de279f6644..d5de279f6644 100644
--- a/drivers/staging/rtl8192e/r819xE_phyreg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
diff --git a/drivers/staging/rtl8192e/rtl_cam.c b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
index baf3b6342e44..baf3b6342e44 100644
--- a/drivers/staging/rtl8192e/rtl_cam.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c
diff --git a/drivers/staging/rtl8192e/rtl_cam.h b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
index fa607f98b172..fa607f98b172 100644
--- a/drivers/staging/rtl8192e/rtl_cam.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 5ad96649f407..71adb6b3344d 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -53,9 +53,7 @@
 #include "rtl_wx.h"
 #include "rtl_dm.h"
 
-#ifdef CONFIG_PM_RTL
 #include "rtl_pm.h"
-#endif
 
 int hwwep = 1;
 static int channels = 0x3fff;
@@ -581,7 +579,7 @@ static void rtl8192_update_beacon(void *data)
         struct rtllib_network *net = &ieee->current_network;
 
         if (ieee->pHTInfo->bCurrentHTSupport)
-                HTUpdateSelfAndPeerSetting(ieee, net);
+                HT_update_self_and_peer_setting(ieee, net);
         ieee->pHTInfo->bCurrentRT2RTLongSlotTime =
                  net->bssht.bdRT2RTLongSlotTime;
         ieee->pHTInfo->RT2RT_HT_Mode = net->bssht.RT2RT_HT_Mode;
@@ -1289,7 +1287,7 @@ static short rtl8192_get_channel_map(struct net_device *dev)
                 priv->ChannelPlan = COUNTRY_CODE_FCC;
         }
         RT_TRACE(COMP_INIT, "Channel plan is %d\n", priv->ChannelPlan);
-        Dot11d_Init(priv->rtllib);
+        dot11d_init(priv->rtllib);
         Dot11d_Channelmap(priv->ChannelPlan, priv->rtllib);
         for (i = 1; i <= 11; i++)
                 (priv->rtllib->active_channel_map)[i] = 1;
@@ -1305,7 +1303,6 @@ static short rtl8192_init(struct net_device *dev)
 
         memset(&(priv->stats), 0, sizeof(struct rt_stats));
 
-        rtl8192_dbgp_flag_init(dev);
         rtl8192_init_priv_handler(dev);
         rtl8192_init_priv_constant(dev);
         rtl8192_init_priv_variable(dev);
@@ -2839,7 +2836,6 @@ done:
 /****************************************************************************
         ---------------------------- PCI_STUFF---------------------------
 *****************************************************************************/
-#ifdef HAVE_NET_DEVICE_OPS
 static const struct net_device_ops rtl8192_netdev_ops = {
         .ndo_open = rtl8192_open,
         .ndo_stop = rtl8192_close,
@@ -2851,7 +2847,6 @@ static const struct net_device_ops rtl8192_netdev_ops = {
         .ndo_change_mtu = eth_change_mtu,
         .ndo_start_xmit = rtllib_xmit,
 };
-#endif
 
 static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
                         const struct pci_device_id *id)
@@ -2938,17 +2933,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
         dev->irq = pdev->irq;
         priv->irq = 0;
 
-#ifdef HAVE_NET_DEVICE_OPS
         dev->netdev_ops = &rtl8192_netdev_ops;
-#else
-        dev->open = rtl8192_open;
-        dev->stop = rtl8192_close;
-        dev->tx_timeout = rtl8192_tx_timeout;
-        dev->do_ioctl = rtl8192_ioctl;
-        dev->set_multicast_list = r8192_set_multicast;
-        dev->set_mac_address = r8192_set_mac_adr;
-        dev->hard_start_xmit = rtllib_xmit;
-#endif
 
         dev->wireless_handlers = (struct iw_handler_def *)
                                  &r8192_wx_handlers_def;
@@ -2974,10 +2959,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 
         register_netdev(dev);
         RT_TRACE(COMP_INIT, "dev name: %s\n", dev->name);
-        err = rtl_debug_module_init(priv, dev->name);
-        if (err)
-                RT_TRACE(COMP_DBG, "failed to create debugfs files. Ignoring "
-                         "error: %d\n", err);
+
         rtl8192_proc_init_one(dev);
 
         if (priv->polling_timer_on == 0)
@@ -3015,7 +2997,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
                 del_timer_sync(&priv->gpio_polling_timer);
                 cancel_delayed_work(&priv->gpio_change_rf_wq);
                 priv->polling_timer_on = 0;
-                rtl_debug_module_remove(priv);
                 rtl8192_proc_remove_one(dev);
                 rtl8192_down(dev, true);
                 deinit_hal_dm(dev);
@@ -3103,43 +3084,9 @@ bool NicIFDisableNIC(struct net_device *dev)
 
 static int __init rtl8192_pci_module_init(void)
 {
-        int ret;
-        int error;
-
-        ret = rtllib_init();
-        if (ret) {
-                printk(KERN_ERR "rtllib_init() failed %d\n", ret);
-                return ret;
-        }
-        ret = rtllib_crypto_init();
-        if (ret) {
-                printk(KERN_ERR "rtllib_crypto_init() failed %d\n", ret);
-                return ret;
-        }
-        ret = rtllib_crypto_tkip_init();
-        if (ret) {
-                printk(KERN_ERR "rtllib_crypto_tkip_init() failed %d\n", ret);
-                return ret;
-        }
-        ret = rtllib_crypto_ccmp_init();
-        if (ret) {
-                printk(KERN_ERR "rtllib_crypto_ccmp_init() failed %d\n", ret);
-                return ret;
-        }
-        ret = rtllib_crypto_wep_init();
-        if (ret) {
-                printk(KERN_ERR "rtllib_crypto_wep_init() failed %d\n", ret);
-                return ret;
-        }
         printk(KERN_INFO "\nLinux kernel driver for RTL8192E WLAN cards\n");
         printk(KERN_INFO "Copyright (c) 2007-2008, Realsil Wlan Driver\n");
 
-        error = rtl_create_debugfs_root();
-        if (error) {
-                RT_TRACE(COMP_DBG, "Create debugfs root fail: %d\n", error);
-                goto err_out;
-        }
-
         rtl8192_proc_module_init();
         if (0 != pci_register_driver(&rtl8192_pci_driver)) {
                 DMESG("No device found");
@@ -3147,9 +3094,6 @@ static int __init rtl8192_pci_module_init(void)
                 return -ENODEV;
         }
         return 0;
-err_out:
-        return error;
-
 }
 
 static void __exit rtl8192_pci_module_exit(void)
@@ -3158,12 +3102,6 @@ static void __exit rtl8192_pci_module_exit(void)
 
         RT_TRACE(COMP_DOWN, "Exiting");
         rtl8192_proc_module_remove();
-        rtl_remove_debugfs_root();
-        rtllib_crypto_tkip_exit();
-        rtllib_crypto_ccmp_exit();
-        rtllib_crypto_wep_exit();
-        rtllib_crypto_deinit();
-        rtllib_exit();
 }
 
 void check_rfctrl_gpio_timer(unsigned long data)
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index f9af5153d9cf..2a2519cc284d 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -44,11 +44,14 @@
 #include <linux/proc_fs.h>
 #include <linux/if_arp.h>
 #include <linux/random.h>
-#include <linux/version.h>
 #include <linux/io.h>
-#include "rtllib.h"
 
-#include "dot11d.h"
+/* Need this defined before including local include files */
+#define DRV_NAME "rtl819xE"
+
+#include "../rtllib.h"
+
+#include "../dot11d.h"
 
 #include "r8192E_firmware.h"
 #include "r8192E_hw.h"
@@ -56,7 +59,6 @@
 #include "r8190P_def.h"
 #include "r8192E_dev.h"
 
-#include "rtl_debug.h"
 #include "rtl_eeprom.h"
 #include "rtl_ps.h"
 #include "rtl_pci.h"
@@ -67,8 +69,6 @@
 #define DRV_AUTHOR  "<wlanfae@realtek.com>"
 #define DRV_VERSION  "0014.0401.2010"
 
-#define DRV_NAME "rtl819xE"
-
 #define IS_HARDWARE_TYPE_819xP(_priv)           \
         ((((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8190P) || \
         (((struct r8192_priv *)rtllib_priv(dev))->card_8192 == NIC_8192E))
@@ -215,41 +215,6 @@ enum RTL819x_PHY_PARAM {
         RTL819X_EFUSE_MAP                       = 19,
 };
 
-enum RTL_DEBUG {
-        COMP_TRACE              = BIT0,
-        COMP_DBG                = BIT1,
-        COMP_INIT               = BIT2,
-        COMP_RECV               = BIT3,
-        COMP_SEND               = BIT4,
-        COMP_CMD                = BIT5,
-        COMP_POWER              = BIT6,
-        COMP_EPROM              = BIT7,
-        COMP_SWBW               = BIT8,
-        COMP_SEC                = BIT9,
-        COMP_LPS                = BIT10,
-        COMP_QOS                = BIT11,
-        COMP_RATE               = BIT12,
-        COMP_RXDESC             = BIT13,
-        COMP_PHY                = BIT14,
-        COMP_DIG                = BIT15,
-        COMP_TXAGC              = BIT16,
-        COMP_HALDM              = BIT17,
-        COMP_POWER_TRACKING     = BIT18,
-        COMP_CH                 = BIT19,
-        COMP_RF                 = BIT20,
-        COMP_FIRMWARE           = BIT21,
-        COMP_HT                 = BIT22,
-        COMP_RESET              = BIT23,
-        COMP_CMDPKT             = BIT24,
-        COMP_SCAN               = BIT25,
-        COMP_PS                 = BIT26,
-        COMP_DOWN               = BIT27,
-        COMP_INTR               = BIT28,
-        COMP_LED                = BIT29,
-        COMP_MLME               = BIT30,
-        COMP_ERR                = BIT31
-};
-
 enum nic_t {
         NIC_UNKNOWN     = 0,
         NIC_8192E       = 1,
@@ -1121,4 +1086,10 @@ void ActUpdateChannelAccessSetting(struct net_device *dev,
                            enum wireless_mode WirelessMode,
                            struct channel_access_setting *ChnlAccessSetting);
 
+/* proc stuff from rtl_debug.c */
+void rtl8192_proc_init_one(struct net_device *dev);
+void rtl8192_proc_remove_one(struct net_device *dev);
+void rtl8192_proc_module_init(void);
+void rtl8192_proc_module_remove(void);
+
 #endif
diff --git a/drivers/staging/rtl8192e/rtl_crypto.h b/drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h
index ee57c0f4fa69..ee57c0f4fa69 100644
--- a/drivers/staging/rtl8192e/rtl_crypto.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_crypto.h
diff --git a/drivers/staging/rtl8192e/rtl_debug.c b/drivers/staging/rtl8192e/rtl8192e/rtl_debug.c
index 22bc2dd6e438..c19b14cd6f77 100644
--- a/drivers/staging/rtl8192e/rtl_debug.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_debug.c
@@ -22,91 +22,12 @@
  * Contact Information:
  * wlanfae <wlanfae@realtek.com>
 ******************************************************************************/
-#include "rtl_debug.h"
 #include "rtl_core.h"
 #include "r8192E_phy.h"
 #include "r8192E_phyreg.h"
 #include "r8190P_rtl8256.h" /* RTL8225 Radio frontend */
 #include "r8192E_cmdpkt.h"
 
-u32 rt_global_debug_component = \
-                                COMP_ERR ;
-
-/*------------------Declare variable-----------------------*/
-u32     DBGP_Type[DBGP_TYPE_MAX];
-
-/*-----------------------------------------------------------------------------
- * Function:    DBGP_Flag_Init
- *
- * Overview:    Refresh all debug print control flag content to zero.
- *
- * Input:       NONE
- *
- * Output:      NONE
- *
- * Return:      NONE
- *
- * Revised History:
- *  When                Who             Remark
- *  10/20/2006  MHC             Create Version 0.
- *
- *---------------------------------------------------------------------------*/
-void    rtl8192_dbgp_flag_init(struct net_device *dev)
-{
-        u8 i;
-
-        for (i = 0; i < DBGP_TYPE_MAX; i++)
-                DBGP_Type[i] = 0;
-
-
-}       /* DBGP_Flag_Init */
-
-/* this is only for debugging */
-void print_buffer(u32 *buffer, int len)
-{
-        int i;
-        u8 *buf = (u8 *)buffer;
-
-        printk(KERN_INFO "ASCII BUFFER DUMP (len: %x):\n", len);
-
-        for (i = 0; i < len; i++)
-                printk(KERN_INFO "%c", buf[i]);
-
-        printk(KERN_INFO "\nBINARY BUFFER DUMP (len: %x):\n", len);
-
-        for (i = 0; i < len; i++)
-                printk(KERN_INFO "%x", buf[i]);
-
-        printk(KERN_INFO "\n");
-}
-
-/* this is only for debug */
-void dump_eprom(struct net_device *dev)
-{
-        int i;
-
-        for (i = 0; i < 0xff; i++)
-                RT_TRACE(COMP_INIT, "EEPROM addr %x : %x", i,
-                         eprom_read(dev, i));
-}
-
-/* this is only for debug */
-void rtl8192_dump_reg(struct net_device *dev)
-{
-        int i;
-        int n;
-        int max = 0x5ff;
-
-        RT_TRACE(COMP_INIT, "Dumping NIC register map");
-
-        for (n = 0; n <= max; ) {
-                printk(KERN_INFO "\nD: %2x> ", n);
-                for (i = 0; i < 16 && n <= max; i++, n++)
-                        printk(KERN_INFO "%2x ", read_nic_byte(dev, n));
-        }
-        printk(KERN_INFO "\n");
-}
-
 /****************************************************************************
    -----------------------------PROCFS STUFF-------------------------
 *****************************************************************************/
diff --git a/drivers/staging/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index a7fa9aad6f2d..a7fa9aad6f2d 100644
--- a/drivers/staging/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
diff --git a/drivers/staging/rtl8192e/rtl_dm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
index ab44a9a6927c..ab44a9a6927c 100644
--- a/drivers/staging/rtl8192e/rtl_dm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h
diff --git a/drivers/staging/rtl8192e/rtl_eeprom.c b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c
index c1ccff4a8321..c1ccff4a8321 100644
--- a/drivers/staging/rtl8192e/rtl_eeprom.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c
diff --git a/drivers/staging/rtl8192e/rtl_eeprom.h b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h
index 9452e1683a72..9452e1683a72 100644
--- a/drivers/staging/rtl8192e/rtl_eeprom.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h
diff --git a/drivers/staging/rtl8192e/rtl_ethtool.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c
index 36452fb7cef8..36452fb7cef8 100644
--- a/drivers/staging/rtl8192e/rtl_ethtool.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c
diff --git a/drivers/staging/rtl8192e/rtl_pci.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
index ddadcc3e4e7c..ddadcc3e4e7c 100644
--- a/drivers/staging/rtl8192e/rtl_pci.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
diff --git a/drivers/staging/rtl8192e/rtl_pci.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
index 7ea5a47dfd2b..28c7da677a80 100644
--- a/drivers/staging/rtl8192e/rtl_pci.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
@@ -27,7 +27,6 @@
 
 #include <linux/types.h>
 #include <linux/pci.h>
-#include "rtllib.h"
 
 static inline void NdisRawWritePortUlong(u32 port,  u32 val)
 {
diff --git a/drivers/staging/rtl8192e/rtl_pm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
index 92e2fde7f5f4..8e1a5d55dce8 100644
--- a/drivers/staging/rtl8192e/rtl_pm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
@@ -17,7 +17,6 @@
  * wlanfae <wlanfae@realtek.com>
 ******************************************************************************/
 
-#ifdef CONFIG_PM_RTL
 #include "rtl_core.h"
 #include "r8192E_hw.h"
 #include "r8190P_rtl8256.h"
@@ -133,4 +132,3 @@ int rtl8192E_enable_wake(struct pci_dev *dev, pm_message_t state, int enable)
         return -EAGAIN;
 }
 
-#endif
diff --git a/drivers/staging/rtl8192e/rtl_pm.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
index 4d7f4067cc78..e5299fc3b34a 100644
--- a/drivers/staging/rtl8192e/rtl_pm.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
@@ -17,8 +17,6 @@
  * wlanfae <wlanfae@realtek.com>
 ******************************************************************************/
 
-#ifdef CONFIG_PM_RTL
-
 #ifndef R8192E_PM_H
 #define R8192E_PM_H
 
@@ -31,5 +29,3 @@ int rtl8192E_resume(struct pci_dev *dev);
 int rtl8192E_enable_wake(struct pci_dev *dev, pm_message_t state, int enable);
 
 #endif
-
-#endif
diff --git a/drivers/staging/rtl8192e/rtl_ps.c b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
index c9a7c563b682..c9a7c563b682 100644
--- a/drivers/staging/rtl8192e/rtl_ps.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c
diff --git a/drivers/staging/rtl8192e/rtl_ps.h b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
index a9c2d799c08f..df79d6c4ca03 100644
--- a/drivers/staging/rtl8192e/rtl_ps.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
@@ -26,7 +26,7 @@
 #define _RTL_PS_H
 
 #include <linux/types.h>
-#include "rtllib.h"
+
 struct net_device;
 
 #define RT_CHECK_FOR_HANG_PERIOD 2
diff --git a/drivers/staging/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 93b1edbe6bae..4e93669210af 100644
--- a/drivers/staging/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -19,7 +19,6 @@
 
 #include <linux/string.h>
 #include "rtl_core.h"
-#include "dot11d.h"
 
 #define RATE_COUNT 12
 static u32 rtl8192_rates[] = {
@@ -803,7 +802,7 @@ static int r8192_wx_set_enc(struct net_device *dev,
 
                 switch (wrqu->encoding.flags & IW_ENCODE_INDEX) {
                 case 0:
-                        key_idx = ieee->tx_keyidx;
+                        key_idx = ieee->crypt_info.tx_keyidx;
                         break;
                 case 1:
                         key_idx = 0;
diff --git a/drivers/staging/rtl8192e/rtl_wx.h b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h
index 6a51a25ec87d..6a51a25ec87d 100644
--- a/drivers/staging/rtl8192e/rtl_wx.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.h
diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
index 8b9d85c48be6..32fbbc9d0d92 100644
--- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -18,7 +18,6 @@
 ******************************************************************************/
 #include "rtllib.h"
 #include "rtl819x_BA.h"
-#include "rtl_core.h"
 
 static void ActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA,
                             u16 Time)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index b1c0c566882f..8b7412980ebb 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -943,8 +943,8 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
         }
 }
 
-void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee,
-                                struct rtllib_network *pNetwork)
+void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
+                                     struct rtllib_network *pNetwork)
 {
         struct rt_hi_throughput *pHTInfo = ieee->pHTInfo;
         struct ht_info_ele *pPeerHTInfo =
@@ -955,6 +955,7 @@ void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee,
                         pHTInfo->CurrentOpMode = pPeerHTInfo->OptMode;
         }
 }
+EXPORT_SYMBOL(HT_update_self_and_peer_setting);
 
 void HTUseDefaultSetting(struct rtllib_device *ieee)
 {
diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
index 09a602f74329..711a096be7a7 100644
--- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
@@ -497,6 +497,7 @@ void RemovePeerTS(struct rtllib_device *ieee, u8 *Addr)
                 }
         }
 }
+EXPORT_SYMBOL(RemovePeerTS);
 
 void RemoveAllTS(struct rtllib_device *ieee)
 {
diff --git a/drivers/staging/rtl8192e/rtl_debug.h b/drivers/staging/rtl8192e/rtl_debug.h
deleted file mode 100644
index 50fb9a9b828a..000000000000
--- a/drivers/staging/rtl8192e/rtl_debug.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/******************************************************************************
- * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
- *
- * Based on the r8180 driver, which is:
- * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
- *
- * The full GNU General Public License is included in this distribution in the
- * file called LICENSE.
- *
- * Contact Information:
- * wlanfae <wlanfae@realtek.com>
-******************************************************************************/
-#ifndef _RTL_DEBUG_H
-#define _RTL_DEBUG_H
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/debugfs.h>
-
-struct r8192_priv;
-struct _tx_desc_8192se;
-struct _TX_DESC_8192CE;
-struct net_device;
-
-#define DBG_LOUD        4
-
-#define RT_ASSERT(_Exp, Fmt)                            \
-                if (!(_Exp)) {                          \
-                        printk("Rtl819x: ");            \
-                        printk Fmt;                     \
-                }
-
-enum dbgp_flag {
-        FQoS                            = 0,
-        FTX                             = 1,
-        FRX                             = 2,
-        FSEC                            = 3,
-        FMGNT                           = 4,
-        FMLME                           = 5,
-        FRESOURCE                       = 6,
-        FBEACON                         = 7,
-        FISR                            = 8,
-        FPHY                            = 9,
-        FMP                             = 10,
-        FEEPROM                         = 11,
-        FPWR                            = 12,
-        FDM                             = 13,
-        FDBGCtrl                        = 14,
-        FC2H                            = 15,
-        FBT                             = 16,
-        FINIT                           = 17,
-        FIOCTL                          = 18,
-        DBGP_TYPE_MAX
-};
-
-#define         QoS_INIT                                BIT0
-#define         QoS_VISTA                               BIT1
-
-#define         TX_DESC                                 BIT0
-#define         TX_DESC_TID                             BIT1
-
-#define         RX_DATA                                 BIT0
-#define         RX_PHY_STS                              BIT1
-#define         RX_PHY_SS                               BIT2
-#define         RX_PHY_SQ                               BIT3
-#define         RX_PHY_ASTS                             BIT4
-#define         RX_ERR_LEN                              BIT5
-#define         RX_DEFRAG                               BIT6
-#define         RX_ERR_RATE                             BIT7
-
-
-
-#define         MEDIA_STS                               BIT0
-#define         LINK_STS                                BIT1
-
-#define         OS_CHK                                  BIT0
-
-#define         BCN_SHOW                                BIT0
-#define         BCN_PEER                                BIT1
-
-#define         ISR_CHK                                 BIT0
-
-#define         PHY_BBR                                 BIT0
-#define         PHY_BBW                                 BIT1
-#define         PHY_RFR                                 BIT2
-#define         PHY_RFW                                 BIT3
-#define         PHY_MACR                                BIT4
-#define         PHY_MACW                                BIT5
-#define         PHY_ALLR                                BIT6
-#define         PHY_ALLW                                BIT7
-#define         PHY_TXPWR                               BIT8
-#define         PHY_PWRDIFF                             BIT9
-
-#define         MP_RX                                   BIT0
-#define         MP_SWICH_CH                             BIT1
-
-#define         EEPROM_W                                BIT0
-#define         EFUSE_PG                                BIT1
-#define         EFUSE_READ_ALL                          BIT2
-
-#define         LPS                                     BIT0
-#define         IPS                                     BIT1
-#define         PWRSW                                   BIT2
-#define         PWRHW                                   BIT3
-#define         PWRHAL                                  BIT4
-
-#define         WA_IOT                                  BIT0
-#define         DM_PWDB                                 BIT1
-#define         DM_Monitor                              BIT2
-#define         DM_DIG                                  BIT3
-#define         DM_EDCA_Turbo                           BIT4
-
-#define         DbgCtrl_Trace                           BIT0
-#define         DbgCtrl_InbandNoise                     BIT1
-
-#define         BT_TRACE                                BIT0
-#define         BT_RFPoll                               BIT1
-
-#define         C2H_Summary                             BIT0
-#define         C2H_PacketData                          BIT1
-#define         C2H_ContentData                         BIT2
-#define         BT_TRACE                                BIT0
-#define         BT_RFPoll                               BIT1
-
-#define         INIT_EEPROM                             BIT0
-#define         INIT_TxPower                            BIT1
-#define         INIT_IQK                                BIT2
-#define         INIT_RF                                 BIT3
-
-#define         IOCTL_TRACE                             BIT0
-#define         IOCTL_BT_EVENT                          BIT1
-#define         IOCTL_BT_EVENT_DETAIL                   BIT2
-#define         IOCTL_BT_TX_ACLDATA                     BIT3
-#define         IOCTL_BT_TX_ACLDATA_DETAIL              BIT4
-#define         IOCTL_BT_RX_ACLDATA                     BIT5
-#define         IOCTL_BT_RX_ACLDATA_DETAIL              BIT6
-#define         IOCTL_BT_HCICMD                         BIT7
-#define         IOCTL_BT_HCICMD_DETAIL                  BIT8
-#define         IOCTL_IRP                               BIT9
-#define         IOCTL_IRP_DETAIL                        BIT10
-#define         IOCTL_CALLBACK_FUN                      BIT11
-#define         IOCTL_STATE                             BIT12
-#define         IOCTL_BT_TP                             BIT13
-#define         IOCTL_BT_LOGO                           BIT14
-
-/* 2007/07/13 MH  ------For DeBuG Print modeue------*/
-/*------------------------------Define structure----------------------------*/
-
-
-/*------------------------Export Marco Definition---------------------------*/
-#define         DEBUG_PRINT             1
-
-#if (DEBUG_PRINT == 1)
-#define RTPRINT(dbgtype, dbgflag, printstr)                     \
-{                                                               \
-        if (DBGP_Type[dbgtype] & dbgflag) {                     \
-                printk printstr;                                \
-        }                                                       \
-}
-
-#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)          \
-{                                                               \
-        if (DBGP_Type[dbgtype] & dbgflag) {                     \
-                int __i;                                        \
-                u8 *ptr = (u8 *)_Ptr;                           \
-                printk printstr;                                \
-                printk(" ");                                    \
-                for (__i = 0; __i < 6; __i++)                   \
-                        printk("%02X%s", ptr[__i],              \
-                               (__i == 5) ? "" : "-");          \
-                        printk("\n");                           \
-        }                                                       \
-}
-
-#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)\
-{                                                               \
-        if (DBGP_Type[dbgtype] & dbgflag) {                     \
-                int __i;                                        \
-                u8 *ptr = (u8 *)_HexData;                       \
-                printk(_TitleString);                           \
-                for (__i = 0; __i < (int)_HexDataLen; __i++) {  \
-                        printk("%02X%s", ptr[__i], (((__i + 1)  \
-                               % 4) == 0) ? "  " : " ");        \
-                        if (((__i + 1) % 16) == 0)              \
-                                printk("\n");                   \
-                }                                               \
-                printk("\n");                                   \
-        }                                                       \
-}
-#else
-#define RTPRINT(dbgtype, dbgflag, printstr)
-#define RTPRINT_ADDR(dbgtype, dbgflag, printstr, _Ptr)
-#define RTPRINT_DATA(dbgtype, dbgflag, _TitleString, _HexData, _HexDataLen)
-#endif
-
-extern u32      DBGP_Type[DBGP_TYPE_MAX];
-
-#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) \
-do {\
-        if (((_Comp) & rt_global_debug_component) &&                    \
-             (_Level <= rt_global_debug_component)) {                   \
-                int __i;                                                \
-                u8*     ptr = (u8 *)_HexData;                           \
-                printk(KERN_INFO "Rtl819x: ");                          \
-                printk(_TitleString);                                   \
-                for (__i = 0; __i < (int)_HexDataLen; __i++) {          \
-                        printk("%02X%s", ptr[__i], (((__i + 1) %        \
-                               4) == 0) ? "  " : " ");                  \
-                        if (((__i + 1) % 16) == 0)                      \
-                                printk("\n");                           \
-                }                                                       \
-                printk("\n");                                           \
-        } \
-} while (0);
-
-#define DMESG(x, a...)
-#define DMESGW(x, a...)
-#define DMESGE(x, a...)
-extern u32 rt_global_debug_component;
-#define RT_TRACE(component, x, args...) \
-do {                    \
-        if (rt_global_debug_component & component) \
-                printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
-                       ##args);\
-} while (0);
-
-#define assert(expr) \
-        if (!(expr)) {                            \
-                printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
-                #expr, __FILE__, __func__, __LINE__);     \
-        }
-#define RT_DEBUG_DATA(level, data, datalen)      \
-        do {                                                            \
-                if ((rt_global_debug_component & (level)) == (level)) {\
-                        int _i;                           \
-                        u8 *_pdata = (u8 *)data;                 \
-                        printk(KERN_DEBUG DRV_NAME ": %s()\n", __func__);   \
-                        for (_i = 0; _i < (int)(datalen); _i++) {       \
-                                printk(KERN_INFO "%2x ", _pdata[_i]);   \
-                                if ((_i+1) % 16 == 0)                   \
-                                        printk("\n");                   \
-                        }                              \
-                        printk(KERN_INFO "\n");   \
-                }                                      \
-        } while (0)
-
-struct rtl_fs_debug {
-        const char *name;
-        struct dentry *dir_drv;
-        struct dentry *debug_register;
-        u32 hw_type;
-        u32 hw_offset;
-        bool hw_holding;
-};
-
-void print_buffer(u32 *buffer, int len);
-void dump_eprom(struct net_device *dev);
-void rtl8192_dump_reg(struct net_device *dev);
-
-/* debugfs stuff */
-static inline int rtl_debug_module_init(struct r8192_priv *priv,
-                                        const char *name)
-{
-        return 0;
-}
-
-static inline void rtl_debug_module_remove(struct r8192_priv *priv)
-{
-}
-
-static inline int rtl_create_debugfs_root(void)
-{
-        return 0;
-}
-
-static inline void rtl_remove_debugfs_root(void)
-{
-}
-
-/* proc stuff */
-void rtl8192_proc_init_one(struct net_device *dev);
-void rtl8192_proc_remove_one(struct net_device *dev);
-void rtl8192_proc_module_init(void);
-void rtl8192_proc_module_remove(void);
-void rtl8192_dbgp_flag_init(struct net_device *dev);
-
-#endif
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index de25975ccee4..e26aec86a5c8 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -25,7 +25,6 @@
 #define RTLLIB_H
 #include <linux/if_ether.h> /* ETH_ALEN */
 #include <linux/kernel.h>   /* ARRAY_SIZE */
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
@@ -36,12 +35,14 @@
 #include <linux/delay.h>
 #include <linux/wireless.h>
 
+#include "rtllib_debug.h"
 #include "rtl819x_HT.h"
 #include "rtl819x_BA.h"
 #include "rtl819x_TS.h"
 
 #include <linux/netdevice.h>
 #include <linux/if_arp.h> /* ARPHRD_ETHER */
+#include <net/lib80211.h>
 
 #define MAX_PRECMD_CNT 16
 #define MAX_RFDEPENDCMD_CNT 16
@@ -870,69 +871,6 @@ enum _REG_PREAMBLE_MODE {
 #define WLAN_ERP_USE_PROTECTION (1<<1)
 #define WLAN_ERP_BARKER_PREAMBLE (1<<2)
 
-/* Status codes */
-enum rtllib_statuscode {
-        WLAN_STATUS_SUCCESS = 0,
-        WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
-        WLAN_STATUS_CAPS_UNSUPPORTED = 10,
-        WLAN_STATUS_REASSOC_NO_ASSOC = 11,
-        WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
-        WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
-        WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
-        WLAN_STATUS_CHALLENGE_FAIL = 15,
-        WLAN_STATUS_AUTH_TIMEOUT = 16,
-        WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
-        WLAN_STATUS_ASSOC_DENIED_RATES = 18,
-        /* 802.11b */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
-        WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
-        WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
-        /* 802.11h */
-        WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
-        /* 802.11g */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
-        WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
-        /* 802.11i */
-        WLAN_STATUS_INVALID_IE = 40,
-        WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
-        WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
-        WLAN_STATUS_INVALID_AKMP = 43,
-        WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
-        WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
-        WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
-};
-
-/* Reason codes */
-enum rtllib_reasoncode {
-        WLAN_REASON_UNSPECIFIED = 1,
-        WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
-        WLAN_REASON_DEAUTH_LEAVING = 3,
-        WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
-        WLAN_REASON_DISASSOC_AP_BUSY = 5,
-        WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
-        WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
-        WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
-        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
-        /* 802.11h */
-        WLAN_REASON_DISASSOC_BAD_POWER = 10,
-        WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
-        /* 802.11i */
-        WLAN_REASON_INVALID_IE = 13,
-        WLAN_REASON_MIC_FAILURE = 14,
-        WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
-        WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
-        WLAN_REASON_IE_DIFFERENT = 17,
-        WLAN_REASON_INVALID_GROUP_CIPHER = 18,
-        WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
-        WLAN_REASON_INVALID_AKMP = 20,
-        WLAN_REASON_UNSUPP_RSN_VERSION = 21,
-        WLAN_REASON_INVALID_RSN_IE_CAP = 22,
-        WLAN_REASON_IEEE8021X_FAILED = 23,
-        WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
-};
-
 #define RTLLIB_STATMASK_SIGNAL (1<<0)
 #define RTLLIB_STATMASK_RSSI (1<<1)
 #define RTLLIB_STATMASK_NOISE (1<<2)
@@ -1122,8 +1060,6 @@ struct rtllib_stats {
 
 struct rtllib_device;
 
-#include "rtllib_crypt.h"
-
 #define SEC_KEY_1        (1<<0)
 #define SEC_KEY_2        (1<<1)
 #define SEC_KEY_3        (1<<2)
@@ -1146,7 +1082,6 @@ struct rtllib_device;
 #define SEC_ALG_TKIP            2
 #define SEC_ALG_CCMP            4
 
-#define WEP_KEYS                4
 #define WEP_KEY_LEN             13
 #define SCM_KEY_LEN             32
 #define SCM_TEMPORAL_KEY_LENGTH 16
@@ -1158,8 +1093,8 @@ struct rtllib_security {
             auth_algo:4,
             unicast_uses_group:1,
             encrypt:1;
-        u8 key_sizes[WEP_KEYS];
-        u8 keys[WEP_KEYS][SCM_KEY_LEN];
+        u8 key_sizes[NUM_WEP_KEYS];
+        u8 keys[NUM_WEP_KEYS][SCM_KEY_LEN];
         u8 level;
         u16 flags;
 } __packed;
@@ -2251,14 +2186,10 @@ struct rtllib_device {
         u8 ap_mac_addr[6];
         u16 pairwise_key_type;
         u16 group_key_type;
-        struct list_head crypt_deinit_list;
-        struct rtllib_crypt_data *crypt[WEP_KEYS];
 
-        int tx_keyidx; /* default TX key index (crypt[tx_keyidx]) */
-        struct sw_cam_table swcamtable[TOTAL_CAM_ENTRY];
-        struct timer_list crypt_deinit_timer;
-        int crypt_quiesced;
+        struct lib80211_crypt_info crypt_info;
 
+        struct sw_cam_table swcamtable[TOTAL_CAM_ENTRY];
         int bcrx_sta_key; /* use individual keys to override default keys even
                            * with RX of broad/multicast frames */
 
@@ -2774,7 +2705,7 @@ extern void rtllib_rx_mgt(struct rtllib_device *ieee,
                              struct rtllib_rx_stats *stats);
 extern void rtllib_rx_probe_rq(struct rtllib_device *ieee,
                            struct sk_buff *skb);
-extern int IsLegalChannel(struct rtllib_device *rtllib, u8 channel);
+extern int rtllib_legal_channel(struct rtllib_device *rtllib, u8 channel);
 
 /* rtllib_wx.c */
 extern int rtllib_wx_get_scan(struct rtllib_device *ieee,
@@ -2804,7 +2735,7 @@ extern int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len);
 
 /* rtllib_softmac.c */
 extern short rtllib_is_54g(struct rtllib_network *net);
-extern short rtllib_is_shortslot(struct rtllib_network net);
+extern short rtllib_is_shortslot(const struct rtllib_network *net);
 extern int rtllib_rx_frame_softmac(struct rtllib_device *ieee,
                                    struct sk_buff *skb,
                                    struct rtllib_rx_stats *rx_stats, u16 type,
@@ -2971,8 +2902,8 @@ extern void HTInitializeHTInfo(struct rtllib_device *ieee);
 extern void HTInitializeBssDesc(struct bss_ht *pBssHT);
 extern void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee,
                                           struct rtllib_network *pNetwork);
-extern void HTUpdateSelfAndPeerSetting(struct rtllib_device *ieee,
-                                       struct rtllib_network *pNetwork);
+extern void HT_update_self_and_peer_setting(struct rtllib_device *ieee,
+                                            struct rtllib_network *pNetwork);
 extern u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8 *pMCSRateSet,
                               u8 *pMCSFilter);
 extern u8 MCS_FILTER_ALL[];
@@ -3052,21 +2983,6 @@ static inline const char *escape_essid(const char *essid, u8 essid_len)
         (HTMcsToDataRate(_ieee, (u8)_MGN_RATE)))
 
 /* fun with the built-in rtllib stack... */
-int rtllib_init(void);
-void rtllib_exit(void);
-int rtllib_crypto_init(void);
-void rtllib_crypto_deinit(void);
-int rtllib_crypto_tkip_init(void);
-void rtllib_crypto_tkip_exit(void);
-int rtllib_crypto_ccmp_init(void);
-void rtllib_crypto_ccmp_exit(void);
-int rtllib_crypto_wep_init(void);
-void rtllib_crypto_wep_exit(void);
-
-void rtllib_MgntDisconnectIBSS(struct rtllib_device *rtllib);
-void rtllib_MlmeDisassociateRequest(struct rtllib_device *rtllib, u8 *asSta,
-                                    u8 asRsn);
-void rtllib_MgntDisconnectAP(struct rtllib_device *rtllib, u8 asRsn);
 bool rtllib_MgntDisconnect(struct rtllib_device *rtllib, u8 asRsn);
 
 
@@ -3133,12 +3049,5 @@ extern void rtllib_TURBO_Info(struct rtllib_device *ieee, u8 **tag_p);
 #define MUTEX_LOCK_PRIV(pmutex) mutex_lock(pmutex)
 #define MUTEX_UNLOCK_PRIV(pmutex) mutex_unlock(pmutex)
 #endif
-static inline void dump_buf(u8 *buf, u32 len)
-{
-        u32 i;
-        printk(KERN_INFO "-----------------Len %d----------------\n", len);
-        for (i = 0; i < len; i++)
-                printk("%2.2x-", *(buf+i));
-        printk("\n");
-}
+
 #endif /* RTLLIB_H */
diff --git a/drivers/staging/rtl8192e/rtllib_crypt.c b/drivers/staging/rtl8192e/rtllib_crypt.c
index acda37b81848..86152d0e6b5d 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt.c
@@ -11,7 +11,6 @@
  *
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -22,7 +21,7 @@
 
 struct rtllib_crypto_alg {
         struct list_head list;
-        struct rtllib_crypto_ops *ops;
+        struct lib80211_crypto_ops *ops;
 };
 
 
@@ -33,15 +32,15 @@ struct rtllib_crypto {
 
 static struct rtllib_crypto *hcrypt;
 
-void rtllib_crypt_deinit_entries(struct rtllib_device *ieee,
+void rtllib_crypt_deinit_entries(struct lib80211_crypt_info *info,
                                            int force)
 {
         struct list_head *ptr, *n;
-        struct rtllib_crypt_data *entry;
+        struct lib80211_crypt_data *entry;
 
-        for (ptr = ieee->crypt_deinit_list.next, n = ptr->next;
-             ptr != &ieee->crypt_deinit_list; ptr = n, n = ptr->next) {
-                entry = list_entry(ptr, struct rtllib_crypt_data, list);
+        for (ptr = info->crypt_deinit_list.next, n = ptr->next;
+             ptr != &info->crypt_deinit_list; ptr = n, n = ptr->next) {
+                entry = list_entry(ptr, struct lib80211_crypt_data, list);
 
                 if (atomic_read(&entry->refcnt) != 0 && !force)
                         continue;
@@ -53,28 +52,30 @@ void rtllib_crypt_deinit_entries(struct rtllib_device *ieee,
                 kfree(entry);
         }
 }
+EXPORT_SYMBOL(rtllib_crypt_deinit_entries);
 
 void rtllib_crypt_deinit_handler(unsigned long data)
 {
-        struct rtllib_device *ieee = (struct rtllib_device *)data;
+        struct lib80211_crypt_info *info = (struct lib80211_crypt_info *)data;
         unsigned long flags;
 
-        spin_lock_irqsave(&ieee->lock, flags);
-        rtllib_crypt_deinit_entries(ieee, 0);
-        if (!list_empty(&ieee->crypt_deinit_list)) {
+        spin_lock_irqsave(info->lock, flags);
+        rtllib_crypt_deinit_entries(info, 0);
+        if (!list_empty(&info->crypt_deinit_list)) {
                 printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
-                       "deletion list\n", ieee->dev->name);
-                ieee->crypt_deinit_timer.expires = jiffies + HZ;
-                add_timer(&ieee->crypt_deinit_timer);
+                       "deletion list\n", info->name);
+                info->crypt_deinit_timer.expires = jiffies + HZ;
+                add_timer(&info->crypt_deinit_timer);
         }
-        spin_unlock_irqrestore(&ieee->lock, flags);
+        spin_unlock_irqrestore(info->lock, flags);
 
 }
+EXPORT_SYMBOL(rtllib_crypt_deinit_handler);
 
-void rtllib_crypt_delayed_deinit(struct rtllib_device *ieee,
-                                    struct rtllib_crypt_data **crypt)
+void rtllib_crypt_delayed_deinit(struct lib80211_crypt_info *info,
+                                 struct lib80211_crypt_data **crypt)
 {
-        struct rtllib_crypt_data *tmp;
+        struct lib80211_crypt_data *tmp;
         unsigned long flags;
 
         if (*crypt == NULL)
@@ -87,16 +88,17 @@ void rtllib_crypt_delayed_deinit(struct rtllib_device *ieee,
          * decrypt operations. Use a list of delayed deinits to avoid needing
          * locking. */
 
-        spin_lock_irqsave(&ieee->lock, flags);
-        list_add(&tmp->list, &ieee->crypt_deinit_list);
-        if (!timer_pending(&ieee->crypt_deinit_timer)) {
-                ieee->crypt_deinit_timer.expires = jiffies + HZ;
-                add_timer(&ieee->crypt_deinit_timer);
+        spin_lock_irqsave(info->lock, flags);
+        list_add(&tmp->list, &info->crypt_deinit_list);
+        if (!timer_pending(&info->crypt_deinit_timer)) {
+                info->crypt_deinit_timer.expires = jiffies + HZ;
+                add_timer(&info->crypt_deinit_timer);
         }
-        spin_unlock_irqrestore(&ieee->lock, flags);
+        spin_unlock_irqrestore(info->lock, flags);
 }
+EXPORT_SYMBOL(rtllib_crypt_delayed_deinit);
 
-int rtllib_register_crypto_ops(struct rtllib_crypto_ops *ops)
+int rtllib_register_crypto_ops(struct lib80211_crypto_ops *ops)
 {
         unsigned long flags;
         struct rtllib_crypto_alg *alg;
@@ -104,11 +106,10 @@ int rtllib_register_crypto_ops(struct rtllib_crypto_ops *ops)
         if (hcrypt == NULL)
                 return -1;
 
-        alg = kmalloc(sizeof(*alg), GFP_KERNEL);
+        alg = kzalloc(sizeof(*alg), GFP_KERNEL);
         if (alg == NULL)
                 return -ENOMEM;
 
-        memset(alg, 0, sizeof(*alg));
         alg->ops = ops;
 
         spin_lock_irqsave(&hcrypt->lock, flags);
@@ -120,8 +121,9 @@ int rtllib_register_crypto_ops(struct rtllib_crypto_ops *ops)
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_register_crypto_ops);
 
-int rtllib_unregister_crypto_ops(struct rtllib_crypto_ops *ops)
+int rtllib_unregister_crypto_ops(struct lib80211_crypto_ops *ops)
 {
         unsigned long flags;
         struct list_head *ptr;
@@ -150,9 +152,10 @@ int rtllib_unregister_crypto_ops(struct rtllib_crypto_ops *ops)
 
         return del_alg ? 0 : -1;
 }
+EXPORT_SYMBOL(rtllib_unregister_crypto_ops);
 
 
-struct rtllib_crypto_ops *rtllib_get_crypto_ops(const char *name)
+struct lib80211_crypto_ops *rtllib_get_crypto_ops(const char *name)
 {
         unsigned long flags;
         struct list_head *ptr;
@@ -177,12 +180,13 @@ struct rtllib_crypto_ops *rtllib_get_crypto_ops(const char *name)
         else
                 return NULL;
 }
+EXPORT_SYMBOL(rtllib_get_crypto_ops);
 
 
 static void * rtllib_crypt_null_init(int keyidx) { return (void *) 1; }
 static void rtllib_crypt_null_deinit(void *priv) {}
 
-static struct rtllib_crypto_ops rtllib_crypt_null = {
+static struct lib80211_crypto_ops rtllib_crypt_null = {
         .name                   = "NULL",
         .init                   = rtllib_crypt_null_init,
         .deinit                 = rtllib_crypt_null_deinit,
@@ -192,8 +196,10 @@ static struct rtllib_crypto_ops rtllib_crypt_null = {
         .decrypt_msdu           = NULL,
         .set_key                = NULL,
         .get_key                = NULL,
-        .extra_prefix_len       = 0,
-        .extra_postfix_len      = 0,
+        .extra_mpdu_prefix_len  = 0,
+        .extra_mpdu_postfix_len = 0,
+        .extra_msdu_prefix_len  = 0,
+        .extra_msdu_postfix_len = 0,
         .owner                  = THIS_MODULE,
 };
 
@@ -202,15 +208,14 @@ int __init rtllib_crypto_init(void)
 {
         int ret = -ENOMEM;
 
-        hcrypt = kmalloc(sizeof(*hcrypt), GFP_KERNEL);
+        hcrypt = kzalloc(sizeof(*hcrypt), GFP_KERNEL);
         if (!hcrypt)
                 goto out;
 
-        memset(hcrypt, 0, sizeof(*hcrypt));
         INIT_LIST_HEAD(&hcrypt->algs);
         spin_lock_init(&hcrypt->lock);
 
-        ret = rtllib_register_crypto_ops(&rtllib_crypt_null);
+        ret = lib80211_register_crypto_ops(&rtllib_crypt_null);
         if (ret < 0) {
                 kfree(hcrypt);
                 hcrypt = NULL;
@@ -239,3 +244,8 @@ void __exit rtllib_crypto_deinit(void)
 
         kfree(hcrypt);
 }
+
+module_init(rtllib_crypto_init);
+module_exit(rtllib_crypto_deinit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/rtl8192e/rtllib_crypt.h b/drivers/staging/rtl8192e/rtllib_crypt.h
index 49b90b73ed9c..e177c9287b44 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt.h
+++ b/drivers/staging/rtl8192e/rtllib_crypt.h
@@ -25,61 +25,11 @@
 
 #include <linux/skbuff.h>
 
-struct rtllib_crypto_ops {
-        const char *name;
-
-        /* init new crypto context (e.g., allocate private data space,
-         * select IV, etc.); returns NULL on failure or pointer to allocated
-         * private data on success */
-        void * (*init)(int keyidx);
-
-        /* deinitialize crypto context and free allocated private data */
-        void (*deinit)(void *priv);
-
-        /* encrypt/decrypt return < 0 on error or >= 0 on success. The return
-         * value from decrypt_mpdu is passed as the keyidx value for
-         * decrypt_msdu. skb must have enough head and tail room for the
-         * encryption; if not, error will be returned; these functions are
-         * called for all MPDUs (i.e., fragments).
-         */
-        int (*encrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv);
-        int (*decrypt_mpdu)(struct sk_buff *skb, int hdr_len, void *priv);
-
-        /* These functions are called for full MSDUs, i.e. full frames.
-         * These can be NULL if full MSDU operations are not needed. */
-        int (*encrypt_msdu)(struct sk_buff *skb, int hdr_len, void *priv);
-        int (*decrypt_msdu)(struct sk_buff *skb, int keyidx, int hdr_len,
-                            void *priv, struct rtllib_device* ieee);
-
-        int (*set_key)(void *key, int len, u8 *seq, void *priv);
-        int (*get_key)(void *key, int len, u8 *seq, void *priv);
-
-        /* procfs handler for printing out key information and possible
-         * statistics */
-        char * (*print_stats)(char *p, void *priv);
-
-        /* maximum number of bytes added by encryption; encrypt buf is
-         * allocated with extra_prefix_len bytes, copy of in_buf, and
-         * extra_postfix_len; encrypt need not use all this space, but
-         * the result must start at the beginning of the struct buffer and
-         * correct length must be returned */
-        int extra_prefix_len, extra_postfix_len;
-
-        struct module *owner;
-};
-
-struct rtllib_crypt_data {
-        struct list_head list; /* delayed deletion list */
-        struct rtllib_crypto_ops *ops;
-        void *priv;
-        atomic_t refcnt;
-};
-
-int rtllib_register_crypto_ops(struct rtllib_crypto_ops *ops);
-int rtllib_unregister_crypto_ops(struct rtllib_crypto_ops *ops);
-struct rtllib_crypto_ops *rtllib_get_crypto_ops(const char *name);
-void rtllib_crypt_deinit_entries(struct rtllib_device *, int);
-void rtllib_crypt_deinit_handler(unsigned long);
-void rtllib_crypt_delayed_deinit(struct rtllib_device *ieee,
-                                 struct rtllib_crypt_data **crypt);
+int rtllib_register_crypto_ops(struct lib80211_crypto_ops *ops);
+int rtllib_unregister_crypto_ops(struct lib80211_crypto_ops *ops);
+struct lib80211_crypto_ops *rtllib_get_crypto_ops(const char *name);
+void rtllib_crypt_deinit_entries(struct lib80211_crypt_info *info, int force);
+void rtllib_crypt_deinit_handler(unsigned long data);
+void rtllib_crypt_delayed_deinit(struct lib80211_crypt_info *info,
+                                 struct lib80211_crypt_data **crypt);
 #endif
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
index 6196b9aa3a09..4217b88e6fc3 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
@@ -9,7 +9,6 @@
  * more details.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -63,10 +62,9 @@ static void *rtllib_ccmp_init(int key_idx)
 {
         struct rtllib_ccmp_data *priv;
 
-        priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+        priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
         if (priv == NULL)
                 goto fail;
-        memset(priv, 0, sizeof(*priv));
         priv->key_idx = key_idx;
 
         priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
@@ -429,13 +427,8 @@ static char *rtllib_ccmp_print_stats(char *p, void *priv)
         return p;
 }
 
-void rtllib_ccmp_null(void)
-{
-        return;
-}
-
-static struct rtllib_crypto_ops rtllib_crypt_ccmp = {
-        .name                   = "CCMP",
+static struct lib80211_crypto_ops rtllib_crypt_ccmp = {
+        .name                   = "R-CCMP",
         .init                   = rtllib_ccmp_init,
         .deinit                 = rtllib_ccmp_deinit,
         .encrypt_mpdu           = rtllib_ccmp_encrypt,
@@ -445,19 +438,24 @@ static struct rtllib_crypto_ops rtllib_crypt_ccmp = {
         .set_key                = rtllib_ccmp_set_key,
         .get_key                = rtllib_ccmp_get_key,
         .print_stats            = rtllib_ccmp_print_stats,
-        .extra_prefix_len       = CCMP_HDR_LEN,
-        .extra_postfix_len      = CCMP_MIC_LEN,
+        .extra_mpdu_prefix_len = CCMP_HDR_LEN,
+        .extra_mpdu_postfix_len = CCMP_MIC_LEN,
         .owner                  = THIS_MODULE,
 };
 
 
 int __init rtllib_crypto_ccmp_init(void)
 {
-        return rtllib_register_crypto_ops(&rtllib_crypt_ccmp);
+        return lib80211_register_crypto_ops(&rtllib_crypt_ccmp);
 }
 
 
 void __exit rtllib_crypto_ccmp_exit(void)
 {
-        rtllib_unregister_crypto_ops(&rtllib_crypt_ccmp);
+        lib80211_unregister_crypto_ops(&rtllib_crypt_ccmp);
 }
+
+module_init(rtllib_crypto_ccmp_init);
+module_exit(rtllib_crypto_ccmp_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
index 6a0c87886422..800925053fb0 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_tkip.c
@@ -9,7 +9,6 @@
  * more details.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -60,10 +59,9 @@ static void *rtllib_tkip_init(int key_idx)
 {
         struct rtllib_tkip_data *priv;
 
-        priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+        priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
         if (priv == NULL)
                 goto fail;
-        memset(priv, 0, sizeof(*priv));
         priv->key_idx = key_idx;
         priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
                         CRYPTO_ALG_ASYNC);
@@ -598,8 +596,7 @@ static void rtllib_michael_mic_failure(struct net_device *dev,
 }
 
 static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx,
-                                     int hdr_len, void *priv,
-                                     struct rtllib_device *ieee)
+                                     int hdr_len, void *priv)
 {
         struct rtllib_tkip_data *tkey = priv;
         u8 mic[8];
@@ -618,23 +615,20 @@ static int rtllib_michael_mic_verify(struct sk_buff *skb, int keyidx,
                         skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
                 return -1;
 
-        if ((memcmp(mic, skb->data + skb->len - 8, 8) != 0) ||
-           (ieee->force_mic_error)) {
+        if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {
                 struct rtllib_hdr_4addr *hdr;
                 hdr = (struct rtllib_hdr_4addr *) skb->data;
                 printk(KERN_DEBUG "%s: Michael MIC verification failed for "
                        "MSDU from %pM keyidx=%d\n",
                        skb->dev ? skb->dev->name : "N/A", hdr->addr2,
                        keyidx);
-                printk(KERN_DEBUG "%d, force_mic_error = %d\n",
-                       (memcmp(mic, skb->data + skb->len - 8, 8) != 0),\
-                        ieee->force_mic_error);
+                printk(KERN_DEBUG "%d\n",
+                       memcmp(mic, skb->data + skb->len - 8, 8) != 0);
                 if (skb->dev) {
                         printk(KERN_INFO "skb->dev != NULL\n");
                         rtllib_michael_mic_failure(skb->dev, hdr, keyidx);
                 }
                 tkey->dot11RSNAStatsTKIPLocalMICFailures++;
-                ieee->force_mic_error = false;
                 return -1;
         }
 
@@ -740,9 +734,8 @@ static char *rtllib_tkip_print_stats(char *p, void *priv)
         return p;
 }
 
-
-static struct rtllib_crypto_ops rtllib_crypt_tkip = {
-        .name                   = "TKIP",
+static struct lib80211_crypto_ops rtllib_crypt_tkip = {
+        .name                   = "R-TKIP",
         .init                   = rtllib_tkip_init,
         .deinit                 = rtllib_tkip_deinit,
         .encrypt_mpdu           = rtllib_tkip_encrypt,
@@ -752,24 +745,25 @@ static struct rtllib_crypto_ops rtllib_crypt_tkip = {
         .set_key                = rtllib_tkip_set_key,
         .get_key                = rtllib_tkip_get_key,
         .print_stats            = rtllib_tkip_print_stats,
-        .extra_prefix_len       = 4 + 4, /* IV + ExtIV */
-        .extra_postfix_len      = 8 + 4, /* MIC + ICV */
+        .extra_mpdu_prefix_len = 4 + 4, /* IV + ExtIV */
+        .extra_mpdu_postfix_len = 4,    /* ICV */
+        .extra_msdu_postfix_len = 8,    /* MIC */
         .owner                  = THIS_MODULE,
 };
 
 
 int __init rtllib_crypto_tkip_init(void)
 {
-        return rtllib_register_crypto_ops(&rtllib_crypt_tkip);
+        return lib80211_register_crypto_ops(&rtllib_crypt_tkip);
 }
 
 
 void __exit rtllib_crypto_tkip_exit(void)
 {
-        rtllib_unregister_crypto_ops(&rtllib_crypt_tkip);
+        lib80211_unregister_crypto_ops(&rtllib_crypt_tkip);
 }
 
-void rtllib_tkip_null(void)
-{
-        return;
-}
+module_init(rtllib_crypto_tkip_init);
+module_exit(rtllib_crypto_tkip_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_wep.c b/drivers/staging/rtl8192e/rtllib_crypt_wep.c
index c59bf10fe780..8cdf38913a33 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_wep.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_wep.c
@@ -9,7 +9,6 @@
  * more details.
  */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -38,10 +37,9 @@ static void *prism2_wep_init(int keyidx)
 {
         struct prism2_wep_data *priv;
 
-        priv = kmalloc(sizeof(*priv), GFP_ATOMIC);
+        priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
         if (priv == NULL)
                 goto fail;
-        memset(priv, 0, sizeof(*priv));
         priv->key_idx = keyidx;
 
         priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
@@ -257,9 +255,8 @@ static char *prism2_wep_print_stats(char *p, void *priv)
         return p;
 }
 
-
-static struct rtllib_crypto_ops rtllib_crypt_wep = {
-        .name                   = "WEP",
+static struct lib80211_crypto_ops rtllib_crypt_wep = {
+        .name                   = "R-WEP",
         .init                   = prism2_wep_init,
         .deinit                 = prism2_wep_deinit,
         .encrypt_mpdu           = prism2_wep_encrypt,
@@ -269,24 +266,24 @@ static struct rtllib_crypto_ops rtllib_crypt_wep = {
         .set_key                = prism2_wep_set_key,
         .get_key                = prism2_wep_get_key,
         .print_stats            = prism2_wep_print_stats,
-        .extra_prefix_len       = 4, /* IV */
-        .extra_postfix_len      = 4, /* ICV */
+        .extra_mpdu_prefix_len  = 4,    /* IV */
+        .extra_mpdu_postfix_len = 4,    /* ICV */
         .owner                  = THIS_MODULE,
 };
 
 
 int __init rtllib_crypto_wep_init(void)
 {
-        return rtllib_register_crypto_ops(&rtllib_crypt_wep);
+        return lib80211_register_crypto_ops(&rtllib_crypt_wep);
 }
 
 
 void __exit rtllib_crypto_wep_exit(void)
 {
-        rtllib_unregister_crypto_ops(&rtllib_crypt_wep);
+        lib80211_unregister_crypto_ops(&rtllib_crypt_wep);
 }
 
-void rtllib_wep_null(void)
-{
-        return;
-}
+module_init(rtllib_crypto_wep_init);
+module_exit(rtllib_crypto_wep_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/rtl8192e/rtllib_debug.h b/drivers/staging/rtl8192e/rtllib_debug.h
new file mode 100644
index 000000000000..2bfc1155f505
--- /dev/null
+++ b/drivers/staging/rtl8192e/rtllib_debug.h
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved.
+ *
+ * Based on the r8180 driver, which is:
+ * Copyright 2004-2005 Andrea Merello <andreamrl@tiscali.it>, et al.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * The full GNU General Public License is included in this distribution in the
+ * file called LICENSE.
+ *
+ * Contact Information:
+ * wlanfae <wlanfae@realtek.com>
+******************************************************************************/
+#ifndef _RTL_DEBUG_H
+#define _RTL_DEBUG_H
+
+/* Allow files to override DRV_NAME */
+#ifndef DRV_NAME
+#define DRV_NAME "rtllib_92e"
+#endif
+
+#define DMESG(x, a...)
+
+extern u32 rt_global_debug_component;
+
+/* These are the defines for rt_global_debug_component */
+enum RTL_DEBUG {
+        COMP_TRACE              = (1 << 0),
+        COMP_DBG                = (1 << 1),
+        COMP_INIT               = (1 << 2),
+        COMP_RECV               = (1 << 3),
+        COMP_SEND               = (1 << 4),
+        COMP_CMD                = (1 << 5),
+        COMP_POWER              = (1 << 6),
+        COMP_EPROM              = (1 << 7),
+        COMP_SWBW               = (1 << 8),
+        COMP_SEC                = (1 << 9),
+        COMP_LPS                = (1 << 10),
+        COMP_QOS                = (1 << 11),
+        COMP_RATE               = (1 << 12),
+        COMP_RXDESC             = (1 << 13),
+        COMP_PHY                = (1 << 14),
+        COMP_DIG                = (1 << 15),
+        COMP_TXAGC              = (1 << 16),
+        COMP_HALDM              = (1 << 17),
+        COMP_POWER_TRACKING     = (1 << 18),
+        COMP_CH                 = (1 << 19),
+        COMP_RF                 = (1 << 20),
+        COMP_FIRMWARE           = (1 << 21),
+        COMP_HT                 = (1 << 22),
+        COMP_RESET              = (1 << 23),
+        COMP_CMDPKT             = (1 << 24),
+        COMP_SCAN               = (1 << 25),
+        COMP_PS                 = (1 << 26),
+        COMP_DOWN               = (1 << 27),
+        COMP_INTR               = (1 << 28),
+        COMP_LED                = (1 << 29),
+        COMP_MLME               = (1 << 30),
+        COMP_ERR                = (1 << 31)
+};
+
+#define RT_TRACE(component, x, args...)         \
+do {                    \
+        if (rt_global_debug_component & component) \
+                printk(KERN_DEBUG DRV_NAME ":" x "\n" , \
+                       ##args);\
+} while (0);
+
+#define assert(expr) \
+        if (!(expr)) {                            \
+                printk(KERN_INFO "Assertion failed! %s,%s,%s,line=%d\n", \
+                #expr, __FILE__, __func__, __LINE__);     \
+        }
+
+#endif
diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index c36a140a4568..f9dae958a5d4 100644
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -45,7 +45,6 @@
 #include <linux/slab.h>
 #include <linux/tcp.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
 #include <linux/uaccess.h>
@@ -54,7 +53,9 @@
 #include "rtllib.h"
 
 
-#define DRV_NAME "rtllib_92e"
+u32 rt_global_debug_component = COMP_ERR;
+EXPORT_SYMBOL(rt_global_debug_component);
+
 
 void _setup_timer(struct timer_list *ptimer, void *fun, unsigned long data)
 {
@@ -135,10 +136,6 @@ struct net_device *alloc_rtllib(int sizeof_priv)
         ieee->host_decrypt = 1;
         ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
 
-        INIT_LIST_HEAD(&ieee->crypt_deinit_list);
-        _setup_timer(&ieee->crypt_deinit_timer,
-                    rtllib_crypt_deinit_handler,
-                    (unsigned long) ieee);
         ieee->rtllib_ap_sec_type = rtllib_ap_sec_type;
 
         spin_lock_init(&ieee->lock);
@@ -148,6 +145,9 @@ struct net_device *alloc_rtllib(int sizeof_priv)
         atomic_set(&(ieee->atm_chnlop), 0);
         atomic_set(&(ieee->atm_swbw), 0);
 
+        /* SAM FIXME */
+        lib80211_crypt_info_init(&ieee->crypt_info, "RTLLIB", &ieee->lock);
+
         ieee->bHalfNMode = false;
         ieee->wpa_enabled = 0;
         ieee->tkip_countermeasures = 0;
@@ -177,10 +177,6 @@ struct net_device *alloc_rtllib(int sizeof_priv)
                 ieee->last_packet_time[i] = 0;
         }
 
-        rtllib_tkip_null();
-        rtllib_wep_null();
-        rtllib_ccmp_null();
-
         return dev;
 
  failed:
@@ -188,32 +184,23 @@ struct net_device *alloc_rtllib(int sizeof_priv)
                 free_netdev(dev);
         return NULL;
 }
+EXPORT_SYMBOL(alloc_rtllib);
 
 void free_rtllib(struct net_device *dev)
 {
         struct rtllib_device *ieee = (struct rtllib_device *)
                                       netdev_priv_rsl(dev);
-        int i;
 
         kfree(ieee->pHTInfo);
         ieee->pHTInfo = NULL;
         rtllib_softmac_free(ieee);
-        del_timer_sync(&ieee->crypt_deinit_timer);
-        rtllib_crypt_deinit_entries(ieee, 1);
-
-        for (i = 0; i < WEP_KEYS; i++) {
-                struct rtllib_crypt_data *crypt = ieee->crypt[i];
-                if (crypt) {
-                        if (crypt->ops)
-                                crypt->ops->deinit(crypt->priv);
-                        kfree(crypt);
-                        ieee->crypt[i] = NULL;
-                }
-        }
+
+        lib80211_crypt_info_free(&ieee->crypt_info);
 
         rtllib_networks_free(ieee);
         free_netdev(dev);
 }
+EXPORT_SYMBOL(free_rtllib);
 
 u32 rtllib_debug_level;
 static int debug = \
@@ -287,3 +274,8 @@ void __exit rtllib_exit(void)
                 rtllib_proc = NULL;
         }
 }
+
+module_init(rtllib_init);
+module_exit(rtllib_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index 8d0af5ed8ecf..6c5061f12bad 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -36,7 +36,6 @@
 #include <linux/slab.h>
 #include <linux/tcp.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
 #include <linux/uaccess.h>
@@ -281,7 +280,7 @@ static int rtllib_is_eapol_frame(struct rtllib_device *ieee,
 /* Called only as a tasklet (software IRQ), by rtllib_rx */
 static inline int
 rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
-                        struct rtllib_crypt_data *crypt)
+                        struct lib80211_crypt_data *crypt)
 {
         struct rtllib_hdr_4addr *hdr;
         int res, hdrlen;
@@ -322,7 +321,7 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
 /* Called only as a tasklet (software IRQ), by rtllib_rx */
 static inline int
 rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
-                             int keyidx, struct rtllib_crypt_data *crypt)
+                             int keyidx, struct lib80211_crypt_data *crypt)
 {
         struct rtllib_hdr_4addr *hdr;
         int res, hdrlen;
@@ -341,7 +340,7 @@ rtllib_rx_frame_decrypt_msdu(struct rtllib_device *ieee, struct sk_buff *skb,
         hdrlen = rtllib_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
 
         atomic_inc(&crypt->refcnt);
-        res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv, ieee);
+        res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
                 printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
@@ -1010,7 +1009,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,
 }
 
 static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
-                        struct rtllib_crypt_data **crypt, size_t hdrlen)
+                        struct lib80211_crypt_data **crypt, size_t hdrlen)
 {
         struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
         u16 fc = le16_to_cpu(hdr->frame_ctl);
@@ -1020,7 +1019,7 @@ static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
                 if (skb->len >= hdrlen + 3)
                         idx = skb->data[hdrlen + 3] >> 6;
 
-                *crypt = ieee->crypt[idx];
+                *crypt = ieee->crypt_info.crypt[idx];
                 /* allow NULL decrypt to indicate an station specific override
                  * for default encryption */
                 if (*crypt && ((*crypt)->ops == NULL ||
@@ -1045,7 +1044,7 @@ static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
 
 static int rtllib_rx_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
                       struct rtllib_rx_stats *rx_stats,
-                      struct rtllib_crypt_data *crypt, size_t hdrlen)
+                      struct lib80211_crypt_data *crypt, size_t hdrlen)
 {
         struct rtllib_hdr_4addr *hdr;
         int keyidx = 0;
@@ -1253,7 +1252,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
 {
         struct net_device *dev = ieee->dev;
         struct rtllib_hdr_4addr *hdr = (struct rtllib_hdr_4addr *)skb->data;
-        struct rtllib_crypt_data *crypt = NULL;
+        struct lib80211_crypt_data *crypt = NULL;
         struct rtllib_rxb *rxb = NULL;
         struct rx_ts_record *pTS = NULL;
         u16 fc, sc, SeqNum = 0;
@@ -1497,6 +1496,7 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb,
         ieee->stats.rx_dropped++;
         return 0;
 }
+EXPORT_SYMBOL(rtllib_rx);
 
 static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 };
 
@@ -2492,7 +2492,7 @@ static int IsPassiveChannel(struct rtllib_device *rtllib, u8 channel)
         return 0;
 }
 
-int IsLegalChannel(struct rtllib_device *rtllib, u8 channel)
+int rtllib_legal_channel(struct rtllib_device *rtllib, u8 channel)
 {
         if (MAX_CHANNEL_NUMBER < channel) {
                 printk(KERN_INFO "%s(): Invalid Channel\n", __func__);
@@ -2503,6 +2503,7 @@ int IsLegalChannel(struct rtllib_device *rtllib, u8 channel)
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_legal_channel);
 
 static inline void rtllib_process_probe_response(
         struct rtllib_device *ieee,
@@ -2553,7 +2554,7 @@ static inline void rtllib_process_probe_response(
         }
 
 
-        if (!IsLegalChannel(ieee, network->channel))
+        if (!rtllib_legal_channel(ieee, network->channel))
                 goto free_network;
 
         if (WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index b5086850f0de..1637f1110991 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -15,11 +15,9 @@
 
 
 #include "rtllib.h"
-#include "rtl_core.h"
 
 #include <linux/random.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/uaccess.h>
 #include "dot11d.h"
 
@@ -28,9 +26,9 @@ short rtllib_is_54g(struct rtllib_network *net)
         return (net->rates_ex_len > 0) || (net->rates_len > 4);
 }
 
-short rtllib_is_shortslot(struct rtllib_network net)
+short rtllib_is_shortslot(const struct rtllib_network *net)
 {
-        return net.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME;
+        return net->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME;
 }
 
 /* returns the total length needed for pleacing the RATE MFIE
@@ -468,6 +466,7 @@ void rtllib_EnableIntelPromiscuousMode(struct net_device *dev,
 
         ieee->bNetPromiscuousMode = true;
 }
+EXPORT_SYMBOL(rtllib_EnableIntelPromiscuousMode);
 
 
 /*
@@ -490,6 +489,7 @@ void rtllib_DisableIntelPromiscuousMode(struct net_device *dev,
 
         ieee->bNetPromiscuousMode = false;
 }
+EXPORT_SYMBOL(rtllib_DisableIntelPromiscuousMode);
 
 static void rtllib_send_probe(struct rtllib_device *ieee, u8 is_mesh)
 {
@@ -685,6 +685,7 @@ void rtllib_stop_send_beacons(struct rtllib_device *ieee)
         if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
                 rtllib_beacons_stop(ieee);
 }
+EXPORT_SYMBOL(rtllib_stop_send_beacons);
 
 
 void rtllib_start_send_beacons(struct rtllib_device *ieee)
@@ -694,6 +695,7 @@ void rtllib_start_send_beacons(struct rtllib_device *ieee)
         if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
                 rtllib_beacons_start(ieee);
 }
+EXPORT_SYMBOL(rtllib_start_send_beacons);
 
 
 static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)
@@ -719,6 +721,7 @@ void rtllib_stop_scan(struct rtllib_device *ieee)
                         ieee->rtllib_stop_hw_scan(ieee->dev);
         }
 }
+EXPORT_SYMBOL(rtllib_stop_scan);
 
 void rtllib_stop_scan_syncro(struct rtllib_device *ieee)
 {
@@ -729,6 +732,7 @@ void rtllib_stop_scan_syncro(struct rtllib_device *ieee)
                         ieee->rtllib_stop_hw_scan(ieee->dev);
         }
 }
+EXPORT_SYMBOL(rtllib_stop_scan_syncro);
 
 bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan)
 {
@@ -741,6 +745,7 @@ bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan)
                 return test_bit(STATUS_SCANNING, &ieee->status);
         }
 }
+EXPORT_SYMBOL(rtllib_act_scanning);
 
 /* called with ieee->lock held */
 static void rtllib_start_scan(struct rtllib_device *ieee)
@@ -781,6 +786,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh)
                         ieee->rtllib_start_hw_scan(ieee->dev);
         }
 }
+EXPORT_SYMBOL(rtllib_start_scan_syncro);
 
 inline struct sk_buff *rtllib_authentication_req(struct rtllib_network *beacon,
         struct rtllib_device *ieee, int challengelen, u8 *daddr)
@@ -830,7 +836,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest)
         struct sk_buff *skb = NULL;
         int encrypt;
         int atim_len, erp_len;
-        struct rtllib_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
 
         char *ssid = ieee->current_network.ssid;
         int ssid_len = ieee->current_network.ssid_len;
@@ -865,9 +871,9 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest)
         } else
                 erp_len = 0;
 
-        crypt = ieee->crypt[ieee->tx_keyidx];
+        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
         encrypt = ieee->host_encrypt && crypt && crypt->ops &&
-                ((0 == strcmp(crypt->ops->name, "WEP") || wpa_ie_len));
+                ((0 == strcmp(crypt->ops->name, "R-WEP") || wpa_ie_len));
         if (ieee->pHTInfo->bCurrentHTSupport) {
                 tmp_ht_cap_buf = (u8 *) &(ieee->pHTInfo->SelfHTCap);
                 tmp_ht_cap_len = sizeof(ieee->pHTInfo->SelfHTCap);
@@ -917,7 +923,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, u8 *dest)
                 cpu_to_le16((beacon_buf->capability |=
                                  WLAN_CAPABILITY_SHORT_SLOT_TIME));
 
-        crypt = ieee->crypt[ieee->tx_keyidx];
+        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
         if (encrypt)
                 beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
 
@@ -976,7 +982,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest)
         struct sk_buff *skb;
         u8 *tag;
 
-        struct rtllib_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
         struct rtllib_assoc_response_frame *assoc;
         short encrypt;
 
@@ -1007,7 +1013,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_device *ieee, u8 *dest)
                                  cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME);
 
         if (ieee->host_encrypt)
-                crypt = ieee->crypt[ieee->tx_keyidx];
+                crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
         else
                 crypt = NULL;
 
@@ -1172,7 +1178,7 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,
         unsigned int ckip_ie_len = 0;
         unsigned int ccxrm_ie_len = 0;
         unsigned int cxvernum_ie_len = 0;
-        struct rtllib_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
         int encrypt;
         int     PMKCacheIdx;
 
@@ -1185,10 +1191,10 @@ inline struct sk_buff *rtllib_association_req(struct rtllib_network *beacon,
         unsigned int turbo_info_len = beacon->Turbo_Enable ? 9 : 0;
 
         int len = 0;
-        crypt = ieee->crypt[ieee->tx_keyidx];
+        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
         if (crypt != NULL)
                 encrypt = ieee->host_encrypt && crypt && crypt->ops &&
-                          ((0 == strcmp(crypt->ops->name, "WEP") ||
+                          ((0 == strcmp(crypt->ops->name, "R-WEP") ||
                           wpa_ie_len));
         else
                 encrypt = 0;
@@ -1956,6 +1962,7 @@ void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr)
         if (buf)
                 softmac_ps_mgmt_xmit(buf, ieee);
 }
+EXPORT_SYMBOL(rtllib_sta_ps_send_null_frame);
 
 void rtllib_sta_ps_send_pspoll_frame(struct rtllib_device *ieee)
 {
@@ -2168,6 +2175,7 @@ void rtllib_ps_tx_ack(struct rtllib_device *ieee, short success)
         }
         spin_unlock_irqrestore(&ieee->lock, flags);
 }
+EXPORT_SYMBOL(rtllib_ps_tx_ack);
 
 static void rtllib_process_action(struct rtllib_device *ieee, struct sk_buff *skb)
 {
@@ -2540,6 +2548,7 @@ void rtllib_reset_queue(struct rtllib_device *ieee)
         spin_unlock_irqrestore(&ieee->lock, flags);
 
 }
+EXPORT_SYMBOL(rtllib_reset_queue);
 
 void rtllib_wake_queue(struct rtllib_device *ieee)
 {
@@ -2928,6 +2937,7 @@ struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee)
 
         return skb;
 }
+EXPORT_SYMBOL(rtllib_get_beacon);
 
 void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag,
                                   u8 shutdown)
@@ -2937,6 +2947,7 @@ void rtllib_softmac_stop_protocol(struct rtllib_device *ieee, u8 mesh_flag,
         rtllib_stop_protocol(ieee, shutdown);
         up(&ieee->wx_sem);
 }
+EXPORT_SYMBOL(rtllib_softmac_stop_protocol);
 
 
 void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown)
@@ -2985,6 +2996,7 @@ void rtllib_softmac_start_protocol(struct rtllib_device *ieee, u8 mesh_flag)
         rtllib_start_protocol(ieee);
         up(&ieee->wx_sem);
 }
+EXPORT_SYMBOL(rtllib_softmac_start_protocol);
 
 void rtllib_start_protocol(struct rtllib_device *ieee)
 {
@@ -3048,10 +3060,9 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
         ieee->state = RTLLIB_NOLINK;
         for (i = 0; i < 5; i++)
                 ieee->seq_ctrl[i] = 0;
-        ieee->pDot11dInfo = kmalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);
+        ieee->pDot11dInfo = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);
         if (!ieee->pDot11dInfo)
                 RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for DOT11D\n");
-        memset(ieee->pDot11dInfo, 0, sizeof(struct rt_dot11d_info));
         ieee->LinkDetectInfo.SlotIndex = 0;
         ieee->LinkDetectInfo.SlotNum = 2;
         ieee->LinkDetectInfo.NumRecvBcnInPeriod = 0;
@@ -3207,11 +3218,11 @@ static int rtllib_wpa_set_wpa_ie(struct rtllib_device *ieee,
                 return -EINVAL;
 
         if (param->u.wpa_ie.len) {
-                buf = kmalloc(param->u.wpa_ie.len, GFP_KERNEL);
+                buf = kmemdup(param->u.wpa_ie.data, param->u.wpa_ie.len,
+                              GFP_KERNEL);
                 if (buf == NULL)
                         return -ENOMEM;
 
-                memcpy(buf, param->u.wpa_ie.data, param->u.wpa_ie.len);
                 kfree(ieee->wpa_ie);
                 ieee->wpa_ie = buf;
                 ieee->wpa_ie_len = param->u.wpa_ie.len;
@@ -3334,8 +3345,8 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
                                   u8 is_mesh)
 {
         int ret = 0;
-        struct rtllib_crypto_ops *ops;
-        struct rtllib_crypt_data **crypt;
+        struct lib80211_crypto_ops *ops;
+        struct lib80211_crypt_data **crypt;
 
         struct rtllib_security sec = {
                 .flags = 0,
@@ -3354,9 +3365,9 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
         if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
             param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
             param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
-                if (param->u.crypt.idx >= WEP_KEYS)
+                if (param->u.crypt.idx >= NUM_WEP_KEYS)
                         return -EINVAL;
-                crypt = &ieee->crypt[param->u.crypt.idx];
+                crypt = &ieee->crypt_info.crypt[param->u.crypt.idx];
         } else {
                 return -EINVAL;
         }
@@ -3366,7 +3377,7 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
                         sec.enabled = 0;
                         sec.level = SEC_LEVEL_0;
                         sec.flags |= SEC_ENABLED | SEC_LEVEL;
-                        rtllib_crypt_delayed_deinit(ieee, crypt);
+                        lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
                 }
                 goto done;
         }
@@ -3375,19 +3386,19 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
 
         /* IPW HW cannot build TKIP MIC, host decryption still needed. */
         if (!(ieee->host_encrypt || ieee->host_decrypt) &&
-            strcmp(param->u.crypt.alg, "TKIP"))
+            strcmp(param->u.crypt.alg, "R-TKIP"))
                 goto skip_host_crypt;
 
-        ops = rtllib_get_crypto_ops(param->u.crypt.alg);
-        if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
+        ops = lib80211_get_crypto_ops(param->u.crypt.alg);
+        if (ops == NULL && strcmp(param->u.crypt.alg, "R-WEP") == 0) {
                 request_module("rtllib_crypt_wep");
-                ops = rtllib_get_crypto_ops(param->u.crypt.alg);
-        } else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
+                ops = lib80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "R-TKIP") == 0) {
                 request_module("rtllib_crypt_tkip");
-                ops = rtllib_get_crypto_ops(param->u.crypt.alg);
-        } else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
+                ops = lib80211_get_crypto_ops(param->u.crypt.alg);
+        } else if (ops == NULL && strcmp(param->u.crypt.alg, "R-CCMP") == 0) {
                 request_module("rtllib_crypt_ccmp");
-                ops = rtllib_get_crypto_ops(param->u.crypt.alg);
+                ops = lib80211_get_crypto_ops(param->u.crypt.alg);
         }
         if (ops == NULL) {
                 printk(KERN_INFO "unknown crypto alg '%s'\n",
@@ -3397,17 +3408,17 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
                 goto done;
         }
         if (*crypt == NULL || (*crypt)->ops != ops) {
-                struct rtllib_crypt_data *new_crypt;
+                struct lib80211_crypt_data *new_crypt;
 
-                rtllib_crypt_delayed_deinit(ieee, crypt);
+                lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
 
-                new_crypt = (struct rtllib_crypt_data *)
+                new_crypt = (struct lib80211_crypt_data *)
                         kmalloc(sizeof(*new_crypt), GFP_KERNEL);
                 if (new_crypt == NULL) {
                         ret = -ENOMEM;
                         goto done;
                 }
-                memset(new_crypt, 0, sizeof(struct rtllib_crypt_data));
+                memset(new_crypt, 0, sizeof(struct lib80211_crypt_data));
                 new_crypt->ops = ops;
                 if (new_crypt->ops)
                         new_crypt->priv =
@@ -3435,7 +3446,7 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
 
  skip_host_crypt:
         if (param->u.crypt.set_tx) {
-                ieee->tx_keyidx = param->u.crypt.idx;
+                ieee->crypt_info.tx_keyidx = param->u.crypt.idx;
                 sec.active_key = param->u.crypt.idx;
                 sec.flags |= SEC_ACTIVE_KEY;
         } else
@@ -3448,13 +3459,13 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
                 sec.key_sizes[param->u.crypt.idx] = param->u.crypt.key_len;
                 sec.flags |= (1 << param->u.crypt.idx);
 
-                if (strcmp(param->u.crypt.alg, "WEP") == 0) {
+                if (strcmp(param->u.crypt.alg, "R-WEP") == 0) {
                         sec.flags |= SEC_LEVEL;
                         sec.level = SEC_LEVEL_1;
-                } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) {
+                } else if (strcmp(param->u.crypt.alg, "R-TKIP") == 0) {
                         sec.flags |= SEC_LEVEL;
                         sec.level = SEC_LEVEL_2;
-                } else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
+                } else if (strcmp(param->u.crypt.alg, "R-CCMP") == 0) {
                         sec.flags |= SEC_LEVEL;
                         sec.level = SEC_LEVEL_3;
                 }
@@ -3551,13 +3562,13 @@ u8 rtllib_ap_sec_type(struct rtllib_device *ieee)
         static u8 ccmp_ie[4] = {0x00, 0x50, 0xf2, 0x04};
         static u8 ccmp_rsn_ie[4] = {0x00, 0x0f, 0xac, 0x04};
         int wpa_ie_len = ieee->wpa_ie_len;
-        struct rtllib_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
         int encrypt;
 
-        crypt = ieee->crypt[ieee->tx_keyidx];
+        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
         encrypt = (ieee->current_network.capability & WLAN_CAPABILITY_PRIVACY)
                   || (ieee->host_encrypt && crypt && crypt->ops &&
-                  (0 == strcmp(crypt->ops->name, "WEP")));
+                  (0 == strcmp(crypt->ops->name, "R-WEP")));
 
         /* simply judge  */
         if (encrypt && (wpa_ie_len == 0)) {
@@ -3634,6 +3645,7 @@ out:
 
         return ret;
 }
+EXPORT_SYMBOL(rtllib_wpa_supplicant_ioctl);
 
 void rtllib_MgntDisconnectIBSS(struct rtllib_device *rtllib)
 {
@@ -3719,6 +3731,7 @@ bool rtllib_MgntDisconnect(struct rtllib_device *rtllib, u8 asRsn)
 
         return true;
 }
+EXPORT_SYMBOL(rtllib_MgntDisconnect);
 
 void notify_wx_assoc_event(struct rtllib_device *ieee)
 {
@@ -3739,3 +3752,4 @@ void notify_wx_assoc_event(struct rtllib_device *ieee)
         }
         wireless_send_event(ieee->dev, SIOCGIWAP, &wrqu, NULL);
 }
+EXPORT_SYMBOL(notify_wx_assoc_event);
diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
index 22988fbd444b..1523bc7a2105 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c
@@ -15,7 +15,6 @@
 
 
 #include "rtllib.h"
-#include "rtl_core.h"
 #include "dot11d.h"
 /* FIXME: add A freqs */
 
@@ -25,6 +24,7 @@ const long rtllib_wlan_frequencies[] = {
         2452, 2457, 2462, 2467,
         2472, 2484
 };
+EXPORT_SYMBOL(rtllib_wlan_frequencies);
 
 
 int rtllib_wx_set_freq(struct rtllib_device *ieee, struct iw_request_info *a,
@@ -82,6 +82,7 @@ out:
         up(&ieee->wx_sem);
         return ret;
 }
+EXPORT_SYMBOL(rtllib_wx_set_freq);
 
 
 int rtllib_wx_get_freq(struct rtllib_device *ieee,
@@ -97,6 +98,7 @@ int rtllib_wx_get_freq(struct rtllib_device *ieee,
         fwrq->e = 1;
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_freq);
 
 int rtllib_wx_get_wap(struct rtllib_device *ieee,
                             struct iw_request_info *info,
@@ -125,6 +127,7 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee,
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_wap);
 
 
 int rtllib_wx_set_wap(struct rtllib_device *ieee,
@@ -184,6 +187,7 @@ out:
         up(&ieee->wx_sem);
         return ret;
 }
+EXPORT_SYMBOL(rtllib_wx_set_wap);
 
 int rtllib_wx_get_essid(struct rtllib_device *ieee, struct iw_request_info *a,
                          union iwreq_data *wrqu, char *b)
@@ -220,6 +224,7 @@ out:
         return ret;
 
 }
+EXPORT_SYMBOL(rtllib_wx_get_essid);
 
 int rtllib_wx_set_rate(struct rtllib_device *ieee,
                              struct iw_request_info *info,
@@ -231,6 +236,7 @@ int rtllib_wx_set_rate(struct rtllib_device *ieee,
         ieee->rate = target_rate/100000;
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_rate);
 
 int rtllib_wx_get_rate(struct rtllib_device *ieee,
                              struct iw_request_info *info,
@@ -243,6 +249,7 @@ int rtllib_wx_get_rate(struct rtllib_device *ieee,
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_rate);
 
 
 int rtllib_wx_set_rts(struct rtllib_device *ieee,
@@ -259,6 +266,7 @@ int rtllib_wx_set_rts(struct rtllib_device *ieee,
         }
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_rts);
 
 int rtllib_wx_get_rts(struct rtllib_device *ieee,
                              struct iw_request_info *info,
@@ -269,6 +277,7 @@ int rtllib_wx_get_rts(struct rtllib_device *ieee,
         wrqu->rts.disabled = (wrqu->rts.value == DEFAULT_RTS_THRESHOLD);
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_rts);
 
 int rtllib_wx_set_mode(struct rtllib_device *ieee, struct iw_request_info *a,
                              union iwreq_data *wrqu, char *b)
@@ -314,6 +323,7 @@ out:
         up(&ieee->wx_sem);
         return set_mode_status;
 }
+EXPORT_SYMBOL(rtllib_wx_set_mode);
 
 void rtllib_wx_sync_scan_wq(void *data)
 {
@@ -428,6 +438,7 @@ out:
         up(&ieee->wx_sem);
         return ret;
 }
+EXPORT_SYMBOL(rtllib_wx_set_scan);
 
 int rtllib_wx_set_essid(struct rtllib_device *ieee,
                         struct iw_request_info *a,
@@ -490,6 +501,7 @@ out:
         up(&ieee->wx_sem);
         return ret;
 }
+EXPORT_SYMBOL(rtllib_wx_set_essid);
 
 int rtllib_wx_get_mode(struct rtllib_device *ieee, struct iw_request_info *a,
                        union iwreq_data *wrqu, char *b)
@@ -497,6 +509,7 @@ int rtllib_wx_get_mode(struct rtllib_device *ieee, struct iw_request_info *a,
         wrqu->mode = ieee->iw_mode;
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_mode);
 
 int rtllib_wx_set_rawtx(struct rtllib_device *ieee,
                         struct iw_request_info *info,
@@ -533,6 +546,7 @@ int rtllib_wx_set_rawtx(struct rtllib_device *ieee,
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_rawtx);
 
 int rtllib_wx_get_name(struct rtllib_device *ieee,
                              struct iw_request_info *info,
@@ -548,6 +562,7 @@ int rtllib_wx_get_name(struct rtllib_device *ieee,
                 strcat(wrqu->name, "n");
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_name);
 
 
 /* this is mostly stolen from hostap */
@@ -605,6 +620,7 @@ exit:
         return ret;
 
 }
+EXPORT_SYMBOL(rtllib_wx_set_power);
 
 /* this is stolen from hostap */
 int rtllib_wx_get_power(struct rtllib_device *ieee,
@@ -643,3 +659,4 @@ exit:
         return ret;
 
 }
+EXPORT_SYMBOL(rtllib_wx_get_power);
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index 44e8006bc1af..f451bfc27a86 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -46,7 +46,6 @@
 #include <linux/slab.h>
 #include <linux/tcp.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/wireless.h>
 #include <linux/etherdevice.h>
 #include <linux/uaccess.h>
@@ -180,10 +179,10 @@ inline int rtllib_put_snap(u8 *data, u16 h_proto)
 int rtllib_encrypt_fragment(struct rtllib_device *ieee, struct sk_buff *frag,
                             int hdr_len)
 {
-        struct rtllib_crypt_data *crypt = NULL;
+        struct lib80211_crypt_data *crypt = NULL;
         int res;
 
-        crypt = ieee->crypt[ieee->tx_keyidx];
+        crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
 
         if (!(crypt && crypt->ops)) {
                 printk(KERN_INFO "=========>%s(), crypt is null\n", __func__);
@@ -569,7 +568,7 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
         };
         u8 dest[ETH_ALEN], src[ETH_ALEN];
         int qos_actived = ieee->current_network.qos_data.active;
-        struct rtllib_crypt_data *crypt = NULL;
+        struct lib80211_crypt_data *crypt = NULL;
         struct cb_desc *tcb_desc;
         u8 bIsMulticast = false;
         u8 IsAmsdu = false;
@@ -646,7 +645,7 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
                 }
 
                 skb->priority = rtllib_classify(skb, IsAmsdu);
-                crypt = ieee->crypt[ieee->tx_keyidx];
+                crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx];
                 encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) &&
                         ieee->host_encrypt && crypt && crypt->ops;
                 if (!encrypt && ieee->ieee802_1x &&
@@ -742,8 +741,10 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
                 /* Each fragment may need to have room for encryptiong
                  * pre/postfix */
                 if (encrypt) {
-                        bytes_per_frag -= crypt->ops->extra_prefix_len +
-                                crypt->ops->extra_postfix_len;
+                        bytes_per_frag -= crypt->ops->extra_mpdu_prefix_len +
+                                crypt->ops->extra_mpdu_postfix_len +
+                                crypt->ops->extra_msdu_prefix_len +
+                                crypt->ops->extra_msdu_postfix_len;
                 }
                 /* Number of fragments is the total bytes_per_frag /
                 * payload_per_fragment */
@@ -791,7 +792,8 @@ int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
                                 else
                                         tcb_desc->bHwSec = 0;
                                 skb_reserve(skb_frag,
-                                            crypt->ops->extra_prefix_len);
+                                            crypt->ops->extra_mpdu_prefix_len +
+                                            crypt->ops->extra_msdu_prefix_len);
                         } else {
                                 tcb_desc->bHwSec = 0;
                         }
@@ -965,3 +967,4 @@ int rtllib_xmit(struct sk_buff *skb, struct net_device *dev)
         memset(skb->cb, 0, sizeof(skb->cb));
         return rtllib_xmit_inter(skb, dev);
 }
+EXPORT_SYMBOL(rtllib_xmit);
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 8cea4a60e1b3..c27ff7edbaf2 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -30,7 +30,6 @@
 
 ******************************************************************************/
 #include <linux/wireless.h>
-#include <linux/version.h>
 #include <linux/kmod.h>
 #include <linux/module.h>
 
@@ -295,6 +294,7 @@ int rtllib_wx_get_scan(struct rtllib_device *ieee,
 
         return err;
 }
+EXPORT_SYMBOL(rtllib_wx_get_scan);
 
 int rtllib_wx_set_encode(struct rtllib_device *ieee,
                             struct iw_request_info *info,
@@ -306,44 +306,44 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
                 .flags = 0
         };
         int i, key, key_provided, len;
-        struct rtllib_crypt_data **crypt;
+        struct lib80211_crypt_data **crypt;
 
         RTLLIB_DEBUG_WX("SET_ENCODE\n");
 
         key = erq->flags & IW_ENCODE_INDEX;
         if (key) {
-                if (key > WEP_KEYS)
+                if (key > NUM_WEP_KEYS)
                         return -EINVAL;
                 key--;
                 key_provided = 1;
         } else {
                 key_provided = 0;
-                key = ieee->tx_keyidx;
+                key = ieee->crypt_info.tx_keyidx;
         }
 
         RTLLIB_DEBUG_WX("Key: %d [%s]\n", key, key_provided ?
                            "provided" : "default");
-        crypt = &ieee->crypt[key];
+        crypt = &ieee->crypt_info.crypt[key];
         if (erq->flags & IW_ENCODE_DISABLED) {
                 if (key_provided && *crypt) {
                         RTLLIB_DEBUG_WX("Disabling encryption on key %d.\n",
                                            key);
-                        rtllib_crypt_delayed_deinit(ieee, crypt);
+                        lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
                 } else
                         RTLLIB_DEBUG_WX("Disabling encryption.\n");
 
                 /* Check all the keys to see if any are still configured,
                  * and if no key index was provided, de-init them all */
-                for (i = 0; i < WEP_KEYS; i++) {
-                        if (ieee->crypt[i] != NULL) {
+                for (i = 0; i < NUM_WEP_KEYS; i++) {
+                        if (ieee->crypt_info.crypt[i] != NULL) {
                                 if (key_provided)
                                         break;
-                                rtllib_crypt_delayed_deinit(ieee,
-                                                            &ieee->crypt[i]);
+                                lib80211_crypt_delayed_deinit(&ieee->crypt_info,
+                                                            &ieee->crypt_info.crypt[i]);
                         }
                 }
 
-                if (i == WEP_KEYS) {
+                if (i == NUM_WEP_KEYS) {
                         sec.enabled = 0;
                         sec.level = SEC_LEVEL_0;
                         sec.flags |= SEC_ENABLED | SEC_LEVEL;
@@ -358,25 +358,24 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
         sec.flags |= SEC_ENABLED;
 
         if (*crypt != NULL && (*crypt)->ops != NULL &&
-            strcmp((*crypt)->ops->name, "WEP") != 0) {
+            strcmp((*crypt)->ops->name, "R-WEP") != 0) {
                 /* changing to use WEP; deinit previously used algorithm
                  * on this key */
-                rtllib_crypt_delayed_deinit(ieee, crypt);
+                lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
         }
 
         if (*crypt == NULL) {
-                struct rtllib_crypt_data *new_crypt;
+                struct lib80211_crypt_data *new_crypt;
 
                 /* take WEP into use */
-                new_crypt = kmalloc(sizeof(struct rtllib_crypt_data),
+                new_crypt = kzalloc(sizeof(struct lib80211_crypt_data),
                                     GFP_KERNEL);
                 if (new_crypt == NULL)
                         return -ENOMEM;
-                memset(new_crypt, 0, sizeof(struct rtllib_crypt_data));
-                new_crypt->ops = rtllib_get_crypto_ops("WEP");
+                new_crypt->ops = lib80211_get_crypto_ops("R-WEP");
                 if (!new_crypt->ops) {
                         request_module("rtllib_crypt_wep");
-                        new_crypt->ops = rtllib_get_crypto_ops("WEP");
+                        new_crypt->ops = lib80211_get_crypto_ops("R-WEP");
                 }
 
                 if (new_crypt->ops)
@@ -412,7 +411,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
                  * explicitely set */
                 if (key == sec.active_key)
                         sec.flags |= SEC_ACTIVE_KEY;
-                ieee->tx_keyidx = key;
+                ieee->crypt_info.tx_keyidx = key;
 
         } else {
                 len = (*crypt)->ops->get_key(sec.keys[key], WEP_KEY_LEN,
@@ -435,7 +434,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
                 if (key_provided) {
                         RTLLIB_DEBUG_WX(
                                 "Setting key %d to default Tx key.\n", key);
-                        ieee->tx_keyidx = key;
+                        ieee->crypt_info.tx_keyidx = key;
                         sec.active_key = key;
                         sec.flags |= SEC_ACTIVE_KEY;
                 }
@@ -470,6 +469,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
         }
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_encode);
 
 int rtllib_wx_get_encode(struct rtllib_device *ieee,
                             struct iw_request_info *info,
@@ -477,7 +477,7 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
 {
         struct iw_point *erq = &(wrqu->encoding);
         int len, key;
-        struct rtllib_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
 
         RTLLIB_DEBUG_WX("GET_ENCODE\n");
 
@@ -486,13 +486,13 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
 
         key = erq->flags & IW_ENCODE_INDEX;
         if (key) {
-                if (key > WEP_KEYS)
+                if (key > NUM_WEP_KEYS)
                         return -EINVAL;
                 key--;
         } else {
-                key = ieee->tx_keyidx;
+                key = ieee->crypt_info.tx_keyidx;
         }
-        crypt = ieee->crypt[key];
+        crypt = ieee->crypt_info.crypt[key];
 
         erq->flags = key + 1;
 
@@ -513,6 +513,7 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_get_encode);
 
 int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
                                struct iw_request_info *info,
@@ -525,29 +526,29 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
         int i, idx;
         int group_key = 0;
         const char *alg, *module;
-        struct rtllib_crypto_ops *ops;
-        struct rtllib_crypt_data **crypt;
+        struct lib80211_crypto_ops *ops;
+        struct lib80211_crypt_data **crypt;
 
         struct rtllib_security sec = {
                 .flags = 0,
         };
         idx = encoding->flags & IW_ENCODE_INDEX;
         if (idx) {
-                if (idx < 1 || idx > WEP_KEYS)
+                if (idx < 1 || idx > NUM_WEP_KEYS)
                         return -EINVAL;
                 idx--;
         } else{
-                        idx = ieee->tx_keyidx;
+                        idx = ieee->crypt_info.tx_keyidx;
         }
         if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-                crypt = &ieee->crypt[idx];
+                crypt = &ieee->crypt_info.crypt[idx];
                 group_key = 1;
         } else {
                 /* some Cisco APs use idx>0 for unicast in dynamic WEP */
                 if (idx != 0 && ext->alg != IW_ENCODE_ALG_WEP)
                         return -EINVAL;
                 if (ieee->iw_mode == IW_MODE_INFRA)
-                        crypt = &ieee->crypt[idx];
+                        crypt = &ieee->crypt_info.crypt[idx];
                 else
                         return -EINVAL;
         }
@@ -556,13 +557,13 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
         if ((encoding->flags & IW_ENCODE_DISABLED) ||
             ext->alg == IW_ENCODE_ALG_NONE) {
                 if (*crypt)
-                        rtllib_crypt_delayed_deinit(ieee, crypt);
+                        lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
 
-                for (i = 0; i < WEP_KEYS; i++) {
-                        if (ieee->crypt[i] != NULL)
+                for (i = 0; i < NUM_WEP_KEYS; i++) {
+                        if (ieee->crypt_info.crypt[i] != NULL)
                                 break;
                 }
-                if (i == WEP_KEYS) {
+                if (i == NUM_WEP_KEYS) {
                         sec.enabled = 0;
                         sec.level = SEC_LEVEL_0;
                         sec.flags |= SEC_LEVEL;
@@ -573,15 +574,15 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
         sec.enabled = 1;
         switch (ext->alg) {
         case IW_ENCODE_ALG_WEP:
-                alg = "WEP";
+                alg = "R-WEP";
                 module = "rtllib_crypt_wep";
                 break;
         case IW_ENCODE_ALG_TKIP:
-                alg = "TKIP";
+                alg = "R-TKIP";
                 module = "rtllib_crypt_tkip";
                 break;
         case IW_ENCODE_ALG_CCMP:
-                alg = "CCMP";
+                alg = "R-CCMP";
                 module = "rtllib_crypt_ccmp";
                 break;
         default:
@@ -592,14 +593,14 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
         }
         printk(KERN_INFO "alg name:%s\n", alg);
 
-         ops = rtllib_get_crypto_ops(alg);
+        ops = lib80211_get_crypto_ops(alg);
         if (ops == NULL) {
                 char tempbuf[100];
 
                 memset(tempbuf, 0x00, 100);
                 sprintf(tempbuf, "%s", module);
                 request_module("%s", tempbuf);
-                ops = rtllib_get_crypto_ops(alg);
+                ops = lib80211_get_crypto_ops(alg);
         }
         if (ops == NULL) {
                 RTLLIB_DEBUG_WX("%s: unknown crypto alg %d\n",
@@ -610,9 +611,9 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
         }
 
         if (*crypt == NULL || (*crypt)->ops != ops) {
-                struct rtllib_crypt_data *new_crypt;
+                struct lib80211_crypt_data *new_crypt;
 
-                rtllib_crypt_delayed_deinit(ieee, crypt);
+                lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
 
                 new_crypt = kzalloc(sizeof(*new_crypt), GFP_KERNEL);
                 if (new_crypt == NULL) {
@@ -641,7 +642,7 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee,
                 goto done;
         }
         if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-                ieee->tx_keyidx = idx;
+                ieee->crypt_info.tx_keyidx = idx;
                 sec.active_key = idx;
                 sec.flags |= SEC_ACTIVE_KEY;
         }
@@ -674,6 +675,7 @@ done:
         }
         return ret;
 }
+EXPORT_SYMBOL(rtllib_wx_set_encode_ext);
 
 int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
                                struct iw_request_info *info,
@@ -681,7 +683,7 @@ int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
 {
         struct iw_point *encoding = &wrqu->encoding;
         struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-        struct rtllib_crypt_data *crypt;
+        struct lib80211_crypt_data *crypt;
         int idx, max_key_len;
 
         max_key_len = encoding->length - sizeof(*ext);
@@ -690,18 +692,18 @@ int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
 
         idx = encoding->flags & IW_ENCODE_INDEX;
         if (idx) {
-                if (idx < 1 || idx > WEP_KEYS)
+                if (idx < 1 || idx > NUM_WEP_KEYS)
                         return -EINVAL;
                 idx--;
         } else {
-                idx = ieee->tx_keyidx;
+                idx = ieee->crypt_info.tx_keyidx;
         }
         if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) &&
             (ext->alg != IW_ENCODE_ALG_WEP))
                 if (idx != 0 || (ieee->iw_mode != IW_MODE_INFRA))
                         return -EINVAL;
 
-        crypt = ieee->crypt[idx];
+        crypt = ieee->crypt_info.crypt[idx];
 
         encoding->flags = idx + 1;
         memset(ext, 0, sizeof(*ext));
@@ -711,11 +713,11 @@ int rtllib_wx_get_encode_ext(struct rtllib_device *ieee,
                 ext->key_len = 0;
                 encoding->flags |= IW_ENCODE_DISABLED;
         } else {
-                if (strcmp(crypt->ops->name, "WEP") == 0)
+                if (strcmp(crypt->ops->name, "R-WEP") == 0)
                         ext->alg = IW_ENCODE_ALG_WEP;
-                else if (strcmp(crypt->ops->name, "TKIP"))
+                else if (strcmp(crypt->ops->name, "R-TKIP"))
                         ext->alg = IW_ENCODE_ALG_TKIP;
-                else if (strcmp(crypt->ops->name, "CCMP"))
+                else if (strcmp(crypt->ops->name, "R-CCMP"))
                         ext->alg = IW_ENCODE_ALG_CCMP;
                 else
                         return -EINVAL;
@@ -778,6 +780,7 @@ int rtllib_wx_set_mlme(struct rtllib_device *ieee,
 
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_mlme);
 
 int rtllib_wx_set_auth(struct rtllib_device *ieee,
                                struct iw_request_info *info,
@@ -830,6 +833,7 @@ int rtllib_wx_set_auth(struct rtllib_device *ieee,
         }
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_auth);
 
 int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
 {
@@ -846,10 +850,9 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
 
                         ieee->wps_ie_len = (len < MAX_WZC_IE_LEN) ? (len) :
                                            (MAX_WZC_IE_LEN);
-                        buf = kmalloc(ieee->wps_ie_len, GFP_KERNEL);
+                        buf = kmemdup(ie, ieee->wps_ie_len, GFP_KERNEL);
                         if (buf == NULL)
                                 return -ENOMEM;
-                        memcpy(buf, ie, ieee->wps_ie_len);
                         ieee->wps_ie = buf;
                         return 0;
                 }
@@ -860,10 +863,9 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
         if (len) {
                 if (len != ie[1]+2)
                         return -EINVAL;
-                buf = kmalloc(len, GFP_KERNEL);
+                buf = kmemdup(ie, len, GFP_KERNEL);
                 if (buf == NULL)
                         return -ENOMEM;
-                memcpy(buf, ie, len);
                 kfree(ieee->wpa_ie);
                 ieee->wpa_ie = buf;
                 ieee->wpa_ie_len = len;
@@ -874,3 +876,4 @@ int rtllib_wx_set_gen_ie(struct rtllib_device *ieee, u8 *ie, size_t len)
         }
         return 0;
 }
+EXPORT_SYMBOL(rtllib_wx_set_gen_ie);
diff --git a/drivers/staging/rtl8192u/ieee80211/api.c b/drivers/staging/rtl8192u/ieee80211/api.c
deleted file mode 100644
index 5f46e50e586e..000000000000
--- a/drivers/staging/rtl8192u/ieee80211/api.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Scatterlist Cryptographic API.
- *
- * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- * Copyright (c) 2002 David S. Miller (davem@redhat.com)
- *
- * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no>
- * and Nettle, by Niels M鰈ler.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- */
-#include "kmap_types.h"
-
-#include <linux/init.h>
-#include <linux/module.h>
-//#include <linux/crypto.h>
-#include "rtl_crypto.h"
-#include <linux/errno.h>
-#include <linux/rwsem.h>
-#include <linux/slab.h>
-#include "internal.h"
-
-LIST_HEAD(crypto_alg_list);
-DECLARE_RWSEM(crypto_alg_sem);
-
-static inline int crypto_alg_get(struct crypto_alg *alg)
-{
-        return try_inc_mod_count(alg->cra_module);
-}
-
-static inline void crypto_alg_put(struct crypto_alg *alg)
-{
-        if (alg->cra_module)
-                __MOD_DEC_USE_COUNT(alg->cra_module);
-}
-
-struct crypto_alg *crypto_alg_lookup(const char *name)
-{
-        struct crypto_alg *q, *alg = NULL;
-
-        if (!name)
-                return NULL;
-
-        down_read(&crypto_alg_sem);
-
-        list_for_each_entry(q, &crypto_alg_list, cra_list) {
-                if (!(strcmp(q->cra_name, name))) {
-                        if (crypto_alg_get(q))
-                                alg = q;
-                        break;
-                }
-        }
-
-        up_read(&crypto_alg_sem);
-        return alg;
-}
-
-static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags)
-{
-        tfm->crt_flags = 0;
-
-        switch (crypto_tfm_alg_type(tfm)) {
-        case CRYPTO_ALG_TYPE_CIPHER:
-                return crypto_init_cipher_flags(tfm, flags);
-
-        case CRYPTO_ALG_TYPE_DIGEST:
-                return crypto_init_digest_flags(tfm, flags);
-
-        case CRYPTO_ALG_TYPE_COMPRESS:
-                return crypto_init_compress_flags(tfm, flags);
-
-        default:
-                break;
-        }
-
-        BUG();
-        return -EINVAL;
-}
-
-static int crypto_init_ops(struct crypto_tfm *tfm)
-{
-        switch (crypto_tfm_alg_type(tfm)) {
-        case CRYPTO_ALG_TYPE_CIPHER:
-                return crypto_init_cipher_ops(tfm);
-
-        case CRYPTO_ALG_TYPE_DIGEST:
-                return crypto_init_digest_ops(tfm);
-
-        case CRYPTO_ALG_TYPE_COMPRESS:
-                return crypto_init_compress_ops(tfm);
-
-        default:
-                break;
-        }
-
-        BUG();
-        return -EINVAL;
-}
-
-static void crypto_exit_ops(struct crypto_tfm *tfm)
-{
-        switch (crypto_tfm_alg_type(tfm)) {
-        case CRYPTO_ALG_TYPE_CIPHER:
-                crypto_exit_cipher_ops(tfm);
-                break;
-
-        case CRYPTO_ALG_TYPE_DIGEST:
-                crypto_exit_digest_ops(tfm);
-                break;
-
-        case CRYPTO_ALG_TYPE_COMPRESS:
-                crypto_exit_compress_ops(tfm);
-                break;
-
-        default:
-                BUG();
-
-        }
-}
-
-struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
-{
-        struct crypto_tfm *tfm = NULL;
-        struct crypto_alg *alg;
-
-        alg = crypto_alg_mod_lookup(name);
-        if (alg == NULL)
-                goto out;
-
-        tfm = kzalloc(sizeof(*tfm) + alg->cra_ctxsize, GFP_KERNEL);
-        if (tfm == NULL)
-                goto out_put;
-
-        tfm->__crt_alg = alg;
-
-        if (crypto_init_flags(tfm, flags))
-                goto out_free_tfm;
-
-        if (crypto_init_ops(tfm)) {
-                crypto_exit_ops(tfm);
-                goto out_free_tfm;
-        }
-
-        goto out;
-
-out_free_tfm:
-        kfree(tfm);
-        tfm = NULL;
-out_put:
-        crypto_alg_put(alg);
-out:
-        return tfm;
-}
-
-void crypto_free_tfm(struct crypto_tfm *tfm)
-{
-        struct crypto_alg *alg = tfm->__crt_alg;
-        int size = sizeof(*tfm) + alg->cra_ctxsize;
-
-        crypto_exit_ops(tfm);
-        crypto_alg_put(alg);
-        memset(tfm, 0, size);
-        kfree(tfm);
-}
-
-int crypto_register_alg(struct crypto_alg *alg)
-{
-        int ret = 0;
-        struct crypto_alg *q;
-
-        down_write(&crypto_alg_sem);
-
-        list_for_each_entry(q, &crypto_alg_list, cra_list) {
-                if (!(strcmp(q->cra_name, alg->cra_name))) {
-                        ret = -EEXIST;
-                        goto out;
-                }
-        }
-
-        list_add_tail(&alg->cra_list, &crypto_alg_list);
-out:
-        up_write(&crypto_alg_sem);
-        return ret;
-}
-
-int crypto_unregister_alg(struct crypto_alg *alg)
-{
-        int ret = -ENOENT;
-        struct crypto_alg *q;
-
-        BUG_ON(!alg->cra_module);
-
-        down_write(&crypto_alg_sem);
-        list_for_each_entry(q, &crypto_alg_list, cra_list) {
-                if (alg == q) {
-                        list_del(&alg->cra_list);
-                        ret = 0;
-                        goto out;
-                }
-        }
-out:
-        up_write(&crypto_alg_sem);
-        return ret;
-}
-
-int crypto_alg_available(const char *name, u32 flags)
-{
-        int ret = 0;
-        struct crypto_alg *alg = crypto_alg_mod_lookup(name);
-
-        if (alg) {
-                crypto_alg_put(alg);
-                ret = 1;
-        }
-
-        return ret;
-}
-
-static int __init init_crypto(void)
-{
-        printk(KERN_INFO "Initializing Cryptographic API\n");
-        crypto_init_proc();
-        return 0;
-}
-
-__initcall(init_crypto);
-
-/*
-EXPORT_SYMBOL_GPL(crypto_register_alg);
-EXPORT_SYMBOL_GPL(crypto_unregister_alg);
-EXPORT_SYMBOL_GPL(crypto_alloc_tfm);
-EXPORT_SYMBOL_GPL(crypto_free_tfm);
-EXPORT_SYMBOL_GPL(crypto_alg_available);
-*/
-
-EXPORT_SYMBOL_NOVERS(crypto_register_alg);
-EXPORT_SYMBOL_NOVERS(crypto_unregister_alg);
-EXPORT_SYMBOL_NOVERS(crypto_alloc_tfm);
-EXPORT_SYMBOL_NOVERS(crypto_free_tfm);
-EXPORT_SYMBOL_NOVERS(crypto_alg_available);
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index ef8eb6c7ee41..4277d0304b7a 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -551,7 +551,7 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
                         ibss_wlan = r8712_find_network(
                                                 &pmlmepriv->scanned_queue,
                                                 pnetwork->MacAddress);
-                        if (!ibss_wlan) {
+                        if (ibss_wlan) {
                                 memcpy(ibss_wlan->network.IEs,
                                         pnetwork->IEs, 8);
                                 goto exit;
diff --git a/drivers/staging/rts5139/rts51x.h b/drivers/staging/rts5139/rts51x.h
index 9415d5c05502..b2c58390bfc5 100644
--- a/drivers/staging/rts5139/rts51x.h
+++ b/drivers/staging/rts5139/rts51x.h
@@ -34,7 +34,6 @@
 #include <linux/mutex.h>
 #include <linux/cdrom.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
diff --git a/drivers/staging/rts5139/rts51x_transport.h b/drivers/staging/rts5139/rts51x_transport.h
index f7aa87f7f1a9..8464c4836d5b 100644
--- a/drivers/staging/rts5139/rts51x_transport.h
+++ b/drivers/staging/rts5139/rts51x_transport.h
@@ -28,7 +28,6 @@
 #define __RTS51X_TRANSPORT_H
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 
 #include "rts51x.h"
 #include "rts51x_chip.h"
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index f47571ea745d..6b3d156d4140 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -2120,6 +2120,8 @@ static int sep_prepare_input_output_dma_table_in_dcb(struct sep_device *sep,
                         }
                 }
                 if (tail_size) {
+                        if (tail_size > sizeof(dcb_table_ptr->tail_data))
+                                return -EINVAL;
                         if (is_kva == true) {
                                 memcpy(dcb_table_ptr->tail_data,
                                         (void *)(app_in_address + data_in_size -
diff --git a/drivers/staging/serial/68360serial.c b/drivers/staging/serial/68360serial.c
index 0a3e8787ed50..daf0b1d0dc28 100644
--- a/drivers/staging/serial/68360serial.c
+++ b/drivers/staging/serial/68360serial.c
@@ -2771,8 +2771,8 @@ static int __init rs_360_init(void)
                         */
                         /* cpm_install_handler(IRQ_MACHSPEC | state->irq, rs_360_interrupt, info);  */
                         /*request_irq(IRQ_MACHSPEC | state->irq, rs_360_interrupt, */
-                        request_irq(state->irq, rs_360_interrupt,
-                                                IRQ_FLG_LOCK, "ttyS", (void *)info);
+                        request_irq(state->irq, rs_360_interrupt, 0, "ttyS",
+                                    (void *)info);
 
                         /* Set up the baud rate generator.
                         */
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c
index 39dbf339a4fc..ae0035f327e7 100644
--- a/drivers/staging/sm7xx/smtcfb.c
+++ b/drivers/staging/sm7xx/smtcfb.c
@@ -1024,9 +1024,9 @@ failed_free:
 
 /* Jason (08/11/2009) PCI_DRV wrapper essential structs */
 static DEFINE_PCI_DEVICE_TABLE(smtcfb_pci_table) = {
-        {0x126f, 0x710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x126f, 0x712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        {0x126f, 0x720, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        { PCI_DEVICE(0x126f, 0x710), },
+        { PCI_DEVICE(0x126f, 0x712), },
+        { PCI_DEVICE(0x126f, 0x720), },
         {0,}
 };
 
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index 07a7f5432597..2093896c546b 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -265,12 +265,11 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr,
         unsigned long flags;
 
         spk_lock(flags);
-        in_buff = kmalloc(count + 1, GFP_ATOMIC);
+        in_buff = kmemdup(buf, count + 1, GFP_ATOMIC);
         if (!in_buff) {
                 spk_unlock(flags);
                 return -ENOMEM;
         }
-        memcpy(in_buff, buf, count + 1);
         if (strchr("dDrR", *in_buff)) {
                 set_key_info(key_defaults, key_buf);
                 pr_info("keymap set to default values\n");
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 8be560458977..c7b03f0ef2dd 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -2268,8 +2268,6 @@ static int __init speakup_init(void)
                 set_mask_bits(0, i, 2);
 
         set_key_info(key_defaults, key_buf);
-        if (quiet_boot)
-                spk_shut_up |= 0x01;
 
         /* From here on out, initializations can fail. */
         err = speakup_add_virtual_keyboard();
@@ -2292,6 +2290,9 @@ static int __init speakup_init(void)
                                 goto error_kobjects;
                 }
 
+        if (quiet_boot)
+                spk_shut_up |= 0x01;
+
         err = speakup_kobj_init();
         if (err)
                 goto error_kobjects;
diff --git a/drivers/staging/spectra/Kconfig b/drivers/staging/spectra/Kconfig
deleted file mode 100644
index 4fc206484830..000000000000
--- a/drivers/staging/spectra/Kconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-
-menuconfig SPECTRA
-        tristate "Denali Spectra Flash Translation Layer"
-        depends on BLOCK
-        depends on X86_MRST
-        default n
-        ---help---
-          Enable the FTL pseudo-filesystem used with the NAND Flash
-          controller on Intel Moorestown Platform to pretend to be a disk.
-
-choice
-        prompt "Compile for"
-        depends on SPECTRA
-        default SPECTRA_MRST_HW
-
-config SPECTRA_MRST_HW
-        bool "Moorestown hardware mode"
-        help
-          Driver communicates with the Moorestown hardware's register interface.
-          in DMA mode.
-
-config SPECTRA_MTD
-        bool "Linux MTD mode"
-        depends on MTD
-        help
-          Driver communicates with the kernel MTD subsystem instead of its own
-          built-in hardware driver.
-
-config SPECTRA_EMU
-        bool "RAM emulator testing"
-        help
-          Driver emulates Flash on a RAM buffer and / or disk file.  Useful to test the behavior of FTL layer.
-
-endchoice
-
-config SPECTRA_MRST_HW_DMA
-       bool
-       default n
-       depends on SPECTRA_MRST_HW
-       help
-         Use DMA for native hardware interface.
diff --git a/drivers/staging/spectra/Makefile b/drivers/staging/spectra/Makefile
deleted file mode 100644
index f777dfba05a5..000000000000
--- a/drivers/staging/spectra/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile of Intel Moorestown NAND controller driver
-#
-
-obj-$(CONFIG_SPECTRA) += spectra.o
-spectra-y := ffsport.o flash.o lld.o
-spectra-$(CONFIG_SPECTRA_MRST_HW) += lld_nand.o 
-spectra-$(CONFIG_SPECTRA_MRST_HW_DMA) += lld_cdma.o
-spectra-$(CONFIG_SPECTRA_EMU) += lld_emu.o
-spectra-$(CONFIG_SPECTRA_MTD) += lld_mtd.o
-
diff --git a/drivers/staging/spectra/README b/drivers/staging/spectra/README
deleted file mode 100644
index ecba559b899c..000000000000
--- a/drivers/staging/spectra/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This is a driver for NAND controller of Intel Moorestown platform.
-
-This driver is a standalone linux block device driver, it acts as if it's a normal hard disk.
-It includes three layer:
-        block layer interface - file ffsport.c
-        Flash Translation Layer (FTL) - file flash.c (implement the NAND flash Translation Layer, includs address mapping, garbage collection, wear-leveling and so on)
-        Low level layer - file lld_nand.c/lld_cdma.c/lld_emu.c (which implements actual controller hardware registers access)
-
-This driver can be build as modules or build-in.
-
-Dependency:
-This driver has dependency on IA Firmware of Intel Moorestown platform.
-It need the IA Firmware to create the block table for the first time.
-And to validate this driver code without IA Firmware, you can change the
-macro AUTO_FORMAT_FLASH from 0 to 1 in file spectraswconfig.h. Thus the
-driver will erase the whole nand flash and create a new block table.
-
-TODO:
-        - Enable Command DMA feature support
-        - lower the memory footprint
-        - Remove most of the unnecessary global variables
-        - Change all the upcase variable / functions name to lowercase
-        - Some other misc bugs
-
-Please send patches to:
-        Greg Kroah-Hartman <gregkh@suse.de>
-
-And Cc to: Gao Yunpeng <yunpeng.gao@intel.com>
-
diff --git a/drivers/staging/spectra/ffsdefs.h b/drivers/staging/spectra/ffsdefs.h
deleted file mode 100644
index a9e9cd233d2a..000000000000
--- a/drivers/staging/spectra/ffsdefs.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _FFSDEFS_
-#define _FFSDEFS_
-
-#define CLEAR 0                 /*use this to clear a field instead of "fail"*/
-#define SET   1                 /*use this to set a field instead of "pass"*/
-#define FAIL 1                  /*failed flag*/
-#define PASS 0                  /*success flag*/
-#define ERR -1                  /*error flag*/
-
-#define   ERASE_CMD             10
-#define   WRITE_MAIN_CMD        11
-#define   READ_MAIN_CMD         12
-#define   WRITE_SPARE_CMD       13
-#define   READ_SPARE_CMD        14
-#define   WRITE_MAIN_SPARE_CMD  15
-#define   READ_MAIN_SPARE_CMD   16
-#define   MEMCOPY_CMD           17
-#define   DUMMY_CMD             99
-
-#define     EVENT_PASS                                  0x00
-#define     EVENT_CORRECTABLE_DATA_ERROR_FIXED         0x01
-#define     EVENT_UNCORRECTABLE_DATA_ERROR              0x02
-#define     EVENT_TIME_OUT                              0x03
-#define     EVENT_PROGRAM_FAILURE                       0x04
-#define     EVENT_ERASE_FAILURE                         0x05
-#define     EVENT_MEMCOPY_FAILURE                       0x06
-#define     EVENT_FAIL                                  0x07
-
-#define     EVENT_NONE                                  0x22
-#define     EVENT_DMA_CMD_COMP                          0x77
-#define     EVENT_ECC_TRANSACTION_DONE                  0x88
-#define     EVENT_DMA_CMD_FAIL                          0x99
-
-#define CMD_PASS        0
-#define CMD_FAIL        1
-#define CMD_ABORT       2
-#define CMD_NOT_DONE    3
-
-#endif /* _FFSDEFS_ */
diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
deleted file mode 100644
index 86d556d6cf98..000000000000
--- a/drivers/staging/spectra/ffsport.c
+++ /dev/null
@@ -1,834 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 "ffsport.h"
-#include "flash.h"
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/blkdev.h>
-#include <linux/wait.h>
-#include <linux/mutex.h>
-#include <linux/kthread.h>
-#include <linux/log2.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/async.h>
-
-/**** Helper functions used for Div, Remainder operation on u64 ****/
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_Calc_Used_Bits
-* Inputs:       Power of 2 number
-* Outputs:      Number of Used Bits
-*               0, if the argument is 0
-* Description:  Calculate the number of bits used by a given power of 2 number
-*               Number can be up to 32 bit
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_Calc_Used_Bits(u32 n)
-{
-        int tot_bits = 0;
-
-        if (n >= 1 << 16) {
-                n >>= 16;
-                tot_bits += 16;
-        }
-
-        if (n >= 1 << 8) {
-                n >>=  8;
-                tot_bits +=  8;
-        }
-
-        if (n >= 1 << 4) {
-                n >>=  4;
-                tot_bits +=  4;
-        }
-
-        if (n >= 1 << 2) {
-                n >>=  2;
-                tot_bits +=  2;
-        }
-
-        if (n >= 1 << 1)
-                tot_bits +=  1;
-
-        return ((n == 0) ? (0) : tot_bits);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_u64_Div
-* Inputs:       Number of u64
-*               A power of 2 number as Division
-* Outputs:      Quotient of the Divisor operation
-* Description:  It divides the address by divisor by using bit shift operation
-*               (essentially without explicitely using "/").
-*               Divisor is a power of 2 number and Divided is of u64
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u64 GLOB_u64_Div(u64 addr, u32 divisor)
-{
-        return  (u64)(addr >> GLOB_Calc_Used_Bits(divisor));
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_u64_Remainder
-* Inputs:       Number of u64
-*               Divisor Type (1 -PageAddress, 2- BlockAddress)
-* Outputs:      Remainder of the Division operation
-* Description:  It calculates the remainder of a number (of u64) by
-*               divisor(power of 2 number ) by using bit shifting and multiply
-*               operation(essentially without explicitely using "/").
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u64 GLOB_u64_Remainder(u64 addr, u32 divisor_type)
-{
-        u64 result = 0;
-
-        if (divisor_type == 1) { /* Remainder -- Page */
-                result = (addr >> DeviceInfo.nBitsInPageDataSize);
-                result = result * DeviceInfo.wPageDataSize;
-        } else if (divisor_type == 2) { /* Remainder -- Block */
-                result = (addr >> DeviceInfo.nBitsInBlockDataSize);
-                result = result * DeviceInfo.wBlockDataSize;
-        }
-
-        result = addr - result;
-
-        return result;
-}
-
-#define NUM_DEVICES             1
-#define PARTITIONS              8
-
-#define GLOB_SBD_NAME          "nd"
-#define GLOB_SBD_IRQ_NUM       (29)
-
-#define GLOB_SBD_IOCTL_GC                        (0x7701)
-#define GLOB_SBD_IOCTL_WL                        (0x7702)
-#define GLOB_SBD_IOCTL_FORMAT                    (0x7703)
-#define GLOB_SBD_IOCTL_ERASE_FLASH               (0x7704)
-#define GLOB_SBD_IOCTL_FLUSH_CACHE               (0x7705)
-#define GLOB_SBD_IOCTL_COPY_BLK_TABLE            (0x7706)
-#define GLOB_SBD_IOCTL_COPY_WEAR_LEVELING_TABLE  (0x7707)
-#define GLOB_SBD_IOCTL_GET_NAND_INFO             (0x7708)
-#define GLOB_SBD_IOCTL_WRITE_DATA                (0x7709)
-#define GLOB_SBD_IOCTL_READ_DATA                 (0x770A)
-
-static int reserved_mb = 0;
-module_param(reserved_mb, int, 0);
-MODULE_PARM_DESC(reserved_mb, "Reserved space for OS image, in MiB (default 25 MiB)");
-
-int nand_debug_level;
-module_param(nand_debug_level, int, 0644);
-MODULE_PARM_DESC(nand_debug_level, "debug level value: 1-3");
-
-MODULE_LICENSE("GPL");
-
-struct spectra_nand_dev {
-        struct pci_dev *dev;
-        u64 size;
-        u16 users;
-        spinlock_t qlock;
-        void __iomem *ioaddr;  /* Mapped address */
-        struct request_queue *queue;
-        struct task_struct *thread;
-        struct gendisk *gd;
-        u8 *tmp_buf;
-};
-
-
-static int GLOB_SBD_majornum;
-
-static char *GLOB_version = GLOB_VERSION;
-
-static struct spectra_nand_dev nand_device[NUM_DEVICES];
-
-static struct mutex spectra_lock;
-
-static int res_blks_os = 1;
-
-struct spectra_indentfy_dev_tag IdentifyDeviceData;
-
-static int force_flush_cache(void)
-{
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        if (ERR == GLOB_FTL_Flush_Cache()) {
-                printk(KERN_ERR "Fail to Flush FTL Cache!\n");
-                return -EFAULT;
-        }
-#if CMD_DMA
-                if (glob_ftl_execute_cmds())
-                        return -EIO;
-                else
-                        return 0;
-#endif
-        return 0;
-}
-
-struct ioctl_rw_page_info {
-        u8 *data;
-        unsigned int page;
-};
-
-static int ioctl_read_page_data(unsigned long arg)
-{
-        u8 *buf;
-        struct ioctl_rw_page_info info;
-        int result = PASS;
-
-        if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-                return -EFAULT;
-
-        buf = kmalloc(IdentifyDeviceData.PageDataSize, GFP_ATOMIC);
-        if (!buf) {
-                printk(KERN_ERR "ioctl_read_page_data: "
-                       "failed to allocate memory\n");
-                return -ENOMEM;
-        }
-
-        mutex_lock(&spectra_lock);
-        result = GLOB_FTL_Page_Read(buf,
-                (u64)info.page * IdentifyDeviceData.PageDataSize);
-        mutex_unlock(&spectra_lock);
-
-        if (copy_to_user((void __user *)info.data, buf,
-                           IdentifyDeviceData.PageDataSize)) {
-                printk(KERN_ERR "ioctl_read_page_data: "
-                       "failed to copy user data\n");
-                kfree(buf);
-                return -EFAULT;
-        }
-
-        kfree(buf);
-        return result;
-}
-
-static int ioctl_write_page_data(unsigned long arg)
-{
-        u8 *buf;
-        struct ioctl_rw_page_info info;
-        int result = PASS;
-
-        if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-                return -EFAULT;
-
-        buf = memdup_user((void __user *)info.data,
-                          IdentifyDeviceData.PageDataSize);
-        if (IS_ERR(buf)) {
-                printk(KERN_ERR "ioctl_write_page_data: "
-                       "failed to copy user data\n");
-                return PTR_ERR(buf);
-        }
-
-        mutex_lock(&spectra_lock);
-        result = GLOB_FTL_Page_Write(buf,
-                (u64)info.page * IdentifyDeviceData.PageDataSize);
-        mutex_unlock(&spectra_lock);
-
-        kfree(buf);
-        return result;
-}
-
-/* Return how many blocks should be reserved for bad block replacement */
-static int get_res_blk_num_bad_blk(void)
-{
-        return IdentifyDeviceData.wDataBlockNum / 10;
-}
-
-/* Return how many blocks should be reserved for OS image */
-static int get_res_blk_num_os(void)
-{
-        u32 res_blks, blk_size;
-
-        blk_size = IdentifyDeviceData.PageDataSize *
-                IdentifyDeviceData.PagesPerBlock;
-
-        res_blks = (reserved_mb * 1024 * 1024) / blk_size;
-
-        if ((res_blks < 1) || (res_blks >= IdentifyDeviceData.wDataBlockNum))
-                res_blks = 1; /* Reserved 1 block for block table */
-
-        return res_blks;
-}
-
-/* Transfer a full request. */
-static int do_transfer(struct spectra_nand_dev *tr, struct request *req)
-{
-        u64 start_addr, addr;
-        u32 logical_start_sect, hd_start_sect;
-        u32 nsect, hd_sects;
-        u32 rsect, tsect = 0;
-        char *buf;
-        u32 ratio = IdentifyDeviceData.PageDataSize >> 9;
-
-        start_addr = (u64)(blk_rq_pos(req)) << 9;
-        /* Add a big enough offset to prevent the OS Image from
-        *  being accessed or damaged by file system */
-        start_addr += IdentifyDeviceData.PageDataSize *
-                        IdentifyDeviceData.PagesPerBlock *
-                        res_blks_os;
-
-        if (req->cmd_type & REQ_FLUSH) {
-                if (force_flush_cache()) /* Fail to flush cache */
-                        return -EIO;
-                else
-                        return 0;
-        }
-
-        if (req->cmd_type != REQ_TYPE_FS)
-                return -EIO;
-
-        if (blk_rq_pos(req) + blk_rq_cur_sectors(req) > get_capacity(tr->gd)) {
-                printk(KERN_ERR "Spectra error: request over the NAND "
-                        "capacity!sector %d, current_nr_sectors %d, "
-                        "while capacity is %d\n",
-                        (int)blk_rq_pos(req),
-                        blk_rq_cur_sectors(req),
-                        (int)get_capacity(tr->gd));
-                return -EIO;
-        }
-
-        logical_start_sect = start_addr >> 9;
-        hd_start_sect = logical_start_sect / ratio;
-        rsect = logical_start_sect - hd_start_sect * ratio;
-
-        addr = (u64)hd_start_sect * ratio * 512;
-        buf = req->buffer;
-        nsect = blk_rq_cur_sectors(req);
-
-        if (rsect)
-                tsect =  (ratio - rsect) < nsect ? (ratio - rsect) : nsect;
-
-        switch (rq_data_dir(req)) {
-        case READ:
-                /* Read the first NAND page */
-                if (rsect) {
-                        if (GLOB_FTL_Page_Read(tr->tmp_buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        memcpy(buf, tr->tmp_buf + (rsect << 9), tsect << 9);
-                        addr += IdentifyDeviceData.PageDataSize;
-                        buf += tsect << 9;
-                        nsect -= tsect;
-                }
-
-                /* Read the other NAND pages */
-                for (hd_sects = nsect / ratio; hd_sects > 0; hd_sects--) {
-                        if (GLOB_FTL_Page_Read(buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        addr += IdentifyDeviceData.PageDataSize;
-                        buf += IdentifyDeviceData.PageDataSize;
-                }
-
-                /* Read the last NAND pages */
-                if (nsect % ratio) {
-                        if (GLOB_FTL_Page_Read(tr->tmp_buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        memcpy(buf, tr->tmp_buf, (nsect % ratio) << 9);
-                }
-#if CMD_DMA
-                if (glob_ftl_execute_cmds())
-                        return -EIO;
-                else
-                        return 0;
-#endif
-                return 0;
-
-        case WRITE:
-                /* Write the first NAND page */
-                if (rsect) {
-                        if (GLOB_FTL_Page_Read(tr->tmp_buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        memcpy(tr->tmp_buf + (rsect << 9), buf, tsect << 9);
-                        if (GLOB_FTL_Page_Write(tr->tmp_buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        addr += IdentifyDeviceData.PageDataSize;
-                        buf += tsect << 9;
-                        nsect -= tsect;
-                }
-
-                /* Write the other NAND pages */
-                for (hd_sects = nsect / ratio; hd_sects > 0; hd_sects--) {
-                        if (GLOB_FTL_Page_Write(buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        addr += IdentifyDeviceData.PageDataSize;
-                        buf += IdentifyDeviceData.PageDataSize;
-                }
-
-                /* Write the last NAND pages */
-                if (nsect % ratio) {
-                        if (GLOB_FTL_Page_Read(tr->tmp_buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                        memcpy(tr->tmp_buf, buf, (nsect % ratio) << 9);
-                        if (GLOB_FTL_Page_Write(tr->tmp_buf, addr)) {
-                                printk(KERN_ERR "Error in %s, Line %d\n",
-                                        __FILE__, __LINE__);
-                                return -EIO;
-                        }
-                }
-#if CMD_DMA
-                if (glob_ftl_execute_cmds())
-                        return -EIO;
-                else
-                        return 0;
-#endif
-                return 0;
-
-        default:
-                printk(KERN_NOTICE "Unknown request %u\n", rq_data_dir(req));
-                return -EIO;
-        }
-}
-
-/* This function is copied from drivers/mtd/mtd_blkdevs.c */
-static int spectra_trans_thread(void *arg)
-{
-        struct spectra_nand_dev *tr = arg;
-        struct request_queue *rq = tr->queue;
-        struct request *req = NULL;
-
-        /* we might get involved when memory gets low, so use PF_MEMALLOC */
-        current->flags |= PF_MEMALLOC;
-
-        spin_lock_irq(rq->queue_lock);
-        while (!kthread_should_stop()) {
-                int res;
-
-                if (!req) {
-                        req = blk_fetch_request(rq);
-                        if (!req) {
-                                set_current_state(TASK_INTERRUPTIBLE);
-                                spin_unlock_irq(rq->queue_lock);
-                                schedule();
-                                spin_lock_irq(rq->queue_lock);
-                                continue;
-                        }
-                }
-
-                spin_unlock_irq(rq->queue_lock);
-
-                mutex_lock(&spectra_lock);
-                res = do_transfer(tr, req);
-                mutex_unlock(&spectra_lock);
-
-                spin_lock_irq(rq->queue_lock);
-
-                if (!__blk_end_request_cur(req, res))
-                        req = NULL;
-        }
-
-        if (req)
-                __blk_end_request_all(req, -EIO);
-
-        spin_unlock_irq(rq->queue_lock);
-
-        return 0;
-}
-
-
-/* Request function that "handles clustering". */
-static void GLOB_SBD_request(struct request_queue *rq)
-{
-        struct spectra_nand_dev *pdev = rq->queuedata;
-        wake_up_process(pdev->thread);
-}
-
-static int GLOB_SBD_open(struct block_device *bdev, fmode_t mode)
-
-{
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-        return 0;
-}
-
-static int GLOB_SBD_release(struct gendisk *disk, fmode_t mode)
-{
-        int ret;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        mutex_lock(&spectra_lock);
-        ret = force_flush_cache();
-        mutex_unlock(&spectra_lock);
-
-        return 0;
-}
-
-static int GLOB_SBD_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-{
-        geo->heads = 4;
-        geo->sectors = 16;
-        geo->cylinders = get_capacity(bdev->bd_disk) / (4 * 16);
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "heads: %d, sectors: %d, cylinders: %d\n",
-                geo->heads, geo->sectors, geo->cylinders);
-
-        return 0;
-}
-
-int GLOB_SBD_ioctl(struct block_device *bdev, fmode_t mode,
-                unsigned int cmd, unsigned long arg)
-{
-        int ret;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        switch (cmd) {
-        case GLOB_SBD_IOCTL_GC:
-                nand_dbg_print(NAND_DBG_DEBUG,
-                               "Spectra IOCTL: Garbage Collection "
-                               "being performed\n");
-                if (PASS != GLOB_FTL_Garbage_Collection())
-                        return -EFAULT;
-                return 0;
-
-        case GLOB_SBD_IOCTL_WL:
-                nand_dbg_print(NAND_DBG_DEBUG,
-                               "Spectra IOCTL: Static Wear Leveling "
-                               "being performed\n");
-                if (PASS != GLOB_FTL_Wear_Leveling())
-                        return -EFAULT;
-                return 0;
-
-        case GLOB_SBD_IOCTL_FORMAT:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: Flash format "
-                               "being performed\n");
-                if (PASS != GLOB_FTL_Flash_Format())
-                        return -EFAULT;
-                return 0;
-
-        case GLOB_SBD_IOCTL_FLUSH_CACHE:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: Cache flush "
-                               "being performed\n");
-                mutex_lock(&spectra_lock);
-                ret = force_flush_cache();
-                mutex_unlock(&spectra_lock);
-                return ret;
-
-        case GLOB_SBD_IOCTL_COPY_BLK_TABLE:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: "
-                               "Copy block table\n");
-                if (copy_to_user((void __user *)arg,
-                        get_blk_table_start_addr(),
-                        get_blk_table_len()))
-                        return -EFAULT;
-                return 0;
-
-        case GLOB_SBD_IOCTL_COPY_WEAR_LEVELING_TABLE:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: "
-                               "Copy wear leveling table\n");
-                if (copy_to_user((void __user *)arg,
-                        get_wear_leveling_table_start_addr(),
-                        get_wear_leveling_table_len()))
-                        return -EFAULT;
-                return 0;
-
-        case GLOB_SBD_IOCTL_GET_NAND_INFO:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: "
-                               "Get NAND info\n");
-                if (copy_to_user((void __user *)arg, &IdentifyDeviceData,
-                        sizeof(IdentifyDeviceData)))
-                        return -EFAULT;
-                return 0;
-
-        case GLOB_SBD_IOCTL_WRITE_DATA:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: "
-                               "Write one page data\n");
-                return ioctl_write_page_data(arg);
-
-        case GLOB_SBD_IOCTL_READ_DATA:
-                nand_dbg_print(NAND_DBG_DEBUG, "Spectra IOCTL: "
-                               "Read one page data\n");
-                return ioctl_read_page_data(arg);
-        }
-
-        return -ENOTTY;
-}
-
-static DEFINE_MUTEX(ffsport_mutex);
-
-int GLOB_SBD_unlocked_ioctl(struct block_device *bdev, fmode_t mode,
-                unsigned int cmd, unsigned long arg)
-{
-        int ret;
-
-        mutex_lock(&ffsport_mutex);
-        ret = GLOB_SBD_ioctl(bdev, mode, cmd, arg);
-        mutex_unlock(&ffsport_mutex);
-
-        return ret;
-}
-
-static struct block_device_operations GLOB_SBD_ops = {
-        .owner = THIS_MODULE,
-        .open = GLOB_SBD_open,
-        .release = GLOB_SBD_release,
-        .ioctl = GLOB_SBD_unlocked_ioctl,
-        .getgeo = GLOB_SBD_getgeo,
-};
-
-static int SBD_setup_device(struct spectra_nand_dev *dev, int which)
-{
-        int res_blks;
-        u32 sects;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        memset(dev, 0, sizeof(struct spectra_nand_dev));
-
-        nand_dbg_print(NAND_DBG_WARN, "Reserved %d blocks "
-                "for OS image, %d blocks for bad block replacement.\n",
-                get_res_blk_num_os(),
-                get_res_blk_num_bad_blk());
-
-        res_blks = get_res_blk_num_bad_blk() + get_res_blk_num_os();
-
-        dev->size = (u64)IdentifyDeviceData.PageDataSize *
-                IdentifyDeviceData.PagesPerBlock *
-                (IdentifyDeviceData.wDataBlockNum - res_blks);
-
-        res_blks_os = get_res_blk_num_os();
-
-        spin_lock_init(&dev->qlock);
-
-        dev->tmp_buf = kmalloc(IdentifyDeviceData.PageDataSize, GFP_ATOMIC);
-        if (!dev->tmp_buf) {
-                printk(KERN_ERR "Failed to kmalloc memory in %s Line %d, exit.\n",
-                        __FILE__, __LINE__);
-                goto out_vfree;
-        }
-
-        dev->queue = blk_init_queue(GLOB_SBD_request, &dev->qlock);
-        if (dev->queue == NULL) {
-                printk(KERN_ERR
-                       "Spectra: Request queue could not be initialized."
-                        " Aborting\n ");
-                goto out_vfree;
-        }
-        dev->queue->queuedata = dev;
-
-        /* As Linux block layer doesn't support >4KB hardware sector,  */
-        /* Here we force report 512 byte hardware sector size to Kernel */
-        blk_queue_logical_block_size(dev->queue, 512);
-
-        blk_queue_flush(dev->queue, REQ_FLUSH);
-
-        dev->thread = kthread_run(spectra_trans_thread, dev, "nand_thd");
-        if (IS_ERR(dev->thread)) {
-                blk_cleanup_queue(dev->queue);
-                unregister_blkdev(GLOB_SBD_majornum, GLOB_SBD_NAME);
-                return PTR_ERR(dev->thread);
-        }
-
-        dev->gd = alloc_disk(PARTITIONS);
-        if (!dev->gd) {
-                printk(KERN_ERR
-                       "Spectra: Could not allocate disk. Aborting \n ");
-                goto out_vfree;
-        }
-        dev->gd->major = GLOB_SBD_majornum;
-        dev->gd->first_minor = which * PARTITIONS;
-        dev->gd->fops = &GLOB_SBD_ops;
-        dev->gd->queue = dev->queue;
-        dev->gd->private_data = dev;
-        snprintf(dev->gd->disk_name, 32, "%s%c", GLOB_SBD_NAME, which + 'a');
-
-        sects = dev->size >> 9;
-        nand_dbg_print(NAND_DBG_WARN, "Capacity sects: %d\n", sects);
-        set_capacity(dev->gd, sects);
-
-        add_disk(dev->gd);
-
-        return 0;
-out_vfree:
-        return -ENOMEM;
-}
-
-/*
-static ssize_t show_nand_block_num(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n",
-                (int)IdentifyDeviceData.wDataBlockNum);
-}
-
-static ssize_t show_nand_pages_per_block(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n",
-                (int)IdentifyDeviceData.PagesPerBlock);
-}
-
-static ssize_t show_nand_page_size(struct device *dev,
-        struct device_attribute *attr, char *buf)
-{
-        return snprintf(buf, PAGE_SIZE, "%d\n",
-                (int)IdentifyDeviceData.PageDataSize);
-}
-
-static DEVICE_ATTR(nand_block_num, 0444, show_nand_block_num, NULL);
-static DEVICE_ATTR(nand_pages_per_block, 0444, show_nand_pages_per_block, NULL);
-static DEVICE_ATTR(nand_page_size, 0444, show_nand_page_size, NULL);
-
-static void create_sysfs_entry(struct device *dev)
-{
-        if (device_create_file(dev, &dev_attr_nand_block_num))
-                printk(KERN_ERR "Spectra: "
-                        "failed to create sysfs entry nand_block_num.\n");
-        if (device_create_file(dev, &dev_attr_nand_pages_per_block))
-                printk(KERN_ERR "Spectra: "
-                "failed to create sysfs entry nand_pages_per_block.\n");
-        if (device_create_file(dev, &dev_attr_nand_page_size))
-                printk(KERN_ERR "Spectra: "
-                "failed to create sysfs entry nand_page_size.\n");
-}
-*/
-
-static void register_spectra_ftl_async(void *unused, async_cookie_t cookie)
-{
-        int i;
-
-        /* create_sysfs_entry(&dev->dev); */
-
-        if (PASS != GLOB_FTL_IdentifyDevice(&IdentifyDeviceData)) {
-                printk(KERN_ERR "Spectra: Unable to Read Flash Device. "
-                       "Aborting\n");
-                return;
-        } else {
-                nand_dbg_print(NAND_DBG_WARN, "In GLOB_SBD_init: "
-                               "Num blocks=%d, pagesperblock=%d, "
-                               "pagedatasize=%d, ECCBytesPerSector=%d\n",
-                       (int)IdentifyDeviceData.NumBlocks,
-                       (int)IdentifyDeviceData.PagesPerBlock,
-                       (int)IdentifyDeviceData.PageDataSize,
-                       (int)IdentifyDeviceData.wECCBytesPerSector);
-        }
-
-        printk(KERN_ALERT "Spectra: searching block table, please wait ...\n");
-        if (GLOB_FTL_Init() != PASS) {
-                printk(KERN_ERR "Spectra: Unable to Initialize FTL Layer. "
-                       "Aborting\n");
-                goto out_ftl_flash_register;
-        }
-        printk(KERN_ALERT "Spectra: block table has been found.\n");
-
-        GLOB_SBD_majornum = register_blkdev(0, GLOB_SBD_NAME);
-        if (GLOB_SBD_majornum <= 0) {
-                printk(KERN_ERR "Unable to get the major %d for Spectra",
-                       GLOB_SBD_majornum);
-                goto out_ftl_flash_register;
-        }
-
-        for (i = 0; i < NUM_DEVICES; i++)
-                if (SBD_setup_device(&nand_device[i], i) == -ENOMEM)
-                        goto out_blk_register;
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                       "Spectra: module loaded with major number %d\n",
-                       GLOB_SBD_majornum);
-
-        return;
-
-out_blk_register:
-        unregister_blkdev(GLOB_SBD_majornum, GLOB_SBD_NAME);
-out_ftl_flash_register:
-        GLOB_FTL_Cache_Release();
-        printk(KERN_ERR "Spectra: Module load failed.\n");
-}
-
-int register_spectra_ftl()
-{
-        async_schedule(register_spectra_ftl_async, NULL);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(register_spectra_ftl);
-
-static int GLOB_SBD_init(void)
-{
-        /* Set debug output level (0~3) here. 3 is most verbose */
-        printk(KERN_ALERT "Spectra: %s\n", GLOB_version);
-
-        mutex_init(&spectra_lock);
-
-        if (PASS != GLOB_FTL_Flash_Init()) {
-                printk(KERN_ERR "Spectra: Unable to Initialize Flash Device. "
-                       "Aborting\n");
-                return -ENODEV;
-        }
-        return 0;
-}
-
-static void __exit GLOB_SBD_exit(void)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < NUM_DEVICES; i++) {
-                struct spectra_nand_dev *dev = &nand_device[i];
-                if (dev->gd) {
-                        del_gendisk(dev->gd);
-                        put_disk(dev->gd);
-                }
-                if (dev->queue)
-                        blk_cleanup_queue(dev->queue);
-                kfree(dev->tmp_buf);
-        }
-
-        unregister_blkdev(GLOB_SBD_majornum, GLOB_SBD_NAME);
-
-        mutex_lock(&spectra_lock);
-        force_flush_cache();
-        mutex_unlock(&spectra_lock);
-
-        GLOB_FTL_Cache_Release();
-
-        GLOB_FTL_Flash_Release();
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                       "Spectra FTL module (major number %d) unloaded.\n",
-                       GLOB_SBD_majornum);
-}
-
-module_init(GLOB_SBD_init);
-module_exit(GLOB_SBD_exit);
diff --git a/drivers/staging/spectra/ffsport.h b/drivers/staging/spectra/ffsport.h
deleted file mode 100644
index 85c0750612f6..000000000000
--- a/drivers/staging/spectra/ffsport.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _FFSPORT_
-#define _FFSPORT_
-
-#include "ffsdefs.h"
-
-#if defined __GNUC__
-#define PACKED
-#define PACKED_GNU __attribute__ ((packed))
-#define UNALIGNED
-#endif
-
-#include <linux/semaphore.h>
-#include <linux/string.h>       /* for strcpy(), stricmp(), etc */
-#include <linux/mm.h>           /* for kmalloc(), kfree() */
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-
-#include <linux/kernel.h>       /* printk() */
-#include <linux/fs.h>           /* everything... */
-#include <linux/errno.h>        /* error codes */
-#include <linux/types.h>        /* size_t */
-#include <linux/genhd.h>
-#include <linux/blkdev.h>
-#include <linux/hdreg.h>
-#include <linux/pci.h>
-#include "flash.h"
-
-#define VERBOSE    1
-
-#define NAND_DBG_WARN  1
-#define NAND_DBG_DEBUG 2
-#define NAND_DBG_TRACE 3
-
-extern int nand_debug_level;
-
-#ifdef VERBOSE
-#define nand_dbg_print(level, args...)                  \
-        do {                                            \
-                if (level <= nand_debug_level)          \
-                        printk(KERN_ALERT args);        \
-        } while (0)
-#else
-#define nand_dbg_print(level, args...)
-#endif
-
-#ifdef SUPPORT_BIG_ENDIAN
-#define INVERTUINT16(w)   ((u16)(((u16)(w)) << 8) | \
-                           (u16)((u16)(w) >> 8))
-
-#define INVERTUINT32(dw)  (((u32)(dw) << 24) | \
-                           (((u32)(dw) << 8) & 0x00ff0000) | \
-                           (((u32)(dw) >> 8) & 0x0000ff00) | \
-                           ((u32)(dw) >> 24))
-#else
-#define INVERTUINT16(w)   w
-#define INVERTUINT32(dw)  dw
-#endif
-
-extern int GLOB_Calc_Used_Bits(u32 n);
-extern u64 GLOB_u64_Div(u64 addr, u32 divisor);
-extern u64 GLOB_u64_Remainder(u64 addr, u32 divisor_type);
-extern int register_spectra_ftl(void);
-
-#endif /* _FFSPORT_ */
diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c
deleted file mode 100644
index aead358e5c2a..000000000000
--- a/drivers/staging/spectra/flash.c
+++ /dev/null
@@ -1,4305 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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/fs.h>
-#include <linux/slab.h>
-
-#include "flash.h"
-#include "ffsdefs.h"
-#include "lld.h"
-#include "lld_nand.h"
-#if CMD_DMA
-#include "lld_cdma.h"
-#endif
-
-#define BLK_FROM_ADDR(addr)  ((u32)(addr >> DeviceInfo.nBitsInBlockDataSize))
-#define PAGE_FROM_ADDR(addr, Block)  ((u16)((addr - (u64)Block * \
-        DeviceInfo.wBlockDataSize) >> DeviceInfo.nBitsInPageDataSize))
-
-#define IS_SPARE_BLOCK(blk)     (BAD_BLOCK != (pbt[blk] &\
-        BAD_BLOCK) && SPARE_BLOCK == (pbt[blk] & SPARE_BLOCK))
-
-#define IS_DATA_BLOCK(blk)      (0 == (pbt[blk] & BAD_BLOCK))
-
-#define IS_DISCARDED_BLOCK(blk) (BAD_BLOCK != (pbt[blk] &\
-        BAD_BLOCK) && DISCARD_BLOCK == (pbt[blk] & DISCARD_BLOCK))
-
-#define IS_BAD_BLOCK(blk)       (BAD_BLOCK == (pbt[blk] & BAD_BLOCK))
-
-#if DEBUG_BNDRY
-void debug_boundary_lineno_error(int chnl, int limit, int no,
-                                int lineno, char *filename)
-{
-        if (chnl >= limit)
-                printk(KERN_ERR "Boundary Check Fail value %d >= limit %d, "
-                "at  %s:%d. Other info:%d. Aborting...\n",
-                chnl, limit, filename, lineno, no);
-}
-/* static int globalmemsize; */
-#endif
-
-static u16 FTL_Cache_If_Hit(u64 dwPageAddr);
-static int FTL_Cache_Read(u64 dwPageAddr);
-static void FTL_Cache_Read_Page(u8 *pData, u64 dwPageAddr,
-                                u16 cache_blk);
-static void FTL_Cache_Write_Page(u8 *pData, u64 dwPageAddr,
-                                 u8 cache_blk, u16 flag);
-static int FTL_Cache_Write(void);
-static void FTL_Calculate_LRU(void);
-static u32 FTL_Get_Block_Index(u32 wBlockNum);
-
-static int FTL_Search_Block_Table_IN_Block(u32 BT_Block,
-                                           u8 BT_Tag, u16 *Page);
-static int FTL_Read_Block_Table(void);
-static int FTL_Write_Block_Table(int wForce);
-static int FTL_Write_Block_Table_Data(void);
-static int FTL_Check_Block_Table(int wOldTable);
-static int FTL_Static_Wear_Leveling(void);
-static u32 FTL_Replace_Block_Table(void);
-static int FTL_Write_IN_Progress_Block_Table_Page(void);
-
-static u32 FTL_Get_Page_Num(u64 length);
-static u64 FTL_Get_Physical_Block_Addr(u64 blk_addr);
-
-static u32 FTL_Replace_OneBlock(u32 wBlockNum,
-                                      u32 wReplaceNum);
-static u32 FTL_Replace_LWBlock(u32 wBlockNum,
-                                     int *pGarbageCollect);
-static u32 FTL_Replace_MWBlock(void);
-static int FTL_Replace_Block(u64 blk_addr);
-static int FTL_Adjust_Relative_Erase_Count(u32 Index_of_MAX);
-
-struct device_info_tag DeviceInfo;
-struct flash_cache_tag Cache;
-static struct spectra_l2_cache_info cache_l2;
-
-static u8 *cache_l2_page_buf;
-static u8 *cache_l2_blk_buf;
-
-u8 *g_pBlockTable;
-u8 *g_pWearCounter;
-u16 *g_pReadCounter;
-u32 *g_pBTBlocks;
-static u16 g_wBlockTableOffset;
-static u32 g_wBlockTableIndex;
-static u8 g_cBlockTableStatus;
-
-static u8 *g_pTempBuf;
-static u8 *flag_check_blk_table;
-static u8 *tmp_buf_search_bt_in_block;
-static u8 *spare_buf_search_bt_in_block;
-static u8 *spare_buf_bt_search_bt_in_block;
-static u8 *tmp_buf1_read_blk_table;
-static u8 *tmp_buf2_read_blk_table;
-static u8 *flags_static_wear_leveling;
-static u8 *tmp_buf_write_blk_table_data;
-static u8 *tmp_buf_read_disturbance;
-
-u8 *buf_read_page_main_spare;
-u8 *buf_write_page_main_spare;
-u8 *buf_read_page_spare;
-u8 *buf_get_bad_block;
-
-#if (RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE && CMD_DMA)
-struct flash_cache_delta_list_tag int_cache[MAX_CHANS + MAX_DESCS];
-struct flash_cache_tag cache_start_copy;
-#endif
-
-int g_wNumFreeBlocks;
-u8 g_SBDCmdIndex;
-
-static u8 *g_pIPF;
-static u8 bt_flag = FIRST_BT_ID;
-static u8 bt_block_changed;
-
-static u16 cache_block_to_write;
-static u8 last_erased = FIRST_BT_ID;
-
-static u8 GC_Called;
-static u8 BT_GC_Called;
-
-#if CMD_DMA
-#define COPY_BACK_BUF_NUM 10
-
-static u8 ftl_cmd_cnt;  /* Init value is 0 */
-u8 *g_pBTDelta;
-u8 *g_pBTDelta_Free;
-u8 *g_pBTStartingCopy;
-u8 *g_pWearCounterCopy;
-u16 *g_pReadCounterCopy;
-u8 *g_pBlockTableCopies;
-u8 *g_pNextBlockTable;
-static u8 *cp_back_buf_copies[COPY_BACK_BUF_NUM];
-static int cp_back_buf_idx;
-
-static u8 *g_temp_buf;
-
-#pragma pack(push, 1)
-#pragma pack(1)
-struct BTableChangesDelta {
-        u8 ftl_cmd_cnt;
-        u8 ValidFields;
-        u16 g_wBlockTableOffset;
-        u32 g_wBlockTableIndex;
-        u32 BT_Index;
-        u32 BT_Entry_Value;
-        u32 WC_Index;
-        u8 WC_Entry_Value;
-        u32 RC_Index;
-        u16 RC_Entry_Value;
-};
-
-#pragma pack(pop)
-
-struct BTableChangesDelta *p_BTableChangesDelta;
-#endif
-
-
-#define MARK_BLOCK_AS_BAD(blocknode)      (blocknode |= BAD_BLOCK)
-#define MARK_BLK_AS_DISCARD(blk)  (blk = (blk & ~SPARE_BLOCK) | DISCARD_BLOCK)
-
-#define FTL_Get_LBAPBA_Table_Mem_Size_Bytes() (DeviceInfo.wDataBlockNum *\
-                                                sizeof(u32))
-#define FTL_Get_WearCounter_Table_Mem_Size_Bytes() (DeviceInfo.wDataBlockNum *\
-                                                sizeof(u8))
-#define FTL_Get_ReadCounter_Table_Mem_Size_Bytes() (DeviceInfo.wDataBlockNum *\
-                                                sizeof(u16))
-#if SUPPORT_LARGE_BLOCKNUM
-#define FTL_Get_LBAPBA_Table_Flash_Size_Bytes() (DeviceInfo.wDataBlockNum *\
-                                                sizeof(u8) * 3)
-#else
-#define FTL_Get_LBAPBA_Table_Flash_Size_Bytes() (DeviceInfo.wDataBlockNum *\
-                                                sizeof(u16))
-#endif
-#define FTL_Get_WearCounter_Table_Flash_Size_Bytes \
-        FTL_Get_WearCounter_Table_Mem_Size_Bytes
-#define FTL_Get_ReadCounter_Table_Flash_Size_Bytes \
-        FTL_Get_ReadCounter_Table_Mem_Size_Bytes
-
-static u32 FTL_Get_Block_Table_Flash_Size_Bytes(void)
-{
-        u32 byte_num;
-
-        if (DeviceInfo.MLCDevice) {
-                byte_num = FTL_Get_LBAPBA_Table_Flash_Size_Bytes() +
-                        DeviceInfo.wDataBlockNum * sizeof(u8) +
-                        DeviceInfo.wDataBlockNum * sizeof(u16);
-        } else {
-                byte_num = FTL_Get_LBAPBA_Table_Flash_Size_Bytes() +
-                        DeviceInfo.wDataBlockNum * sizeof(u8);
-        }
-
-        byte_num += 4 * sizeof(u8);
-
-        return byte_num;
-}
-
-static u16  FTL_Get_Block_Table_Flash_Size_Pages(void)
-{
-        return (u16)FTL_Get_Page_Num(FTL_Get_Block_Table_Flash_Size_Bytes());
-}
-
-static int FTL_Copy_Block_Table_To_Flash(u8 *flashBuf, u32 sizeToTx,
-                                        u32 sizeTxed)
-{
-        u32 wBytesCopied, blk_tbl_size, wBytes;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        blk_tbl_size = FTL_Get_LBAPBA_Table_Flash_Size_Bytes();
-        for (wBytes = 0;
-        (wBytes < sizeToTx) && ((wBytes + sizeTxed) < blk_tbl_size);
-        wBytes++) {
-#if SUPPORT_LARGE_BLOCKNUM
-                flashBuf[wBytes] = (u8)(pbt[(wBytes + sizeTxed) / 3]
-                >> (((wBytes + sizeTxed) % 3) ?
-                ((((wBytes + sizeTxed) % 3) == 2) ? 0 : 8) : 16)) & 0xFF;
-#else
-                flashBuf[wBytes] = (u8)(pbt[(wBytes + sizeTxed) / 2]
-                >> (((wBytes + sizeTxed) % 2) ? 0 : 8)) & 0xFF;
-#endif
-        }
-
-        sizeTxed = (sizeTxed > blk_tbl_size) ? (sizeTxed - blk_tbl_size) : 0;
-        blk_tbl_size = FTL_Get_WearCounter_Table_Flash_Size_Bytes();
-        wBytesCopied = wBytes;
-        wBytes = ((blk_tbl_size - sizeTxed) > (sizeToTx - wBytesCopied)) ?
-                (sizeToTx - wBytesCopied) : (blk_tbl_size - sizeTxed);
-        memcpy(flashBuf + wBytesCopied, g_pWearCounter + sizeTxed, wBytes);
-
-        sizeTxed = (sizeTxed > blk_tbl_size) ? (sizeTxed - blk_tbl_size) : 0;
-
-        if (DeviceInfo.MLCDevice) {
-                blk_tbl_size = FTL_Get_ReadCounter_Table_Flash_Size_Bytes();
-                wBytesCopied += wBytes;
-                for (wBytes = 0; ((wBytes + wBytesCopied) < sizeToTx) &&
-                        ((wBytes + sizeTxed) < blk_tbl_size); wBytes++)
-                        flashBuf[wBytes + wBytesCopied] =
-                        (g_pReadCounter[(wBytes + sizeTxed) / 2] >>
-                        (((wBytes + sizeTxed) % 2) ? 0 : 8)) & 0xFF;
-        }
-
-        return wBytesCopied + wBytes;
-}
-
-static int FTL_Copy_Block_Table_From_Flash(u8 *flashBuf,
-                                u32 sizeToTx, u32 sizeTxed)
-{
-        u32 wBytesCopied, blk_tbl_size, wBytes;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        blk_tbl_size = FTL_Get_LBAPBA_Table_Flash_Size_Bytes();
-        for (wBytes = 0; (wBytes < sizeToTx) &&
-                ((wBytes + sizeTxed) < blk_tbl_size); wBytes++) {
-#if SUPPORT_LARGE_BLOCKNUM
-                if (!((wBytes + sizeTxed) % 3))
-                        pbt[(wBytes + sizeTxed) / 3] = 0;
-                pbt[(wBytes + sizeTxed) / 3] |=
-                        (flashBuf[wBytes] << (((wBytes + sizeTxed) % 3) ?
-                        ((((wBytes + sizeTxed) % 3) == 2) ? 0 : 8) : 16));
-#else
-                if (!((wBytes + sizeTxed) % 2))
-                        pbt[(wBytes + sizeTxed) / 2] = 0;
-                pbt[(wBytes + sizeTxed) / 2] |=
-                        (flashBuf[wBytes] << (((wBytes + sizeTxed) % 2) ?
-                        0 : 8));
-#endif
-        }
-
-        sizeTxed = (sizeTxed > blk_tbl_size) ? (sizeTxed - blk_tbl_size) : 0;
-        blk_tbl_size = FTL_Get_WearCounter_Table_Flash_Size_Bytes();
-        wBytesCopied = wBytes;
-        wBytes = ((blk_tbl_size - sizeTxed) > (sizeToTx - wBytesCopied)) ?
-                (sizeToTx - wBytesCopied) : (blk_tbl_size - sizeTxed);
-        memcpy(g_pWearCounter + sizeTxed, flashBuf + wBytesCopied, wBytes);
-        sizeTxed = (sizeTxed > blk_tbl_size) ? (sizeTxed - blk_tbl_size) : 0;
-
-        if (DeviceInfo.MLCDevice) {
-                wBytesCopied += wBytes;
-                blk_tbl_size = FTL_Get_ReadCounter_Table_Flash_Size_Bytes();
-                for (wBytes = 0; ((wBytes + wBytesCopied) < sizeToTx) &&
-                        ((wBytes + sizeTxed) < blk_tbl_size); wBytes++) {
-                        if (((wBytes + sizeTxed) % 2))
-                                g_pReadCounter[(wBytes + sizeTxed) / 2] = 0;
-                        g_pReadCounter[(wBytes + sizeTxed) / 2] |=
-                                (flashBuf[wBytes] <<
-                                (((wBytes + sizeTxed) % 2) ? 0 : 8));
-                }
-        }
-
-        return wBytesCopied+wBytes;
-}
-
-static int FTL_Insert_Block_Table_Signature(u8 *buf, u8 tag)
-{
-        int i;
-
-        for (i = 0; i < BTSIG_BYTES; i++)
-                buf[BTSIG_OFFSET + i] =
-                ((tag + (i * BTSIG_DELTA) - FIRST_BT_ID) %
-                (1 + LAST_BT_ID-FIRST_BT_ID)) + FIRST_BT_ID;
-
-        return PASS;
-}
-
-static int FTL_Extract_Block_Table_Tag(u8 *buf, u8 **tagarray)
-{
-        static u8 tag[BTSIG_BYTES >> 1];
-        int i, j, k, tagi, tagtemp, status;
-
-        *tagarray = (u8 *)tag;
-        tagi = 0;
-
-        for (i = 0; i < (BTSIG_BYTES - 1); i++) {
-                for (j = i + 1; (j < BTSIG_BYTES) &&
-                        (tagi < (BTSIG_BYTES >> 1)); j++) {
-                        tagtemp = buf[BTSIG_OFFSET + j] -
-                                buf[BTSIG_OFFSET + i];
-                        if (tagtemp && !(tagtemp % BTSIG_DELTA)) {
-                                tagtemp = (buf[BTSIG_OFFSET + i] +
-                                        (1 + LAST_BT_ID - FIRST_BT_ID) -
-                                        (i * BTSIG_DELTA)) %
-                                        (1 + LAST_BT_ID - FIRST_BT_ID);
-                                status = FAIL;
-                                for (k = 0; k < tagi; k++) {
-                                        if (tagtemp == tag[k])
-                                                status = PASS;
-                                }
-
-                                if (status == FAIL) {
-                                        tag[tagi++] = tagtemp;
-                                        i = (j == (i + 1)) ? i + 1 : i;
-                                        j = (j == (i + 1)) ? i + 1 : i;
-                                }
-                        }
-                }
-        }
-
-        return tagi;
-}
-
-
-static int FTL_Execute_SPL_Recovery(void)
-{
-        u32 j, block, blks;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        int ret;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                                __FILE__, __LINE__, __func__);
-
-        blks = DeviceInfo.wSpectraEndBlock - DeviceInfo.wSpectraStartBlock;
-        for (j = 0; j <= blks; j++) {
-                block = (pbt[j]);
-                if (((block & BAD_BLOCK) != BAD_BLOCK) &&
-                        ((block & SPARE_BLOCK) == SPARE_BLOCK)) {
-                        ret =  GLOB_LLD_Erase_Block(block & ~BAD_BLOCK);
-                        if (FAIL == ret) {
-                                nand_dbg_print(NAND_DBG_WARN,
-                                        "NAND Program fail in %s, Line %d, "
-                                        "Function: %s, new Bad Block %d "
-                                        "generated!\n",
-                                        __FILE__, __LINE__, __func__,
-                                        (int)(block & ~BAD_BLOCK));
-                                MARK_BLOCK_AS_BAD(pbt[j]);
-                        }
-                }
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_IdentifyDevice
-* Inputs:       pointer to identify data structure
-* Outputs:      PASS / FAIL
-* Description:  the identify data structure is filled in with
-*                   information for the block driver.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_IdentifyDevice(struct spectra_indentfy_dev_tag *dev_data)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                                __FILE__, __LINE__, __func__);
-
-        dev_data->NumBlocks = DeviceInfo.wTotalBlocks;
-        dev_data->PagesPerBlock = DeviceInfo.wPagesPerBlock;
-        dev_data->PageDataSize = DeviceInfo.wPageDataSize;
-        dev_data->wECCBytesPerSector = DeviceInfo.wECCBytesPerSector;
-        dev_data->wDataBlockNum = DeviceInfo.wDataBlockNum;
-
-        return PASS;
-}
-
-/* ..... */
-static int allocate_memory(void)
-{
-        u32 block_table_size, page_size, block_size, mem_size;
-        u32 total_bytes = 0;
-        int i;
-#if CMD_DMA
-        int j;
-#endif
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        page_size = DeviceInfo.wPageSize;
-        block_size = DeviceInfo.wPagesPerBlock * DeviceInfo.wPageDataSize;
-
-        block_table_size = DeviceInfo.wDataBlockNum *
-                (sizeof(u32) + sizeof(u8) + sizeof(u16));
-        block_table_size += (DeviceInfo.wPageDataSize -
-                (block_table_size % DeviceInfo.wPageDataSize)) %
-                DeviceInfo.wPageDataSize;
-
-        /* Malloc memory for block tables */
-        g_pBlockTable = kzalloc(block_table_size, GFP_ATOMIC);
-        if (!g_pBlockTable)
-                goto block_table_fail;
-        total_bytes += block_table_size;
-
-        g_pWearCounter = (u8 *)(g_pBlockTable +
-                DeviceInfo.wDataBlockNum * sizeof(u32));
-
-        if (DeviceInfo.MLCDevice)
-                g_pReadCounter = (u16 *)(g_pBlockTable +
-                        DeviceInfo.wDataBlockNum *
-                        (sizeof(u32) + sizeof(u8)));
-
-        /* Malloc memory and init for cache items */
-        for (i = 0; i < CACHE_ITEM_NUM; i++) {
-                Cache.array[i].address = NAND_CACHE_INIT_ADDR;
-                Cache.array[i].use_cnt = 0;
-                Cache.array[i].changed = CLEAR;
-                Cache.array[i].buf = kzalloc(Cache.cache_item_size,
-                                             GFP_ATOMIC);
-                if (!Cache.array[i].buf)
-                        goto cache_item_fail;
-                total_bytes += Cache.cache_item_size;
-        }
-
-        /* Malloc memory for IPF */
-        g_pIPF = kzalloc(page_size, GFP_ATOMIC);
-        if (!g_pIPF)
-                goto ipf_fail;
-        total_bytes += page_size;
-
-        /* Malloc memory for data merging during Level2 Cache flush */
-        cache_l2_page_buf = kmalloc(page_size, GFP_ATOMIC);
-        if (!cache_l2_page_buf)
-                goto cache_l2_page_buf_fail;
-        memset(cache_l2_page_buf, 0xff, page_size);
-        total_bytes += page_size;
-
-        cache_l2_blk_buf = kmalloc(block_size, GFP_ATOMIC);
-        if (!cache_l2_blk_buf)
-                goto cache_l2_blk_buf_fail;
-        memset(cache_l2_blk_buf, 0xff, block_size);
-        total_bytes += block_size;
-
-        /* Malloc memory for temp buffer */
-        g_pTempBuf = kzalloc(Cache.cache_item_size, GFP_ATOMIC);
-        if (!g_pTempBuf)
-                goto Temp_buf_fail;
-        total_bytes += Cache.cache_item_size;
-
-        /* Malloc memory for block table blocks */
-        mem_size = (1 + LAST_BT_ID - FIRST_BT_ID) * sizeof(u32);
-        g_pBTBlocks = kmalloc(mem_size, GFP_ATOMIC);
-        if (!g_pBTBlocks)
-                goto bt_blocks_fail;
-        memset(g_pBTBlocks, 0xff, mem_size);
-        total_bytes += mem_size;
-
-        /* Malloc memory for function FTL_Check_Block_Table */
-        flag_check_blk_table = kmalloc(DeviceInfo.wDataBlockNum, GFP_ATOMIC);
-        if (!flag_check_blk_table)
-                goto flag_check_blk_table_fail;
-        total_bytes += DeviceInfo.wDataBlockNum;
-
-        /* Malloc memory for function FTL_Search_Block_Table_IN_Block */
-        tmp_buf_search_bt_in_block = kmalloc(page_size, GFP_ATOMIC);
-        if (!tmp_buf_search_bt_in_block)
-                goto tmp_buf_search_bt_in_block_fail;
-        memset(tmp_buf_search_bt_in_block, 0xff, page_size);
-        total_bytes += page_size;
-
-        mem_size = DeviceInfo.wPageSize - DeviceInfo.wPageDataSize;
-        spare_buf_search_bt_in_block = kmalloc(mem_size, GFP_ATOMIC);
-        if (!spare_buf_search_bt_in_block)
-                goto spare_buf_search_bt_in_block_fail;
-        memset(spare_buf_search_bt_in_block, 0xff, mem_size);
-        total_bytes += mem_size;
-
-        spare_buf_bt_search_bt_in_block = kmalloc(mem_size, GFP_ATOMIC);
-        if (!spare_buf_bt_search_bt_in_block)
-                goto spare_buf_bt_search_bt_in_block_fail;
-        memset(spare_buf_bt_search_bt_in_block, 0xff, mem_size);
-        total_bytes += mem_size;
-
-        /* Malloc memory for function FTL_Read_Block_Table */
-        tmp_buf1_read_blk_table = kmalloc(page_size, GFP_ATOMIC);
-        if (!tmp_buf1_read_blk_table)
-                goto tmp_buf1_read_blk_table_fail;
-        memset(tmp_buf1_read_blk_table, 0xff, page_size);
-        total_bytes += page_size;
-
-        tmp_buf2_read_blk_table = kmalloc(page_size, GFP_ATOMIC);
-        if (!tmp_buf2_read_blk_table)
-                goto tmp_buf2_read_blk_table_fail;
-        memset(tmp_buf2_read_blk_table, 0xff, page_size);
-        total_bytes += page_size;
-
-        /* Malloc memory for function FTL_Static_Wear_Leveling */
-        flags_static_wear_leveling = kmalloc(DeviceInfo.wDataBlockNum,
-                                        GFP_ATOMIC);
-        if (!flags_static_wear_leveling)
-                goto flags_static_wear_leveling_fail;
-        total_bytes += DeviceInfo.wDataBlockNum;
-
-        /* Malloc memory for function FTL_Write_Block_Table_Data */
-        if (FTL_Get_Block_Table_Flash_Size_Pages() > 3)
-                mem_size = FTL_Get_Block_Table_Flash_Size_Bytes() -
-                                2 * DeviceInfo.wPageSize;
-        else
-                mem_size = DeviceInfo.wPageSize;
-        tmp_buf_write_blk_table_data = kmalloc(mem_size, GFP_ATOMIC);
-        if (!tmp_buf_write_blk_table_data)
-                goto tmp_buf_write_blk_table_data_fail;
-        memset(tmp_buf_write_blk_table_data, 0xff, mem_size);
-        total_bytes += mem_size;
-
-        /* Malloc memory for function FTL_Read_Disturbance */
-        tmp_buf_read_disturbance = kmalloc(block_size, GFP_ATOMIC);
-        if (!tmp_buf_read_disturbance)
-                goto tmp_buf_read_disturbance_fail;
-        memset(tmp_buf_read_disturbance, 0xff, block_size);
-        total_bytes += block_size;
-
-        /* Alloc mem for function NAND_Read_Page_Main_Spare of lld_nand.c */
-        buf_read_page_main_spare = kmalloc(DeviceInfo.wPageSize, GFP_ATOMIC);
-        if (!buf_read_page_main_spare)
-                goto buf_read_page_main_spare_fail;
-        total_bytes += DeviceInfo.wPageSize;
-
-        /* Alloc mem for function NAND_Write_Page_Main_Spare of lld_nand.c */
-        buf_write_page_main_spare = kmalloc(DeviceInfo.wPageSize, GFP_ATOMIC);
-        if (!buf_write_page_main_spare)
-                goto buf_write_page_main_spare_fail;
-        total_bytes += DeviceInfo.wPageSize;
-
-        /* Alloc mem for function NAND_Read_Page_Spare of lld_nand.c */
-        buf_read_page_spare = kmalloc(DeviceInfo.wPageSpareSize, GFP_ATOMIC);
-        if (!buf_read_page_spare)
-                goto buf_read_page_spare_fail;
-        memset(buf_read_page_spare, 0xff, DeviceInfo.wPageSpareSize);
-        total_bytes += DeviceInfo.wPageSpareSize;
-
-        /* Alloc mem for function NAND_Get_Bad_Block of lld_nand.c */
-        buf_get_bad_block = kmalloc(DeviceInfo.wPageSpareSize, GFP_ATOMIC);
-        if (!buf_get_bad_block)
-                goto buf_get_bad_block_fail;
-        memset(buf_get_bad_block, 0xff, DeviceInfo.wPageSpareSize);
-        total_bytes += DeviceInfo.wPageSpareSize;
-
-#if CMD_DMA
-        g_temp_buf = kmalloc(block_size, GFP_ATOMIC);
-        if (!g_temp_buf)
-                goto temp_buf_fail;
-        memset(g_temp_buf, 0xff, block_size);
-        total_bytes += block_size;
-
-        /* Malloc memory for copy of block table used in CDMA mode */
-        g_pBTStartingCopy = kzalloc(block_table_size, GFP_ATOMIC);
-        if (!g_pBTStartingCopy)
-                goto bt_starting_copy;
-        total_bytes += block_table_size;
-
-        g_pWearCounterCopy = (u8 *)(g_pBTStartingCopy +
-                DeviceInfo.wDataBlockNum * sizeof(u32));
-
-        if (DeviceInfo.MLCDevice)
-                g_pReadCounterCopy = (u16 *)(g_pBTStartingCopy +
-                        DeviceInfo.wDataBlockNum *
-                        (sizeof(u32) + sizeof(u8)));
-
-        /* Malloc memory for block table copies */
-        mem_size = 5 * DeviceInfo.wDataBlockNum * sizeof(u32) +
-                        5 * DeviceInfo.wDataBlockNum * sizeof(u8);
-        if (DeviceInfo.MLCDevice)
-                mem_size += 5 * DeviceInfo.wDataBlockNum * sizeof(u16);
-        g_pBlockTableCopies = kzalloc(mem_size, GFP_ATOMIC);
-        if (!g_pBlockTableCopies)
-                goto blk_table_copies_fail;
-        total_bytes += mem_size;
-        g_pNextBlockTable = g_pBlockTableCopies;
-
-        /* Malloc memory for Block Table Delta */
-        mem_size = MAX_DESCS * sizeof(struct BTableChangesDelta);
-        g_pBTDelta = kzalloc(mem_size, GFP_ATOMIC);
-        if (!g_pBTDelta)
-                goto bt_delta_fail;
-        total_bytes += mem_size;
-        g_pBTDelta_Free = g_pBTDelta;
-
-        /* Malloc memory for Copy Back Buffers */
-        for (j = 0; j < COPY_BACK_BUF_NUM; j++) {
-                cp_back_buf_copies[j] = kzalloc(block_size, GFP_ATOMIC);
-                if (!cp_back_buf_copies[j])
-                        goto cp_back_buf_copies_fail;
-                total_bytes += block_size;
-        }
-        cp_back_buf_idx = 0;
-
-        /* Malloc memory for pending commands list */
-        mem_size = sizeof(struct pending_cmd) * MAX_DESCS;
-        info.pcmds = kzalloc(mem_size, GFP_KERNEL);
-        if (!info.pcmds)
-                goto pending_cmds_buf_fail;
-        total_bytes += mem_size;
-
-        /* Malloc memory for CDMA descripter table */
-        mem_size = sizeof(struct cdma_descriptor) * MAX_DESCS;
-        info.cdma_desc_buf = kzalloc(mem_size, GFP_KERNEL);
-        if (!info.cdma_desc_buf)
-                goto cdma_desc_buf_fail;
-        total_bytes += mem_size;
-
-        /* Malloc memory for Memcpy descripter table */
-        mem_size = sizeof(struct memcpy_descriptor) * MAX_DESCS;
-        info.memcp_desc_buf = kzalloc(mem_size, GFP_KERNEL);
-        if (!info.memcp_desc_buf)
-                goto memcp_desc_buf_fail;
-        total_bytes += mem_size;
-#endif
-
-        nand_dbg_print(NAND_DBG_WARN,
-                "Total memory allocated in FTL layer: %d\n", total_bytes);
-
-        return PASS;
-
-#if CMD_DMA
-memcp_desc_buf_fail:
-        kfree(info.cdma_desc_buf);
-cdma_desc_buf_fail:
-        kfree(info.pcmds);
-pending_cmds_buf_fail:
-cp_back_buf_copies_fail:
-        j--;
-        for (; j >= 0; j--)
-                kfree(cp_back_buf_copies[j]);
-        kfree(g_pBTDelta);
-bt_delta_fail:
-        kfree(g_pBlockTableCopies);
-blk_table_copies_fail:
-        kfree(g_pBTStartingCopy);
-bt_starting_copy:
-        kfree(g_temp_buf);
-temp_buf_fail:
-        kfree(buf_get_bad_block);
-#endif
-
-buf_get_bad_block_fail:
-        kfree(buf_read_page_spare);
-buf_read_page_spare_fail:
-        kfree(buf_write_page_main_spare);
-buf_write_page_main_spare_fail:
-        kfree(buf_read_page_main_spare);
-buf_read_page_main_spare_fail:
-        kfree(tmp_buf_read_disturbance);
-tmp_buf_read_disturbance_fail:
-        kfree(tmp_buf_write_blk_table_data);
-tmp_buf_write_blk_table_data_fail:
-        kfree(flags_static_wear_leveling);
-flags_static_wear_leveling_fail:
-        kfree(tmp_buf2_read_blk_table);
-tmp_buf2_read_blk_table_fail:
-        kfree(tmp_buf1_read_blk_table);
-tmp_buf1_read_blk_table_fail:
-        kfree(spare_buf_bt_search_bt_in_block);
-spare_buf_bt_search_bt_in_block_fail:
-        kfree(spare_buf_search_bt_in_block);
-spare_buf_search_bt_in_block_fail:
-        kfree(tmp_buf_search_bt_in_block);
-tmp_buf_search_bt_in_block_fail:
-        kfree(flag_check_blk_table);
-flag_check_blk_table_fail:
-        kfree(g_pBTBlocks);
-bt_blocks_fail:
-        kfree(g_pTempBuf);
-Temp_buf_fail:
-        kfree(cache_l2_blk_buf);
-cache_l2_blk_buf_fail:
-        kfree(cache_l2_page_buf);
-cache_l2_page_buf_fail:
-        kfree(g_pIPF);
-ipf_fail:
-cache_item_fail:
-        i--;
-        for (; i >= 0; i--)
-                kfree(Cache.array[i].buf);
-        kfree(g_pBlockTable);
-block_table_fail:
-        printk(KERN_ERR "Failed to kmalloc memory in %s Line %d.\n",
-                __FILE__, __LINE__);
-
-        return -ENOMEM;
-}
-
-/* .... */
-static int free_memory(void)
-{
-        int i;
-
-#if CMD_DMA
-        kfree(info.memcp_desc_buf);
-        kfree(info.cdma_desc_buf);
-        kfree(info.pcmds);
-        for (i = COPY_BACK_BUF_NUM - 1; i >= 0; i--)
-                kfree(cp_back_buf_copies[i]);
-        kfree(g_pBTDelta);
-        kfree(g_pBlockTableCopies);
-        kfree(g_pBTStartingCopy);
-        kfree(g_temp_buf);
-        kfree(buf_get_bad_block);
-#endif
-        kfree(buf_read_page_spare);
-        kfree(buf_write_page_main_spare);
-        kfree(buf_read_page_main_spare);
-        kfree(tmp_buf_read_disturbance);
-        kfree(tmp_buf_write_blk_table_data);
-        kfree(flags_static_wear_leveling);
-        kfree(tmp_buf2_read_blk_table);
-        kfree(tmp_buf1_read_blk_table);
-        kfree(spare_buf_bt_search_bt_in_block);
-        kfree(spare_buf_search_bt_in_block);
-        kfree(tmp_buf_search_bt_in_block);
-        kfree(flag_check_blk_table);
-        kfree(g_pBTBlocks);
-        kfree(g_pTempBuf);
-        kfree(g_pIPF);
-        for (i = CACHE_ITEM_NUM - 1; i >= 0; i--)
-                kfree(Cache.array[i].buf);
-        kfree(g_pBlockTable);
-
-        return 0;
-}
-
-static void dump_cache_l2_table(void)
-{
-        struct list_head *p;
-        struct spectra_l2_cache_list *pnd;
-        int n;
-
-        n = 0;
-        list_for_each(p, &cache_l2.table.list) {
-                pnd = list_entry(p, struct spectra_l2_cache_list, list);
-                nand_dbg_print(NAND_DBG_WARN, "dump_cache_l2_table node: %d, logical_blk_num: %d\n", n, pnd->logical_blk_num);
-/*
-                for (i = 0; i < DeviceInfo.wPagesPerBlock; i++) {
-                        if (pnd->pages_array[i] != MAX_U32_VALUE)
-                                nand_dbg_print(NAND_DBG_WARN, "    pages_array[%d]: 0x%x\n", i, pnd->pages_array[i]);
-                }
-*/
-                n++;
-        }
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Init
-* Inputs:       none
-* Outputs:      PASS=0 / FAIL=1
-* Description:  allocates the memory for cache array,
-*               important data structures
-*               clears the cache array
-*               reads the block table from flash into array
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Init(void)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        Cache.pages_per_item = 1;
-        Cache.cache_item_size = 1 * DeviceInfo.wPageDataSize;
-
-        if (allocate_memory() != PASS)
-                return FAIL;
-
-#if CMD_DMA
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        memcpy((void *)&cache_start_copy, (void *)&Cache,
-                sizeof(struct flash_cache_tag));
-        memset((void *)&int_cache, -1,
-                sizeof(struct flash_cache_delta_list_tag) *
-                (MAX_CHANS + MAX_DESCS));
-#endif
-        ftl_cmd_cnt = 0;
-#endif
-
-        if (FTL_Read_Block_Table() != PASS)
-                return FAIL;
-
-        /* Init the Level2 Cache data structure */
-        for (i = 0; i < BLK_NUM_FOR_L2_CACHE; i++)
-                cache_l2.blk_array[i] = MAX_U32_VALUE;
-        cache_l2.cur_blk_idx = 0;
-        cache_l2.cur_page_num = 0;
-        INIT_LIST_HEAD(&cache_l2.table.list);
-        cache_l2.table.logical_blk_num = MAX_U32_VALUE;
-
-        dump_cache_l2_table();
-
-        return 0;
-}
-
-
-#if CMD_DMA
-#if 0
-static void save_blk_table_changes(u16 idx)
-{
-        u8 ftl_cmd;
-        u32 *pbt = (u32 *)g_pBTStartingCopy;
-
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        u16 id;
-        u8 cache_blks;
-
-        id = idx - MAX_CHANS;
-        if (int_cache[id].item != -1) {
-                cache_blks = int_cache[id].item;
-                cache_start_copy.array[cache_blks].address =
-                        int_cache[id].cache.address;
-                cache_start_copy.array[cache_blks].changed =
-                        int_cache[id].cache.changed;
-        }
-#endif
-
-        ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-
-        while (ftl_cmd <= PendingCMD[idx].Tag) {
-                if (p_BTableChangesDelta->ValidFields == 0x01) {
-                        g_wBlockTableOffset =
-                                p_BTableChangesDelta->g_wBlockTableOffset;
-                } else if (p_BTableChangesDelta->ValidFields == 0x0C) {
-                        pbt[p_BTableChangesDelta->BT_Index] =
-                                p_BTableChangesDelta->BT_Entry_Value;
-                        debug_boundary_error(((
-                                p_BTableChangesDelta->BT_Index)),
-                                DeviceInfo.wDataBlockNum, 0);
-                } else if (p_BTableChangesDelta->ValidFields == 0x03) {
-                        g_wBlockTableOffset =
-                                p_BTableChangesDelta->g_wBlockTableOffset;
-                        g_wBlockTableIndex =
-                                p_BTableChangesDelta->g_wBlockTableIndex;
-                } else if (p_BTableChangesDelta->ValidFields == 0x30) {
-                        g_pWearCounterCopy[p_BTableChangesDelta->WC_Index] =
-                                p_BTableChangesDelta->WC_Entry_Value;
-                } else if ((DeviceInfo.MLCDevice) &&
-                        (p_BTableChangesDelta->ValidFields == 0xC0)) {
-                        g_pReadCounterCopy[p_BTableChangesDelta->RC_Index] =
-                                p_BTableChangesDelta->RC_Entry_Value;
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "In event status setting read counter "
-                                "GLOB_ftl_cmd_cnt %u Count %u Index %u\n",
-                                ftl_cmd,
-                                p_BTableChangesDelta->RC_Entry_Value,
-                                (unsigned int)p_BTableChangesDelta->RC_Index);
-                } else {
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "This should never occur \n");
-                }
-                p_BTableChangesDelta += 1;
-                ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-        }
-}
-
-static void discard_cmds(u16 n)
-{
-        u32 *pbt = (u32 *)g_pBTStartingCopy;
-        u8 ftl_cmd;
-        unsigned long k;
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        u8 cache_blks;
-        u16 id;
-#endif
-
-        if ((PendingCMD[n].CMD == WRITE_MAIN_CMD) ||
-                (PendingCMD[n].CMD == WRITE_MAIN_SPARE_CMD)) {
-                for (k = 0; k < DeviceInfo.wDataBlockNum; k++) {
-                        if (PendingCMD[n].Block == (pbt[k] & (~BAD_BLOCK)))
-                                MARK_BLK_AS_DISCARD(pbt[k]);
-                }
-        }
-
-        ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-        while (ftl_cmd <= PendingCMD[n].Tag) {
-                p_BTableChangesDelta += 1;
-                ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-        }
-
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        id = n - MAX_CHANS;
-
-        if (int_cache[id].item != -1) {
-                cache_blks = int_cache[id].item;
-                if (PendingCMD[n].CMD == MEMCOPY_CMD) {
-                        if ((cache_start_copy.array[cache_blks].buf <=
-                                PendingCMD[n].DataDestAddr) &&
-                                ((cache_start_copy.array[cache_blks].buf +
-                                Cache.cache_item_size) >
-                                PendingCMD[n].DataDestAddr)) {
-                                cache_start_copy.array[cache_blks].address =
-                                                NAND_CACHE_INIT_ADDR;
-                                cache_start_copy.array[cache_blks].use_cnt =
-                                                                0;
-                                cache_start_copy.array[cache_blks].changed =
-                                                                CLEAR;
-                        }
-                } else {
-                        cache_start_copy.array[cache_blks].address =
-                                        int_cache[id].cache.address;
-                        cache_start_copy.array[cache_blks].changed =
-                                        int_cache[id].cache.changed;
-                }
-        }
-#endif
-}
-
-static void process_cmd_pass(int *first_failed_cmd, u16 idx)
-{
-        if (0 == *first_failed_cmd)
-                save_blk_table_changes(idx);
-        else
-                discard_cmds(idx);
-}
-
-static void process_cmd_fail_abort(int *first_failed_cmd,
-                                u16 idx, int event)
-{
-        u32 *pbt = (u32 *)g_pBTStartingCopy;
-        u8 ftl_cmd;
-        unsigned long i;
-        int erase_fail, program_fail;
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        u8 cache_blks;
-        u16 id;
-#endif
-
-        if (0 == *first_failed_cmd)
-                *first_failed_cmd = PendingCMD[idx].SBDCmdIndex;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Uncorrectable error has occurred "
-                "while executing %u Command %u accesing Block %u\n",
-                (unsigned int)p_BTableChangesDelta->ftl_cmd_cnt,
-                PendingCMD[idx].CMD,
-                (unsigned int)PendingCMD[idx].Block);
-
-        ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-        while (ftl_cmd <= PendingCMD[idx].Tag) {
-                p_BTableChangesDelta += 1;
-                ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-        }
-
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        id = idx - MAX_CHANS;
-
-        if (int_cache[id].item != -1) {
-                cache_blks = int_cache[id].item;
-                if ((PendingCMD[idx].CMD == WRITE_MAIN_CMD)) {
-                        cache_start_copy.array[cache_blks].address =
-                                        int_cache[id].cache.address;
-                        cache_start_copy.array[cache_blks].changed = SET;
-                } else if ((PendingCMD[idx].CMD == READ_MAIN_CMD)) {
-                        cache_start_copy.array[cache_blks].address =
-                                NAND_CACHE_INIT_ADDR;
-                        cache_start_copy.array[cache_blks].use_cnt = 0;
-                        cache_start_copy.array[cache_blks].changed =
-                                                        CLEAR;
-                } else if (PendingCMD[idx].CMD == ERASE_CMD) {
-                        /* ? */
-                } else if (PendingCMD[idx].CMD == MEMCOPY_CMD) {
-                        /* ? */
-                }
-        }
-#endif
-
-        erase_fail = (event == EVENT_ERASE_FAILURE) &&
-                        (PendingCMD[idx].CMD == ERASE_CMD);
-
-        program_fail = (event == EVENT_PROGRAM_FAILURE) &&
-                        ((PendingCMD[idx].CMD == WRITE_MAIN_CMD) ||
-                        (PendingCMD[idx].CMD == WRITE_MAIN_SPARE_CMD));
-
-        if (erase_fail || program_fail) {
-                for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                        if (PendingCMD[idx].Block ==
-                                (pbt[i] & (~BAD_BLOCK)))
-                                MARK_BLOCK_AS_BAD(pbt[i]);
-                }
-        }
-}
-
-static void process_cmd(int *first_failed_cmd, u16 idx, int event)
-{
-        u8 ftl_cmd;
-        int cmd_match = 0;
-
-        if (p_BTableChangesDelta->ftl_cmd_cnt == PendingCMD[idx].Tag)
-                cmd_match = 1;
-
-        if (PendingCMD[idx].Status == CMD_PASS) {
-                process_cmd_pass(first_failed_cmd, idx);
-        } else if ((PendingCMD[idx].Status == CMD_FAIL) ||
-                        (PendingCMD[idx].Status == CMD_ABORT)) {
-                process_cmd_fail_abort(first_failed_cmd, idx, event);
-        } else if ((PendingCMD[idx].Status == CMD_NOT_DONE) &&
-                                        PendingCMD[idx].Tag) {
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        " Command no. %hu is not executed\n",
-                        (unsigned int)PendingCMD[idx].Tag);
-                ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-                while (ftl_cmd <= PendingCMD[idx].Tag) {
-                        p_BTableChangesDelta += 1;
-                        ftl_cmd = p_BTableChangesDelta->ftl_cmd_cnt;
-                }
-        }
-}
-#endif
-
-static void process_cmd(int *first_failed_cmd, u16 idx, int event)
-{
-        printk(KERN_ERR "temporary workaround function. "
-                "Should not be called! \n");
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Event_Status
-* Inputs:       none
-* Outputs:      Event Code
-* Description:  It is called by SBD after hardware interrupt signalling
-*               completion of commands chain
-*               It does following things
-*               get event status from LLD
-*               analyze command chain status
-*               determine last command executed
-*               analyze results
-*               rebuild the block table in case of uncorrectable error
-*               return event code
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Event_Status(int *first_failed_cmd)
-{
-        int event_code = PASS;
-        u16 i_P;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        *first_failed_cmd = 0;
-
-        event_code = GLOB_LLD_Event_Status();
-
-        switch (event_code) {
-        case EVENT_PASS:
-                nand_dbg_print(NAND_DBG_DEBUG, "Handling EVENT_PASS\n");
-                break;
-        case EVENT_UNCORRECTABLE_DATA_ERROR:
-                nand_dbg_print(NAND_DBG_DEBUG, "Handling Uncorrectable ECC!\n");
-                break;
-        case EVENT_PROGRAM_FAILURE:
-        case EVENT_ERASE_FAILURE:
-                nand_dbg_print(NAND_DBG_WARN, "Handling Ugly case. "
-                        "Event code: 0x%x\n", event_code);
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta;
-                for (i_P = MAX_CHANS; i_P < (ftl_cmd_cnt + MAX_CHANS);
-                                i_P++)
-                        process_cmd(first_failed_cmd, i_P, event_code);
-                memcpy(g_pBlockTable, g_pBTStartingCopy,
-                        DeviceInfo.wDataBlockNum * sizeof(u32));
-                memcpy(g_pWearCounter, g_pWearCounterCopy,
-                        DeviceInfo.wDataBlockNum * sizeof(u8));
-                if (DeviceInfo.MLCDevice)
-                        memcpy(g_pReadCounter, g_pReadCounterCopy,
-                                DeviceInfo.wDataBlockNum * sizeof(u16));
-
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-                memcpy((void *)&Cache, (void *)&cache_start_copy,
-                        sizeof(struct flash_cache_tag));
-                memset((void *)&int_cache, -1,
-                        sizeof(struct flash_cache_delta_list_tag) *
-                        (MAX_DESCS + MAX_CHANS));
-#endif
-                break;
-        default:
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Handling unexpected event code - 0x%x\n",
-                        event_code);
-                event_code = ERR;
-                break;
-        }
-
-        memcpy(g_pBTStartingCopy, g_pBlockTable,
-                DeviceInfo.wDataBlockNum * sizeof(u32));
-        memcpy(g_pWearCounterCopy, g_pWearCounter,
-                DeviceInfo.wDataBlockNum * sizeof(u8));
-        if (DeviceInfo.MLCDevice)
-                memcpy(g_pReadCounterCopy, g_pReadCounter,
-                        DeviceInfo.wDataBlockNum * sizeof(u16));
-
-        g_pBTDelta_Free = g_pBTDelta;
-        ftl_cmd_cnt = 0;
-        g_pNextBlockTable = g_pBlockTableCopies;
-        cp_back_buf_idx = 0;
-
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        memcpy((void *)&cache_start_copy, (void *)&Cache,
-                sizeof(struct flash_cache_tag));
-        memset((void *)&int_cache, -1,
-                sizeof(struct flash_cache_delta_list_tag) *
-                (MAX_DESCS + MAX_CHANS));
-#endif
-
-        return event_code;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     glob_ftl_execute_cmds
-* Inputs:       none
-* Outputs:      none
-* Description:  pass thru to LLD
-***************************************************************/
-u16 glob_ftl_execute_cmds(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE,
-                "glob_ftl_execute_cmds: ftl_cmd_cnt %u\n",
-                (unsigned int)ftl_cmd_cnt);
-        g_SBDCmdIndex = 0;
-        return glob_lld_execute_cmds();
-}
-
-#endif
-
-#if !CMD_DMA
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Read Immediate
-* Inputs:         pointer to data
-*                     address of data
-* Outputs:      PASS / FAIL
-* Description:  Reads one page of data into RAM directly from flash without
-*       using or disturbing cache.It is assumed this function is called
-*       with CMD-DMA disabled.
-*****************************************************************/
-int GLOB_FTL_Read_Immediate(u8 *read_data, u64 addr)
-{
-        int wResult = FAIL;
-        u32 Block;
-        u16 Page;
-        u32 phy_blk;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        Block = BLK_FROM_ADDR(addr);
-        Page = PAGE_FROM_ADDR(addr, Block);
-
-        if (!IS_SPARE_BLOCK(Block))
-                return FAIL;
-
-        phy_blk = pbt[Block];
-        wResult = GLOB_LLD_Read_Page_Main(read_data, phy_blk, Page, 1);
-
-        if (DeviceInfo.MLCDevice) {
-                g_pReadCounter[phy_blk - DeviceInfo.wSpectraStartBlock]++;
-                if (g_pReadCounter[phy_blk - DeviceInfo.wSpectraStartBlock]
-                        >= MAX_READ_COUNTER)
-                        FTL_Read_Disturbance(phy_blk);
-                if (g_cBlockTableStatus != IN_PROGRESS_BLOCK_TABLE) {
-                        g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                        FTL_Write_IN_Progress_Block_Table_Page();
-                }
-        }
-
-        return wResult;
-}
-#endif
-
-#ifdef SUPPORT_BIG_ENDIAN
-/*********************************************************************
-* Function:     FTL_Invert_Block_Table
-* Inputs:       none
-* Outputs:      none
-* Description:  Re-format the block table in ram based on BIG_ENDIAN and
-*                     LARGE_BLOCKNUM if necessary
-**********************************************************************/
-static void FTL_Invert_Block_Table(void)
-{
-        u32 i;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-#ifdef SUPPORT_LARGE_BLOCKNUM
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                pbt[i] = INVERTUINT32(pbt[i]);
-                g_pWearCounter[i] = INVERTUINT32(g_pWearCounter[i]);
-        }
-#else
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                pbt[i] = INVERTUINT16(pbt[i]);
-                g_pWearCounter[i] = INVERTUINT16(g_pWearCounter[i]);
-        }
-#endif
-}
-#endif
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Flash_Init
-* Inputs:       none
-* Outputs:      PASS=0 / FAIL=0x01 (based on read ID)
-* Description:  The flash controller is initialized
-*               The flash device is reset
-*               Perform a flash READ ID command to confirm that a
-*                   valid device is attached and active.
-*                   The DeviceInfo structure gets filled in
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Flash_Init(void)
-{
-        int status = FAIL;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        g_SBDCmdIndex = 0;
-
-        status = GLOB_LLD_Flash_Init();
-
-        return status;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Inputs:       none
-* Outputs:      PASS=0 / FAIL=0x01 (based on read ID)
-* Description:  The flash controller is released
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Flash_Release(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        return GLOB_LLD_Flash_Release();
-}
-
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Cache_Release
-* Inputs:       none
-* Outputs:      none
-* Description:  release all allocated memory in GLOB_FTL_Init
-*               (allocated in GLOB_FTL_Init)
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-void GLOB_FTL_Cache_Release(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        free_memory();
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_If_Hit
-* Inputs:       Page Address
-* Outputs:      Block number/UNHIT BLOCK
-* Description:  Determines if the addressed page is in cache
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u16 FTL_Cache_If_Hit(u64 page_addr)
-{
-        u16 item;
-        u64 addr;
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        item = UNHIT_CACHE_ITEM;
-        for (i = 0; i < CACHE_ITEM_NUM; i++) {
-                addr = Cache.array[i].address;
-                if ((page_addr >= addr) &&
-                        (page_addr < (addr + Cache.cache_item_size))) {
-                        item = i;
-                        break;
-                }
-        }
-
-        return item;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Calculate_LRU
-* Inputs:       None
-* Outputs:      None
-* Description:  Calculate the least recently block in a cache and record its
-*               index in LRU field.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static void FTL_Calculate_LRU(void)
-{
-        u16 i, bCurrentLRU, bTempCount;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        bCurrentLRU = 0;
-        bTempCount = MAX_WORD_VALUE;
-
-        for (i = 0; i < CACHE_ITEM_NUM; i++) {
-                if (Cache.array[i].use_cnt < bTempCount) {
-                        bCurrentLRU = i;
-                        bTempCount = Cache.array[i].use_cnt;
-                }
-        }
-
-        Cache.LRU = bCurrentLRU;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_Read_Page
-* Inputs:       pointer to read buffer, logical address and cache item number
-* Outputs:      None
-* Description:  Read the page from the cached block addressed by blocknumber
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static void FTL_Cache_Read_Page(u8 *data_buf, u64 logic_addr, u16 cache_item)
-{
-        u8 *start_addr;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        start_addr = Cache.array[cache_item].buf;
-        start_addr += (u32)(((logic_addr - Cache.array[cache_item].address) >>
-                DeviceInfo.nBitsInPageDataSize) * DeviceInfo.wPageDataSize);
-
-#if CMD_DMA
-        GLOB_LLD_MemCopy_CMD(data_buf, start_addr,
-                        DeviceInfo.wPageDataSize, 0);
-        ftl_cmd_cnt++;
-#else
-        memcpy(data_buf, start_addr, DeviceInfo.wPageDataSize);
-#endif
-
-        if (Cache.array[cache_item].use_cnt < MAX_WORD_VALUE)
-                Cache.array[cache_item].use_cnt++;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_Read_All
-* Inputs:       pointer to read buffer,block address
-* Outputs:      PASS=0 / FAIL =1
-* Description:  It reads pages in cache
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Cache_Read_All(u8 *pData, u64 phy_addr)
-{
-        int wResult = PASS;
-        u32 Block;
-        u32 lba;
-        u16 Page;
-        u16 PageCount;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 i;
-
-        Block = BLK_FROM_ADDR(phy_addr);
-        Page = PAGE_FROM_ADDR(phy_addr, Block);
-        PageCount = Cache.pages_per_item;
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                        "%s, Line %d, Function: %s, Block: 0x%x\n",
-                        __FILE__, __LINE__, __func__, Block);
-
-        lba = 0xffffffff;
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                if ((pbt[i] & (~BAD_BLOCK)) == Block) {
-                        lba = i;
-                        if (IS_SPARE_BLOCK(i) || IS_BAD_BLOCK(i) ||
-                                IS_DISCARDED_BLOCK(i)) {
-                                /* Add by yunpeng -2008.12.3 */
-#if CMD_DMA
-                                GLOB_LLD_MemCopy_CMD(pData, g_temp_buf,
-                                PageCount * DeviceInfo.wPageDataSize, 0);
-                                ftl_cmd_cnt++;
-#else
-                                memset(pData, 0xFF,
-                                        PageCount * DeviceInfo.wPageDataSize);
-#endif
-                                return wResult;
-                        } else {
-                                continue; /* break ?? */
-                        }
-                }
-        }
-
-        if (0xffffffff == lba)
-                printk(KERN_ERR "FTL_Cache_Read_All: Block is not found in BT\n");
-
-#if CMD_DMA
-        wResult = GLOB_LLD_Read_Page_Main_cdma(pData, Block, Page,
-                        PageCount, LLD_CMD_FLAG_MODE_CDMA);
-        if (DeviceInfo.MLCDevice) {
-                g_pReadCounter[Block - DeviceInfo.wSpectraStartBlock]++;
-                nand_dbg_print(NAND_DBG_DEBUG,
-                               "Read Counter modified in ftl_cmd_cnt %u"
-                                " Block %u Counter%u\n",
-                               ftl_cmd_cnt, (unsigned int)Block,
-                               g_pReadCounter[Block -
-                               DeviceInfo.wSpectraStartBlock]);
-
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-                p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-                p_BTableChangesDelta->RC_Index =
-                        Block - DeviceInfo.wSpectraStartBlock;
-                p_BTableChangesDelta->RC_Entry_Value =
-                        g_pReadCounter[Block - DeviceInfo.wSpectraStartBlock];
-                p_BTableChangesDelta->ValidFields = 0xC0;
-
-                ftl_cmd_cnt++;
-
-                if (g_pReadCounter[Block - DeviceInfo.wSpectraStartBlock] >=
-                    MAX_READ_COUNTER)
-                        FTL_Read_Disturbance(Block);
-                if (g_cBlockTableStatus != IN_PROGRESS_BLOCK_TABLE) {
-                        g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                        FTL_Write_IN_Progress_Block_Table_Page();
-                }
-        } else {
-                ftl_cmd_cnt++;
-        }
-#else
-        wResult = GLOB_LLD_Read_Page_Main(pData, Block, Page, PageCount);
-        if (wResult == FAIL)
-                return wResult;
-
-        if (DeviceInfo.MLCDevice) {
-                g_pReadCounter[Block - DeviceInfo.wSpectraStartBlock]++;
-                if (g_pReadCounter[Block - DeviceInfo.wSpectraStartBlock] >=
-                                                MAX_READ_COUNTER)
-                        FTL_Read_Disturbance(Block);
-                if (g_cBlockTableStatus != IN_PROGRESS_BLOCK_TABLE) {
-                        g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                        FTL_Write_IN_Progress_Block_Table_Page();
-                }
-        }
-#endif
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_Write_All
-* Inputs:       pointer to cache in sys memory
-*               address of free block in flash
-* Outputs:      PASS=0 / FAIL=1
-* Description:  writes all the pages of the block in cache to flash
-*
-*               NOTE:need to make sure this works ok when cache is limited
-*               to a partial block. This is where copy-back would be
-*               activated.  This would require knowing which pages in the
-*               cached block are clean/dirty.Right now we only know if
-*               the whole block is clean/dirty.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Cache_Write_All(u8 *pData, u64 blk_addr)
-{
-        u16 wResult = PASS;
-        u32 Block;
-        u16 Page;
-        u16 PageCount;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        nand_dbg_print(NAND_DBG_DEBUG, "This block %d going to be written "
-                "on %d\n", cache_block_to_write,
-                (u32)(blk_addr >> DeviceInfo.nBitsInBlockDataSize));
-
-        Block = BLK_FROM_ADDR(blk_addr);
-        Page = PAGE_FROM_ADDR(blk_addr, Block);
-        PageCount = Cache.pages_per_item;
-
-#if CMD_DMA
-        if (FAIL == GLOB_LLD_Write_Page_Main_cdma(pData,
-                                        Block, Page, PageCount)) {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "NAND Program fail in %s, Line %d, "
-                        "Function: %s, new Bad Block %d generated! "
-                        "Need Bad Block replacing.\n",
-                        __FILE__, __LINE__, __func__, Block);
-                wResult = FAIL;
-        }
-        ftl_cmd_cnt++;
-#else
-        if (FAIL == GLOB_LLD_Write_Page_Main(pData, Block, Page, PageCount)) {
-                nand_dbg_print(NAND_DBG_WARN, "NAND Program fail in %s,"
-                        " Line %d, Function %s, new Bad Block %d generated!"
-                        "Need Bad Block replacing.\n",
-                        __FILE__, __LINE__, __func__, Block);
-                wResult = FAIL;
-        }
-#endif
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Copy_Block
-* Inputs:       source block address
-*               Destination block address
-* Outputs:      PASS=0 / FAIL=1
-* Description:  used only for static wear leveling to move the block
-*               containing static data to new blocks(more worn)
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int FTL_Copy_Block(u64 old_blk_addr, u64 blk_addr)
-{
-        int i, r1, r2, wResult = PASS;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < DeviceInfo.wPagesPerBlock; i += Cache.pages_per_item) {
-                r1 = FTL_Cache_Read_All(g_pTempBuf, old_blk_addr +
-                                        i * DeviceInfo.wPageDataSize);
-                r2 = FTL_Cache_Write_All(g_pTempBuf, blk_addr +
-                                        i * DeviceInfo.wPageDataSize);
-                if ((ERR == r1) || (FAIL == r2)) {
-                        wResult = FAIL;
-                        break;
-                }
-        }
-
-        return wResult;
-}
-
-/* Search the block table to find out the least wear block and then return it */
-static u32 find_least_worn_blk_for_l2_cache(void)
-{
-        int i;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u8 least_wear_cnt = MAX_BYTE_VALUE;
-        u32 least_wear_blk_idx = MAX_U32_VALUE;
-        u32 phy_idx;
-
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                if (IS_SPARE_BLOCK(i)) {
-                        phy_idx = (u32)((~BAD_BLOCK) & pbt[i]);
-                        if (phy_idx > DeviceInfo.wSpectraEndBlock)
-                                printk(KERN_ERR "find_least_worn_blk_for_l2_cache: "
-                                        "Too big phy block num (%d)\n", phy_idx);
-                        if (g_pWearCounter[phy_idx -DeviceInfo.wSpectraStartBlock] < least_wear_cnt) {
-                                least_wear_cnt = g_pWearCounter[phy_idx - DeviceInfo.wSpectraStartBlock];
-                                least_wear_blk_idx = i;
-                        }
-                }
-        }
-
-        nand_dbg_print(NAND_DBG_WARN,
-                "find_least_worn_blk_for_l2_cache: "
-                "find block %d with least worn counter (%d)\n",
-                least_wear_blk_idx, least_wear_cnt);
-
-        return least_wear_blk_idx;
-}
-
-
-
-/* Get blocks for Level2 Cache */
-static int get_l2_cache_blks(void)
-{
-        int n;
-        u32 blk;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        for (n = 0; n < BLK_NUM_FOR_L2_CACHE; n++) {
-                blk = find_least_worn_blk_for_l2_cache();
-                if (blk >= DeviceInfo.wDataBlockNum) {
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "find_least_worn_blk_for_l2_cache: "
-                                "No enough free NAND blocks (n: %d) for L2 Cache!\n", n);
-                        return FAIL;
-                }
-                /* Tag the free block as discard in block table */
-                pbt[blk] = (pbt[blk] & (~BAD_BLOCK)) | DISCARD_BLOCK;
-                /* Add the free block to the L2 Cache block array */
-                cache_l2.blk_array[n] = pbt[blk] & (~BAD_BLOCK);
-        }
-
-        return PASS;
-}
-
-static int erase_l2_cache_blocks(void)
-{
-        int i, ret = PASS;
-        u32 pblk, lblk = BAD_BLOCK;
-        u64 addr;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < BLK_NUM_FOR_L2_CACHE; i++) {
-                pblk = cache_l2.blk_array[i];
-
-                /* If the L2 cache block is invalid, then just skip it */
-                if (MAX_U32_VALUE == pblk)
-                        continue;
-
-                BUG_ON(pblk > DeviceInfo.wSpectraEndBlock);
-
-                addr = (u64)pblk << DeviceInfo.nBitsInBlockDataSize;
-                if (PASS == GLOB_FTL_Block_Erase(addr)) {
-                        /* Get logical block number of the erased block */
-                        lblk = FTL_Get_Block_Index(pblk);
-                        BUG_ON(BAD_BLOCK == lblk);
-                        /* Tag it as free in the block table */
-                        pbt[lblk] &= (u32)(~DISCARD_BLOCK);
-                        pbt[lblk] |= (u32)(SPARE_BLOCK);
-                } else {
-                        MARK_BLOCK_AS_BAD(pbt[lblk]);
-                        ret = ERR;
-                }
-        }
-
-        return ret;
-}
-
-/*
- * Merge the valid data page in the L2 cache blocks into NAND.
-*/
-static int flush_l2_cache(void)
-{
-        struct list_head *p;
-        struct spectra_l2_cache_list *pnd, *tmp_pnd;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 phy_blk, l2_blk;
-        u64 addr;
-        u16 l2_page;
-        int i, ret = PASS;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        if (list_empty(&cache_l2.table.list)) /* No data to flush */
-                return ret;
-
-        //dump_cache_l2_table();
-
-        if (IN_PROGRESS_BLOCK_TABLE != g_cBlockTableStatus) {
-                g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                FTL_Write_IN_Progress_Block_Table_Page();
-        }
-
-        list_for_each(p, &cache_l2.table.list) {
-                pnd = list_entry(p, struct spectra_l2_cache_list, list);
-                if (IS_SPARE_BLOCK(pnd->logical_blk_num) ||
-                        IS_BAD_BLOCK(pnd->logical_blk_num) ||
-                        IS_DISCARDED_BLOCK(pnd->logical_blk_num)) {
-                        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d\n", __FILE__, __LINE__);
-                        memset(cache_l2_blk_buf, 0xff, DeviceInfo.wPagesPerBlock * DeviceInfo.wPageDataSize);                   
-                } else {
-                        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d\n", __FILE__, __LINE__);
-                        phy_blk = pbt[pnd->logical_blk_num] & (~BAD_BLOCK);
-                        ret = GLOB_LLD_Read_Page_Main(cache_l2_blk_buf,
-                                phy_blk, 0, DeviceInfo.wPagesPerBlock);
-                        if (ret == FAIL) {
-                                printk(KERN_ERR "Read NAND page fail in %s, Line %d\n", __FILE__, __LINE__);
-                        }
-                }
-
-                for (i = 0; i < DeviceInfo.wPagesPerBlock; i++) {
-                        if (pnd->pages_array[i] != MAX_U32_VALUE) {
-                                l2_blk = cache_l2.blk_array[(pnd->pages_array[i] >> 16) & 0xffff];
-                                l2_page = pnd->pages_array[i] & 0xffff;
-                                ret = GLOB_LLD_Read_Page_Main(cache_l2_page_buf, l2_blk, l2_page, 1);
-                                if (ret == FAIL) {
-                                        printk(KERN_ERR "Read NAND page fail in %s, Line %d\n", __FILE__, __LINE__);
-                                }
-                                memcpy(cache_l2_blk_buf + i * DeviceInfo.wPageDataSize, cache_l2_page_buf, DeviceInfo.wPageDataSize);
-                        }
-                }
-
-                /* Find a free block and tag the original block as discarded */
-                addr = (u64)pnd->logical_blk_num << DeviceInfo.nBitsInBlockDataSize;
-                ret = FTL_Replace_Block(addr);
-                if (ret == FAIL) {
-                        printk(KERN_ERR "FTL_Replace_Block fail in %s, Line %d\n", __FILE__, __LINE__);
-                }
-
-                /* Write back the updated data into NAND */
-                phy_blk = pbt[pnd->logical_blk_num] & (~BAD_BLOCK);
-                if (FAIL == GLOB_LLD_Write_Page_Main(cache_l2_blk_buf, phy_blk, 0, DeviceInfo.wPagesPerBlock)) {
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "Program NAND block %d fail in %s, Line %d\n",
-                                phy_blk, __FILE__, __LINE__);
-                        /* This may not be really a bad block. So just tag it as discarded. */
-                        /* Then it has a chance to be erased when garbage collection. */
-                        /* If it is really bad, then the erase will fail and it will be marked */
-                        /* as bad then. Otherwise it will be marked as free and can be used again */
-                        MARK_BLK_AS_DISCARD(pbt[pnd->logical_blk_num]);
-                        /* Find another free block and write it again */
-                        FTL_Replace_Block(addr);
-                        phy_blk = pbt[pnd->logical_blk_num] & (~BAD_BLOCK);
-                        if (FAIL == GLOB_LLD_Write_Page_Main(cache_l2_blk_buf, phy_blk, 0, DeviceInfo.wPagesPerBlock)) {
-                                printk(KERN_ERR "Failed to write back block %d when flush L2 cache."
-                                        "Some data will be lost!\n", phy_blk);
-                                MARK_BLOCK_AS_BAD(pbt[pnd->logical_blk_num]);
-                        }
-                } else {
-                        /* tag the new free block as used block */
-                        pbt[pnd->logical_blk_num] &= (~SPARE_BLOCK);
-                }
-        }
-
-        /* Destroy the L2 Cache table and free the memory of all nodes */
-        list_for_each_entry_safe(pnd, tmp_pnd, &cache_l2.table.list, list) {
-                list_del(&pnd->list);
-                kfree(pnd);
-        }
-
-        /* Erase discard L2 cache blocks */
-        if (erase_l2_cache_blocks() != PASS)
-                nand_dbg_print(NAND_DBG_WARN,
-                        " Erase L2 cache blocks error in %s, Line %d\n",
-                        __FILE__, __LINE__);
-
-        /* Init the Level2 Cache data structure */
-        for (i = 0; i < BLK_NUM_FOR_L2_CACHE; i++)
-                cache_l2.blk_array[i] = MAX_U32_VALUE;
-        cache_l2.cur_blk_idx = 0;
-        cache_l2.cur_page_num = 0;
-        INIT_LIST_HEAD(&cache_l2.table.list);
-        cache_l2.table.logical_blk_num = MAX_U32_VALUE;
-
-        return ret;
-}
-
-/*
- * Write back a changed victim cache item to the Level2 Cache
- * and update the L2 Cache table to map the change.
- * If the L2 Cache is full, then start to do the L2 Cache flush.
-*/
-static int write_back_to_l2_cache(u8 *buf, u64 logical_addr)
-{
-        u32 logical_blk_num;
-        u16 logical_page_num;
-        struct list_head *p;
-        struct spectra_l2_cache_list *pnd, *pnd_new;
-        u32 node_size;
-        int i, found;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        /*
-         * If Level2 Cache table is empty, then it means either:
-         * 1. This is the first time that the function called after FTL_init
-         * or
-         * 2. The Level2 Cache has just been flushed
-         *
-         * So, 'steal' some free blocks from NAND for L2 Cache using
-         * by just mask them as discard in the block table
-        */
-        if (list_empty(&cache_l2.table.list)) {
-                BUG_ON(cache_l2.cur_blk_idx != 0);
-                BUG_ON(cache_l2.cur_page_num!= 0);
-                BUG_ON(cache_l2.table.logical_blk_num != MAX_U32_VALUE);
-                if (FAIL == get_l2_cache_blks()) {
-                        GLOB_FTL_Garbage_Collection();
-                        if (FAIL == get_l2_cache_blks()) {
-                                printk(KERN_ALERT "Fail to get L2 cache blks!\n");
-                                return FAIL;
-                        }
-                }
-        }
-
-        logical_blk_num = BLK_FROM_ADDR(logical_addr);
-        logical_page_num = PAGE_FROM_ADDR(logical_addr, logical_blk_num);
-        BUG_ON(logical_blk_num == MAX_U32_VALUE);
-
-        /* Write the cache item data into the current position of L2 Cache */
-#if CMD_DMA
-        /*
-         * TODO
-         */
-#else
-        if (FAIL == GLOB_LLD_Write_Page_Main(buf,
-                cache_l2.blk_array[cache_l2.cur_blk_idx],
-                cache_l2.cur_page_num, 1)) {
-                nand_dbg_print(NAND_DBG_WARN, "NAND Program fail in "
-                        "%s, Line %d, new Bad Block %d generated!\n",
-                        __FILE__, __LINE__,
-                        cache_l2.blk_array[cache_l2.cur_blk_idx]);
-
-                /* TODO: tag the current block as bad and try again */
-
-                return FAIL;
-        }
-#endif
-
-        /* 
-         * Update the L2 Cache table.
-         *
-         * First seaching in the table to see whether the logical block
-         * has been mapped. If not, then kmalloc a new node for the
-         * logical block, fill data, and then insert it to the list.
-         * Otherwise, just update the mapped node directly.
-         */
-        found = 0;
-        list_for_each(p, &cache_l2.table.list) {
-                pnd = list_entry(p, struct spectra_l2_cache_list, list);
-                if (pnd->logical_blk_num == logical_blk_num) {
-                        pnd->pages_array[logical_page_num] =
-                                (cache_l2.cur_blk_idx << 16) |
-                                cache_l2.cur_page_num;
-                        found = 1;
-                        break;
-                }
-        }
-        if (!found) { /* Create new node for the logical block here */
-
-                /* The logical pages to physical pages map array is
-                 * located at the end of struct spectra_l2_cache_list.
-                 */ 
-                node_size = sizeof(struct spectra_l2_cache_list) +
-                        sizeof(u32) * DeviceInfo.wPagesPerBlock;
-                pnd_new = kmalloc(node_size, GFP_ATOMIC);
-                if (!pnd_new) {
-                        printk(KERN_ERR "Failed to kmalloc in %s Line %d\n",
-                                __FILE__, __LINE__);
-                        /* 
-                         * TODO: Need to flush all the L2 cache into NAND ASAP
-                         * since no memory available here
-                         */
-                }
-                pnd_new->logical_blk_num = logical_blk_num;
-                for (i = 0; i < DeviceInfo.wPagesPerBlock; i++)
-                        pnd_new->pages_array[i] = MAX_U32_VALUE;
-                pnd_new->pages_array[logical_page_num] =
-                        (cache_l2.cur_blk_idx << 16) | cache_l2.cur_page_num;
-                list_add(&pnd_new->list, &cache_l2.table.list);
-        }
-
-        /* Increasing the current position pointer of the L2 Cache */
-        cache_l2.cur_page_num++;
-        if (cache_l2.cur_page_num >= DeviceInfo.wPagesPerBlock) {
-                cache_l2.cur_blk_idx++;
-                if (cache_l2.cur_blk_idx >= BLK_NUM_FOR_L2_CACHE) {
-                        /* The L2 Cache is full. Need to flush it now */
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "L2 Cache is full, will start to flush it\n");
-                        flush_l2_cache();
-                } else {
-                        cache_l2.cur_page_num = 0;
-                }
-        }
-
-        return PASS;
-}
-
-/*
- * Search in the Level2 Cache table to find the cache item.
- * If find, read the data from the NAND page of L2 Cache,
- * Otherwise, return FAIL.
- */
-static int search_l2_cache(u8 *buf, u64 logical_addr)
-{
-        u32 logical_blk_num;
-        u16 logical_page_num;
-        struct list_head *p;
-        struct spectra_l2_cache_list *pnd;
-        u32 tmp = MAX_U32_VALUE;
-        u32 phy_blk;
-        u16 phy_page;
-        int ret = FAIL;
-
-        logical_blk_num = BLK_FROM_ADDR(logical_addr);
-        logical_page_num = PAGE_FROM_ADDR(logical_addr, logical_blk_num);
-
-        list_for_each(p, &cache_l2.table.list) {
-                pnd = list_entry(p, struct spectra_l2_cache_list, list);
-                if (pnd->logical_blk_num == logical_blk_num) {
-                        tmp = pnd->pages_array[logical_page_num];
-                        break;
-                }
-        }
-
-        if (tmp != MAX_U32_VALUE) { /* Found valid map */
-                phy_blk = cache_l2.blk_array[(tmp >> 16) & 0xFFFF];
-                phy_page = tmp & 0xFFFF;
-#if CMD_DMA
-                /* TODO */
-#else
-                ret = GLOB_LLD_Read_Page_Main(buf, phy_blk, phy_page, 1);
-#endif
-        }
-
-        return ret;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_Write_Page
-* Inputs:       Pointer to buffer, page address, cache block number
-* Outputs:      PASS=0 / FAIL=1
-* Description:  It writes the data in Cache Block
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static void FTL_Cache_Write_Page(u8 *pData, u64 page_addr,
-                                u8 cache_blk, u16 flag)
-{
-        u8 *pDest;
-        u64 addr;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        addr = Cache.array[cache_blk].address;
-        pDest = Cache.array[cache_blk].buf;
-
-        pDest += (unsigned long)(page_addr - addr);
-        Cache.array[cache_blk].changed = SET;
-#if CMD_DMA
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        int_cache[ftl_cmd_cnt].item = cache_blk;
-        int_cache[ftl_cmd_cnt].cache.address =
-                        Cache.array[cache_blk].address;
-        int_cache[ftl_cmd_cnt].cache.changed =
-                        Cache.array[cache_blk].changed;
-#endif
-        GLOB_LLD_MemCopy_CMD(pDest, pData, DeviceInfo.wPageDataSize, flag);
-        ftl_cmd_cnt++;
-#else
-        memcpy(pDest, pData, DeviceInfo.wPageDataSize);
-#endif
-        if (Cache.array[cache_blk].use_cnt < MAX_WORD_VALUE)
-                Cache.array[cache_blk].use_cnt++;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_Write
-* Inputs:       none
-* Outputs:      PASS=0 / FAIL=1
-* Description:  It writes least frequently used Cache block to flash if it
-*               has been changed
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Cache_Write(void)
-{
-        int i, bResult = PASS;
-        u16 bNO, least_count = 0xFFFF;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        FTL_Calculate_LRU();
-
-        bNO = Cache.LRU;
-        nand_dbg_print(NAND_DBG_DEBUG, "FTL_Cache_Write: "
-                "Least used cache block is %d\n", bNO);
-
-        if (Cache.array[bNO].changed != SET)
-                return bResult;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "FTL_Cache_Write: Cache"
-                " Block %d containing logical block %d is dirty\n",
-                bNO,
-                (u32)(Cache.array[bNO].address >>
-                DeviceInfo.nBitsInBlockDataSize));
-#if CMD_DMA
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        int_cache[ftl_cmd_cnt].item = bNO;
-        int_cache[ftl_cmd_cnt].cache.address =
-                                Cache.array[bNO].address;
-        int_cache[ftl_cmd_cnt].cache.changed = CLEAR;
-#endif
-#endif
-        bResult = write_back_to_l2_cache(Cache.array[bNO].buf,
-                        Cache.array[bNO].address);
-        if (bResult != ERR)
-                Cache.array[bNO].changed = CLEAR;
-
-        least_count = Cache.array[bNO].use_cnt;
-
-        for (i = 0; i < CACHE_ITEM_NUM; i++) {
-                if (i == bNO)
-                        continue;
-                if (Cache.array[i].use_cnt > 0)
-                        Cache.array[i].use_cnt -= least_count;
-        }
-
-        return bResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Cache_Read
-* Inputs:       Page address
-* Outputs:      PASS=0 / FAIL=1
-* Description:  It reads the block from device in Cache Block
-*               Set the LRU count to 1
-*               Mark the Cache Block as clean
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Cache_Read(u64 logical_addr)
-{
-        u64 item_addr, phy_addr;
-        u16 num;
-        int ret;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        num = Cache.LRU; /* The LRU cache item will be overwritten */
-
-        item_addr = (u64)GLOB_u64_Div(logical_addr, Cache.cache_item_size) *
-                Cache.cache_item_size;
-        Cache.array[num].address = item_addr;
-        Cache.array[num].use_cnt = 1;
-        Cache.array[num].changed = CLEAR;
-
-#if CMD_DMA
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-        int_cache[ftl_cmd_cnt].item = num;
-        int_cache[ftl_cmd_cnt].cache.address =
-                        Cache.array[num].address;
-        int_cache[ftl_cmd_cnt].cache.changed =
-                        Cache.array[num].changed;
-#endif
-#endif
-        /*
-         * Search in L2 Cache. If hit, fill data into L1 Cache item buffer,
-         * Otherwise, read it from NAND
-         */
-        ret = search_l2_cache(Cache.array[num].buf, logical_addr);
-        if (PASS == ret) /* Hit in L2 Cache */
-                return ret;
-
-        /* Compute the physical start address of NAND device according to */
-        /* the logical start address of the cache item (LRU cache item) */
-        phy_addr = FTL_Get_Physical_Block_Addr(item_addr) +
-                GLOB_u64_Remainder(item_addr, 2);
-
-        return FTL_Cache_Read_All(Cache.array[num].buf, phy_addr);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Check_Block_Table
-* Inputs:       ?
-* Outputs:      PASS=0 / FAIL=1
-* Description:  It checks the correctness of each block table entry
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Check_Block_Table(int wOldTable)
-{
-        u32 i;
-        int wResult = PASS;
-        u32 blk_idx;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u8 *pFlag = flag_check_blk_table;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (NULL != pFlag) {
-                memset(pFlag, FAIL, DeviceInfo.wDataBlockNum);
-                for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                        blk_idx = (u32)(pbt[i] & (~BAD_BLOCK));
-
-                        /*
-                         * 20081006/KBV - Changed to pFlag[i] reference
-                         * to avoid buffer overflow
-                         */
-
-                        /*
-                         * 2008-10-20 Yunpeng Note: This change avoid
-                         * buffer overflow, but changed function of
-                         * the code, so it should be re-write later
-                         */
-                        if ((blk_idx > DeviceInfo.wSpectraEndBlock) ||
-                                PASS == pFlag[i]) {
-                                wResult = FAIL;
-                                break;
-                        } else {
-                                pFlag[i] = PASS;
-                        }
-                }
-        }
-
-        return wResult;
-}
-
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Write_Block_Table
-* Inputs:       flasg
-* Outputs:      0=Block Table was updated. No write done. 1=Block write needs to
-* happen. -1 Error
-* Description:  It writes the block table
-*               Block table always mapped to LBA 0 which inturn mapped
-*               to any physical block
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Write_Block_Table(int wForce)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-        int wSuccess = PASS;
-        u32 wTempBlockTableIndex;
-        u16 bt_pages, new_bt_offset;
-        u8 blockchangeoccured = 0;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        bt_pages = FTL_Get_Block_Table_Flash_Size_Pages();
-
-        if (IN_PROGRESS_BLOCK_TABLE != g_cBlockTableStatus)
-                return 0;
-
-        if (PASS == wForce) {
-                g_wBlockTableOffset =
-                        (u16)(DeviceInfo.wPagesPerBlock - bt_pages);
-#if CMD_DMA
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-                p_BTableChangesDelta->g_wBlockTableOffset =
-                        g_wBlockTableOffset;
-                p_BTableChangesDelta->ValidFields = 0x01;
-#endif
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "Inside FTL_Write_Block_Table: block %d Page:%d\n",
-                g_wBlockTableIndex, g_wBlockTableOffset);
-
-        do {
-                new_bt_offset = g_wBlockTableOffset + bt_pages + 1;
-                if ((0 == (new_bt_offset % DeviceInfo.wPagesPerBlock)) ||
-                        (new_bt_offset > DeviceInfo.wPagesPerBlock) ||
-                        (FAIL == wSuccess)) {
-                        wTempBlockTableIndex = FTL_Replace_Block_Table();
-                        if (BAD_BLOCK == wTempBlockTableIndex)
-                                return ERR;
-                        if (!blockchangeoccured) {
-                                bt_block_changed = 1;
-                                blockchangeoccured = 1;
-                        }
-
-                        g_wBlockTableIndex = wTempBlockTableIndex;
-                        g_wBlockTableOffset = 0;
-                        pbt[BLOCK_TABLE_INDEX] = g_wBlockTableIndex;
-#if CMD_DMA
-                        p_BTableChangesDelta =
-                                (struct BTableChangesDelta *)g_pBTDelta_Free;
-                        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                    ftl_cmd_cnt;
-                        p_BTableChangesDelta->g_wBlockTableOffset =
-                                    g_wBlockTableOffset;
-                        p_BTableChangesDelta->g_wBlockTableIndex =
-                                    g_wBlockTableIndex;
-                        p_BTableChangesDelta->ValidFields = 0x03;
-
-                        p_BTableChangesDelta =
-                                (struct BTableChangesDelta *)g_pBTDelta_Free;
-                        g_pBTDelta_Free +=
-                                sizeof(struct BTableChangesDelta);
-
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                    ftl_cmd_cnt;
-                        p_BTableChangesDelta->BT_Index =
-                                    BLOCK_TABLE_INDEX;
-                        p_BTableChangesDelta->BT_Entry_Value =
-                                    pbt[BLOCK_TABLE_INDEX];
-                        p_BTableChangesDelta->ValidFields = 0x0C;
-#endif
-                }
-
-                wSuccess = FTL_Write_Block_Table_Data();
-                if (FAIL == wSuccess)
-                        MARK_BLOCK_AS_BAD(pbt[BLOCK_TABLE_INDEX]);
-        } while (FAIL == wSuccess);
-
-        g_cBlockTableStatus = CURRENT_BLOCK_TABLE;
-
-        return 1;
-}
-
-static int  force_format_nand(void)
-{
-        u32 i;
-
-        /* Force erase the whole unprotected physical partiton of NAND */
-        printk(KERN_ALERT "Start to force erase whole NAND device ...\n");
-        printk(KERN_ALERT "From phyical block %d to %d\n",
-                DeviceInfo.wSpectraStartBlock, DeviceInfo.wSpectraEndBlock);
-        for (i = DeviceInfo.wSpectraStartBlock; i <= DeviceInfo.wSpectraEndBlock; i++) {
-                if (GLOB_LLD_Erase_Block(i))
-                        printk(KERN_ERR "Failed to force erase NAND block %d\n", i);
-        }
-        printk(KERN_ALERT "Force Erase ends. Please reboot the system ...\n");
-        while(1);
-
-        return PASS;
-}
-
-int GLOB_FTL_Flash_Format(void)
-{
-        //return FTL_Format_Flash(1);
-        return force_format_nand();
-
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Search_Block_Table_IN_Block
-* Inputs:       Block Number
-*               Pointer to page
-* Outputs:      PASS / FAIL
-*               Page contatining the block table
-* Description:  It searches the block table in the block
-*               passed as an argument.
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Search_Block_Table_IN_Block(u32 BT_Block,
-                                                u8 BT_Tag, u16 *Page)
-{
-        u16 i, j, k;
-        u16 Result = PASS;
-        u16 Last_IPF = 0;
-        u8  BT_Found = 0;
-        u8 *tagarray;
-        u8 *tempbuf = tmp_buf_search_bt_in_block;
-        u8 *pSpareBuf = spare_buf_search_bt_in_block;
-        u8 *pSpareBufBTLastPage = spare_buf_bt_search_bt_in_block;
-        u8 bt_flag_last_page = 0xFF;
-        u8 search_in_previous_pages = 0;
-        u16 bt_pages;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                       "Searching block table in %u block\n",
-                       (unsigned int)BT_Block);
-
-        bt_pages = FTL_Get_Block_Table_Flash_Size_Pages();
-
-        for (i = bt_pages; i < DeviceInfo.wPagesPerBlock;
-                                i += (bt_pages + 1)) {
-                nand_dbg_print(NAND_DBG_DEBUG,
-                               "Searching last IPF: %d\n", i);
-                Result = GLOB_LLD_Read_Page_Main_Polling(tempbuf,
-                                                        BT_Block, i, 1);
-
-                if (0 == memcmp(tempbuf, g_pIPF, DeviceInfo.wPageDataSize)) {
-                        if ((i + bt_pages + 1) < DeviceInfo.wPagesPerBlock) {
-                                continue;
-                        } else {
-                                search_in_previous_pages = 1;
-                                Last_IPF = i;
-                        }
-                }
-
-                if (!search_in_previous_pages) {
-                        if (i != bt_pages) {
-                                i -= (bt_pages + 1);
-                                Last_IPF = i;
-                        }
-                }
-
-                if (0 == Last_IPF)
-                        break;
-
-                if (!search_in_previous_pages) {
-                        i = i + 1;
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Reading the spare area of Block %u Page %u",
-                                (unsigned int)BT_Block, i);
-                        Result = GLOB_LLD_Read_Page_Spare(pSpareBuf,
-                                                        BT_Block, i, 1);
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Reading the spare area of Block %u Page %u",
-                                (unsigned int)BT_Block, i + bt_pages - 1);
-                        Result = GLOB_LLD_Read_Page_Spare(pSpareBufBTLastPage,
-                                BT_Block, i + bt_pages - 1, 1);
-
-                        k = 0;
-                        j = FTL_Extract_Block_Table_Tag(pSpareBuf, &tagarray);
-                        if (j) {
-                                for (; k < j; k++) {
-                                        if (tagarray[k] == BT_Tag)
-                                                break;
-                                }
-                        }
-
-                        if (k < j)
-                                bt_flag = tagarray[k];
-                        else
-                                Result = FAIL;
-
-                        if (Result == PASS) {
-                                k = 0;
-                                j = FTL_Extract_Block_Table_Tag(
-                                        pSpareBufBTLastPage, &tagarray);
-                                if (j) {
-                                        for (; k < j; k++) {
-                                                if (tagarray[k] == BT_Tag)
-                                                        break;
-                                        }
-                                }
-
-                                if (k < j)
-                                        bt_flag_last_page = tagarray[k];
-                                else
-                                        Result = FAIL;
-
-                                if (Result == PASS) {
-                                        if (bt_flag == bt_flag_last_page) {
-                                                nand_dbg_print(NAND_DBG_DEBUG,
-                                                        "Block table is found"
-                                                        " in page after IPF "
-                                                        "at block %d "
-                                                        "page %d\n",
-                                                        (int)BT_Block, i);
-                                                BT_Found = 1;
-                                                *Page  = i;
-                                                g_cBlockTableStatus =
-                                                        CURRENT_BLOCK_TABLE;
-                                                break;
-                                        } else {
-                                                Result = FAIL;
-                                        }
-                                }
-                        }
-                }
-
-                if (search_in_previous_pages)
-                        i = i - bt_pages;
-                else
-                        i = i - (bt_pages + 1);
-
-                Result = PASS;
-
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Reading the spare area of Block %d Page %d",
-                        (int)BT_Block, i);
-
-                Result = GLOB_LLD_Read_Page_Spare(pSpareBuf, BT_Block, i, 1);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Reading the spare area of Block %u Page %u",
-                        (unsigned int)BT_Block, i + bt_pages - 1);
-
-                Result = GLOB_LLD_Read_Page_Spare(pSpareBufBTLastPage,
-                                        BT_Block, i + bt_pages - 1, 1);
-
-                k = 0;
-                j = FTL_Extract_Block_Table_Tag(pSpareBuf, &tagarray);
-                if (j) {
-                        for (; k < j; k++) {
-                                if (tagarray[k] == BT_Tag)
-                                        break;
-                        }
-                }
-
-                if (k < j)
-                        bt_flag = tagarray[k];
-                else
-                        Result = FAIL;
-
-                if (Result == PASS) {
-                        k = 0;
-                        j = FTL_Extract_Block_Table_Tag(pSpareBufBTLastPage,
-                                                &tagarray);
-                        if (j) {
-                                for (; k < j; k++) {
-                                        if (tagarray[k] == BT_Tag)
-                                                break;
-                                }
-                        }
-
-                        if (k < j) {
-                                bt_flag_last_page = tagarray[k];
-                        } else {
-                                Result = FAIL;
-                                break;
-                        }
-
-                        if (Result == PASS) {
-                                if (bt_flag == bt_flag_last_page) {
-                                        nand_dbg_print(NAND_DBG_DEBUG,
-                                                "Block table is found "
-                                                "in page prior to IPF "
-                                                "at block %u page %d\n",
-                                                (unsigned int)BT_Block, i);
-                                        BT_Found = 1;
-                                        *Page  = i;
-                                        g_cBlockTableStatus =
-                                                IN_PROGRESS_BLOCK_TABLE;
-                                        break;
-                                } else {
-                                        Result = FAIL;
-                                        break;
-                                }
-                        }
-                }
-        }
-
-        if (Result == FAIL) {
-                if ((Last_IPF > bt_pages) && (i < Last_IPF) && (!BT_Found)) {
-                        BT_Found = 1;
-                        *Page = i - (bt_pages + 1);
-                }
-                if ((Last_IPF == bt_pages) && (i < Last_IPF) && (!BT_Found))
-                        goto func_return;
-        }
-
-        if (Last_IPF == 0) {
-                i = 0;
-                Result = PASS;
-                nand_dbg_print(NAND_DBG_DEBUG, "Reading the spare area of "
-                        "Block %u Page %u", (unsigned int)BT_Block, i);
-
-                Result = GLOB_LLD_Read_Page_Spare(pSpareBuf, BT_Block, i, 1);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Reading the spare area of Block %u Page %u",
-                        (unsigned int)BT_Block, i + bt_pages - 1);
-                Result = GLOB_LLD_Read_Page_Spare(pSpareBufBTLastPage,
-                                        BT_Block, i + bt_pages - 1, 1);
-
-                k = 0;
-                j = FTL_Extract_Block_Table_Tag(pSpareBuf, &tagarray);
-                if (j) {
-                        for (; k < j; k++) {
-                                if (tagarray[k] == BT_Tag)
-                                        break;
-                        }
-                }
-
-                if (k < j)
-                        bt_flag = tagarray[k];
-                else
-                        Result = FAIL;
-
-                if (Result == PASS) {
-                        k = 0;
-                        j = FTL_Extract_Block_Table_Tag(pSpareBufBTLastPage,
-                                                        &tagarray);
-                        if (j) {
-                                for (; k < j; k++) {
-                                        if (tagarray[k] == BT_Tag)
-                                                break;
-                                }
-                        }
-
-                        if (k < j)
-                                bt_flag_last_page = tagarray[k];
-                        else
-                                Result = FAIL;
-
-                        if (Result == PASS) {
-                                if (bt_flag == bt_flag_last_page) {
-                                        nand_dbg_print(NAND_DBG_DEBUG,
-                                                "Block table is found "
-                                                "in page after IPF at "
-                                                "block %u page %u\n",
-                                                (unsigned int)BT_Block,
-                                                (unsigned int)i);
-                                        BT_Found = 1;
-                                        *Page  = i;
-                                        g_cBlockTableStatus =
-                                                CURRENT_BLOCK_TABLE;
-                                        goto func_return;
-                                } else {
-                                        Result = FAIL;
-                                }
-                        }
-                }
-
-                if (Result == FAIL)
-                        goto func_return;
-        }
-func_return:
-        return Result;
-}
-
-u8 *get_blk_table_start_addr(void)
-{
-        return g_pBlockTable;
-}
-
-unsigned long get_blk_table_len(void)
-{
-        return DeviceInfo.wDataBlockNum * sizeof(u32);
-}
-
-u8 *get_wear_leveling_table_start_addr(void)
-{
-        return g_pWearCounter;
-}
-
-unsigned long get_wear_leveling_table_len(void)
-{
-        return DeviceInfo.wDataBlockNum * sizeof(u8);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Read_Block_Table
-* Inputs:       none
-* Outputs:      PASS / FAIL
-* Description:  read the flash spare area and find a block containing the
-*               most recent block table(having largest block_table_counter).
-*               Find the last written Block table in this block.
-*               Check the correctness of Block Table
-*               If CDMA is enabled, this function is called in
-*               polling mode.
-*               We don't need to store changes in Block table in this
-*               function as it is called only at initialization
-*
-*               Note: Currently this function is called at initialization
-*               before any read/erase/write command issued to flash so,
-*               there is no need to wait for CDMA list to complete as of now
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Read_Block_Table(void)
-{
-        u16 i = 0;
-        int k, j;
-        u8 *tempBuf, *tagarray;
-        int wResult = FAIL;
-        int status = FAIL;
-        u8 block_table_found = 0;
-        int search_result;
-        u32 Block;
-        u16 Page = 0;
-        u16 PageCount;
-        u16 bt_pages;
-        int wBytesCopied = 0, tempvar;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        tempBuf = tmp_buf1_read_blk_table;
-        bt_pages = FTL_Get_Block_Table_Flash_Size_Pages();
-
-        for (j = DeviceInfo.wSpectraStartBlock;
-                j <= (int)DeviceInfo.wSpectraEndBlock;
-                        j++) {
-                status = GLOB_LLD_Read_Page_Spare(tempBuf, j, 0, 1);
-                k = 0;
-                i = FTL_Extract_Block_Table_Tag(tempBuf, &tagarray);
-                if (i) {
-                        status  = GLOB_LLD_Read_Page_Main_Polling(tempBuf,
-                                                                j, 0, 1);
-                        for (; k < i; k++) {
-                                if (tagarray[k] == tempBuf[3])
-                                        break;
-                        }
-                }
-
-                if (k < i)
-                        k = tagarray[k];
-                else
-                        continue;
-
-                nand_dbg_print(NAND_DBG_DEBUG,
-                                "Block table is contained in Block %d %d\n",
-                                       (unsigned int)j, (unsigned int)k);
-
-                if (g_pBTBlocks[k-FIRST_BT_ID] == BTBLOCK_INVAL) {
-                        g_pBTBlocks[k-FIRST_BT_ID] = j;
-                        block_table_found = 1;
-                } else {
-                        printk(KERN_ERR "FTL_Read_Block_Table -"
-                                "This should never happens. "
-                                "Two block table have same counter %u!\n", k);
-                }
-        }
-
-        if (block_table_found) {
-                if (g_pBTBlocks[FIRST_BT_ID - FIRST_BT_ID] != BTBLOCK_INVAL &&
-                g_pBTBlocks[LAST_BT_ID - FIRST_BT_ID] != BTBLOCK_INVAL) {
-                        j = LAST_BT_ID;
-                        while ((j > FIRST_BT_ID) &&
-                        (g_pBTBlocks[j - FIRST_BT_ID] != BTBLOCK_INVAL))
-                                j--;
-                        if (j == FIRST_BT_ID) {
-                                j = LAST_BT_ID;
-                                last_erased = LAST_BT_ID;
-                        } else {
-                                last_erased = (u8)j + 1;
-                                while ((j > FIRST_BT_ID) && (BTBLOCK_INVAL ==
-                                        g_pBTBlocks[j - FIRST_BT_ID]))
-                                        j--;
-                        }
-                } else {
-                        j = FIRST_BT_ID;
-                        while (g_pBTBlocks[j - FIRST_BT_ID] == BTBLOCK_INVAL)
-                                j++;
-                        last_erased = (u8)j;
-                        while ((j < LAST_BT_ID) && (BTBLOCK_INVAL !=
-                                g_pBTBlocks[j - FIRST_BT_ID]))
-                                j++;
-                        if (g_pBTBlocks[j-FIRST_BT_ID] == BTBLOCK_INVAL)
-                                j--;
-                }
-
-                if (last_erased > j)
-                        j += (1 + LAST_BT_ID - FIRST_BT_ID);
-
-                for (; (j >= last_erased) && (FAIL == wResult); j--) {
-                        i = (j - FIRST_BT_ID) %
-                                (1 + LAST_BT_ID - FIRST_BT_ID);
-                        search_result =
-                        FTL_Search_Block_Table_IN_Block(g_pBTBlocks[i],
-                                                i + FIRST_BT_ID, &Page);
-                        if (g_cBlockTableStatus == IN_PROGRESS_BLOCK_TABLE)
-                                block_table_found = 0;
-
-                        while ((search_result == PASS) && (FAIL == wResult)) {
-                                nand_dbg_print(NAND_DBG_DEBUG,
-                                        "FTL_Read_Block_Table:"
-                                        "Block: %u Page: %u "
-                                        "contains block table\n",
-                                        (unsigned int)g_pBTBlocks[i],
-                                        (unsigned int)Page);
-
-                                tempBuf = tmp_buf2_read_blk_table;
-
-                                for (k = 0; k < bt_pages; k++) {
-                                        Block = g_pBTBlocks[i];
-                                        PageCount = 1;
-
-                                        status  =
-                                        GLOB_LLD_Read_Page_Main_Polling(
-                                        tempBuf, Block, Page, PageCount);
-
-                                        tempvar = k ? 0 : 4;
-
-                                        wBytesCopied +=
-                                        FTL_Copy_Block_Table_From_Flash(
-                                        tempBuf + tempvar,
-                                        DeviceInfo.wPageDataSize - tempvar,
-                                        wBytesCopied);
-
-                                        Page++;
-                                }
-
-                                wResult = FTL_Check_Block_Table(FAIL);
-                                if (FAIL == wResult) {
-                                        block_table_found = 0;
-                                        if (Page > bt_pages)
-                                                Page -= ((bt_pages<<1) + 1);
-                                        else
-                                                search_result = FAIL;
-                                }
-                        }
-                }
-        }
-
-        if (PASS == wResult) {
-                if (!block_table_found)
-                        FTL_Execute_SPL_Recovery();
-
-                if (g_cBlockTableStatus == IN_PROGRESS_BLOCK_TABLE)
-                        g_wBlockTableOffset = (u16)Page + 1;
-                else
-                        g_wBlockTableOffset = (u16)Page - bt_pages;
-
-                g_wBlockTableIndex = (u32)g_pBTBlocks[i];
-
-#if CMD_DMA
-                if (DeviceInfo.MLCDevice)
-                        memcpy(g_pBTStartingCopy, g_pBlockTable,
-                                DeviceInfo.wDataBlockNum * sizeof(u32)
-                                + DeviceInfo.wDataBlockNum * sizeof(u8)
-                                + DeviceInfo.wDataBlockNum * sizeof(u16));
-                else
-                        memcpy(g_pBTStartingCopy, g_pBlockTable,
-                                DeviceInfo.wDataBlockNum * sizeof(u32)
-                                + DeviceInfo.wDataBlockNum * sizeof(u8));
-#endif
-        }
-
-        if (FAIL == wResult)
-                printk(KERN_ERR "Yunpeng - "
-                "Can not find valid spectra block table!\n");
-
-#if AUTO_FORMAT_FLASH
-        if (FAIL == wResult) {
-                nand_dbg_print(NAND_DBG_DEBUG, "doing auto-format\n");
-                wResult = FTL_Format_Flash(0);
-        }
-#endif
-
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Get_Page_Num
-* Inputs:       Size in bytes
-* Outputs:      Size in pages
-* Description:  It calculates the pages required for the length passed
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u32 FTL_Get_Page_Num(u64 length)
-{
-        return (u32)((length >> DeviceInfo.nBitsInPageDataSize) +
-                (GLOB_u64_Remainder(length , 1) > 0 ? 1 : 0));
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Get_Physical_Block_Addr
-* Inputs:       Block Address (byte format)
-* Outputs:      Physical address of the block.
-* Description:  It translates LBA to PBA by returning address stored
-*               at the LBA location in the block table
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u64 FTL_Get_Physical_Block_Addr(u64 logical_addr)
-{
-        u32 *pbt;
-        u64 physical_addr;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        pbt = (u32 *)g_pBlockTable;
-        physical_addr = (u64) DeviceInfo.wBlockDataSize *
-                (pbt[BLK_FROM_ADDR(logical_addr)] & (~BAD_BLOCK));
-
-        return physical_addr;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Get_Block_Index
-* Inputs:       Physical Block no.
-* Outputs:      Logical block no. /BAD_BLOCK
-* Description:  It returns the logical block no. for the PBA passed
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u32 FTL_Get_Block_Index(u32 wBlockNum)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++)
-                if (wBlockNum == (pbt[i] & (~BAD_BLOCK)))
-                        return i;
-
-        return BAD_BLOCK;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Wear_Leveling
-* Inputs:       none
-* Outputs:      PASS=0
-* Description:  This is static wear leveling (done by explicit call)
-*               do complete static wear leveling
-*               do complete garbage collection
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Wear_Leveling(void)
-{
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        FTL_Static_Wear_Leveling();
-        GLOB_FTL_Garbage_Collection();
-
-        return PASS;
-}
-
-static void find_least_most_worn(u8 *chg,
-        u32 *least_idx, u8 *least_cnt,
-        u32 *most_idx, u8 *most_cnt)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 idx;
-        u8 cnt;
-        int i;
-
-        for (i = BLOCK_TABLE_INDEX + 1; i < DeviceInfo.wDataBlockNum; i++) {
-                if (IS_BAD_BLOCK(i) || PASS == chg[i])
-                        continue;
-
-                idx = (u32) ((~BAD_BLOCK) & pbt[i]);
-                cnt = g_pWearCounter[idx - DeviceInfo.wSpectraStartBlock];
-
-                if (IS_SPARE_BLOCK(i)) {
-                        if (cnt > *most_cnt) {
-                                *most_cnt = cnt;
-                                *most_idx = idx;
-                        }
-                }
-
-                if (IS_DATA_BLOCK(i)) {
-                        if (cnt < *least_cnt) {
-                                *least_cnt = cnt;
-                                *least_idx = idx;
-                        }
-                }
-
-                if (PASS == chg[*most_idx] || PASS == chg[*least_idx]) {
-                        debug_boundary_error(*most_idx,
-                                DeviceInfo.wDataBlockNum, 0);
-                        debug_boundary_error(*least_idx,
-                                DeviceInfo.wDataBlockNum, 0);
-                        continue;
-                }
-        }
-}
-
-static int move_blks_for_wear_leveling(u8 *chg,
-        u32 *least_idx, u32 *rep_blk_num, int *result)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 rep_blk;
-        int j, ret_cp_blk, ret_erase;
-        int ret = PASS;
-
-        chg[*least_idx] = PASS;
-        debug_boundary_error(*least_idx, DeviceInfo.wDataBlockNum, 0);
-
-        rep_blk = FTL_Replace_MWBlock();
-        if (rep_blk != BAD_BLOCK) {
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "More than two spare blocks exist so do it\n");
-                nand_dbg_print(NAND_DBG_DEBUG, "Block Replaced is %d\n",
-                                rep_blk);
-
-                chg[rep_blk] = PASS;
-
-                if (IN_PROGRESS_BLOCK_TABLE != g_cBlockTableStatus) {
-                        g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                        FTL_Write_IN_Progress_Block_Table_Page();
-                }
-
-                for (j = 0; j < RETRY_TIMES; j++) {
-                        ret_cp_blk = FTL_Copy_Block((u64)(*least_idx) *
-                                DeviceInfo.wBlockDataSize,
-                                (u64)rep_blk * DeviceInfo.wBlockDataSize);
-                        if (FAIL == ret_cp_blk) {
-                                ret_erase = GLOB_FTL_Block_Erase((u64)rep_blk
-                                        * DeviceInfo.wBlockDataSize);
-                                if (FAIL == ret_erase)
-                                        MARK_BLOCK_AS_BAD(pbt[rep_blk]);
-                        } else {
-                                nand_dbg_print(NAND_DBG_DEBUG,
-                                        "FTL_Copy_Block == OK\n");
-                                break;
-                        }
-                }
-
-                if (j < RETRY_TIMES) {
-                        u32 tmp;
-                        u32 old_idx = FTL_Get_Block_Index(*least_idx);
-                        u32 rep_idx = FTL_Get_Block_Index(rep_blk);
-                        tmp = (u32)(DISCARD_BLOCK | pbt[old_idx]);
-                        pbt[old_idx] = (u32)((~SPARE_BLOCK) &
-                                                        pbt[rep_idx]);
-                        pbt[rep_idx] = tmp;
-#if CMD_DMA
-                        p_BTableChangesDelta = (struct BTableChangesDelta *)
-                                                g_pBTDelta_Free;
-                        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                                ftl_cmd_cnt;
-                        p_BTableChangesDelta->BT_Index = old_idx;
-                        p_BTableChangesDelta->BT_Entry_Value = pbt[old_idx];
-                        p_BTableChangesDelta->ValidFields = 0x0C;
-
-                        p_BTableChangesDelta = (struct BTableChangesDelta *)
-                                                g_pBTDelta_Free;
-                        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                                ftl_cmd_cnt;
-                        p_BTableChangesDelta->BT_Index = rep_idx;
-                        p_BTableChangesDelta->BT_Entry_Value = pbt[rep_idx];
-                        p_BTableChangesDelta->ValidFields = 0x0C;
-#endif
-                } else {
-                        pbt[FTL_Get_Block_Index(rep_blk)] |= BAD_BLOCK;
-#if CMD_DMA
-                        p_BTableChangesDelta = (struct BTableChangesDelta *)
-                                                g_pBTDelta_Free;
-                        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                                ftl_cmd_cnt;
-                        p_BTableChangesDelta->BT_Index =
-                                        FTL_Get_Block_Index(rep_blk);
-                        p_BTableChangesDelta->BT_Entry_Value =
-                                        pbt[FTL_Get_Block_Index(rep_blk)];
-                        p_BTableChangesDelta->ValidFields = 0x0C;
-#endif
-                        *result = FAIL;
-                        ret = FAIL;
-                }
-
-                if (((*rep_blk_num)++) > WEAR_LEVELING_BLOCK_NUM)
-                        ret = FAIL;
-        } else {
-                printk(KERN_ERR "Less than 3 spare blocks exist so quit\n");
-                ret = FAIL;
-        }
-
-        return ret;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Static_Wear_Leveling
-* Inputs:       none
-* Outputs:      PASS=0 / FAIL=1
-* Description:  This is static wear leveling (done by explicit call)
-*               search for most&least used
-*               if difference < GATE:
-*                   update the block table with exhange
-*                   mark block table in flash as IN_PROGRESS
-*                   copy flash block
-*               the caller should handle GC clean up after calling this function
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int FTL_Static_Wear_Leveling(void)
-{
-        u8 most_worn_cnt;
-        u8 least_worn_cnt;
-        u32 most_worn_idx;
-        u32 least_worn_idx;
-        int result = PASS;
-        int go_on = PASS;
-        u32 replaced_blks = 0;
-        u8 *chang_flag = flags_static_wear_leveling;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (!chang_flag)
-                return FAIL;
-
-        memset(chang_flag, FAIL, DeviceInfo.wDataBlockNum);
-        while (go_on == PASS) {
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "starting static wear leveling\n");
-                most_worn_cnt = 0;
-                least_worn_cnt = 0xFF;
-                least_worn_idx = BLOCK_TABLE_INDEX;
-                most_worn_idx = BLOCK_TABLE_INDEX;
-
-                find_least_most_worn(chang_flag, &least_worn_idx,
-                        &least_worn_cnt, &most_worn_idx, &most_worn_cnt);
-
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Used and least worn is block %u, whos count is %u\n",
-                        (unsigned int)least_worn_idx,
-                        (unsigned int)least_worn_cnt);
-
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Free and  most worn is block %u, whos count is %u\n",
-                        (unsigned int)most_worn_idx,
-                        (unsigned int)most_worn_cnt);
-
-                if ((most_worn_cnt > least_worn_cnt) &&
-                        (most_worn_cnt - least_worn_cnt > WEAR_LEVELING_GATE))
-                        go_on = move_blks_for_wear_leveling(chang_flag,
-                                &least_worn_idx, &replaced_blks, &result);
-                else
-                        go_on = FAIL;
-        }
-
-        return result;
-}
-
-#if CMD_DMA
-static int do_garbage_collection(u32 discard_cnt)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 pba;
-        u8 bt_block_erased = 0;
-        int i, cnt, ret = FAIL;
-        u64 addr;
-
-        i = 0;
-        while ((i < DeviceInfo.wDataBlockNum) && (discard_cnt > 0) &&
-                        ((ftl_cmd_cnt + 28) < 256)) {
-                if (((pbt[i] & BAD_BLOCK) != BAD_BLOCK) &&
-                                (pbt[i] & DISCARD_BLOCK)) {
-                        if (IN_PROGRESS_BLOCK_TABLE != g_cBlockTableStatus) {
-                                g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                                FTL_Write_IN_Progress_Block_Table_Page();
-                        }
-
-                        addr = FTL_Get_Physical_Block_Addr((u64)i *
-                                                DeviceInfo.wBlockDataSize);
-                        pba = BLK_FROM_ADDR(addr);
-
-                        for (cnt = FIRST_BT_ID; cnt <= LAST_BT_ID; cnt++) {
-                                if (pba == g_pBTBlocks[cnt - FIRST_BT_ID]) {
-                                        nand_dbg_print(NAND_DBG_DEBUG,
-                                                "GC will erase BT block %u\n",
-                                                (unsigned int)pba);
-                                        discard_cnt--;
-                                        i++;
-                                        bt_block_erased = 1;
-                                        break;
-                                }
-                        }
-
-                        if (bt_block_erased) {
-                                bt_block_erased = 0;
-                                continue;
-                        }
-
-                        addr = FTL_Get_Physical_Block_Addr((u64)i *
-                                                DeviceInfo.wBlockDataSize);
-
-                        if (PASS == GLOB_FTL_Block_Erase(addr)) {
-                                pbt[i] &= (u32)(~DISCARD_BLOCK);
-                                pbt[i] |= (u32)(SPARE_BLOCK);
-                                p_BTableChangesDelta =
-                                        (struct BTableChangesDelta *)
-                                        g_pBTDelta_Free;
-                                g_pBTDelta_Free +=
-                                        sizeof(struct BTableChangesDelta);
-                                p_BTableChangesDelta->ftl_cmd_cnt =
-                                        ftl_cmd_cnt - 1;
-                                p_BTableChangesDelta->BT_Index = i;
-                                p_BTableChangesDelta->BT_Entry_Value = pbt[i];
-                                p_BTableChangesDelta->ValidFields = 0x0C;
-                                discard_cnt--;
-                                ret = PASS;
-                        } else {
-                                MARK_BLOCK_AS_BAD(pbt[i]);
-                        }
-                }
-
-                i++;
-        }
-
-        return ret;
-}
-
-#else
-static int do_garbage_collection(u32 discard_cnt)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 pba;
-        u8 bt_block_erased = 0;
-        int i, cnt, ret = FAIL;
-        u64 addr;
-
-        i = 0;
-        while ((i < DeviceInfo.wDataBlockNum) && (discard_cnt > 0)) {
-                if (((pbt[i] & BAD_BLOCK) != BAD_BLOCK) &&
-                                (pbt[i] & DISCARD_BLOCK)) {
-                        if (IN_PROGRESS_BLOCK_TABLE != g_cBlockTableStatus) {
-                                g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                                FTL_Write_IN_Progress_Block_Table_Page();
-                        }
-
-                        addr = FTL_Get_Physical_Block_Addr((u64)i *
-                                                DeviceInfo.wBlockDataSize);
-                        pba = BLK_FROM_ADDR(addr);
-
-                        for (cnt = FIRST_BT_ID; cnt <= LAST_BT_ID; cnt++) {
-                                if (pba == g_pBTBlocks[cnt - FIRST_BT_ID]) {
-                                        nand_dbg_print(NAND_DBG_DEBUG,
-                                                "GC will erase BT block %d\n",
-                                                pba);
-                                        discard_cnt--;
-                                        i++;
-                                        bt_block_erased = 1;
-                                        break;
-                                }
-                        }
-
-                        if (bt_block_erased) {
-                                bt_block_erased = 0;
-                                continue;
-                        }
-
-                        /* If the discard block is L2 cache block, then just skip it */
-                        for (cnt = 0; cnt < BLK_NUM_FOR_L2_CACHE; cnt++) {
-                                if (cache_l2.blk_array[cnt] == pba) {
-                                        nand_dbg_print(NAND_DBG_DEBUG,
-                                                "GC will erase L2 cache blk %d\n",
-                                                pba);
-                                        break;
-                                }
-                        }
-                        if (cnt < BLK_NUM_FOR_L2_CACHE) { /* Skip it */
-                                discard_cnt--;
-                                i++;
-                                continue;
-                        }
-
-                        addr = FTL_Get_Physical_Block_Addr((u64)i *
-                                                DeviceInfo.wBlockDataSize);
-
-                        if (PASS == GLOB_FTL_Block_Erase(addr)) {
-                                pbt[i] &= (u32)(~DISCARD_BLOCK);
-                                pbt[i] |= (u32)(SPARE_BLOCK);
-                                discard_cnt--;
-                                ret = PASS;
-                        } else {
-                                MARK_BLOCK_AS_BAD(pbt[i]);
-                        }
-                }
-
-                i++;
-        }
-
-        return ret;
-}
-#endif
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Garbage_Collection
-* Inputs:       none
-* Outputs:      PASS / FAIL (returns the number of un-erased blocks
-* Description:  search the block table for all discarded blocks to erase
-*               for each discarded block:
-*                   set the flash block to IN_PROGRESS
-*                   erase the block
-*                   update the block table
-*                   write the block table to flash
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Garbage_Collection(void)
-{
-        u32 i;
-        u32 wDiscard = 0;
-        int wResult = FAIL;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        if (GC_Called) {
-                printk(KERN_ALERT "GLOB_FTL_Garbage_Collection() "
-                        "has been re-entered! Exit.\n");
-                return PASS;
-        }
-
-        GC_Called = 1;
-
-        GLOB_FTL_BT_Garbage_Collection();
-
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                if (IS_DISCARDED_BLOCK(i))
-                        wDiscard++;
-        }
-
-        if (wDiscard <= 0) {
-                GC_Called = 0;
-                return wResult;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "Found %d discarded blocks\n", wDiscard);
-
-        FTL_Write_Block_Table(FAIL);
-
-        wResult = do_garbage_collection(wDiscard);
-
-        FTL_Write_Block_Table(FAIL);
-
-        GC_Called = 0;
-
-        return wResult;
-}
-
-
-#if CMD_DMA
-static int do_bt_garbage_collection(void)
-{
-        u32 pba, lba;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 *pBTBlocksNode = (u32 *)g_pBTBlocks;
-        u64 addr;
-        int i, ret = FAIL;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        if (BT_GC_Called)
-                return PASS;
-
-        BT_GC_Called = 1;
-
-        for (i = last_erased; (i <= LAST_BT_ID) &&
-                (g_pBTBlocks[((i + 2) % (1 + LAST_BT_ID - FIRST_BT_ID)) +
-                FIRST_BT_ID - FIRST_BT_ID] != BTBLOCK_INVAL) &&
-                ((ftl_cmd_cnt + 28)) < 256; i++) {
-                pba = pBTBlocksNode[i - FIRST_BT_ID];
-                lba = FTL_Get_Block_Index(pba);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "do_bt_garbage_collection: pba %d, lba %d\n",
-                        pba, lba);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Block Table Entry: %d", pbt[lba]);
-
-                if (((pbt[lba] & BAD_BLOCK) != BAD_BLOCK) &&
-                        (pbt[lba] & DISCARD_BLOCK)) {
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "do_bt_garbage_collection_cdma: "
-                                "Erasing Block tables present in block %d\n",
-                                pba);
-                        addr = FTL_Get_Physical_Block_Addr((u64)lba *
-                                                DeviceInfo.wBlockDataSize);
-                        if (PASS == GLOB_FTL_Block_Erase(addr)) {
-                                pbt[lba] &= (u32)(~DISCARD_BLOCK);
-                                pbt[lba] |= (u32)(SPARE_BLOCK);
-
-                                p_BTableChangesDelta =
-                                        (struct BTableChangesDelta *)
-                                        g_pBTDelta_Free;
-                                g_pBTDelta_Free +=
-                                        sizeof(struct BTableChangesDelta);
-
-                                p_BTableChangesDelta->ftl_cmd_cnt =
-                                        ftl_cmd_cnt - 1;
-                                p_BTableChangesDelta->BT_Index = lba;
-                                p_BTableChangesDelta->BT_Entry_Value =
-                                                                pbt[lba];
-
-                                p_BTableChangesDelta->ValidFields = 0x0C;
-
-                                ret = PASS;
-                                pBTBlocksNode[last_erased - FIRST_BT_ID] =
-                                                        BTBLOCK_INVAL;
-                                nand_dbg_print(NAND_DBG_DEBUG,
-                                        "resetting bt entry at index %d "
-                                        "value %d\n", i,
-                                        pBTBlocksNode[i - FIRST_BT_ID]);
-                                if (last_erased == LAST_BT_ID)
-                                        last_erased = FIRST_BT_ID;
-                                else
-                                        last_erased++;
-                        } else {
-                                MARK_BLOCK_AS_BAD(pbt[lba]);
-                        }
-                }
-        }
-
-        BT_GC_Called = 0;
-
-        return ret;
-}
-
-#else
-static int do_bt_garbage_collection(void)
-{
-        u32 pba, lba;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 *pBTBlocksNode = (u32 *)g_pBTBlocks;
-        u64 addr;
-        int i, ret = FAIL;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        if (BT_GC_Called)
-                return PASS;
-
-        BT_GC_Called = 1;
-
-        for (i = last_erased; (i <= LAST_BT_ID) &&
-                (g_pBTBlocks[((i + 2) % (1 + LAST_BT_ID - FIRST_BT_ID)) +
-                FIRST_BT_ID - FIRST_BT_ID] != BTBLOCK_INVAL); i++) {
-                pba = pBTBlocksNode[i - FIRST_BT_ID];
-                lba = FTL_Get_Block_Index(pba);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "do_bt_garbage_collection_cdma: pba %d, lba %d\n",
-                        pba, lba);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Block Table Entry: %d", pbt[lba]);
-
-                if (((pbt[lba] & BAD_BLOCK) != BAD_BLOCK) &&
-                        (pbt[lba] & DISCARD_BLOCK)) {
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "do_bt_garbage_collection: "
-                                "Erasing Block tables present in block %d\n",
-                                pba);
-                        addr = FTL_Get_Physical_Block_Addr((u64)lba *
-                                                DeviceInfo.wBlockDataSize);
-                        if (PASS == GLOB_FTL_Block_Erase(addr)) {
-                                pbt[lba] &= (u32)(~DISCARD_BLOCK);
-                                pbt[lba] |= (u32)(SPARE_BLOCK);
-                                ret = PASS;
-                                pBTBlocksNode[last_erased - FIRST_BT_ID] =
-                                                        BTBLOCK_INVAL;
-                                nand_dbg_print(NAND_DBG_DEBUG,
-                                        "resetting bt entry at index %d "
-                                        "value %d\n", i,
-                                        pBTBlocksNode[i - FIRST_BT_ID]);
-                                if (last_erased == LAST_BT_ID)
-                                        last_erased = FIRST_BT_ID;
-                                else
-                                        last_erased++;
-                        } else {
-                                MARK_BLOCK_AS_BAD(pbt[lba]);
-                        }
-                }
-        }
-
-        BT_GC_Called = 0;
-
-        return ret;
-}
-
-#endif
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_BT_Garbage_Collection
-* Inputs:       none
-* Outputs:      PASS / FAIL (returns the number of un-erased blocks
-* Description:  Erases discarded blocks containing Block table
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_BT_Garbage_Collection(void)
-{
-        return do_bt_garbage_collection();
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Replace_OneBlock
-* Inputs:       Block number 1
-*               Block number 2
-* Outputs:      Replaced Block Number
-* Description:  Interchange block table entries at wBlockNum and wReplaceNum
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u32 FTL_Replace_OneBlock(u32 blk, u32 rep_blk)
-{
-        u32 tmp_blk;
-        u32 replace_node = BAD_BLOCK;
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        if (rep_blk != BAD_BLOCK) {
-                if (IS_BAD_BLOCK(blk))
-                        tmp_blk = pbt[blk];
-                else
-                        tmp_blk = DISCARD_BLOCK | (~SPARE_BLOCK & pbt[blk]);
-
-                replace_node = (u32) ((~SPARE_BLOCK) & pbt[rep_blk]);
-                pbt[blk] = replace_node;
-                pbt[rep_blk] = tmp_blk;
-
-#if CMD_DMA
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-                p_BTableChangesDelta->BT_Index = blk;
-                p_BTableChangesDelta->BT_Entry_Value = pbt[blk];
-
-                p_BTableChangesDelta->ValidFields = 0x0C;
-
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-                p_BTableChangesDelta->BT_Index = rep_blk;
-                p_BTableChangesDelta->BT_Entry_Value = pbt[rep_blk];
-                p_BTableChangesDelta->ValidFields = 0x0C;
-#endif
-        }
-
-        return replace_node;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Write_Block_Table_Data
-* Inputs:       Block table size in pages
-* Outputs:      PASS=0 / FAIL=1
-* Description:  Write block table data in flash
-*               If first page and last page
-*                  Write data+BT flag
-*               else
-*                  Write data
-*               BT flag is a counter. Its value is incremented for block table
-*               write in a new Block
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Write_Block_Table_Data(void)
-{
-        u64 dwBlockTableAddr, pTempAddr;
-        u32 Block;
-        u16 Page, PageCount;
-        u8 *tempBuf = tmp_buf_write_blk_table_data;
-        int wBytesCopied;
-        u16 bt_pages;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        dwBlockTableAddr =
-                (u64)((u64)g_wBlockTableIndex * DeviceInfo.wBlockDataSize +
-                (u64)g_wBlockTableOffset * DeviceInfo.wPageDataSize);
-        pTempAddr = dwBlockTableAddr;
-
-        bt_pages = FTL_Get_Block_Table_Flash_Size_Pages();
-
-        nand_dbg_print(NAND_DBG_DEBUG, "FTL_Write_Block_Table_Data: "
-                               "page= %d BlockTableIndex= %d "
-                               "BlockTableOffset=%d\n", bt_pages,
-                               g_wBlockTableIndex, g_wBlockTableOffset);
-
-        Block = BLK_FROM_ADDR(pTempAddr);
-        Page = PAGE_FROM_ADDR(pTempAddr, Block);
-        PageCount = 1;
-
-        if (bt_block_changed) {
-                if (bt_flag == LAST_BT_ID) {
-                        bt_flag = FIRST_BT_ID;
-                        g_pBTBlocks[bt_flag - FIRST_BT_ID] = Block;
-                } else if (bt_flag < LAST_BT_ID) {
-                        bt_flag++;
-                        g_pBTBlocks[bt_flag - FIRST_BT_ID] = Block;
-                }
-
-                if ((bt_flag > (LAST_BT_ID-4)) &&
-                        g_pBTBlocks[FIRST_BT_ID - FIRST_BT_ID] !=
-                                                BTBLOCK_INVAL) {
-                        bt_block_changed = 0;
-                        GLOB_FTL_BT_Garbage_Collection();
-                }
-
-                bt_block_changed = 0;
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Block Table Counter is %u Block %u\n",
-                        bt_flag, (unsigned int)Block);
-        }
-
-        memset(tempBuf, 0, 3);
-        tempBuf[3] = bt_flag;
-        wBytesCopied = FTL_Copy_Block_Table_To_Flash(tempBuf + 4,
-                        DeviceInfo.wPageDataSize - 4, 0);
-        memset(&tempBuf[wBytesCopied + 4], 0xff,
-                DeviceInfo.wPageSize - (wBytesCopied + 4));
-        FTL_Insert_Block_Table_Signature(&tempBuf[DeviceInfo.wPageDataSize],
-                                        bt_flag);
-
-#if CMD_DMA
-        memcpy(g_pNextBlockTable, tempBuf,
-                DeviceInfo.wPageSize * sizeof(u8));
-        nand_dbg_print(NAND_DBG_DEBUG, "Writing First Page of Block Table "
-                "Block %u Page %u\n", (unsigned int)Block, Page);
-        if (FAIL == GLOB_LLD_Write_Page_Main_Spare_cdma(g_pNextBlockTable,
-                Block, Page, 1,
-                LLD_CMD_FLAG_MODE_CDMA | LLD_CMD_FLAG_ORDER_BEFORE_REST)) {
-                nand_dbg_print(NAND_DBG_WARN, "NAND Program fail in "
-                        "%s, Line %d, Function: %s, "
-                        "new Bad Block %d generated!\n",
-                        __FILE__, __LINE__, __func__, Block);
-                goto func_return;
-        }
-
-        ftl_cmd_cnt++;
-        g_pNextBlockTable += ((DeviceInfo.wPageSize * sizeof(u8)));
-#else
-        if (FAIL == GLOB_LLD_Write_Page_Main_Spare(tempBuf, Block, Page, 1)) {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "NAND Program fail in %s, Line %d, Function: %s, "
-                        "new Bad Block %d generated!\n",
-                        __FILE__, __LINE__, __func__, Block);
-                goto func_return;
-        }
-#endif
-
-        if (bt_pages > 1) {
-                PageCount = bt_pages - 1;
-                if (PageCount > 1) {
-                        wBytesCopied += FTL_Copy_Block_Table_To_Flash(tempBuf,
-                                DeviceInfo.wPageDataSize * (PageCount - 1),
-                                wBytesCopied);
-
-#if CMD_DMA
-                        memcpy(g_pNextBlockTable, tempBuf,
-                                (PageCount - 1) * DeviceInfo.wPageDataSize);
-                        if (FAIL == GLOB_LLD_Write_Page_Main_cdma(
-                                g_pNextBlockTable, Block, Page + 1,
-                                PageCount - 1)) {
-                                nand_dbg_print(NAND_DBG_WARN,
-                                        "NAND Program fail in %s, Line %d, "
-                                        "Function: %s, "
-                                        "new Bad Block %d generated!\n",
-                                        __FILE__, __LINE__, __func__,
-                                        (int)Block);
-                                goto func_return;
-                        }
-
-                        ftl_cmd_cnt++;
-                        g_pNextBlockTable += (PageCount - 1) *
-                                DeviceInfo.wPageDataSize * sizeof(u8);
-#else
-                        if (FAIL == GLOB_LLD_Write_Page_Main(tempBuf,
-                                        Block, Page + 1, PageCount - 1)) {
-                                nand_dbg_print(NAND_DBG_WARN,
-                                        "NAND Program fail in %s, Line %d, "
-                                        "Function: %s, "
-                                        "new Bad Block %d generated!\n",
-                                        __FILE__, __LINE__, __func__,
-                                        (int)Block);
-                                goto func_return;
-                        }
-#endif
-                }
-
-                wBytesCopied = FTL_Copy_Block_Table_To_Flash(tempBuf,
-                                DeviceInfo.wPageDataSize, wBytesCopied);
-                memset(&tempBuf[wBytesCopied], 0xff,
-                        DeviceInfo.wPageSize-wBytesCopied);
-                FTL_Insert_Block_Table_Signature(
-                        &tempBuf[DeviceInfo.wPageDataSize], bt_flag);
-#if CMD_DMA
-                memcpy(g_pNextBlockTable, tempBuf,
-                                DeviceInfo.wPageSize * sizeof(u8));
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Writing the last Page of Block Table "
-                        "Block %u Page %u\n",
-                        (unsigned int)Block, Page + bt_pages - 1);
-                if (FAIL == GLOB_LLD_Write_Page_Main_Spare_cdma(
-                        g_pNextBlockTable, Block, Page + bt_pages - 1, 1,
-                        LLD_CMD_FLAG_MODE_CDMA |
-                        LLD_CMD_FLAG_ORDER_BEFORE_REST)) {
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "NAND Program fail in %s, Line %d, "
-                                "Function: %s, new Bad Block %d generated!\n",
-                                __FILE__, __LINE__, __func__, Block);
-                        goto func_return;
-                }
-                ftl_cmd_cnt++;
-#else
-                if (FAIL == GLOB_LLD_Write_Page_Main_Spare(tempBuf,
-                                        Block, Page+bt_pages - 1, 1)) {
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "NAND Program fail in %s, Line %d, "
-                                "Function: %s, "
-                                "new Bad Block %d generated!\n",
-                                __FILE__, __LINE__, __func__, Block);
-                        goto func_return;
-                }
-#endif
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "FTL_Write_Block_Table_Data: done\n");
-
-func_return:
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Replace_Block_Table
-* Inputs:       None
-* Outputs:      PASS=0 / FAIL=1
-* Description:  Get a new block to write block table
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u32 FTL_Replace_Block_Table(void)
-{
-        u32 blk;
-        int gc;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        blk = FTL_Replace_LWBlock(BLOCK_TABLE_INDEX, &gc);
-
-        if ((BAD_BLOCK == blk) && (PASS == gc)) {
-                GLOB_FTL_Garbage_Collection();
-                blk = FTL_Replace_LWBlock(BLOCK_TABLE_INDEX, &gc);
-        }
-        if (BAD_BLOCK == blk)
-                printk(KERN_ERR "%s, %s: There is no spare block. "
-                        "It should never happen\n",
-                        __FILE__, __func__);
-
-        nand_dbg_print(NAND_DBG_DEBUG, "New Block table Block is %d\n", blk);
-
-        return blk;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Replace_LWBlock
-* Inputs:       Block number
-*               Pointer to Garbage Collect flag
-* Outputs:
-* Description:  Determine the least weared block by traversing
-*               block table
-*               Set Garbage collection to be called if number of spare
-*               block is less than Free Block Gate count
-*               Change Block table entry to map least worn block for current
-*               operation
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u32 FTL_Replace_LWBlock(u32 wBlockNum, int *pGarbageCollect)
-{
-        u32 i;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u8 wLeastWornCounter = 0xFF;
-        u32 wLeastWornIndex = BAD_BLOCK;
-        u32 wSpareBlockNum = 0;
-        u32 wDiscardBlockNum = 0;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        if (IS_SPARE_BLOCK(wBlockNum)) {
-                *pGarbageCollect = FAIL;
-                pbt[wBlockNum] = (u32)(pbt[wBlockNum] & (~SPARE_BLOCK));
-#if CMD_DMA
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-                p_BTableChangesDelta->ftl_cmd_cnt =
-                                                ftl_cmd_cnt;
-                p_BTableChangesDelta->BT_Index = (u32)(wBlockNum);
-                p_BTableChangesDelta->BT_Entry_Value = pbt[wBlockNum];
-                p_BTableChangesDelta->ValidFields = 0x0C;
-#endif
-                return pbt[wBlockNum];
-        }
-
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                if (IS_DISCARDED_BLOCK(i))
-                        wDiscardBlockNum++;
-
-                if (IS_SPARE_BLOCK(i)) {
-                        u32 wPhysicalIndex = (u32)((~BAD_BLOCK) & pbt[i]);
-                        if (wPhysicalIndex > DeviceInfo.wSpectraEndBlock)
-                                printk(KERN_ERR "FTL_Replace_LWBlock: "
-                                        "This should never occur!\n");
-                        if (g_pWearCounter[wPhysicalIndex -
-                                DeviceInfo.wSpectraStartBlock] <
-                                wLeastWornCounter) {
-                                wLeastWornCounter =
-                                        g_pWearCounter[wPhysicalIndex -
-                                        DeviceInfo.wSpectraStartBlock];
-                                wLeastWornIndex = i;
-                        }
-                        wSpareBlockNum++;
-                }
-        }
-
-        nand_dbg_print(NAND_DBG_WARN,
-                "FTL_Replace_LWBlock: Least Worn Counter %d\n",
-                (int)wLeastWornCounter);
-
-        if ((wDiscardBlockNum >= NUM_FREE_BLOCKS_GATE) ||
-                (wSpareBlockNum <= NUM_FREE_BLOCKS_GATE))
-                *pGarbageCollect = PASS;
-        else
-                *pGarbageCollect = FAIL;
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "FTL_Replace_LWBlock: Discarded Blocks %u Spare"
-                " Blocks %u\n",
-                (unsigned int)wDiscardBlockNum,
-                (unsigned int)wSpareBlockNum);
-
-        return FTL_Replace_OneBlock(wBlockNum, wLeastWornIndex);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Replace_MWBlock
-* Inputs:       None
-* Outputs:      most worn spare block no./BAD_BLOCK
-* Description:  It finds most worn spare block.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static u32 FTL_Replace_MWBlock(void)
-{
-        u32 i;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u8 wMostWornCounter = 0;
-        u32 wMostWornIndex = BAD_BLOCK;
-        u32 wSpareBlockNum = 0;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                if (IS_SPARE_BLOCK(i)) {
-                        u32 wPhysicalIndex = (u32)((~SPARE_BLOCK) & pbt[i]);
-                        if (g_pWearCounter[wPhysicalIndex -
-                            DeviceInfo.wSpectraStartBlock] >
-                            wMostWornCounter) {
-                                wMostWornCounter =
-                                    g_pWearCounter[wPhysicalIndex -
-                                    DeviceInfo.wSpectraStartBlock];
-                                wMostWornIndex = wPhysicalIndex;
-                        }
-                        wSpareBlockNum++;
-                }
-        }
-
-        if (wSpareBlockNum <= 2)
-                return BAD_BLOCK;
-
-        return wMostWornIndex;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Replace_Block
-* Inputs:       Block Address
-* Outputs:      PASS=0 / FAIL=1
-* Description:  If block specified by blk_addr parameter is not free,
-*               replace it with the least worn block.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Replace_Block(u64 blk_addr)
-{
-        u32 current_blk = BLK_FROM_ADDR(blk_addr);
-        u32 *pbt = (u32 *)g_pBlockTable;
-        int wResult = PASS;
-        int GarbageCollect = FAIL;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        if (IS_SPARE_BLOCK(current_blk)) {
-                pbt[current_blk] = (~SPARE_BLOCK) & pbt[current_blk];
-#if CMD_DMA
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-                p_BTableChangesDelta->ftl_cmd_cnt =
-                        ftl_cmd_cnt;
-                p_BTableChangesDelta->BT_Index = current_blk;
-                p_BTableChangesDelta->BT_Entry_Value = pbt[current_blk];
-                p_BTableChangesDelta->ValidFields = 0x0C ;
-#endif
-                return wResult;
-        }
-
-        FTL_Replace_LWBlock(current_blk, &GarbageCollect);
-
-        if (PASS == GarbageCollect)
-                wResult = GLOB_FTL_Garbage_Collection();
-
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Is_BadBlock
-* Inputs:       block number to test
-* Outputs:      PASS (block is BAD) / FAIL (block is not bad)
-* Description:  test if this block number is flagged as bad
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Is_BadBlock(u32 wBlockNum)
-{
-        u32 *pbt = (u32 *)g_pBlockTable;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        if (wBlockNum >= DeviceInfo.wSpectraStartBlock
-                && BAD_BLOCK == (pbt[wBlockNum] & BAD_BLOCK))
-                return PASS;
-        else
-                return FAIL;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Flush_Cache
-* Inputs:       none
-* Outputs:      PASS=0 / FAIL=1
-* Description:  flush all the cache blocks to flash
-*               if a cache block is not dirty, don't do anything with it
-*               else, write the block and update the block table
-* Note:         This function should be called at shutdown/power down.
-*               to write important data into device
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Flush_Cache(void)
-{
-        int i, ret;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < CACHE_ITEM_NUM; i++) {
-                if (SET == Cache.array[i].changed) {
-#if CMD_DMA
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-                        int_cache[ftl_cmd_cnt].item = i;
-                        int_cache[ftl_cmd_cnt].cache.address =
-                                        Cache.array[i].address;
-                        int_cache[ftl_cmd_cnt].cache.changed = CLEAR;
-#endif
-#endif
-                        ret = write_back_to_l2_cache(Cache.array[i].buf, Cache.array[i].address);
-                        if (PASS == ret) {
-                                Cache.array[i].changed = CLEAR;
-                        } else {
-                                printk(KERN_ALERT "Failed when write back to L2 cache!\n");
-                                /* TODO - How to handle this? */
-                        }
-                }
-        }
-
-        flush_l2_cache();
-
-        return FTL_Write_Block_Table(FAIL);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Page_Read
-* Inputs:       pointer to data
-*                   logical address of data (u64 is LBA * Bytes/Page)
-* Outputs:      PASS=0 / FAIL=1
-* Description:  reads a page of data into RAM from the cache
-*               if the data is not already in cache, read from flash to cache
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Page_Read(u8 *data, u64 logical_addr)
-{
-        u16 cache_item;
-        int res = PASS;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "GLOB_FTL_Page_Read - "
-                "page_addr: %llu\n", logical_addr);
-
-        cache_item = FTL_Cache_If_Hit(logical_addr);
-
-        if (UNHIT_CACHE_ITEM == cache_item) {
-                nand_dbg_print(NAND_DBG_DEBUG,
-                               "GLOB_FTL_Page_Read: Cache not hit\n");
-                res = FTL_Cache_Write();
-                if (ERR == FTL_Cache_Read(logical_addr))
-                        res = ERR;
-                cache_item = Cache.LRU;
-        }
-
-        FTL_Cache_Read_Page(data, logical_addr, cache_item);
-
-        return res;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Page_Write
-* Inputs:       pointer to data
-*               address of data (ADDRESSTYPE is LBA * Bytes/Page)
-* Outputs:      PASS=0 / FAIL=1
-* Description:  writes a page of data from RAM to the cache
-*               if the data is not already in cache, write back the
-*               least recently used block and read the addressed block
-*               from flash to cache
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Page_Write(u8 *pData, u64 dwPageAddr)
-{
-        u16 cache_blk;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        int wResult = PASS;
-
-        nand_dbg_print(NAND_DBG_TRACE, "GLOB_FTL_Page_Write - "
-                "dwPageAddr: %llu\n", dwPageAddr);
-
-        cache_blk = FTL_Cache_If_Hit(dwPageAddr);
-
-        if (UNHIT_CACHE_ITEM == cache_blk) {
-                wResult = FTL_Cache_Write();
-                if (IS_BAD_BLOCK(BLK_FROM_ADDR(dwPageAddr))) {
-                        wResult = FTL_Replace_Block(dwPageAddr);
-                        pbt[BLK_FROM_ADDR(dwPageAddr)] |= SPARE_BLOCK;
-                        if (wResult == FAIL)
-                                return FAIL;
-                }
-                if (ERR == FTL_Cache_Read(dwPageAddr))
-                        wResult = ERR;
-                cache_blk = Cache.LRU;
-                FTL_Cache_Write_Page(pData, dwPageAddr, cache_blk, 0);
-        } else {
-#if CMD_DMA
-                FTL_Cache_Write_Page(pData, dwPageAddr, cache_blk,
-                                LLD_CMD_FLAG_ORDER_BEFORE_REST);
-#else
-                FTL_Cache_Write_Page(pData, dwPageAddr, cache_blk, 0);
-#endif
-        }
-
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     GLOB_FTL_Block_Erase
-* Inputs:       address of block to erase (now in byte format, should change to
-* block format)
-* Outputs:      PASS=0 / FAIL=1
-* Description:  erases the specified block
-*               increments the erase count
-*               If erase count reaches its upper limit,call function to
-*               do the adjustment as per the relative erase count values
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int GLOB_FTL_Block_Erase(u64 blk_addr)
-{
-        int status;
-        u32 BlkIdx;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        BlkIdx = (u32)(blk_addr >> DeviceInfo.nBitsInBlockDataSize);
-
-        if (BlkIdx < DeviceInfo.wSpectraStartBlock) {
-                printk(KERN_ERR "GLOB_FTL_Block_Erase: "
-                        "This should never occur\n");
-                return FAIL;
-        }
-
-#if CMD_DMA
-        status = GLOB_LLD_Erase_Block_cdma(BlkIdx, LLD_CMD_FLAG_MODE_CDMA);
-        if (status == FAIL)
-                nand_dbg_print(NAND_DBG_WARN,
-                               "NAND Program fail in %s, Line %d, "
-                               "Function: %s, new Bad Block %d generated!\n",
-                               __FILE__, __LINE__, __func__, BlkIdx);
-#else
-        status = GLOB_LLD_Erase_Block(BlkIdx);
-        if (status == FAIL) {
-                nand_dbg_print(NAND_DBG_WARN,
-                               "NAND Program fail in %s, Line %d, "
-                               "Function: %s, new Bad Block %d generated!\n",
-                               __FILE__, __LINE__, __func__, BlkIdx);
-                return status;
-        }
-#endif
-
-        if (DeviceInfo.MLCDevice) {
-                g_pReadCounter[BlkIdx - DeviceInfo.wSpectraStartBlock] = 0;
-                if (g_cBlockTableStatus != IN_PROGRESS_BLOCK_TABLE) {
-                        g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                        FTL_Write_IN_Progress_Block_Table_Page();
-                }
-        }
-
-        g_pWearCounter[BlkIdx - DeviceInfo.wSpectraStartBlock]++;
-
-#if CMD_DMA
-        p_BTableChangesDelta =
-                (struct BTableChangesDelta *)g_pBTDelta_Free;
-        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-        p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-        p_BTableChangesDelta->WC_Index =
-                BlkIdx - DeviceInfo.wSpectraStartBlock;
-        p_BTableChangesDelta->WC_Entry_Value =
-                g_pWearCounter[BlkIdx - DeviceInfo.wSpectraStartBlock];
-        p_BTableChangesDelta->ValidFields = 0x30;
-
-        if (DeviceInfo.MLCDevice) {
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-                p_BTableChangesDelta->ftl_cmd_cnt =
-                        ftl_cmd_cnt;
-                p_BTableChangesDelta->RC_Index =
-                        BlkIdx - DeviceInfo.wSpectraStartBlock;
-                p_BTableChangesDelta->RC_Entry_Value =
-                        g_pReadCounter[BlkIdx -
-                                DeviceInfo.wSpectraStartBlock];
-                p_BTableChangesDelta->ValidFields = 0xC0;
-        }
-
-        ftl_cmd_cnt++;
-#endif
-
-        if (g_pWearCounter[BlkIdx - DeviceInfo.wSpectraStartBlock] == 0xFE)
-                FTL_Adjust_Relative_Erase_Count(BlkIdx);
-
-        return status;
-}
-
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Adjust_Relative_Erase_Count
-* Inputs:       index to block that was just incremented and is at the max
-* Outputs:      PASS=0 / FAIL=1
-* Description:  If any erase counts at MAX, adjusts erase count of every
-*               block by subtracting least worn
-*               counter from counter value of every entry in wear table
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-static int FTL_Adjust_Relative_Erase_Count(u32 Index_of_MAX)
-{
-        u8 wLeastWornCounter = MAX_BYTE_VALUE;
-        u8 wWearCounter;
-        u32 i, wWearIndex;
-        u32 *pbt = (u32 *)g_pBlockTable;
-        int wResult = PASS;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < DeviceInfo.wDataBlockNum; i++) {
-                if (IS_BAD_BLOCK(i))
-                        continue;
-                wWearIndex = (u32)(pbt[i] & (~BAD_BLOCK));
-
-                if ((wWearIndex - DeviceInfo.wSpectraStartBlock) < 0)
-                        printk(KERN_ERR "FTL_Adjust_Relative_Erase_Count:"
-                                        "This should never occur\n");
-                wWearCounter = g_pWearCounter[wWearIndex -
-                        DeviceInfo.wSpectraStartBlock];
-                if (wWearCounter < wLeastWornCounter)
-                        wLeastWornCounter = wWearCounter;
-        }
-
-        if (wLeastWornCounter == 0) {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Adjusting Wear Levelling Counters: Special Case\n");
-                g_pWearCounter[Index_of_MAX -
-                        DeviceInfo.wSpectraStartBlock]--;
-#if CMD_DMA
-                p_BTableChangesDelta =
-                        (struct BTableChangesDelta *)g_pBTDelta_Free;
-                g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-                p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-                p_BTableChangesDelta->WC_Index =
-                        Index_of_MAX - DeviceInfo.wSpectraStartBlock;
-                p_BTableChangesDelta->WC_Entry_Value =
-                        g_pWearCounter[Index_of_MAX -
-                                DeviceInfo.wSpectraStartBlock];
-                p_BTableChangesDelta->ValidFields = 0x30;
-#endif
-                FTL_Static_Wear_Leveling();
-        } else {
-                for (i = 0; i < DeviceInfo.wDataBlockNum; i++)
-                        if (!IS_BAD_BLOCK(i)) {
-                                wWearIndex = (u32)(pbt[i] & (~BAD_BLOCK));
-                                g_pWearCounter[wWearIndex -
-                                        DeviceInfo.wSpectraStartBlock] =
-                                        (u8)(g_pWearCounter
-                                        [wWearIndex -
-                                        DeviceInfo.wSpectraStartBlock] -
-                                        wLeastWornCounter);
-#if CMD_DMA
-                                p_BTableChangesDelta =
-                                (struct BTableChangesDelta *)g_pBTDelta_Free;
-                                g_pBTDelta_Free +=
-                                        sizeof(struct BTableChangesDelta);
-
-                                p_BTableChangesDelta->ftl_cmd_cnt =
-                                        ftl_cmd_cnt;
-                                p_BTableChangesDelta->WC_Index = wWearIndex -
-                                        DeviceInfo.wSpectraStartBlock;
-                                p_BTableChangesDelta->WC_Entry_Value =
-                                        g_pWearCounter[wWearIndex -
-                                        DeviceInfo.wSpectraStartBlock];
-                                p_BTableChangesDelta->ValidFields = 0x30;
-#endif
-                        }
-        }
-
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Write_IN_Progress_Block_Table_Page
-* Inputs:       None
-* Outputs:      None
-* Description:  It writes in-progress flag page to the page next to
-*               block table
-***********************************************************************/
-static int FTL_Write_IN_Progress_Block_Table_Page(void)
-{
-        int wResult = PASS;
-        u16 bt_pages;
-        u16 dwIPFPageAddr;
-#if CMD_DMA
-#else
-        u32 *pbt = (u32 *)g_pBlockTable;
-        u32 wTempBlockTableIndex;
-#endif
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-        bt_pages = FTL_Get_Block_Table_Flash_Size_Pages();
-
-        dwIPFPageAddr = g_wBlockTableOffset + bt_pages;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Writing IPF at "
-                               "Block %d Page %d\n",
-                               g_wBlockTableIndex, dwIPFPageAddr);
-
-#if CMD_DMA
-        wResult = GLOB_LLD_Write_Page_Main_Spare_cdma(g_pIPF,
-                g_wBlockTableIndex, dwIPFPageAddr, 1,
-                LLD_CMD_FLAG_MODE_CDMA | LLD_CMD_FLAG_ORDER_BEFORE_REST);
-        if (wResult == FAIL) {
-                nand_dbg_print(NAND_DBG_WARN,
-                               "NAND Program fail in %s, Line %d, "
-                               "Function: %s, new Bad Block %d generated!\n",
-                               __FILE__, __LINE__, __func__,
-                               g_wBlockTableIndex);
-        }
-        g_wBlockTableOffset = dwIPFPageAddr + 1;
-        p_BTableChangesDelta = (struct BTableChangesDelta *)g_pBTDelta_Free;
-        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-        p_BTableChangesDelta->ftl_cmd_cnt = ftl_cmd_cnt;
-        p_BTableChangesDelta->g_wBlockTableOffset = g_wBlockTableOffset;
-        p_BTableChangesDelta->ValidFields = 0x01;
-        ftl_cmd_cnt++;
-#else
-        wResult = GLOB_LLD_Write_Page_Main_Spare(g_pIPF,
-                g_wBlockTableIndex, dwIPFPageAddr, 1);
-        if (wResult == FAIL) {
-                nand_dbg_print(NAND_DBG_WARN,
-                               "NAND Program fail in %s, Line %d, "
-                               "Function: %s, new Bad Block %d generated!\n",
-                               __FILE__, __LINE__, __func__,
-                               (int)g_wBlockTableIndex);
-                MARK_BLOCK_AS_BAD(pbt[BLOCK_TABLE_INDEX]);
-                wTempBlockTableIndex = FTL_Replace_Block_Table();
-                bt_block_changed = 1;
-                if (BAD_BLOCK == wTempBlockTableIndex)
-                        return ERR;
-                g_wBlockTableIndex = wTempBlockTableIndex;
-                g_wBlockTableOffset = 0;
-                /* Block table tag is '00'. Means it's used one */
-                pbt[BLOCK_TABLE_INDEX] = g_wBlockTableIndex;
-                return FAIL;
-        }
-        g_wBlockTableOffset = dwIPFPageAddr + 1;
-#endif
-        return wResult;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     FTL_Read_Disturbance
-* Inputs:       block address
-* Outputs:      PASS=0 / FAIL=1
-* Description:  used to handle read disturbance. Data in block that
-*               reaches its read limit is moved to new block
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int FTL_Read_Disturbance(u32 blk_addr)
-{
-        int wResult = FAIL;
-        u32 *pbt = (u32 *) g_pBlockTable;
-        u32 dwOldBlockAddr = blk_addr;
-        u32 wBlockNum;
-        u32 i;
-        u32 wLeastReadCounter = 0xFFFF;
-        u32 wLeastReadIndex = BAD_BLOCK;
-        u32 wSpareBlockNum = 0;
-        u32 wTempNode;
-        u32 wReplacedNode;
-        u8 *g_pTempBuf;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                               __FILE__, __LINE__, __func__);
-
-#if CMD_DMA
-        g_pTempBuf = cp_back_buf_copies[cp_back_buf_idx];
-        cp_back_buf_idx++;
-        if (cp_back_buf_idx > COPY_BACK_BUF_NUM) {
-                printk(KERN_ERR "cp_back_buf_copies overflow! Exit."
-                "Maybe too many pending commands in your CDMA chain.\n");
-                return FAIL;
-        }
-#else
-        g_pTempBuf = tmp_buf_read_disturbance;
-#endif
-
-        wBlockNum = FTL_Get_Block_Index(blk_addr);
-
-        do {
-                /* This is a bug.Here 'i' should be logical block number
-                 * and start from 1 (0 is reserved for block table).
-                 * Have fixed it.        - Yunpeng 2008. 12. 19
-                 */
-                for (i = 1; i < DeviceInfo.wDataBlockNum; i++) {
-                        if (IS_SPARE_BLOCK(i)) {
-                                u32 wPhysicalIndex =
-                                        (u32)((~SPARE_BLOCK) & pbt[i]);
-                                if (g_pReadCounter[wPhysicalIndex -
-                                        DeviceInfo.wSpectraStartBlock] <
-                                        wLeastReadCounter) {
-                                        wLeastReadCounter =
-                                                g_pReadCounter[wPhysicalIndex -
-                                                DeviceInfo.wSpectraStartBlock];
-                                        wLeastReadIndex = i;
-                                }
-                                wSpareBlockNum++;
-                        }
-                }
-
-                if (wSpareBlockNum <= NUM_FREE_BLOCKS_GATE) {
-                        wResult = GLOB_FTL_Garbage_Collection();
-                        if (PASS == wResult)
-                                continue;
-                        else
-                                break;
-                } else {
-                        wTempNode = (u32)(DISCARD_BLOCK | pbt[wBlockNum]);
-                        wReplacedNode = (u32)((~SPARE_BLOCK) &
-                                        pbt[wLeastReadIndex]);
-#if CMD_DMA
-                        pbt[wBlockNum] = wReplacedNode;
-                        pbt[wLeastReadIndex] = wTempNode;
-                        p_BTableChangesDelta =
-                                (struct BTableChangesDelta *)g_pBTDelta_Free;
-                        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                        ftl_cmd_cnt;
-                        p_BTableChangesDelta->BT_Index = wBlockNum;
-                        p_BTableChangesDelta->BT_Entry_Value = pbt[wBlockNum];
-                        p_BTableChangesDelta->ValidFields = 0x0C;
-
-                        p_BTableChangesDelta =
-                                (struct BTableChangesDelta *)g_pBTDelta_Free;
-                        g_pBTDelta_Free += sizeof(struct BTableChangesDelta);
-
-                        p_BTableChangesDelta->ftl_cmd_cnt =
-                                        ftl_cmd_cnt;
-                        p_BTableChangesDelta->BT_Index = wLeastReadIndex;
-                        p_BTableChangesDelta->BT_Entry_Value =
-                                        pbt[wLeastReadIndex];
-                        p_BTableChangesDelta->ValidFields = 0x0C;
-
-                        wResult = GLOB_LLD_Read_Page_Main_cdma(g_pTempBuf,
-                                dwOldBlockAddr, 0, DeviceInfo.wPagesPerBlock,
-                                LLD_CMD_FLAG_MODE_CDMA);
-                        if (wResult == FAIL)
-                                return wResult;
-
-                        ftl_cmd_cnt++;
-
-                        if (wResult != FAIL) {
-                                if (FAIL == GLOB_LLD_Write_Page_Main_cdma(
-                                        g_pTempBuf, pbt[wBlockNum], 0,
-                                        DeviceInfo.wPagesPerBlock)) {
-                                        nand_dbg_print(NAND_DBG_WARN,
-                                                "NAND Program fail in "
-                                                "%s, Line %d, Function: %s, "
-                                                "new Bad Block %d "
-                                                "generated!\n",
-                                                __FILE__, __LINE__, __func__,
-                                                (int)pbt[wBlockNum]);
-                                        wResult = FAIL;
-                                        MARK_BLOCK_AS_BAD(pbt[wBlockNum]);
-                                }
-                                ftl_cmd_cnt++;
-                        }
-#else
-                        wResult = GLOB_LLD_Read_Page_Main(g_pTempBuf,
-                                dwOldBlockAddr, 0, DeviceInfo.wPagesPerBlock);
-                        if (wResult == FAIL)
-                                return wResult;
-
-                        if (wResult != FAIL) {
-                                /* This is a bug. At this time, pbt[wBlockNum]
-                                is still the physical address of
-                                discard block, and should not be write.
-                                Have fixed it as below.
-                                        -- Yunpeng 2008.12.19
-                                */
-                                wResult = GLOB_LLD_Write_Page_Main(g_pTempBuf,
-                                        wReplacedNode, 0,
-                                        DeviceInfo.wPagesPerBlock);
-                                if (wResult == FAIL) {
-                                        nand_dbg_print(NAND_DBG_WARN,
-                                                "NAND Program fail in "
-                                                "%s, Line %d, Function: %s, "
-                                                "new Bad Block %d "
-                                                "generated!\n",
-                                                __FILE__, __LINE__, __func__,
-                                                (int)wReplacedNode);
-                                        MARK_BLOCK_AS_BAD(wReplacedNode);
-                                } else {
-                                        pbt[wBlockNum] = wReplacedNode;
-                                        pbt[wLeastReadIndex] = wTempNode;
-                                }
-                        }
-
-                        if ((wResult == PASS) && (g_cBlockTableStatus !=
-                                IN_PROGRESS_BLOCK_TABLE)) {
-                                g_cBlockTableStatus = IN_PROGRESS_BLOCK_TABLE;
-                                FTL_Write_IN_Progress_Block_Table_Page();
-                        }
-#endif
-                }
-        } while (wResult != PASS)
-        ;
-
-#if CMD_DMA
-        /* ... */
-#endif
-
-        return wResult;
-}
-
diff --git a/drivers/staging/spectra/flash.h b/drivers/staging/spectra/flash.h
deleted file mode 100644
index e59cf4ede551..000000000000
--- a/drivers/staging/spectra/flash.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _FLASH_INTERFACE_
-#define _FLASH_INTERFACE_
-
-#include "ffsport.h"
-#include "spectraswconfig.h"
-
-#define MAX_BYTE_VALUE        0xFF
-#define MAX_WORD_VALUE        0xFFFF
-#define MAX_U32_VALUE        0xFFFFFFFF
-
-#define MAX_BLOCKNODE_VALUE     0xFFFFFF
-#define DISCARD_BLOCK           0x800000
-#define SPARE_BLOCK             0x400000
-#define BAD_BLOCK               0xC00000
-
-#define UNHIT_CACHE_ITEM         0xFFFF
-
-#define NAND_CACHE_INIT_ADDR    0xffffffffffffffffULL
-
-#define IN_PROGRESS_BLOCK_TABLE   0x00
-#define CURRENT_BLOCK_TABLE       0x01
-
-#define BTSIG_OFFSET   (0)
-#define BTSIG_BYTES    (5)
-#define BTSIG_DELTA    (3)
-
-#define MAX_READ_COUNTER  0x2710
-
-#define FIRST_BT_ID             (1)
-#define LAST_BT_ID    (254)
-#define BTBLOCK_INVAL  (u32)(0xFFFFFFFF)
-
-struct device_info_tag {
-        u16 wDeviceMaker;
-        u16 wDeviceID;
-        u32 wDeviceType;
-        u32 wSpectraStartBlock;
-        u32 wSpectraEndBlock;
-        u32 wTotalBlocks;
-        u16 wPagesPerBlock;
-        u16 wPageSize;
-        u16 wPageDataSize;
-        u16 wPageSpareSize;
-        u16 wNumPageSpareFlag;
-        u16 wECCBytesPerSector;
-        u32 wBlockSize;
-        u32 wBlockDataSize;
-        u32 wDataBlockNum;
-        u8 bPlaneNum;
-        u16 wDeviceMainAreaSize;
-        u16 wDeviceSpareAreaSize;
-        u16 wDevicesConnected;
-        u16 wDeviceWidth;
-        u16 wHWRevision;
-        u16 wHWFeatures;
-
-        u16 wONFIDevFeatures;
-        u16 wONFIOptCommands;
-        u16 wONFITimingMode;
-        u16 wONFIPgmCacheTimingMode;
-
-        u16 MLCDevice;
-        u16 wSpareSkipBytes;
-
-        u8 nBitsInPageNumber;
-        u8 nBitsInPageDataSize;
-        u8 nBitsInBlockDataSize;
-};
-
-extern struct device_info_tag DeviceInfo;
-
-/* Cache item format */
-struct flash_cache_item_tag {
-        u64 address;
-        u16 use_cnt;
-        u16 changed;
-        u8 *buf;
-};
-
-struct flash_cache_tag {
-        u32 cache_item_size; /* Size in bytes of each cache item */
-        u16 pages_per_item; /* How many NAND pages in each cache item */
-        u16 LRU; /* No. of the least recently used cache item */
-        struct flash_cache_item_tag array[CACHE_ITEM_NUM];
-};
-
-/*
- *Data structure for each list node of the management table
- * used for the Level 2 Cache. Each node maps one logical NAND block.
- */
-struct spectra_l2_cache_list {
-        struct list_head list;
-        u32 logical_blk_num; /* Logical block number */
-        u32 pages_array[]; /* Page map array of this logical block.
-                           * Array index is the logical block number,
-                           * and for every item of this arry:
-                           * high 16 bit is index of the L2 cache block num,
-                           * low 16 bit is the phy page num
-                           * of the above L2 cache block.
-                           * This array will be kmalloc during run time.
-                           */
-};
-
-struct spectra_l2_cache_info {
-        u32 blk_array[BLK_NUM_FOR_L2_CACHE];
-        u16 cur_blk_idx; /* idx to the phy block number of current using */
-        u16 cur_page_num; /* pages number of current using */
-        struct spectra_l2_cache_list table; /* First node of the table */
-};
-
-#define RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE    1
-
-#if RESTORE_CACHE_ON_CDMA_CHAIN_FAILURE
-struct flash_cache_mod_item_tag {
-        u64 address;
-        u8 changed;
-};
-
-struct flash_cache_delta_list_tag {
-        u8 item;  /* used cache item */
-        struct flash_cache_mod_item_tag cache;
-};
-#endif
-
-extern struct flash_cache_tag Cache;
-
-extern u8 *buf_read_page_main_spare;
-extern u8 *buf_write_page_main_spare;
-extern u8 *buf_read_page_spare;
-extern u8 *buf_get_bad_block;
-extern u8 *cdma_desc_buf;
-extern u8 *memcp_desc_buf;
-
-/* struture used for IndentfyDevice function */
-struct spectra_indentfy_dev_tag {
-        u32 NumBlocks;
-        u16 PagesPerBlock;
-        u16 PageDataSize;
-        u16 wECCBytesPerSector;
-        u32 wDataBlockNum;
-};
-
-int GLOB_FTL_Flash_Init(void);
-int GLOB_FTL_Flash_Release(void);
-/*void GLOB_FTL_Erase_Flash(void);*/
-int GLOB_FTL_Block_Erase(u64 block_addr);
-int GLOB_FTL_Is_BadBlock(u32 block_num);
-int GLOB_FTL_IdentifyDevice(struct spectra_indentfy_dev_tag *dev_data);
-int GLOB_FTL_Event_Status(int *);
-u16 glob_ftl_execute_cmds(void);
-
-/*int FTL_Read_Disturbance(ADDRESSTYPE dwBlockAddr);*/
-int FTL_Read_Disturbance(u32 dwBlockAddr);
-
-/*Flash r/w based on cache*/
-int GLOB_FTL_Page_Read(u8 *read_data, u64 page_addr);
-int GLOB_FTL_Page_Write(u8 *write_data, u64 page_addr);
-int GLOB_FTL_Wear_Leveling(void);
-int GLOB_FTL_Flash_Format(void);
-int GLOB_FTL_Init(void);
-int GLOB_FTL_Flush_Cache(void);
-int GLOB_FTL_Garbage_Collection(void);
-int GLOB_FTL_BT_Garbage_Collection(void);
-void GLOB_FTL_Cache_Release(void);
-u8 *get_blk_table_start_addr(void);
-u8 *get_wear_leveling_table_start_addr(void);
-unsigned long get_blk_table_len(void);
-unsigned long get_wear_leveling_table_len(void);
-
-#if DEBUG_BNDRY
-void debug_boundary_lineno_error(int chnl, int limit, int no, int lineno,
-                                char *filename);
-#define debug_boundary_error(chnl, limit, no) debug_boundary_lineno_error(chnl,\
-                                                limit, no, __LINE__, __FILE__)
-#else
-#define debug_boundary_error(chnl, limit, no) ;
-#endif
-
-#endif /*_FLASH_INTERFACE_*/
diff --git a/drivers/staging/spectra/lld.c b/drivers/staging/spectra/lld.c
deleted file mode 100644
index 5c3b9762dc3e..000000000000
--- a/drivers/staging/spectra/lld.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 "spectraswconfig.h"
-#include "ffsport.h"
-#include "ffsdefs.h"
-#include "lld.h"
-#include "lld_nand.h"
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-#if FLASH_EMU           /* vector all the LLD calls to the LLD_EMU code */
-#include "lld_emu.h"
-#include "lld_cdma.h"
-
-/* common functions: */
-u16 GLOB_LLD_Flash_Reset(void)
-{
-        return emu_Flash_Reset();
-}
-
-u16 GLOB_LLD_Read_Device_ID(void)
-{
-        return emu_Read_Device_ID();
-}
-
-int GLOB_LLD_Flash_Release(void)
-{
-        return emu_Flash_Release();
-}
-
-u16 GLOB_LLD_Flash_Init(void)
-{
-        return emu_Flash_Init();
-}
-
-u16 GLOB_LLD_Erase_Block(u32 block_add)
-{
-        return emu_Erase_Block(block_add);
-}
-
-u16 GLOB_LLD_Write_Page_Main(u8 *write_data, u32 block, u16 Page,
-                                u16 PageCount)
-{
-        return emu_Write_Page_Main(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main(u8 *read_data, u32 block, u16 Page,
-                               u16 PageCount)
-{
-        return emu_Read_Page_Main(read_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Polling(u8 *read_data,
-                        u32 block, u16 page, u16 page_count)
-{
-        return emu_Read_Page_Main(read_data, block, page, page_count);
-}
-
-u16 GLOB_LLD_Write_Page_Main_Spare(u8 *write_data, u32 block,
-                                      u16 Page, u16 PageCount)
-{
-        return emu_Write_Page_Main_Spare(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Spare(u8 *read_data, u32 block,
-                                     u16 Page, u16 PageCount)
-{
-        return emu_Read_Page_Main_Spare(read_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Write_Page_Spare(u8 *write_data, u32 block, u16 Page,
-                                 u16 PageCount)
-{
-        return emu_Write_Page_Spare(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Spare(u8 *read_data, u32 block, u16 Page,
-                                u16 PageCount)
-{
-        return emu_Read_Page_Spare(read_data, block, Page, PageCount);
-}
-
-u16  GLOB_LLD_Get_Bad_Block(u32 block)
-{
-    return  emu_Get_Bad_Block(block);
-}
-
-#endif /* FLASH_EMU */
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-#if FLASH_MTD           /* vector all the LLD calls to the LLD_MTD code */
-#include "lld_mtd.h"
-#include "lld_cdma.h"
-
-/* common functions: */
-u16 GLOB_LLD_Flash_Reset(void)
-{
-        return mtd_Flash_Reset();
-}
-
-u16 GLOB_LLD_Read_Device_ID(void)
-{
-        return mtd_Read_Device_ID();
-}
-
-int GLOB_LLD_Flash_Release(void)
-{
-        return mtd_Flash_Release();
-}
-
-u16 GLOB_LLD_Flash_Init(void)
-{
-        return mtd_Flash_Init();
-}
-
-u16 GLOB_LLD_Erase_Block(u32 block_add)
-{
-        return mtd_Erase_Block(block_add);
-}
-
-u16 GLOB_LLD_Write_Page_Main(u8 *write_data, u32 block, u16 Page,
-                                u16 PageCount)
-{
-        return mtd_Write_Page_Main(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main(u8 *read_data, u32 block, u16 Page,
-                               u16 PageCount)
-{
-        return mtd_Read_Page_Main(read_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Polling(u8 *read_data,
-                        u32 block, u16 page, u16 page_count)
-{
-        return mtd_Read_Page_Main(read_data, block, page, page_count);
-}
-
-u16 GLOB_LLD_Write_Page_Main_Spare(u8 *write_data, u32 block,
-                                      u16 Page, u16 PageCount)
-{
-        return mtd_Write_Page_Main_Spare(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Spare(u8 *read_data, u32 block,
-                                     u16 Page, u16 PageCount)
-{
-        return mtd_Read_Page_Main_Spare(read_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Write_Page_Spare(u8 *write_data, u32 block, u16 Page,
-                                 u16 PageCount)
-{
-        return mtd_Write_Page_Spare(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Spare(u8 *read_data, u32 block, u16 Page,
-                                u16 PageCount)
-{
-        return mtd_Read_Page_Spare(read_data, block, Page, PageCount);
-}
-
-u16  GLOB_LLD_Get_Bad_Block(u32 block)
-{
-    return  mtd_Get_Bad_Block(block);
-}
-
-#endif /* FLASH_MTD */
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-#if FLASH_NAND  /* vector all the LLD calls to the NAND controller code */
-#include "lld_nand.h"
-#include "lld_cdma.h"
-#include "flash.h"
-
-/* common functions for LLD_NAND */
-void GLOB_LLD_ECC_Control(int enable)
-{
-        NAND_ECC_Ctrl(enable);
-}
-
-/* common functions for LLD_NAND */
-u16 GLOB_LLD_Flash_Reset(void)
-{
-        return NAND_Flash_Reset();
-}
-
-u16 GLOB_LLD_Read_Device_ID(void)
-{
-        return NAND_Read_Device_ID();
-}
-
-u16 GLOB_LLD_UnlockArrayAll(void)
-{
-        return NAND_UnlockArrayAll();
-}
-
-u16 GLOB_LLD_Flash_Init(void)
-{
-        return NAND_Flash_Init();
-}
-
-int GLOB_LLD_Flash_Release(void)
-{
-        return nand_release_spectra();
-}
-
-u16 GLOB_LLD_Erase_Block(u32 block_add)
-{
-        return NAND_Erase_Block(block_add);
-}
-
-
-u16 GLOB_LLD_Write_Page_Main(u8 *write_data, u32 block, u16 Page,
-                                u16 PageCount)
-{
-        return NAND_Write_Page_Main(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main(u8 *read_data, u32 block, u16 page,
-                               u16 page_count)
-{
-        if (page_count == 1) /* Using polling to improve read speed */
-                return NAND_Read_Page_Main_Polling(read_data, block, page, 1);
-        else
-                return NAND_Read_Page_Main(read_data, block, page, page_count);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Polling(u8 *read_data,
-                        u32 block, u16 page, u16 page_count)
-{
-        return NAND_Read_Page_Main_Polling(read_data,
-                        block, page, page_count);
-}
-
-u16 GLOB_LLD_Write_Page_Main_Spare(u8 *write_data, u32 block,
-                                      u16 Page, u16 PageCount)
-{
-        return NAND_Write_Page_Main_Spare(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Write_Page_Spare(u8 *write_data, u32 block, u16 Page,
-                                 u16 PageCount)
-{
-        return NAND_Write_Page_Spare(write_data, block, Page, PageCount);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Spare(u8 *read_data, u32 block,
-                                     u16 page, u16 page_count)
-{
-        return NAND_Read_Page_Main_Spare(read_data, block, page, page_count);
-}
-
-u16 GLOB_LLD_Read_Page_Spare(u8 *read_data, u32 block, u16 Page,
-                                u16 PageCount)
-{
-        return NAND_Read_Page_Spare(read_data, block, Page, PageCount);
-}
-
-u16  GLOB_LLD_Get_Bad_Block(u32 block)
-{
-        return  NAND_Get_Bad_Block(block);
-}
-
-#if CMD_DMA
-u16 GLOB_LLD_Event_Status(void)
-{
-        return CDMA_Event_Status();
-}
-
-u16 glob_lld_execute_cmds(void)
-{
-        return CDMA_Execute_CMDs();
-}
-
-u16 GLOB_LLD_MemCopy_CMD(u8 *dest, u8 *src,
-                        u32 ByteCount, u16 flag)
-{
-        /* Replace the hardware memcopy with software memcpy function */
-        if (CDMA_Execute_CMDs())
-                return FAIL;
-        memcpy(dest, src, ByteCount);
-        return PASS;
-
-        /* return CDMA_MemCopy_CMD(dest, src, ByteCount, flag); */
-}
-
-u16 GLOB_LLD_Erase_Block_cdma(u32 block, u16 flags)
-{
-        return CDMA_Data_CMD(ERASE_CMD, 0, block, 0, 0, flags);
-}
-
-u16 GLOB_LLD_Write_Page_Main_cdma(u8 *data, u32 block, u16 page, u16 count)
-{
-        return CDMA_Data_CMD(WRITE_MAIN_CMD, data, block, page, count, 0);
-}
-
-u16 GLOB_LLD_Read_Page_Main_cdma(u8 *data, u32 block, u16 page,
-                                u16 count, u16 flags)
-{
-        return CDMA_Data_CMD(READ_MAIN_CMD, data, block, page, count, flags);
-}
-
-u16 GLOB_LLD_Write_Page_Main_Spare_cdma(u8 *data, u32 block, u16 page,
-                                        u16 count, u16 flags)
-{
-        return CDMA_Data_CMD(WRITE_MAIN_SPARE_CMD,
-                        data, block, page, count, flags);
-}
-
-u16 GLOB_LLD_Read_Page_Main_Spare_cdma(u8 *data,
-                                u32 block, u16 page, u16 count)
-{
-        return CDMA_Data_CMD(READ_MAIN_SPARE_CMD, data, block, page, count,
-                        LLD_CMD_FLAG_MODE_CDMA);
-}
-
-#endif /* CMD_DMA */
-#endif /* FLASH_NAND */
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-
-/* end of LLD.c */
diff --git a/drivers/staging/spectra/lld.h b/drivers/staging/spectra/lld.h
deleted file mode 100644
index d3738e0e1fea..000000000000
--- a/drivers/staging/spectra/lld.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _LLD_
-#define _LLD_
-
-#include "ffsport.h"
-#include "spectraswconfig.h"
-#include "flash.h"
-
-#define GOOD_BLOCK 0
-#define DEFECTIVE_BLOCK 1
-#define READ_ERROR 2
-
-#define CLK_X  5
-#define CLK_MULTI 4
-
-/* Typedefs */
-
-/*  prototypes: API for LLD */
-/* Currently, Write_Page_Main
- *                        MemCopy
- *                        Read_Page_Main_Spare
- * do not have flag because they were not implemented prior to this
- * They are not being added to keep changes to a minimum for now.
- * Currently, they are not required (only reqd for Wr_P_M_S.)
- * Later on, these NEED to be changed.
- */
-
-extern void GLOB_LLD_ECC_Control(int enable);
-
-extern u16 GLOB_LLD_Flash_Reset(void);
-
-extern u16 GLOB_LLD_Read_Device_ID(void);
-
-extern u16 GLOB_LLD_UnlockArrayAll(void);
-
-extern u16 GLOB_LLD_Flash_Init(void);
-
-extern int GLOB_LLD_Flash_Release(void);
-
-extern u16 GLOB_LLD_Erase_Block(u32 block_add);
-
-extern u16 GLOB_LLD_Write_Page_Main(u8 *write_data,
-        u32 block, u16 Page, u16 PageCount);
-
-extern u16 GLOB_LLD_Read_Page_Main(u8 *read_data,
-        u32 block, u16 page, u16 page_count);
-
-extern u16 GLOB_LLD_Read_Page_Main_Polling(u8 *read_data,
-        u32 block, u16 page, u16 page_count);
-
-extern u16 GLOB_LLD_Write_Page_Main_Spare(u8 *write_data,
-        u32 block, u16 Page, u16 PageCount);
-
-extern u16 GLOB_LLD_Write_Page_Spare(u8 *write_data,
-        u32 block, u16 Page, u16 PageCount);
-
-extern u16 GLOB_LLD_Read_Page_Main_Spare(u8 *read_data,
-        u32 block, u16 page, u16 page_count);
-
-extern u16 GLOB_LLD_Read_Page_Spare(u8 *read_data,
-        u32 block, u16 Page, u16 PageCount);
-
-extern u16  GLOB_LLD_Get_Bad_Block(u32 block);
-
-extern u16 GLOB_LLD_Event_Status(void);
-
-extern u16 GLOB_LLD_MemCopy_CMD(u8 *dest, u8 *src, u32 ByteCount, u16 flag);
-
-extern u16 glob_lld_execute_cmds(void);
-
-extern u16 GLOB_LLD_Erase_Block_cdma(u32 block, u16 flags);
-
-extern u16 GLOB_LLD_Write_Page_Main_cdma(u8 *data,
-        u32 block, u16 page, u16 count);
-
-extern u16 GLOB_LLD_Read_Page_Main_cdma(u8 *data,
-        u32 block, u16 page, u16 count, u16 flags);
-
-extern u16 GLOB_LLD_Write_Page_Main_Spare_cdma(u8 *data,
-        u32 block, u16 page, u16 count, u16 flags);
-
-extern u16 GLOB_LLD_Read_Page_Main_Spare_cdma(u8 *data,
-        u32 block, u16 page, u16 count);
-
-#define LLD_CMD_FLAG_ORDER_BEFORE_REST          (0x1)
-#define LLD_CMD_FLAG_MODE_CDMA                  (0x8)
-
-
-#endif /*_LLD_ */
-
-
diff --git a/drivers/staging/spectra/lld_cdma.c b/drivers/staging/spectra/lld_cdma.c
deleted file mode 100644
index c6e76103d43c..000000000000
--- a/drivers/staging/spectra/lld_cdma.c
+++ /dev/null
@@ -1,910 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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/fs.h>
-#include <linux/slab.h>
-
-#include "spectraswconfig.h"
-#include "lld.h"
-#include "lld_nand.h"
-#include "lld_cdma.h"
-#include "lld_emu.h"
-#include "flash.h"
-#include "nand_regs.h"
-
-#define MAX_PENDING_CMDS    4
-#define MODE_02             (0x2 << 26)
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_Data_Cmd
-* Inputs:   cmd code (aligned for hw)
-*               data: pointer to source or destination
-*               block: block address
-*               page: page address
-*               num: num pages to transfer
-* Outputs:      PASS
-* Description:  This function takes the parameters and puts them
-*                   into the "pending commands" array.
-*               It does not parse or validate the parameters.
-*               The array index is same as the tag.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 CDMA_Data_CMD(u8 cmd, u8 *data, u32 block, u16 page, u16 num, u16 flags)
-{
-        u8 bank;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (0 == cmd)
-                nand_dbg_print(NAND_DBG_DEBUG,
-                "%s, Line %d, Illegal cmd (0)\n", __FILE__, __LINE__);
-
-        /* If a command of another bank comes, then first execute */
-        /* pending commands of the current bank, then set the new */
-        /* bank as current bank */
-        bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-        if (bank != info.flash_bank) {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Will access new bank. old bank: %d, new bank: %d\n",
-                        info.flash_bank, bank);
-                if (CDMA_Execute_CMDs()) {
-                        printk(KERN_ERR "CDMA_Execute_CMDs fail!\n");
-                        return FAIL;
-                }
-                info.flash_bank = bank;
-        }
-
-        info.pcmds[info.pcmds_num].CMD = cmd;
-        info.pcmds[info.pcmds_num].DataAddr = data;
-        info.pcmds[info.pcmds_num].Block = block;
-        info.pcmds[info.pcmds_num].Page = page;
-        info.pcmds[info.pcmds_num].PageCount = num;
-        info.pcmds[info.pcmds_num].DataDestAddr = 0;
-        info.pcmds[info.pcmds_num].DataSrcAddr = 0;
-        info.pcmds[info.pcmds_num].MemCopyByteCnt = 0;
-        info.pcmds[info.pcmds_num].Flags = flags;
-        info.pcmds[info.pcmds_num].Status = 0xB0B;
-
-        switch (cmd) {
-        case WRITE_MAIN_SPARE_CMD:
-                Conv_Main_Spare_Data_Log2Phy_Format(data, num);
-                break;
-        case WRITE_SPARE_CMD:
-                Conv_Spare_Data_Log2Phy_Format(data);
-                break;
-        default:
-                break;
-        }
-
-        info.pcmds_num++;
-
-        if (info.pcmds_num >= MAX_PENDING_CMDS) {
-                if (CDMA_Execute_CMDs()) {
-                        printk(KERN_ERR "CDMA_Execute_CMDs fail!\n");
-                        return FAIL;
-                }
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_MemCopy_CMD
-* Inputs:       dest: pointer to destination
-*               src:  pointer to source
-*               count: num bytes to transfer
-* Outputs:      PASS
-* Description:  This function takes the parameters and puts them
-*                   into the "pending commands" array.
-*               It does not parse or validate the parameters.
-*               The array index is same as the tag.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 CDMA_MemCopy_CMD(u8 *dest, u8 *src, u32 byte_cnt, u16 flags)
-{
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        info.pcmds[info.pcmds_num].CMD = MEMCOPY_CMD;
-        info.pcmds[info.pcmds_num].DataAddr = 0;
-        info.pcmds[info.pcmds_num].Block = 0;
-        info.pcmds[info.pcmds_num].Page = 0;
-        info.pcmds[info.pcmds_num].PageCount = 0;
-        info.pcmds[info.pcmds_num].DataDestAddr = dest;
-        info.pcmds[info.pcmds_num].DataSrcAddr = src;
-        info.pcmds[info.pcmds_num].MemCopyByteCnt = byte_cnt;
-        info.pcmds[info.pcmds_num].Flags = flags;
-        info.pcmds[info.pcmds_num].Status = 0xB0B;
-
-        info.pcmds_num++;
-
-        if (info.pcmds_num >= MAX_PENDING_CMDS) {
-                if (CDMA_Execute_CMDs()) {
-                        printk(KERN_ERR "CDMA_Execute_CMDs fail!\n");
-                        return FAIL;
-                }
-        }
-
-        return PASS;
-}
-
-#if 0
-/* Prints the PendingCMDs array */
-void print_pending_cmds(void)
-{
-        u16 i;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < info.pcmds_num; i++) {
-                nand_dbg_print(NAND_DBG_DEBUG, "\ni: %d\n", i);
-                switch (info.pcmds[i].CMD) {
-                case ERASE_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Erase Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                case WRITE_MAIN_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Write Main Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                case WRITE_MAIN_SPARE_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Write Main Spare Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                case READ_MAIN_SPARE_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Read Main Spare Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                case READ_MAIN_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Read Main Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                case MEMCOPY_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Memcopy Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                case DUMMY_CMD:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Dummy Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                default:
-                        nand_dbg_print(NAND_DBG_DEBUG,
-                                "Illegal Command (0x%x)\n",
-                                info.pcmds[i].CMD);
-                        break;
-                }
-
-                nand_dbg_print(NAND_DBG_DEBUG, "DataAddr: 0x%x\n",
-                        (u32)info.pcmds[i].DataAddr);
-                nand_dbg_print(NAND_DBG_DEBUG, "Block: %d\n",
-                        info.pcmds[i].Block);
-                nand_dbg_print(NAND_DBG_DEBUG, "Page: %d\n",
-                        info.pcmds[i].Page);
-                nand_dbg_print(NAND_DBG_DEBUG, "PageCount: %d\n",
-                        info.pcmds[i].PageCount);
-                nand_dbg_print(NAND_DBG_DEBUG, "DataDestAddr: 0x%x\n",
-                        (u32)info.pcmds[i].DataDestAddr);
-                nand_dbg_print(NAND_DBG_DEBUG, "DataSrcAddr: 0x%x\n",
-                        (u32)info.pcmds[i].DataSrcAddr);
-                nand_dbg_print(NAND_DBG_DEBUG, "MemCopyByteCnt: %d\n",
-                        info.pcmds[i].MemCopyByteCnt);
-                nand_dbg_print(NAND_DBG_DEBUG, "Flags: 0x%x\n",
-                        info.pcmds[i].Flags);
-                nand_dbg_print(NAND_DBG_DEBUG, "Status: 0x%x\n",
-                        info.pcmds[i].Status);
-        }
-}
-
-/* Print the CDMA descriptors */
-void print_cdma_descriptors(void)
-{
-        struct cdma_descriptor *pc;
-        int i;
-
-        pc = (struct cdma_descriptor *)info.cdma_desc_buf;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "\nWill dump cdma descriptors:\n");
-
-        for (i = 0; i < info.cdma_num; i++) {
-                nand_dbg_print(NAND_DBG_DEBUG, "\ni: %d\n", i);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "NxtPointerHi: 0x%x, NxtPointerLo: 0x%x\n",
-                        pc[i].NxtPointerHi, pc[i].NxtPointerLo);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "FlashPointerHi: 0x%x, FlashPointerLo: 0x%x\n",
-                        pc[i].FlashPointerHi, pc[i].FlashPointerLo);
-                nand_dbg_print(NAND_DBG_DEBUG, "CommandType: 0x%x\n",
-                        pc[i].CommandType);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "MemAddrHi: 0x%x, MemAddrLo: 0x%x\n",
-                        pc[i].MemAddrHi, pc[i].MemAddrLo);
-                nand_dbg_print(NAND_DBG_DEBUG, "CommandFlags: 0x%x\n",
-                        pc[i].CommandFlags);
-                nand_dbg_print(NAND_DBG_DEBUG, "Channel: %d, Status: 0x%x\n",
-                        pc[i].Channel, pc[i].Status);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "MemCopyPointerHi: 0x%x, MemCopyPointerLo: 0x%x\n",
-                        pc[i].MemCopyPointerHi, pc[i].MemCopyPointerLo);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Reserved12: 0x%x, Reserved13: 0x%x, "
-                        "Reserved14: 0x%x, pcmd: %d\n",
-                        pc[i].Reserved12, pc[i].Reserved13,
-                        pc[i].Reserved14, pc[i].pcmd);
-        }
-}
-
-/* Print the Memory copy descriptors */
-static void print_memcp_descriptors(void)
-{
-        struct memcpy_descriptor *pm;
-        int i;
-
-        pm = (struct memcpy_descriptor *)info.memcp_desc_buf;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "\nWill dump mem_cpy descriptors:\n");
-
-        for (i = 0; i < info.cdma_num; i++) {
-                nand_dbg_print(NAND_DBG_DEBUG, "\ni: %d\n", i);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "NxtPointerHi: 0x%x, NxtPointerLo: 0x%x\n",
-                        pm[i].NxtPointerHi, pm[i].NxtPointerLo);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "SrcAddrHi: 0x%x, SrcAddrLo: 0x%x\n",
-                        pm[i].SrcAddrHi, pm[i].SrcAddrLo);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "DestAddrHi: 0x%x, DestAddrLo: 0x%x\n",
-                        pm[i].DestAddrHi, pm[i].DestAddrLo);
-                nand_dbg_print(NAND_DBG_DEBUG, "XferSize: %d\n",
-                        pm[i].XferSize);
-                nand_dbg_print(NAND_DBG_DEBUG, "MemCopyFlags: 0x%x\n",
-                        pm[i].MemCopyFlags);
-                nand_dbg_print(NAND_DBG_DEBUG, "MemCopyStatus: %d\n",
-                        pm[i].MemCopyStatus);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved9: 0x%x\n",
-                        pm[i].reserved9);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved10: 0x%x\n",
-                        pm[i].reserved10);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved11: 0x%x\n",
-                        pm[i].reserved11);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved12: 0x%x\n",
-                        pm[i].reserved12);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved13: 0x%x\n",
-                        pm[i].reserved13);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved14: 0x%x\n",
-                        pm[i].reserved14);
-                nand_dbg_print(NAND_DBG_DEBUG, "reserved15: 0x%x\n",
-                        pm[i].reserved15);
-        }
-}
-#endif
-
-/* Reset cdma_descriptor chain to 0 */
-static void reset_cdma_desc(int i)
-{
-        struct cdma_descriptor *ptr;
-
-        BUG_ON(i >= MAX_DESCS);
-
-        ptr = (struct cdma_descriptor *)info.cdma_desc_buf;
-
-        ptr[i].NxtPointerHi = 0;
-        ptr[i].NxtPointerLo = 0;
-        ptr[i].FlashPointerHi = 0;
-        ptr[i].FlashPointerLo = 0;
-        ptr[i].CommandType = 0;
-        ptr[i].MemAddrHi = 0;
-        ptr[i].MemAddrLo = 0;
-        ptr[i].CommandFlags = 0;
-        ptr[i].Channel = 0;
-        ptr[i].Status = 0;
-        ptr[i].MemCopyPointerHi = 0;
-        ptr[i].MemCopyPointerLo = 0;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_UpdateEventStatus
-* Inputs:       none
-* Outputs:      none
-* Description:  This function update the event status of all the channels
-*               when an error condition is reported.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-void CDMA_UpdateEventStatus(void)
-{
-        int i, j, active_chan;
-        struct cdma_descriptor *ptr;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        ptr = (struct cdma_descriptor *)info.cdma_desc_buf;
-
-        for (j = 0; j < info.cdma_num; j++) {
-                /* Check for the descriptor with failure */
-                if ((ptr[j].Status & CMD_DMA_DESC_FAIL))
-                        break;
-
-        }
-
-        /* All the previous cmd's status for this channel must be good */
-        for (i = 0; i < j; i++) {
-                if (ptr[i].pcmd != 0xff)
-                        info.pcmds[ptr[i].pcmd].Status = CMD_PASS;
-        }
-
-        /* Abort the channel with type 0 reset command. It resets the */
-        /* selected channel after the descriptor completes the flash */
-        /* operation and status has been updated for the descriptor. */
-        /* Memory Copy and Sync associated with this descriptor will */
-        /* not be executed */
-        active_chan = ioread32(FlashReg + CHNL_ACTIVE);
-        if ((active_chan & (1 << info.flash_bank)) == (1 << info.flash_bank)) {
-                iowrite32(MODE_02 | (0 << 4), FlashMem); /* Type 0 reset */
-                iowrite32((0xF << 4) | info.flash_bank, FlashMem + 0x10);
-        } else { /* Should not reached here */
-                printk(KERN_ERR "Error! Used bank is not set in"
-                        " reg CHNL_ACTIVE\n");
-        }
-}
-
-static void cdma_trans(u16 chan)
-{
-        u32 addr;
-
-        addr = info.cdma_desc;
-
-        iowrite32(MODE_10 | (chan << 24), FlashMem);
-        iowrite32((1 << 7) | chan, FlashMem + 0x10);
-
-        iowrite32(MODE_10 | (chan << 24) | ((0x0FFFF & (addr >> 16)) << 8),
-                FlashMem);
-        iowrite32((1 << 7) | (1 << 4) | 0, FlashMem + 0x10);
-
-        iowrite32(MODE_10 | (chan << 24) | ((0x0FFFF & addr) << 8), FlashMem);
-        iowrite32((1 << 7) | (1 << 5) | 0, FlashMem + 0x10);
-
-        iowrite32(MODE_10 | (chan << 24), FlashMem);
-        iowrite32((1 << 7) | (1 << 5) | (1 << 4) | 0, FlashMem + 0x10);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_Execute_CMDs (for use with CMD_DMA)
-* Inputs:       tag_count:  the number of pending cmds to do
-* Outputs:      PASS/FAIL
-* Description:  Build the SDMA chain(s) by making one CMD-DMA descriptor
-*               for each pending command, start the CDMA engine, and return.
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 CDMA_Execute_CMDs(void)
-{
-        int i, ret;
-        u64 flash_add;
-        u32 ptr;
-        dma_addr_t map_addr, next_ptr;
-        u16 status = PASS;
-        u16 tmp_c;
-        struct cdma_descriptor *pc;
-        struct memcpy_descriptor *pm;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        /* No pending cmds to execute, just exit */
-        if (0 == info.pcmds_num) {
-                nand_dbg_print(NAND_DBG_TRACE,
-                        "No pending cmds to execute. Just exit.\n");
-                return PASS;
-        }
-
-        for (i = 0; i < MAX_DESCS; i++)
-                reset_cdma_desc(i);
-
-        pc = (struct cdma_descriptor *)info.cdma_desc_buf;
-        pm = (struct memcpy_descriptor *)info.memcp_desc_buf;
-
-        info.cdma_desc = virt_to_bus(info.cdma_desc_buf);
-        info.memcp_desc = virt_to_bus(info.memcp_desc_buf);
-        next_ptr = info.cdma_desc;
-        info.cdma_num = 0;
-
-        for (i = 0; i < info.pcmds_num; i++) {
-                if (info.pcmds[i].Block >= DeviceInfo.wTotalBlocks) {
-                        info.pcmds[i].Status = CMD_NOT_DONE;
-                        continue;
-                }
-
-                next_ptr += sizeof(struct cdma_descriptor);
-                pc[info.cdma_num].NxtPointerHi = next_ptr >> 16;
-                pc[info.cdma_num].NxtPointerLo = next_ptr & 0xffff;
-
-                /* Use the Block offset within a bank */
-                tmp_c = info.pcmds[i].Block /
-                        (DeviceInfo.wTotalBlocks / totalUsedBanks);
-                flash_add = (u64)(info.pcmds[i].Block - tmp_c *
-                        (DeviceInfo.wTotalBlocks / totalUsedBanks)) *
-                        DeviceInfo.wBlockDataSize +
-                        (u64)(info.pcmds[i].Page) *
-                        DeviceInfo.wPageDataSize;
-
-                ptr = MODE_10 | (info.flash_bank << 24) |
-                        (u32)GLOB_u64_Div(flash_add,
-                                DeviceInfo.wPageDataSize);
-                pc[info.cdma_num].FlashPointerHi = ptr >> 16;
-                pc[info.cdma_num].FlashPointerLo = ptr & 0xffff;
-
-                if ((info.pcmds[i].CMD == WRITE_MAIN_SPARE_CMD) ||
-                        (info.pcmds[i].CMD == READ_MAIN_SPARE_CMD)) {
-                        /* Descriptor to set Main+Spare Access Mode */
-                        pc[info.cdma_num].CommandType = 0x43;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        pc[info.cdma_num].MemAddrHi = 0;
-                        pc[info.cdma_num].MemAddrLo = 0;
-                        pc[info.cdma_num].Channel = 0;
-                        pc[info.cdma_num].Status = 0;
-                        pc[info.cdma_num].pcmd = i;
-
-                        info.cdma_num++;
-                        BUG_ON(info.cdma_num >= MAX_DESCS);
-
-                        reset_cdma_desc(info.cdma_num);
-                        next_ptr += sizeof(struct cdma_descriptor);
-                        pc[info.cdma_num].NxtPointerHi = next_ptr >> 16;
-                        pc[info.cdma_num].NxtPointerLo = next_ptr & 0xffff;
-                        pc[info.cdma_num].FlashPointerHi = ptr >> 16;
-                        pc[info.cdma_num].FlashPointerLo = ptr & 0xffff;
-                }
-
-                switch (info.pcmds[i].CMD) {
-                case ERASE_CMD:
-                        pc[info.cdma_num].CommandType = 1;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        pc[info.cdma_num].MemAddrHi = 0;
-                        pc[info.cdma_num].MemAddrLo = 0;
-                        break;
-
-                case WRITE_MAIN_CMD:
-                        pc[info.cdma_num].CommandType =
-                                0x2100 | info.pcmds[i].PageCount;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        map_addr = virt_to_bus(info.pcmds[i].DataAddr);
-                        pc[info.cdma_num].MemAddrHi = map_addr >> 16;
-                        pc[info.cdma_num].MemAddrLo = map_addr & 0xffff;
-                        break;
-
-                case READ_MAIN_CMD:
-                        pc[info.cdma_num].CommandType =
-                                0x2000 | info.pcmds[i].PageCount;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        map_addr = virt_to_bus(info.pcmds[i].DataAddr);
-                        pc[info.cdma_num].MemAddrHi = map_addr >> 16;
-                        pc[info.cdma_num].MemAddrLo = map_addr & 0xffff;
-                        break;
-
-                case WRITE_MAIN_SPARE_CMD:
-                        pc[info.cdma_num].CommandType =
-                                0x2100 | info.pcmds[i].PageCount;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        map_addr = virt_to_bus(info.pcmds[i].DataAddr);
-                        pc[info.cdma_num].MemAddrHi = map_addr >> 16;
-                        pc[info.cdma_num].MemAddrLo = map_addr & 0xffff;
-                        break;
-
-                case READ_MAIN_SPARE_CMD:
-                        pc[info.cdma_num].CommandType =
-                                0x2000 | info.pcmds[i].PageCount;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        map_addr = virt_to_bus(info.pcmds[i].DataAddr);
-                        pc[info.cdma_num].MemAddrHi = map_addr >> 16;
-                        pc[info.cdma_num].MemAddrLo = map_addr & 0xffff;
-                        break;
-
-                case MEMCOPY_CMD:
-                        pc[info.cdma_num].CommandType = 0xFFFF; /* NOP cmd */
-                        /* Set bit 11 to let the CDMA engine continue to */
-                        /* execute only after it has finished processing   */
-                        /* the memcopy descriptor.                        */
-                        /* Also set bit 10 and bit 9 to 1                  */
-                        pc[info.cdma_num].CommandFlags = 0x0E40;
-                        map_addr = info.memcp_desc + info.cdma_num *
-                                        sizeof(struct memcpy_descriptor);
-                        pc[info.cdma_num].MemCopyPointerHi = map_addr >> 16;
-                        pc[info.cdma_num].MemCopyPointerLo = map_addr & 0xffff;
-
-                        pm[info.cdma_num].NxtPointerHi = 0;
-                        pm[info.cdma_num].NxtPointerLo = 0;
-
-                        map_addr = virt_to_bus(info.pcmds[i].DataSrcAddr);
-                        pm[info.cdma_num].SrcAddrHi = map_addr >> 16;
-                        pm[info.cdma_num].SrcAddrLo = map_addr & 0xffff;
-                        map_addr = virt_to_bus(info.pcmds[i].DataDestAddr);
-                        pm[info.cdma_num].DestAddrHi = map_addr >> 16;
-                        pm[info.cdma_num].DestAddrLo = map_addr & 0xffff;
-
-                        pm[info.cdma_num].XferSize =
-                                info.pcmds[i].MemCopyByteCnt;
-                        pm[info.cdma_num].MemCopyFlags =
-                                (0 << 15 | 0 << 14 | 27 << 8 | 0x40);
-                        pm[info.cdma_num].MemCopyStatus = 0;
-                        break;
-
-                case DUMMY_CMD:
-                default:
-                        pc[info.cdma_num].CommandType = 0XFFFF;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        pc[info.cdma_num].MemAddrHi = 0;
-                        pc[info.cdma_num].MemAddrLo = 0;
-                        break;
-                }
-
-                pc[info.cdma_num].Channel = 0;
-                pc[info.cdma_num].Status = 0;
-                pc[info.cdma_num].pcmd = i;
-
-                info.cdma_num++;
-                BUG_ON(info.cdma_num >= MAX_DESCS);
-
-                if ((info.pcmds[i].CMD == WRITE_MAIN_SPARE_CMD) ||
-                        (info.pcmds[i].CMD == READ_MAIN_SPARE_CMD)) {
-                        /* Descriptor to set back Main Area Access Mode */
-                        reset_cdma_desc(info.cdma_num);
-                        next_ptr += sizeof(struct cdma_descriptor);
-                        pc[info.cdma_num].NxtPointerHi = next_ptr >> 16;
-                        pc[info.cdma_num].NxtPointerLo = next_ptr & 0xffff;
-
-                        pc[info.cdma_num].FlashPointerHi = ptr >> 16;
-                        pc[info.cdma_num].FlashPointerLo = ptr & 0xffff;
-
-                        pc[info.cdma_num].CommandType = 0x42;
-                        pc[info.cdma_num].CommandFlags =
-                                (0 << 10) | (1 << 9) | (0 << 8) | 0x40;
-                        pc[info.cdma_num].MemAddrHi = 0;
-                        pc[info.cdma_num].MemAddrLo = 0;
-
-                        pc[info.cdma_num].Channel = 0;
-                        pc[info.cdma_num].Status = 0;
-                        pc[info.cdma_num].pcmd = i;
-
-                        info.cdma_num++;
-                        BUG_ON(info.cdma_num >= MAX_DESCS);
-                }
-        }
-
-        /* Add a dummy descriptor at end of the CDMA chain */
-        reset_cdma_desc(info.cdma_num);
-        ptr = MODE_10 | (info.flash_bank << 24);
-        pc[info.cdma_num].FlashPointerHi = ptr >> 16;
-        pc[info.cdma_num].FlashPointerLo = ptr & 0xffff;
-        pc[info.cdma_num].CommandType = 0xFFFF; /* NOP command */
-        /* Set Command Flags for the last CDMA descriptor: */
-        /* set Continue bit (bit 9) to 0 and Interrupt bit (bit 8) to 1 */
-        pc[info.cdma_num].CommandFlags =
-                (0 << 10) | (0 << 9) | (1 << 8) | 0x40;
-        pc[info.cdma_num].pcmd = 0xff; /* Set it to an illegal value */
-        info.cdma_num++;
-        BUG_ON(info.cdma_num >= MAX_DESCS);
-
-        iowrite32(1, FlashReg + GLOBAL_INT_ENABLE);  /* Enable Interrupt */
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        /* Wait for DMA to be enabled before issuing the next command */
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-        cdma_trans(info.flash_bank);
-
-        ret = wait_for_completion_timeout(&info.complete, 50 * HZ);
-        if (!ret)
-                printk(KERN_ERR "Wait for completion timeout "
-                        "in %s, Line %d\n", __FILE__, __LINE__);
-        status = info.ret;
-
-        info.pcmds_num = 0; /* Clear the pending cmds number to 0 */
-
-        return status;
-}
-
-int is_cdma_interrupt(void)
-{
-        u32 ints_b0, ints_b1, ints_b2, ints_b3, ints_cdma;
-        u32 int_en_mask;
-        u32 cdma_int_en_mask;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        /* Set the global Enable masks for only those interrupts
-         * that are supported */
-        cdma_int_en_mask = (DMA_INTR__DESC_COMP_CHANNEL0 |
-                        DMA_INTR__DESC_COMP_CHANNEL1 |
-                        DMA_INTR__DESC_COMP_CHANNEL2 |
-                        DMA_INTR__DESC_COMP_CHANNEL3 |
-                        DMA_INTR__MEMCOPY_DESC_COMP);
-
-        int_en_mask = (INTR_STATUS0__ECC_ERR |
-                INTR_STATUS0__PROGRAM_FAIL |
-                INTR_STATUS0__ERASE_FAIL);
-
-        ints_b0 = ioread32(FlashReg + INTR_STATUS0) & int_en_mask;
-        ints_b1 = ioread32(FlashReg + INTR_STATUS1) & int_en_mask;
-        ints_b2 = ioread32(FlashReg + INTR_STATUS2) & int_en_mask;
-        ints_b3 = ioread32(FlashReg + INTR_STATUS3) & int_en_mask;
-        ints_cdma = ioread32(FlashReg + DMA_INTR) & cdma_int_en_mask;
-
-        nand_dbg_print(NAND_DBG_WARN, "ints_bank0 to ints_bank3: "
-                        "0x%x, 0x%x, 0x%x, 0x%x, ints_cdma: 0x%x\n",
-                        ints_b0, ints_b1, ints_b2, ints_b3, ints_cdma);
-
-        if (ints_b0 || ints_b1 || ints_b2 || ints_b3 || ints_cdma) {
-                return 1;
-        } else {
-                iowrite32(ints_b0, FlashReg + INTR_STATUS0);
-                iowrite32(ints_b1, FlashReg + INTR_STATUS1);
-                iowrite32(ints_b2, FlashReg + INTR_STATUS2);
-                iowrite32(ints_b3, FlashReg + INTR_STATUS3);
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Not a NAND controller interrupt! Ignore it.\n");
-                return 0;
-        }
-}
-
-static void update_event_status(void)
-{
-        int i;
-        struct cdma_descriptor *ptr;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        ptr = (struct cdma_descriptor *)info.cdma_desc_buf;
-
-        for (i = 0; i < info.cdma_num; i++) {
-                if (ptr[i].pcmd != 0xff)
-                        info.pcmds[ptr[i].pcmd].Status = CMD_PASS;
-                if ((ptr[i].CommandType == 0x41) ||
-                        (ptr[i].CommandType == 0x42) ||
-                        (ptr[i].CommandType == 0x43))
-                        continue;
-
-                switch (info.pcmds[ptr[i].pcmd].CMD) {
-                case READ_MAIN_SPARE_CMD:
-                        Conv_Main_Spare_Data_Phy2Log_Format(
-                                info.pcmds[ptr[i].pcmd].DataAddr,
-                                info.pcmds[ptr[i].pcmd].PageCount);
-                        break;
-                case READ_SPARE_CMD:
-                        Conv_Spare_Data_Phy2Log_Format(
-                                info.pcmds[ptr[i].pcmd].DataAddr);
-                        break;
-                }
-        }
-}
-
-static u16 do_ecc_for_desc(u32 ch, u8 *buf, u16 page)
-{
-        u16 event = EVENT_NONE;
-        u16 err_byte;
-        u16 err_page = 0;
-        u8 err_sector;
-        u8 err_device;
-        u16 ecc_correction_info;
-        u16 err_address;
-        u32 eccSectorSize;
-        u8 *err_pos;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        eccSectorSize = ECC_SECTOR_SIZE * (DeviceInfo.wDevicesConnected);
-
-        do {
-                if (0 == ch)
-                        err_page = ioread32(FlashReg + ERR_PAGE_ADDR0);
-                else if (1 == ch)
-                        err_page = ioread32(FlashReg + ERR_PAGE_ADDR1);
-                else if (2 == ch)
-                        err_page = ioread32(FlashReg + ERR_PAGE_ADDR2);
-                else if (3 == ch)
-                        err_page = ioread32(FlashReg + ERR_PAGE_ADDR3);
-
-                err_address = ioread32(FlashReg + ECC_ERROR_ADDRESS);
-                err_byte = err_address & ECC_ERROR_ADDRESS__OFFSET;
-                err_sector = ((err_address &
-                        ECC_ERROR_ADDRESS__SECTOR_NR) >> 12);
-
-                ecc_correction_info = ioread32(FlashReg + ERR_CORRECTION_INFO);
-                err_device = ((ecc_correction_info &
-                        ERR_CORRECTION_INFO__DEVICE_NR) >> 8);
-
-                if (ecc_correction_info & ERR_CORRECTION_INFO__ERROR_TYPE) {
-                        event = EVENT_UNCORRECTABLE_DATA_ERROR;
-                } else {
-                        event = EVENT_CORRECTABLE_DATA_ERROR_FIXED;
-                        if (err_byte < ECC_SECTOR_SIZE) {
-                                err_pos = buf +
-                                        (err_page - page) *
-                                        DeviceInfo.wPageDataSize +
-                                        err_sector * eccSectorSize +
-                                        err_byte *
-                                        DeviceInfo.wDevicesConnected +
-                                        err_device;
-                                *err_pos ^= ecc_correction_info &
-                                        ERR_CORRECTION_INFO__BYTEMASK;
-                        }
-                }
-        } while (!(ecc_correction_info & ERR_CORRECTION_INFO__LAST_ERR_INFO));
-
-        return event;
-}
-
-static u16 process_ecc_int(u32 c, u16 *p_desc_num)
-{
-        struct cdma_descriptor *ptr;
-        u16 j;
-        int event = EVENT_PASS;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (c != info.flash_bank)
-                printk(KERN_ERR "Error!info.flash_bank is %d, while c is %d\n",
-                                info.flash_bank, c);
-
-        ptr = (struct cdma_descriptor *)info.cdma_desc_buf;
-
-        for (j = 0; j < info.cdma_num; j++)
-                if ((ptr[j].Status & CMD_DMA_DESC_COMP) != CMD_DMA_DESC_COMP)
-                        break;
-
-        *p_desc_num = j; /* Pass the descripter number found here */
-
-        if (j >= info.cdma_num) {
-                printk(KERN_ERR "Can not find the correct descriptor number "
-                        "when ecc interrupt triggered!"
-                        "info.cdma_num: %d, j: %d\n", info.cdma_num, j);
-                return EVENT_UNCORRECTABLE_DATA_ERROR;
-        }
-
-        event = do_ecc_for_desc(c, info.pcmds[ptr[j].pcmd].DataAddr,
-                info.pcmds[ptr[j].pcmd].Page);
-
-        if (EVENT_UNCORRECTABLE_DATA_ERROR == event) {
-                printk(KERN_ERR "Uncorrectable ECC error!"
-                        "info.cdma_num: %d, j: %d, "
-                        "pending cmd CMD: 0x%x, "
-                        "Block: 0x%x, Page: 0x%x, PageCount: 0x%x\n",
-                        info.cdma_num, j,
-                        info.pcmds[ptr[j].pcmd].CMD,
-                        info.pcmds[ptr[j].pcmd].Block,
-                        info.pcmds[ptr[j].pcmd].Page,
-                        info.pcmds[ptr[j].pcmd].PageCount);
-
-                if (ptr[j].pcmd != 0xff)
-                        info.pcmds[ptr[j].pcmd].Status = CMD_FAIL;
-                CDMA_UpdateEventStatus();
-        }
-
-        return event;
-}
-
-static void process_prog_erase_fail_int(u16 desc_num)
-{
-        struct cdma_descriptor *ptr;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        ptr = (struct cdma_descriptor *)info.cdma_desc_buf;
-
-        if (ptr[desc_num].pcmd != 0xFF)
-                info.pcmds[ptr[desc_num].pcmd].Status = CMD_FAIL;
-
-        CDMA_UpdateEventStatus();
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_Event_Status (for use with CMD_DMA)
-* Inputs:       none
-* Outputs:      Event_Status code
-* Description:  This function is called after an interrupt has happened
-*               It reads the HW status register and ...tbd
-*               It returns the appropriate event status
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16  CDMA_Event_Status(void)
-{
-        u32 ints_addr[4] = {INTR_STATUS0, INTR_STATUS1,
-                INTR_STATUS2, INTR_STATUS3};
-        u32 dma_intr_bit[4] = {DMA_INTR__DESC_COMP_CHANNEL0,
-                DMA_INTR__DESC_COMP_CHANNEL1,
-                DMA_INTR__DESC_COMP_CHANNEL2,
-                DMA_INTR__DESC_COMP_CHANNEL3};
-        u32 cdma_int_status, int_status;
-        u32 ecc_enable = 0;
-        u16 event = EVENT_PASS;
-        u16 cur_desc = 0;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        ecc_enable = ioread32(FlashReg + ECC_ENABLE);
-
-        while (1) {
-                int_status = ioread32(FlashReg + ints_addr[info.flash_bank]);
-                if (ecc_enable && (int_status & INTR_STATUS0__ECC_ERR)) {
-                        event = process_ecc_int(info.flash_bank, &cur_desc);
-                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                FlashReg + ints_addr[info.flash_bank]);
-                        if (EVENT_UNCORRECTABLE_DATA_ERROR == event) {
-                                nand_dbg_print(NAND_DBG_WARN,
-                                        "ints_bank0 to ints_bank3: "
-                                        "0x%x, 0x%x, 0x%x, 0x%x, "
-                                        "ints_cdma: 0x%x\n",
-                                        ioread32(FlashReg + INTR_STATUS0),
-                                        ioread32(FlashReg + INTR_STATUS1),
-                                        ioread32(FlashReg + INTR_STATUS2),
-                                        ioread32(FlashReg + INTR_STATUS3),
-                                        ioread32(FlashReg + DMA_INTR));
-                                break;
-                        }
-                } else if (int_status & INTR_STATUS0__PROGRAM_FAIL) {
-                        printk(KERN_ERR "NAND program fail interrupt!\n");
-                        process_prog_erase_fail_int(cur_desc);
-                        event = EVENT_PROGRAM_FAILURE;
-                        break;
-                } else if (int_status & INTR_STATUS0__ERASE_FAIL) {
-                        printk(KERN_ERR "NAND erase fail interrupt!\n");
-                        process_prog_erase_fail_int(cur_desc);
-                        event = EVENT_ERASE_FAILURE;
-                        break;
-                } else {
-                        cdma_int_status = ioread32(FlashReg + DMA_INTR);
-                        if (cdma_int_status & dma_intr_bit[info.flash_bank]) {
-                                iowrite32(dma_intr_bit[info.flash_bank],
-                                        FlashReg + DMA_INTR);
-                                update_event_status();
-                                event = EVENT_PASS;
-                                break;
-                        }
-                }
-        }
-
-        int_status = ioread32(FlashReg + ints_addr[info.flash_bank]);
-        iowrite32(int_status, FlashReg + ints_addr[info.flash_bank]);
-        cdma_int_status = ioread32(FlashReg + DMA_INTR);
-        iowrite32(cdma_int_status, FlashReg + DMA_INTR);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-        while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        return event;
-}
-
-
-
diff --git a/drivers/staging/spectra/lld_cdma.h b/drivers/staging/spectra/lld_cdma.h
deleted file mode 100644
index 854ea066f0c4..000000000000
--- a/drivers/staging/spectra/lld_cdma.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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.
- *
- */
-
-/* header for LLD_CDMA.c module */
-
-#ifndef _LLD_CDMA_
-#define _LLD_CDMA_
-
-#include "flash.h"
-
-#define  DEBUG_SYNC    1
-
-/*///////////   CDMA specific MACRO definition */
-#define MAX_DESCS         (255)
-#define MAX_CHANS  (4)
-#define MAX_SYNC_POINTS         (16)
-#define MAX_DESC_PER_CHAN     (MAX_DESCS * 3 + MAX_SYNC_POINTS + 2)
-
-#define CHANNEL_SYNC_MASK       (0x000F)
-#define CHANNEL_DMA_MASK        (0x00F0)
-#define CHANNEL_ID_MASK         (0x0300)
-#define CHANNEL_CONT_MASK       (0x4000)
-#define CHANNEL_INTR_MASK       (0x8000)
-
-#define CHANNEL_SYNC_OFFSET     (0)
-#define CHANNEL_DMA_OFFSET      (4)
-#define CHANNEL_ID_OFFSET       (8)
-#define CHANNEL_CONT_OFFSET     (14)
-#define CHANNEL_INTR_OFFSET     (15)
-
-u16 CDMA_Data_CMD(u8 cmd, u8 *data, u32 block, u16 page, u16 num, u16 flags);
-u16 CDMA_MemCopy_CMD(u8 *dest, u8 *src, u32 byte_cnt, u16 flags);
-u16 CDMA_Execute_CMDs(void);
-void print_pending_cmds(void);
-void print_cdma_descriptors(void);
-
-extern u8 g_SBDCmdIndex;
-extern struct mrst_nand_info info;
-
-
-/*///////////   prototypes: APIs for LLD_CDMA */
-int is_cdma_interrupt(void);
-u16 CDMA_Event_Status(void);
-
-/* CMD-DMA Descriptor Struct.  These are defined by the CMD_DMA HW */
-struct cdma_descriptor {
-        u32 NxtPointerHi;
-        u32 NxtPointerLo;
-        u32 FlashPointerHi;
-        u32 FlashPointerLo;
-        u32 CommandType;
-        u32 MemAddrHi;
-        u32 MemAddrLo;
-        u32 CommandFlags;
-        u32 Channel;
-        u32 Status;
-        u32 MemCopyPointerHi;
-        u32 MemCopyPointerLo;
-        u32 Reserved12;
-        u32 Reserved13;
-        u32 Reserved14;
-        u32 pcmd; /* pending cmd num related to this descriptor */
-};
-
-/* This struct holds one MemCopy descriptor as defined by the HW */
-struct memcpy_descriptor {
-        u32 NxtPointerHi;
-        u32 NxtPointerLo;
-        u32 SrcAddrHi;
-        u32 SrcAddrLo;
-        u32 DestAddrHi;
-        u32 DestAddrLo;
-        u32 XferSize;
-        u32 MemCopyFlags;
-        u32 MemCopyStatus;
-        u32 reserved9;
-        u32 reserved10;
-        u32 reserved11;
-        u32 reserved12;
-        u32 reserved13;
-        u32 reserved14;
-        u32 reserved15;
-};
-
-/* Pending CMD table entries (includes MemCopy parameters */
-struct pending_cmd {
-        u8 CMD;
-        u8 *DataAddr;
-        u32 Block;
-        u16 Page;
-        u16 PageCount;
-        u8 *DataDestAddr;
-        u8 *DataSrcAddr;
-        u32 MemCopyByteCnt;
-        u16 Flags;
-        u16 Status;
-};
-
-#if DEBUG_SYNC
-extern u32 debug_sync_cnt;
-#endif
-
-/* Definitions for CMD DMA descriptor chain fields */
-#define     CMD_DMA_DESC_COMP   0x8000
-#define     CMD_DMA_DESC_FAIL   0x4000
-
-#endif /*_LLD_CDMA_*/
diff --git a/drivers/staging/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c
deleted file mode 100644
index 095f2f0c2e5b..000000000000
--- a/drivers/staging/spectra/lld_emu.c
+++ /dev/null
@@ -1,776 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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/fs.h>
-#include <linux/slab.h>
-#include "flash.h"
-#include "ffsdefs.h"
-#include "lld_emu.h"
-#include "lld.h"
-#if CMD_DMA
-#include "lld_cdma.h"
-#if FLASH_EMU
-u32 totalUsedBanks;
-u32 valid_banks[MAX_CHANS];
-#endif
-#endif
-
-#define GLOB_LLD_PAGES           64
-#define GLOB_LLD_PAGE_SIZE       (512+16)
-#define GLOB_LLD_PAGE_DATA_SIZE  512
-#define GLOB_LLD_BLOCKS          2048
-
-#if FLASH_EMU                   /* This is for entire module */
-
-static u8 *flash_memory[GLOB_LLD_BLOCKS * GLOB_LLD_PAGES];
-
-/* Read nand emu file and then fill it's content to flash_memory */
-int emu_load_file_to_mem(void)
-{
-        mm_segment_t fs;
-        struct file *nef_filp = NULL;
-        struct inode *inode = NULL;
-        loff_t nef_size = 0;
-        loff_t tmp_file_offset, file_offset;
-        ssize_t nread;
-        int i, rc = -EINVAL;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        fs = get_fs();
-        set_fs(get_ds());
-
-        nef_filp = filp_open("/root/nand_emu_file", O_RDWR | O_LARGEFILE, 0);
-        if (IS_ERR(nef_filp)) {
-                printk(KERN_ERR "filp_open error: "
-                       "Unable to open nand emu file!\n");
-                return PTR_ERR(nef_filp);
-        }
-
-        if (nef_filp->f_path.dentry) {
-                inode = nef_filp->f_path.dentry->d_inode;
-        } else {
-                printk(KERN_ERR "Can not get valid inode!\n");
-                goto out;
-        }
-
-        nef_size = i_size_read(inode->i_mapping->host);
-        if (nef_size <= 0) {
-                printk(KERN_ERR "Invalid nand emu file size: "
-                       "0x%llx\n", nef_size);
-                goto out;
-        } else {
-                nand_dbg_print(NAND_DBG_DEBUG, "nand emu file size: %lld\n",
-                               nef_size);
-        }
-
-        file_offset = 0;
-        for (i = 0; i < GLOB_LLD_BLOCKS * GLOB_LLD_PAGES; i++) {
-                tmp_file_offset = file_offset;
-                nread = vfs_read(nef_filp,
-                                 (char __user *)flash_memory[i],
-                                 GLOB_LLD_PAGE_SIZE, &tmp_file_offset);
-                if (nread < GLOB_LLD_PAGE_SIZE) {
-                        printk(KERN_ERR "%s, Line %d - "
-                               "nand emu file partial read: "
-                               "%d bytes\n", __FILE__, __LINE__, (int)nread);
-                        goto out;
-                }
-                file_offset += GLOB_LLD_PAGE_SIZE;
-        }
-        rc = 0;
-
-out:
-        filp_close(nef_filp, current->files);
-        set_fs(fs);
-        return rc;
-}
-
-/* Write contents of flash_memory to nand emu file */
-int emu_write_mem_to_file(void)
-{
-        mm_segment_t fs;
-        struct file *nef_filp = NULL;
-        struct inode *inode = NULL;
-        loff_t nef_size = 0;
-        loff_t tmp_file_offset, file_offset;
-        ssize_t nwritten;
-        int i, rc = -EINVAL;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        fs = get_fs();
-        set_fs(get_ds());
-
-        nef_filp = filp_open("/root/nand_emu_file", O_RDWR | O_LARGEFILE, 0);
-        if (IS_ERR(nef_filp)) {
-                printk(KERN_ERR "filp_open error: "
-                       "Unable to open nand emu file!\n");
-                return PTR_ERR(nef_filp);
-        }
-
-        if (nef_filp->f_path.dentry) {
-                inode = nef_filp->f_path.dentry->d_inode;
-        } else {
-                printk(KERN_ERR "Invalid " "nef_filp->f_path.dentry value!\n");
-                goto out;
-        }
-
-        nef_size = i_size_read(inode->i_mapping->host);
-        if (nef_size <= 0) {
-                printk(KERN_ERR "Invalid "
-                       "nand emu file size: 0x%llx\n", nef_size);
-                goto out;
-        } else {
-                nand_dbg_print(NAND_DBG_DEBUG, "nand emu file size: "
-                               "%lld\n", nef_size);
-        }
-
-        file_offset = 0;
-        for (i = 0; i < GLOB_LLD_BLOCKS * GLOB_LLD_PAGES; i++) {
-                tmp_file_offset = file_offset;
-                nwritten = vfs_write(nef_filp,
-                                     (char __user *)flash_memory[i],
-                                     GLOB_LLD_PAGE_SIZE, &tmp_file_offset);
-                if (nwritten < GLOB_LLD_PAGE_SIZE) {
-                        printk(KERN_ERR "%s, Line %d - "
-                               "nand emu file partial write: "
-                               "%d bytes\n", __FILE__, __LINE__, (int)nwritten);
-                        goto out;
-                }
-                file_offset += GLOB_LLD_PAGE_SIZE;
-        }
-        rc = 0;
-
-out:
-        filp_close(nef_filp, current->files);
-        set_fs(fs);
-        return rc;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Flash_Init
-* Inputs:       none
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:  Creates & initializes the flash RAM array.
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Flash_Init(void)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        flash_memory[0] = vmalloc(GLOB_LLD_PAGE_SIZE * GLOB_LLD_BLOCKS *
-                                  GLOB_LLD_PAGES * sizeof(u8));
-        if (!flash_memory[0]) {
-                printk(KERN_ERR "Fail to allocate memory "
-                       "for nand emulator!\n");
-                return ERR;
-        }
-
-        memset((char *)(flash_memory[0]), 0xFF,
-               GLOB_LLD_PAGE_SIZE * GLOB_LLD_BLOCKS * GLOB_LLD_PAGES *
-               sizeof(u8));
-
-        for (i = 1; i < GLOB_LLD_BLOCKS * GLOB_LLD_PAGES; i++)
-                flash_memory[i] = flash_memory[i - 1] + GLOB_LLD_PAGE_SIZE;
-
-        emu_load_file_to_mem(); /* Load nand emu file to mem */
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Flash_Release
-* Inputs:       none
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Releases the flash.
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int emu_Flash_Release(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        emu_write_mem_to_file();  /* Write back mem to nand emu file */
-
-        vfree(flash_memory[0]);
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Read_Device_ID
-* Inputs:       none
-* Outputs:      PASS=1 FAIL=0
-* Description:  Reads the info from the controller registers.
-*               Sets up DeviceInfo structure with device parameters
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-
-u16 emu_Read_Device_ID(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        DeviceInfo.wDeviceMaker = 0;
-        DeviceInfo.wDeviceType = 8;
-        DeviceInfo.wSpectraStartBlock = 36;
-        DeviceInfo.wSpectraEndBlock = GLOB_LLD_BLOCKS - 1;
-        DeviceInfo.wTotalBlocks = GLOB_LLD_BLOCKS;
-        DeviceInfo.wPagesPerBlock = GLOB_LLD_PAGES;
-        DeviceInfo.wPageSize = GLOB_LLD_PAGE_SIZE;
-        DeviceInfo.wPageDataSize = GLOB_LLD_PAGE_DATA_SIZE;
-        DeviceInfo.wPageSpareSize = GLOB_LLD_PAGE_SIZE -
-            GLOB_LLD_PAGE_DATA_SIZE;
-        DeviceInfo.wBlockSize = DeviceInfo.wPageSize * GLOB_LLD_PAGES;
-        DeviceInfo.wBlockDataSize = DeviceInfo.wPageDataSize * GLOB_LLD_PAGES;
-        DeviceInfo.wDataBlockNum = (u32) (DeviceInfo.wSpectraEndBlock -
-                                                DeviceInfo.wSpectraStartBlock
-                                                + 1);
-        DeviceInfo.MLCDevice = 1; /* Emulate MLC device */
-        DeviceInfo.nBitsInPageNumber =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wPagesPerBlock);
-        DeviceInfo.nBitsInPageDataSize =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wPageDataSize);
-        DeviceInfo.nBitsInBlockDataSize =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wBlockDataSize);
-
-#if CMD_DMA
-        totalUsedBanks = 4;
-        valid_banks[0] = 1;
-        valid_banks[1] = 1;
-        valid_banks[2] = 1;
-        valid_banks[3] = 1;
-#endif
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Flash_Reset
-* Inputs:       none
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Reset the flash
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Flash_Reset(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Erase_Block
-* Inputs:       Address
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Erase a block
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Erase_Block(u32 block_add)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (block_add >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "emu_Erase_Block error! "
-                       "Too big block address: %d\n", block_add);
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Erasing block %d\n",
-                (int)block_add);
-
-        for (i = block_add * GLOB_LLD_PAGES;
-             i < ((block_add + 1) * GLOB_LLD_PAGES); i++) {
-                if (flash_memory[i]) {
-                        memset((u8 *)(flash_memory[i]), 0xFF,
-                               DeviceInfo.wPageSize * sizeof(u8));
-                }
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Write_Page_Main
-* Inputs:       Write buffer address pointer
-*               Block number
-*               Page  number
-*               Number of pages to process
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:  Write the data in the buffer to main area of flash
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Write_Page_Main(u8 *write_data, u32 Block,
-                           u16 Page, u16 PageCount)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks)
-                return FAIL;
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock)
-                return FAIL;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "emu_Write_Page_Main: "
-                       "lba %u Page %u PageCount %u\n",
-                       (unsigned int)Block,
-                       (unsigned int)Page, (unsigned int)PageCount);
-
-        for (i = 0; i < PageCount; i++) {
-                if (NULL == flash_memory[Block * GLOB_LLD_PAGES + Page]) {
-                        printk(KERN_ERR "Run out of memory\n");
-                        return FAIL;
-                }
-                memcpy((u8 *) (flash_memory[Block * GLOB_LLD_PAGES + Page]),
-                       write_data, DeviceInfo.wPageDataSize);
-                write_data += DeviceInfo.wPageDataSize;
-                Page++;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Read_Page_Main
-* Inputs:       Read buffer address pointer
-*               Block number
-*               Page  number
-*               Number of pages to process
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:  Read the data from the flash main area to the buffer
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Read_Page_Main(u8 *read_data, u32 Block,
-                          u16 Page, u16 PageCount)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks)
-                return FAIL;
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock)
-                return FAIL;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "emu_Read_Page_Main: "
-                       "lba %u Page %u PageCount %u\n",
-                       (unsigned int)Block,
-                       (unsigned int)Page, (unsigned int)PageCount);
-
-        for (i = 0; i < PageCount; i++) {
-                if (NULL == flash_memory[Block * GLOB_LLD_PAGES + Page]) {
-                        memset(read_data, 0xFF, DeviceInfo.wPageDataSize);
-                } else {
-                        memcpy(read_data,
-                               (u8 *) (flash_memory[Block * GLOB_LLD_PAGES
-                                                      + Page]),
-                               DeviceInfo.wPageDataSize);
-                }
-                read_data += DeviceInfo.wPageDataSize;
-                Page++;
-        }
-
-        return PASS;
-}
-
-#ifndef ELDORA
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Read_Page_Main_Spare
-* Inputs:       Write Buffer
-*                       Address
-*                       Buffer size
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Read from flash main+spare area
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Read_Page_Main_Spare(u8 *read_data, u32 Block,
-                                u16 Page, u16 PageCount)
-{
-        int i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Read Page Main+Spare "
-                       "Error: Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Read Page Main+Spare "
-                       "Error: Page number too big\n");
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Read Page Main + Spare - "
-                       "No. of pages %u block %u start page %u\n",
-                       (unsigned int)PageCount,
-                       (unsigned int)Block, (unsigned int)Page);
-
-        for (i = 0; i < PageCount; i++) {
-                if (NULL == flash_memory[Block * GLOB_LLD_PAGES + Page]) {
-                        memset(read_data, 0xFF, DeviceInfo.wPageSize);
-                } else {
-                        memcpy(read_data, (u8 *) (flash_memory[Block *
-                                                                 GLOB_LLD_PAGES
-                                                                 + Page]),
-                               DeviceInfo.wPageSize);
-                }
-
-                read_data += DeviceInfo.wPageSize;
-                Page++;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Write_Page_Main_Spare
-* Inputs:       Write buffer
-*                       address
-*                       buffer length
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Write the buffer to main+spare area of flash
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Write_Page_Main_Spare(u8 *write_data, u32 Block,
-                                 u16 Page, u16 page_count)
-{
-        u16 i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Write Page Main + Spare "
-                       "Error: Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + page_count > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Write Page Main + Spare "
-                       "Error: Page number too big\n");
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Write Page Main+Spare - "
-                       "No. of pages %u block %u start page %u\n",
-                       (unsigned int)page_count,
-                       (unsigned int)Block, (unsigned int)Page);
-
-        for (i = 0; i < page_count; i++) {
-                if (NULL == flash_memory[Block * GLOB_LLD_PAGES + Page]) {
-                        printk(KERN_ERR "Run out of memory!\n");
-                        return FAIL;
-                }
-                memcpy((u8 *) (flash_memory[Block * GLOB_LLD_PAGES + Page]),
-                       write_data, DeviceInfo.wPageSize);
-                write_data += DeviceInfo.wPageSize;
-                Page++;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Write_Page_Spare
-* Inputs:       Write buffer
-*                       Address
-*                       buffer size
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Write the buffer in the spare area
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Write_Page_Spare(u8 *write_data, u32 Block,
-                            u16 Page, u16 PageCount)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Read Page Spare Error: "
-                       "Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Read Page Spare Error: "
-                       "Page number too big\n");
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Write Page Spare- "
-                       "block %u page %u\n",
-                       (unsigned int)Block, (unsigned int)Page);
-
-        if (NULL == flash_memory[Block * GLOB_LLD_PAGES + Page]) {
-                printk(KERN_ERR "Run out of memory!\n");
-                return FAIL;
-        }
-
-        memcpy((u8 *) (flash_memory[Block * GLOB_LLD_PAGES + Page] +
-                         DeviceInfo.wPageDataSize), write_data,
-               (DeviceInfo.wPageSize - DeviceInfo.wPageDataSize));
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Read_Page_Spare
-* Inputs:       Write Buffer
-*                       Address
-*                       Buffer size
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Read data from the spare area
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_Read_Page_Spare(u8 *write_data, u32 Block,
-                           u16 Page, u16 PageCount)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Read Page Spare "
-                       "Error: Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Read Page Spare "
-                       "Error: Page number too big\n");
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Read Page Spare- "
-                       "block %u page %u\n",
-                       (unsigned int)Block, (unsigned int)Page);
-
-        if (NULL == flash_memory[Block * GLOB_LLD_PAGES + Page]) {
-                memset(write_data, 0xFF,
-                       (DeviceInfo.wPageSize - DeviceInfo.wPageDataSize));
-        } else {
-                memcpy(write_data,
-                       (u8 *) (flash_memory[Block * GLOB_LLD_PAGES + Page]
-                                 + DeviceInfo.wPageDataSize),
-                       (DeviceInfo.wPageSize - DeviceInfo.wPageDataSize));
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Enable_Disable_Interrupts
-* Inputs:       enable or disable
-* Outputs:      none
-* Description:  NOP
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-void emu_Enable_Disable_Interrupts(u16 INT_ENABLE)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-}
-
-u16 emu_Get_Bad_Block(u32 block)
-{
-        return 0;
-}
-
-#if CMD_DMA
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Support for CDMA functions
-************************************
-*       emu_CDMA_Flash_Init
-*           CDMA_process_data command   (use LLD_CDMA)
-*           CDMA_MemCopy_CMD            (use LLD_CDMA)
-*       emu_CDMA_execute all commands
-*       emu_CDMA_Event_Status
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_CDMA_Flash_Init(void)
-{
-        u16 i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < MAX_DESCS + MAX_CHANS; i++) {
-                PendingCMD[i].CMD = 0;
-                PendingCMD[i].Tag = 0;
-                PendingCMD[i].DataAddr = 0;
-                PendingCMD[i].Block = 0;
-                PendingCMD[i].Page = 0;
-                PendingCMD[i].PageCount = 0;
-                PendingCMD[i].DataDestAddr = 0;
-                PendingCMD[i].DataSrcAddr = 0;
-                PendingCMD[i].MemCopyByteCnt = 0;
-                PendingCMD[i].ChanSync[0] = 0;
-                PendingCMD[i].ChanSync[1] = 0;
-                PendingCMD[i].ChanSync[2] = 0;
-                PendingCMD[i].ChanSync[3] = 0;
-                PendingCMD[i].ChanSync[4] = 0;
-                PendingCMD[i].Status = 3;
-        }
-
-        return PASS;
-}
-
-static void emu_isr(int irq, void *dev_id)
-{
-        /* TODO:  ... */
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_Execute_CMDs
-* Inputs:       tag_count:  the number of pending cmds to do
-* Outputs:      PASS/FAIL
-* Description:  execute each command in the pending CMD array
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_CDMA_Execute_CMDs(u16 tag_count)
-{
-        u16 i, j;
-        u8 CMD;         /* cmd parameter */
-        u8 *data;
-        u32 block;
-        u16 page;
-        u16 count;
-        u16 status = PASS;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        nand_dbg_print(NAND_DBG_TRACE, "At start of Execute CMDs: "
-                       "Tag Count %u\n", tag_count);
-
-        for (i = 0; i < totalUsedBanks; i++) {
-                PendingCMD[i].CMD = DUMMY_CMD;
-                PendingCMD[i].Tag = 0xFF;
-                PendingCMD[i].Block =
-                    (DeviceInfo.wTotalBlocks / totalUsedBanks) * i;
-
-                for (j = 0; j <= MAX_CHANS; j++)
-                        PendingCMD[i].ChanSync[j] = 0;
-        }
-
-        CDMA_Execute_CMDs(tag_count);
-
-        print_pending_cmds(tag_count);
-
-#if DEBUG_SYNC
-        }
-        debug_sync_cnt++;
-#endif
-
-        for (i = MAX_CHANS;
-             i < tag_count + MAX_CHANS; i++) {
-                CMD = PendingCMD[i].CMD;
-                data = PendingCMD[i].DataAddr;
-                block = PendingCMD[i].Block;
-                page = PendingCMD[i].Page;
-                count = PendingCMD[i].PageCount;
-
-                switch (CMD) {
-                case ERASE_CMD:
-                        emu_Erase_Block(block);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case WRITE_MAIN_CMD:
-                        emu_Write_Page_Main(data, block, page, count);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case WRITE_MAIN_SPARE_CMD:
-                        emu_Write_Page_Main_Spare(data, block, page, count);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case READ_MAIN_CMD:
-                        emu_Read_Page_Main(data, block, page, count);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case MEMCOPY_CMD:
-                        memcpy(PendingCMD[i].DataDestAddr,
-                               PendingCMD[i].DataSrcAddr,
-                               PendingCMD[i].MemCopyByteCnt);
-                case DUMMY_CMD:
-                        PendingCMD[i].Status = PASS;
-                        break;
-                default:
-                        PendingCMD[i].Status = FAIL;
-                        break;
-                }
-        }
-
-        /*
-         * Temperory adding code to reset PendingCMD array for basic testing.
-         * It should be done at the end of  event status function.
-         */
-        for (i = tag_count + MAX_CHANS; i < MAX_DESCS; i++) {
-                PendingCMD[i].CMD = 0;
-                PendingCMD[i].Tag = 0;
-                PendingCMD[i].DataAddr = 0;
-                PendingCMD[i].Block = 0;
-                PendingCMD[i].Page = 0;
-                PendingCMD[i].PageCount = 0;
-                PendingCMD[i].DataDestAddr = 0;
-                PendingCMD[i].DataSrcAddr = 0;
-                PendingCMD[i].MemCopyByteCnt = 0;
-                PendingCMD[i].ChanSync[0] = 0;
-                PendingCMD[i].ChanSync[1] = 0;
-                PendingCMD[i].ChanSync[2] = 0;
-                PendingCMD[i].ChanSync[3] = 0;
-                PendingCMD[i].ChanSync[4] = 0;
-                PendingCMD[i].Status = CMD_NOT_DONE;
-        }
-
-        nand_dbg_print(NAND_DBG_TRACE, "At end of Execute CMDs.\n");
-
-        emu_isr(0, 0); /* This is a null isr now. Need fill it in future */
-
-        return status;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     emu_Event_Status
-* Inputs:       none
-* Outputs:      Event_Status code
-* Description:  This function can also be used to force errors
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 emu_CDMA_Event_Status(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return EVENT_PASS;
-}
-
-#endif /* CMD_DMA */
-#endif /* !ELDORA */
-#endif /* FLASH_EMU */
diff --git a/drivers/staging/spectra/lld_emu.h b/drivers/staging/spectra/lld_emu.h
deleted file mode 100644
index 63f84c38d3c1..000000000000
--- a/drivers/staging/spectra/lld_emu.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _LLD_EMU_
-#define _LLD_EMU_
-
-#include "ffsport.h"
-#include "ffsdefs.h"
-
-/* prototypes: emulator API functions */
-extern u16 emu_Flash_Reset(void);
-extern u16 emu_Flash_Init(void);
-extern int emu_Flash_Release(void);
-extern u16 emu_Read_Device_ID(void);
-extern u16 emu_Erase_Block(u32 block_addr);
-extern u16 emu_Write_Page_Main(u8 *write_data, u32 Block,
-                                u16 Page, u16 PageCount);
-extern u16 emu_Read_Page_Main(u8 *read_data, u32 Block, u16 Page,
-                                 u16 PageCount);
-extern u16 emu_Event_Status(void);
-extern void emu_Enable_Disable_Interrupts(u16 INT_ENABLE);
-extern u16 emu_Write_Page_Main_Spare(u8 *write_data, u32 Block,
-                                        u16 Page, u16 PageCount);
-extern u16 emu_Write_Page_Spare(u8 *write_data, u32 Block,
-                                        u16 Page, u16 PageCount);
-extern u16 emu_Read_Page_Main_Spare(u8 *read_data, u32 Block,
-                                       u16 Page, u16 PageCount);
-extern u16 emu_Read_Page_Spare(u8 *read_data, u32 Block, u16 Page,
-                                  u16 PageCount);
-extern u16 emu_Get_Bad_Block(u32 block);
-
-u16 emu_CDMA_Flash_Init(void);
-u16 emu_CDMA_Execute_CMDs(u16 tag_count);
-u16 emu_CDMA_Event_Status(void);
-#endif /*_LLD_EMU_*/
diff --git a/drivers/staging/spectra/lld_mtd.c b/drivers/staging/spectra/lld_mtd.c
deleted file mode 100644
index a9c309a167c2..000000000000
--- a/drivers/staging/spectra/lld_mtd.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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/fs.h>
-#include <linux/slab.h>
-#include <linux/mtd/mtd.h>
-#include "flash.h"
-#include "ffsdefs.h"
-#include "lld_emu.h"
-#include "lld.h"
-#if CMD_DMA
-#include "lld_cdma.h"
-u32 totalUsedBanks;
-u32 valid_banks[MAX_CHANS];
-#endif
-
-#define GLOB_LLD_PAGES           64
-#define GLOB_LLD_PAGE_SIZE       (512+16)
-#define GLOB_LLD_PAGE_DATA_SIZE  512
-#define GLOB_LLD_BLOCKS          2048
-
-static struct mtd_info *spectra_mtd;
-static int mtddev = -1;
-module_param(mtddev, int, 0);
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Flash_Init
-* Inputs:       none
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:  Creates & initializes the flash RAM array.
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Flash_Init(void)
-{
-        if (mtddev == -1) {
-                printk(KERN_ERR "No MTD device specified. Give mtddev parameter\n");
-                return FAIL;
-        }
-
-        spectra_mtd = get_mtd_device(NULL, mtddev);
-        if (!spectra_mtd) {
-                printk(KERN_ERR "Failed to obtain MTD device #%d\n", mtddev);
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Flash_Release
-* Inputs:       none
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Releases the flash.
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-int mtd_Flash_Release(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-        if (!spectra_mtd)
-                return PASS;
-
-        put_mtd_device(spectra_mtd);
-        spectra_mtd = NULL;
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Read_Device_ID
-* Inputs:       none
-* Outputs:      PASS=1 FAIL=0
-* Description:  Reads the info from the controller registers.
-*               Sets up DeviceInfo structure with device parameters
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-
-u16 mtd_Read_Device_ID(void)
-{
-        uint64_t tmp;
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (!spectra_mtd)
-                return FAIL;
-
-        DeviceInfo.wDeviceMaker = 0;
-        DeviceInfo.wDeviceType = 8;
-        DeviceInfo.wSpectraStartBlock = SPECTRA_START_BLOCK;
-        tmp = spectra_mtd->size;
-        do_div(tmp, spectra_mtd->erasesize);
-        DeviceInfo.wTotalBlocks = tmp;
-        DeviceInfo.wSpectraEndBlock = DeviceInfo.wTotalBlocks - 1;
-        DeviceInfo.wPagesPerBlock = spectra_mtd->erasesize / spectra_mtd->writesize;
-        DeviceInfo.wPageSize = spectra_mtd->writesize + spectra_mtd->oobsize;
-        DeviceInfo.wPageDataSize = spectra_mtd->writesize;
-        DeviceInfo.wPageSpareSize = spectra_mtd->oobsize;
-        DeviceInfo.wBlockSize = DeviceInfo.wPageSize * DeviceInfo.wPagesPerBlock;
-        DeviceInfo.wBlockDataSize = DeviceInfo.wPageDataSize * DeviceInfo.wPagesPerBlock;
-        DeviceInfo.wDataBlockNum = (u32) (DeviceInfo.wSpectraEndBlock -
-                                                DeviceInfo.wSpectraStartBlock
-                                                + 1);
-        DeviceInfo.MLCDevice = 0;//spectra_mtd->celltype & NAND_CI_CELLTYPE_MSK;
-        DeviceInfo.nBitsInPageNumber =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wPagesPerBlock);
-        DeviceInfo.nBitsInPageDataSize =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wPageDataSize);
-        DeviceInfo.nBitsInBlockDataSize =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wBlockDataSize);
-
-#if CMD_DMA
-        totalUsedBanks = 4;
-        valid_banks[0] = 1;
-        valid_banks[1] = 1;
-        valid_banks[2] = 1;
-        valid_banks[3] = 1;
-#endif
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Flash_Reset
-* Inputs:       none
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Reset the flash
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Flash_Reset(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return PASS;
-}
-
-void erase_callback(struct erase_info *e)
-{
-        complete((void *)e->priv);
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Erase_Block
-* Inputs:       Address
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Erase a block
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Erase_Block(u32 block_add)
-{
-        struct erase_info erase;
-        DECLARE_COMPLETION_ONSTACK(comp);
-        int ret;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (block_add >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "mtd_Erase_Block error! "
-                       "Too big block address: %d\n", block_add);
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Erasing block %d\n",
-                (int)block_add);
-
-        erase.mtd = spectra_mtd;
-        erase.callback = erase_callback;
-        erase.addr = block_add * spectra_mtd->erasesize;
-        erase.len = spectra_mtd->erasesize;
-        erase.priv = (unsigned long)&comp;
-
-        ret = spectra_mtd->erase(spectra_mtd, &erase);
-        if (!ret) {
-                wait_for_completion(&comp);
-                if (erase.state != MTD_ERASE_DONE)
-                        ret = -EIO;
-        }
-        if (ret) {
-                printk(KERN_WARNING "mtd_Erase_Block error! "
-                       "erase of region [0x%llx, 0x%llx] failed\n",
-                       erase.addr, erase.len);
-                return FAIL;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Write_Page_Main
-* Inputs:       Write buffer address pointer
-*               Block number
-*               Page  number
-*               Number of pages to process
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:  Write the data in the buffer to main area of flash
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Write_Page_Main(u8 *write_data, u32 Block,
-                           u16 Page, u16 PageCount)
-{
-        size_t retlen;
-        int ret = 0;
-
-        if (Block >= DeviceInfo.wTotalBlocks)
-                return FAIL;
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock)
-                return FAIL;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "mtd_Write_Page_Main: "
-                       "lba %u Page %u PageCount %u\n",
-                       (unsigned int)Block,
-                       (unsigned int)Page, (unsigned int)PageCount);
-
-
-        while (PageCount) {
-                ret = spectra_mtd->write(spectra_mtd,
-                                         (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
-                                         DeviceInfo.wPageDataSize, &retlen, write_data);
-                if (ret) {
-                        printk(KERN_ERR "%s failed %d\n", __func__, ret);
-                        return FAIL;
-                }
-                write_data += DeviceInfo.wPageDataSize;
-                Page++;
-                PageCount--;
-        }
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Read_Page_Main
-* Inputs:       Read buffer address pointer
-*               Block number
-*               Page  number
-*               Number of pages to process
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:  Read the data from the flash main area to the buffer
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Read_Page_Main(u8 *read_data, u32 Block,
-                          u16 Page, u16 PageCount)
-{
-        size_t retlen;
-        int ret = 0;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks)
-                return FAIL;
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock)
-                return FAIL;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "mtd_Read_Page_Main: "
-                       "lba %u Page %u PageCount %u\n",
-                       (unsigned int)Block,
-                       (unsigned int)Page, (unsigned int)PageCount);
-
-
-        while (PageCount) {
-                ret = spectra_mtd->read(spectra_mtd,
-                                        (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
-                                        DeviceInfo.wPageDataSize, &retlen, read_data);
-                if (ret) {
-                        printk(KERN_ERR "%s failed %d\n", __func__, ret);
-                        return FAIL;
-                }
-                read_data += DeviceInfo.wPageDataSize;
-                Page++;
-                PageCount--;
-        }
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return PASS;
-}
-
-#ifndef ELDORA
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Read_Page_Main_Spare
-* Inputs:       Write Buffer
-*                       Address
-*                       Buffer size
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Read from flash main+spare area
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Read_Page_Main_Spare(u8 *read_data, u32 Block,
-                                u16 Page, u16 PageCount)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Read Page Main+Spare "
-                       "Error: Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Read Page Main+Spare "
-                       "Error: Page number %d+%d too big in block %d\n",
-                       Page, PageCount, Block);
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Read Page Main + Spare - "
-                       "No. of pages %u block %u start page %u\n",
-                       (unsigned int)PageCount,
-                       (unsigned int)Block, (unsigned int)Page);
-
-
-        while (PageCount) {
-                struct mtd_oob_ops ops;
-                int ret;
-
-                ops.mode = MTD_OPS_AUTO_OOB;
-                ops.datbuf = read_data;
-                ops.len = DeviceInfo.wPageDataSize;
-                ops.oobbuf = read_data + DeviceInfo.wPageDataSize + BTSIG_OFFSET;
-                ops.ooblen = BTSIG_BYTES;
-                ops.ooboffs = 0;
-
-                ret = spectra_mtd->read_oob(spectra_mtd,
-                                            (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
-                                            &ops);
-                if (ret) {
-                        printk(KERN_ERR "%s failed %d\n", __func__, ret);
-                        return FAIL;
-                }
-                read_data += DeviceInfo.wPageSize;
-                Page++;
-                PageCount--;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Write_Page_Main_Spare
-* Inputs:       Write buffer
-*                       address
-*                       buffer length
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Write the buffer to main+spare area of flash
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Write_Page_Main_Spare(u8 *write_data, u32 Block,
-                                 u16 Page, u16 page_count)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Write Page Main + Spare "
-                       "Error: Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + page_count > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Write Page Main + Spare "
-                       "Error: Page number %d+%d too big in block %d\n",
-                       Page, page_count, Block);
-                WARN_ON(1);
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Write Page Main+Spare - "
-                       "No. of pages %u block %u start page %u\n",
-                       (unsigned int)page_count,
-                       (unsigned int)Block, (unsigned int)Page);
-
-        while (page_count) {
-                struct mtd_oob_ops ops;
-                int ret;
-
-                ops.mode = MTD_OPS_AUTO_OOB;
-                ops.datbuf = write_data;
-                ops.len = DeviceInfo.wPageDataSize;
-                ops.oobbuf = write_data + DeviceInfo.wPageDataSize + BTSIG_OFFSET;
-                ops.ooblen = BTSIG_BYTES;
-                ops.ooboffs = 0;
-
-                ret = spectra_mtd->write_oob(spectra_mtd,
-                                             (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
-                                             &ops);
-                if (ret) {
-                        printk(KERN_ERR "%s failed %d\n", __func__, ret);
-                        return FAIL;
-                }
-                write_data += DeviceInfo.wPageSize;
-                Page++;
-                page_count--;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Write_Page_Spare
-* Inputs:       Write buffer
-*                       Address
-*                       buffer size
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Write the buffer in the spare area
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Write_Page_Spare(u8 *write_data, u32 Block,
-                            u16 Page, u16 PageCount)
-{
-        WARN_ON(1);
-        return FAIL;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Read_Page_Spare
-* Inputs:       Write Buffer
-*                       Address
-*                       Buffer size
-* Outputs:      PASS=0 (notice 0=ok here)
-* Description:          Read data from the spare area
-*
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_Read_Page_Spare(u8 *read_data, u32 Block,
-                           u16 Page, u16 PageCount)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (Block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "Read Page Spare "
-                       "Error: Block Address too big\n");
-                return FAIL;
-        }
-
-        if (Page + PageCount > DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "Read Page Spare "
-                       "Error: Page number too big\n");
-                return FAIL;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Read Page Spare- "
-                       "block %u page %u (%u pages)\n",
-                       (unsigned int)Block, (unsigned int)Page, PageCount);
-
-        while (PageCount) {
-                struct mtd_oob_ops ops;
-                int ret;
-
-                ops.mode = MTD_OPS_AUTO_OOB;
-                ops.datbuf = NULL;
-                ops.len = 0;
-                ops.oobbuf = read_data;
-                ops.ooblen = BTSIG_BYTES;
-                ops.ooboffs = 0;
-
-                ret = spectra_mtd->read_oob(spectra_mtd,
-                                            (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
-                                            &ops);
-                if (ret) {
-                        printk(KERN_ERR "%s failed %d\n", __func__, ret);
-                        return FAIL;
-                }
-
-                read_data += DeviceInfo.wPageSize;
-                Page++;
-                PageCount--;
-        }
-
-        return PASS;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Enable_Disable_Interrupts
-* Inputs:       enable or disable
-* Outputs:      none
-* Description:  NOP
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-void mtd_Enable_Disable_Interrupts(u16 INT_ENABLE)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-}
-
-u16 mtd_Get_Bad_Block(u32 block)
-{
-        return 0;
-}
-
-#if CMD_DMA
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Support for CDMA functions
-************************************
-*       mtd_CDMA_Flash_Init
-*           CDMA_process_data command   (use LLD_CDMA)
-*           CDMA_MemCopy_CMD            (use LLD_CDMA)
-*       mtd_CDMA_execute all commands
-*       mtd_CDMA_Event_Status
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_CDMA_Flash_Init(void)
-{
-        u16 i;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0; i < MAX_DESCS + MAX_CHANS; i++) {
-                PendingCMD[i].CMD = 0;
-                PendingCMD[i].Tag = 0;
-                PendingCMD[i].DataAddr = 0;
-                PendingCMD[i].Block = 0;
-                PendingCMD[i].Page = 0;
-                PendingCMD[i].PageCount = 0;
-                PendingCMD[i].DataDestAddr = 0;
-                PendingCMD[i].DataSrcAddr = 0;
-                PendingCMD[i].MemCopyByteCnt = 0;
-                PendingCMD[i].ChanSync[0] = 0;
-                PendingCMD[i].ChanSync[1] = 0;
-                PendingCMD[i].ChanSync[2] = 0;
-                PendingCMD[i].ChanSync[3] = 0;
-                PendingCMD[i].ChanSync[4] = 0;
-                PendingCMD[i].Status = 3;
-        }
-
-        return PASS;
-}
-
-static void mtd_isr(int irq, void *dev_id)
-{
-        /* TODO:  ... */
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     CDMA_Execute_CMDs
-* Inputs:       tag_count:  the number of pending cmds to do
-* Outputs:      PASS/FAIL
-* Description:  execute each command in the pending CMD array
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_CDMA_Execute_CMDs(u16 tag_count)
-{
-        u16 i, j;
-        u8 CMD;         /* cmd parameter */
-        u8 *data;
-        u32 block;
-        u16 page;
-        u16 count;
-        u16 status = PASS;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        nand_dbg_print(NAND_DBG_TRACE, "At start of Execute CMDs: "
-                       "Tag Count %u\n", tag_count);
-
-        for (i = 0; i < totalUsedBanks; i++) {
-                PendingCMD[i].CMD = DUMMY_CMD;
-                PendingCMD[i].Tag = 0xFF;
-                PendingCMD[i].Block =
-                    (DeviceInfo.wTotalBlocks / totalUsedBanks) * i;
-
-                for (j = 0; j <= MAX_CHANS; j++)
-                        PendingCMD[i].ChanSync[j] = 0;
-        }
-
-        CDMA_Execute_CMDs(tag_count);
-
-#ifdef VERBOSE
-                print_pending_cmds(tag_count);
-#endif
-#if DEBUG_SYNC
-        }
-        debug_sync_cnt++;
-#endif
-
-        for (i = MAX_CHANS;
-             i < tag_count + MAX_CHANS; i++) {
-                CMD = PendingCMD[i].CMD;
-                data = PendingCMD[i].DataAddr;
-                block = PendingCMD[i].Block;
-                page = PendingCMD[i].Page;
-                count = PendingCMD[i].PageCount;
-
-                switch (CMD) {
-                case ERASE_CMD:
-                        mtd_Erase_Block(block);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case WRITE_MAIN_CMD:
-                        mtd_Write_Page_Main(data, block, page, count);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case WRITE_MAIN_SPARE_CMD:
-                        mtd_Write_Page_Main_Spare(data, block, page, count);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case READ_MAIN_CMD:
-                        mtd_Read_Page_Main(data, block, page, count);
-                        PendingCMD[i].Status = PASS;
-                        break;
-                case MEMCOPY_CMD:
-                        memcpy(PendingCMD[i].DataDestAddr,
-                               PendingCMD[i].DataSrcAddr,
-                               PendingCMD[i].MemCopyByteCnt);
-                case DUMMY_CMD:
-                        PendingCMD[i].Status = PASS;
-                        break;
-                default:
-                        PendingCMD[i].Status = FAIL;
-                        break;
-                }
-        }
-
-        /*
-         * Temperory adding code to reset PendingCMD array for basic testing.
-         * It should be done at the end of  event status function.
-         */
-        for (i = tag_count + MAX_CHANS; i < MAX_DESCS; i++) {
-                PendingCMD[i].CMD = 0;
-                PendingCMD[i].Tag = 0;
-                PendingCMD[i].DataAddr = 0;
-                PendingCMD[i].Block = 0;
-                PendingCMD[i].Page = 0;
-                PendingCMD[i].PageCount = 0;
-                PendingCMD[i].DataDestAddr = 0;
-                PendingCMD[i].DataSrcAddr = 0;
-                PendingCMD[i].MemCopyByteCnt = 0;
-                PendingCMD[i].ChanSync[0] = 0;
-                PendingCMD[i].ChanSync[1] = 0;
-                PendingCMD[i].ChanSync[2] = 0;
-                PendingCMD[i].ChanSync[3] = 0;
-                PendingCMD[i].ChanSync[4] = 0;
-                PendingCMD[i].Status = CMD_NOT_DONE;
-        }
-
-        nand_dbg_print(NAND_DBG_TRACE, "At end of Execute CMDs.\n");
-
-        mtd_isr(0, 0); /* This is a null isr now. Need fill it in future */
-
-        return status;
-}
-
-/*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
-* Function:     mtd_Event_Status
-* Inputs:       none
-* Outputs:      Event_Status code
-* Description:  This function can also be used to force errors
-*&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&*/
-u16 mtd_CDMA_Event_Status(void)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        return EVENT_PASS;
-}
-
-#endif /* CMD_DMA */
-#endif /* !ELDORA */
diff --git a/drivers/staging/spectra/lld_mtd.h b/drivers/staging/spectra/lld_mtd.h
deleted file mode 100644
index 4e81ee87b53d..000000000000
--- a/drivers/staging/spectra/lld_mtd.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _LLD_MTD_
-#define _LLD_MTD_
-
-#include "ffsport.h"
-#include "ffsdefs.h"
-
-/* prototypes: MTD API functions */
-extern u16 mtd_Flash_Reset(void);
-extern u16 mtd_Flash_Init(void);
-extern int mtd_Flash_Release(void);
-extern u16 mtd_Read_Device_ID(void);
-extern u16 mtd_Erase_Block(u32 block_addr);
-extern u16 mtd_Write_Page_Main(u8 *write_data, u32 Block,
-                                u16 Page, u16 PageCount);
-extern u16 mtd_Read_Page_Main(u8 *read_data, u32 Block, u16 Page,
-                                 u16 PageCount);
-extern u16 mtd_Event_Status(void);
-extern void mtd_Enable_Disable_Interrupts(u16 INT_ENABLE);
-extern u16 mtd_Write_Page_Main_Spare(u8 *write_data, u32 Block,
-                                        u16 Page, u16 PageCount);
-extern u16 mtd_Write_Page_Spare(u8 *write_data, u32 Block,
-                                        u16 Page, u16 PageCount);
-extern u16 mtd_Read_Page_Main_Spare(u8 *read_data, u32 Block,
-                                       u16 Page, u16 PageCount);
-extern u16 mtd_Read_Page_Spare(u8 *read_data, u32 Block, u16 Page,
-                                  u16 PageCount);
-extern u16 mtd_Get_Bad_Block(u32 block);
-
-u16 mtd_CDMA_Flash_Init(void);
-u16 mtd_CDMA_Execute_CMDs(u16 tag_count);
-u16 mtd_CDMA_Event_Status(void);
-#endif /*_LLD_MTD_*/
diff --git a/drivers/staging/spectra/lld_nand.c b/drivers/staging/spectra/lld_nand.c
deleted file mode 100644
index 60a14ff26c7f..000000000000
--- a/drivers/staging/spectra/lld_nand.c
+++ /dev/null
@@ -1,2619 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 "lld.h"
-#include "lld_nand.h"
-#include "lld_cdma.h"
-
-#include "spectraswconfig.h"
-#include "flash.h"
-#include "ffsdefs.h"
-
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
-#include <linux/mutex.h>
-
-#include "nand_regs.h"
-
-#define SPECTRA_NAND_NAME    "nd"
-
-#define CEIL_DIV(X, Y) (((X)%(Y)) ? ((X)/(Y)+1) : ((X)/(Y)))
-#define MAX_PAGES_PER_RW        128
-
-#define INT_IDLE_STATE                 0
-#define INT_READ_PAGE_MAIN    0x01
-#define INT_WRITE_PAGE_MAIN    0x02
-#define INT_PIPELINE_READ_AHEAD    0x04
-#define INT_PIPELINE_WRITE_AHEAD    0x08
-#define INT_MULTI_PLANE_READ    0x10
-#define INT_MULTI_PLANE_WRITE    0x11
-
-static u32 enable_ecc;
-
-struct mrst_nand_info info;
-
-int totalUsedBanks;
-u32 GLOB_valid_banks[LLD_MAX_FLASH_BANKS];
-
-void __iomem *FlashReg;
-void __iomem *FlashMem;
-
-u16 conf_parameters[] = {
-        0x0000,
-        0x0000,
-        0x01F4,
-        0x01F4,
-        0x01F4,
-        0x01F4,
-        0x0000,
-        0x0000,
-        0x0001,
-        0x0000,
-        0x0000,
-        0x0000,
-        0x0000,
-        0x0040,
-        0x0001,
-        0x000A,
-        0x000A,
-        0x000A,
-        0x0000,
-        0x0000,
-        0x0005,
-        0x0012,
-        0x000C
-};
-
-u16   NAND_Get_Bad_Block(u32 block)
-{
-        u32 status = PASS;
-        u32 flag_bytes  = 0;
-        u32 skip_bytes  = DeviceInfo.wSpareSkipBytes;
-        u32 page, i;
-        u8 *pReadSpareBuf = buf_get_bad_block;
-
-        if (enable_ecc)
-                flag_bytes = DeviceInfo.wNumPageSpareFlag;
-
-        for (page = 0; page < 2; page++) {
-                status = NAND_Read_Page_Spare(pReadSpareBuf, block, page, 1);
-                if (status != PASS)
-                        return READ_ERROR;
-                for (i = flag_bytes; i < (flag_bytes + skip_bytes); i++)
-                        if (pReadSpareBuf[i] != 0xff)
-                                return DEFECTIVE_BLOCK;
-        }
-
-        for (page = 1; page < 3; page++) {
-                status = NAND_Read_Page_Spare(pReadSpareBuf, block,
-                        DeviceInfo.wPagesPerBlock - page , 1);
-                if (status != PASS)
-                        return READ_ERROR;
-                for (i = flag_bytes; i < (flag_bytes + skip_bytes); i++)
-                        if (pReadSpareBuf[i] != 0xff)
-                                return DEFECTIVE_BLOCK;
-        }
-
-        return GOOD_BLOCK;
-}
-
-
-u16 NAND_Flash_Reset(void)
-{
-        u32 i;
-        u32 intr_status_rst_comp[4] = {INTR_STATUS0__RST_COMP,
-                INTR_STATUS1__RST_COMP,
-                INTR_STATUS2__RST_COMP,
-                INTR_STATUS3__RST_COMP};
-        u32 intr_status_time_out[4] = {INTR_STATUS0__TIME_OUT,
-                INTR_STATUS1__TIME_OUT,
-                INTR_STATUS2__TIME_OUT,
-                INTR_STATUS3__TIME_OUT};
-        u32 intr_status[4] = {INTR_STATUS0, INTR_STATUS1,
-                INTR_STATUS2, INTR_STATUS3};
-        u32 device_reset_banks[4] = {DEVICE_RESET__BANK0,
-                DEVICE_RESET__BANK1,
-                DEVICE_RESET__BANK2,
-                DEVICE_RESET__BANK3};
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        for (i = 0 ; i < LLD_MAX_FLASH_BANKS; i++)
-                iowrite32(intr_status_rst_comp[i] | intr_status_time_out[i],
-                FlashReg + intr_status[i]);
-
-        for (i = 0 ; i < LLD_MAX_FLASH_BANKS; i++) {
-                iowrite32(device_reset_banks[i], FlashReg + DEVICE_RESET);
-                while (!(ioread32(FlashReg + intr_status[i]) &
-                        (intr_status_rst_comp[i] | intr_status_time_out[i])))
-                        ;
-                if (ioread32(FlashReg + intr_status[i]) &
-                        intr_status_time_out[i])
-                        nand_dbg_print(NAND_DBG_WARN,
-                        "NAND Reset operation timed out on bank %d\n", i);
-        }
-
-        for (i = 0; i < LLD_MAX_FLASH_BANKS; i++)
-                iowrite32(intr_status_rst_comp[i] | intr_status_time_out[i],
-                        FlashReg + intr_status[i]);
-
-        return PASS;
-}
-
-static void NAND_ONFi_Timing_Mode(u16 mode)
-{
-        u16 Trea[6] = {40, 30, 25, 20, 20, 16};
-        u16 Trp[6] = {50, 25, 17, 15, 12, 10};
-        u16 Treh[6] = {30, 15, 15, 10, 10, 7};
-        u16 Trc[6] = {100, 50, 35, 30, 25, 20};
-        u16 Trhoh[6] = {0, 15, 15, 15, 15, 15};
-        u16 Trloh[6] = {0, 0, 0, 0, 5, 5};
-        u16 Tcea[6] = {100, 45, 30, 25, 25, 25};
-        u16 Tadl[6] = {200, 100, 100, 100, 70, 70};
-        u16 Trhw[6] = {200, 100, 100, 100, 100, 100};
-        u16 Trhz[6] = {200, 100, 100, 100, 100, 100};
-        u16 Twhr[6] = {120, 80, 80, 60, 60, 60};
-        u16 Tcs[6] = {70, 35, 25, 25, 20, 15};
-
-        u16 TclsRising = 1;
-        u16 data_invalid_rhoh, data_invalid_rloh, data_invalid;
-        u16 dv_window = 0;
-        u16 en_lo, en_hi;
-        u16 acc_clks;
-        u16 addr_2_data, re_2_we, re_2_re, we_2_re, cs_cnt;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        en_lo = CEIL_DIV(Trp[mode], CLK_X);
-        en_hi = CEIL_DIV(Treh[mode], CLK_X);
-
-#if ONFI_BLOOM_TIME
-        if ((en_hi * CLK_X) < (Treh[mode] + 2))
-                en_hi++;
-#endif
-
-        if ((en_lo + en_hi) * CLK_X < Trc[mode])
-                en_lo += CEIL_DIV((Trc[mode] - (en_lo + en_hi) * CLK_X), CLK_X);
-
-        if ((en_lo + en_hi) < CLK_MULTI)
-                en_lo += CLK_MULTI - en_lo - en_hi;
-
-        while (dv_window < 8) {
-                data_invalid_rhoh = en_lo * CLK_X + Trhoh[mode];
-
-                data_invalid_rloh = (en_lo + en_hi) * CLK_X + Trloh[mode];
-
-                data_invalid =
-                    data_invalid_rhoh <
-                    data_invalid_rloh ? data_invalid_rhoh : data_invalid_rloh;
-
-                dv_window = data_invalid - Trea[mode];
-
-                if (dv_window < 8)
-                        en_lo++;
-        }
-
-        acc_clks = CEIL_DIV(Trea[mode], CLK_X);
-
-        while (((acc_clks * CLK_X) - Trea[mode]) < 3)
-                acc_clks++;
-
-        if ((data_invalid - acc_clks * CLK_X) < 2)
-                nand_dbg_print(NAND_DBG_WARN, "%s, Line %d: Warning!\n",
-                        __FILE__, __LINE__);
-
-        addr_2_data = CEIL_DIV(Tadl[mode], CLK_X);
-        re_2_we = CEIL_DIV(Trhw[mode], CLK_X);
-        re_2_re = CEIL_DIV(Trhz[mode], CLK_X);
-        we_2_re = CEIL_DIV(Twhr[mode], CLK_X);
-        cs_cnt = CEIL_DIV((Tcs[mode] - Trp[mode]), CLK_X);
-        if (!TclsRising)
-                cs_cnt = CEIL_DIV(Tcs[mode], CLK_X);
-        if (cs_cnt == 0)
-                cs_cnt = 1;
-
-        if (Tcea[mode]) {
-                while (((cs_cnt * CLK_X) + Trea[mode]) < Tcea[mode])
-                        cs_cnt++;
-        }
-
-#if MODE5_WORKAROUND
-        if (mode == 5)
-                acc_clks = 5;
-#endif
-
-        /* Sighting 3462430: Temporary hack for MT29F128G08CJABAWP:B */
-        if ((ioread32(FlashReg + MANUFACTURER_ID) == 0) &&
-                (ioread32(FlashReg + DEVICE_ID) == 0x88))
-                acc_clks = 6;
-
-        iowrite32(acc_clks, FlashReg + ACC_CLKS);
-        iowrite32(re_2_we, FlashReg + RE_2_WE);
-        iowrite32(re_2_re, FlashReg + RE_2_RE);
-        iowrite32(we_2_re, FlashReg + WE_2_RE);
-        iowrite32(addr_2_data, FlashReg + ADDR_2_DATA);
-        iowrite32(en_lo, FlashReg + RDWR_EN_LO_CNT);
-        iowrite32(en_hi, FlashReg + RDWR_EN_HI_CNT);
-        iowrite32(cs_cnt, FlashReg + CS_SETUP_CNT);
-}
-
-static void index_addr(u32 address, u32 data)
-{
-        iowrite32(address, FlashMem);
-        iowrite32(data, FlashMem + 0x10);
-}
-
-static void index_addr_read_data(u32 address, u32 *pdata)
-{
-        iowrite32(address, FlashMem);
-        *pdata = ioread32(FlashMem + 0x10);
-}
-
-static void set_ecc_config(void)
-{
-#if SUPPORT_8BITECC
-        if ((ioread32(FlashReg + DEVICE_MAIN_AREA_SIZE) < 4096) ||
-                (ioread32(FlashReg + DEVICE_SPARE_AREA_SIZE) <= 128))
-                iowrite32(8, FlashReg + ECC_CORRECTION);
-#endif
-
-        if ((ioread32(FlashReg + ECC_CORRECTION) & ECC_CORRECTION__VALUE)
-                == 1) {
-                DeviceInfo.wECCBytesPerSector = 4;
-                DeviceInfo.wECCBytesPerSector *= DeviceInfo.wDevicesConnected;
-                DeviceInfo.wNumPageSpareFlag =
-                        DeviceInfo.wPageSpareSize -
-                        DeviceInfo.wPageDataSize /
-                        (ECC_SECTOR_SIZE * DeviceInfo.wDevicesConnected) *
-                        DeviceInfo.wECCBytesPerSector
-                        - DeviceInfo.wSpareSkipBytes;
-        } else {
-                DeviceInfo.wECCBytesPerSector =
-                        (ioread32(FlashReg + ECC_CORRECTION) &
-                        ECC_CORRECTION__VALUE) * 13 / 8;
-                if ((DeviceInfo.wECCBytesPerSector) % 2 == 0)
-                        DeviceInfo.wECCBytesPerSector += 2;
-                else
-                        DeviceInfo.wECCBytesPerSector += 1;
-
-                DeviceInfo.wECCBytesPerSector *= DeviceInfo.wDevicesConnected;
-                DeviceInfo.wNumPageSpareFlag = DeviceInfo.wPageSpareSize -
-                        DeviceInfo.wPageDataSize /
-                        (ECC_SECTOR_SIZE * DeviceInfo.wDevicesConnected) *
-                        DeviceInfo.wECCBytesPerSector
-                        - DeviceInfo.wSpareSkipBytes;
-        }
-}
-
-static u16 get_onfi_nand_para(void)
-{
-        int i;
-        u16 blks_lun_l, blks_lun_h, n_of_luns;
-        u32 blockperlun, id;
-
-        iowrite32(DEVICE_RESET__BANK0, FlashReg + DEVICE_RESET);
-
-        while (!((ioread32(FlashReg + INTR_STATUS0) &
-                INTR_STATUS0__RST_COMP) |
-                (ioread32(FlashReg + INTR_STATUS0) &
-                INTR_STATUS0__TIME_OUT)))
-                ;
-
-        if (ioread32(FlashReg + INTR_STATUS0) & INTR_STATUS0__RST_COMP) {
-                iowrite32(DEVICE_RESET__BANK1, FlashReg + DEVICE_RESET);
-                while (!((ioread32(FlashReg + INTR_STATUS1) &
-                        INTR_STATUS1__RST_COMP) |
-                        (ioread32(FlashReg + INTR_STATUS1) &
-                        INTR_STATUS1__TIME_OUT)))
-                        ;
-
-                if (ioread32(FlashReg + INTR_STATUS1) &
-                        INTR_STATUS1__RST_COMP) {
-                        iowrite32(DEVICE_RESET__BANK2,
-                                FlashReg + DEVICE_RESET);
-                        while (!((ioread32(FlashReg + INTR_STATUS2) &
-                                INTR_STATUS2__RST_COMP) |
-                                (ioread32(FlashReg + INTR_STATUS2) &
-                                INTR_STATUS2__TIME_OUT)))
-                                ;
-
-                        if (ioread32(FlashReg + INTR_STATUS2) &
-                                INTR_STATUS2__RST_COMP) {
-                                iowrite32(DEVICE_RESET__BANK3,
-                                        FlashReg + DEVICE_RESET);
-                                while (!((ioread32(FlashReg + INTR_STATUS3) &
-                                        INTR_STATUS3__RST_COMP) |
-                                        (ioread32(FlashReg + INTR_STATUS3) &
-                                        INTR_STATUS3__TIME_OUT)))
-                                        ;
-                        } else {
-                                printk(KERN_ERR "Getting a time out for bank 2!\n");
-                        }
-                } else {
-                        printk(KERN_ERR "Getting a time out for bank 1!\n");
-                }
-        }
-
-        iowrite32(INTR_STATUS0__TIME_OUT, FlashReg + INTR_STATUS0);
-        iowrite32(INTR_STATUS1__TIME_OUT, FlashReg + INTR_STATUS1);
-        iowrite32(INTR_STATUS2__TIME_OUT, FlashReg + INTR_STATUS2);
-        iowrite32(INTR_STATUS3__TIME_OUT, FlashReg + INTR_STATUS3);
-
-        DeviceInfo.wONFIDevFeatures =
-                ioread32(FlashReg + ONFI_DEVICE_FEATURES);
-        DeviceInfo.wONFIOptCommands =
-                ioread32(FlashReg + ONFI_OPTIONAL_COMMANDS);
-        DeviceInfo.wONFITimingMode =
-                ioread32(FlashReg + ONFI_TIMING_MODE);
-        DeviceInfo.wONFIPgmCacheTimingMode =
-                ioread32(FlashReg + ONFI_PGM_CACHE_TIMING_MODE);
-
-        n_of_luns = ioread32(FlashReg + ONFI_DEVICE_NO_OF_LUNS) &
-                ONFI_DEVICE_NO_OF_LUNS__NO_OF_LUNS;
-        blks_lun_l = ioread32(FlashReg + ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_L);
-        blks_lun_h = ioread32(FlashReg + ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_U);
-
-        blockperlun = (blks_lun_h << 16) | blks_lun_l;
-
-        DeviceInfo.wTotalBlocks = n_of_luns * blockperlun;
-
-        if (!(ioread32(FlashReg + ONFI_TIMING_MODE) &
-                ONFI_TIMING_MODE__VALUE))
-                return FAIL;
-
-        for (i = 5; i > 0; i--) {
-                if (ioread32(FlashReg + ONFI_TIMING_MODE) & (0x01 << i))
-                        break;
-        }
-
-        NAND_ONFi_Timing_Mode(i);
-
-        index_addr(MODE_11 | 0, 0x90);
-        index_addr(MODE_11 | 1, 0);
-
-        for (i = 0; i < 3; i++)
-                index_addr_read_data(MODE_11 | 2, &id);
-
-        nand_dbg_print(NAND_DBG_DEBUG, "3rd ID: 0x%x\n", id);
-
-        DeviceInfo.MLCDevice = id & 0x0C;
-
-        /* By now, all the ONFI devices we know support the page cache */
-        /* rw feature. So here we enable the pipeline_rw_ahead feature */
-        /* iowrite32(1, FlashReg + CACHE_WRITE_ENABLE); */
-        /* iowrite32(1, FlashReg + CACHE_READ_ENABLE);  */
-
-        return PASS;
-}
-
-static void get_samsung_nand_para(void)
-{
-        u8 no_of_planes;
-        u32 blk_size;
-        u64 plane_size, capacity;
-        u32 id_bytes[5];
-        int i;
-
-        index_addr((u32)(MODE_11 | 0), 0x90);
-        index_addr((u32)(MODE_11 | 1), 0);
-        for (i = 0; i < 5; i++)
-                index_addr_read_data((u32)(MODE_11 | 2), &id_bytes[i]);
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "ID bytes: 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n",
-                id_bytes[0], id_bytes[1], id_bytes[2],
-                id_bytes[3], id_bytes[4]);
-
-        if ((id_bytes[1] & 0xff) == 0xd3) { /* Samsung K9WAG08U1A */
-                /* Set timing register values according to datasheet */
-                iowrite32(5, FlashReg + ACC_CLKS);
-                iowrite32(20, FlashReg + RE_2_WE);
-                iowrite32(12, FlashReg + WE_2_RE);
-                iowrite32(14, FlashReg + ADDR_2_DATA);
-                iowrite32(3, FlashReg + RDWR_EN_LO_CNT);
-                iowrite32(2, FlashReg + RDWR_EN_HI_CNT);
-                iowrite32(2, FlashReg + CS_SETUP_CNT);
-        }
-
-        no_of_planes = 1 << ((id_bytes[4] & 0x0c) >> 2);
-        plane_size  = (u64)64 << ((id_bytes[4] & 0x70) >> 4);
-        blk_size = 64 << ((ioread32(FlashReg + DEVICE_PARAM_1) & 0x30) >> 4);
-        capacity = (u64)128 * plane_size * no_of_planes;
-
-        DeviceInfo.wTotalBlocks = (u32)GLOB_u64_Div(capacity, blk_size);
-}
-
-static void get_toshiba_nand_para(void)
-{
-        void __iomem *scratch_reg;
-        u32 tmp;
-
-        /* Workaround to fix a controller bug which reports a wrong */
-        /* spare area size for some kind of Toshiba NAND device */
-        if ((ioread32(FlashReg + DEVICE_MAIN_AREA_SIZE) == 4096) &&
-                (ioread32(FlashReg + DEVICE_SPARE_AREA_SIZE) == 64)) {
-                iowrite32(216, FlashReg + DEVICE_SPARE_AREA_SIZE);
-                tmp = ioread32(FlashReg + DEVICES_CONNECTED) *
-                        ioread32(FlashReg + DEVICE_SPARE_AREA_SIZE);
-                iowrite32(tmp, FlashReg + LOGICAL_PAGE_SPARE_SIZE);
-#if SUPPORT_15BITECC
-                iowrite32(15, FlashReg + ECC_CORRECTION);
-#elif SUPPORT_8BITECC
-                iowrite32(8, FlashReg + ECC_CORRECTION);
-#endif
-        }
-
-        /* As Toshiba NAND can not provide it's block number, */
-        /* so here we need user to provide the correct block */
-        /* number in a scratch register before the Linux NAND */
-        /* driver is loaded. If no valid value found in the scratch */
-        /* register, then we use default block number value */
-        scratch_reg = ioremap_nocache(SCRATCH_REG_ADDR, SCRATCH_REG_SIZE);
-        if (!scratch_reg) {
-                printk(KERN_ERR "Spectra: ioremap failed in %s, Line %d",
-                        __FILE__, __LINE__);
-                DeviceInfo.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-        } else {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Spectra: ioremap reg address: 0x%p\n", scratch_reg);
-                DeviceInfo.wTotalBlocks = 1 << ioread8(scratch_reg);
-                if (DeviceInfo.wTotalBlocks < 512)
-                        DeviceInfo.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-                iounmap(scratch_reg);
-        }
-}
-
-static void get_hynix_nand_para(void)
-{
-        void __iomem *scratch_reg;
-        u32 main_size, spare_size;
-
-        switch (DeviceInfo.wDeviceID) {
-        case 0xD5: /* Hynix H27UAG8T2A, H27UBG8U5A or H27UCG8VFA */
-        case 0xD7: /* Hynix H27UDG8VEM, H27UCG8UDM or H27UCG8V5A */
-                iowrite32(128, FlashReg + PAGES_PER_BLOCK);
-                iowrite32(4096, FlashReg + DEVICE_MAIN_AREA_SIZE);
-                iowrite32(224, FlashReg + DEVICE_SPARE_AREA_SIZE);
-                main_size = 4096 * ioread32(FlashReg + DEVICES_CONNECTED);
-                spare_size = 224 * ioread32(FlashReg + DEVICES_CONNECTED);
-                iowrite32(main_size, FlashReg + LOGICAL_PAGE_DATA_SIZE);
-                iowrite32(spare_size, FlashReg + LOGICAL_PAGE_SPARE_SIZE);
-                iowrite32(0, FlashReg + DEVICE_WIDTH);
-#if SUPPORT_15BITECC
-                iowrite32(15, FlashReg + ECC_CORRECTION);
-#elif SUPPORT_8BITECC
-                iowrite32(8, FlashReg + ECC_CORRECTION);
-#endif
-                DeviceInfo.MLCDevice  = 1;
-                break;
-        default:
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Spectra: Unknown Hynix NAND (Device ID: 0x%x)."
-                        "Will use default parameter values instead.\n",
-                        DeviceInfo.wDeviceID);
-        }
-
-        scratch_reg = ioremap_nocache(SCRATCH_REG_ADDR, SCRATCH_REG_SIZE);
-        if (!scratch_reg) {
-                printk(KERN_ERR "Spectra: ioremap failed in %s, Line %d",
-                        __FILE__, __LINE__);
-                DeviceInfo.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-        } else {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Spectra: ioremap reg address: 0x%p\n", scratch_reg);
-                DeviceInfo.wTotalBlocks = 1 << ioread8(scratch_reg);
-                if (DeviceInfo.wTotalBlocks < 512)
-                        DeviceInfo.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-                iounmap(scratch_reg);
-        }
-}
-
-static void find_valid_banks(void)
-{
-        u32 id[LLD_MAX_FLASH_BANKS];
-        int i;
-
-        totalUsedBanks = 0;
-        for (i = 0; i < LLD_MAX_FLASH_BANKS; i++) {
-                index_addr((u32)(MODE_11 | (i << 24) | 0), 0x90);
-                index_addr((u32)(MODE_11 | (i << 24) | 1), 0);
-                index_addr_read_data((u32)(MODE_11 | (i << 24) | 2), &id[i]);
-
-                nand_dbg_print(NAND_DBG_DEBUG,
-                        "Return 1st ID for bank[%d]: %x\n", i, id[i]);
-
-                if (i == 0) {
-                        if (id[i] & 0x0ff)
-                                GLOB_valid_banks[i] = 1;
-                } else {
-                        if ((id[i] & 0x0ff) == (id[0] & 0x0ff))
-                                GLOB_valid_banks[i] = 1;
-                }
-
-                totalUsedBanks += GLOB_valid_banks[i];
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "totalUsedBanks: %d\n", totalUsedBanks);
-}
-
-static void detect_partition_feature(void)
-{
-        if (ioread32(FlashReg + FEATURES) & FEATURES__PARTITION) {
-                if ((ioread32(FlashReg + PERM_SRC_ID_1) &
-                        PERM_SRC_ID_1__SRCID) == SPECTRA_PARTITION_ID) {
-                        DeviceInfo.wSpectraStartBlock =
-                            ((ioread32(FlashReg + MIN_MAX_BANK_1) &
-                              MIN_MAX_BANK_1__MIN_VALUE) *
-                             DeviceInfo.wTotalBlocks)
-                            +
-                            (ioread32(FlashReg + MIN_BLK_ADDR_1) &
-                            MIN_BLK_ADDR_1__VALUE);
-
-                        DeviceInfo.wSpectraEndBlock =
-                            (((ioread32(FlashReg + MIN_MAX_BANK_1) &
-                               MIN_MAX_BANK_1__MAX_VALUE) >> 2) *
-                             DeviceInfo.wTotalBlocks)
-                            +
-                            (ioread32(FlashReg + MAX_BLK_ADDR_1) &
-                            MAX_BLK_ADDR_1__VALUE);
-
-                        DeviceInfo.wTotalBlocks *= totalUsedBanks;
-
-                        if (DeviceInfo.wSpectraEndBlock >=
-                            DeviceInfo.wTotalBlocks) {
-                                DeviceInfo.wSpectraEndBlock =
-                                    DeviceInfo.wTotalBlocks - 1;
-                        }
-
-                        DeviceInfo.wDataBlockNum =
-                                DeviceInfo.wSpectraEndBlock -
-                                DeviceInfo.wSpectraStartBlock + 1;
-                } else {
-                        DeviceInfo.wTotalBlocks *= totalUsedBanks;
-                        DeviceInfo.wSpectraStartBlock = SPECTRA_START_BLOCK;
-                        DeviceInfo.wSpectraEndBlock =
-                                DeviceInfo.wTotalBlocks - 1;
-                        DeviceInfo.wDataBlockNum =
-                                DeviceInfo.wSpectraEndBlock -
-                                DeviceInfo.wSpectraStartBlock + 1;
-                }
-        } else {
-                DeviceInfo.wTotalBlocks *= totalUsedBanks;
-                DeviceInfo.wSpectraStartBlock = SPECTRA_START_BLOCK;
-                DeviceInfo.wSpectraEndBlock = DeviceInfo.wTotalBlocks - 1;
-                DeviceInfo.wDataBlockNum =
-                        DeviceInfo.wSpectraEndBlock -
-                        DeviceInfo.wSpectraStartBlock + 1;
-        }
-}
-
-static void dump_device_info(void)
-{
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceInfo:\n");
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceMaker: 0x%x\n",
-                DeviceInfo.wDeviceMaker);
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceID: 0x%x\n",
-                DeviceInfo.wDeviceID);
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceType: 0x%x\n",
-                DeviceInfo.wDeviceType);
-        nand_dbg_print(NAND_DBG_DEBUG, "SpectraStartBlock: %d\n",
-                DeviceInfo.wSpectraStartBlock);
-        nand_dbg_print(NAND_DBG_DEBUG, "SpectraEndBlock: %d\n",
-                DeviceInfo.wSpectraEndBlock);
-        nand_dbg_print(NAND_DBG_DEBUG, "TotalBlocks: %d\n",
-                DeviceInfo.wTotalBlocks);
-        nand_dbg_print(NAND_DBG_DEBUG, "PagesPerBlock: %d\n",
-                DeviceInfo.wPagesPerBlock);
-        nand_dbg_print(NAND_DBG_DEBUG, "PageSize: %d\n",
-                DeviceInfo.wPageSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "PageDataSize: %d\n",
-                DeviceInfo.wPageDataSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "PageSpareSize: %d\n",
-                DeviceInfo.wPageSpareSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "NumPageSpareFlag: %d\n",
-                DeviceInfo.wNumPageSpareFlag);
-        nand_dbg_print(NAND_DBG_DEBUG, "ECCBytesPerSector: %d\n",
-                DeviceInfo.wECCBytesPerSector);
-        nand_dbg_print(NAND_DBG_DEBUG, "BlockSize: %d\n",
-                DeviceInfo.wBlockSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "BlockDataSize: %d\n",
-                DeviceInfo.wBlockDataSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "DataBlockNum: %d\n",
-                DeviceInfo.wDataBlockNum);
-        nand_dbg_print(NAND_DBG_DEBUG, "PlaneNum: %d\n",
-                DeviceInfo.bPlaneNum);
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceMainAreaSize: %d\n",
-                DeviceInfo.wDeviceMainAreaSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceSpareAreaSize: %d\n",
-                DeviceInfo.wDeviceSpareAreaSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "DevicesConnected: %d\n",
-                DeviceInfo.wDevicesConnected);
-        nand_dbg_print(NAND_DBG_DEBUG, "DeviceWidth: %d\n",
-                DeviceInfo.wDeviceWidth);
-        nand_dbg_print(NAND_DBG_DEBUG, "HWRevision: 0x%x\n",
-                DeviceInfo.wHWRevision);
-        nand_dbg_print(NAND_DBG_DEBUG, "HWFeatures: 0x%x\n",
-                DeviceInfo.wHWFeatures);
-        nand_dbg_print(NAND_DBG_DEBUG, "ONFIDevFeatures: 0x%x\n",
-                DeviceInfo.wONFIDevFeatures);
-        nand_dbg_print(NAND_DBG_DEBUG, "ONFIOptCommands: 0x%x\n",
-                DeviceInfo.wONFIOptCommands);
-        nand_dbg_print(NAND_DBG_DEBUG, "ONFITimingMode: 0x%x\n",
-                DeviceInfo.wONFITimingMode);
-        nand_dbg_print(NAND_DBG_DEBUG, "ONFIPgmCacheTimingMode: 0x%x\n",
-                DeviceInfo.wONFIPgmCacheTimingMode);
-        nand_dbg_print(NAND_DBG_DEBUG, "MLCDevice: %s\n",
-                DeviceInfo.MLCDevice ? "Yes" : "No");
-        nand_dbg_print(NAND_DBG_DEBUG, "SpareSkipBytes: %d\n",
-                DeviceInfo.wSpareSkipBytes);
-        nand_dbg_print(NAND_DBG_DEBUG, "BitsInPageNumber: %d\n",
-                DeviceInfo.nBitsInPageNumber);
-        nand_dbg_print(NAND_DBG_DEBUG, "BitsInPageDataSize: %d\n",
-                DeviceInfo.nBitsInPageDataSize);
-        nand_dbg_print(NAND_DBG_DEBUG, "BitsInBlockDataSize: %d\n",
-                DeviceInfo.nBitsInBlockDataSize);
-}
-
-u16 NAND_Read_Device_ID(void)
-{
-        u16 status = PASS;
-        u8 no_of_planes;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        iowrite32(0x02, FlashReg + SPARE_AREA_SKIP_BYTES);
-        iowrite32(0xffff, FlashReg + SPARE_AREA_MARKER);
-        DeviceInfo.wDeviceMaker = ioread32(FlashReg + MANUFACTURER_ID);
-        DeviceInfo.wDeviceID = ioread32(FlashReg + DEVICE_ID);
-        DeviceInfo.MLCDevice = ioread32(FlashReg + DEVICE_PARAM_0) & 0x0c;
-
-        if (ioread32(FlashReg + ONFI_DEVICE_NO_OF_LUNS) &
-                ONFI_DEVICE_NO_OF_LUNS__ONFI_DEVICE) { /* ONFI 1.0 NAND */
-                if (FAIL == get_onfi_nand_para())
-                        return FAIL;
-        } else if (DeviceInfo.wDeviceMaker == 0xEC) { /* Samsung NAND */
-                get_samsung_nand_para();
-        } else if (DeviceInfo.wDeviceMaker == 0x98) { /* Toshiba NAND */
-                get_toshiba_nand_para();
-        } else if (DeviceInfo.wDeviceMaker == 0xAD) { /* Hynix NAND */
-                get_hynix_nand_para();
-        } else {
-                DeviceInfo.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-        }
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Dump timing register values:"
-                        "acc_clks: %d, re_2_we: %d, we_2_re: %d,"
-                        "addr_2_data: %d, rdwr_en_lo_cnt: %d, "
-                        "rdwr_en_hi_cnt: %d, cs_setup_cnt: %d\n",
-                        ioread32(FlashReg + ACC_CLKS),
-                        ioread32(FlashReg + RE_2_WE),
-                        ioread32(FlashReg + WE_2_RE),
-                        ioread32(FlashReg + ADDR_2_DATA),
-                        ioread32(FlashReg + RDWR_EN_LO_CNT),
-                        ioread32(FlashReg + RDWR_EN_HI_CNT),
-                        ioread32(FlashReg + CS_SETUP_CNT));
-
-        DeviceInfo.wHWRevision = ioread32(FlashReg + REVISION);
-        DeviceInfo.wHWFeatures = ioread32(FlashReg + FEATURES);
-
-        DeviceInfo.wDeviceMainAreaSize =
-                ioread32(FlashReg + DEVICE_MAIN_AREA_SIZE);
-        DeviceInfo.wDeviceSpareAreaSize =
-                ioread32(FlashReg + DEVICE_SPARE_AREA_SIZE);
-
-        DeviceInfo.wPageDataSize =
-                ioread32(FlashReg + LOGICAL_PAGE_DATA_SIZE);
-
-        /* Note: When using the Micon 4K NAND device, the controller will report
-         * Page Spare Size as 216 bytes. But Micron's Spec say it's 218 bytes.
-         * And if force set it to 218 bytes, the controller can not work
-         * correctly. So just let it be. But keep in mind that this bug may
-         * cause
-         * other problems in future.       - Yunpeng  2008-10-10
-         */
-        DeviceInfo.wPageSpareSize =
-                ioread32(FlashReg + LOGICAL_PAGE_SPARE_SIZE);
-
-        DeviceInfo.wPagesPerBlock = ioread32(FlashReg + PAGES_PER_BLOCK);
-
-        DeviceInfo.wPageSize =
-            DeviceInfo.wPageDataSize + DeviceInfo.wPageSpareSize;
-        DeviceInfo.wBlockSize =
-            DeviceInfo.wPageSize * DeviceInfo.wPagesPerBlock;
-        DeviceInfo.wBlockDataSize =
-            DeviceInfo.wPagesPerBlock * DeviceInfo.wPageDataSize;
-
-        DeviceInfo.wDeviceWidth = ioread32(FlashReg + DEVICE_WIDTH);
-        DeviceInfo.wDeviceType =
-                ((ioread32(FlashReg + DEVICE_WIDTH) > 0) ? 16 : 8);
-
-        DeviceInfo.wDevicesConnected = ioread32(FlashReg + DEVICES_CONNECTED);
-
-        DeviceInfo.wSpareSkipBytes =
-                ioread32(FlashReg + SPARE_AREA_SKIP_BYTES) *
-                DeviceInfo.wDevicesConnected;
-
-        DeviceInfo.nBitsInPageNumber =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wPagesPerBlock);
-        DeviceInfo.nBitsInPageDataSize =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wPageDataSize);
-        DeviceInfo.nBitsInBlockDataSize =
-                (u8)GLOB_Calc_Used_Bits(DeviceInfo.wBlockDataSize);
-
-        set_ecc_config();
-
-        no_of_planes = ioread32(FlashReg + NUMBER_OF_PLANES) &
-                NUMBER_OF_PLANES__VALUE;
-
-        switch (no_of_planes) {
-        case 0:
-        case 1:
-        case 3:
-        case 7:
-                DeviceInfo.bPlaneNum = no_of_planes + 1;
-                break;
-        default:
-                status = FAIL;
-                break;
-        }
-
-        find_valid_banks();
-
-        detect_partition_feature();
-
-        dump_device_info();
-
-        return status;
-}
-
-u16 NAND_UnlockArrayAll(void)
-{
-        u64 start_addr, end_addr;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        start_addr = 0;
-        end_addr = ((u64)DeviceInfo.wBlockSize *
-                (DeviceInfo.wTotalBlocks - 1)) >>
-                DeviceInfo.nBitsInPageDataSize;
-
-        index_addr((u32)(MODE_10 | (u32)start_addr), 0x10);
-        index_addr((u32)(MODE_10 | (u32)end_addr), 0x11);
-
-        return PASS;
-}
-
-void NAND_LLD_Enable_Disable_Interrupts(u16 INT_ENABLE)
-{
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (INT_ENABLE)
-                iowrite32(1, FlashReg + GLOBAL_INT_ENABLE);
-        else
-                iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
-}
-
-u16 NAND_Erase_Block(u32 block)
-{
-        u16 status = PASS;
-        u64 flash_add;
-        u16 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        if (block >= DeviceInfo.wTotalBlocks)
-                status = FAIL;
-
-        if (status == PASS) {
-                intr_status = intr_status_addresses[flash_bank];
-
-                iowrite32(INTR_STATUS0__ERASE_COMP | INTR_STATUS0__ERASE_FAIL,
-                        FlashReg + intr_status);
-
-                index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)), 1);
-
-                while (!(ioread32(FlashReg + intr_status) &
-                        (INTR_STATUS0__ERASE_COMP | INTR_STATUS0__ERASE_FAIL)))
-                        ;
-
-                if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__ERASE_FAIL)
-                        status = FAIL;
-
-                iowrite32(INTR_STATUS0__ERASE_COMP | INTR_STATUS0__ERASE_FAIL,
-                        FlashReg + intr_status);
-        }
-
-        return status;
-}
-
-static u32 Boundary_Check_Block_Page(u32 block, u16 page,
-                                                u16 page_count)
-{
-        u32 status = PASS;
-
-        if (block >= DeviceInfo.wTotalBlocks)
-                status = FAIL;
-
-        if (page + page_count > DeviceInfo.wPagesPerBlock)
-                status = FAIL;
-
-        return status;
-}
-
-u16 NAND_Read_Page_Spare(u8 *read_data, u32 block, u16 page,
-                            u16 page_count)
-{
-        u32 status = PASS;
-        u32 i;
-        u64 flash_add;
-        u32 PageSpareSize = DeviceInfo.wPageSpareSize;
-        u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u8 *page_spare = buf_read_page_spare;
-
-        if (block >= DeviceInfo.wTotalBlocks) {
-                printk(KERN_ERR "block too big: %d\n", (int)block);
-                status = FAIL;
-        }
-
-        if (page >= DeviceInfo.wPagesPerBlock) {
-                printk(KERN_ERR "page too big: %d\n", page);
-                status = FAIL;
-        }
-
-        if (page_count > 1) {
-                printk(KERN_ERR "page count too big: %d\n", page_count);
-                status = FAIL;
-        }
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        if (status == PASS) {
-                intr_status = intr_status_addresses[flash_bank];
-                iowrite32(ioread32(FlashReg + intr_status),
-                        FlashReg + intr_status);
-
-                index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)),
-                        0x41);
-                index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)),
-                        0x2000 | page_count);
-                while (!(ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__LOAD_COMP))
-                        ;
-
-                iowrite32((u32)(MODE_01 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)),
-                        FlashMem);
-
-                for (i = 0; i < (PageSpareSize / 4); i++)
-                        *((u32 *)page_spare + i) =
-                                        ioread32(FlashMem + 0x10);
-
-                if (enable_ecc) {
-                        for (i = 0; i < spareFlagBytes; i++)
-                                read_data[i] =
-                                        page_spare[PageSpareSize -
-                                                spareFlagBytes + i];
-                        for (i = 0; i < (PageSpareSize - spareFlagBytes); i++)
-                                read_data[spareFlagBytes + i] =
-                                                        page_spare[i];
-                } else {
-                        for (i = 0; i < PageSpareSize; i++)
-                                read_data[i] = page_spare[i];
-                }
-
-                index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-        }
-
-        return status;
-}
-
-/* No use function. Should be removed later */
-u16 NAND_Write_Page_Spare(u8 *write_data, u32 block, u16 page,
-                             u16 page_count)
-{
-        printk(KERN_ERR
-               "Error! This function (NAND_Write_Page_Spare) should never"
-                " be called!\n");
-        return ERR;
-}
-
-/* op value:  0 - DDMA read;  1 - DDMA write */
-static void ddma_trans(u8 *data, u64 flash_add,
-                        u32 flash_bank, int op, u32 numPages)
-{
-        u32 data_addr;
-
-        /* Map virtual address to bus address for DDMA */
-        data_addr = virt_to_bus(data);
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                (flash_add >> DeviceInfo.nBitsInPageDataSize)),
-                (u16)(2 << 12) | (op << 8) | numPages);
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                ((u16)(0x0FFFF & (data_addr >> 16)) << 8)),
-                (u16)(2 << 12) | (2 << 8) | 0);
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                ((u16)(0x0FFFF & data_addr) << 8)),
-                (u16)(2 << 12) | (3 << 8) | 0);
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                (1 << 16) | (0x40 << 8)),
-                (u16)(2 << 12) | (4 << 8) | 0);
-}
-
-/* If data in buf are all 0xff, then return 1; otherwise return 0 */
-static int check_all_1(u8 *buf)
-{
-        int i, j, cnt;
-
-        for (i = 0; i < DeviceInfo.wPageDataSize; i++) {
-                if (buf[i] != 0xff) {
-                        cnt = 0;
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "the first non-0xff data byte is: %d\n", i);
-                        for (j = i; j < DeviceInfo.wPageDataSize; j++) {
-                                nand_dbg_print(NAND_DBG_WARN, "0x%x ", buf[j]);
-                                cnt++;
-                                if (cnt > 8)
-                                        break;
-                        }
-                        nand_dbg_print(NAND_DBG_WARN, "\n");
-                        return 0;
-                }
-        }
-
-        return 1;
-}
-
-static int do_ecc_new(unsigned long bank, u8 *buf,
-                                u32 block, u16 page)
-{
-        int status = PASS;
-        u16 err_page = 0;
-        u16 err_byte;
-        u8 err_sect;
-        u8 err_dev;
-        u16 err_fix_info;
-        u16 err_addr;
-        u32 ecc_sect_size;
-        u8 *err_pos;
-        u32 err_page_addr[4] = {ERR_PAGE_ADDR0,
-                ERR_PAGE_ADDR1, ERR_PAGE_ADDR2, ERR_PAGE_ADDR3};
-
-        ecc_sect_size = ECC_SECTOR_SIZE * (DeviceInfo.wDevicesConnected);
-
-        do {
-                err_page = ioread32(FlashReg + err_page_addr[bank]);
-                err_addr = ioread32(FlashReg + ECC_ERROR_ADDRESS);
-                err_byte = err_addr & ECC_ERROR_ADDRESS__OFFSET;
-                err_sect = ((err_addr & ECC_ERROR_ADDRESS__SECTOR_NR) >> 12);
-                err_fix_info = ioread32(FlashReg + ERR_CORRECTION_INFO);
-                err_dev = ((err_fix_info & ERR_CORRECTION_INFO__DEVICE_NR)
-                        >> 8);
-                if (err_fix_info & ERR_CORRECTION_INFO__ERROR_TYPE) {
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "%s, Line %d Uncorrectable ECC error "
-                                "when read block %d page %d."
-                                "PTN_INTR register: 0x%x "
-                                "err_page: %d, err_sect: %d, err_byte: %d, "
-                                "err_dev: %d, ecc_sect_size: %d, "
-                                "err_fix_info: 0x%x\n",
-                                __FILE__, __LINE__, block, page,
-                                ioread32(FlashReg + PTN_INTR),
-                                err_page, err_sect, err_byte, err_dev,
-                                ecc_sect_size, (u32)err_fix_info);
-
-                        if (check_all_1(buf))
-                                nand_dbg_print(NAND_DBG_WARN, "%s, Line %d"
-                                               "All 0xff!\n",
-                                               __FILE__, __LINE__);
-                        else
-                                nand_dbg_print(NAND_DBG_WARN, "%s, Line %d"
-                                               "Not all 0xff!\n",
-                                               __FILE__, __LINE__);
-                        status = FAIL;
-                } else {
-                        nand_dbg_print(NAND_DBG_WARN,
-                                "%s, Line %d Found ECC error "
-                                "when read block %d page %d."
-                                "err_page: %d, err_sect: %d, err_byte: %d, "
-                                "err_dev: %d, ecc_sect_size: %d, "
-                                "err_fix_info: 0x%x\n",
-                                __FILE__, __LINE__, block, page,
-                                err_page, err_sect, err_byte, err_dev,
-                                ecc_sect_size, (u32)err_fix_info);
-                        if (err_byte < ECC_SECTOR_SIZE) {
-                                err_pos = buf +
-                                        (err_page - page) *
-                                        DeviceInfo.wPageDataSize +
-                                        err_sect * ecc_sect_size +
-                                        err_byte *
-                                        DeviceInfo.wDevicesConnected +
-                                        err_dev;
-
-                                *err_pos ^= err_fix_info &
-                                        ERR_CORRECTION_INFO__BYTEMASK;
-                        }
-                }
-        } while (!(err_fix_info & ERR_CORRECTION_INFO__LAST_ERR_INFO));
-
-        return status;
-}
-
-u16 NAND_Read_Page_Main_Polling(u8 *read_data,
-                u32 block, u16 page, u16 page_count)
-{
-        u32 status = PASS;
-        u64 flash_add;
-        u32 intr_status = 0;
-        u32 flash_bank;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u8 *read_data_l;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-        if (status != PASS)
-                return status;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        intr_status = intr_status_addresses[flash_bank];
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        if (page_count > 1) {
-                read_data_l = read_data;
-                while (page_count > MAX_PAGES_PER_RW) {
-                        if (ioread32(FlashReg + MULTIPLANE_OPERATION))
-                                status = NAND_Multiplane_Read(read_data_l,
-                                        block, page, MAX_PAGES_PER_RW);
-                        else
-                                status = NAND_Pipeline_Read_Ahead_Polling(
-                                        read_data_l, block, page,
-                                        MAX_PAGES_PER_RW);
-
-                        if (status == FAIL)
-                                return status;
-
-                        read_data_l += DeviceInfo.wPageDataSize *
-                                        MAX_PAGES_PER_RW;
-                        page_count -= MAX_PAGES_PER_RW;
-                        page += MAX_PAGES_PER_RW;
-                }
-                if (ioread32(FlashReg + MULTIPLANE_OPERATION))
-                        status = NAND_Multiplane_Read(read_data_l,
-                                        block, page, page_count);
-                else
-                        status = NAND_Pipeline_Read_Ahead_Polling(
-                                        read_data_l, block, page, page_count);
-
-                return status;
-        }
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        ddma_trans(read_data, flash_add, flash_bank, 0, 1);
-
-        if (enable_ecc) {
-                while (!(ioread32(FlashReg + intr_status) &
-                        (INTR_STATUS0__ECC_TRANSACTION_DONE |
-                        INTR_STATUS0__ECC_ERR)))
-                        ;
-
-                if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__ECC_ERR) {
-                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                FlashReg + intr_status);
-                        status = do_ecc_new(flash_bank, read_data,
-                                        block, page);
-                }
-
-                if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__ECC_TRANSACTION_DONE &
-                        INTR_STATUS0__ECC_ERR)
-                        iowrite32(INTR_STATUS0__ECC_TRANSACTION_DONE |
-                                INTR_STATUS0__ECC_ERR,
-                                FlashReg + intr_status);
-                else if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__ECC_TRANSACTION_DONE)
-                        iowrite32(INTR_STATUS0__ECC_TRANSACTION_DONE,
-                                FlashReg + intr_status);
-                else if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__ECC_ERR)
-                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                FlashReg + intr_status);
-        } else {
-                while (!(ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__DMA_CMD_COMP))
-                        ;
-                iowrite32(INTR_STATUS0__DMA_CMD_COMP, FlashReg + intr_status);
-        }
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-        while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        return status;
-}
-
-u16 NAND_Pipeline_Read_Ahead_Polling(u8 *read_data,
-                        u32 block, u16 page, u16 page_count)
-{
-        u32 status = PASS;
-        u32 NumPages = page_count;
-        u64 flash_add;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u32 ecc_done_OR_dma_comp;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-
-        if (page_count < 2)
-                status = FAIL;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                *DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        if (status == PASS) {
-                intr_status = intr_status_addresses[flash_bank];
-                iowrite32(ioread32(FlashReg + intr_status),
-                        FlashReg + intr_status);
-
-                iowrite32(1, FlashReg + DMA_ENABLE);
-                while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                        ;
-
-                iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-                index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-                ddma_trans(read_data, flash_add, flash_bank, 0, NumPages);
-
-                ecc_done_OR_dma_comp = 0;
-                while (1) {
-                        if (enable_ecc) {
-                                while (!ioread32(FlashReg + intr_status))
-                                        ;
-
-                                if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_ERR) {
-                                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                                FlashReg + intr_status);
-                                        status = do_ecc_new(flash_bank,
-                                                read_data, block, page);
-                                } else if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__DMA_CMD_COMP) {
-                                        iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                                FlashReg + intr_status);
-
-                                        if (1 == ecc_done_OR_dma_comp)
-                                                break;
-
-                                        ecc_done_OR_dma_comp = 1;
-                                } else if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE) {
-                                        iowrite32(
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE,
-                                        FlashReg + intr_status);
-
-                                        if (1 == ecc_done_OR_dma_comp)
-                                                break;
-
-                                        ecc_done_OR_dma_comp = 1;
-                                }
-                        } else {
-                                while (!(ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__DMA_CMD_COMP))
-                                        ;
-
-                                iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                        FlashReg + intr_status);
-                                break;
-                        }
-
-                        iowrite32((~INTR_STATUS0__ECC_ERR) &
-                                (~INTR_STATUS0__ECC_TRANSACTION_DONE) &
-                                (~INTR_STATUS0__DMA_CMD_COMP),
-                                FlashReg + intr_status);
-
-                }
-
-                iowrite32(ioread32(FlashReg + intr_status),
-                        FlashReg + intr_status);
-
-                iowrite32(0, FlashReg + DMA_ENABLE);
-
-                while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                        ;
-        }
-        return status;
-}
-
-u16 NAND_Read_Page_Main(u8 *read_data, u32 block, u16 page,
-                           u16 page_count)
-{
-        u32 status = PASS;
-        u64 flash_add;
-        u32 intr_status = 0;
-        u32 flash_bank;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        int ret;
-        u8 *read_data_l;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-        if (status != PASS)
-                return status;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        intr_status = intr_status_addresses[flash_bank];
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        if (page_count > 1) {
-                read_data_l = read_data;
-                while (page_count > MAX_PAGES_PER_RW) {
-                        if (ioread32(FlashReg + MULTIPLANE_OPERATION))
-                                status = NAND_Multiplane_Read(read_data_l,
-                                        block, page, MAX_PAGES_PER_RW);
-                        else
-                                status = NAND_Pipeline_Read_Ahead(
-                                        read_data_l, block, page,
-                                        MAX_PAGES_PER_RW);
-
-                        if (status == FAIL)
-                                return status;
-
-                        read_data_l += DeviceInfo.wPageDataSize *
-                                        MAX_PAGES_PER_RW;
-                        page_count -= MAX_PAGES_PER_RW;
-                        page += MAX_PAGES_PER_RW;
-                }
-                if (ioread32(FlashReg + MULTIPLANE_OPERATION))
-                        status = NAND_Multiplane_Read(read_data_l,
-                                        block, page, page_count);
-                else
-                        status = NAND_Pipeline_Read_Ahead(
-                                        read_data_l, block, page, page_count);
-
-                return status;
-        }
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        /* Fill the mrst_nand_info structure */
-        info.state = INT_READ_PAGE_MAIN;
-        info.read_data = read_data;
-        info.flash_bank = flash_bank;
-        info.block = block;
-        info.page = page;
-        info.ret = PASS;
-
-        ddma_trans(read_data, flash_add, flash_bank, 0, 1);
-
-        iowrite32(1, FlashReg + GLOBAL_INT_ENABLE); /* Enable Interrupt */
-
-        ret = wait_for_completion_timeout(&info.complete, 10 * HZ);
-        if (!ret) {
-                printk(KERN_ERR "Wait for completion timeout "
-                        "in %s, Line %d\n", __FILE__, __LINE__);
-                status = ERR;
-        } else {
-                status = info.ret;
-        }
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-        while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        return status;
-}
-
-void Conv_Spare_Data_Log2Phy_Format(u8 *data)
-{
-        int i;
-        const u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        const u32 PageSpareSize  = DeviceInfo.wPageSpareSize;
-
-        if (enable_ecc) {
-                for (i = spareFlagBytes - 1; i >= 0; i--)
-                        data[PageSpareSize - spareFlagBytes + i] = data[i];
-        }
-}
-
-void Conv_Spare_Data_Phy2Log_Format(u8 *data)
-{
-        int i;
-        const u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        const u32 PageSpareSize = DeviceInfo.wPageSpareSize;
-
-        if (enable_ecc) {
-                for (i = 0; i < spareFlagBytes; i++)
-                        data[i] = data[PageSpareSize - spareFlagBytes + i];
-        }
-}
-
-
-void Conv_Main_Spare_Data_Log2Phy_Format(u8 *data, u16 page_count)
-{
-        const u32 PageSize = DeviceInfo.wPageSize;
-        const u32 PageDataSize = DeviceInfo.wPageDataSize;
-        const u32 eccBytes = DeviceInfo.wECCBytesPerSector;
-        const u32 spareSkipBytes = DeviceInfo.wSpareSkipBytes;
-        const u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        u32 eccSectorSize;
-        u32 page_offset;
-        int i, j;
-
-        eccSectorSize = ECC_SECTOR_SIZE * (DeviceInfo.wDevicesConnected);
-        if (enable_ecc) {
-                while (page_count > 0) {
-                        page_offset = (page_count - 1) * PageSize;
-                        j = (DeviceInfo.wPageDataSize / eccSectorSize);
-                        for (i = spareFlagBytes - 1; i >= 0; i--)
-                                data[page_offset +
-                                        (eccSectorSize + eccBytes) * j + i] =
-                                        data[page_offset + PageDataSize + i];
-                        for (j--; j >= 1; j--) {
-                                for (i = eccSectorSize - 1; i >= 0; i--)
-                                        data[page_offset +
-                                        (eccSectorSize + eccBytes) * j + i] =
-                                                data[page_offset +
-                                                eccSectorSize * j + i];
-                        }
-                        for (i = (PageSize - spareSkipBytes) - 1;
-                                i >= PageDataSize; i--)
-                                data[page_offset + i + spareSkipBytes] =
-                                        data[page_offset + i];
-                        page_count--;
-                }
-        }
-}
-
-void Conv_Main_Spare_Data_Phy2Log_Format(u8 *data, u16 page_count)
-{
-        const u32 PageSize = DeviceInfo.wPageSize;
-        const u32 PageDataSize = DeviceInfo.wPageDataSize;
-        const u32 eccBytes = DeviceInfo.wECCBytesPerSector;
-        const u32 spareSkipBytes = DeviceInfo.wSpareSkipBytes;
-        const u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        u32 eccSectorSize;
-        u32 page_offset;
-        int i, j;
-
-        eccSectorSize = ECC_SECTOR_SIZE * (DeviceInfo.wDevicesConnected);
-        if (enable_ecc) {
-                while (page_count > 0) {
-                        page_offset = (page_count - 1) * PageSize;
-                        for (i = PageDataSize;
-                                i < PageSize - spareSkipBytes;
-                                i++)
-                                data[page_offset + i] =
-                                        data[page_offset + i +
-                                        spareSkipBytes];
-                        for (j = 1;
-                        j < DeviceInfo.wPageDataSize / eccSectorSize;
-                        j++) {
-                                for (i = 0; i < eccSectorSize; i++)
-                                        data[page_offset +
-                                        eccSectorSize * j + i] =
-                                                data[page_offset +
-                                                (eccSectorSize + eccBytes) * j
-                                                + i];
-                        }
-                        for (i = 0; i < spareFlagBytes; i++)
-                                data[page_offset + PageDataSize + i] =
-                                        data[page_offset +
-                                        (eccSectorSize + eccBytes) * j + i];
-                        page_count--;
-                }
-        }
-}
-
-/* Un-tested function */
-u16 NAND_Multiplane_Read(u8 *read_data, u32 block, u16 page,
-                            u16 page_count)
-{
-        u32 status = PASS;
-        u32 NumPages = page_count;
-        u64 flash_add;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u32 ecc_done_OR_dma_comp;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        if (status == PASS) {
-                intr_status = intr_status_addresses[flash_bank];
-                iowrite32(ioread32(FlashReg + intr_status),
-                        FlashReg + intr_status);
-
-                iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-                iowrite32(0x01, FlashReg + MULTIPLANE_OPERATION);
-
-                iowrite32(1, FlashReg + DMA_ENABLE);
-                while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                        ;
-                index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                        (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-                ddma_trans(read_data, flash_add, flash_bank, 0, NumPages);
-
-                ecc_done_OR_dma_comp = 0;
-                while (1) {
-                        if (enable_ecc) {
-                                while (!ioread32(FlashReg + intr_status))
-                                        ;
-
-                                if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_ERR) {
-                                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                                FlashReg + intr_status);
-                                        status = do_ecc_new(flash_bank,
-                                                read_data, block, page);
-                                } else if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__DMA_CMD_COMP) {
-                                        iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                                FlashReg + intr_status);
-
-                                        if (1 == ecc_done_OR_dma_comp)
-                                                break;
-
-                                        ecc_done_OR_dma_comp = 1;
-                                } else if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE) {
-                                        iowrite32(
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE,
-                                        FlashReg + intr_status);
-
-                                        if (1 == ecc_done_OR_dma_comp)
-                                                break;
-
-                                        ecc_done_OR_dma_comp = 1;
-                                }
-                        } else {
-                                while (!(ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__DMA_CMD_COMP))
-                                        ;
-                                iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                        FlashReg + intr_status);
-                                break;
-                        }
-
-                        iowrite32((~INTR_STATUS0__ECC_ERR) &
-                                (~INTR_STATUS0__ECC_TRANSACTION_DONE) &
-                                (~INTR_STATUS0__DMA_CMD_COMP),
-                                FlashReg + intr_status);
-
-                }
-
-                iowrite32(ioread32(FlashReg + intr_status),
-                        FlashReg + intr_status);
-
-                iowrite32(0, FlashReg + DMA_ENABLE);
-
-                while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                        ;
-
-                iowrite32(0, FlashReg + MULTIPLANE_OPERATION);
-        }
-
-        return status;
-}
-
-u16 NAND_Pipeline_Read_Ahead(u8 *read_data, u32 block,
-                                u16 page, u16 page_count)
-{
-        u32 status = PASS;
-        u32 NumPages = page_count;
-        u64 flash_add;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        int ret;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-
-        if (page_count < 2)
-                status = FAIL;
-
-        if (status != PASS)
-                return status;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                *DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        intr_status = intr_status_addresses[flash_bank];
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        /* Fill the mrst_nand_info structure */
-        info.state = INT_PIPELINE_READ_AHEAD;
-        info.read_data = read_data;
-        info.flash_bank = flash_bank;
-        info.block = block;
-        info.page = page;
-        info.ret = PASS;
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-
-        ddma_trans(read_data, flash_add, flash_bank, 0, NumPages);
-
-        iowrite32(1, FlashReg + GLOBAL_INT_ENABLE); /* Enable Interrupt */
-
-        ret = wait_for_completion_timeout(&info.complete, 10 * HZ);
-        if (!ret) {
-                printk(KERN_ERR "Wait for completion timeout "
-                        "in %s, Line %d\n", __FILE__, __LINE__);
-                status = ERR;
-        } else {
-                status = info.ret;
-        }
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-
-        while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        return status;
-}
-
-
-u16 NAND_Write_Page_Main(u8 *write_data, u32 block, u16 page,
-                            u16 page_count)
-{
-        u32 status = PASS;
-        u64 flash_add;
-        u32 intr_status = 0;
-        u32 flash_bank;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        int ret;
-        u8 *write_data_l;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-        if (status != PASS)
-                return status;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        intr_status = intr_status_addresses[flash_bank];
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        iowrite32(INTR_STATUS0__PROGRAM_COMP |
-                INTR_STATUS0__PROGRAM_FAIL, FlashReg + intr_status);
-
-        if (page_count > 1) {
-                write_data_l = write_data;
-                while (page_count > MAX_PAGES_PER_RW) {
-                        if (ioread32(FlashReg + MULTIPLANE_OPERATION))
-                                status = NAND_Multiplane_Write(write_data_l,
-                                        block, page, MAX_PAGES_PER_RW);
-                        else
-                                status = NAND_Pipeline_Write_Ahead(
-                                        write_data_l, block, page,
-                                        MAX_PAGES_PER_RW);
-                        if (status == FAIL)
-                                return status;
-
-                        write_data_l += DeviceInfo.wPageDataSize *
-                                        MAX_PAGES_PER_RW;
-                        page_count -= MAX_PAGES_PER_RW;
-                        page += MAX_PAGES_PER_RW;
-                }
-                if (ioread32(FlashReg + MULTIPLANE_OPERATION))
-                        status = NAND_Multiplane_Write(write_data_l,
-                                block, page, page_count);
-                else
-                        status = NAND_Pipeline_Write_Ahead(write_data_l,
-                                block, page, page_count);
-
-                return status;
-        }
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        /* Fill the mrst_nand_info structure */
-        info.state = INT_WRITE_PAGE_MAIN;
-        info.write_data = write_data;
-        info.flash_bank = flash_bank;
-        info.block = block;
-        info.page = page;
-        info.ret = PASS;
-
-        ddma_trans(write_data, flash_add, flash_bank, 1, 1);
-
-        iowrite32(1, FlashReg + GLOBAL_INT_ENABLE); /* Enable interrupt */
-
-        ret = wait_for_completion_timeout(&info.complete, 10 * HZ);
-        if (!ret) {
-                printk(KERN_ERR "Wait for completion timeout "
-                        "in %s, Line %d\n", __FILE__, __LINE__);
-                status = ERR;
-        } else {
-                status = info.ret;
-        }
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-        while (ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG)
-                ;
-
-        return status;
-}
-
-void NAND_ECC_Ctrl(int enable)
-{
-        if (enable) {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Will enable ECC in %s, Line %d, Function: %s\n",
-                        __FILE__, __LINE__, __func__);
-                iowrite32(1, FlashReg + ECC_ENABLE);
-                enable_ecc = 1;
-        } else {
-                nand_dbg_print(NAND_DBG_WARN,
-                        "Will disable ECC in %s, Line %d, Function: %s\n",
-                        __FILE__, __LINE__, __func__);
-                iowrite32(0, FlashReg + ECC_ENABLE);
-                enable_ecc = 0;
-        }
-}
-
-u16 NAND_Write_Page_Main_Spare(u8 *write_data, u32 block,
-                                        u16 page, u16 page_count)
-{
-        u32 status = PASS;
-        u32 i, j, page_num = 0;
-        u32 PageSize = DeviceInfo.wPageSize;
-        u32 PageDataSize = DeviceInfo.wPageDataSize;
-        u32 eccBytes = DeviceInfo.wECCBytesPerSector;
-        u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        u32 spareSkipBytes  = DeviceInfo.wSpareSkipBytes;
-        u64 flash_add;
-        u32 eccSectorSize;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u8 *page_main_spare = buf_write_page_main_spare;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        eccSectorSize = ECC_SECTOR_SIZE * (DeviceInfo.wDevicesConnected);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        if (status == PASS) {
-                intr_status = intr_status_addresses[flash_bank];
-
-                iowrite32(1, FlashReg + TRANSFER_SPARE_REG);
-
-                while ((status != FAIL) && (page_count > 0)) {
-                        flash_add = (u64)(block %
-                        (DeviceInfo.wTotalBlocks / totalUsedBanks)) *
-                        DeviceInfo.wBlockDataSize +
-                        (u64)page * DeviceInfo.wPageDataSize;
-
-                        iowrite32(ioread32(FlashReg + intr_status),
-                                FlashReg + intr_status);
-
-                        iowrite32((u32)(MODE_01 | (flash_bank << 24) |
-                                (flash_add >>
-                                DeviceInfo.nBitsInPageDataSize)),
-                                FlashMem);
-
-                        if (enable_ecc) {
-                                for (j = 0;
-                                     j <
-                                     DeviceInfo.wPageDataSize / eccSectorSize;
-                                     j++) {
-                                        for (i = 0; i < eccSectorSize; i++)
-                                                page_main_spare[(eccSectorSize +
-                                                                 eccBytes) * j +
-                                                                i] =
-                                                    write_data[eccSectorSize *
-                                                               j + i];
-
-                                        for (i = 0; i < eccBytes; i++)
-                                                page_main_spare[(eccSectorSize +
-                                                                 eccBytes) * j +
-                                                                eccSectorSize +
-                                                                i] =
-                                                    write_data[PageDataSize +
-                                                               spareFlagBytes +
-                                                               eccBytes * j +
-                                                               i];
-                                }
-
-                                for (i = 0; i < spareFlagBytes; i++)
-                                        page_main_spare[(eccSectorSize +
-                                                         eccBytes) * j + i] =
-                                            write_data[PageDataSize + i];
-
-                                for (i = PageSize - 1; i >= PageDataSize +
-                                                        spareSkipBytes; i--)
-                                        page_main_spare[i] = page_main_spare[i -
-                                                                spareSkipBytes];
-
-                                for (i = PageDataSize; i < PageDataSize +
-                                                        spareSkipBytes; i++)
-                                        page_main_spare[i] = 0xff;
-
-                                for (i = 0; i < PageSize / 4; i++)
-                                        iowrite32(
-                                        *((u32 *)page_main_spare + i),
-                                        FlashMem + 0x10);
-                        } else {
-
-                                for (i = 0; i < PageSize / 4; i++)
-                                        iowrite32(*((u32 *)write_data + i),
-                                                FlashMem + 0x10);
-                        }
-
-                        while (!(ioread32(FlashReg + intr_status) &
-                                (INTR_STATUS0__PROGRAM_COMP |
-                                INTR_STATUS0__PROGRAM_FAIL)))
-                                ;
-
-                        if (ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__PROGRAM_FAIL)
-                                status = FAIL;
-
-                        iowrite32(ioread32(FlashReg + intr_status),
-                                        FlashReg + intr_status);
-
-                        page_num++;
-                        page_count--;
-                        write_data += PageSize;
-                }
-
-                iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-        }
-
-        return status;
-}
-
-u16 NAND_Read_Page_Main_Spare(u8 *read_data, u32 block, u16 page,
-                                 u16 page_count)
-{
-        u32 status = PASS;
-        u32 i, j;
-        u64 flash_add = 0;
-        u32 PageSize = DeviceInfo.wPageSize;
-        u32 PageDataSize = DeviceInfo.wPageDataSize;
-        u32 PageSpareSize = DeviceInfo.wPageSpareSize;
-        u32 eccBytes = DeviceInfo.wECCBytesPerSector;
-        u32 spareFlagBytes = DeviceInfo.wNumPageSpareFlag;
-        u32 spareSkipBytes  = DeviceInfo.wSpareSkipBytes;
-        u32 eccSectorSize;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u8 *read_data_l = read_data;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u8 *page_main_spare = buf_read_page_main_spare;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        eccSectorSize = ECC_SECTOR_SIZE * (DeviceInfo.wDevicesConnected);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        if (status == PASS) {
-                intr_status = intr_status_addresses[flash_bank];
-
-                iowrite32(1, FlashReg + TRANSFER_SPARE_REG);
-
-                iowrite32(ioread32(FlashReg + intr_status),
-                                FlashReg + intr_status);
-
-                while ((status != FAIL) && (page_count > 0)) {
-                        flash_add = (u64)(block %
-                                (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                                * DeviceInfo.wBlockDataSize +
-                                (u64)page * DeviceInfo.wPageDataSize;
-
-                        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                                (flash_add >> DeviceInfo.nBitsInPageDataSize)),
-                                0x43);
-                        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                                (flash_add >> DeviceInfo.nBitsInPageDataSize)),
-                                0x2000 | page_count);
-
-                        while (!(ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__LOAD_COMP))
-                                ;
-
-                        iowrite32((u32)(MODE_01 | (flash_bank << 24) |
-                                (flash_add >>
-                                DeviceInfo.nBitsInPageDataSize)),
-                                FlashMem);
-
-                        for (i = 0; i < PageSize / 4; i++)
-                                *(((u32 *)page_main_spare) + i) =
-                                        ioread32(FlashMem + 0x10);
-
-                        if (enable_ecc) {
-                                for (i = PageDataSize;  i < PageSize -
-                                                        spareSkipBytes; i++)
-                                        page_main_spare[i] = page_main_spare[i +
-                                                                spareSkipBytes];
-
-                                for (j = 0;
-                                j < DeviceInfo.wPageDataSize / eccSectorSize;
-                                j++) {
-
-                                        for (i = 0; i < eccSectorSize; i++)
-                                                read_data_l[eccSectorSize * j +
-                                                            i] =
-                                                    page_main_spare[
-                                                        (eccSectorSize +
-                                                        eccBytes) * j + i];
-
-                                        for (i = 0; i < eccBytes; i++)
-                                                read_data_l[PageDataSize +
-                                                            spareFlagBytes +
-                                                            eccBytes * j + i] =
-                                                    page_main_spare[
-                                                        (eccSectorSize +
-                                                        eccBytes) * j +
-                                                        eccSectorSize + i];
-                                }
-
-                                for (i = 0; i < spareFlagBytes; i++)
-                                        read_data_l[PageDataSize + i] =
-                                            page_main_spare[(eccSectorSize +
-                                                             eccBytes) * j + i];
-                        } else {
-                                for (i = 0; i < (PageDataSize + PageSpareSize);
-                                     i++)
-                                        read_data_l[i] = page_main_spare[i];
-
-                        }
-
-                        if (enable_ecc) {
-                                while (!(ioread32(FlashReg + intr_status) &
-                                        (INTR_STATUS0__ECC_TRANSACTION_DONE |
-                                        INTR_STATUS0__ECC_ERR)))
-                                        ;
-
-                                if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_ERR) {
-                                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                                FlashReg + intr_status);
-                                        status = do_ecc_new(flash_bank,
-                                                read_data, block, page);
-                                }
-
-                                if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE &
-                                        INTR_STATUS0__ECC_ERR) {
-                                        iowrite32(INTR_STATUS0__ECC_ERR |
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE,
-                                        FlashReg + intr_status);
-                                } else if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE) {
-                                        iowrite32(
-                                        INTR_STATUS0__ECC_TRANSACTION_DONE,
-                                        FlashReg + intr_status);
-                                } else if (ioread32(FlashReg + intr_status) &
-                                        INTR_STATUS0__ECC_ERR) {
-                                        iowrite32(INTR_STATUS0__ECC_ERR,
-                                                FlashReg + intr_status);
-                                }
-                        }
-
-                        page++;
-                        page_count--;
-                        read_data_l += PageSize;
-                }
-        }
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-
-        return status;
-}
-
-u16 NAND_Pipeline_Write_Ahead(u8 *write_data, u32 block,
-                        u16 page, u16 page_count)
-{
-        u16 status = PASS;
-        u32 NumPages = page_count;
-        u64 flash_add;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        int ret;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-
-        if (page_count < 2)
-                status = FAIL;
-
-        if (status != PASS)
-                return status;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        intr_status = intr_status_addresses[flash_bank];
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        /* Fill the mrst_nand_info structure */
-        info.state = INT_PIPELINE_WRITE_AHEAD;
-        info.write_data = write_data;
-        info.flash_bank = flash_bank;
-        info.block = block;
-        info.page = page;
-        info.ret = PASS;
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-
-        ddma_trans(write_data, flash_add, flash_bank, 1, NumPages);
-
-        iowrite32(1, FlashReg + GLOBAL_INT_ENABLE); /* Enable interrupt */
-
-        ret = wait_for_completion_timeout(&info.complete, 10 * HZ);
-        if (!ret) {
-                printk(KERN_ERR "Wait for completion timeout "
-                        "in %s, Line %d\n", __FILE__, __LINE__);
-                status = ERR;
-        } else {
-                status = info.ret;
-        }
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-        while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        return status;
-}
-
-/* Un-tested function */
-u16 NAND_Multiplane_Write(u8 *write_data, u32 block, u16 page,
-                             u16 page_count)
-{
-        u16 status = PASS;
-        u32 NumPages = page_count;
-        u64 flash_add;
-        u32 flash_bank;
-        u32 intr_status = 0;
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u16 status2 = PASS;
-        u32 t;
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        status = Boundary_Check_Block_Page(block, page, page_count);
-        if (status != PASS)
-                return status;
-
-        flash_add = (u64)(block % (DeviceInfo.wTotalBlocks / totalUsedBanks))
-                * DeviceInfo.wBlockDataSize +
-                (u64)page * DeviceInfo.wPageDataSize;
-
-        flash_bank = block / (DeviceInfo.wTotalBlocks / totalUsedBanks);
-
-        intr_status = intr_status_addresses[flash_bank];
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-        iowrite32(0x01, FlashReg + MULTIPLANE_OPERATION);
-
-        iowrite32(1, FlashReg + DMA_ENABLE);
-        while (!(ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + TRANSFER_SPARE_REG);
-
-        index_addr((u32)(MODE_10 | (flash_bank << 24) |
-                (flash_add >> DeviceInfo.nBitsInPageDataSize)), 0x42);
-
-        ddma_trans(write_data, flash_add, flash_bank, 1, NumPages);
-
-        while (1) {
-                while (!ioread32(FlashReg + intr_status))
-                        ;
-
-                if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__DMA_CMD_COMP) {
-                        iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                FlashReg + intr_status);
-                        status = PASS;
-                        if (status2 == FAIL)
-                                status = FAIL;
-                        break;
-                } else if (ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__PROGRAM_FAIL) {
-                        status2 = FAIL;
-                        status = FAIL;
-                        t = ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__PROGRAM_FAIL;
-                        iowrite32(t, FlashReg + intr_status);
-                } else {
-                        iowrite32((~INTR_STATUS0__PROGRAM_FAIL) &
-                                (~INTR_STATUS0__DMA_CMD_COMP),
-                                FlashReg + intr_status);
-                }
-        }
-
-        iowrite32(ioread32(FlashReg + intr_status), FlashReg + intr_status);
-
-        iowrite32(0, FlashReg + DMA_ENABLE);
-
-        while ((ioread32(FlashReg + DMA_ENABLE) & DMA_ENABLE__FLAG))
-                ;
-
-        iowrite32(0, FlashReg + MULTIPLANE_OPERATION);
-
-        return status;
-}
-
-
-#if CMD_DMA
-static irqreturn_t cdma_isr(int irq, void *dev_id)
-{
-        struct mrst_nand_info *dev = dev_id;
-        int first_failed_cmd;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        if (!is_cdma_interrupt())
-                return IRQ_NONE;
-
-        /* Disable controller interrupts */
-        iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
-        GLOB_FTL_Event_Status(&first_failed_cmd);
-        complete(&dev->complete);
-
-        return IRQ_HANDLED;
-}
-#else
-static void handle_nand_int_read(struct mrst_nand_info *dev)
-{
-        u32 intr_status_addresses[4] = {INTR_STATUS0,
-                INTR_STATUS1, INTR_STATUS2, INTR_STATUS3};
-        u32 intr_status;
-        u32 ecc_done_OR_dma_comp = 0;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        dev->ret = PASS;
-        intr_status = intr_status_addresses[dev->flash_bank];
-
-        while (1) {
-                if (enable_ecc) {
-                        if (ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__ECC_ERR) {
-                                iowrite32(INTR_STATUS0__ECC_ERR,
-                                        FlashReg + intr_status);
-                                dev->ret = do_ecc_new(dev->flash_bank,
-                                                dev->read_data,
-                                                dev->block, dev->page);
-                        } else if (ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__DMA_CMD_COMP) {
-                                iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                        FlashReg + intr_status);
-                                if (1 == ecc_done_OR_dma_comp)
-                                        break;
-                                ecc_done_OR_dma_comp = 1;
-                        } else if (ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__ECC_TRANSACTION_DONE) {
-                                iowrite32(INTR_STATUS0__ECC_TRANSACTION_DONE,
-                                        FlashReg + intr_status);
-                                if (1 == ecc_done_OR_dma_comp)
-                                        break;
-                                ecc_done_OR_dma_comp = 1;
-                        }
-                } else {
-                        if (ioread32(FlashReg + intr_status) &
-                                INTR_STATUS0__DMA_CMD_COMP) {
-                                iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                        FlashReg + intr_status);
-                                break;
-                        } else {
-                                printk(KERN_ERR "Illegal INTS "
-                                        "(offset addr 0x%x) value: 0x%x\n",
-                                        intr_status,
-                                        ioread32(FlashReg + intr_status));
-                        }
-                }
-
-                iowrite32((~INTR_STATUS0__ECC_ERR) &
-                (~INTR_STATUS0__ECC_TRANSACTION_DONE) &
-                (~INTR_STATUS0__DMA_CMD_COMP),
-                FlashReg + intr_status);
-        }
-}
-
-static void handle_nand_int_write(struct mrst_nand_info *dev)
-{
-        u32 intr_status;
-        u32 intr[4] = {INTR_STATUS0, INTR_STATUS1,
-                INTR_STATUS2, INTR_STATUS3};
-        int status = PASS;
-
-        nand_dbg_print(NAND_DBG_DEBUG, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        dev->ret = PASS;
-        intr_status = intr[dev->flash_bank];
-
-        while (1) {
-                while (!ioread32(FlashReg + intr_status))
-                        ;
-
-                if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__DMA_CMD_COMP) {
-                        iowrite32(INTR_STATUS0__DMA_CMD_COMP,
-                                FlashReg + intr_status);
-                        if (FAIL == status)
-                                dev->ret = FAIL;
-                        break;
-                } else if (ioread32(FlashReg + intr_status) &
-                        INTR_STATUS0__PROGRAM_FAIL) {
-                        status = FAIL;
-                        iowrite32(INTR_STATUS0__PROGRAM_FAIL,
-                                FlashReg + intr_status);
-                } else {
-                        iowrite32((~INTR_STATUS0__PROGRAM_FAIL) &
-                                (~INTR_STATUS0__DMA_CMD_COMP),
-                                FlashReg + intr_status);
-                }
-        }
-}
-
-static irqreturn_t ddma_isr(int irq, void *dev_id)
-{
-        struct mrst_nand_info *dev = dev_id;
-        u32 int_mask, ints0, ints1, ints2, ints3, ints_offset;
-        u32 intr[4] = {INTR_STATUS0, INTR_STATUS1,
-                INTR_STATUS2, INTR_STATUS3};
-
-        int_mask = INTR_STATUS0__DMA_CMD_COMP |
-                INTR_STATUS0__ECC_TRANSACTION_DONE |
-                INTR_STATUS0__ECC_ERR |
-                INTR_STATUS0__PROGRAM_FAIL |
-                INTR_STATUS0__ERASE_FAIL;
-
-        ints0 = ioread32(FlashReg + INTR_STATUS0);
-        ints1 = ioread32(FlashReg + INTR_STATUS1);
-        ints2 = ioread32(FlashReg + INTR_STATUS2);
-        ints3 = ioread32(FlashReg + INTR_STATUS3);
-
-        ints_offset = intr[dev->flash_bank];
-
-        nand_dbg_print(NAND_DBG_DEBUG,
-                "INTR0: 0x%x, INTR1: 0x%x, INTR2: 0x%x, INTR3: 0x%x, "
-                "DMA_INTR: 0x%x, "
-                "dev->state: 0x%x, dev->flash_bank: %d\n",
-                ints0, ints1, ints2, ints3,
-                ioread32(FlashReg + DMA_INTR),
-                dev->state, dev->flash_bank);
-
-        if (!(ioread32(FlashReg + ints_offset) & int_mask)) {
-                iowrite32(ints0, FlashReg + INTR_STATUS0);
-                iowrite32(ints1, FlashReg + INTR_STATUS1);
-                iowrite32(ints2, FlashReg + INTR_STATUS2);
-                iowrite32(ints3, FlashReg + INTR_STATUS3);
-                nand_dbg_print(NAND_DBG_WARN,
-                        "ddma_isr: Invalid interrupt for NAND controller. "
-                        "Ignore it\n");
-                return IRQ_NONE;
-        }
-
-        switch (dev->state) {
-        case INT_READ_PAGE_MAIN:
-        case INT_PIPELINE_READ_AHEAD:
-                /* Disable controller interrupts */
-                iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
-                handle_nand_int_read(dev);
-                break;
-        case INT_WRITE_PAGE_MAIN:
-        case INT_PIPELINE_WRITE_AHEAD:
-                iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
-                handle_nand_int_write(dev);
-                break;
-        default:
-                printk(KERN_ERR "ddma_isr - Illegal state: 0x%x\n",
-                        dev->state);
-                return IRQ_NONE;
-        }
-
-        dev->state = INT_IDLE_STATE;
-        complete(&dev->complete);
-        return IRQ_HANDLED;
-}
-#endif
-
-static const struct pci_device_id nand_pci_ids[] = {
-        {
-         .vendor = 0x8086,
-         .device = 0x0809,
-         .subvendor = PCI_ANY_ID,
-         .subdevice = PCI_ANY_ID,
-         },
-        { /* end: all zeroes */ }
-};
-
-static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
-{
-        int ret = -ENODEV;
-        unsigned long csr_base;
-        unsigned long csr_len;
-        struct mrst_nand_info *pndev = &info;
-        u32 int_mask;
-
-        ret = pci_enable_device(dev);
-        if (ret) {
-                printk(KERN_ERR "Spectra: pci_enable_device failed.\n");
-                return ret;
-        }
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        FlashReg = ioremap_nocache(GLOB_HWCTL_REG_BASE,
-                        GLOB_HWCTL_REG_SIZE);
-        if (!FlashReg) {
-                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
-                goto failed_disable;
-        }
-        nand_dbg_print(NAND_DBG_WARN,
-                "Spectra: Remapped reg base address: "
-                "0x%p, len: %d\n",
-                FlashReg, GLOB_HWCTL_REG_SIZE);
-
-        FlashMem = ioremap_nocache(GLOB_HWCTL_MEM_BASE,
-                        GLOB_HWCTL_MEM_SIZE);
-        if (!FlashMem) {
-                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
-                iounmap(FlashReg);
-                goto failed_disable;
-        }
-        nand_dbg_print(NAND_DBG_WARN,
-                "Spectra: Remapped flash base address: "
-                "0x%p, len: %d\n",
-                (void *)FlashMem, GLOB_HWCTL_MEM_SIZE);
-
-        nand_dbg_print(NAND_DBG_DEBUG, "Dump timing register values:"
-                        "acc_clks: %d, re_2_we: %d, we_2_re: %d,"
-                        "addr_2_data: %d, rdwr_en_lo_cnt: %d, "
-                        "rdwr_en_hi_cnt: %d, cs_setup_cnt: %d\n",
-                        ioread32(FlashReg + ACC_CLKS),
-                        ioread32(FlashReg + RE_2_WE),
-                        ioread32(FlashReg + WE_2_RE),
-                        ioread32(FlashReg + ADDR_2_DATA),
-                        ioread32(FlashReg + RDWR_EN_LO_CNT),
-                        ioread32(FlashReg + RDWR_EN_HI_CNT),
-                        ioread32(FlashReg + CS_SETUP_CNT));
-
-        NAND_Flash_Reset();
-
-        iowrite32(0, FlashReg + GLOBAL_INT_ENABLE);
-
-#if CMD_DMA
-        info.pcmds_num = 0;
-        info.flash_bank = 0;
-        info.cdma_num = 0;
-        int_mask = (DMA_INTR__DESC_COMP_CHANNEL0 |
-                DMA_INTR__DESC_COMP_CHANNEL1 |
-                DMA_INTR__DESC_COMP_CHANNEL2 |
-                DMA_INTR__DESC_COMP_CHANNEL3 |
-                DMA_INTR__MEMCOPY_DESC_COMP);
-        iowrite32(int_mask, FlashReg + DMA_INTR_EN);
-        iowrite32(0xFFFF, FlashReg + DMA_INTR);
-
-        int_mask = (INTR_STATUS0__ECC_ERR |
-                INTR_STATUS0__PROGRAM_FAIL |
-                INTR_STATUS0__ERASE_FAIL);
-#else
-        int_mask = INTR_STATUS0__DMA_CMD_COMP |
-                INTR_STATUS0__ECC_TRANSACTION_DONE |
-                INTR_STATUS0__ECC_ERR |
-                INTR_STATUS0__PROGRAM_FAIL |
-                INTR_STATUS0__ERASE_FAIL;
-#endif
-        iowrite32(int_mask, FlashReg + INTR_EN0);
-        iowrite32(int_mask, FlashReg + INTR_EN1);
-        iowrite32(int_mask, FlashReg + INTR_EN2);
-        iowrite32(int_mask, FlashReg + INTR_EN3);
-
-        /* Clear all status bits */
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS0);
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS1);
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS2);
-        iowrite32(0xFFFF, FlashReg + INTR_STATUS3);
-
-        iowrite32(0x0F, FlashReg + RB_PIN_ENABLED);
-        iowrite32(CHIP_EN_DONT_CARE__FLAG, FlashReg + CHIP_ENABLE_DONT_CARE);
-
-        /* Should set value for these registers when init */
-        iowrite32(0, FlashReg + TWO_ROW_ADDR_CYCLES);
-        iowrite32(1, FlashReg + ECC_ENABLE);
-        enable_ecc = 1;
-
-        pci_set_master(dev);
-        pndev->dev = dev;
-
-        csr_base = pci_resource_start(dev, 0);
-        if (!csr_base) {
-                printk(KERN_ERR "Spectra: pci_resource_start failed!\n");
-                ret = -ENODEV;
-                goto failed_req_csr;
-        }
-
-        csr_len = pci_resource_len(dev, 0);
-        if (!csr_len) {
-                printk(KERN_ERR "Spectra: pci_resource_len failed!\n");
-                ret = -ENODEV;
-                goto failed_req_csr;
-        }
-
-        ret = pci_request_regions(dev, SPECTRA_NAND_NAME);
-        if (ret) {
-                printk(KERN_ERR "Spectra: Unable to request "
-                       "memory region\n");
-                goto failed_req_csr;
-        }
-
-        pndev->ioaddr = ioremap_nocache(csr_base, csr_len);
-        if (!pndev->ioaddr) {
-                printk(KERN_ERR "Spectra: Unable to remap memory region\n");
-                ret = -ENOMEM;
-                goto failed_remap_csr;
-        }
-        nand_dbg_print(NAND_DBG_DEBUG, "Spectra: CSR 0x%08lx -> 0x%p (0x%lx)\n",
-                       csr_base, pndev->ioaddr, csr_len);
-
-        init_completion(&pndev->complete);
-        nand_dbg_print(NAND_DBG_DEBUG, "Spectra: IRQ %d\n", dev->irq);
-
-#if CMD_DMA
-        if (request_irq(dev->irq, cdma_isr, IRQF_SHARED,
-                        SPECTRA_NAND_NAME, &info)) {
-                printk(KERN_ERR "Spectra: Unable to allocate IRQ\n");
-                ret = -ENODEV;
-                iounmap(pndev->ioaddr);
-                goto failed_remap_csr;
-        }
-#else
-        if (request_irq(dev->irq, ddma_isr, IRQF_SHARED,
-                        SPECTRA_NAND_NAME, &info)) {
-                printk(KERN_ERR "Spectra: Unable to allocate IRQ\n");
-                ret = -ENODEV;
-                iounmap(pndev->ioaddr);
-                goto failed_remap_csr;
-        }
-#endif
-
-        pci_set_drvdata(dev, pndev);
-
-        ret = GLOB_LLD_Read_Device_ID();
-        if (ret) {
-                iounmap(pndev->ioaddr);
-                goto failed_remap_csr;
-        }
-
-        ret = register_spectra_ftl();
-        if (ret) {
-                iounmap(pndev->ioaddr);
-                goto failed_remap_csr;
-        }
-
-        return 0;
-
-failed_remap_csr:
-        pci_release_regions(dev);
-failed_req_csr:
-        iounmap(FlashMem);
-        iounmap(FlashReg);
-failed_disable:
-        pci_disable_device(dev);
-
-        return ret;
-}
-
-static void nand_pci_remove(struct pci_dev *dev)
-{
-        struct mrst_nand_info *pndev = pci_get_drvdata(dev);
-
-        nand_dbg_print(NAND_DBG_WARN, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-#if CMD_DMA
-        free_irq(dev->irq, pndev);
-#endif
-        iounmap(pndev->ioaddr);
-        pci_release_regions(dev);
-        pci_disable_device(dev);
-}
-
-MODULE_DEVICE_TABLE(pci, nand_pci_ids);
-
-static struct pci_driver nand_pci_driver = {
-        .name = SPECTRA_NAND_NAME,
-        .id_table = nand_pci_ids,
-        .probe = nand_pci_probe,
-        .remove = nand_pci_remove,
-};
-
-int NAND_Flash_Init(void)
-{
-        int retval;
-
-        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
-                       __FILE__, __LINE__, __func__);
-
-        retval = pci_register_driver(&nand_pci_driver);
-        if (retval)
-                return -ENOMEM;
-
-        return PASS;
-}
-
-/* Free memory */
-int nand_release_spectra(void)
-{
-        pci_unregister_driver(&nand_pci_driver);
-        iounmap(FlashMem);
-        iounmap(FlashReg);
-
-        return 0;
-}
-
-
-
diff --git a/drivers/staging/spectra/lld_nand.h b/drivers/staging/spectra/lld_nand.h
deleted file mode 100644
index d08388287da8..000000000000
--- a/drivers/staging/spectra/lld_nand.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _LLD_NAND_
-#define _LLD_NAND_
-
-#ifdef ELDORA
-#include "defs.h"
-#else
-#include "flash.h"
-#include "ffsport.h"
-#endif
-
-#define MODE_00    0x00000000
-#define MODE_01    0x04000000
-#define MODE_10    0x08000000
-#define MODE_11    0x0C000000
-
-
-#define DATA_TRANSFER_MODE              0
-#define PROTECTION_PER_BLOCK            1
-#define LOAD_WAIT_COUNT                 2
-#define PROGRAM_WAIT_COUNT              3
-#define ERASE_WAIT_COUNT                4
-#define INT_MONITOR_CYCLE_COUNT         5
-#define READ_BUSY_PIN_ENABLED           6
-#define MULTIPLANE_OPERATION_SUPPORT    7
-#define PRE_FETCH_MODE                  8
-#define CE_DONT_CARE_SUPPORT            9
-#define COPYBACK_SUPPORT                10
-#define CACHE_WRITE_SUPPORT             11
-#define CACHE_READ_SUPPORT              12
-#define NUM_PAGES_IN_BLOCK              13
-#define ECC_ENABLE_SELECT               14
-#define WRITE_ENABLE_2_READ_ENABLE      15
-#define ADDRESS_2_DATA                  16
-#define READ_ENABLE_2_WRITE_ENABLE      17
-#define TWO_ROW_ADDRESS_CYCLES          18
-#define MULTIPLANE_ADDRESS_RESTRICT     19
-#define ACC_CLOCKS                      20
-#define READ_WRITE_ENABLE_LOW_COUNT     21
-#define READ_WRITE_ENABLE_HIGH_COUNT    22
-
-#define ECC_SECTOR_SIZE     512
-#define LLD_MAX_FLASH_BANKS     4
-
-struct mrst_nand_info {
-        struct pci_dev *dev;
-        u32 state;
-        u32 flash_bank;
-        u8 *read_data;
-        u8 *write_data;
-        u32 block;
-        u16 page;
-        u32 use_dma;
-        void __iomem *ioaddr;  /* Mapped io reg base address */
-        int ret;
-        u32 pcmds_num;
-        struct pending_cmd *pcmds;
-        int cdma_num;           /* CDMA descriptor number in this chan */
-        u8 *cdma_desc_buf;      /* CDMA descriptor table */
-        u8 *memcp_desc_buf;     /* Memory copy descriptor table */
-        dma_addr_t cdma_desc;   /* Mapped CDMA descriptor table */
-        dma_addr_t memcp_desc;  /* Mapped memory copy descriptor table */
-        struct completion complete;
-};
-
-int NAND_Flash_Init(void);
-int nand_release_spectra(void);
-u16  NAND_Flash_Reset(void);
-u16  NAND_Read_Device_ID(void);
-u16  NAND_Erase_Block(u32 flash_add);
-u16  NAND_Write_Page_Main(u8 *write_data, u32 block, u16 page,
-                                u16 page_count);
-u16  NAND_Read_Page_Main(u8 *read_data, u32 block, u16 page,
-                                u16 page_count);
-u16  NAND_UnlockArrayAll(void);
-u16  NAND_Write_Page_Main_Spare(u8 *write_data, u32 block,
-                                u16 page, u16 page_count);
-u16  NAND_Write_Page_Spare(u8 *read_data, u32 block, u16 page,
-                                u16 page_count);
-u16  NAND_Read_Page_Main_Spare(u8 *read_data, u32 block, u16 page,
-                                u16 page_count);
-u16  NAND_Read_Page_Spare(u8 *read_data, u32 block, u16 page,
-                                u16 page_count);
-void NAND_LLD_Enable_Disable_Interrupts(u16 INT_ENABLE);
-u16  NAND_Get_Bad_Block(u32 block);
-u16  NAND_Pipeline_Read_Ahead(u8 *read_data, u32 block, u16 page,
-                                u16 page_count);
-u16  NAND_Pipeline_Write_Ahead(u8 *write_data, u32 block,
-                                u16 page, u16 page_count);
-u16  NAND_Multiplane_Read(u8 *read_data, u32 block, u16 page,
-                                u16 page_count);
-u16  NAND_Multiplane_Write(u8 *write_data, u32 block, u16 page,
-                                u16 page_count);
-void NAND_ECC_Ctrl(int enable);
-u16 NAND_Read_Page_Main_Polling(u8 *read_data,
-                u32 block, u16 page, u16 page_count);
-u16 NAND_Pipeline_Read_Ahead_Polling(u8 *read_data,
-                        u32 block, u16 page, u16 page_count);
-void Conv_Spare_Data_Log2Phy_Format(u8 *data);
-void Conv_Spare_Data_Phy2Log_Format(u8 *data);
-void Conv_Main_Spare_Data_Log2Phy_Format(u8 *data, u16 page_count);
-void Conv_Main_Spare_Data_Phy2Log_Format(u8 *data, u16 page_count);
-
-extern void __iomem *FlashReg;
-extern void __iomem *FlashMem;
-
-extern int totalUsedBanks;
-extern u32 GLOB_valid_banks[LLD_MAX_FLASH_BANKS];
-
-#endif /*_LLD_NAND_*/
-
-
-
diff --git a/drivers/staging/spectra/nand_regs.h b/drivers/staging/spectra/nand_regs.h
deleted file mode 100644
index e192e4ae8c1e..000000000000
--- a/drivers/staging/spectra/nand_regs.h
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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.
- *
- */
-
-#define DEVICE_RESET                            0x0
-#define     DEVICE_RESET__BANK0                         0x0001
-#define     DEVICE_RESET__BANK1                         0x0002
-#define     DEVICE_RESET__BANK2                         0x0004
-#define     DEVICE_RESET__BANK3                         0x0008
-
-#define TRANSFER_SPARE_REG                      0x10
-#define     TRANSFER_SPARE_REG__FLAG                    0x0001
-
-#define LOAD_WAIT_CNT                           0x20
-#define     LOAD_WAIT_CNT__VALUE                                0xffff
-
-#define PROGRAM_WAIT_CNT                        0x30
-#define     PROGRAM_WAIT_CNT__VALUE                     0xffff
-
-#define ERASE_WAIT_CNT                          0x40
-#define     ERASE_WAIT_CNT__VALUE                       0xffff
-
-#define INT_MON_CYCCNT                          0x50
-#define     INT_MON_CYCCNT__VALUE                       0xffff
-
-#define RB_PIN_ENABLED                          0x60
-#define     RB_PIN_ENABLED__BANK0                       0x0001
-#define     RB_PIN_ENABLED__BANK1                       0x0002
-#define     RB_PIN_ENABLED__BANK2                       0x0004
-#define     RB_PIN_ENABLED__BANK3                       0x0008
-
-#define MULTIPLANE_OPERATION                    0x70
-#define     MULTIPLANE_OPERATION__FLAG                  0x0001
-
-#define MULTIPLANE_READ_ENABLE                  0x80
-#define     MULTIPLANE_READ_ENABLE__FLAG                0x0001
-
-#define COPYBACK_DISABLE                        0x90
-#define     COPYBACK_DISABLE__FLAG                      0x0001
-
-#define CACHE_WRITE_ENABLE                      0xa0
-#define     CACHE_WRITE_ENABLE__FLAG                    0x0001
-
-#define CACHE_READ_ENABLE                       0xb0
-#define     CACHE_READ_ENABLE__FLAG                     0x0001
-
-#define PREFETCH_MODE                           0xc0
-#define     PREFETCH_MODE__PREFETCH_EN                  0x0001
-#define     PREFETCH_MODE__PREFETCH_BURST_LENGTH        0xfff0
-
-#define CHIP_ENABLE_DONT_CARE                   0xd0
-#define     CHIP_EN_DONT_CARE__FLAG                     0x01
-
-#define ECC_ENABLE                              0xe0
-#define     ECC_ENABLE__FLAG                            0x0001
-
-#define GLOBAL_INT_ENABLE                       0xf0
-#define     GLOBAL_INT_EN_FLAG                          0x01
-
-#define WE_2_RE                                 0x100
-#define     WE_2_RE__VALUE                              0x003f
-
-#define ADDR_2_DATA                             0x110
-#define     ADDR_2_DATA__VALUE                          0x003f
-
-#define RE_2_WE                                 0x120
-#define     RE_2_WE__VALUE                              0x003f
-
-#define ACC_CLKS                                0x130
-#define     ACC_CLKS__VALUE                             0x000f
-
-#define NUMBER_OF_PLANES                        0x140
-#define     NUMBER_OF_PLANES__VALUE                     0x0007
-
-#define PAGES_PER_BLOCK                         0x150
-#define     PAGES_PER_BLOCK__VALUE                      0xffff
-
-#define DEVICE_WIDTH                            0x160
-#define     DEVICE_WIDTH__VALUE                         0x0003
-
-#define DEVICE_MAIN_AREA_SIZE                   0x170
-#define     DEVICE_MAIN_AREA_SIZE__VALUE                0xffff
-
-#define DEVICE_SPARE_AREA_SIZE                  0x180
-#define     DEVICE_SPARE_AREA_SIZE__VALUE               0xffff
-
-#define TWO_ROW_ADDR_CYCLES                     0x190
-#define     TWO_ROW_ADDR_CYCLES__FLAG                   0x0001
-
-#define MULTIPLANE_ADDR_RESTRICT                0x1a0
-#define     MULTIPLANE_ADDR_RESTRICT__FLAG              0x0001
-
-#define ECC_CORRECTION                          0x1b0
-#define     ECC_CORRECTION__VALUE                       0x001f
-
-#define READ_MODE                               0x1c0
-#define     READ_MODE__VALUE                            0x000f
-
-#define WRITE_MODE                              0x1d0
-#define     WRITE_MODE__VALUE                           0x000f
-
-#define COPYBACK_MODE                           0x1e0
-#define     COPYBACK_MODE__VALUE                        0x000f
-
-#define RDWR_EN_LO_CNT                          0x1f0
-#define     RDWR_EN_LO_CNT__VALUE                       0x001f
-
-#define RDWR_EN_HI_CNT                          0x200
-#define     RDWR_EN_HI_CNT__VALUE                       0x001f
-
-#define MAX_RD_DELAY                            0x210
-#define     MAX_RD_DELAY__VALUE                         0x000f
-
-#define CS_SETUP_CNT                            0x220
-#define     CS_SETUP_CNT__VALUE                         0x001f
-
-#define SPARE_AREA_SKIP_BYTES                   0x230
-#define     SPARE_AREA_SKIP_BYTES__VALUE                0x003f
-
-#define SPARE_AREA_MARKER                       0x240
-#define     SPARE_AREA_MARKER__VALUE                    0xffff
-
-#define DEVICES_CONNECTED                       0x250
-#define     DEVICES_CONNECTED__VALUE                    0x0007
-
-#define DIE_MASK                                        0x260
-#define     DIE_MASK__VALUE                             0x00ff
-
-#define FIRST_BLOCK_OF_NEXT_PLANE               0x270
-#define     FIRST_BLOCK_OF_NEXT_PLANE__VALUE            0xffff
-
-#define WRITE_PROTECT                           0x280
-#define     WRITE_PROTECT__FLAG                         0x0001
-
-#define RE_2_RE                                 0x290
-#define     RE_2_RE__VALUE                              0x003f
-
-#define MANUFACTURER_ID                 0x300
-#define     MANUFACTURER_ID__VALUE                      0x00ff
-
-#define DEVICE_ID                               0x310
-#define     DEVICE_ID__VALUE                            0x00ff
-
-#define DEVICE_PARAM_0                          0x320
-#define     DEVICE_PARAM_0__VALUE                       0x00ff
-
-#define DEVICE_PARAM_1                          0x330
-#define     DEVICE_PARAM_1__VALUE                       0x00ff
-
-#define DEVICE_PARAM_2                          0x340
-#define     DEVICE_PARAM_2__VALUE                       0x00ff
-
-#define LOGICAL_PAGE_DATA_SIZE                  0x350
-#define     LOGICAL_PAGE_DATA_SIZE__VALUE               0xffff
-
-#define LOGICAL_PAGE_SPARE_SIZE                 0x360
-#define     LOGICAL_PAGE_SPARE_SIZE__VALUE              0xffff
-
-#define REVISION                                        0x370
-#define     REVISION__VALUE                             0xffff
-
-#define ONFI_DEVICE_FEATURES                    0x380
-#define     ONFI_DEVICE_FEATURES__VALUE                 0x003f
-
-#define ONFI_OPTIONAL_COMMANDS          0x390
-#define     ONFI_OPTIONAL_COMMANDS__VALUE               0x003f
-
-#define ONFI_TIMING_MODE                        0x3a0
-#define     ONFI_TIMING_MODE__VALUE                     0x003f
-
-#define ONFI_PGM_CACHE_TIMING_MODE              0x3b0
-#define     ONFI_PGM_CACHE_TIMING_MODE__VALUE           0x003f
-
-#define ONFI_DEVICE_NO_OF_LUNS                  0x3c0
-#define     ONFI_DEVICE_NO_OF_LUNS__NO_OF_LUNS          0x00ff
-#define     ONFI_DEVICE_NO_OF_LUNS__ONFI_DEVICE         0x0100
-
-#define ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_L      0x3d0
-#define     ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_L__VALUE   0xffff
-
-#define ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_U      0x3e0
-#define     ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_U__VALUE   0xffff
-
-#define FEATURES                                        0x3f0
-#define     FEATURES__N_BANKS                           0x0003
-#define     FEATURES__ECC_MAX_ERR                       0x003c
-#define     FEATURES__DMA                                       0x0040
-#define     FEATURES__CMD_DMA                           0x0080
-#define     FEATURES__PARTITION                         0x0100
-#define     FEATURES__XDMA_SIDEBAND                     0x0200
-#define     FEATURES__GPREG                             0x0400
-#define     FEATURES__INDEX_ADDR                                0x0800
-
-#define TRANSFER_MODE                           0x400
-#define     TRANSFER_MODE__VALUE                        0x0003
-
-#define INTR_STATUS0                            0x410
-#define     INTR_STATUS0__ECC_TRANSACTION_DONE          0x0001
-#define     INTR_STATUS0__ECC_ERR                       0x0002
-#define     INTR_STATUS0__DMA_CMD_COMP                  0x0004
-#define     INTR_STATUS0__TIME_OUT                      0x0008
-#define     INTR_STATUS0__PROGRAM_FAIL                  0x0010
-#define     INTR_STATUS0__ERASE_FAIL                    0x0020
-#define     INTR_STATUS0__LOAD_COMP                     0x0040
-#define     INTR_STATUS0__PROGRAM_COMP                  0x0080
-#define     INTR_STATUS0__ERASE_COMP                    0x0100
-#define     INTR_STATUS0__PIPE_CPYBCK_CMD_COMP          0x0200
-#define     INTR_STATUS0__LOCKED_BLK                    0x0400
-#define     INTR_STATUS0__UNSUP_CMD                     0x0800
-#define     INTR_STATUS0__INT_ACT                       0x1000
-#define     INTR_STATUS0__RST_COMP                      0x2000
-#define     INTR_STATUS0__PIPE_CMD_ERR                  0x4000
-#define     INTR_STATUS0__PAGE_XFER_INC                 0x8000
-
-#define INTR_EN0                                        0x420
-#define     INTR_EN0__ECC_TRANSACTION_DONE              0x0001
-#define     INTR_EN0__ECC_ERR                           0x0002
-#define     INTR_EN0__DMA_CMD_COMP                      0x0004
-#define     INTR_EN0__TIME_OUT                          0x0008
-#define     INTR_EN0__PROGRAM_FAIL                      0x0010
-#define     INTR_EN0__ERASE_FAIL                                0x0020
-#define     INTR_EN0__LOAD_COMP                         0x0040
-#define     INTR_EN0__PROGRAM_COMP                      0x0080
-#define     INTR_EN0__ERASE_COMP                                0x0100
-#define     INTR_EN0__PIPE_CPYBCK_CMD_COMP              0x0200
-#define     INTR_EN0__LOCKED_BLK                                0x0400
-#define     INTR_EN0__UNSUP_CMD                         0x0800
-#define     INTR_EN0__INT_ACT                           0x1000
-#define     INTR_EN0__RST_COMP                          0x2000
-#define     INTR_EN0__PIPE_CMD_ERR                      0x4000
-#define     INTR_EN0__PAGE_XFER_INC                     0x8000
-
-#define PAGE_CNT0                               0x430
-#define     PAGE_CNT0__VALUE                            0x00ff
-
-#define ERR_PAGE_ADDR0                          0x440
-#define     ERR_PAGE_ADDR0__VALUE                       0xffff
-
-#define ERR_BLOCK_ADDR0                 0x450
-#define     ERR_BLOCK_ADDR0__VALUE                      0xffff
-
-#define INTR_STATUS1                            0x460
-#define     INTR_STATUS1__ECC_TRANSACTION_DONE          0x0001
-#define     INTR_STATUS1__ECC_ERR                       0x0002
-#define     INTR_STATUS1__DMA_CMD_COMP                  0x0004
-#define     INTR_STATUS1__TIME_OUT                      0x0008
-#define     INTR_STATUS1__PROGRAM_FAIL                  0x0010
-#define     INTR_STATUS1__ERASE_FAIL                    0x0020
-#define     INTR_STATUS1__LOAD_COMP                     0x0040
-#define     INTR_STATUS1__PROGRAM_COMP                  0x0080
-#define     INTR_STATUS1__ERASE_COMP                    0x0100
-#define     INTR_STATUS1__PIPE_CPYBCK_CMD_COMP          0x0200
-#define     INTR_STATUS1__LOCKED_BLK                    0x0400
-#define     INTR_STATUS1__UNSUP_CMD                     0x0800
-#define     INTR_STATUS1__INT_ACT                       0x1000
-#define     INTR_STATUS1__RST_COMP                      0x2000
-#define     INTR_STATUS1__PIPE_CMD_ERR                  0x4000
-#define     INTR_STATUS1__PAGE_XFER_INC                 0x8000
-
-#define INTR_EN1                                        0x470
-#define     INTR_EN1__ECC_TRANSACTION_DONE              0x0001
-#define     INTR_EN1__ECC_ERR                           0x0002
-#define     INTR_EN1__DMA_CMD_COMP                      0x0004
-#define     INTR_EN1__TIME_OUT                          0x0008
-#define     INTR_EN1__PROGRAM_FAIL                      0x0010
-#define     INTR_EN1__ERASE_FAIL                                0x0020
-#define     INTR_EN1__LOAD_COMP                         0x0040
-#define     INTR_EN1__PROGRAM_COMP                      0x0080
-#define     INTR_EN1__ERASE_COMP                                0x0100
-#define     INTR_EN1__PIPE_CPYBCK_CMD_COMP              0x0200
-#define     INTR_EN1__LOCKED_BLK                                0x0400
-#define     INTR_EN1__UNSUP_CMD                         0x0800
-#define     INTR_EN1__INT_ACT                           0x1000
-#define     INTR_EN1__RST_COMP                          0x2000
-#define     INTR_EN1__PIPE_CMD_ERR                      0x4000
-#define     INTR_EN1__PAGE_XFER_INC                     0x8000
-
-#define PAGE_CNT1                               0x480
-#define     PAGE_CNT1__VALUE                            0x00ff
-
-#define ERR_PAGE_ADDR1                          0x490
-#define     ERR_PAGE_ADDR1__VALUE                       0xffff
-
-#define ERR_BLOCK_ADDR1                 0x4a0
-#define     ERR_BLOCK_ADDR1__VALUE                      0xffff
-
-#define INTR_STATUS2                            0x4b0
-#define     INTR_STATUS2__ECC_TRANSACTION_DONE          0x0001
-#define     INTR_STATUS2__ECC_ERR                       0x0002
-#define     INTR_STATUS2__DMA_CMD_COMP                  0x0004
-#define     INTR_STATUS2__TIME_OUT                      0x0008
-#define     INTR_STATUS2__PROGRAM_FAIL                  0x0010
-#define     INTR_STATUS2__ERASE_FAIL                    0x0020
-#define     INTR_STATUS2__LOAD_COMP                     0x0040
-#define     INTR_STATUS2__PROGRAM_COMP                  0x0080
-#define     INTR_STATUS2__ERASE_COMP                    0x0100
-#define     INTR_STATUS2__PIPE_CPYBCK_CMD_COMP          0x0200
-#define     INTR_STATUS2__LOCKED_BLK                    0x0400
-#define     INTR_STATUS2__UNSUP_CMD                     0x0800
-#define     INTR_STATUS2__INT_ACT                       0x1000
-#define     INTR_STATUS2__RST_COMP                      0x2000
-#define     INTR_STATUS2__PIPE_CMD_ERR                  0x4000
-#define     INTR_STATUS2__PAGE_XFER_INC                 0x8000
-
-#define INTR_EN2                                        0x4c0
-#define     INTR_EN2__ECC_TRANSACTION_DONE              0x0001
-#define     INTR_EN2__ECC_ERR                           0x0002
-#define     INTR_EN2__DMA_CMD_COMP                      0x0004
-#define     INTR_EN2__TIME_OUT                          0x0008
-#define     INTR_EN2__PROGRAM_FAIL                      0x0010
-#define     INTR_EN2__ERASE_FAIL                                0x0020
-#define     INTR_EN2__LOAD_COMP                         0x0040
-#define     INTR_EN2__PROGRAM_COMP                      0x0080
-#define     INTR_EN2__ERASE_COMP                                0x0100
-#define     INTR_EN2__PIPE_CPYBCK_CMD_COMP              0x0200
-#define     INTR_EN2__LOCKED_BLK                                0x0400
-#define     INTR_EN2__UNSUP_CMD                         0x0800
-#define     INTR_EN2__INT_ACT                           0x1000
-#define     INTR_EN2__RST_COMP                          0x2000
-#define     INTR_EN2__PIPE_CMD_ERR                      0x4000
-#define     INTR_EN2__PAGE_XFER_INC                     0x8000
-
-#define PAGE_CNT2                               0x4d0
-#define     PAGE_CNT2__VALUE                            0x00ff
-
-#define ERR_PAGE_ADDR2                          0x4e0
-#define     ERR_PAGE_ADDR2__VALUE                       0xffff
-
-#define ERR_BLOCK_ADDR2                 0x4f0
-#define     ERR_BLOCK_ADDR2__VALUE                      0xffff
-
-#define INTR_STATUS3                            0x500
-#define     INTR_STATUS3__ECC_TRANSACTION_DONE          0x0001
-#define     INTR_STATUS3__ECC_ERR                       0x0002
-#define     INTR_STATUS3__DMA_CMD_COMP                  0x0004
-#define     INTR_STATUS3__TIME_OUT                      0x0008
-#define     INTR_STATUS3__PROGRAM_FAIL                  0x0010
-#define     INTR_STATUS3__ERASE_FAIL                    0x0020
-#define     INTR_STATUS3__LOAD_COMP                     0x0040
-#define     INTR_STATUS3__PROGRAM_COMP                  0x0080
-#define     INTR_STATUS3__ERASE_COMP                    0x0100
-#define     INTR_STATUS3__PIPE_CPYBCK_CMD_COMP          0x0200
-#define     INTR_STATUS3__LOCKED_BLK                    0x0400
-#define     INTR_STATUS3__UNSUP_CMD                     0x0800
-#define     INTR_STATUS3__INT_ACT                       0x1000
-#define     INTR_STATUS3__RST_COMP                      0x2000
-#define     INTR_STATUS3__PIPE_CMD_ERR                  0x4000
-#define     INTR_STATUS3__PAGE_XFER_INC                 0x8000
-
-#define INTR_EN3                                        0x510
-#define     INTR_EN3__ECC_TRANSACTION_DONE              0x0001
-#define     INTR_EN3__ECC_ERR                           0x0002
-#define     INTR_EN3__DMA_CMD_COMP                      0x0004
-#define     INTR_EN3__TIME_OUT                          0x0008
-#define     INTR_EN3__PROGRAM_FAIL                      0x0010
-#define     INTR_EN3__ERASE_FAIL                                0x0020
-#define     INTR_EN3__LOAD_COMP                         0x0040
-#define     INTR_EN3__PROGRAM_COMP                      0x0080
-#define     INTR_EN3__ERASE_COMP                                0x0100
-#define     INTR_EN3__PIPE_CPYBCK_CMD_COMP              0x0200
-#define     INTR_EN3__LOCKED_BLK                                0x0400
-#define     INTR_EN3__UNSUP_CMD                         0x0800
-#define     INTR_EN3__INT_ACT                           0x1000
-#define     INTR_EN3__RST_COMP                          0x2000
-#define     INTR_EN3__PIPE_CMD_ERR                      0x4000
-#define     INTR_EN3__PAGE_XFER_INC                     0x8000
-
-#define PAGE_CNT3                               0x520
-#define     PAGE_CNT3__VALUE                            0x00ff
-
-#define ERR_PAGE_ADDR3                          0x530
-#define     ERR_PAGE_ADDR3__VALUE                       0xffff
-
-#define ERR_BLOCK_ADDR3                 0x540
-#define     ERR_BLOCK_ADDR3__VALUE                      0xffff
-
-#define DATA_INTR                               0x550
-#define     DATA_INTR__WRITE_SPACE_AV                   0x0001
-#define     DATA_INTR__READ_DATA_AV                     0x0002
-
-#define DATA_INTR_EN                            0x560
-#define     DATA_INTR_EN__WRITE_SPACE_AV                0x0001
-#define     DATA_INTR_EN__READ_DATA_AV                  0x0002
-
-#define GPREG_0                                 0x570
-#define     GPREG_0__VALUE                              0xffff
-
-#define GPREG_1                                 0x580
-#define     GPREG_1__VALUE                              0xffff
-
-#define GPREG_2                                 0x590
-#define     GPREG_2__VALUE                              0xffff
-
-#define GPREG_3                                 0x5a0
-#define     GPREG_3__VALUE                              0xffff
-
-#define ECC_THRESHOLD                           0x600
-#define     ECC_THRESHOLD__VALUE                                0x03ff
-
-#define ECC_ERROR_BLOCK_ADDRESS         0x610
-#define     ECC_ERROR_BLOCK_ADDRESS__VALUE              0xffff
-
-#define ECC_ERROR_PAGE_ADDRESS                  0x620
-#define     ECC_ERROR_PAGE_ADDRESS__VALUE               0x0fff
-#define     ECC_ERROR_PAGE_ADDRESS__BANK                0xf000
-
-#define ECC_ERROR_ADDRESS                       0x630
-#define     ECC_ERROR_ADDRESS__OFFSET                   0x0fff
-#define     ECC_ERROR_ADDRESS__SECTOR_NR                0xf000
-
-#define ERR_CORRECTION_INFO                     0x640
-#define     ERR_CORRECTION_INFO__BYTEMASK               0x00ff
-#define     ERR_CORRECTION_INFO__DEVICE_NR              0x0f00
-#define     ERR_CORRECTION_INFO__ERROR_TYPE             0x4000
-#define     ERR_CORRECTION_INFO__LAST_ERR_INFO          0x8000
-
-#define DMA_ENABLE                              0x700
-#define     DMA_ENABLE__FLAG                            0x0001
-
-#define IGNORE_ECC_DONE                         0x710
-#define     IGNORE_ECC_DONE__FLAG                       0x0001
-
-#define DMA_INTR                                0x720
-#define     DMA_INTR__TARGET_ERROR                      0x0001
-#define     DMA_INTR__DESC_COMP_CHANNEL0                0x0002
-#define     DMA_INTR__DESC_COMP_CHANNEL1                0x0004
-#define     DMA_INTR__DESC_COMP_CHANNEL2                0x0008
-#define     DMA_INTR__DESC_COMP_CHANNEL3                0x0010
-#define     DMA_INTR__MEMCOPY_DESC_COMP         0x0020
-
-#define DMA_INTR_EN                             0x730
-#define     DMA_INTR_EN__TARGET_ERROR                   0x0001
-#define     DMA_INTR_EN__DESC_COMP_CHANNEL0             0x0002
-#define     DMA_INTR_EN__DESC_COMP_CHANNEL1             0x0004
-#define     DMA_INTR_EN__DESC_COMP_CHANNEL2             0x0008
-#define     DMA_INTR_EN__DESC_COMP_CHANNEL3             0x0010
-#define     DMA_INTR_EN__MEMCOPY_DESC_COMP              0x0020
-
-#define TARGET_ERR_ADDR_LO                      0x740
-#define     TARGET_ERR_ADDR_LO__VALUE                   0xffff
-
-#define TARGET_ERR_ADDR_HI                      0x750
-#define     TARGET_ERR_ADDR_HI__VALUE                   0xffff
-
-#define CHNL_ACTIVE                             0x760
-#define     CHNL_ACTIVE__CHANNEL0                       0x0001
-#define     CHNL_ACTIVE__CHANNEL1                       0x0002
-#define     CHNL_ACTIVE__CHANNEL2                       0x0004
-#define     CHNL_ACTIVE__CHANNEL3                       0x0008
-
-#define ACTIVE_SRC_ID                           0x800
-#define     ACTIVE_SRC_ID__VALUE                                0x00ff
-
-#define PTN_INTR                                        0x810
-#define     PTN_INTR__CONFIG_ERROR                      0x0001
-#define     PTN_INTR__ACCESS_ERROR_BANK0                0x0002
-#define     PTN_INTR__ACCESS_ERROR_BANK1                0x0004
-#define     PTN_INTR__ACCESS_ERROR_BANK2                0x0008
-#define     PTN_INTR__ACCESS_ERROR_BANK3                0x0010
-#define     PTN_INTR__REG_ACCESS_ERROR                  0x0020
-
-#define PTN_INTR_EN                             0x820
-#define     PTN_INTR_EN__CONFIG_ERROR                   0x0001
-#define     PTN_INTR_EN__ACCESS_ERROR_BANK0             0x0002
-#define     PTN_INTR_EN__ACCESS_ERROR_BANK1             0x0004
-#define     PTN_INTR_EN__ACCESS_ERROR_BANK2             0x0008
-#define     PTN_INTR_EN__ACCESS_ERROR_BANK3             0x0010
-#define     PTN_INTR_EN__REG_ACCESS_ERROR               0x0020
-
-#define PERM_SRC_ID_0                           0x830
-#define     PERM_SRC_ID_0__SRCID                                0x00ff
-#define     PERM_SRC_ID_0__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_0__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_0__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_0__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_0                          0x840
-#define     MIN_BLK_ADDR_0__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_0                          0x850
-#define     MAX_BLK_ADDR_0__VALUE                       0xffff
-
-#define MIN_MAX_BANK_0                          0x860
-#define     MIN_MAX_BANK_0__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_0__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_1                           0x870
-#define     PERM_SRC_ID_1__SRCID                                0x00ff
-#define     PERM_SRC_ID_1__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_1__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_1__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_1__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_1                          0x880
-#define     MIN_BLK_ADDR_1__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_1                          0x890
-#define     MAX_BLK_ADDR_1__VALUE                       0xffff
-
-#define MIN_MAX_BANK_1                          0x8a0
-#define     MIN_MAX_BANK_1__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_1__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_2                           0x8b0
-#define     PERM_SRC_ID_2__SRCID                                0x00ff
-#define     PERM_SRC_ID_2__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_2__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_2__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_2__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_2                          0x8c0
-#define     MIN_BLK_ADDR_2__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_2                          0x8d0
-#define     MAX_BLK_ADDR_2__VALUE                       0xffff
-
-#define MIN_MAX_BANK_2                          0x8e0
-#define     MIN_MAX_BANK_2__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_2__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_3                           0x8f0
-#define     PERM_SRC_ID_3__SRCID                                0x00ff
-#define     PERM_SRC_ID_3__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_3__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_3__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_3__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_3                          0x900
-#define     MIN_BLK_ADDR_3__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_3                          0x910
-#define     MAX_BLK_ADDR_3__VALUE                       0xffff
-
-#define MIN_MAX_BANK_3                          0x920
-#define     MIN_MAX_BANK_3__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_3__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_4                           0x930
-#define     PERM_SRC_ID_4__SRCID                                0x00ff
-#define     PERM_SRC_ID_4__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_4__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_4__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_4__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_4                          0x940
-#define     MIN_BLK_ADDR_4__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_4                          0x950
-#define     MAX_BLK_ADDR_4__VALUE                       0xffff
-
-#define MIN_MAX_BANK_4                          0x960
-#define     MIN_MAX_BANK_4__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_4__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_5                           0x970
-#define     PERM_SRC_ID_5__SRCID                                0x00ff
-#define     PERM_SRC_ID_5__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_5__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_5__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_5__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_5                          0x980
-#define     MIN_BLK_ADDR_5__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_5                          0x990
-#define     MAX_BLK_ADDR_5__VALUE                       0xffff
-
-#define MIN_MAX_BANK_5                          0x9a0
-#define     MIN_MAX_BANK_5__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_5__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_6                           0x9b0
-#define     PERM_SRC_ID_6__SRCID                                0x00ff
-#define     PERM_SRC_ID_6__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_6__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_6__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_6__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_6                          0x9c0
-#define     MIN_BLK_ADDR_6__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_6                          0x9d0
-#define     MAX_BLK_ADDR_6__VALUE                       0xffff
-
-#define MIN_MAX_BANK_6                          0x9e0
-#define     MIN_MAX_BANK_6__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_6__MAX_VALUE                   0x000c
-
-#define PERM_SRC_ID_7                           0x9f0
-#define     PERM_SRC_ID_7__SRCID                                0x00ff
-#define     PERM_SRC_ID_7__DIRECT_ACCESS_ACTIVE         0x0800
-#define     PERM_SRC_ID_7__WRITE_ACTIVE                 0x2000
-#define     PERM_SRC_ID_7__READ_ACTIVE                  0x4000
-#define     PERM_SRC_ID_7__PARTITION_VALID              0x8000
-
-#define MIN_BLK_ADDR_7                          0xa00
-#define     MIN_BLK_ADDR_7__VALUE                       0xffff
-
-#define MAX_BLK_ADDR_7                          0xa10
-#define     MAX_BLK_ADDR_7__VALUE                       0xffff
-
-#define MIN_MAX_BANK_7                          0xa20
-#define     MIN_MAX_BANK_7__MIN_VALUE                   0x0003
-#define     MIN_MAX_BANK_7__MAX_VALUE                   0x000c
diff --git a/drivers/staging/spectra/spectraswconfig.h b/drivers/staging/spectra/spectraswconfig.h
deleted file mode 100644
index 17259469e955..000000000000
--- a/drivers/staging/spectra/spectraswconfig.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * NAND Flash Controller Device Driver
- * Copyright (c) 2009, Intel Corporation and its suppliers.
- *
- * 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 _SPECTRASWCONFIG_
-#define _SPECTRASWCONFIG_
-
-/* NAND driver version */
-#define GLOB_VERSION          "driver version 20100311"
-
-
-/***** Common Parameters *****/
-#define RETRY_TIMES                   3
-
-#define READ_BADBLOCK_INFO            1
-#define READBACK_VERIFY               0
-#define AUTO_FORMAT_FLASH             0
-
-/***** Cache Parameters *****/
-#define CACHE_ITEM_NUM            128
-#define BLK_NUM_FOR_L2_CACHE        16
-
-/***** Block Table Parameters *****/
-#define BLOCK_TABLE_INDEX             0
-
-/***** Wear Leveling Parameters *****/
-#define WEAR_LEVELING_GATE         0x10
-#define WEAR_LEVELING_BLOCK_NUM      10
-
-#define DEBUG_BNDRY             0
-
-/***** Product Feature Support *****/
-#define FLASH_EMU               defined(CONFIG_SPECTRA_EMU)
-#define FLASH_NAND              defined(CONFIG_SPECTRA_MRST_HW)
-#define FLASH_MTD               defined(CONFIG_SPECTRA_MTD)
-#define CMD_DMA                 defined(CONFIG_SPECTRA_MRST_HW_DMA)
-
-#define SPECTRA_PARTITION_ID    0
-
-/* Enable this macro if the number of flash blocks is larger than 16K. */
-#define SUPPORT_LARGE_BLOCKNUM  1
-
-/**** Block Table and Reserved Block Parameters *****/
-#define SPECTRA_START_BLOCK     3
-//#define NUM_FREE_BLOCKS_GATE    30
-#define NUM_FREE_BLOCKS_GATE    60
-
-/**** Hardware Parameters ****/
-#define GLOB_HWCTL_REG_BASE     0xFFA40000
-#define GLOB_HWCTL_REG_SIZE     4096
-
-#define GLOB_HWCTL_MEM_BASE     0xFFA48000
-#define GLOB_HWCTL_MEM_SIZE     4096
-
-/* KBV - Updated to LNW scratch register address */
-#define SCRATCH_REG_ADDR    0xFF108018
-#define SCRATCH_REG_SIZE    64
-
-#define GLOB_HWCTL_DEFAULT_BLKS    2048
-
-#define SUPPORT_15BITECC        1
-#define SUPPORT_8BITECC         1
-
-#define ONFI_BLOOM_TIME         0
-#define MODE5_WORKAROUND        1
-
-#endif /*_SPECTRASWCONFIG_*/
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c
index 55c0b510889c..03420e25d9c6 100644
--- a/drivers/staging/usbip/stub_dev.c
+++ b/drivers/staging/usbip/stub_dev.c
@@ -109,11 +109,6 @@ static ssize_t store_sockfd(struct device *dev, struct device_attribute *attr,
                         spin_unlock(&sdev->ud.lock);
                         return -EINVAL;
                 }
-#if 0
-                setnodelay(socket);
-                setkeepalive(socket);
-                setreuse(socket);
-#endif
                 sdev->ud.tcp_socket = socket;
 
                 spin_unlock(&sdev->ud.lock);
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c
index 6b4e3e182de8..27ac363d1cfa 100644
--- a/drivers/staging/usbip/stub_rx.c
+++ b/drivers/staging/usbip/stub_rx.c
@@ -564,7 +564,7 @@ static void stub_rx_pdu(struct usbip_device *ud)
         memset(&pdu, 0, sizeof(pdu));
 
         /* 1. receive a pdu header */
-        ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);
+        ret = usbip_recv(ud->tcp_socket, &pdu, sizeof(pdu));
         if (ret != sizeof(pdu)) {
                 dev_err(dev, "recv a header, %d\n", ret);
                 usbip_event_add(ud, SDEV_EVENT_ERROR_TCP);
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 3b7a847f4657..d93e7f1f7973 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -334,9 +334,8 @@ void usbip_dump_header(struct usbip_header *pdu)
 }
 EXPORT_SYMBOL_GPL(usbip_dump_header);
 
-/* Send/receive messages over TCP/IP. I refer drivers/block/nbd.c */
-int usbip_xmit(int send, struct socket *sock, char *buf, int size,
-               int msg_flags)
+/* Receive data over TCP/IP. */
+int usbip_recv(struct socket *sock, void *buf, int size)
 {
         int result;
         struct msghdr msg;
@@ -355,19 +354,6 @@ int usbip_xmit(int send, struct socket *sock, char *buf, int size,
                 return -EINVAL;
         }
 
-        if (usbip_dbg_flag_xmit) {
-                if (send) {
-                        if (!in_interrupt())
-                                pr_debug("%-10s:", current->comm);
-                        else
-                                pr_debug("interrupt  :");
-
-                        pr_debug("sending... , sock %p, buf %p, size %d, "
-                                 "msg_flags %d\n", sock, buf, size, msg_flags);
-                        usbip_dump_buffer(buf, size);
-                }
-        }
-
         do {
                 sock->sk->sk_allocation = GFP_NOIO;
                 iov.iov_base    = buf;
@@ -377,42 +363,30 @@ int usbip_xmit(int send, struct socket *sock, char *buf, int size,
                 msg.msg_control = NULL;
                 msg.msg_controllen = 0;
                 msg.msg_namelen    = 0;
-                msg.msg_flags      = msg_flags | MSG_NOSIGNAL;
-
-                if (send)
-                        result = kernel_sendmsg(sock, &msg, &iov, 1, size);
-                else
-                        result = kernel_recvmsg(sock, &msg, &iov, 1, size,
-                                                MSG_WAITALL);
+                msg.msg_flags      = MSG_NOSIGNAL;
 
+                result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL);
                 if (result <= 0) {
-                        pr_debug("%s sock %p buf %p size %u ret %d total %d\n",
-                                 send ? "send" : "receive", sock, buf, size,
-                                 result, total);
+                        pr_debug("receive sock %p buf %p size %u ret %d total %d\n",
+                                 sock, buf, size, result, total);
                         goto err;
                 }
 
                 size -= result;
                 buf += result;
                 total += result;
-
         } while (size > 0);
 
         if (usbip_dbg_flag_xmit) {
-                if (!send) {
-                        if (!in_interrupt())
-                                pr_debug("%-10s:", current->comm);
-                        else
-                                pr_debug("interrupt  :");
-
-                        pr_debug("receiving....\n");
-                        usbip_dump_buffer(bp, osize);
-                        pr_debug("received, osize %d ret %d size %d total %d\n",
-                                 osize, result, size, total);
-                }
+                if (!in_interrupt())
+                        pr_debug("%-10s:", current->comm);
+                else
+                        pr_debug("interrupt  :");
 
-                if (send)
-                        pr_debug("send, total %d\n", total);
+                pr_debug("receiving....\n");
+                usbip_dump_buffer(bp, osize);
+                pr_debug("received, osize %d ret %d size %d total %d\n",
+                        osize, result, size, total);
         }
 
         return total;
@@ -420,7 +394,7 @@ int usbip_xmit(int send, struct socket *sock, char *buf, int size,
 err:
         return result;
 }
-EXPORT_SYMBOL_GPL(usbip_xmit);
+EXPORT_SYMBOL_GPL(usbip_recv);
 
 struct socket *sockfd_to_socket(unsigned int sockfd)
 {
@@ -712,7 +686,7 @@ int usbip_recv_iso(struct usbip_device *ud, struct urb *urb)
         if (!buff)
                 return -ENOMEM;
 
-        ret = usbip_xmit(0, ud->tcp_socket, buff, size, 0);
+        ret = usbip_recv(ud->tcp_socket, buff, size);
         if (ret != size) {
                 dev_err(&urb->dev->dev, "recv iso_frame_descriptor, %d\n",
                         ret);
@@ -823,8 +797,7 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb)
         if (!(size > 0))
                 return 0;
 
-        ret = usbip_xmit(0, ud->tcp_socket, (char *)urb->transfer_buffer,
-                         size, 0);
+        ret = usbip_recv(ud->tcp_socket, urb->transfer_buffer, size);
         if (ret != size) {
                 dev_err(&urb->dev->dev, "recv xbuf, %d\n", ret);
                 if (ud->side == USBIP_STUB) {
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index be216175ae87..b8f8c48b8a72 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -292,21 +292,11 @@ struct usbip_device {
         } eh_ops;
 };
 
-#if 0
-int usbip_sendmsg(struct socket *, struct msghdr *, int);
-int set_sockaddr(struct socket *socket, struct sockaddr_storage *ss);
-int setnodelay(struct socket *);
-int setquickack(struct socket *);
-int setkeepalive(struct socket *socket);
-void setreuse(struct socket *);
-#endif
-
 /* usbip_common.c */
 void usbip_dump_urb(struct urb *purb);
 void usbip_dump_header(struct usbip_header *pdu);
 
-int usbip_xmit(int send, struct socket *sock, char *buf, int size,
-               int msg_flags);
+int usbip_recv(struct socket *sock, void *buf, int size);
 struct socket *sockfd_to_socket(unsigned int sockfd);
 
 void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
@@ -337,9 +327,4 @@ static inline int interface_to_devnum(struct usb_interface *interface)
         return udev->devnum;
 }
 
-static inline int interface_to_infnum(struct usb_interface *interface)
-{
-        return interface->cur_altsetting->desc.bInterfaceNumber;
-}
-
 #endif /* __USBIP_COMMON_H */
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
index 3872b8cccdcf..3f511b47563d 100644
--- a/drivers/staging/usbip/vhci_rx.c
+++ b/drivers/staging/usbip/vhci_rx.c
@@ -206,7 +206,7 @@ static void vhci_rx_pdu(struct usbip_device *ud)
         memset(&pdu, 0, sizeof(pdu));
 
         /* 1. receive a pdu header */
-        ret = usbip_xmit(0, ud->tcp_socket, (char *) &pdu, sizeof(pdu), 0);
+        ret = usbip_recv(ud->tcp_socket, &pdu, sizeof(pdu));
         if (ret < 0) {
                 if (ret == -ECONNRESET)
                         pr_info("connection reset by peer\n");
diff --git a/drivers/staging/vme/TODO b/drivers/staging/vme/TODO
index 82c222b4a146..79f00333e7ef 100644
--- a/drivers/staging/vme/TODO
+++ b/drivers/staging/vme/TODO
@@ -1,70 +1,5 @@
                                 TODO
                                 ====
 
-API
-===
-
-Master window broadcast select mask
------------------------------------
-
-API currently provides no method to set or get Broadcast Select mask. Suggest
-somthing like:
-
-        int vme_master_bmsk_set (struct vme_resource *res, int mask);
-        int vme_master_bmsk_get (struct vme_resource *res, int *mask);
-
-
-Interrupt Generation
---------------------
-
-Add optional timeout when waiting for an IACK.
-
-
-CR/CSR Buffer
--------------
-
-The VME API provides no functions to access the buffer mapped into the CR/CSR
-space.
-
-
-Mailboxes
----------
-
-Whilst not part of the VME specification, they are provided by a number of
-chips. They are currently not supported at all by the API.
-
-
-Core
-====
-
-- Improve generic sanity checks (Such as does an offset and size fit within a
-  window and parameter checking).
-
-Bridge Support
-==============
-
-Tempe (tsi148)
---------------
-
-- 2eSST Broadcast mode.
-- Mailboxes unsupported.
-- Improve error detection.
-- Control of prefetch size, threshold.
-- Arbiter control
-- Requestor control
-
-Universe II (ca91c142)
-----------------------
-
-- Mailboxes unsupported.
-- Error Detection.
-- Control of prefetch size, threshold.
-- Arbiter control
-- Requestor control
-- Slot detection
-
-Universe I (ca91x042)
----------------------
-
-Currently completely unsupported.
+- Add one or more device drivers which use the VME framework.
 
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 0e4feac138eb..515b8b8e32a8 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -338,7 +338,7 @@ static int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
 
 static int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
         unsigned long long vme_base, unsigned long long size,
-        dma_addr_t pci_base, vme_address_t aspace, vme_cycle_t cycle)
+        dma_addr_t pci_base, u32 aspace, u32 cycle)
 {
         unsigned int i, addr = 0, granularity;
         unsigned int temp_ctl = 0;
@@ -444,7 +444,7 @@ static int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
 
 static int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
-        dma_addr_t *pci_base, vme_address_t *aspace, vme_cycle_t *cycle)
+        dma_addr_t *pci_base, u32 *aspace, u32 *cycle)
 {
         unsigned int i, granularity = 0, ctl = 0;
         unsigned long long vme_bound, pci_offset;
@@ -595,8 +595,8 @@ static void ca91cx42_free_resource(struct vme_master_resource *image)
 
 
 static int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
-        unsigned long long vme_base, unsigned long long size,
-        vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
+        unsigned long long vme_base, unsigned long long size, u32 aspace,
+        u32 cycle, u32 dwidth)
 {
         int retval = 0;
         unsigned int i, granularity = 0;
@@ -753,7 +753,7 @@ err_window:
 
 static int __ca91cx42_master_get(struct vme_master_resource *image,
         int *enabled, unsigned long long *vme_base, unsigned long long *size,
-        vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
+        u32 *aspace, u32 *cycle, u32 *dwidth)
 {
         unsigned int i, ctl;
         unsigned long long pci_base, pci_bound, vme_offset;
@@ -839,8 +839,8 @@ static int __ca91cx42_master_get(struct vme_master_resource *image,
 }
 
 static int ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
-        unsigned long long *vme_base, unsigned long long *size,
-        vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
+        unsigned long long *vme_base, unsigned long long *size, u32 *aspace,
+        u32 *cycle, u32 *dwidth)
 {
         int retval;
 
@@ -876,13 +876,13 @@ static ssize_t ca91cx42_master_read(struct vme_master_resource *image,
          * maximal configured data cycle is used and splits it
          * automatically for non-aligned addresses.
          */
-        if ((int)addr & 0x1) {
+        if ((uintptr_t)addr & 0x1) {
                 *(u8 *)buf = ioread8(addr);
                 done += 1;
                 if (done == count)
                         goto out;
         }
-        if ((int)addr & 0x2) {
+        if ((uintptr_t)addr & 0x2) {
                 if ((count - done) < 2) {
                         *(u8 *)(buf + done) = ioread8(addr + done);
                         done += 1;
@@ -930,13 +930,13 @@ static ssize_t ca91cx42_master_write(struct vme_master_resource *image,
         /* Here we apply for the same strategy we do in master_read
          * function in order to assure D16 cycle when required.
          */
-        if ((int)addr & 0x1) {
+        if ((uintptr_t)addr & 0x1) {
                 iowrite8(*(u8 *)buf, addr);
                 done += 1;
                 if (done == count)
                         goto out;
         }
-        if ((int)addr & 0x2) {
+        if ((uintptr_t)addr & 0x2) {
                 if ((count - done) < 2) {
                         iowrite8(*(u8 *)(buf + done), addr + done);
                         done += 1;
@@ -973,7 +973,8 @@ static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
         unsigned int mask, unsigned int compare, unsigned int swap,
         loff_t offset)
 {
-        u32 pci_addr, result;
+        u32 result;
+        uintptr_t pci_addr;
         int i;
         struct ca91cx42_driver *bridge;
         struct device *dev;
@@ -990,7 +991,7 @@ static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
         /* Lock image */
         spin_lock(&image->lock);
 
-        pci_addr = (u32)image->kern_base + offset;
+        pci_addr = (uintptr_t)image->kern_base + offset;
 
         /* Address must be 4-byte aligned */
         if (pci_addr & 0x3) {
@@ -1291,7 +1292,7 @@ static int ca91cx42_dma_list_empty(struct vme_dma_list *list)
  * callback is attached and disabled when the last callback is removed.
  */
 static int ca91cx42_lm_set(struct vme_lm_resource *lm,
-        unsigned long long lm_base, vme_address_t aspace, vme_cycle_t cycle)
+        unsigned long long lm_base, u32 aspace, u32 cycle)
 {
         u32 temp_base, lm_ctl = 0;
         int i;
@@ -1359,7 +1360,7 @@ static int ca91cx42_lm_set(struct vme_lm_resource *lm,
  * or disabled.
  */
 static int ca91cx42_lm_get(struct vme_lm_resource *lm,
-        unsigned long long *lm_base, vme_address_t *aspace, vme_cycle_t *cycle)
+        unsigned long long *lm_base, u32 *aspace, u32 *cycle)
 {
         u32 lm_ctl, enabled = 0;
         struct ca91cx42_driver *bridge;
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
index 6c1167c2bea9..08a449b4abf9 100644
--- a/drivers/staging/vme/bridges/vme_tsi148.c
+++ b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -483,7 +483,7 @@ static int tsi148_irq_generate(struct vme_bridge *tsi148_bridge, int level,
  * Find the first error in this address range
  */
 static struct vme_bus_error *tsi148_find_error(struct vme_bridge *tsi148_bridge,
-        vme_address_t aspace, unsigned long long address, size_t count)
+        u32 aspace, unsigned long long address, size_t count)
 {
         struct list_head *err_pos;
         struct vme_bus_error *vme_err, *valid = NULL;
@@ -517,7 +517,7 @@ static struct vme_bus_error *tsi148_find_error(struct vme_bridge *tsi148_bridge,
  * Clear errors in the provided address range.
  */
 static void tsi148_clear_errors(struct vme_bridge *tsi148_bridge,
-        vme_address_t aspace, unsigned long long address, size_t count)
+        u32 aspace, unsigned long long address, size_t count)
 {
         struct list_head *err_pos, *temp;
         struct vme_bus_error *vme_err;
@@ -551,7 +551,7 @@ static void tsi148_clear_errors(struct vme_bridge *tsi148_bridge,
  */
 static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
         unsigned long long vme_base, unsigned long long size,
-        dma_addr_t pci_base, vme_address_t aspace, vme_cycle_t cycle)
+        dma_addr_t pci_base, u32 aspace, u32 cycle)
 {
         unsigned int i, addr = 0, granularity = 0;
         unsigned int temp_ctl = 0;
@@ -701,7 +701,7 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled,
  */
 static int tsi148_slave_get(struct vme_slave_resource *image, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
-        dma_addr_t *pci_base, vme_address_t *aspace, vme_cycle_t *cycle)
+        dma_addr_t *pci_base, u32 *aspace, u32 *cycle)
 {
         unsigned int i, granularity = 0, ctl = 0;
         unsigned int vme_base_low, vme_base_high;
@@ -893,8 +893,8 @@ static void tsi148_free_resource(struct vme_master_resource *image)
  * Set the attributes of an outbound window.
  */
 static int tsi148_master_set(struct vme_master_resource *image, int enabled,
-        unsigned long long vme_base, unsigned long long size,
-        vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
+        unsigned long long vme_base, unsigned long long size, u32 aspace,
+        u32 cycle, u32 dwidth)
 {
         int retval = 0;
         unsigned int i;
@@ -1129,8 +1129,8 @@ err_window:
  * XXX Not parsing prefetch information.
  */
 static int __tsi148_master_get(struct vme_master_resource *image, int *enabled,
-        unsigned long long *vme_base, unsigned long long *size,
-        vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
+        unsigned long long *vme_base, unsigned long long *size, u32 *aspace,
+        u32 *cycle, u32 *dwidth)
 {
         unsigned int i, ctl;
         unsigned int pci_base_low, pci_base_high;
@@ -1239,8 +1239,8 @@ static int __tsi148_master_get(struct vme_master_resource *image, int *enabled,
 
 
 static int tsi148_master_get(struct vme_master_resource *image, int *enabled,
-        unsigned long long *vme_base, unsigned long long *size,
-        vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
+        unsigned long long *vme_base, unsigned long long *size, u32 *aspace,
+        u32 *cycle, u32 *dwidth)
 {
         int retval;
 
@@ -1259,9 +1259,7 @@ static ssize_t tsi148_master_read(struct vme_master_resource *image, void *buf,
 {
         int retval, enabled;
         unsigned long long vme_base, size;
-        vme_address_t aspace;
-        vme_cycle_t cycle;
-        vme_width_t dwidth;
+        u32 aspace, cycle, dwidth;
         struct vme_bus_error *vme_err = NULL;
         struct vme_bridge *tsi148_bridge;
 
@@ -1301,9 +1299,7 @@ static ssize_t tsi148_master_write(struct vme_master_resource *image, void *buf,
 {
         int retval = 0, enabled;
         unsigned long long vme_base, size;
-        vme_address_t aspace;
-        vme_cycle_t cycle;
-        vme_width_t dwidth;
+        u32 aspace, cycle, dwidth;
 
         struct vme_bus_error *vme_err = NULL;
         struct vme_bridge *tsi148_bridge;
@@ -1420,7 +1416,7 @@ static unsigned int tsi148_master_rmw(struct vme_master_resource *image,
 }
 
 static int tsi148_dma_set_vme_src_attributes(struct device *dev, u32 *attr,
-        vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
+        u32 aspace, u32 cycle, u32 dwidth)
 {
         /* Setup 2eSST speeds */
         switch (cycle & (VME_2eSST160 | VME_2eSST267 | VME_2eSST320)) {
@@ -1514,7 +1510,7 @@ static int tsi148_dma_set_vme_src_attributes(struct device *dev, u32 *attr,
 }
 
 static int tsi148_dma_set_vme_dest_attributes(struct device *dev, u32 *attr,
-        vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
+        u32 aspace, u32 cycle, u32 dwidth)
 {
         /* Setup 2eSST speeds */
         switch (cycle & (VME_2eSST160 | VME_2eSST267 | VME_2eSST320)) {
@@ -1886,7 +1882,7 @@ static int tsi148_dma_list_empty(struct vme_dma_list *list)
  * callback is attached and disabled when the last callback is removed.
  */
 static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
-        vme_address_t aspace, vme_cycle_t cycle)
+        u32 aspace, u32 cycle)
 {
         u32 lm_base_high, lm_base_low, lm_ctl = 0;
         int i;
@@ -1953,7 +1949,7 @@ static int tsi148_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
  * or disabled.
  */
 static int tsi148_lm_get(struct vme_lm_resource *lm,
-        unsigned long long *lm_base, vme_address_t *aspace, vme_cycle_t *cycle)
+        unsigned long long *lm_base, u32 *aspace, u32 *cycle)
 {
         u32 lm_base_high, lm_base_low, lm_ctl, enabled = 0;
         struct tsi148_driver *bridge;
diff --git a/drivers/staging/vme/devices/Kconfig b/drivers/staging/vme/devices/Kconfig
index ca5ba89e2d8c..55ec30cb1fa2 100644
--- a/drivers/staging/vme/devices/Kconfig
+++ b/drivers/staging/vme/devices/Kconfig
@@ -6,3 +6,16 @@ config VME_USER
           If you say Y here you want to be able to access a limited number of
           VME windows in a manner at least semi-compatible with the interface
           provided with the original driver at http://vmelinux.org/.
+
+config VME_PIO2
+        tristate "GE PIO2 VME"
+        depends on GPIOLIB
+        help
+          Say Y here to include support for the GE PIO2. The PIO2 is a 6U VME
+          slave card, implementing 32 solid-state relay switched IO lines, in
+          4 groups of 8. Each bank of IO lines is built to function as input,
+          output or both depending on the variant of the card.
+
+          To compile this driver as a module, choose M here. The module will
+          be called vme_pio2. If unsure, say N.
+
diff --git a/drivers/staging/vme/devices/Makefile b/drivers/staging/vme/devices/Makefile
index 459742a75283..172512cb5dbf 100644
--- a/drivers/staging/vme/devices/Makefile
+++ b/drivers/staging/vme/devices/Makefile
@@ -3,3 +3,6 @@
 #
 
 obj-$(CONFIG_VME_USER)          += vme_user.o
+
+vme_pio2-objs   := vme_pio2_cntr.o vme_pio2_gpio.o vme_pio2_core.o
+obj-$(CONFIG_VME_PIO2)         += vme_pio2.o
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h
new file mode 100644
index 000000000000..3c5931364535
--- /dev/null
+++ b/drivers/staging/vme/devices/vme_pio2.h
@@ -0,0 +1,249 @@
+#ifndef _VME_PIO2_H_
+#define _VME_PIO2_H_
+
+#define PIO2_CARDS_MAX                  32
+
+#define PIO2_VARIANT_LENGTH             5
+
+#define PIO2_NUM_CHANNELS               32
+#define PIO2_NUM_IRQS                   11
+#define PIO2_NUM_CNTRS                  6
+
+#define PIO2_REGS_SIZE                  0x40
+
+#define PIO2_REGS_DATA0                 0x0
+#define PIO2_REGS_DATA1                 0x1
+#define PIO2_REGS_DATA2                 0x2
+#define PIO2_REGS_DATA3                 0x3
+
+static const int PIO2_REGS_DATA[4] = { PIO2_REGS_DATA0, PIO2_REGS_DATA1,
+                                        PIO2_REGS_DATA2, PIO2_REGS_DATA3 };
+
+#define PIO2_REGS_INT_STAT0             0x8
+#define PIO2_REGS_INT_STAT1             0x9
+#define PIO2_REGS_INT_STAT2             0xa
+#define PIO2_REGS_INT_STAT3             0xb
+
+static const int PIO2_REGS_INT_STAT[4] = { PIO2_REGS_INT_STAT0,
+                                        PIO2_REGS_INT_STAT1,
+                                        PIO2_REGS_INT_STAT2,
+                                        PIO2_REGS_INT_STAT3 };
+
+#define PIO2_REGS_INT_STAT_CNTR         0xc
+#define PIO2_REGS_INT_MASK0             0x10
+#define PIO2_REGS_INT_MASK1             0x11
+#define PIO2_REGS_INT_MASK2             0x12
+#define PIO2_REGS_INT_MASK3             0x13
+#define PIO2_REGS_INT_MASK4             0x14
+#define PIO2_REGS_INT_MASK5             0x15
+#define PIO2_REGS_INT_MASK6             0x16
+#define PIO2_REGS_INT_MASK7             0x17
+
+static const int PIO2_REGS_INT_MASK[8] = { PIO2_REGS_INT_MASK0,
+                                        PIO2_REGS_INT_MASK1,
+                                        PIO2_REGS_INT_MASK2,
+                                        PIO2_REGS_INT_MASK3,
+                                        PIO2_REGS_INT_MASK4,
+                                        PIO2_REGS_INT_MASK5,
+                                        PIO2_REGS_INT_MASK6,
+                                        PIO2_REGS_INT_MASK7 };
+
+
+
+#define PIO2_REGS_CTRL                  0x18
+#define PIO2_REGS_VME_VECTOR            0x19
+#define PIO2_REGS_CNTR0                 0x20
+#define PIO2_REGS_CNTR1                 0x22
+#define PIO2_REGS_CNTR2                 0x24
+#define PIO2_REGS_CTRL_WRD0             0x26
+#define PIO2_REGS_CNTR3                 0x28
+#define PIO2_REGS_CNTR4                 0x2a
+#define PIO2_REGS_CNTR5                 0x2c
+#define PIO2_REGS_CTRL_WRD1             0x2e
+
+#define PIO2_REGS_ID                    0x30
+
+
+/* PIO2_REGS_DATAx (0x0 - 0x3) */
+
+static const int PIO2_CHANNEL_BANK[32] = { 0, 0, 0, 0, 0, 0, 0, 0,
+                                        1, 1, 1, 1, 1, 1, 1, 1,
+                                        2, 2, 2, 2, 2, 2, 2, 2,
+                                        3, 3, 3, 3, 3, 3, 3, 3 };
+
+#define PIO2_CHANNEL0_BIT               (1 << 0)
+#define PIO2_CHANNEL1_BIT               (1 << 1)
+#define PIO2_CHANNEL2_BIT               (1 << 2)
+#define PIO2_CHANNEL3_BIT               (1 << 3)
+#define PIO2_CHANNEL4_BIT               (1 << 4)
+#define PIO2_CHANNEL5_BIT               (1 << 5)
+#define PIO2_CHANNEL6_BIT               (1 << 6)
+#define PIO2_CHANNEL7_BIT               (1 << 7)
+#define PIO2_CHANNEL8_BIT               (1 << 0)
+#define PIO2_CHANNEL9_BIT               (1 << 1)
+#define PIO2_CHANNEL10_BIT              (1 << 2)
+#define PIO2_CHANNEL11_BIT              (1 << 3)
+#define PIO2_CHANNEL12_BIT              (1 << 4)
+#define PIO2_CHANNEL13_BIT              (1 << 5)
+#define PIO2_CHANNEL14_BIT              (1 << 6)
+#define PIO2_CHANNEL15_BIT              (1 << 7)
+#define PIO2_CHANNEL16_BIT              (1 << 0)
+#define PIO2_CHANNEL17_BIT              (1 << 1)
+#define PIO2_CHANNEL18_BIT              (1 << 2)
+#define PIO2_CHANNEL19_BIT              (1 << 3)
+#define PIO2_CHANNEL20_BIT              (1 << 4)
+#define PIO2_CHANNEL21_BIT              (1 << 5)
+#define PIO2_CHANNEL22_BIT              (1 << 6)
+#define PIO2_CHANNEL23_BIT              (1 << 7)
+#define PIO2_CHANNEL24_BIT              (1 << 0)
+#define PIO2_CHANNEL25_BIT              (1 << 1)
+#define PIO2_CHANNEL26_BIT              (1 << 2)
+#define PIO2_CHANNEL27_BIT              (1 << 3)
+#define PIO2_CHANNEL28_BIT              (1 << 4)
+#define PIO2_CHANNEL29_BIT              (1 << 5)
+#define PIO2_CHANNEL30_BIT              (1 << 6)
+#define PIO2_CHANNEL31_BIT              (1 << 7)
+
+static const int PIO2_CHANNEL_BIT[32] = { PIO2_CHANNEL0_BIT, PIO2_CHANNEL1_BIT,
+                                        PIO2_CHANNEL2_BIT, PIO2_CHANNEL3_BIT,
+                                        PIO2_CHANNEL4_BIT, PIO2_CHANNEL5_BIT,
+                                        PIO2_CHANNEL6_BIT, PIO2_CHANNEL7_BIT,
+                                        PIO2_CHANNEL8_BIT, PIO2_CHANNEL9_BIT,
+                                        PIO2_CHANNEL10_BIT, PIO2_CHANNEL11_BIT,
+                                        PIO2_CHANNEL12_BIT, PIO2_CHANNEL13_BIT,
+                                        PIO2_CHANNEL14_BIT, PIO2_CHANNEL15_BIT,
+                                        PIO2_CHANNEL16_BIT, PIO2_CHANNEL17_BIT,
+                                        PIO2_CHANNEL18_BIT, PIO2_CHANNEL19_BIT,
+                                        PIO2_CHANNEL20_BIT, PIO2_CHANNEL21_BIT,
+                                        PIO2_CHANNEL22_BIT, PIO2_CHANNEL23_BIT,
+                                        PIO2_CHANNEL24_BIT, PIO2_CHANNEL25_BIT,
+                                        PIO2_CHANNEL26_BIT, PIO2_CHANNEL27_BIT,
+                                        PIO2_CHANNEL28_BIT, PIO2_CHANNEL29_BIT,
+                                        PIO2_CHANNEL30_BIT, PIO2_CHANNEL31_BIT
+                                        };
+
+/* PIO2_REGS_INT_STAT_CNTR (0xc) */
+#define PIO2_COUNTER0                   (1 << 0)
+#define PIO2_COUNTER1                   (1 << 1)
+#define PIO2_COUNTER2                   (1 << 2)
+#define PIO2_COUNTER3                   (1 << 3)
+#define PIO2_COUNTER4                   (1 << 4)
+#define PIO2_COUNTER5                   (1 << 5)
+
+static const int PIO2_COUNTER[6] = { PIO2_COUNTER0, PIO2_COUNTER1,
+                                        PIO2_COUNTER2, PIO2_COUNTER3,
+                                        PIO2_COUNTER4, PIO2_COUNTER5 };
+
+/* PIO2_REGS_CTRL (0x18) */
+#define PIO2_VME_INT_MASK               0x7
+#define PIO2_LED                        (1 << 6)
+#define PIO2_LOOP                       (1 << 7)
+
+/* PIO2_REGS_VME_VECTOR (0x19) */
+#define PIO2_VME_VECTOR_SPUR            0x0
+#define PIO2_VME_VECTOR_BANK0           0x1
+#define PIO2_VME_VECTOR_BANK1           0x2
+#define PIO2_VME_VECTOR_BANK2           0x3
+#define PIO2_VME_VECTOR_BANK3           0x4
+#define PIO2_VME_VECTOR_CNTR0           0x5
+#define PIO2_VME_VECTOR_CNTR1           0x6
+#define PIO2_VME_VECTOR_CNTR2           0x7
+#define PIO2_VME_VECTOR_CNTR3           0x8
+#define PIO2_VME_VECTOR_CNTR4           0x9
+#define PIO2_VME_VECTOR_CNTR5           0xa
+
+#define PIO2_VME_VECTOR_MASK            0xf0
+
+static const int PIO2_VECTOR_BANK[4] = { PIO2_VME_VECTOR_BANK0,
+                                        PIO2_VME_VECTOR_BANK1,
+                                        PIO2_VME_VECTOR_BANK2,
+                                        PIO2_VME_VECTOR_BANK3 };
+
+static const int PIO2_VECTOR_CNTR[6] = { PIO2_VME_VECTOR_CNTR0,
+                                        PIO2_VME_VECTOR_CNTR1,
+                                        PIO2_VME_VECTOR_CNTR2,
+                                        PIO2_VME_VECTOR_CNTR3,
+                                        PIO2_VME_VECTOR_CNTR4,
+                                        PIO2_VME_VECTOR_CNTR5 };
+
+/* PIO2_REGS_CNTRx (0x20 - 0x24 & 0x28 - 0x2c) */
+
+static const int PIO2_CNTR_DATA[6] = { PIO2_REGS_CNTR0, PIO2_REGS_CNTR1,
+                                        PIO2_REGS_CNTR2, PIO2_REGS_CNTR3,
+                                        PIO2_REGS_CNTR4, PIO2_REGS_CNTR5 };
+
+/* PIO2_REGS_CTRL_WRDx (0x26 & 0x2e) */
+
+static const int PIO2_CNTR_CTRL[6] = { PIO2_REGS_CTRL_WRD0,
+                                        PIO2_REGS_CTRL_WRD0,
+                                        PIO2_REGS_CTRL_WRD0,
+                                        PIO2_REGS_CTRL_WRD1,
+                                        PIO2_REGS_CTRL_WRD1,
+                                        PIO2_REGS_CTRL_WRD1 };
+
+#define PIO2_CNTR_SC_DEV0               0
+#define PIO2_CNTR_SC_DEV1               (1 << 6)
+#define PIO2_CNTR_SC_DEV2               (2 << 6)
+#define PIO2_CNTR_SC_RDBACK             (3 << 6)
+
+static const int PIO2_CNTR_SC_DEV[6] = { PIO2_CNTR_SC_DEV0, PIO2_CNTR_SC_DEV1,
+                                        PIO2_CNTR_SC_DEV2, PIO2_CNTR_SC_DEV0,
+                                        PIO2_CNTR_SC_DEV1, PIO2_CNTR_SC_DEV2 };
+
+#define PIO2_CNTR_RW_LATCH              0
+#define PIO2_CNTR_RW_LSB                (1 << 4)
+#define PIO2_CNTR_RW_MSB                (2 << 4)
+#define PIO2_CNTR_RW_BOTH               (3 << 4)
+
+#define PIO2_CNTR_MODE0                 0
+#define PIO2_CNTR_MODE1                 (1 << 1)
+#define PIO2_CNTR_MODE2                 (2 << 1)
+#define PIO2_CNTR_MODE3                 (3 << 1)
+#define PIO2_CNTR_MODE4                 (4 << 1)
+#define PIO2_CNTR_MODE5                 (5 << 1)
+
+#define PIO2_CNTR_BCD                   1
+
+
+
+enum pio2_bank_config { NOFIT, INPUT, OUTPUT, BOTH };
+enum pio2_int_config { NONE = 0, LOW2HIGH = 1, HIGH2LOW = 2, EITHER = 4 };
+
+/* Bank configuration structure */
+struct pio2_io_bank {
+        enum pio2_bank_config config;
+        u8 value;
+        enum pio2_int_config irq[8];
+};
+
+/* Counter configuration structure */
+struct pio2_cntr {
+        int mode;
+        int count;
+};
+
+struct pio2_card {
+        int id;
+        int bus;
+        long base;
+        int irq_vector;
+        int irq_level;
+        char variant[6];
+        int led;
+
+        struct vme_dev *vdev;
+        struct vme_resource *window;
+
+        struct gpio_chip gc;
+        struct pio2_io_bank bank[4];
+
+        struct pio2_cntr cntr[6];
+};
+
+int pio2_cntr_reset(struct pio2_card *);
+
+int pio2_gpio_reset(struct pio2_card *);
+int __init pio2_gpio_init(struct pio2_card *);
+void __exit pio2_gpio_exit(struct pio2_card *);
+
+#endif /* _VME_PIO2_H_ */
diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
new file mode 100644
index 000000000000..08e0d59806ca
--- /dev/null
+++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
@@ -0,0 +1,71 @@
+/*
+ * GE PIO2 Counter Driver
+ *
+ * Author: Martyn Welch <martyn.welch@ge.com>
+ * Copyright 2009 GE Intelligent Platforms Embedded Systems, 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
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ * The PIO-2 has 6 counters, currently this code just disables the interrupts
+ * and leaves them alone.
+ *
+ */
+
+#include <linux/device.h>
+#include <linux/types.h>
+#include <linux/gpio.h>
+
+#include "../vme.h"
+#include "vme_pio2.h"
+
+static int pio2_cntr_irq_set(struct pio2_card *card, int id)
+{
+        int retval;
+        u8 data;
+
+        data = PIO2_CNTR_SC_DEV[id] | PIO2_CNTR_RW_BOTH | card->cntr[id].mode;
+        retval = vme_master_write(card->window, &data, 1, PIO2_CNTR_CTRL[id]);
+        if (retval < 0)
+                return retval;
+
+        data = card->cntr[id].count & 0xFF;
+        retval = vme_master_write(card->window, &data, 1, PIO2_CNTR_DATA[id]);
+        if (retval < 0)
+                return retval;
+
+        data = (card->cntr[id].count >> 8) & 0xFF;
+        retval = vme_master_write(card->window, &data, 1, PIO2_CNTR_DATA[id]);
+        if (retval < 0)
+                return retval;
+
+        return 0;
+}
+
+int pio2_cntr_reset(struct pio2_card *card)
+{
+        int i, retval = 0;
+        u8 reg;
+
+        /* Clear down all timers */
+        for (i = 0; i < 6; i++) {
+                card->cntr[i].mode = PIO2_CNTR_MODE5;
+                card->cntr[i].count = 0;
+                retval = pio2_cntr_irq_set(card, i);
+                if (retval < 0)
+                        return retval;
+        }
+
+        /* Ensure all counter interrupts are cleared */
+        do {
+                retval = vme_master_read(card->window, &reg, 1,
+                        PIO2_REGS_INT_STAT_CNTR);
+                if (retval < 0)
+                        return retval;
+        } while (reg != 0);
+
+        return retval;
+}
+
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
new file mode 100644
index 000000000000..9fedc442a779
--- /dev/null
+++ b/drivers/staging/vme/devices/vme_pio2_core.c
@@ -0,0 +1,524 @@
+/*
+ * GE PIO2 6U VME I/O Driver
+ *
+ * Author: Martyn Welch <martyn.welch@ge.com>
+ * Copyright 2009 GE Intelligent Platforms Embedded Systems, 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
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/device.h>
+#include <linux/ctype.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+
+#include "../vme.h"
+#include "vme_pio2.h"
+
+
+static const char driver_name[] = "pio2";
+
+static int bus[PIO2_CARDS_MAX];
+static int bus_num;
+static long base[PIO2_CARDS_MAX];
+static int base_num;
+static int vector[PIO2_CARDS_MAX];
+static int vector_num;
+static int level[PIO2_CARDS_MAX];
+static int level_num;
+static const char *variant[PIO2_CARDS_MAX];
+static int variant_num;
+
+static int loopback;
+
+static int pio2_match(struct vme_dev *);
+static int __devinit pio2_probe(struct vme_dev *);
+static int __devexit pio2_remove(struct vme_dev *);
+
+static int pio2_get_led(struct pio2_card *card)
+{
+        /* Can't read hardware, state saved in structure */
+        return card->led;
+}
+
+static int pio2_set_led(struct pio2_card *card, int state)
+{
+        u8 reg;
+        int retval;
+
+        reg = card->irq_level;
+
+        /* Register state inverse of led state */
+        if (!state)
+                reg |= PIO2_LED;
+
+        if (loopback)
+                reg |= PIO2_LOOP;
+
+        retval = vme_master_write(card->window, &reg, 1, PIO2_REGS_CTRL);
+        if (retval < 0)
+                return retval;
+
+        card->led = state ? 1 : 0;
+
+        return 0;
+}
+
+static void pio2_int(int level, int vector, void *ptr)
+{
+        int vec, i, channel, retval;
+        u8 reg;
+        struct pio2_card *card  = ptr;
+
+        vec = vector & ~PIO2_VME_VECTOR_MASK;
+
+        switch (vec) {
+        case 0:
+                dev_warn(&card->vdev->dev, "Spurious Interrupt\n");
+                break;
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+                /* Channels 0 to 7 */
+                retval = vme_master_read(card->window, &reg, 1,
+                        PIO2_REGS_INT_STAT[vec - 1]);
+                if (retval < 0) {
+                        dev_err(&card->vdev->dev,
+                                "Unable to read IRQ status register\n");
+                        return;
+                }
+                for (i = 0; i < 8; i++) {
+                        channel = ((vec - 1) * 8) + i;
+                        if (reg & PIO2_CHANNEL_BIT[channel])
+                                dev_info(&card->vdev->dev,
+                                        "Interrupt on I/O channel %d\n",
+                                        channel);
+                }
+                break;
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+        case 10:
+                /* Counters are dealt with by their own handler */
+                dev_err(&card->vdev->dev,
+                        "Counter interrupt\n");
+                break;
+        }
+}
+
+
+/*
+ * We return whether this has been successful - this is used in the probe to
+ * ensure we have a valid card.
+ */
+static int pio2_reset_card(struct pio2_card *card)
+{
+        int retval = 0;
+        u8 data = 0;
+
+        /* Clear main register*/
+        retval = vme_master_write(card->window, &data, 1, PIO2_REGS_CTRL);
+        if (retval < 0)
+                return retval;
+
+        /* Clear VME vector */
+        retval = vme_master_write(card->window, &data, 1, PIO2_REGS_VME_VECTOR);
+        if (retval < 0)
+                return retval;
+
+        /* Reset GPIO */
+        retval = pio2_gpio_reset(card);
+        if (retval < 0)
+                return retval;
+
+        /* Reset counters */
+        retval = pio2_cntr_reset(card);
+        if (retval < 0)
+                return retval;
+
+        return 0;
+}
+
+static struct vme_driver pio2_driver = {
+        .name = driver_name,
+        .match = pio2_match,
+        .probe = pio2_probe,
+        .remove = __devexit_p(pio2_remove),
+};
+
+
+static int __init pio2_init(void)
+{
+        int retval = 0;
+
+        if (bus_num == 0) {
+                printk(KERN_ERR "%s: No cards, skipping registration\n",
+                        driver_name);
+                goto err_nocard;
+        }
+
+        if (bus_num > PIO2_CARDS_MAX) {
+                printk(KERN_ERR
+                        "%s: Driver only able to handle %d PIO2 Cards\n",
+                        driver_name, PIO2_CARDS_MAX);
+                bus_num = PIO2_CARDS_MAX;
+        }
+
+        /* Register the PIO2 driver */
+        retval = vme_register_driver(&pio2_driver, bus_num);
+        if (retval != 0)
+                goto err_reg;
+
+        return retval;
+
+err_reg:
+err_nocard:
+        return retval;
+}
+
+static int pio2_match(struct vme_dev *vdev)
+{
+
+        if (vdev->num >= bus_num) {
+                dev_err(&vdev->dev,
+                        "The enumeration of the VMEbus to which the board is connected must be specified");
+                return 0;
+        }
+
+        if (vdev->num >= base_num) {
+                dev_err(&vdev->dev,
+                        "The VME address for the cards registers must be specified");
+                return 0;
+        }
+
+        if (vdev->num >= vector_num) {
+                dev_err(&vdev->dev,
+                        "The IRQ vector used by the card must be specified");
+                return 0;
+        }
+
+        if (vdev->num >= level_num) {
+                dev_err(&vdev->dev,
+                        "The IRQ level used by the card must be specified");
+                return 0;
+        }
+
+        if (vdev->num >= variant_num) {
+                dev_err(&vdev->dev, "The variant of the card must be specified");
+                return 0;
+        }
+
+        return 1;
+}
+
+static int __devinit pio2_probe(struct vme_dev *vdev)
+{
+        struct pio2_card *card;
+        int retval;
+        int i;
+        u8 reg;
+        int vec;
+
+        card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
+        if (card == NULL) {
+                dev_err(&vdev->dev, "Unable to allocate card structure\n");
+                retval = -ENOMEM;
+                goto err_struct;
+        }
+
+        card->id = vdev->num;
+        card->bus = bus[card->id];
+        card->base = base[card->id];
+        card->irq_vector = vector[card->id];
+        card->irq_level = level[card->id] & PIO2_VME_INT_MASK;
+        strncpy(card->variant, variant[card->id], PIO2_VARIANT_LENGTH);
+        card->vdev = vdev;
+
+        for (i = 0; i < PIO2_VARIANT_LENGTH; i++) {
+
+                if (isdigit(card->variant[i]) == 0) {
+                        dev_err(&card->vdev->dev, "Variant invalid\n");
+                        retval = -EINVAL;
+                        goto err_variant;
+                }
+        }
+
+        /*
+         * Bottom 4 bits of VME interrupt vector used to determine source,
+         * provided vector should only use upper 4 bits.
+         */
+        if (card->irq_vector & ~PIO2_VME_VECTOR_MASK) {
+                dev_err(&card->vdev->dev,
+                        "Invalid VME IRQ Vector, vector must not use lower 4 bits\n");
+                retval = -EINVAL;
+                goto err_vector;
+        }
+
+        /*
+         * There is no way to determine the build variant or whether each bank
+         * is input, output or both at run time. The inputs are also inverted
+         * if configured as both.
+         *
+         * We pass in the board variant and use that to determine the
+         * configuration of the banks.
+         */
+        for (i = 1; i < PIO2_VARIANT_LENGTH; i++) {
+                switch (card->variant[i]) {
+                case '0':
+                        card->bank[i-1].config = NOFIT;
+                        break;
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                        card->bank[i-1].config = INPUT;
+                        break;
+                case '5':
+                        card->bank[i-1].config = OUTPUT;
+                        break;
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                        card->bank[i-1].config = BOTH;
+                        break;
+                }
+        }
+
+        /* Get a master window and position over regs */
+        card->window = vme_master_request(vdev, VME_A24, VME_SCT, VME_D16);
+        if (card->window == NULL) {
+                dev_err(&card->vdev->dev,
+                        "Unable to assign VME master resource\n");
+                retval = -EIO;
+                goto err_window;
+        }
+
+        retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
+                (VME_SCT | VME_USER | VME_DATA), VME_D16);
+        if (retval) {
+                dev_err(&card->vdev->dev,
+                        "Unable to configure VME master resource\n");
+                goto err_set;
+        }
+
+        /*
+         * There is also no obvious register which we can probe to determine
+         * whether the provided base is valid. If we can read the "ID Register"
+         * offset and the reset function doesn't error, assume we have a valid
+         * location.
+         */
+        retval = vme_master_read(card->window, &reg, 1, PIO2_REGS_ID);
+        if (retval < 0) {
+                dev_err(&card->vdev->dev, "Unable to read from device\n");
+                goto err_read;
+        }
+
+        dev_dbg(&card->vdev->dev, "ID Register:%x\n", reg);
+
+        /*
+         * Ensure all the I/O is cleared. We can't read back the states, so
+         * this is the only method we have to ensure that the I/O is in a known
+         * state.
+         */
+        retval = pio2_reset_card(card);
+        if (retval) {
+                dev_err(&card->vdev->dev,
+                        "Failed to reset card, is location valid?");
+                retval = -ENODEV;
+                goto err_reset;
+        }
+
+        /* Configure VME Interrupts */
+        reg = card->irq_level;
+        if (pio2_get_led(card))
+                reg |= PIO2_LED;
+        if (loopback)
+                reg |= PIO2_LOOP;
+        retval = vme_master_write(card->window, &reg, 1, PIO2_REGS_CTRL);
+        if (retval < 0)
+                return retval;
+
+        /* Set VME vector */
+        retval = vme_master_write(card->window, &card->irq_vector, 1,
+                PIO2_REGS_VME_VECTOR);
+        if (retval < 0)
+                return retval;
+
+        /* Attach spurious interrupt handler. */
+        vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
+
+        retval = vme_irq_request(vdev, card->irq_level, vec,
+                &pio2_int, (void *)card);
+        if (retval < 0) {
+                dev_err(&card->vdev->dev,
+                        "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
+                         vec, card->irq_level);
+                goto err_irq;
+        }
+
+        /* Attach GPIO interrupt handlers. */
+        for (i = 0; i < 4; i++) {
+                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
+
+                retval = vme_irq_request(vdev, card->irq_level, vec,
+                        &pio2_int, (void *)card);
+                if (retval < 0) {
+                        dev_err(&card->vdev->dev,
+                                "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
+                                 vec, card->irq_level);
+                        goto err_gpio_irq;
+                }
+        }
+
+        /* Attach counter interrupt handlers. */
+        for (i = 0; i < 6; i++) {
+                vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
+
+                retval = vme_irq_request(vdev, card->irq_level, vec,
+                        &pio2_int, (void *)card);
+                if (retval < 0) {
+                        dev_err(&card->vdev->dev,
+                                "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
+                                vec, card->irq_level);
+                        goto err_cntr_irq;
+                }
+        }
+
+        /* Register IO */
+        retval = pio2_gpio_init(card);
+        if (retval < 0) {
+                dev_err(&card->vdev->dev,
+                        "Unable to register with GPIO framework\n");
+                goto err_gpio;
+        }
+
+        /* Set LED - This also sets interrupt level */
+        retval = pio2_set_led(card, 0);
+        if (retval < 0) {
+                dev_err(&card->vdev->dev, "Unable to set LED\n");
+                goto err_led;
+        }
+
+        dev_set_drvdata(&card->vdev->dev, card);
+
+        dev_info(&card->vdev->dev,
+                "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
+                card->base);
+
+        return 0;
+
+err_led:
+        pio2_gpio_exit(card);
+err_gpio:
+        i = 6;
+err_cntr_irq:
+        while (i > 0) {
+                i--;
+                vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
+                vme_irq_free(vdev, card->irq_level, vec);
+        }
+
+        i = 4;
+err_gpio_irq:
+        while (i > 0) {
+                i--;
+                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
+                vme_irq_free(vdev, card->irq_level, vec);
+        }
+
+        vec = (card->irq_vector & PIO2_VME_VECTOR_MASK) | PIO2_VME_VECTOR_SPUR;
+        vme_irq_free(vdev, card->irq_level, vec);
+err_irq:
+         pio2_reset_card(card);
+err_reset:
+err_read:
+        vme_master_set(card->window, 0, 0, 0, VME_A16, 0, VME_D16);
+err_set:
+        vme_master_free(card->window);
+err_window:
+err_vector:
+err_variant:
+        kfree(card);
+err_struct:
+        return retval;
+}
+
+static int __devexit pio2_remove(struct vme_dev *vdev)
+{
+        int vec;
+        int i;
+
+        struct pio2_card *card = dev_get_drvdata(&vdev->dev);
+
+        pio2_gpio_exit(card);
+
+        for (i = 0; i < 6; i++) {
+                vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
+                vme_irq_free(vdev, card->irq_level, vec);
+        }
+
+        for (i = 0; i < 4; i++) {
+                vec = card->irq_vector | PIO2_VECTOR_BANK[i];
+                vme_irq_free(vdev, card->irq_level, vec);
+        }
+
+        vec = (card->irq_vector & PIO2_VME_VECTOR_MASK) | PIO2_VME_VECTOR_SPUR;
+        vme_irq_free(vdev, card->irq_level, vec);
+
+        pio2_reset_card(card);
+
+        vme_master_set(card->window, 0, 0, 0, VME_A16, 0, VME_D16);
+
+        vme_master_free(card->window);
+
+        kfree(card);
+
+        return 0;
+}
+
+static void __exit pio2_exit(void)
+{
+        vme_unregister_driver(&pio2_driver);
+}
+
+
+/* These are required for each board */
+MODULE_PARM_DESC(bus, "Enumeration of VMEbus to which the board is connected");
+module_param_array(bus, int, &bus_num, S_IRUGO);
+
+MODULE_PARM_DESC(base, "Base VME address for PIO2 Registers");
+module_param_array(base, long, &base_num, S_IRUGO);
+
+MODULE_PARM_DESC(vector, "VME IRQ Vector (Lower 4 bits masked)");
+module_param_array(vector, int, &vector_num, S_IRUGO);
+
+MODULE_PARM_DESC(level, "VME IRQ Level");
+module_param_array(level, int, &level_num, S_IRUGO);
+
+MODULE_PARM_DESC(variant, "Last 4 characters of PIO2 board variant");
+module_param_array(variant, charp, &variant_num, S_IRUGO);
+
+/* This is for debugging */
+MODULE_PARM_DESC(loopback, "Enable loopback mode on all cards");
+module_param(loopback, bool, S_IRUGO);
+
+MODULE_DESCRIPTION("GE PIO2 6U VME I/O Driver");
+MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com");
+MODULE_LICENSE("GPL");
+
+module_init(pio2_init);
+module_exit(pio2_exit);
+
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
new file mode 100644
index 000000000000..dc837deb99dd
--- /dev/null
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -0,0 +1,232 @@
+/*
+ * GE PIO2 GPIO Driver
+ *
+ * Author: Martyn Welch <martyn.welch@ge.com>
+ * Copyright 2009 GE Intelligent Platforms Embedded Systems, 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
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/ctype.h>
+#include <linux/gpio.h>
+#include <linux/slab.h>
+
+#include "../vme.h"
+#include "vme_pio2.h"
+
+static const char driver_name[] = "pio2_gpio";
+
+static struct pio2_card *gpio_to_pio2_card(struct gpio_chip *chip)
+{
+        return container_of(chip, struct pio2_card, gc);
+}
+
+static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
+{
+        u8 reg;
+        int retval;
+        struct pio2_card *card = gpio_to_pio2_card(chip);
+
+        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
+                (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+
+                dev_err(&card->vdev->dev, "Channel not available as input\n");
+                return 0;
+        }
+
+        retval = vme_master_read(card->window, &reg, 1,
+                PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+        if (retval < 0) {
+                dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
+                return 0;
+        }
+
+        /*
+         * Remember, input on channels configured as both input and output
+         * are inverted!
+         */
+        if (reg & PIO2_CHANNEL_BIT[offset]) {
+                if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
+                        return 0;
+                else
+                        return 1;
+        } else {
+                if (card->bank[PIO2_CHANNEL_BANK[offset]].config != BOTH)
+                        return 1;
+                else
+                        return 0;
+        }
+}
+
+static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
+        int value)
+{
+        u8 reg;
+        int retval;
+        struct pio2_card *card = gpio_to_pio2_card(chip);
+
+        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
+                (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+
+                dev_err(&card->vdev->dev, "Channel not availabe as output\n");
+                return;
+        }
+
+        if (value)
+                reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
+                        PIO2_CHANNEL_BIT[offset];
+        else
+                reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
+                        ~PIO2_CHANNEL_BIT[offset];
+
+        retval = vme_master_write(card->window, &reg, 1,
+                PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
+        if (retval < 0) {
+                dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
+                return;
+        }
+
+        card->bank[PIO2_CHANNEL_BANK[offset]].value = reg;
+}
+
+/* Directionality configured at board build - send appropriate response */
+static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
+{
+        int data;
+        struct pio2_card *card = gpio_to_pio2_card(chip);
+
+        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
+                (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+                dev_err(&card->vdev->dev,
+                        "Channel directionality not configurable at runtine\n");
+
+                data = -EINVAL;
+        } else {
+                data = 0;
+        }
+
+        return data;
+}
+
+/* Directionality configured at board build - send appropriate response */
+static int pio2_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
+{
+        int data;
+        struct pio2_card *card = gpio_to_pio2_card(chip);
+
+        if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
+                (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
+                dev_err(&card->vdev->dev,
+                        "Channel directionality not configurable at runtine\n");
+
+                data = -EINVAL;
+        } else {
+                data = 0;
+        }
+
+        return data;
+}
+
+/*
+ * We return whether this has been successful - this is used in the probe to
+ * ensure we have a valid card.
+ */
+int pio2_gpio_reset(struct pio2_card *card)
+{
+        int retval = 0;
+        int i, j;
+
+        u8 data = 0;
+
+        /* Zero output registers */
+        for (i = 0; i < 4; i++) {
+                retval = vme_master_write(card->window, &data, 1,
+                        PIO2_REGS_DATA[i]);
+                if (retval < 0)
+                        return retval;
+                card->bank[i].value = 0;
+        }
+
+        /* Set input interrupt masks */
+        for (i = 0; i < 4; i++) {
+                retval = vme_master_write(card->window, &data, 1,
+                        PIO2_REGS_INT_MASK[i * 2]);
+                if (retval < 0)
+                        return retval;
+
+                retval = vme_master_write(card->window, &data, 1,
+                        PIO2_REGS_INT_MASK[(i * 2) + 1]);
+                if (retval < 0)
+                        return retval;
+
+                for (j = 0; j < 8; j++)
+                        card->bank[i].irq[j] = NONE;
+        }
+
+        /* Ensure all I/O interrupts are cleared */
+        for (i = 0; i < 4; i++) {
+                do {
+                        retval = vme_master_read(card->window, &data, 1,
+                                PIO2_REGS_INT_STAT[i]);
+                        if (retval < 0)
+                                return retval;
+                } while (data != 0);
+        }
+
+        return 0;
+}
+
+int __init pio2_gpio_init(struct pio2_card *card)
+{
+        int retval = 0;
+        char *label;
+
+        label = kmalloc(PIO2_NUM_CHANNELS, GFP_KERNEL);
+        if (label == NULL) {
+                dev_err(&card->vdev->dev, "Unable to allocate GPIO label\n");
+                return -ENOMEM;
+        }
+
+        sprintf(label, "%s@%s", driver_name, dev_name(&card->vdev->dev));
+        card->gc.label = label;
+
+        card->gc.ngpio = PIO2_NUM_CHANNELS;
+        /* Dynamic allocation of base */
+        card->gc.base = -1;
+        /* Setup pointers to chip functions */
+        card->gc.direction_input = pio2_gpio_dir_in;
+        card->gc.direction_output = pio2_gpio_dir_out;
+        card->gc.get = pio2_gpio_get;
+        card->gc.set = pio2_gpio_set;
+
+        /* This function adds a memory mapped GPIO chip */
+        retval = gpiochip_add(&(card->gc));
+        if (retval) {
+                dev_err(&card->vdev->dev, "Unable to register GPIO\n");
+                kfree(card->gc.label);
+        }
+
+        return retval;
+};
+
+void __exit pio2_gpio_exit(struct pio2_card *card)
+{
+        const char *label = card->gc.label;
+
+        if (gpiochip_remove(&(card->gc)))
+                dev_err(&card->vdev->dev, "Failed to remove GPIO");
+
+        kfree(label);
+}
+
diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
index d85a1e9dbe3a..7d24cd6343e4 100644
--- a/drivers/staging/vme/devices/vme_user.h
+++ b/drivers/staging/vme/devices/vme_user.h
@@ -10,9 +10,9 @@ struct vme_master {
         int enable;                     /* State of Window */
         unsigned long long vme_addr;    /* Starting Address on the VMEbus */
         unsigned long long size;        /* Window Size */
-        vme_address_t aspace;           /* Address Space */
-        vme_cycle_t cycle;              /* Cycle properties */
-        vme_width_t dwidth;             /* Maximum Data Width */
+        u32 aspace;                     /* Address Space */
+        u32 cycle;              /* Cycle properties */
+        u32 dwidth;             /* Maximum Data Width */
 #if 0
         char prefetchEnable;            /* Prefetch Read Enable State */
         int prefetchSize;               /* Prefetch Read Size (Cache Lines) */
@@ -34,8 +34,8 @@ struct vme_slave {
         int enable;                     /* State of Window */
         unsigned long long vme_addr;    /* Starting Address on the VMEbus */
         unsigned long long size;        /* Window Size */
-        vme_address_t aspace;           /* Address Space */
-        vme_cycle_t cycle;              /* Cycle properties */
+        u32 aspace;                     /* Address Space */
+        u32 cycle;              /* Cycle properties */
 #if 0
         char wrPostEnable;              /* Write Post State */
         char rmwLock;                   /* Lock PCI during RMW Cycles */
diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c
index b04b4688f705..70722ae52321 100644
--- a/drivers/staging/vme/vme.c
+++ b/drivers/staging/vme/vme.c
@@ -153,9 +153,7 @@ size_t vme_get_size(struct vme_resource *resource)
         int enabled, retval;
         unsigned long long base, size;
         dma_addr_t buf_base;
-        vme_address_t aspace;
-        vme_cycle_t cycle;
-        vme_width_t dwidth;
+        u32 aspace, cycle, dwidth;
 
         switch (resource->type) {
         case VME_MASTER:
@@ -181,7 +179,7 @@ size_t vme_get_size(struct vme_resource *resource)
 }
 EXPORT_SYMBOL(vme_get_size);
 
-static int vme_check_window(vme_address_t aspace, unsigned long long vme_base,
+static int vme_check_window(u32 aspace, unsigned long long vme_base,
         unsigned long long size)
 {
         int retval = 0;
@@ -232,8 +230,8 @@ static int vme_check_window(vme_address_t aspace, unsigned long long vme_base,
  * Request a slave image with specific attributes, return some unique
  * identifier.
  */
-struct vme_resource *vme_slave_request(struct vme_dev *vdev,
-        vme_address_t address, vme_cycle_t cycle)
+struct vme_resource *vme_slave_request(struct vme_dev *vdev, u32 address,
+        u32 cycle)
 {
         struct vme_bridge *bridge;
         struct list_head *slave_pos = NULL;
@@ -298,7 +296,7 @@ EXPORT_SYMBOL(vme_slave_request);
 
 int vme_slave_set(struct vme_resource *resource, int enabled,
         unsigned long long vme_base, unsigned long long size,
-        dma_addr_t buf_base, vme_address_t aspace, vme_cycle_t cycle)
+        dma_addr_t buf_base, u32 aspace, u32 cycle)
 {
         struct vme_bridge *bridge = find_bridge(resource);
         struct vme_slave_resource *image;
@@ -333,7 +331,7 @@ EXPORT_SYMBOL(vme_slave_set);
 
 int vme_slave_get(struct vme_resource *resource, int *enabled,
         unsigned long long *vme_base, unsigned long long *size,
-        dma_addr_t *buf_base, vme_address_t *aspace, vme_cycle_t *cycle)
+        dma_addr_t *buf_base, u32 *aspace, u32 *cycle)
 {
         struct vme_bridge *bridge = find_bridge(resource);
         struct vme_slave_resource *image;
@@ -388,8 +386,8 @@ EXPORT_SYMBOL(vme_slave_free);
  * Request a master image with specific attributes, return some unique
  * identifier.
  */
-struct vme_resource *vme_master_request(struct vme_dev *vdev,
-        vme_address_t address, vme_cycle_t cycle, vme_width_t dwidth)
+struct vme_resource *vme_master_request(struct vme_dev *vdev, u32 address,
+        u32 cycle, u32 dwidth)
 {
         struct vme_bridge *bridge;
         struct list_head *master_pos = NULL;
@@ -456,8 +454,8 @@ err_bus:
 EXPORT_SYMBOL(vme_master_request);
 
 int vme_master_set(struct vme_resource *resource, int enabled,
-        unsigned long long vme_base, unsigned long long size,
-        vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
+        unsigned long long vme_base, unsigned long long size, u32 aspace,
+        u32 cycle, u32 dwidth)
 {
         struct vme_bridge *bridge = find_bridge(resource);
         struct vme_master_resource *image;
@@ -492,8 +490,8 @@ int vme_master_set(struct vme_resource *resource, int enabled,
 EXPORT_SYMBOL(vme_master_set);
 
 int vme_master_get(struct vme_resource *resource, int *enabled,
-        unsigned long long *vme_base, unsigned long long *size,
-        vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
+        unsigned long long *vme_base, unsigned long long *size, u32 *aspace,
+        u32 *cycle, u32 *dwidth)
 {
         struct vme_bridge *bridge = find_bridge(resource);
         struct vme_master_resource *image;
@@ -646,8 +644,7 @@ EXPORT_SYMBOL(vme_master_free);
  * Request a DMA controller with specific attributes, return some unique
  * identifier.
  */
-struct vme_resource *vme_dma_request(struct vme_dev *vdev,
-        vme_dma_route_t route)
+struct vme_resource *vme_dma_request(struct vme_dev *vdev, u32 route)
 {
         struct vme_bridge *bridge;
         struct list_head *dma_pos = NULL;
@@ -743,8 +740,7 @@ EXPORT_SYMBOL(vme_new_dma_list);
 /*
  * Create "Pattern" type attributes
  */
-struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern,
-        vme_pattern_t type)
+struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type)
 {
         struct vme_dma_attr *attributes;
         struct vme_dma_pattern *pattern_attr;
@@ -822,7 +818,7 @@ EXPORT_SYMBOL(vme_dma_pci_attribute);
  * Create "VME" type attributes
  */
 struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address,
-        vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
+        u32 aspace, u32 cycle, u32 dwidth)
 {
         struct vme_dma_attr *attributes;
         struct vme_dma_vme *vme_attr;
@@ -1173,7 +1169,7 @@ int vme_lm_count(struct vme_resource *resource)
 EXPORT_SYMBOL(vme_lm_count);
 
 int vme_lm_set(struct vme_resource *resource, unsigned long long lm_base,
-        vme_address_t aspace, vme_cycle_t cycle)
+        u32 aspace, u32 cycle)
 {
         struct vme_bridge *bridge = find_bridge(resource);
         struct vme_lm_resource *lm;
@@ -1195,7 +1191,7 @@ int vme_lm_set(struct vme_resource *resource, unsigned long long lm_base,
 EXPORT_SYMBOL(vme_lm_set);
 
 int vme_lm_get(struct vme_resource *resource, unsigned long long *lm_base,
-        vme_address_t *aspace, vme_cycle_t *cycle)
+        u32 *aspace, u32 *cycle)
 {
         struct vme_bridge *bridge = find_bridge(resource);
         struct vme_lm_resource *lm;
@@ -1307,7 +1303,12 @@ EXPORT_SYMBOL(vme_slot_get);
 
 /* - Bridge Registration --------------------------------------------------- */
 
-static int vme_add_bus(struct vme_bridge *bridge)
+static void vme_dev_release(struct device *dev)
+{
+        kfree(dev_to_vme_dev(dev));
+}
+
+int vme_register_bridge(struct vme_bridge *bridge)
 {
         int i;
         int ret = -1;
@@ -1327,8 +1328,9 @@ static int vme_add_bus(struct vme_bridge *bridge)
 
         return ret;
 }
+EXPORT_SYMBOL(vme_register_bridge);
 
-static void vme_remove_bus(struct vme_bridge *bridge)
+void vme_unregister_bridge(struct vme_bridge *bridge)
 {
         struct vme_dev *vdev;
         struct vme_dev *tmp;
@@ -1343,22 +1345,6 @@ static void vme_remove_bus(struct vme_bridge *bridge)
         list_del(&bridge->bus_list);
         mutex_unlock(&vme_buses_lock);
 }
-
-static void vme_dev_release(struct device *dev)
-{
-        kfree(dev_to_vme_dev(dev));
-}
-
-int vme_register_bridge(struct vme_bridge *bridge)
-{
-        return vme_add_bus(bridge);
-}
-EXPORT_SYMBOL(vme_register_bridge);
-
-void vme_unregister_bridge(struct vme_bridge *bridge)
-{
-        vme_remove_bus(bridge);
-}
 EXPORT_SYMBOL(vme_unregister_bridge);
 
 /* - Driver Registration --------------------------------------------------- */
@@ -1421,10 +1407,7 @@ static int __vme_register_driver(struct vme_driver *drv, unsigned int ndevs)
                  * and if the bridge is removed, it will have to go through
                  * vme_unregister_bridge() to do it (which calls remove() on
                  * the bridge which in turn tries to acquire vme_buses_lock and
-                 * will have to wait). The probe() called after device
-                 * registration in __vme_register_driver below will also fail
-                 * as the bridge is being removed (since the probe() calls
-                 * vme_bridge_get()).
+                 * will have to wait).
                  */
                 err = __vme_register_driver_bus(drv, bridge, ndevs);
                 if (err)
diff --git a/drivers/staging/vme/vme.h b/drivers/staging/vme/vme.h
index e3828badca61..9d38ceed60e2 100644
--- a/drivers/staging/vme/vme.h
+++ b/drivers/staging/vme/vme.h
@@ -10,7 +10,6 @@ enum vme_resource_type {
 };
 
 /* VME Address Spaces */
-typedef u32 vme_address_t;
 #define VME_A16         0x1
 #define VME_A24         0x2
 #define VME_A32         0x4
@@ -29,7 +28,6 @@ typedef u32 vme_address_t;
 
 
 /* VME Cycle Types */
-typedef u32 vme_cycle_t;
 #define VME_SCT         0x1
 #define VME_BLT         0x2
 #define VME_MBLT        0x4
@@ -47,28 +45,23 @@ typedef u32 vme_cycle_t;
 #define VME_DATA        0x8000
 
 /* VME Data Widths */
-typedef u32 vme_width_t;
 #define VME_D8          0x1
 #define VME_D16         0x2
 #define VME_D32         0x4
 #define VME_D64         0x8
 
 /* Arbitration Scheduling Modes */
-typedef u32 vme_arbitration_t;
 #define VME_R_ROBIN_MODE        0x1
 #define VME_PRIORITY_MODE       0x2
 
-typedef u32 vme_dma_t;
 #define VME_DMA_PATTERN                 (1<<0)
 #define VME_DMA_PCI                     (1<<1)
 #define VME_DMA_VME                     (1<<2)
 
-typedef u32 vme_pattern_t;
 #define VME_DMA_PATTERN_BYTE            (1<<0)
 #define VME_DMA_PATTERN_WORD            (1<<1)
 #define VME_DMA_PATTERN_INCREMENT       (1<<2)
 
-typedef u32 vme_dma_route_t;
 #define VME_DMA_VME_TO_MEM              (1<<0)
 #define VME_DMA_MEM_TO_VME              (1<<1)
 #define VME_DMA_VME_TO_VME              (1<<2)
@@ -77,7 +70,7 @@ typedef u32 vme_dma_route_t;
 #define VME_DMA_PATTERN_TO_MEM          (1<<5)
 
 struct vme_dma_attr {
-        vme_dma_t type;
+        u32 type;
         void *private;
 };
 
@@ -97,7 +90,7 @@ extern struct bus_type vme_bus_type;
 
 /**
  * Structure representing a VME device
- * @id: The ID of the device (currently the bus and slot number)
+ * @num: The device number
  * @bridge: Pointer to the bridge device this device is on
  * @dev: Internal device structure
  * @drv_list: List of devices (per driver)
@@ -128,32 +121,29 @@ void vme_free_consistent(struct vme_resource *, size_t,  void *,
 
 size_t vme_get_size(struct vme_resource *);
 
-struct vme_resource *vme_slave_request(struct vme_dev *, vme_address_t,
-        vme_cycle_t);
+struct vme_resource *vme_slave_request(struct vme_dev *, u32, u32);
 int vme_slave_set(struct vme_resource *, int, unsigned long long,
-        unsigned long long, dma_addr_t, vme_address_t, vme_cycle_t);
+        unsigned long long, dma_addr_t, u32, u32);
 int vme_slave_get(struct vme_resource *, int *, unsigned long long *,
-        unsigned long long *, dma_addr_t *, vme_address_t *, vme_cycle_t *);
+        unsigned long long *, dma_addr_t *, u32 *, u32 *);
 void vme_slave_free(struct vme_resource *);
 
-struct vme_resource *vme_master_request(struct vme_dev *, vme_address_t,
-        vme_cycle_t, vme_width_t);
+struct vme_resource *vme_master_request(struct vme_dev *, u32, u32, u32);
 int vme_master_set(struct vme_resource *, int, unsigned long long,
-        unsigned long long, vme_address_t, vme_cycle_t, vme_width_t);
+        unsigned long long, u32, u32, u32);
 int vme_master_get(struct vme_resource *, int *, unsigned long long *,
-        unsigned long long *, vme_address_t *, vme_cycle_t *, vme_width_t *);
+        unsigned long long *, u32 *, u32 *, u32 *);
 ssize_t vme_master_read(struct vme_resource *, void *, size_t, loff_t);
 ssize_t vme_master_write(struct vme_resource *, void *, size_t, loff_t);
 unsigned int vme_master_rmw(struct vme_resource *, unsigned int, unsigned int,
         unsigned int, loff_t);
 void vme_master_free(struct vme_resource *);
 
-struct vme_resource *vme_dma_request(struct vme_dev *, vme_dma_route_t);
+struct vme_resource *vme_dma_request(struct vme_dev *, u32);
 struct vme_dma_list *vme_new_dma_list(struct vme_resource *);
-struct vme_dma_attr *vme_dma_pattern_attribute(u32, vme_pattern_t);
+struct vme_dma_attr *vme_dma_pattern_attribute(u32, u32);
 struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t);
-struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long, vme_address_t,
-        vme_cycle_t, vme_width_t);
+struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long, u32, u32, u32);
 void vme_dma_free_attribute(struct vme_dma_attr *);
 int vme_dma_list_add(struct vme_dma_list *, struct vme_dma_attr *,
         struct vme_dma_attr *, size_t);
@@ -168,10 +158,8 @@ int vme_irq_generate(struct vme_dev *, int, int);
 
 struct vme_resource * vme_lm_request(struct vme_dev *);
 int vme_lm_count(struct vme_resource *);
-int vme_lm_set(struct vme_resource *, unsigned long long, vme_address_t,
-        vme_cycle_t);
-int vme_lm_get(struct vme_resource *, unsigned long long *, vme_address_t *,
-        vme_cycle_t *);
+int vme_lm_set(struct vme_resource *, unsigned long long, u32, u32);
+int vme_lm_get(struct vme_resource *, unsigned long long *, u32 *, u32 *);
 int vme_lm_attach(struct vme_resource *, int, void (*callback)(int));
 int vme_lm_detach(struct vme_resource *, int);
 void vme_lm_free(struct vme_resource *);
diff --git a/drivers/staging/vme/vme_api.txt b/drivers/staging/vme/vme_api.txt
index e8ff2151a487..856efa35f6e3 100644
--- a/drivers/staging/vme/vme_api.txt
+++ b/drivers/staging/vme/vme_api.txt
@@ -86,26 +86,26 @@ driver allows a resource to be assigned based on the required attributes of the
 driver in question:
 
         struct vme_resource * vme_master_request(struct vme_dev *dev,
-                vme_address_t aspace, vme_cycle_t cycle, vme_width_t width);
-
-        struct vme_resource * vme_slave_request(struct vme_dev *dev,
-                vme_address_t aspace, vme_cycle_t cycle);
-
-        struct vme_resource *vme_dma_request(struct vme_dev *dev,
-                vme_dma_route_t route);
-
-For slave windows these attributes are split into those of type 'vme_address_t'
-and 'vme_cycle_t'. Master windows add a further set of attributes
-'vme_cycle_t'.  These attributes are defined as bitmasks and as such any
-combination of the attributes can be requested for a single window, the core
-will assign a window that meets the requirements, returning a pointer of type
-vme_resource that should be used to identify the allocated resource when it is
-used. For DMA controllers, the request function requires the potential
-direction of any transfers to be provided in the route attributes. This is
-typically VME-to-MEM and/or MEM-to-VME, though some hardware can support
-VME-to-VME and MEM-to-MEM transfers as well as test pattern generation. If an
-unallocated window fitting the requirements can not be found a NULL pointer
-will be returned.
+                u32 aspace, u32 cycle, u32 width);
+
+        struct vme_resource * vme_slave_request(struct vme_dev *dev, u32 aspace,
+                u32 cycle);
+
+        struct vme_resource *vme_dma_request(struct vme_dev *dev, u32 route);
+
+For slave windows these attributes are split into the VME address spaces that
+need to be accessed in 'aspace' and VME bus cycle types required in 'cycle'.
+Master windows add a further set of attributes in 'width' specifying the
+required data transfer widths. These attributes are defined as bitmasks and as
+such any combination of the attributes can be requested for a single window,
+the core will assign a window that meets the requirements, returning a pointer
+of type vme_resource that should be used to identify the allocated resource
+when it is used. For DMA controllers, the request function requires the
+potential direction of any transfers to be provided in the route attributes.
+This is typically VME-to-MEM and/or MEM-to-VME, though some hardware can
+support VME-to-VME and MEM-to-MEM transfers as well as test pattern generation.
+If an unallocated window fitting the requirements can not be found a NULL
+pointer will be returned.
 
 Functions are also provided to free window allocations once they are no longer
 required. These functions should be passed the pointer to the resource provided
@@ -133,12 +133,12 @@ Once a master window has been assigned the following functions can be used to
 configure it and retrieve the current settings:
 
         int vme_master_set (struct vme_resource *res, int enabled,
-                unsigned long long base, unsigned long long size,
-                vme_address_t aspace, vme_cycle_t cycle, vme_width_t width);
+                unsigned long long base, unsigned long long size, u32 aspace,
+                u32 cycle, u32 width);
 
         int vme_master_get (struct vme_resource *res, int *enabled,
-                unsigned long long *base, unsigned long long *size,
-                vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *width);
+                unsigned long long *base, unsigned long long *size, u32 *aspace,
+                u32 *cycle, u32 *width);
 
 The address spaces, transfer widths and cycle types are the same as described
 under resource management, however some of the options are mutually exclusive.
@@ -189,11 +189,11 @@ configure it and retrieve the current settings:
 
         int vme_slave_set (struct vme_resource *res, int enabled,
                 unsigned long long base, unsigned long long size,
-                dma_addr_t mem, vme_address_t aspace, vme_cycle_t cycle);
+                dma_addr_t mem, u32 aspace, u32 cycle);
 
         int vme_slave_get (struct vme_resource *res, int *enabled,
                 unsigned long long *base, unsigned long long *size,
-                dma_addr_t *mem, vme_address_t *aspace, vme_cycle_t *cycle);
+                dma_addr_t *mem, u32 *aspace, u32 *cycle);
 
 The address spaces, transfer widths and cycle types are the same as described
 under resource management, however some of the options are mutually exclusive.
@@ -273,8 +273,7 @@ and pattern sources and destinations (where appropriate):
 
 Pattern source:
 
-        struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern,
-                vme_pattern_t type);
+        struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type);
 
 PCI source or destination:
 
@@ -283,7 +282,7 @@ PCI source or destination:
 VME source or destination:
 
         struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long base,
-                vme_address_t aspace, vme_cycle_t cycle, vme_width_t width);
+                u32 aspace, u32 cycle, u32 width);
 
 The following function should be used to free an attribute:
 
@@ -366,10 +365,10 @@ Once a bank of location monitors has been allocated, the following functions
 are provided to configure the location and mode of the location monitor:
 
         int vme_lm_set(struct vme_resource *res, unsigned long long base,
-                vme_address_t aspace, vme_cycle_t cycle);
+                u32 aspace, u32 cycle);
 
         int vme_lm_get(struct vme_resource *res, unsigned long long *base,
-                vme_address_t *aspace, vme_cycle_t *cycle);
+                u32 *aspace, u32 *cycle);
 
 
 Location Monitor Use
diff --git a/drivers/staging/vme/vme_bridge.h b/drivers/staging/vme/vme_bridge.h
index c2deda2c38df..934949abd745 100644
--- a/drivers/staging/vme/vme_bridge.h
+++ b/drivers/staging/vme/vme_bridge.h
@@ -15,9 +15,9 @@ struct vme_master_resource {
         spinlock_t lock;
         int locked;
         int number;
-        vme_address_t address_attr;
-        vme_cycle_t cycle_attr;
-        vme_width_t width_attr;
+        u32 address_attr;
+        u32 cycle_attr;
+        u32 width_attr;
         struct resource bus_resource;
         void __iomem *kern_base;
 };
@@ -28,13 +28,13 @@ struct vme_slave_resource {
         struct mutex mtx;
         int locked;
         int number;
-        vme_address_t address_attr;
-        vme_cycle_t cycle_attr;
+        u32 address_attr;
+        u32 cycle_attr;
 };
 
 struct vme_dma_pattern {
         u32 pattern;
-        vme_pattern_t type;
+        u32 type;
 };
 
 struct vme_dma_pci {
@@ -43,9 +43,9 @@ struct vme_dma_pci {
 
 struct vme_dma_vme {
         unsigned long long address;
-        vme_address_t aspace;
-        vme_cycle_t cycle;
-        vme_width_t dwidth;
+        u32 aspace;
+        u32 cycle;
+        u32 dwidth;
 };
 
 struct vme_dma_list {
@@ -63,7 +63,7 @@ struct vme_dma_resource {
         int number;
         struct list_head pending;
         struct list_head running;
-        vme_dma_route_t route_attr;
+        u32 route_attr;
 };
 
 struct vme_lm_resource {
@@ -122,17 +122,16 @@ struct vme_bridge {
         /* Slave Functions */
         int (*slave_get) (struct vme_slave_resource *, int *,
                 unsigned long long *, unsigned long long *, dma_addr_t *,
-                vme_address_t *, vme_cycle_t *);
+                u32 *, u32 *);
         int (*slave_set) (struct vme_slave_resource *, int, unsigned long long,
-                unsigned long long, dma_addr_t, vme_address_t, vme_cycle_t);
+                unsigned long long, dma_addr_t, u32, u32);
 
         /* Master Functions */
         int (*master_get) (struct vme_master_resource *, int *,
-                unsigned long long *, unsigned long long *, vme_address_t *,
-                vme_cycle_t *, vme_width_t *);
+                unsigned long long *, unsigned long long *, u32 *, u32 *,
+                u32 *);
         int (*master_set) (struct vme_master_resource *, int,
-                unsigned long long, unsigned long long,  vme_address_t,
-                vme_cycle_t, vme_width_t);
+                unsigned long long, unsigned long long,  u32, u32, u32);
         ssize_t (*master_read) (struct vme_master_resource *, void *, size_t,
                 loff_t);
         ssize_t (*master_write) (struct vme_master_resource *, void *, size_t,
@@ -151,10 +150,9 @@ struct vme_bridge {
         int (*irq_generate) (struct vme_bridge *, int, int);
 
         /* Location monitor functions */
-        int (*lm_set) (struct vme_lm_resource *, unsigned long long,
-                vme_address_t, vme_cycle_t);
-        int (*lm_get) (struct vme_lm_resource *, unsigned long long *,
-                vme_address_t *, vme_cycle_t *);
+        int (*lm_set) (struct vme_lm_resource *, unsigned long long, u32, u32);
+        int (*lm_get) (struct vme_lm_resource *, unsigned long long *, u32 *,
+                u32 *);
         int (*lm_attach) (struct vme_lm_resource *, int, void (*callback)(int));
         int (*lm_detach) (struct vme_lm_resource *, int);
 
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index d8dd7846447d..3e8283c2dc73 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -3153,11 +3153,7 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
                 break;
 
         case SIOCGIWNWID:     //0x8b03  support
-        #ifdef  WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-          rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
-        #else
-        rc = -EOPNOTSUPP;
-        #endif
+                rc = -EOPNOTSUPP;
                 break;
 
                 // Set frequency/channel
diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index 432a20993c6e..7fd5cc5a55f6 100644
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -300,6 +300,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                         result = -EFAULT;
                         break;
                 }
+                if (sList.uItem > (ULONG_MAX - sizeof(SBSSIDList)) / sizeof(SBSSIDItem)) {
+                        result = -EINVAL;
+                        break;
+                }
                 pList = (PSBSSIDList)kmalloc(sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)), (int)GFP_ATOMIC);
                 if (pList == NULL) {
                         result = -ENOMEM;
@@ -571,6 +575,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                         result = -EFAULT;
                         break;
                 }
+                if (sNodeList.uItem > (ULONG_MAX - sizeof(SNodeList)) / sizeof(SNodeItem)) {
+                        result = -EINVAL;
+                        break;
+                }
                 pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
                 if (pNodeList == NULL) {
                         result = -ENOMEM;
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 5e425d1476b8..87288db21785 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -151,18 +151,6 @@ int iwctl_giwname(struct net_device *dev,
         return 0;
 }
 
-int iwctl_giwnwid(struct net_device *dev,
-             struct iw_request_info *info,
-                         struct iw_param *wrq,
-                   char *extra)
-{
-        //wrq->value = 0x100;
-        //wrq->disabled = 0;
-        //wrq->fixed = 1;
-        //return 0;
-  return -EOPNOTSUPP;
-}
-
 /*
  * Wireless Handler : set scan
  */
diff --git a/drivers/staging/vt6655/iwctl.h b/drivers/staging/vt6655/iwctl.h
index 3096de0ba1bd..d224f913a624 100644
--- a/drivers/staging/vt6655/iwctl.h
+++ b/drivers/staging/vt6655/iwctl.h
@@ -79,11 +79,6 @@ int iwctl_giwname(struct net_device *dev,
                          char *wrq,
                          char *extra);
 
-int iwctl_giwnwid(struct net_device *dev,
-             struct iw_request_info *info,
-                         struct iw_param *wrq,
-                   char *extra) ;
-
 int iwctl_giwsens(struct net_device *dev,
                          struct iw_request_info *info,
                          struct iw_param *wrq,
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c
index fceec4999c36..39f98423dc02 100644
--- a/drivers/staging/vt6656/80211mgr.c
+++ b/drivers/staging/vt6656/80211mgr.c
@@ -224,8 +224,6 @@ vMgrDecodeBeacon(
         }
         pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
     }
-
-    return;
 }
 
 
@@ -248,8 +246,6 @@ vMgrEncodeIBSSATIM(
 {
     pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
     pFrame->len = WLAN_HDR_ADDR3_LEN;
-
-    return;
 }
 
 
@@ -270,8 +266,6 @@ vMgrDecodeIBSSATIM(
     )
 {
     pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
-
-    return;
 }
 
 
@@ -298,8 +292,6 @@ vMgrEncodeDisassociation(
     pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                + WLAN_DISASSOC_OFF_REASON);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DISASSOC_OFF_REASON + sizeof(*(pFrame->pwReason));
-
-    return;
 }
 
 
@@ -324,8 +316,6 @@ vMgrDecodeDisassociation(
     /* Fixed Fields */
     pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                + WLAN_DISASSOC_OFF_REASON);
-
-    return;
 }
 
 /*+
@@ -352,7 +342,6 @@ vMgrEncodeAssocRequest(
     pFrame->pwListenInterval = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                        + WLAN_ASSOCREQ_OFF_LISTEN_INT);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCREQ_OFF_LISTEN_INT + sizeof(*(pFrame->pwListenInterval));
-    return;
 }
 
 
@@ -418,7 +407,6 @@ vMgrDecodeAssocRequest(
         }
         pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
     }
-    return;
 }
 
 /*+
@@ -448,8 +436,6 @@ vMgrEncodeAssocResponse(
                             + WLAN_ASSOCRESP_OFF_AID);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_ASSOCRESP_OFF_AID
                   + sizeof(*(pFrame->pwAid));
-
-    return;
 }
 
 
@@ -491,10 +477,8 @@ vMgrDecodeAssocResponse(
     if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES)) {
         pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "pFrame->pExtSuppRates=[%p].\n", pItem);
-    } else {
+        } else
         pFrame->pExtSuppRates = NULL;
-    }
-    return;
 }
 
 
@@ -524,8 +508,6 @@ vMgrEncodeReassocRequest(
     pFrame->pAddrCurrAP = (PIEEE_ADDR)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                        + WLAN_REASSOCREQ_OFF_CURR_AP);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCREQ_OFF_CURR_AP + sizeof(*(pFrame->pAddrCurrAP));
-
-    return;
 }
 
 
@@ -578,10 +560,9 @@ vMgrDecodeReassocRequest(
                 pFrame->pRSN = (PWLAN_IE_RSN)pItem;
             break;
         case WLAN_EID_RSN_WPA:
-            if (pFrame->pRSNWPA == NULL) {
+                if (pFrame->pRSNWPA == NULL)
                 if (WPAb_Is_RSN((PWLAN_IE_RSN_EXT)pItem) == TRUE)
                     pFrame->pRSNWPA = (PWLAN_IE_RSN_EXT)pItem;
-            }
             break;
 
         case WLAN_EID_EXTSUPP_RATES:
@@ -595,7 +576,6 @@ vMgrDecodeReassocRequest(
         }
         pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 + pItem->len);
     }
-    return;
 }
 
 
@@ -619,7 +599,6 @@ vMgrEncodeProbeRequest(
 {
     pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
     pFrame->len = WLAN_HDR_ADDR3_LEN;
-    return;
 }
 
 /*+
@@ -670,7 +649,6 @@ vMgrDecodeProbeRequest(
 
         pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 +  pItem->len);
     }
-    return;
 }
 
 
@@ -703,8 +681,6 @@ vMgrEncodeProbeResponse(
 
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_PROBERESP_OFF_CAP_INFO +
                   sizeof(*(pFrame->pwCapInfo));
-
-    return;
 }
 
 
@@ -818,7 +794,6 @@ vMgrDecodeProbeResponse(
 
         pItem = (PWLAN_IE)(((PBYTE)pItem) + 2 +  pItem->len);
     }
-    return;
 }
 
 
@@ -848,7 +823,6 @@ vMgrEncodeAuthen(
     pFrame->pwStatus = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                + WLAN_AUTHEN_OFF_STATUS);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_AUTHEN_OFF_STATUS + sizeof(*(pFrame->pwStatus));
-    return;
 }
 
 
@@ -886,7 +860,6 @@ vMgrDecodeAuthen(
 
     if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_CHALLENGE))
         pFrame->pChallenge = (PWLAN_IE_CHALLENGE)pItem;
-    return;
 }
 
 
@@ -912,7 +885,6 @@ vMgrEncodeDeauthen(
     pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                + WLAN_DEAUTHEN_OFF_REASON);
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_DEAUTHEN_OFF_REASON + sizeof(*(pFrame->pwReason));
-    return;
 }
 
 
@@ -937,7 +909,6 @@ vMgrDecodeDeauthen(
     /* Fixed Fields */
     pFrame->pwReason = (PWORD)(WLAN_HDR_A3_DATA_PTR(&(pFrame->pHdr->sA3))
                                + WLAN_DEAUTHEN_OFF_REASON);
-    return;
 }
 
 
@@ -968,7 +939,6 @@ vMgrEncodeReassocResponse(
                             + WLAN_REASSOCRESP_OFF_AID);
 
     pFrame->len = WLAN_HDR_ADDR3_LEN + WLAN_REASSOCRESP_OFF_AID + sizeof(*(pFrame->pwAid));
-    return;
 }
 
 
@@ -1010,5 +980,4 @@ vMgrDecodeReassocResponse(
 
     if ((((PBYTE)pItem) < (pFrame->pBuf + pFrame->len)) && (pItem->byElementID == WLAN_EID_EXTSUPP_RATES))
         pFrame->pExtSuppRates = (PWLAN_IE_SUPP_RATES)pItem;
-    return;
 }
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 0d11147f91c1..06f27f624db4 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -932,30 +932,8 @@ BBvCaculateParameter (
 void
 BBvSetAntennaMode (PSDevice pDevice, BYTE byAntennaMode)
 {
-    //{{ RobertYu: 20041124, ABG Mode, VC1/VC2 define, make the ANT_A, ANT_B inverted
-    /*if ( (pDevice->byRFType == RF_MAXIM2829) ||
-         (pDevice->byRFType == RF_UW2452) ||
-         (pDevice->byRFType == RF_AIROHA7230) ) { // RobertYu: 20041210, 20050104
-
-        switch (byAntennaMode) {
-            case ANT_TXA:
-                byAntennaMode = ANT_TXB;
-                break;
-            case ANT_TXB:
-                byAntennaMode = ANT_TXA;
-                break;
-            case ANT_RXA:
-                byAntennaMode = ANT_RXB;
-                break;
-            case ANT_RXB:
-                byAntennaMode = ANT_RXA;
-                break;
-        }
-    }*/
-
     switch (byAntennaMode) {
         case ANT_TXA:
-            break;
         case ANT_TXB:
             break;
         case ANT_RXA:
@@ -1249,8 +1227,7 @@ void BBvLoopbackOff (PSDevice pDevice)
         // Set the CR33 Bit2 to disable internal Loopback.
         ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x21, &byData);//CR33
         ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x21, (BYTE)(byData & 0xFE));//CR33
-    }
-    else { // OFDM
+        } else { /* OFDM */
         ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0x9A, &byData);//CR154
         ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x9A, (BYTE)(byData & 0xFE));//CR154
     }
@@ -1277,19 +1254,16 @@ BBvSetShortSlotTime (PSDevice pDevice)
 {
     BYTE byBBVGA=0;
 
-    if (pDevice->bShortSlotTime) {
+        if (pDevice->bShortSlotTime)
         pDevice->byBBRxConf &= 0xDF;//1101 1111
-    } else {
+        else
         pDevice->byBBRxConf |= 0x20;//0010 0000
-    }
 
     ControlvReadByte (pDevice, MESSAGE_REQUEST_BBREG, 0xE7, &byBBVGA);
-    if (byBBVGA == pDevice->abyBBVGA[0]) {
+        if (byBBVGA == pDevice->abyBBVGA[0])
         pDevice->byBBRxConf |= 0x20;//0010 0000
-    }
 
     ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0A, pDevice->byBBRxConf);
-
 }
 
 
@@ -1299,13 +1273,11 @@ void BBvSetVGAGainOffset(PSDevice pDevice, BYTE byData)
     ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0xE7, byData);
 
     // patch for 3253B0 Baseband with Cardbus module
-    if (byData == pDevice->abyBBVGA[0]) {
-        pDevice->byBBRxConf |= 0x20;//0010 0000
-    } else if (pDevice->bShortSlotTime) {
-        pDevice->byBBRxConf &= 0xDF;//1101 1111
-    } else {
-        pDevice->byBBRxConf |= 0x20;//0010 0000
-    }
+        if (pDevice->bShortSlotTime)
+                pDevice->byBBRxConf &= 0xDF; /* 1101 1111 */
+        else
+                pDevice->byBBRxConf |= 0x20; /* 0010 0000 */
+
     ControlvWriteByte(pDevice, MESSAGE_REQUEST_BBREG, 0x0A, pDevice->byBBRxConf);//CR10
 }
 
@@ -1365,15 +1337,14 @@ static unsigned long s_ulGetLowSQ3(PSDevice pDevice)
         unsigned long ulMaxPacket;
 
     ulMaxPacket = pDevice->aulPktNum[RATE_54M];
-    if ( pDevice->aulPktNum[RATE_54M] != 0 ) {
+        if (pDevice->aulPktNum[RATE_54M] != 0)
         ulSQ3 = pDevice->aulSQ3Val[RATE_54M] / pDevice->aulPktNum[RATE_54M];
-    }
-    for ( ii=RATE_48M;ii>=RATE_6M;ii-- ) {
-        if ( pDevice->aulPktNum[ii] > ulMaxPacket ) {
+
+        for (ii = RATE_48M; ii >= RATE_6M; ii--)
+                if (pDevice->aulPktNum[ii] > ulMaxPacket) {
             ulMaxPacket = pDevice->aulPktNum[ii];
             ulSQ3 = pDevice->aulSQ3Val[ii] / pDevice->aulPktNum[ii];
         }
-    }
 
     return ulSQ3;
 }
@@ -1392,7 +1363,7 @@ static unsigned long s_ulGetRatio(PSDevice pDevice)
         ulRatio = (ulPacketNum * 1000 / pDevice->uDiversityCnt);
         ulRatio += TOP_RATE_54M;
     }
-    for ( ii=RATE_48M;ii>=RATE_1M;ii-- ) {
+        for (ii = RATE_48M; ii >= RATE_1M; ii--)
         if ( pDevice->aulPktNum[ii] > ulMaxPacket ) {
             ulPacketNum = 0;
             for ( jj=RATE_54M;jj>=ii;jj--)
@@ -1402,8 +1373,6 @@ static unsigned long s_ulGetRatio(PSDevice pDevice)
             ulMaxPacket = pDevice->aulPktNum[ii];
         }
 
-    }
-
     return ulRatio;
 }
 
@@ -1589,7 +1558,6 @@ void TimerSQ3CallBack(void *hDeviceContext)
 
 
     spin_unlock_irq(&pDevice->lock);
-    return;
 }
 
 
@@ -1637,7 +1605,6 @@ void TimerSQ3Tmax3CallBack(void *hDeviceContext)
     add_timer(&pDevice->TimerSQ3Tmax1);
 
     spin_unlock_irq(&pDevice->lock);
-    return;
 }
 
 void
diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c
index af006df4c8e9..32c67ed8435a 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -216,26 +216,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
                         continue;
                     }
                 }
-/*
-                if (pMgmt->eAuthenMode < WMAC_AUTH_WPA) {
-                    if (pCurrBSS->bWPAValid == TRUE) {
-                        // WPA AP will reject connection of station without WPA enable.
-                        continue;
-                    }
-                } else if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) ||
-                           (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) {
-                    if (pCurrBSS->bWPAValid == FALSE) {
-                        // station with WPA enable can't join NonWPA AP.
-                        continue;
-                    }
-                } else if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) ||
-                           (pMgmt->eAuthenMode == WMAC_AUTH_WPA2PSK)) {
-                    if (pCurrBSS->bWPA2Valid == FALSE) {
-                        // station with WPA2 enable can't join NonWPA2 AP.
-                        continue;
-                    }
-                }
-*/
 
         pMgmt->pSameBSS[jj].uChannel = pCurrBSS->uChannel;
         DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList pSelect1[%02X %02X %02X-%02X %02X %02X]\n",*pCurrBSS->abyBSSID,*(pCurrBSS->abyBSSID+1),*(pCurrBSS->abyBSSID+2),*(pCurrBSS->abyBSSID+3),*(pCurrBSS->abyBSSID+4),*(pCurrBSS->abyBSSID+5));
@@ -300,18 +280,11 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID)
                 continue;
             }
         }
-/*
-        if ((pMgmt->sBSSList[ii].bActive) && (pMgmt->sBSSList[ii].uClearCount < BSS_CLEAR_COUNT)) {
-             pMgmt->sBSSList[ii].uClearCount ++;
-             continue;
-        }
-*/
-        pMgmt->sBSSList[ii].bActive = FALSE;
+
+        pMgmt->sBSSList[ii].bActive = FALSE;
         memset(&pMgmt->sBSSList[ii], 0, sizeof(KnownBSS));
     }
     BSSvClearAnyBSSJoinRecord(pDevice);
-
-    return;
 }
 
 
@@ -524,46 +497,6 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext,
             pBSSList->ldBmAverage[ii] = 0;
     }
 
-/*
-    if ((pIE_Country != NULL) &&
-        (pMgmt->b11hEnable == TRUE)) {
-        CARDvSetCountryInfo(pMgmt->pAdapter,
-                            pBSSList->eNetworkTypeInUse,
-                            pIE_Country);
-    }
-
-    if ((bParsingQuiet == TRUE) && (pIE_Quiet != NULL)) {
-        if ((((PWLAN_IE_QUIET)pIE_Quiet)->len == 8) &&
-            (((PWLAN_IE_QUIET)pIE_Quiet)->byQuietCount != 0)) {
-            // valid EID
-            if (pQuiet == NULL) {
-                pQuiet = (PWLAN_IE_QUIET)pIE_Quiet;
-                CARDbSetQuiet(  pMgmt->pAdapter,
-                                TRUE,
-                                pQuiet->byQuietCount,
-                                pQuiet->byQuietPeriod,
-                                *((PWORD)pQuiet->abyQuietDuration),
-                                *((PWORD)pQuiet->abyQuietOffset)
-                                );
-            } else {
-                pQuiet = (PWLAN_IE_QUIET)pIE_Quiet;
-                CARDbSetQuiet(  pMgmt->pAdapter,
-                                FALSE,
-                                pQuiet->byQuietCount,
-                                pQuiet->byQuietPeriod,
-                                *((PWORD)pQuiet->abyQuietDuration),
-                                *((PWORD)pQuiet->abyQuietOffset)
-                                );
-            }
-        }
-    }
-
-    if ((bParsingQuiet == TRUE) &&
-        (pQuiet != NULL)) {
-        CARDbStartQuiet(pMgmt->pAdapter);
-    }
-*/
-
     pBSSList->uIELength = uIELength;
     if (pBSSList->uIELength > WLAN_BEACON_FR_MAXLEN)
         pBSSList->uIELength = WLAN_BEACON_FR_MAXLEN;
@@ -609,8 +542,6 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
     PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;
     signed long            ldBm, ldBmSum;
     BOOL            bParsingQuiet = FALSE;
-  //  BYTE            abyTmpSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
-
 
     if (pBSSList == NULL)
         return FALSE;
@@ -622,7 +553,6 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
     pBSSList->wCapInfo = cpu_to_le16(wCapInfo);
     pBSSList->uClearCount = 0;
     pBSSList->uChannel = byCurrChannel;
-//    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSbUpdateToBSSList: pBSSList->uChannel: %d\n", pBSSList->uChannel);
 
     if (pSSID->len > WLAN_SSID_MAXLEN)
         pSSID->len = WLAN_SSID_MAXLEN;
@@ -809,7 +739,6 @@ void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)
     pMgmt->sNodeDBTable[*puNodeIndex].byAuthSequence = 0;
     pMgmt->sNodeDBTable[*puNodeIndex].wEnQueueCnt = 0;
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Create node index = %d\n", ii);
-    return;
 };
 
 
@@ -840,8 +769,6 @@ void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex)
     memset(&pMgmt->sNodeDBTable[uNodeIndex], 0, sizeof(KnownNodeDB));
     // clear tx bit map
     pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[uNodeIndex].wAID >> 3] &=  ~byMask[pMgmt->sNodeDBTable[uNodeIndex].wAID & 7];
-
-    return;
 };
 /*+
  *
@@ -1054,10 +981,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
 
             // Rate fallback check
             if (!pDevice->bFixRate) {
-/*
-                if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (ii == 0))
-                    RATEvTxRateFallBack(pDevice, &(pMgmt->sNodeDBTable[ii]));
-*/
                 if (ii > 0) {
                     // ii = 0 for multicast node (AP & Adhoc)
                         RATEvTxRateFallBack((void *)pDevice,
@@ -1152,7 +1075,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
         (pMgmt->eCurrMode == WMAC_MODE_ESS_STA)) {
 
         if (pMgmt->sNodeDBTable[0].bActive) { // Assoc with BSS
-           // DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Callback inactive Count = [%d]\n", pMgmt->sNodeDBTable[0].uInActiveCount);
 
             if (pDevice->bUpdateBBVGA) {
                 /* s_vCheckSensitivity((void *) pDevice); */
@@ -1194,7 +1116,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
              pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
          }
    #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-  // if(pDevice->bWPASuppWextEnabled == TRUE)
       {
         union iwreq_data  wrqu;
         memset(&wrqu, 0, sizeof (wrqu));
@@ -1223,7 +1144,6 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
                 pDevice->uIsroamingTime = 0;
                 pDevice->bRoaming = FALSE;
 
-//            if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
              wpahdr = (viawget_wpa_header *)pDevice->skb->data;
              wpahdr->type = VIAWGET_CCKM_ROAM_MSG;
              wpahdr->resp_ie_len = 0;
@@ -1237,7 +1157,6 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
              netif_rx(pDevice->skb);
             pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
 
-//         }
           }
       else if ((pDevice->bRoaming == FALSE)&&(pDevice->bIsRoaming == TRUE)) {
                             pDevice->uIsroamingTime++;
@@ -1315,7 +1234,6 @@ else {
 
     pMgmt->sTimerSecondCallback.expires = RUN_AT(HZ);
     add_timer(&pMgmt->sTimerSecondCallback);
-    return;
 }
 
 /*+
@@ -1364,7 +1282,6 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext,
 
     // Only Unicast using support rates
     if (wFIFOCtl & FIFOCTL_NEEDACK) {
-        //DBG_PRN_GRP21(("Device %08X, wRate %04X, byTSR %02X\n", hDeviceContext, wRate, byTSR));
         if (pMgmt->eCurrMode == WMAC_MODE_ESS_STA) {
             pMgmt->sNodeDBTable[0].uTxAttempts += 1;
             if ( !(byTSR & (TSR_TMO | TSR_RETRYTMO))) {
@@ -1475,10 +1392,6 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext,
             }
         }
     }
-
-    return;
-
-
 }
 
 /*+
@@ -1519,8 +1432,6 @@ void BSSvClearNodeDBTable(void *hDeviceContext,
             memset(&pMgmt->sNodeDBTable[ii], 0, sizeof(KnownNodeDB));
         }
     }
-
-    return;
 };
 
 void s_vCheckSensitivity(void *hDeviceContext)
@@ -1584,7 +1495,6 @@ RxOkRatio = (RxCnt < 6) ? 2000:((pDevice->scStatistic.RxOkCnt * 2000) / RxCnt);
 //decide link quality
 if(pDevice->bLinkPass !=TRUE)
 {
- //  printk("s_uCalculateLinkQual-->Link disconnect and Poor quality**\n");
    pDevice->scStatistic.LinkQuality = 0;
    pDevice->scStatistic.SignalStren = 0;
 }
@@ -1608,7 +1518,6 @@ else
    pDevice->scStatistic.TxFailCount = 0;
    pDevice->scStatistic.TxNoRetryOkCount = 0;
    pDevice->scStatistic.TxRetryOkCount = 0;
-   return;
 }
 
 void BSSvClearAnyBSSJoinRecord(void *hDeviceContext)
@@ -1617,10 +1526,8 @@ void BSSvClearAnyBSSJoinRecord(void *hDeviceContext)
     PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);
     unsigned int            ii;
 
-    for (ii = 0; ii < MAX_BSS_NUM; ii++) {
+        for (ii = 0; ii < MAX_BSS_NUM; ii++)
         pMgmt->sBSSList[ii].bSelected = FALSE;
-    }
-    return;
 }
 
 void s_vCheckPreEDThreshold(void *hDeviceContext)
@@ -1637,6 +1544,5 @@ void s_vCheckPreEDThreshold(void *hDeviceContext)
             BBvUpdatePreEDThreshold(pDevice, FALSE);
         }
     }
-    return;
 }
 
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index a49053bd7c65..9d09e9fd8e18 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -91,15 +91,10 @@ const WORD cwRXBCNTSFOff[MAX_RATE] =
  *      uConnectionChannel  - Channel to be set
  *  Out:
  *      none
- *
- * Return Value: TRUE if succeeded; FALSE if failed.
- *
  */
-BOOL CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel)
+void CARDbSetMediaChannel(void *pDeviceHandler, unsigned int uConnectionChannel)
 {
 PSDevice            pDevice = (PSDevice) pDeviceHandler;
-BOOL                bResult = TRUE;
-
 
     if (pDevice->byBBType == BB_TYPE_11A) { // 15 ~ 38
         if ((uConnectionChannel < (CB_MAX_CHANNEL_24G+1)) || (uConnectionChannel > CB_MAX_CHANNEL))
@@ -140,7 +135,6 @@ BOOL                bResult = TRUE;
         RFbRawSetPower(pDevice, pDevice->abyCCKPwrTbl[uConnectionChannel-1], RATE_1M);
     }
     ControlvWriteByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_CHANNEL,(BYTE)(uConnectionChannel|0x80));
-    return(bResult);
 }
 
 /*
@@ -607,7 +601,7 @@ BYTE ii;
  * Return Value: TRUE if succeeded; FALSE if failed.
  *
  */
-BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx)
+void CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx)
 {
 PSDevice    pDevice = (PSDevice) pDeviceHandler;
 WORD wRate = (WORD)(1<<wRateIdx);
@@ -616,8 +610,6 @@ WORD wRate = (WORD)(1<<wRateIdx);
 
     //Determines the highest basic rate.
     CARDvUpdateBasicTopRate(pDevice);
-
-    return(TRUE);
 }
 
 BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler)
@@ -1090,7 +1082,7 @@ CARDbChannelSwitch (
 
     if (byCount == 0) {
         pDevice->sMgmtObj.uCurrChannel = byNewChannel;
-        bResult = CARDbSetMediaChannel(pDevice, byNewChannel);
+        CARDbSetMediaChannel(pDevice, byNewChannel);
 
         return bResult;
     }
diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 6c91343d0d14..9cf71a3d8801 100644
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -60,12 +60,12 @@ typedef enum _CARD_OP_MODE {
 
 /*---------------------  Export Functions  --------------------------*/
 
-BOOL CARDbSetMediaChannel(void *pDeviceHandler,
+void CARDbSetMediaChannel(void *pDeviceHandler,
                           unsigned int uConnectionChannel);
 void CARDvSetRSPINF(void *pDeviceHandler, BYTE byBBType);
 void vUpdateIFS(void *pDeviceHandler);
 void CARDvUpdateBasicTopRate(void *pDeviceHandler);
-BOOL CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
+void CARDbAddBasicRate(void *pDeviceHandler, WORD wRateIdx);
 BOOL CARDbIsOFDMinBasicRate(void *pDeviceHandler);
 void CARDvAdjustTSF(void *pDeviceHandler, BYTE byRxRate,
                     QWORD qwBSSTimestamp, QWORD qwLocalTSF);
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index c95833ac58e0..0a114231145f 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -92,9 +92,8 @@ void INTvWorkItem(void *Context)
         spin_unlock_irq(&pDevice->lock);
 }
 
-int INTnsProcessData(PSDevice pDevice)
+void INTnsProcessData(PSDevice pDevice)
 {
-        int status = STATUS_SUCCESS;
         PSINTData       pINTData;
         PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);
         struct net_device_stats *pStats = &pDevice->stats;
@@ -218,6 +217,4 @@ int INTnsProcessData(PSDevice pDevice)
                         pDevice->scStatistic.ullTxBroadcastBytes;
         pStats->tx_errors = pDevice->scStatistic.dwTsrErr;
         pStats->tx_dropped = pDevice->scStatistic.dwTsrErr;
-
-        return status;
 }
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h
index 3176c8d08d6d..a5d96b968176 100644
--- a/drivers/staging/vt6656/int.h
+++ b/drivers/staging/vt6656/int.h
@@ -68,6 +68,6 @@ SINTData, *PSINTData;
 /*---------------------  Export Functions  --------------------------*/
 
 void INTvWorkItem(void *Context);
-int INTnsProcessData(PSDevice pDevice);
+void INTnsProcessData(PSDevice pDevice);
 
 #endif /* __INT_H__ */
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
index 49390026dea3..1463d76895f0 100644
--- a/drivers/staging/vt6656/ioctl.c
+++ b/drivers/staging/vt6656/ioctl.c
@@ -295,6 +295,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                         result = -EFAULT;
                         break;
                 }
+                if (sList.uItem > (ULONG_MAX - sizeof(SBSSIDList)) / sizeof(SBSSIDItem)) {
+                        result = -EINVAL;
+                        break;
+                }
                 pList = (PSBSSIDList)kmalloc(sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)), (int)GFP_ATOMIC);
                 if (pList == NULL) {
                         result = -ENOMEM;
@@ -557,6 +561,10 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                         result = -EFAULT;
                         break;
                 }
+                if (sNodeList.uItem > (ULONG_MAX - sizeof(SNodeList)) / sizeof(SNodeItem)) {
+                        result = -ENOMEM;
+                        break;
+                }
                 pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC);
                 if (pNodeList == NULL) {
                         result = -ENOMEM;
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 2121205a912b..ecfda5272fa1 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -128,17 +128,6 @@ int iwctl_giwname(struct net_device *dev,
         return 0;
 }
 
-int iwctl_giwnwid(struct net_device *dev,
-             struct iw_request_info *info,
-                         struct iw_param *wrq,
-                   char *extra)
-{
-        //wrq->value = 0x100;
-        //wrq->disabled = 0;
-        //wrq->fixed = 1;
-        //return 0;
-  return -EOPNOTSUPP;
-}
 /*
  * Wireless Handler : set scan
  */
@@ -1939,7 +1928,6 @@ static const iw_handler		iwctl_handler[] =
         (iw_handler) iwctl_commit,      // SIOCSIWCOMMIT
         (iw_handler) iwctl_giwname,     // SIOCGIWNAME
         (iw_handler) NULL,                              // SIOCSIWNWID
-        (iw_handler) NULL,                              // SIOCGIWNWID
         (iw_handler) iwctl_siwfreq,             // SIOCSIWFREQ
         (iw_handler) iwctl_giwfreq,             // SIOCGIWFREQ
         (iw_handler) iwctl_siwmode,             // SIOCSIWMODE
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index cc48954783fc..10a240e65012 100644
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -77,11 +77,6 @@ int iwctl_giwname(struct net_device *dev,
                          char *wrq,
                          char *extra);
 
-int iwctl_giwnwid(struct net_device *dev,
-             struct iw_request_info *info,
-                         struct iw_param *wrq,
-                   char *extra) ;
-
 int iwctl_giwsens(struct net_device *dev,
                          struct iw_request_info *info,
                          struct iw_param *wrq,
diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c
index 26c19d1408c4..af4a29d14775 100644
--- a/drivers/staging/vt6656/mac.c
+++ b/drivers/staging/vt6656/mac.c
@@ -133,10 +133,9 @@ void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData)
  *  Out:
  *      none
  *
- * Return Value: TRUE if success; otherwise FALSE
  *
  */
-BOOL MACbShutdown (PSDevice pDevice)
+void MACbShutdown(PSDevice pDevice)
 {
     CONTROLnsRequestOutAsyn(pDevice,
                         MESSAGE_TYPE_MACSHUTDOWN,
@@ -145,7 +144,6 @@ BOOL MACbShutdown (PSDevice pDevice)
                         0,
                         NULL
                         );
-    return TRUE;
 }
 
 void MACvSetBBType(PSDevice pDevice,BYTE byType)
diff --git a/drivers/staging/vt6656/mac.h b/drivers/staging/vt6656/mac.h
index 491ff5ecd04b..147ac50218d3 100644
--- a/drivers/staging/vt6656/mac.h
+++ b/drivers/staging/vt6656/mac.h
@@ -422,7 +422,7 @@
 
 void MACvSetMultiAddrByHash(PSDevice pDevice, BYTE byHashIdx);
 void MACvWriteMultiAddr(PSDevice pDevice, unsigned int uByteIdx, BYTE byData);
-BOOL MACbShutdown(PSDevice pDevice);
+void MACbShutdown(PSDevice pDevice);
 void MACvSetBBType(PSDevice pDevice, BYTE byType);
 void MACvSetMISCFifo(PSDevice pDevice, WORD wOffset, DWORD dwData);
 void MACvDisableKeyEntry(PSDevice pDevice, unsigned int uEntryIdx);
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 541f9aa8ef6d..6a708f447651 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -900,7 +900,7 @@ static BOOL device_alloc_bufs(PSDevice pDevice) {
     }
 
     // allocate rcb mem
-    pDevice->pRCBMem = kmalloc((sizeof(RCB) * pDevice->cbRD), GFP_KERNEL);
+        pDevice->pRCBMem = kzalloc((sizeof(RCB) * pDevice->cbRD), GFP_KERNEL);
     if (pDevice->pRCBMem == NULL) {
         DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s : alloc rx usb context failed\n", pDevice->dev->name);
         goto free_tx;
@@ -912,7 +912,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) {
     pDevice->FirstRecvMngList = NULL;
     pDevice->LastRecvMngList = NULL;
     pDevice->NumRecvFreeList = 0;
-    memset(pDevice->pRCBMem, 0, (sizeof(RCB) * pDevice->cbRD));
     pRCB = (PRCB) pDevice->pRCBMem;
 
     for (ii = 0; ii < pDevice->cbRD; ii++) {
@@ -1618,15 +1617,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
                 break;
 
         case SIOCSIWNWID:
-        rc = -EOPNOTSUPP;
-                break;
-
         case SIOCGIWNWID:     //0x8b03  support
-        #ifdef  WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-          rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
-        #else
-        rc = -EOPNOTSUPP;
-        #endif
+                rc = -EOPNOTSUPP;
                 break;
 
                 // Set frequency/channel
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c
index 1f1d98679171..2bd9b84ace8e 100644
--- a/drivers/staging/wlags49_h2/wl_pci.c
+++ b/drivers/staging/wlags49_h2/wl_pci.c
@@ -112,17 +112,10 @@ extern dbg_info_t *DbgInfo;
 #endif  // DBG
 
 /* define the PCI device Table Cardname and id tables */
-enum hermes_pci_versions {
-        CH_Agere_Systems_Mini_PCI_V1 = 0,
-};
-
 static struct pci_device_id wl_pci_tbl[] __devinitdata = {
-        { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 },
-        { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 },
-        { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2,
-          PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 },
+        { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), },
+        { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1), },
+        { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2), },
 
         { }                     /* Terminating entry */
 };
diff --git a/drivers/staging/xgifb/Makefile b/drivers/staging/xgifb/Makefile
index 3c8c7de9eadd..55e519905346 100644
--- a/drivers/staging/xgifb/Makefile
+++ b/drivers/staging/xgifb/Makefile
@@ -1,4 +1,4 @@
 obj-$(CONFIG_FB_XGI)  += xgifb.o
 
-xgifb-y := XGI_main_26.o vb_init.o vb_setmode.o vb_util.o vb_ext.o
+xgifb-y := XGI_main_26.o vb_init.o vb_setmode.o vb_util.o
 
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 71aebe3e84d8..35f7b2a485e1 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -32,14 +32,10 @@
 #endif
 
 static DEFINE_PCI_DEVICE_TABLE(xgifb_pci_table) = {
-        {PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_20, PCI_ANY_ID, PCI_ANY_ID,
-         0, 0, 0},
-        {PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_27, PCI_ANY_ID, PCI_ANY_ID,
-         0, 0, 1},
-        {PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_40, PCI_ANY_ID, PCI_ANY_ID,
-         0, 0, 2},
-        {PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_42, PCI_ANY_ID, PCI_ANY_ID,
-         0, 0, 3},
+        {PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_20)},
+        {PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_27)},
+        {PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_40)},
+        {PCI_DEVICE(PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_42)},
         {0}
 };
 
@@ -128,7 +124,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table);
 /* display status */
 static int XGIfb_crt1off;
 static int XGIfb_forcecrt1 = -1;
-static int XGIfb_userom ;
 
 /* global flags */
 static int XGIfb_tvmode;
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 277e408c39c5..2502c49c9c5b 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -21,7 +21,6 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/vmalloc.h>
 #include <linux/vt_kern.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
@@ -46,8 +45,7 @@
 #define GPIOG_EN    (1<<6)
 #define GPIOG_READ  (1<<1)
 
-#define XGIFB_ROM_SIZE  65536
-
+static char *forcecrt2type;
 static char *mode;
 static int vesa = -1;
 static unsigned int refresh_rate;
@@ -159,7 +157,6 @@ static int XGIfb_mode_rate_to_dclock(struct vb_device_info *XGI_Pr,
 
         /* unsigned long  temp = 0; */
         int Clock;
-        XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
         InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
 
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
@@ -199,7 +196,6 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
         unsigned char sr_data, cr_data, cr_data2;
         unsigned long cr_data3;
         int A, B, C, D, E, F, temp, j;
-        XGI_Pr->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
         InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
                         ModeIdIndex, XGI_Pr);
@@ -387,7 +383,7 @@ static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr)
 
 /* ------------------ Internal helper routines ----------------- */
 
-static int XGIfb_GetXG21DefaultLVDSModeIdx(void)
+static int XGIfb_GetXG21DefaultLVDSModeIdx(struct xgifb_video_info *xgifb_info)
 {
 
         int found_mode = 0;
@@ -396,11 +392,11 @@ static int XGIfb_GetXG21DefaultLVDSModeIdx(void)
         found_mode = 0;
         while ((XGIbios_mode[XGIfb_mode_idx].mode_no != 0)
                         && (XGIbios_mode[XGIfb_mode_idx].xres
-                                        <= XGI21_LCDCapList[0].LVDSHDE)) {
+                                        <= xgifb_info->lvds_data.LVDSHDE)) {
                 if ((XGIbios_mode[XGIfb_mode_idx].xres
-                                == XGI21_LCDCapList[0].LVDSHDE)
+                                == xgifb_info->lvds_data.LVDSHDE)
                                 && (XGIbios_mode[XGIfb_mode_idx].yres
-                                                == XGI21_LCDCapList[0].LVDSVDE)
+                                        == xgifb_info->lvds_data.LVDSVDE)
                                 && (XGIbios_mode[XGIfb_mode_idx].bpp == 8)) {
                         found_mode = 1;
                         break;
@@ -456,51 +452,6 @@ invalid:
                 printk(KERN_INFO "XGIfb: Invalid VESA mode 0x%x'\n", vesamode);
 }
 
-static int XGIfb_GetXG21LVDSData(struct xgifb_video_info *xgifb_info)
-{
-        u8 tmp;
-        void __iomem *data = xgifb_info->mmio_vbase + 0x20000;
-        int i, j, k;
-
-        tmp = xgifb_reg_get(XGISR, 0x1e);
-        xgifb_reg_set(XGISR, 0x1e, tmp | 4);
-
-        if ((readb(data) == 0x55) &&
-            (readb(data + 1) == 0xAA) &&
-            (readb(data + 0x65) & 0x1)) {
-                i = readw(data + 0x316);
-                j = readb(data + i - 1);
-                if (j == 0xff)
-                        j = 1;
-
-                k = 0;
-                do {
-                        XGI21_LCDCapList[k].LVDS_Capability = readw(data + i);
-                        XGI21_LCDCapList[k].LVDSHT = readw(data + i + 2);
-                        XGI21_LCDCapList[k].LVDSVT = readw(data + i + 4);
-                        XGI21_LCDCapList[k].LVDSHDE = readw(data + i + 6);
-                        XGI21_LCDCapList[k].LVDSVDE = readw(data + i + 8);
-                        XGI21_LCDCapList[k].LVDSHFP = readw(data + i + 10);
-                        XGI21_LCDCapList[k].LVDSVFP = readw(data + i + 12);
-                        XGI21_LCDCapList[k].LVDSHSYNC = readw(data + i + 14);
-                        XGI21_LCDCapList[k].LVDSVSYNC = readw(data + i + 16);
-                        XGI21_LCDCapList[k].VCLKData1 = readb(data + i + 18);
-                        XGI21_LCDCapList[k].VCLKData2 = readb(data + i + 19);
-                        XGI21_LCDCapList[k].PSC_S1 = readb(data + i + 20);
-                        XGI21_LCDCapList[k].PSC_S2 = readb(data + i + 21);
-                        XGI21_LCDCapList[k].PSC_S3 = readb(data + i + 22);
-                        XGI21_LCDCapList[k].PSC_S4 = readb(data + i + 23);
-                        XGI21_LCDCapList[k].PSC_S5 = readb(data + i + 24);
-                        i += 25;
-                        j--;
-                        k++;
-                } while ((j > 0) && (k < (sizeof(XGI21_LCDCapList)
-                                / sizeof(struct XGI21_LVDSCapStruct))));
-                return 1;
-        }
-        return 0;
-}
-
 static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
 {
         u16 xres, yres;
@@ -508,8 +459,8 @@ static int XGIfb_validate_mode(struct xgifb_video_info *xgifb_info, int myindex)
 
         if (xgifb_info->chip == XG21) {
                 if (xgifb_info->display2 == XGIFB_DISP_LCD) {
-                        xres = XGI21_LCDCapList[0].LVDSHDE;
-                        yres = XGI21_LCDCapList[0].LVDSVDE;
+                        xres = xgifb_info->lvds_data.LVDSHDE;
+                        yres = xgifb_info->lvds_data.LVDSVDE;
                         if (XGIbios_mode[myindex].xres > xres)
                                 return -1;
                         if (XGIbios_mode[myindex].yres > yres)
@@ -1223,7 +1174,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
         if (isactive) {
 
                 XGIfb_pre_setmode(xgifb_info);
-                if (XGISetModeNew(hw_info,
+                if (XGISetModeNew(xgifb_info, hw_info,
                                   XGIbios_mode[xgifb_info->mode_idx].mode_no)
                                         == 0) {
                         printk(KERN_ERR "XGIfb: Setting mode[0x%x] failed\n",
@@ -1794,17 +1745,16 @@ static void XGIfb_detect_VB(struct xgifb_video_info *xgifb_info)
                         XGIfb_crt1off = 0;
         }
 
-        if (XGIfb_crt2type != -1)
-                /* TW: Override with option */
-                xgifb_info->display2 = XGIfb_crt2type;
-        else if (cr32 & XGI_VB_TV)
-                xgifb_info->display2 = XGIFB_DISP_TV;
-        else if (cr32 & XGI_VB_LCD)
-                xgifb_info->display2 = XGIFB_DISP_LCD;
-        else if (cr32 & XGI_VB_CRT2)
-                xgifb_info->display2 = XGIFB_DISP_CRT;
-        else
-                xgifb_info->display2 = XGIFB_DISP_NONE;
+        if (!xgifb_info->display2_force) {
+                if (cr32 & XGI_VB_TV)
+                        xgifb_info->display2 = XGIFB_DISP_TV;
+                else if (cr32 & XGI_VB_LCD)
+                        xgifb_info->display2 = XGIFB_DISP_LCD;
+                else if (cr32 & XGI_VB_CRT2)
+                        xgifb_info->display2 = XGIFB_DISP_CRT;
+                else
+                        xgifb_info->display2 = XGIFB_DISP_NONE;
+        }
 
         if (XGIfb_tvplug != -1)
                 /* PR/TW: Override with option */
@@ -1925,8 +1875,6 @@ static int __init XGIfb_setup(char *options)
                         XGIfb_crt2type = XGIFB_DISP_LCD;
                 } else if (!strncmp(this_opt, "noypan", 6)) {
                         XGIfb_ypan = 0;
-                } else if (!strncmp(this_opt, "userom:", 7)) {
-                        XGIfb_userom = xgifb_optval(this_opt, 7);
                 } else {
                         mode = this_opt;
                 }
@@ -1934,35 +1882,12 @@ static int __init XGIfb_setup(char *options)
         return 0;
 }
 
-static unsigned char *xgifb_copy_rom(struct pci_dev *dev)
-{
-        void __iomem *rom_address;
-        unsigned char *rom_copy;
-        size_t rom_size;
-
-        rom_address = pci_map_rom(dev, &rom_size);
-        if (rom_address == NULL)
-                return NULL;
-
-        rom_copy = vzalloc(XGIFB_ROM_SIZE);
-        if (rom_copy == NULL)
-                goto done;
-
-        rom_size = min_t(size_t, rom_size, XGIFB_ROM_SIZE);
-        memcpy_fromio(rom_copy, rom_address, rom_size);
-
-done:
-        pci_unmap_rom(dev, rom_address);
-        return rom_copy;
-}
-
 static int __devinit xgifb_probe(struct pci_dev *pdev,
                 const struct pci_device_id *ent)
 {
         u8 reg, reg1;
         u8 CR48, CR38;
         int ret;
-        bool xgi21_drvlcdcaplist = false;
         struct fb_info *fb_info;
         struct xgifb_video_info *xgifb_info;
         struct xgi_hw_device_info *hw_info;
@@ -2001,6 +1926,11 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                 goto error;
         }
 
+        if (XGIfb_crt2type != -1) {
+                xgifb_info->display2 = XGIfb_crt2type;
+                xgifb_info->display2_force = true;
+        }
+
         XGIRegInit(&xgifb_info->dev_info, (unsigned long)hw_info->pjIOAddress);
 
         xgifb_reg_set(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
@@ -2041,18 +1971,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
         printk("XGIfb:chipid = %x\n", xgifb_info->chip);
         hw_info->jChipType = xgifb_info->chip;
 
-        if ((xgifb_info->chip == XG21) || (XGIfb_userom)) {
-                hw_info->pjVirtualRomBase = xgifb_copy_rom(pdev);
-                if (hw_info->pjVirtualRomBase)
-                        printk(KERN_INFO "XGIfb: Video ROM found and mapped to %p\n",
-                               hw_info->pjVirtualRomBase);
-                else
-                        printk(KERN_INFO "XGIfb: Video ROM not found\n");
-        } else {
-                hw_info->pjVirtualRomBase = NULL;
-                printk(KERN_INFO "XGIfb: Video ROM usage disabled\n");
-        }
-
         if (XGIfb_get_dram_size(xgifb_info)) {
                 printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
                 ret = -ENODEV;
@@ -2117,8 +2035,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                 CR38 = xgifb_reg_get(XGICR, 0x38);
                 if ((CR38&0xE0) == 0xC0) {
                         xgifb_info->display2 = XGIFB_DISP_LCD;
-                        if (!XGIfb_GetXG21LVDSData(xgifb_info))
-                                xgi21_drvlcdcaplist = true;
                 } else if ((CR38&0xE0) == 0x60) {
                         xgifb_info->hasVB = HASVB_CHRONTEL;
                 } else {
@@ -2193,6 +2109,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 
         if (xgifb_info->hasVB != HASVB_NONE)
                 XGIfb_detect_VB(xgifb_info);
+        else if (xgifb_info->chip != XG21)
+                xgifb_info->display2 = XGIFB_DISP_NONE;
 
         if (xgifb_info->display2 == XGIFB_DISP_LCD) {
                 if (!enable_dstn) {
@@ -2254,7 +2172,7 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                 if (xgifb_info->display2 == XGIFB_DISP_LCD &&
                     xgifb_info->chip == XG21)
                         xgifb_info->mode_idx =
-                                XGIfb_GetXG21DefaultLVDSModeIdx();
+                                XGIfb_GetXG21DefaultLVDSModeIdx(xgifb_info);
                 else
                         xgifb_info->mode_idx = DEFAULT_MODE;
         }
@@ -2264,21 +2182,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
                 goto error_1;
         }
 
-        if (xgi21_drvlcdcaplist) {
-                int m;
-
-                for (m = 0; m < ARRAY_SIZE(XGI21_LCDCapList); m++)
-                        if ((XGI21_LCDCapList[m].LVDSHDE ==
-                                XGIbios_mode[xgifb_info->mode_idx].xres) &&
-                            (XGI21_LCDCapList[m].LVDSVDE ==
-                                XGIbios_mode[xgifb_info->mode_idx].yres)) {
-                                xgifb_reg_set(xgifb_info->dev_info.P3d4,
-                                              0x36,
-                                              m);
-                                break;
-                        }
-        }
-
         /* yilin set default refresh rate */
         xgifb_info->refresh_rate = refresh_rate;
         if (xgifb_info->refresh_rate == 0)
@@ -2418,7 +2321,6 @@ error_1:
 error_0:
         release_mem_region(xgifb_info->video_base, xgifb_info->video_size);
 error:
-        vfree(hw_info->pjVirtualRomBase);
         framebuffer_release(fb_info);
         return ret;
 }
@@ -2442,7 +2344,6 @@ static void __devexit xgifb_remove(struct pci_dev *pdev)
         iounmap(xgifb_info->video_vbase);
         release_mem_region(xgifb_info->mmio_base, xgifb_info->mmio_size);
         release_mem_region(xgifb_info->video_base, xgifb_info->video_size);
-        vfree(xgifb_info->hw_info.pjVirtualRomBase);
         framebuffer_release(fb_info);
         pci_set_drvdata(pdev, NULL);
 }
@@ -2458,6 +2359,8 @@ static int __init xgifb_init(void)
 {
         char *option = NULL;
 
+        if (forcecrt2type != NULL)
+                XGIfb_search_crt2type(forcecrt2type);
         if (fb_get_options("xgifb", &option))
                 return -ENODEV;
         XGIfb_setup(option);
@@ -2480,6 +2383,11 @@ MODULE_AUTHOR("XGITECH , Others");
 module_param(mode, charp, 0);
 module_param(vesa, int, 0);
 module_param(filter, int, 0);
+module_param(forcecrt2type, charp, 0);
+
+MODULE_PARM_DESC(forcecrt2type,
+        "\nForce the second display output type. Possible values are NONE,\n"
+        "LCD, TV, VGA, SVIDEO or COMPOSITE.\n");
 
 MODULE_PARM_DESC(mode,
         "\nSelects the desired default display mode in the format XxYxDepth,\n"
diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h
index 7611846a7039..2c866bb65a00 100644
--- a/drivers/staging/xgifb/XGIfb.h
+++ b/drivers/staging/xgifb/XGIfb.h
@@ -86,10 +86,13 @@ struct xgifb_video_info {
         unsigned int refresh_rate;
 
         enum xgifb_display_type display2; /* the second display output type */
+        bool display2_force;
         unsigned char hasVB;
         unsigned char TV_type;
         unsigned char TV_plug;
 
+        struct XGI21_LVDSCapStruct lvds_data;
+
         enum XGI_CHIP_TYPE chip;
         unsigned char revision_id;
 
diff --git a/drivers/staging/xgifb/vb_ext.c b/drivers/staging/xgifb/vb_ext.c
deleted file mode 100644
index b1a25730b7ca..000000000000
--- a/drivers/staging/xgifb/vb_ext.c
+++ /dev/null
@@ -1,444 +0,0 @@
-#include <linux/io.h>
-#include <linux/types.h>
-#include "XGIfb.h"
-
-#include "vb_def.h"
-#include "vgatypes.h"
-#include "vb_struct.h"
-#include "vb_util.h"
-#include "vb_setmode.h"
-#include "vb_ext.h"
-
-/**************************************************************
- *********************** Dynamic Sense ************************
- *************************************************************/
-
-static unsigned char XGINew_Is301B(struct vb_device_info *pVBInfo)
-{
-        unsigned short flag;
-
-        flag = xgifb_reg_get(pVBInfo->Part4Port, 0x01);
-
-        if (flag > 0x0B0)
-                return 0; /* 301b */
-        else
-                return 1;
-}
-
-static unsigned char XGINew_Sense(unsigned short tempbx,
-                                  unsigned short tempcx,
-                                  struct vb_device_info *pVBInfo)
-{
-        unsigned short temp, i, tempch;
-
-        temp = tempbx & 0xFF;
-        xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
-        temp = (tempbx & 0xFF00) >> 8;
-        temp |= (tempcx & 0x00FF);
-        xgifb_reg_and_or(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
-
-        for (i = 0; i < 10; i++)
-                XGI_LongWait(pVBInfo);
-
-        tempch = (tempcx & 0x7F00) >> 8;
-        temp = xgifb_reg_get(pVBInfo->Part4Port, 0x03);
-        temp = temp ^ (0x0E);
-        temp &= tempch;
-
-        if (temp > 0)
-                return 1;
-        else
-                return 0;
-}
-
-static unsigned char
-XGINew_GetLCDDDCInfo(struct xgi_hw_device_info *HwDeviceExtension,
-                     struct vb_device_info *pVBInfo)
-{
-        unsigned short temp;
-
-        /* add lcd sense */
-        if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {
-                return 0;
-        } else {
-                temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;
-                switch (HwDeviceExtension->ulCRT2LCDType) {
-                case LCD_INVALID:
-                case LCD_800x600:
-                case LCD_1024x768:
-                case LCD_1280x1024:
-                        break;
-
-                case LCD_640x480:
-                case LCD_1024x600:
-                case LCD_1152x864:
-                case LCD_1280x960:
-                case LCD_1152x768:
-                        temp = 0;
-                        break;
-
-                case LCD_1400x1050:
-                case LCD_1280x768:
-                case LCD_1600x1200:
-                        break;
-
-                case LCD_1920x1440:
-                case LCD_2048x1536:
-                        temp = 0;
-                        break;
-
-                default:
-                        break;
-                }
-                xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);
-                return 1;
-        }
-}
-
-static unsigned char XGINew_GetPanelID(struct vb_device_info *pVBInfo)
-{
-        unsigned short PanelTypeTable[16] = { SyncNN | PanelRGB18Bit
-                        | Panel800x600  | _PanelType00, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType01, SyncNN | PanelRGB18Bit
-                        | Panel800x600  | _PanelType02, SyncNN | PanelRGB18Bit
-                        | Panel640x480  | _PanelType03, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType04, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType05, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType06, SyncNN | PanelRGB24Bit
-                        | Panel1024x768 | _PanelType07, SyncNN | PanelRGB18Bit
-                        | Panel800x600  | _PanelType08, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType09, SyncNN | PanelRGB18Bit
-                        | Panel800x600  | _PanelType0A, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType0B, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType0C, SyncNN | PanelRGB24Bit
-                        | Panel1024x768 | _PanelType0D, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType0E, SyncNN | PanelRGB18Bit
-                        | Panel1024x768 | _PanelType0F };
-        unsigned short tempax, tempbx, temp;
-        /* unsigned short return_flag; */
-
-        tempax = xgifb_reg_get(pVBInfo->P3c4, 0x1A);
-        tempbx = tempax & 0x1E;
-
-        if (tempax == 0)
-                return 0;
-        else {
-                /*
-                if (!(tempax & 0x10)) {
-                        if (pVBInfo->IF_DEF_LVDS == 1) {
-                                tempbx = 0;
-                                temp = xgifb_reg_get(pVBInfo->P3c4, 0x38);
-                                if (temp & 0x40)
-                                        tempbx |= 0x08;
-                                if (temp & 0x20)
-                                        tempbx |= 0x02;
-                                if (temp & 0x01)
-                                        tempbx |= 0x01;
-
-                                temp = xgifb_reg_get(pVBInfo->P3c4, 0x39);
-                                if (temp & 0x80)
-                                        tempbx |= 0x04;
-                         } else {
-                                return(0);
-                         }
-                }
-                */
-
-                tempbx = tempbx >> 1;
-                temp = tempbx & 0x00F;
-                xgifb_reg_set(pVBInfo->P3d4, 0x36, temp);
-                tempbx--;
-                tempbx = PanelTypeTable[tempbx];
-
-                temp = (tempbx & 0xFF00) >> 8;
-                xgifb_reg_and_or(pVBInfo->P3d4, 0x37, ~(LCDSyncBit
-                                | LCDRGB18Bit), temp);
-                return 1;
-        }
-}
-
-static unsigned char
-XGINew_BridgeIsEnable(struct xgi_hw_device_info *HwDeviceExtension,
-                      struct vb_device_info *pVBInfo)
-{
-        unsigned short flag;
-
-        if (XGI_BridgeIsOn(pVBInfo) == 0) {
-                flag = xgifb_reg_get(pVBInfo->Part1Port, 0x0);
-
-                if (flag & 0x050)
-                        return 1;
-                else
-                        return 0;
-
-        }
-        return 0;
-}
-
-static unsigned char
-XGINew_SenseHiTV(struct xgi_hw_device_info *HwDeviceExtension,
-                 struct vb_device_info *pVBInfo)
-{
-        unsigned short tempbx, tempcx, temp, i, tempch;
-
-        tempbx = *pVBInfo->pYCSenseData2;
-
-        tempcx = 0x0604;
-
-        temp = tempbx & 0xFF;
-        xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
-        temp = (tempbx & 0xFF00) >> 8;
-        temp |= (tempcx & 0x00FF);
-        xgifb_reg_and_or(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
-
-        for (i = 0; i < 10; i++)
-                XGI_LongWait(pVBInfo);
-
-        tempch = (tempcx & 0xFF00) >> 8;
-        temp = xgifb_reg_get(pVBInfo->Part4Port, 0x03);
-        temp = temp ^ (0x0E);
-        temp &= tempch;
-
-        if (temp != tempch)
-                return 0;
-
-        tempbx = *pVBInfo->pVideoSenseData2;
-
-        tempcx = 0x0804;
-        temp = tempbx & 0xFF;
-        xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
-        temp = (tempbx & 0xFF00) >> 8;
-        temp |= (tempcx & 0x00FF);
-        xgifb_reg_and_or(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
-
-        for (i = 0; i < 10; i++)
-                XGI_LongWait(pVBInfo);
-
-        tempch = (tempcx & 0xFF00) >> 8;
-        temp = xgifb_reg_get(pVBInfo->Part4Port, 0x03);
-        temp = temp ^ (0x0E);
-        temp &= tempch;
-
-        if (temp != tempch) {
-                return 0;
-        } else {
-                tempbx = 0x3FF;
-                tempcx = 0x0804;
-                temp = tempbx & 0xFF;
-                xgifb_reg_set(pVBInfo->Part4Port, 0x11, temp);
-                temp = (tempbx & 0xFF00) >> 8;
-                temp |= (tempcx & 0x00FF);
-                xgifb_reg_and_or(pVBInfo->Part4Port, 0x10, ~0x1F, temp);
-
-                for (i = 0; i < 10; i++)
-                        XGI_LongWait(pVBInfo);
-
-                tempch = (tempcx & 0xFF00) >> 8;
-                temp = xgifb_reg_get(pVBInfo->Part4Port, 0x03);
-                temp = temp ^ (0x0E);
-                temp &= tempch;
-
-                if (temp != tempch)
-                        return 1;
-                else
-                        return 0;
-        }
-}
-
-void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
-                        struct vb_device_info *pVBInfo)
-{
-        unsigned short  tempax = 0, tempbx, tempcx, temp,
-                        P2reg0 = 0, SenseModeNo = 0,
-                        OutputSelect = *pVBInfo->pOutputSelect,
-                        ModeIdIndex, i;
-        pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
-
-        if (pVBInfo->IF_DEF_LVDS == 1) {
-                /* ynlai 02/27/2002 */
-                tempax = xgifb_reg_get(pVBInfo->P3c4, 0x1A);
-                tempbx = xgifb_reg_get(pVBInfo->P3c4, 0x1B);
-                tempax = ((tempax & 0xFE) >> 1) | (tempbx << 8);
-                if (tempax == 0x00) { /* Get Panel id from DDC */
-                        temp = XGINew_GetLCDDDCInfo(HwDeviceExtension, pVBInfo);
-                        if (temp == 1) { /* LCD connect */
-                                /* set CR39 bit0="1" */
-                                xgifb_reg_and_or(pVBInfo->P3d4,
-                                                 0x39, 0xFF, 0x01);
-                                /* clean CR37 bit4="0" */
-                                xgifb_reg_and_or(pVBInfo->P3d4,
-                                                 0x37, 0xEF, 0x00);
-                                temp = LCDSense;
-                        } else { /* LCD don't connect */
-                                temp = 0;
-                        }
-                } else {
-                        XGINew_GetPanelID(pVBInfo);
-                        temp = LCDSense;
-                }
-
-                tempbx = ~(LCDSense | AVIDEOSense | SVIDEOSense);
-                xgifb_reg_and_or(pVBInfo->P3d4, 0x32, tempbx, temp);
-        } else { /* for 301 */
-                if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) { /* for HiVision */
-                        tempax = xgifb_reg_get(pVBInfo->P3c4, 0x38);
-                        temp = tempax & 0x01;
-                        tempax = xgifb_reg_get(pVBInfo->P3c4, 0x3A);
-                        temp = temp | (tempax & 0x02);
-                        xgifb_reg_and_or(pVBInfo->P3d4, 0x32, 0xA0, temp);
-                } else {
-                        if (XGI_BridgeIsOn(pVBInfo)) {
-                                P2reg0 = xgifb_reg_get(pVBInfo->Part2Port,
-                                                       0x00);
-                                if (!XGINew_BridgeIsEnable(HwDeviceExtension,
-                                                           pVBInfo)) {
-                                        SenseModeNo = 0x2e;
-                                /* xgifb_reg_set(pVBInfo->P3d4, 0x30, 0x41);
-                                 * XGISetModeNew(HwDeviceExtension, 0x2e);
-                                 * // ynlai InitMode */
-
-                                        temp = XGI_SearchModeID(SenseModeNo,
-                                                                &ModeIdIndex,
-                                                                pVBInfo);
-                                        XGI_GetVGAType(HwDeviceExtension,
-                                                       pVBInfo);
-                                        XGI_GetVBType(pVBInfo);
-                                        pVBInfo->SetFlag = 0x00;
-                                        pVBInfo->ModeType = ModeVGA;
-                                        pVBInfo->VBInfo = SetCRT2ToRAMDAC |
-                                                          LoadDACFlag |
-                                                          SetInSlaveMode;
-                                        XGI_GetLCDInfo(0x2e,
-                                                       ModeIdIndex,
-                                                       pVBInfo);
-                                        XGI_GetTVInfo(0x2e,
-                                                      ModeIdIndex,
-                                                      pVBInfo);
-                                        XGI_EnableBridge(HwDeviceExtension,
-                                                         pVBInfo);
-                                        XGI_SetCRT2Group301(SenseModeNo,
-                                                            HwDeviceExtension,
-                                                            pVBInfo);
-                                        XGI_SetCRT2ModeRegs(0x2e,
-                                                            HwDeviceExtension,
-                                                            pVBInfo);
-                                        /* XGI_DisableBridge(HwDeviceExtension,
-                                         *                   pVBInfo ) ; */
-                                        /* Display Off 0212 */
-                                        xgifb_reg_and_or(pVBInfo->P3c4,
-                                                         0x01,
-                                                         0xDF,
-                                                         0x20);
-                                        for (i = 0; i < 20; i++)
-                                                XGI_LongWait(pVBInfo);
-                                }
-                                xgifb_reg_set(pVBInfo->Part2Port, 0x00, 0x1c);
-                                tempax = 0;
-                                tempbx = *pVBInfo->pRGBSenseData;
-
-                                if (!(XGINew_Is301B(pVBInfo)))
-                                        tempbx = *pVBInfo->pRGBSenseData2;
-
-                                tempcx = 0x0E08;
-                                if (XGINew_Sense(tempbx, tempcx, pVBInfo)) {
-                                        if (XGINew_Sense(tempbx,
-                                                         tempcx,
-                                                         pVBInfo))
-                                                tempax |= Monitor2Sense;
-                                }
-
-                                if (pVBInfo->VBType & VB_XGI301C)
-                                        xgifb_reg_or(pVBInfo->Part4Port,
-                                                     0x0d,
-                                                     0x04);
-
-                                /* add by kuku for Multi-adapter sense HiTV */
-                                if (XGINew_SenseHiTV(HwDeviceExtension,
-                                                     pVBInfo)) {
-                                        tempax |= HiTVSense;
-                                        if ((pVBInfo->VBType & VB_XGI301C))
-                                                tempax ^= (HiTVSense |
-                                                           YPbPrSense);
-                                }
-
-                                /* start */
-                                if (!(tempax & (HiTVSense | YPbPrSense))) {
-                                        tempbx = *pVBInfo->pYCSenseData;
-                                        if (!(XGINew_Is301B(pVBInfo)))
-                                                tempbx = *pVBInfo->pYCSenseData2;
-                                        tempcx = 0x0604;
-                                        if (XGINew_Sense(tempbx,
-                                                         tempcx,
-                                                         pVBInfo)) {
-                                                if (XGINew_Sense(tempbx,
-                                                                 tempcx,
-                                                                 pVBInfo))
-                                                        tempax |= SVIDEOSense;
-                                        }
-
-                                        if (OutputSelect & BoardTVType) {
-                                                tempbx = *pVBInfo->pVideoSenseData;
-
-                                                if (!(XGINew_Is301B(pVBInfo)))
-                                                        tempbx = *pVBInfo->pVideoSenseData2;
-
-                                                tempcx = 0x0804;
-                                                if (XGINew_Sense(tempbx,
-                                                                 tempcx,
-                                                                 pVBInfo)) {
-                                                        if (XGINew_Sense(tempbx,
-                                                                         tempcx,
-                                                                         pVBInfo))
-                                                                tempax |= AVIDEOSense;
-                                                }
-                                        } else {
-                                                if (!(tempax & SVIDEOSense)) {
-                                                        tempbx = *pVBInfo->pVideoSenseData;
-
-                                                        if (!(XGINew_Is301B(pVBInfo)))
-                                                                tempbx = *pVBInfo->pVideoSenseData2;
-
-                                                        tempcx = 0x0804;
-                                                        if (XGINew_Sense(tempbx,
-                                                                         tempcx,
-                                                                         pVBInfo)) {
-                                                                if (XGINew_Sense(tempbx, tempcx, pVBInfo))
-                                                                        tempax |= AVIDEOSense;
-                                                        }
-                                                }
-                                        }
-                                }
-                        } /* end */
-                        if (!(tempax & Monitor2Sense)) {
-                                if (XGINew_SenseLCD(HwDeviceExtension, pVBInfo))
-                                        tempax |= LCDSense;
-                        }
-                        tempbx = 0;
-                        tempcx = 0;
-                        XGINew_Sense(tempbx, tempcx, pVBInfo);
-
-                        xgifb_reg_and_or(pVBInfo->P3d4, 0x32, ~0xDF, tempax);
-                        xgifb_reg_set(pVBInfo->Part2Port, 0x00, P2reg0);
-
-                        if (!(P2reg0 & 0x20)) {
-                                pVBInfo->VBInfo = DisableCRT2Display;
-                                /* XGI_SetCRT2Group301(SenseModeNo,
-                                 *                     HwDeviceExtension,
-                                 *                     pVBInfo); */
-                        }
-                }
-        }
-        XGI_DisableBridge(HwDeviceExtension, pVBInfo); /* shampoo 0226 */
-
-}
-
-unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *HwDeviceExtension,
-                               struct vb_device_info *pVBInfo)
-{
-        /* unsigned short SoftSetting ; */
-        unsigned short temp;
-
-        temp = XGINew_GetLCDDDCInfo(HwDeviceExtension, pVBInfo);
-
-        return temp;
-}
diff --git a/drivers/staging/xgifb/vb_ext.h b/drivers/staging/xgifb/vb_ext.h
deleted file mode 100644
index 0b1f55b4242f..000000000000
--- a/drivers/staging/xgifb/vb_ext.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _VBEXT_
-#define _VBEXT_
-
-extern void XGI_GetSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
-                               struct vb_device_info *pVBInfo);
-extern unsigned short XGINew_SenseLCD(struct xgi_hw_device_info *,
-                                      struct vb_device_info *pVBInfo);
-
-#endif
diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 9e890a17fbc2..4ccd988ffd7c 100644
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include <linux/delay.h> /* udelay */
 #include <linux/pci.h>
+#include <linux/vmalloc.h>
 
 #include "vgatypes.h"
 #include "XGIfb.h"
@@ -10,7 +11,6 @@
 #include "vb_util.h"
 #include "vb_setmode.h"
 #include "vb_init.h"
-#include "vb_ext.h"
 
 
 #include <linux/io.h>
@@ -35,6 +35,8 @@ static const unsigned short XGINew_DDRDRAM_TYPE20[12][5] = {
         { 2, 12,  9,  8, 0x35},
         { 2, 12,  8,  4, 0x31} };
 
+#define XGIFB_ROM_SIZE  65536
+
 static unsigned char
 XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
                        struct vb_device_info *pVBInfo)
@@ -1068,20 +1070,20 @@ static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
         return 0;
 }
 
-static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
+static void XGINew_SetDRAMSize_340(struct xgifb_video_info *xgifb_info,
+                struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short data;
 
-        pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
         pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;
 
-        XGISetModeNew(HwDeviceExtension, 0x2e);
+        XGISetModeNew(xgifb_info, HwDeviceExtension, 0x2e);
 
         data = xgifb_reg_get(pVBInfo->P3c4, 0x21);
         /* disable read cache */
         xgifb_reg_set(pVBInfo->P3c4, 0x21, (unsigned short) (data & 0xDF));
-        XGI_DisplayOff(HwDeviceExtension, pVBInfo);
+        XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
 
         /* data = xgifb_reg_get(pVBInfo->P3c4, 0x1); */
         /* data |= 0x20 ; */
@@ -1092,118 +1094,100 @@ static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
         xgifb_reg_set(pVBInfo->P3c4, 0x21, (unsigned short) (data | 0x20));
 }
 
-static void ReadVBIOSTablData(unsigned char ChipType,
+static u8 *xgifb_copy_rom(struct pci_dev *dev, size_t *rom_size)
+{
+        void __iomem *rom_address;
+        u8 *rom_copy;
+
+        rom_address = pci_map_rom(dev, rom_size);
+        if (rom_address == NULL)
+                return NULL;
+
+        rom_copy = vzalloc(XGIFB_ROM_SIZE);
+        if (rom_copy == NULL)
+                goto done;
+
+        *rom_size = min_t(size_t, *rom_size, XGIFB_ROM_SIZE);
+        memcpy_fromio(rom_copy, rom_address, *rom_size);
+
+done:
+        pci_unmap_rom(dev, rom_address);
+        return rom_copy;
+}
+
+static void xgifb_read_vbios(struct pci_dev *pdev,
                               struct vb_device_info *pVBInfo)
 {
-        volatile unsigned char *pVideoMemory =
-                (unsigned char *) pVBInfo->ROMAddr;
+        struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
+        u8 *vbios;
         unsigned long i;
-        unsigned char j, k;
-        /* Volari customize data area end */
-
-        if (ChipType == XG21) {
-                pVBInfo->IF_DEF_LVDS = 0;
-                if (pVideoMemory[0x65] & 0x1) {
-                        pVBInfo->IF_DEF_LVDS = 1;
-                        i = pVideoMemory[0x316] | (pVideoMemory[0x317] << 8);
-                        j = pVideoMemory[i - 1];
-                        if (j != 0xff) {
-                                k = 0;
-                                do {
-                                        pVBInfo->XG21_LVDSCapList[k].
-                                                 LVDS_Capability
-                                                = pVideoMemory[i] |
-                                                 (pVideoMemory[i + 1] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSHT
-                                                = pVideoMemory[i + 2] |
-                                                  (pVideoMemory[i + 3] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSVT
-                                                = pVideoMemory[i + 4] |
-                                                  (pVideoMemory[i + 5] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSHDE
-                                                = pVideoMemory[i + 6] |
-                                                  (pVideoMemory[i + 7] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSVDE
-                                                = pVideoMemory[i + 8] |
-                                                  (pVideoMemory[i + 9] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSHFP
-                                                = pVideoMemory[i + 10] |
-                                                  (pVideoMemory[i + 11] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSVFP
-                                                = pVideoMemory[i + 12] |
-                                                  (pVideoMemory[i + 13] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSHSYNC
-                                                = pVideoMemory[i + 14] |
-                                                  (pVideoMemory[i + 15] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].LVDSVSYNC
-                                                = pVideoMemory[i + 16] |
-                                                  (pVideoMemory[i + 17] << 8);
-                                        pVBInfo->XG21_LVDSCapList[k].VCLKData1
-                                                = pVideoMemory[i + 18];
-                                        pVBInfo->XG21_LVDSCapList[k].VCLKData2
-                                                = pVideoMemory[i + 19];
-                                        pVBInfo->XG21_LVDSCapList[k].PSC_S1
-                                                = pVideoMemory[i + 20];
-                                        pVBInfo->XG21_LVDSCapList[k].PSC_S2
-                                                = pVideoMemory[i + 21];
-                                        pVBInfo->XG21_LVDSCapList[k].PSC_S3
-                                                = pVideoMemory[i + 22];
-                                        pVBInfo->XG21_LVDSCapList[k].PSC_S4
-                                                = pVideoMemory[i + 23];
-                                        pVBInfo->XG21_LVDSCapList[k].PSC_S5
-                                                = pVideoMemory[i + 24];
-                                        i += 25;
-                                        j--;
-                                        k++;
-                                } while ((j > 0) &&
-                                         (k < (sizeof(XGI21_LCDCapList) /
-                                               sizeof(struct
-                                                        XGI21_LVDSCapStruct))));
-                        } else {
-                                pVBInfo->XG21_LVDSCapList[0].LVDS_Capability
-                                                = pVideoMemory[i] |
-                                                  (pVideoMemory[i + 1] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSHT
-                                                = pVideoMemory[i + 2] |
-                                                  (pVideoMemory[i + 3] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSVT
-                                                = pVideoMemory[i + 4] |
-                                                  (pVideoMemory[i + 5] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSHDE
-                                                = pVideoMemory[i + 6] |
-                                                  (pVideoMemory[i + 7] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSVDE
-                                                = pVideoMemory[i + 8] |
-                                                  (pVideoMemory[i + 9] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSHFP
-                                                = pVideoMemory[i + 10] |
-                                                  (pVideoMemory[i + 11] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSVFP
-                                                = pVideoMemory[i + 12] |
-                                                  (pVideoMemory[i + 13] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSHSYNC
-                                                = pVideoMemory[i + 14] |
-                                                  (pVideoMemory[i + 15] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].LVDSVSYNC
-                                                = pVideoMemory[i + 16] |
-                                                  (pVideoMemory[i + 17] << 8);
-                                pVBInfo->XG21_LVDSCapList[0].VCLKData1
-                                                = pVideoMemory[i + 18];
-                                pVBInfo->XG21_LVDSCapList[0].VCLKData2
-                                                = pVideoMemory[i + 19];
-                                pVBInfo->XG21_LVDSCapList[0].PSC_S1
-                                                = pVideoMemory[i + 20];
-                                pVBInfo->XG21_LVDSCapList[0].PSC_S2
-                                                = pVideoMemory[i + 21];
-                                pVBInfo->XG21_LVDSCapList[0].PSC_S3
-                                                = pVideoMemory[i + 22];
-                                pVBInfo->XG21_LVDSCapList[0].PSC_S4
-                                                = pVideoMemory[i + 23];
-                                pVBInfo->XG21_LVDSCapList[0].PSC_S5
-                                                = pVideoMemory[i + 24];
-                        }
-                }
+        unsigned char j;
+        struct XGI21_LVDSCapStruct *lvds;
+        size_t vbios_size;
+        int entry;
+
+        if (xgifb_info->chip != XG21)
+                return;
+        pVBInfo->IF_DEF_LVDS = 0;
+        vbios = xgifb_copy_rom(pdev, &vbios_size);
+        if (vbios == NULL) {
+                dev_err(&pdev->dev, "video BIOS not available\n");
+                return;
+        }
+        if (vbios_size <= 0x65)
+                goto error;
+        /*
+         * The user can ignore the LVDS bit in the BIOS and force the display
+         * type.
+         */
+        if (!(vbios[0x65] & 0x1) &&
+            (!xgifb_info->display2_force ||
+             xgifb_info->display2 != XGIFB_DISP_LCD)) {
+                vfree(vbios);
+                return;
         }
+        if (vbios_size <= 0x317)
+                goto error;
+        i = vbios[0x316] | (vbios[0x317] << 8);
+        if (vbios_size <= i - 1)
+                goto error;
+        j = vbios[i - 1];
+        if (j == 0)
+                goto error;
+        if (j == 0xff)
+                j = 1;
+        /*
+         * Read the LVDS table index scratch register set by the BIOS.
+         */
+        entry = xgifb_reg_get(xgifb_info->dev_info.P3d4, 0x36);
+        if (entry >= j)
+                entry = 0;
+        i += entry * 25;
+        lvds = &xgifb_info->lvds_data;
+        if (vbios_size <= i + 24)
+                goto error;
+        lvds->LVDS_Capability   = vbios[i]      | (vbios[i + 1] << 8);
+        lvds->LVDSHT            = vbios[i + 2]  | (vbios[i + 3] << 8);
+        lvds->LVDSVT            = vbios[i + 4]  | (vbios[i + 5] << 8);
+        lvds->LVDSHDE           = vbios[i + 6]  | (vbios[i + 7] << 8);
+        lvds->LVDSVDE           = vbios[i + 8]  | (vbios[i + 9] << 8);
+        lvds->LVDSHFP           = vbios[i + 10] | (vbios[i + 11] << 8);
+        lvds->LVDSVFP           = vbios[i + 12] | (vbios[i + 13] << 8);
+        lvds->LVDSHSYNC         = vbios[i + 14] | (vbios[i + 15] << 8);
+        lvds->LVDSVSYNC         = vbios[i + 16] | (vbios[i + 17] << 8);
+        lvds->VCLKData1         = vbios[i + 18];
+        lvds->VCLKData2         = vbios[i + 19];
+        lvds->PSC_S1            = vbios[i + 20];
+        lvds->PSC_S2            = vbios[i + 21];
+        lvds->PSC_S3            = vbios[i + 22];
+        lvds->PSC_S4            = vbios[i + 23];
+        lvds->PSC_S5            = vbios[i + 24];
+        vfree(vbios);
+        pVBInfo->IF_DEF_LVDS = 1;
+        return;
+error:
+        dev_err(&pdev->dev, "video BIOS corrupted\n");
+        vfree(vbios);
 }
 
 static void XGINew_ChkSenseStatus(struct xgi_hw_device_info *HwDeviceExtension,
@@ -1336,18 +1320,57 @@ static void XGINew_SetModeScratch(struct xgi_hw_device_info *HwDeviceExtension,
 
 }
 
+static unsigned short XGINew_SenseLCD(struct xgi_hw_device_info
+                                                        *HwDeviceExtension,
+                                      struct vb_device_info *pVBInfo)
+{
+        unsigned short temp;
+
+        /* add lcd sense */
+        if (HwDeviceExtension->ulCRT2LCDType == LCD_UNKNOWN) {
+                return 0;
+        } else {
+                temp = (unsigned short) HwDeviceExtension->ulCRT2LCDType;
+                switch (HwDeviceExtension->ulCRT2LCDType) {
+                case LCD_INVALID:
+                case LCD_800x600:
+                case LCD_1024x768:
+                case LCD_1280x1024:
+                        break;
+
+                case LCD_640x480:
+                case LCD_1024x600:
+                case LCD_1152x864:
+                case LCD_1280x960:
+                case LCD_1152x768:
+                        temp = 0;
+                        break;
+
+                case LCD_1400x1050:
+                case LCD_1280x768:
+                case LCD_1600x1200:
+                        break;
+
+                case LCD_1920x1440:
+                case LCD_2048x1536:
+                        temp = 0;
+                        break;
+
+                default:
+                        break;
+                }
+                xgifb_reg_and_or(pVBInfo->P3d4, 0x36, 0xF0, temp);
+                return 1;
+        }
+}
+
 static void XGINew_GetXG21Sense(struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
         unsigned char Temp;
-        volatile unsigned char *pVideoMemory =
-                        (unsigned char *) pVBInfo->ROMAddr;
-
-        pVBInfo->IF_DEF_LVDS = 0;
 
 #if 1
-        if ((pVideoMemory[0x65] & 0x01)) { /* For XG21 LVDS */
-                pVBInfo->IF_DEF_LVDS = 1;
+        if (pVBInfo->IF_DEF_LVDS) { /* For XG21 LVDS */
                 xgifb_reg_or(pVBInfo->P3d4, 0x32, LCDSense);
                 /* LVDS on chip */
                 xgifb_reg_and_or(pVBInfo->P3d4, 0x38, ~0xE0, 0xC0);
@@ -1393,7 +1416,6 @@ static void XGINew_GetXG27Sense(struct xgi_hw_device_info *HwDeviceExtension,
         xgifb_reg_set(pVBInfo->P3d4, 0x4A, bCR4A);
 
         if (Temp <= 0x02) {
-                pVBInfo->IF_DEF_LVDS = 1;
                 /* LVDS setting */
                 xgifb_reg_and_or(pVBInfo->P3d4, 0x38, ~0xE0, 0xC0);
                 xgifb_reg_set(pVBInfo->P3d4, 0x30, 0x21);
@@ -1451,24 +1473,15 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
         struct vb_device_info *pVBInfo = &VBINF;
         unsigned char i, temp = 0, temp1;
         /* VBIOSVersion[5]; */
-        volatile unsigned char *pVideoMemory;
 
         /* unsigned long j, k; */
 
-        pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
-
         pVBInfo->FBAddr = HwDeviceExtension->pjVideoMemoryAddress;
 
         pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
 
-        pVideoMemory = (unsigned char *) pVBInfo->ROMAddr;
-
         /* Newdebugcode(0x99); */
 
-
-        /* if (pVBInfo->ROMAddr == 0) */
-        /* return(0); */
-
         if (pVBInfo->FBAddr == NULL) {
                 printk("\n pVBInfo->FBAddr == 0 ");
                 return 0;
@@ -1516,8 +1529,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
 
         InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo);
 
-        /* ReadVBIOSData */
-        ReadVBIOSTablData(HwDeviceExtension->jChipType, pVBInfo);
+        xgifb_read_vbios(pdev, pVBInfo);
 
         /* 1.Openkey */
         xgifb_reg_set(pVBInfo->P3c4, 0x05, 0x86);
@@ -1774,7 +1786,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
                                          pVBInfo);
 
         printk("20");
-        XGINew_SetDRAMSize_340(HwDeviceExtension, pVBInfo);
+        XGINew_SetDRAMSize_340(xgifb_info, HwDeviceExtension, pVBInfo);
         printk("21");
 
         printk("22");
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 81c0cc41bb42..67a316c3c108 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -67,11 +67,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
         pVBInfo->XGINEWUB_CRT1Table
                         = (struct XGI_CRT1TableStruct *) XGI_CRT1Table;
 
-        /* add for new UNIVGABIOS */
-        /* XGINew_UBLCDDataTable =
-         *      (struct XGI_LCDDataTablStruct *) XGI_LCDDataTable; */
-        /* XGINew_UBTVDataTable = (XGI_TVDataTablStruct *) XGI_TVDataTable; */
-
         pVBInfo->MCLKData = (struct XGI_MCLKDataStruct *) XGI340New_MCLKData;
         pVBInfo->ECLKData = (struct XGI_ECLKDataStruct *) XGI340_ECLKData;
         pVBInfo->VCLKData = (struct XGI_VCLKDataStruct *) XGI_VCLKData;
@@ -148,9 +143,6 @@ void InitTo330Pointer(unsigned char ChipType, struct vb_device_info *pVBInfo)
         else
                 pVBInfo->LCDCapList = XGI_LCDCapList;
 
-        if ((ChipType == XG21) || (ChipType == XG27))
-                pVBInfo->XG21_LVDSCapList = XGI21_LCDCapList;
-
         pVBInfo->XGI_TVDelayList = XGI301TVDelayList;
         pVBInfo->XGI_TVDelayList2 = XGI301TVDelayList2;
 
@@ -236,28 +228,6 @@ static void XGI_SetSeqRegs(unsigned short ModeNo,
         }
 }
 
-static void XGI_SetMiscRegs(unsigned short StandTableIndex,
-                            struct vb_device_info *pVBInfo)
-{
-        unsigned char Miscdata;
-
-        /* Get Misc from file */
-        Miscdata = pVBInfo->StandTable[StandTableIndex].MISC;
-        /*
-        if (pVBInfo->VBType & (VB_XGI301B |
-                               VB_XGI302B |
-                               VB_XGI301LV |
-                               VB_XGI302LV |
-                               VB_XGI301C)) {
-                if (pVBInfo->VBInfo & SetCRT2ToLCDA) {
-                        Miscdata |= 0x0C;
-                }
-        }
-        */
-
-        outb(Miscdata, pVBInfo->P3c2); /* Set Misc(3c2) */
-}
-
 static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension,
                             unsigned short StandTableIndex,
                             struct vb_device_info *pVBInfo)
@@ -274,16 +244,6 @@ static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension,
                 CRTCdata = pVBInfo->StandTable[StandTableIndex].CRTC[i];
                 xgifb_reg_set(pVBInfo->P3d4, i, CRTCdata); /* Set CRTC(3d4) */
         }
-        /*
-        if ((HwDeviceExtension->jChipType == XGI_630) &&
-            (HwDeviceExtension->jChipRevision == 0x30)) {
-                if (pVBInfo->VBInfo & SetInSlaveMode) {
-                        if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToTV)) {
-                                xgifb_reg_set(pVBInfo->P3d4, 0x18, 0xFE);
-                        }
-                }
-        }
-        */
 }
 
 static void XGI_SetATTRegs(unsigned short ModeNo,
@@ -530,10 +490,6 @@ static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo,
         unsigned char data, data1, pushax;
         unsigned short i, j;
 
-        /* xgifb_reg_set(pVBInfo->P3d4, 0x51, 0); */
-        /* xgifb_reg_set(pVBInfo->P3d4, 0x56, 0); */
-        /* xgifb_reg_and_or(pVBInfo->P3d4, 0x11, 0x7f, 0x00); */
-
         /* unlock cr0-7 */
         data = (unsigned char) xgifb_reg_get(pVBInfo->P3d4, 0x11);
         data &= 0x7F;
@@ -595,10 +551,6 @@ static void XGI_SetCRT1Timing_V(unsigned short ModeIdIndex,
         unsigned char data;
         unsigned short i, j;
 
-        /* xgifb_reg_set(pVBInfo->P3d4, 0x51, 0); */
-        /* xgifb_reg_set(pVBInfo->P3d4, 0x56, 0); */
-        /* xgifb_reg_and_or(pVBInfo->P3d4, 0x11, 0x7f, 0x00); */
-
         for (i = 0x00; i <= 0x01; i++) {
                 data = pVBInfo->TimingV[0].data[i];
                 xgifb_reg_set(pVBInfo->P3d4, (unsigned short) (i + 6), data);
@@ -976,6 +928,20 @@ static void XGI_SetXG27CRTC(unsigned short ModeNo,
         }
 }
 
+static void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo)
+{
+        unsigned char temp;
+
+        /* D[1:0] 01: 18bit, 00: dual 12, 10: single 24 */
+        temp = xgifb_reg_get(pVBInfo->P3d4, 0x37);
+        temp = (temp & 3) << 6;
+        /* SR06[7]0: dual 12/1: single 24 [6] 18bit Dither <= 0 h/w recommend */
+        xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0xc0, temp & 0x80);
+        /* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: 24bits */
+        xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0xc0, temp | 0x80);
+
+}
+
 static void xgifb_set_lcd(int chip_id,
                           struct vb_device_info *pVBInfo,
                           unsigned short RefreshRateTableIndex,
@@ -1088,6 +1054,20 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
         }
 }
 
+static unsigned short XGI_GetResInfo(unsigned short ModeNo,
+                unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
+{
+        unsigned short resindex;
+
+        if (ModeNo <= 0x13)
+                /* si+St_ResInfo */
+                resindex = pVBInfo->SModeIDTable[ModeIdIndex].St_ResInfo;
+        else
+                /* si+Ext_ResInfo */
+                resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
+        return resindex;
+}
+
 static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
                 unsigned short ModeNo, unsigned short ModeIdIndex,
                 unsigned short RefreshRateTableIndex,
@@ -1127,9 +1107,6 @@ static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
 
         tempcx = 8;
 
-        /* if (!(modeflag & Charx8Dot)) */
-        /* tempcx = 9; */
-
         tempax /= tempcx;
         tempax -= 1;
         tempbx -= 1;
@@ -1163,20 +1140,6 @@ static void XGI_SetCRT1DE(struct xgi_hw_device_info *HwDeviceExtension,
         xgifb_reg_set(pVBInfo->P3d4, 0x11, temp);
 }
 
-unsigned short XGI_GetResInfo(unsigned short ModeNo,
-                unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
-{
-        unsigned short resindex;
-
-        if (ModeNo <= 0x13)
-                /* si+St_ResInfo */
-                resindex = pVBInfo->SModeIDTable[ModeIdIndex].St_ResInfo;
-        else
-                /* si+Ext_ResInfo */
-                resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
-        return resindex;
-}
-
 static void XGI_SetCRT1Offset(unsigned short ModeNo,
                               unsigned short ModeIdIndex,
                               unsigned short RefreshRateTableIndex,
@@ -1308,77 +1271,55 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
                                 VCLKIndex = LCDXlat2VCLK[CRT2Index];
                         else
                                 VCLKIndex = LCDXlat1VCLK[CRT2Index];
-                } else { /* for TV */
-                        if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                                if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) {
-                                        if (pVBInfo->SetFlag & RPLLDIV2XO) {
-                                                VCLKIndex = HiTVVCLKDIV2;
-                                                VCLKIndex += 25;
-                                        } else {
-                                                VCLKIndex = HiTVVCLK;
-                                                VCLKIndex += 25;
-                                        }
-
-                                        if (pVBInfo->SetFlag & TVSimuMode) {
-                                                if (modeflag & Charx8Dot) {
-                                                        VCLKIndex =
-                                                                HiTVSimuVCLK;
-                                                        VCLKIndex += 25;
-                                                } else {
-                                                        VCLKIndex =
-                                                                HiTVTextVCLK;
-                                                        VCLKIndex += 25;
-                                                }
-                                        }
+                } else if (pVBInfo->VBInfo & SetCRT2ToHiVisionTV) {
+                        if (pVBInfo->SetFlag & RPLLDIV2XO) {
+                                VCLKIndex = HiTVVCLKDIV2;
+                                VCLKIndex += 25;
+                        } else {
+                                VCLKIndex = HiTVVCLK;
+                                VCLKIndex += 25;
+                        }
 
-                                        /* 301lv */
-                                        if (pVBInfo->VBType & VB_XGI301LV) {
-                                                if (!(pVBInfo->VBExtInfo ==
-                                                     VB_YPbPr1080i)) {
-                                                        VCLKIndex =
-                                                                YPbPr750pVCLK;
-                                                        if (!(pVBInfo->VBExtInfo
-                                                                        ==
-                                                             VB_YPbPr750p)) {
-                                                                VCLKIndex =
-                                                                  YPbPr525pVCLK;
-                                                                if (!(pVBInfo->VBExtInfo
-                                                                                == VB_YPbPr525p)) {
-                                                                        VCLKIndex
-                                                                                        = YPbPr525iVCLK_2;
-                                                                        if (!(pVBInfo->SetFlag
-                                                                                        & RPLLDIV2XO))
-                                                                                VCLKIndex
-                                                                                                = YPbPr525iVCLK;
-                                                                }
-                                                        }
-                                                }
-                                        }
+                        if (pVBInfo->SetFlag & TVSimuMode) {
+                                if (modeflag & Charx8Dot) {
+                                        VCLKIndex = HiTVSimuVCLK;
+                                        VCLKIndex += 25;
                                 } else {
-                                        if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                                                if (pVBInfo->SetFlag &
-                                                    RPLLDIV2XO) {
-                                                        VCLKIndex = TVVCLKDIV2;
-                                                        VCLKIndex += 25;
-                                                } else {
-                                                        VCLKIndex = TVVCLK;
-                                                        VCLKIndex += 25;
-                                                }
-                                        }
+                                        VCLKIndex = HiTVTextVCLK;
+                                        VCLKIndex += 25;
                                 }
-                        } else { /* for CRT2 */
-                                /* Port 3cch */
-                                VCLKIndex = (unsigned char) inb(
-                                                (pVBInfo->P3ca + 0x02));
-                                VCLKIndex = ((VCLKIndex >> 2) & 0x03);
-                                if (ModeNo > 0x13) {
-                                        /* di+Ext_CRTVCLK */
-                                        VCLKIndex =
-                                                pVBInfo->RefIndex[
+                        }
+
+                        /* 301lv */
+                        if ((pVBInfo->VBType & VB_XGI301LV) &&
+                            !(pVBInfo->VBExtInfo == VB_YPbPr1080i)) {
+                                if (pVBInfo->VBExtInfo == VB_YPbPr750p)
+                                        VCLKIndex = YPbPr750pVCLK;
+                                else if (pVBInfo->VBExtInfo == VB_YPbPr525p)
+                                        VCLKIndex = YPbPr525pVCLK;
+                                else if (pVBInfo->SetFlag & RPLLDIV2XO)
+                                        VCLKIndex = YPbPr525iVCLK_2;
+                                else
+                                        VCLKIndex = YPbPr525iVCLK;
+                        }
+                } else if (pVBInfo->VBInfo & SetCRT2ToTV) {
+                        if (pVBInfo->SetFlag & RPLLDIV2XO) {
+                                VCLKIndex = TVVCLKDIV2;
+                                VCLKIndex += 25;
+                        } else {
+                                VCLKIndex = TVVCLK;
+                                VCLKIndex += 25;
+                        }
+                } else { /* for CRT2 */
+                        /* Port 3cch */
+                        VCLKIndex = (unsigned char) inb((pVBInfo->P3ca + 0x02));
+                        VCLKIndex = ((VCLKIndex >> 2) & 0x03);
+                        if (ModeNo > 0x13) {
+                                /* di+Ext_CRTVCLK */
+                                VCLKIndex = pVBInfo->RefIndex[
                                                         RefreshRateTableIndex].
                                                                 Ext_CRTVCLK;
-                                        VCLKIndex &= IndexMask;
-                                }
+                                VCLKIndex &= IndexMask;
                         }
                 }
         } else { /* LVDS */
@@ -1397,7 +1338,6 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
                 else
                         VCLKIndex = LVDSXlat3VCLK[VCLKIndex];
         }
-        /* VCLKIndex = VCLKIndex&IndexMask; */
 
         return VCLKIndex;
 }
@@ -1461,6 +1401,19 @@ static void XGI_SetCRT1VCLK(unsigned short ModeNo,
         }
 }
 
+static void XGI_SetXG21FPBits(struct vb_device_info *pVBInfo)
+{
+        unsigned char temp;
+
+        temp = xgifb_reg_get(pVBInfo->P3d4, 0x37); /* D[0] 1: 18bit */
+        temp = (temp & 1) << 6;
+        /* SR06[6] 18bit Dither */
+        xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0x40, temp);
+        /* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: dual 12bits */
+        xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0xc0, temp | 0x80);
+
+}
+
 static void XGI_SetCRT1FIFO(unsigned short ModeNo,
                 struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
@@ -1532,16 +1485,6 @@ static void XGI_SetVCLKState(struct xgi_hw_device_info *HwDeviceExtension,
                 xgifb_reg_set(pVBInfo->P3c4, 0x1F, data);
         }
 
-        /*  Jong for Adavantech LCD ripple issue
-        if ((VCLK >= 0) && (VCLK < 135))
-                data2 = 0x03;
-        else if ((VCLK >= 135) && (VCLK < 160))
-                data2 = 0x02;
-        else if ((VCLK >= 160) && (VCLK < 260))
-                data2 = 0x01;
-        else if (VCLK > 260)
-                data2 = 0x00;
-        */
         data2 = 0x00;
 
         xgifb_reg_and_or(pVBInfo->P3c4, 0x07, 0xFC, data2);
@@ -1591,7 +1534,6 @@ static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
                 data2 |= 0x20;
 
         xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0x3F, data2);
-        /* xgifb_reg_set(pVBInfo->P3c4,0x06,data2); */
         resindex = XGI_GetResInfo(ModeNo, ModeIdIndex, pVBInfo);
         if (ModeNo <= 0x13)
                 xres = pVBInfo->StResInfo[resindex].HTotal;
@@ -1636,11 +1578,6 @@ static void XGI_SetCRT1ModeRegs(struct xgi_hw_device_info *HwDeviceExtension,
         XGI_SetVCLKState(HwDeviceExtension, ModeNo, RefreshRateTableIndex,
                         pVBInfo);
 
-        /* if (modeflag&HalfDCLK) //030305 fix lowresolution bug */
-        /* if (XGINew_IF_DEF_NEW_LOWRES) */
-        /* XGI_VesaLowResolution(ModeNo, ModeIdIndex);
-         * //030305 fix lowresolution bug */
-
         data = xgifb_reg_get(pVBInfo->P3d4, 0x31);
 
         if (HwDeviceExtension->jChipType == XG27) {
@@ -1803,11 +1740,6 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo,
                 /* si+Ext_ResInfo */
                 modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
-        /* if (ModeNo > 0x13) */
-        /*      modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag; */
-        /* else */
-        /*      modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag; */
-
         if (ModeNo <= 0x13)
                 /* si+St_ResInfo */
                 resindex = pVBInfo->SModeIDTable[ModeIdIndex].St_ResInfo;
@@ -1815,8 +1747,6 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo,
                 /* si+Ext_ResInfo */
                 resindex = pVBInfo->EModeIDTable[ModeIdIndex].Ext_RESINFO;
 
-        /* resindex = XGI_GetResInfo(ModeNo, ModeIdIndex, pVBInfo); */
-
         if (ModeNo <= 0x13) {
                 xres = pVBInfo->StResInfo[resindex].HTotal;
                 yres = pVBInfo->StResInfo[resindex].VTotal;
@@ -1831,13 +1761,10 @@ static void XGI_GetLVDSResInfo(unsigned short ModeNo,
                 if (modeflag & DoubleScanMode)
                         yres = yres << 1;
         }
-        /* if (modeflag & Charx8Dot) */
-        /* { */
 
         if (xres == 720)
                 xres = 640;
 
-        /* } */
         pVBInfo->VGAHDE = xres;
         pVBInfo->HDE = xres;
         pVBInfo->VGAVDE = yres;
@@ -1890,7 +1817,7 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
                 tempal = (tempal & 0x0f);
         }
 
-        tempcx = LCDLenList[tempbx]; /* mov cl,byte ptr cs:LCDLenList[bx] */
+        tempcx = LCDLenList[tempbx];
 
         if (pVBInfo->LCDInfo & EnableScalingLCD) { /* ScaleLCD */
                 if ((tempbx == 5) || (tempbx) == 7)
@@ -1898,9 +1825,6 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
                 else if ((tempbx == 3) || (tempbx == 8))
                         tempcx = LVDSDesDataLen2;
         }
-        /* mov di, word ptr cs:LCDDataList[bx] */
-        /* tempdi = pVideoMemory[LCDDataList + tempbx * 2] |
-                    (pVideoMemory[LCDDataList + tempbx * 2 + 1] << 8); */
 
         switch (tempbx) {
         case 0:
@@ -2321,10 +2245,10 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
 
         switch (tempbx) {
         case 0:
-                tempdi = NULL; /*EPLCHTVCRT1Ptr_H;*/
+                tempdi = NULL;
                 break;
         case 1:
-                tempdi = NULL; /*EPLCHTVCRT1Ptr_V;*/
+                tempdi = NULL;
                 break;
         case 2:
         case 6:
@@ -2363,9 +2287,7 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
         }
 
         /* 07/05/22 */
-        if (table == 0x00) {
-        } else if (table == 0x01) {
-        } else if (table == 0x04) {
+        if (table == 0x04) {
                 switch (tempdi[i].DATAPTR) {
                 case 0:
                         return &XGI_ExtPALData[tempal];
@@ -2429,7 +2351,6 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
                 default:
                         break;
                 }
-        } else if (table == 0x06) {
         }
         return NULL;
 }
@@ -2741,7 +2662,6 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         else
                 tempbx = LCDPtr->LCDVRS;
 
-        /* tempbx = tempbx >> 4; */
         tempcx = push1;
 
         if (pVBInfo->LCDInfo & EnableScalingLCD)
@@ -2881,7 +2801,6 @@ static void XGI_GetLCDVCLKPtr(unsigned char *di_0, unsigned char *di_1,
         unsigned short index;
 
         if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
-                /* index = XGI_GetLCDCapPtr(pVBInfo); */
                 index = XGI_GetLCDCapPtr1(pVBInfo);
 
                 if (pVBInfo->VBInfo & SetCRT2ToLCD) { /* LCDB */
@@ -3105,19 +3024,6 @@ static void XGI_UpdateModeInfo(struct xgi_hw_device_info *HwDeviceExtension,
         }
 }
 
-void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension,
-                struct vb_device_info *pVBInfo)
-{
-        /*
-        if ( HwDeviceExtension->jChipType >= XG20 ) {
-                pVBInfo->Set_VGAType = XG20;
-        } else {
-                pVBInfo->Set_VGAType = VGA_XGI340;
-        }
-        */
-        pVBInfo->Set_VGAType = HwDeviceExtension->jChipType;
-}
-
 void XGI_GetVBType(struct vb_device_info *pVBInfo)
 {
         unsigned short flag, tempbx, tempah;
@@ -3160,7 +3066,7 @@ void XGI_GetVBType(struct vb_device_info *pVBInfo)
         }
 }
 
-void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
+static void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
@@ -3193,14 +3099,9 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
 
                 if (pVBInfo->IF_DEF_LCDA == 1) {
 
-                        if ((pVBInfo->Set_VGAType >= XG20)
-                                        || (pVBInfo->Set_VGAType >= XG40)) {
+                        if ((HwDeviceExtension->jChipType >= XG20) ||
+                            (HwDeviceExtension->jChipType >= XG40)) {
                                 if (pVBInfo->IF_DEF_LVDS == 0) {
-                                        /* if ((pVBInfo->VBType & VB_XGI302B)
-                                            || (pVBInfo->VBType & VB_XGI301LV)
-                                            || (pVBInfo->VBType & VB_XGI302LV)
-                                            || (pVBInfo->VBType & VB_XGI301C))
-                                        */
                                         if (pVBInfo->VBType &
                                             (VB_XGI302B |
                                              VB_XGI301LV |
@@ -3225,7 +3126,7 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                             ((pVBInfo->VBType & VB_XGI301LV) ||
                             (pVBInfo->VBType & VB_XGI302LV) ||
                             (pVBInfo->VBType & VB_XGI301C)))) {
-                                if (temp & SetYPbPr) { /* temp = CR38 */
+                                if (temp & SetYPbPr) {
                                         if (pVBInfo->IF_DEF_HiVision == 1) {
                                                 /* shampoo add for new
                                                  * scratch */
@@ -3242,8 +3143,6 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                                                          SetCRT2ToYPbPr;
                                                 }
                                         }
-
-                                        /* tempbx |= SetCRT2ToYPbPr; */
                                 }
                         }
                 }
@@ -3368,7 +3267,7 @@ void XGI_GetVBInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
         pVBInfo->VBInfo = tempbx;
 }
 
-void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
+static void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short temp, tempbx = 0, resinfo = 0, modeflag, index1;
@@ -3404,17 +3303,6 @@ void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                                 tempbx &= (SetCHTVOverScan |
                                            SetNTSCJ |
                                            SetPALTV);
-                        /*
-                        if (pVBInfo->IF_DEF_LVDS == 0) {
-                                //PAL-M/PAL-N Info
-                                index1 = xgifb_reg_get(pVBInfo->P3d4, 0x38);
-                                //00:PAL, 01:PAL-M, 10:PAL-N
-                                temp2 = (index1 & 0xC0) >> 5;
-                                tempbx |= temp2;
-                                if (temp2 & 0x02) //PAL-M
-                                        tempbx &= (~SetPALTV);
-                        }
-                        */
                 }
 
                 if (pVBInfo->IF_DEF_LVDS == 0) {
@@ -3476,8 +3364,8 @@ void XGI_GetTVInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
         pVBInfo->TVInfo = tempbx;
 }
 
-unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
-                struct vb_device_info *pVBInfo)
+static unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
+                unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
 {
         unsigned short temp, tempax, tempbx, modeflag, resinfo = 0, LCDIdIndex;
 
@@ -3553,15 +3441,8 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                         tempbx |= SetLCDtoNonExpanding;
         }
 
-        /*
-        if (tempax & LCDBToA) {
-                tempbx |= SetLCDBToA;
-        }
-        */
-
         if (pVBInfo->IF_DEF_ExpLink == 1) {
                 if (modeflag & HalfDCLK) {
-                        /* if (!(pVBInfo->LCDInfo&LCDNonExpanding)) */
                         if (!(tempbx & SetLCDtoNonExpanding)) {
                                 tempbx |= EnableLVDSDDA;
                         } else {
@@ -3604,25 +3485,6 @@ unsigned char XGI_GetLCDInfo(unsigned short ModeNo, unsigned short ModeIdIndex,
                 }
         }
 
-        /*
-        if (pVBInfo->IF_DEF_LVDS == 0) {
-                if (tempax & (LockLCDBToA | StLCDBToA)) {
-                        if (pVBInfo->VBInfo & SetInSlaveMode) {
-                                if (!((!(tempax & LockLCDBToA)) &&
-                                    (ModeNo > 0x13))) {
-                                        pVBInfo->VBInfo &=
-                                                ~(SetSimuScanMode |
-                                                  SetInSlaveMode |
-                                                  SetCRT2ToLCD);
-                                        pVBInfo->VBInfo |=
-                                                SetCRT2ToLCDA |
-                                                SetCRT2ToDualEdge;
-                                }
-                        }
-                }
-        }
-        */
-
         return 1;
 }
 
@@ -3632,10 +3494,6 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo,
         if (ModeNo <= 5)
                 ModeNo |= 1;
         if (ModeNo <= 0x13) {
-                /* for (*ModeIdIndex=0;
-                        *ModeIdIndex < sizeof(pVBInfo->SModeIDTable)
-                                / sizeof(struct XGI_StStruct);
-                        (*ModeIdIndex)++) */
                 for (*ModeIdIndex = 0;; (*ModeIdIndex)++) {
                         if (pVBInfo->SModeIDTable[*ModeIdIndex].St_ModeID ==
                             ModeNo)
@@ -3651,10 +3509,6 @@ unsigned char XGI_SearchModeID(unsigned short ModeNo,
                         (*ModeIdIndex) += 2; /* 400 lines */
                 /* else 350 lines */
         } else {
-                /* for (*ModeIdIndex=0;
-                        *ModeIdIndex < sizeof(pVBInfo->EModeIDTable)
-                                / sizeof(struct XGI_ExtStruct);
-                        (*ModeIdIndex)++) */
                 for (*ModeIdIndex = 0;; (*ModeIdIndex)++) {
                         if (pVBInfo->EModeIDTable[*ModeIdIndex].Ext_ModeID ==
                             ModeNo)
@@ -3675,7 +3529,6 @@ static unsigned char XG21GPIODataTransfer(unsigned char ujDate)
 
         for (i = 0; i < 8; i++) {
                 ujRet = ujRet << 1;
-                /* ujRet |= GETBITS(ujDate >> i, 0:0); */
                 ujRet |= (ujDate >> i) & 1;
         }
 
@@ -3726,7 +3579,101 @@ static unsigned char XGI_XG27GetPSCValue(struct vb_device_info *pVBInfo)
         return temp;
 }
 
-void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE,
+/*----------------------------------------------------------------------------*/
+/* input                                                                      */
+/*      bl[5] : 1;LVDS signal on                                              */
+/*      bl[1] : 1;LVDS backlight on                                           */
+/*      bl[0] : 1:LVDS VDD on                                                 */
+/*      bh: 100000b : clear bit 5, to set bit5                                */
+/*          000010b : clear bit 1, to set bit1                                */
+/*          000001b : clear bit 0, to set bit0                                */
+/*----------------------------------------------------------------------------*/
+static void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
+                struct vb_device_info *pVBInfo)
+{
+        unsigned char CR4A, temp;
+
+        CR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
+        tempbh &= 0x23;
+        tempbl &= 0x23;
+        xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~tempbh); /* enable GPIO write */
+
+        if (tempbh & 0x20) {
+                temp = (tempbl >> 4) & 0x02;
+
+                /* CR B4[1] */
+                xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~0x02, temp);
+
+        }
+
+        temp = xgifb_reg_get(pVBInfo->P3d4, 0x48);
+
+        temp = XG21GPIODataTransfer(temp);
+        temp &= ~tempbh;
+        temp |= tempbl;
+        xgifb_reg_set(pVBInfo->P3d4, 0x48, temp);
+}
+
+static void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
+                struct vb_device_info *pVBInfo)
+{
+        unsigned char CR4A, temp;
+        unsigned short tempbh0, tempbl0;
+
+        tempbh0 = tempbh;
+        tempbl0 = tempbl;
+        tempbh0 &= 0x20;
+        tempbl0 &= 0x20;
+        tempbh0 >>= 3;
+        tempbl0 >>= 3;
+
+        if (tempbh & 0x20) {
+                temp = (tempbl >> 4) & 0x02;
+
+                /* CR B4[1] */
+                xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~0x02, temp);
+
+        }
+        xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~tempbh0, tempbl0);
+
+        CR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
+        tempbh &= 0x03;
+        tempbl &= 0x03;
+        tempbh <<= 2;
+        tempbl <<= 2; /* GPIOC,GPIOD */
+        xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~tempbh); /* enable GPIO write */
+        xgifb_reg_and_or(pVBInfo->P3d4, 0x48, ~tempbh, tempbl);
+}
+
+/* --------------------------------------------------------------------- */
+/* Function : XGI_XG21SetPanelDelay */
+/* Input : */
+/* Output : */
+/* Description : */
+/* I/P : bl : 1 ; T1 : the duration between CPL on and signal on */
+/* : bl : 2 ; T2 : the duration signal on and Vdd on */
+/* : bl : 3 ; T3 : the duration between CPL off and signal off */
+/* : bl : 4 ; T4 : the duration signal off and Vdd off */
+/* --------------------------------------------------------------------- */
+static void XGI_XG21SetPanelDelay(struct xgifb_video_info *xgifb_info,
+                unsigned short tempbl,
+                struct vb_device_info *pVBInfo)
+{
+        if (tempbl == 1)
+                mdelay(xgifb_info->lvds_data.PSC_S1);
+
+        if (tempbl == 2)
+                mdelay(xgifb_info->lvds_data.PSC_S2);
+
+        if (tempbl == 3)
+                mdelay(xgifb_info->lvds_data.PSC_S3);
+
+        if (tempbl == 4)
+                mdelay(xgifb_info->lvds_data.PSC_S4);
+}
+
+static void XGI_DisplayOn(struct xgifb_video_info *xgifb_info,
+                struct xgi_hw_device_info *pXGIHWDE,
                 struct vb_device_info *pVBInfo)
 {
 
@@ -3736,12 +3683,12 @@ void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE,
                         if (!(XGI_XG21GetPSCValue(pVBInfo) & 0x1)) {
                                 /* LVDS VDD on */
                                 XGI_XG21BLSignalVDD(0x01, 0x01, pVBInfo);
-                                XGI_XG21SetPanelDelay(2, pVBInfo);
+                                XGI_XG21SetPanelDelay(xgifb_info, 2, pVBInfo);
                         }
                         if (!(XGI_XG21GetPSCValue(pVBInfo) & 0x20))
                                 /* LVDS signal on */
                                 XGI_XG21BLSignalVDD(0x20, 0x20, pVBInfo);
-                        XGI_XG21SetPanelDelay(3, pVBInfo);
+                        XGI_XG21SetPanelDelay(xgifb_info, 3, pVBInfo);
                         /* LVDS backlight on */
                         XGI_XG21BLSignalVDD(0x02, 0x02, pVBInfo);
                 } else {
@@ -3756,12 +3703,12 @@ void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE,
                         if (!(XGI_XG27GetPSCValue(pVBInfo) & 0x1)) {
                                 /* LVDS VDD on */
                                 XGI_XG27BLSignalVDD(0x01, 0x01, pVBInfo);
-                                XGI_XG21SetPanelDelay(2, pVBInfo);
+                                XGI_XG21SetPanelDelay(xgifb_info, 2, pVBInfo);
                         }
                         if (!(XGI_XG27GetPSCValue(pVBInfo) & 0x20))
                                 /* LVDS signal on */
                                 XGI_XG27BLSignalVDD(0x20, 0x20, pVBInfo);
-                        XGI_XG21SetPanelDelay(3, pVBInfo);
+                        XGI_XG21SetPanelDelay(xgifb_info, 3, pVBInfo);
                         /* LVDS backlight on */
                         XGI_XG27BLSignalVDD(0x02, 0x02, pVBInfo);
                 } else {
@@ -3772,7 +3719,8 @@ void XGI_DisplayOn(struct xgi_hw_device_info *pXGIHWDE,
         }
 }
 
-void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE,
+void XGI_DisplayOff(struct xgifb_video_info *xgifb_info,
+                struct xgi_hw_device_info *pXGIHWDE,
                 struct vb_device_info *pVBInfo)
 {
 
@@ -3780,7 +3728,7 @@ void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE,
                 if (pVBInfo->IF_DEF_LVDS == 1) {
                         /* LVDS backlight off */
                         XGI_XG21BLSignalVDD(0x02, 0x00, pVBInfo);
-                        XGI_XG21SetPanelDelay(3, pVBInfo);
+                        XGI_XG21SetPanelDelay(xgifb_info, 3, pVBInfo);
                 } else {
                         /* DVO/DVI signal off */
                         XGI_XG21BLSignalVDD(0x20, 0x00, pVBInfo);
@@ -3791,7 +3739,7 @@ void XGI_DisplayOff(struct xgi_hw_device_info *pXGIHWDE,
                 if ((XGI_XG27GetPSCValue(pVBInfo) & 0x2)) {
                         /* LVDS backlight off */
                         XGI_XG27BLSignalVDD(0x02, 0x00, pVBInfo);
-                        XGI_XG21SetPanelDelay(3, pVBInfo);
+                        XGI_XG21SetPanelDelay(xgifb_info, 3, pVBInfo);
                 }
 
                 if (pVBInfo->IF_DEF_LVDS == 0)
@@ -3838,26 +3786,17 @@ static void XGI_GetCRT2ResInfo(unsigned short ModeNo,
         if (ModeNo <= 0x13) {
                 xres = pVBInfo->StResInfo[resindex].HTotal;
                 yres = pVBInfo->StResInfo[resindex].VTotal;
-                /* si+St_ResInfo */
-                /* modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;*/
         } else {
                 xres = pVBInfo->ModeResInfo[resindex].HTotal; /* xres->ax */
                 yres = pVBInfo->ModeResInfo[resindex].VTotal; /* yres->bx */
                 /* si+St_ModeFlag */
                 modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
 
-                /*
-                if (pVBInfo->IF_DEF_FSTN) {
-                        xres *= 2;
-                        yres *= 2;
-                 } else {
-                */
                 if (modeflag & HalfDCLK)
                         xres *= 2;
 
                 if (modeflag & DoubleScanMode)
                         yres *= 2;
-                /* } */
         }
 
         if (pVBInfo->VBInfo & SetCRT2ToLCD) {
@@ -4028,8 +3967,6 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
                                         tempbx = 775;
                                 else if (pVBInfo->VGAVDE == 600)
                                         tempbx = 775;
-                                /* else if (pVBInfo->VGAVDE==350) tempbx=560; */
-                                /* else if (pVBInfo->VGAVDE==400) tempbx=640; */
                                 else
                                         tempbx = 768;
                         } else
@@ -4294,7 +4231,6 @@ static void XGI_PreSetGroup1(unsigned short ModeNo, unsigned short ModeIdIndex,
         XGI_SetCRT2Offset(ModeNo, ModeIdIndex, RefreshRateTableIndex,
                         HwDeviceExtension, pVBInfo);
         XGI_SetCRT2FIFO(pVBInfo);
-        /* XGI_SetCRT2Sync(ModeNo,RefreshRateTableIndex); */
 
         for (tempcx = 4; tempcx < 7; tempcx++)
                 xgifb_reg_set(pVBInfo->Part1Port, tempcx, 0x0);
@@ -4497,9 +4433,6 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
 
         temp = 0xFF; /* set MAX HT */
         xgifb_reg_set(pVBInfo->Part1Port, 0x03, temp);
-        /* if (modeflag & Charx8Dot) */
-        /*      tempcx = 0x08; */
-        /* else */
         tempcx = 0x08;
 
         if (pVBInfo->VBType & (VB_XGI301LV | VB_XGI302LV | VB_XGI301C))
@@ -4565,7 +4498,6 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
                         }
                 }
         } else {
-                /* tempcx = tempbx & 0x00FF ; */
                 tempbx = (tempbx & 0xFF00) >> 8;
                 tempcx = (tempcx + tempbx) >> 1;
                 temp = (tempcx & 0x00FF) + 2;
@@ -4579,36 +4511,23 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
                                                 temp -= 6;
                                 }
                         }
-                } else {
-                        if (!(modeflag & HalfDCLK)) {
-                                temp -= 4;
-                                if (pVBInfo->LCDResInfo != Panel1280x960) {
-                                        if (pVBInfo->VGAHDE >= 800) {
-                                                temp -= 7;
-                                                if (pVBInfo->ModeType ==
-                                                        ModeEGA) {
-                                                        if (pVBInfo->VGAVDE ==
-                                                            1024) {
-                                                                temp += 15;
-                                                                if (pVBInfo->LCDResInfo != Panel1280x1024) {
-                                                                        temp +=
-                                                                            7;
-                                                                }
-                                                        }
-                                                }
-
-                                                if (pVBInfo->VGAHDE >= 1280) {
-                                                        if (pVBInfo->LCDResInfo
-                                                                        != Panel1280x960) {
-                                                                if (pVBInfo->LCDInfo
-                                                                                & LCDNonExpanding) {
-                                                                        temp
-                                                                                        += 28;
-                                                                }
-                                                        }
-                                                }
-                                        }
+                } else if (!(modeflag & HalfDCLK)) {
+                        temp -= 4;
+                        if (pVBInfo->LCDResInfo != Panel1280x960 &&
+                            pVBInfo->VGAHDE >= 800) {
+                                temp -= 7;
+                                if (pVBInfo->ModeType == ModeEGA &&
+                                    pVBInfo->VGAVDE == 1024) {
+                                        temp += 15;
+                                        if (pVBInfo->LCDResInfo !=
+                                                Panel1280x1024)
+                                                temp += 7;
                                 }
+
+                                if (pVBInfo->VGAHDE >= 1280 &&
+                                    pVBInfo->LCDResInfo != Panel1280x960 &&
+                                    (pVBInfo->LCDInfo & LCDNonExpanding))
+                                        temp += 28;
                         }
                 }
         }
@@ -5297,7 +5216,6 @@ static void XGI_SetGroup2(unsigned short ModeNo, unsigned short ModeIdIndex,
                 tempax--;
                 xgifb_reg_and(pVBInfo->Part2Port, 0x01, tempax);
 
-                /* if ( !( pVBInfo->VBType & VB_XGI301C ) ) */
                 xgifb_reg_and(pVBInfo->Part2Port, 0x00, 0xEF);
         }
 
@@ -5436,7 +5354,6 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         tempax = pVBInfo->VT;
         tempbx = pVBInfo->LCDVRS;
 
-        /* if (SetLCD_Info & EnableScalingLCD) */
         tempcx += tempbx;
         if (tempcx >= tempax)
                 tempcx -= tempax;
@@ -5478,12 +5395,10 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
         temp = (tempcx & 0xFF00) >> 8;
         xgifb_reg_set(pVBInfo->Part2Port, 0x25, temp);
 
-        /* getlcdsync() */
         XGI_GetLCDSync(&tempax, &tempbx, pVBInfo);
         tempcx = tempax;
         tempax = pVBInfo->HT;
         tempbx = pVBInfo->LCDHRS;
-        /* if ( SetLCD_Info & EnableScalingLCD) */
         if (XGI_IsLCDDualLink(pVBInfo)) {
                 tempax = tempax >> 1;
                 tempbx = tempbx >> 1;
@@ -5801,9 +5716,6 @@ static void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex,
                 if (XGI_IsLCDDualLink(pVBInfo))
                         tempax = tempax >> 1;
 
-                /* if((pVBInfo->VBInfo&(SetCRT2ToLCD)) ||
-                      ((pVBInfo->TVInfo&SetYPbPrMode525p) ||
-                      (pVBInfo->TVInfo&SetYPbPrMode750p))) { */
                 if (pVBInfo->VBInfo & SetCRT2ToLCD) {
                         if (tempax > 800)
                                 tempax -= 800;
@@ -5817,33 +5729,6 @@ static void XGI_SetGroup4(unsigned short ModeNo, unsigned short ModeIdIndex,
                 }
                 tempax -= 1;
 
-                /*
-                if (pVBInfo->VBInfo & (SetCRT2ToTV | SetCRT2ToHiVisionTV)) {
-                        if (pVBInfo->VBType & VB_XGI301LV) {
-                                if (!(pVBInfo->TVInfo &
-                                      (SetYPbPrMode525p |
-                                       SetYPbPrMode750p |
-                                       SetYPbPrMode1080i))) {
-                                        if (pVBInfo->VGAHDE > 800) {
-                                                if (pVBInfo->VGAHDE == 1024)
-                                                        tempax =(tempax * 25 /
-                                                                 32) - 1;
-                                                else
-                                                        tempax = (tempax * 20 /
-                                                                  32) - 1;
-                                        }
-                                }
-                        } else {
-                                if (pVBInfo->VGAHDE > 800) {
-                                        if (pVBInfo->VGAHDE == 1024)
-                                                tempax = (tempax * 25 / 32) - 1;
-                                        else
-                                                tempax = (tempax * 20 / 32) - 1;
-                                }
-                        }
-                }
-                */
-
                 temp = (tempax & 0xFF00) >> 8;
                 temp = ((temp & 0x0003) << 4);
                 xgifb_reg_set(pVBInfo->Part4Port, 0x1E, temp);
@@ -5902,7 +5787,6 @@ static void XGI_SetGroup5(unsigned short ModeNo, unsigned short ModeIdIndex,
                 if (!(pVBInfo->VBInfo & (SetInSlaveMode | LoadDACFlag
                                 | CRT2DisplayFlag))) {
                         XGINew_EnableCRT2(pVBInfo);
-                        /* LoadDAC2(pVBInfo->Part5Port, ModeNo, ModeIdIndex); */
                 }
         }
         return;
@@ -5921,118 +5805,11 @@ static void XGI_DisableGatingCRT(struct xgi_hw_device_info *HwDeviceExtension,
         xgifb_reg_and_or(pVBInfo->P3d4, 0x63, 0xBF, 0x00);
 }
 
-/*----------------------------------------------------------------------------*/
-/* input                                                                      */
-/*      bl[5] : 1;LVDS signal on                                              */
-/*      bl[1] : 1;LVDS backlight on                                           */
-/*      bl[0] : 1:LVDS VDD on                                                 */
-/*      bh: 100000b : clear bit 5, to set bit5                                */
-/*          000010b : clear bit 1, to set bit1                                */
-/*          000001b : clear bit 0, to set bit0                                */
-/*----------------------------------------------------------------------------*/
-void XGI_XG21BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
-                struct vb_device_info *pVBInfo)
-{
-        unsigned char CR4A, temp;
-
-        CR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
-        tempbh &= 0x23;
-        tempbl &= 0x23;
-        xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~tempbh); /* enable GPIO write */
-
-        if (tempbh & 0x20) {
-                temp = (tempbl >> 4) & 0x02;
-
-                /* CR B4[1] */
-                xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~0x02, temp);
-
-        }
-
-        temp = xgifb_reg_get(pVBInfo->P3d4, 0x48);
-
-        temp = XG21GPIODataTransfer(temp);
-        temp &= ~tempbh;
-        temp |= tempbl;
-        xgifb_reg_set(pVBInfo->P3d4, 0x48, temp);
-}
-
-void XGI_XG27BLSignalVDD(unsigned short tempbh, unsigned short tempbl,
-                struct vb_device_info *pVBInfo)
-{
-        unsigned char CR4A, temp;
-        unsigned short tempbh0, tempbl0;
-
-        tempbh0 = tempbh;
-        tempbl0 = tempbl;
-        tempbh0 &= 0x20;
-        tempbl0 &= 0x20;
-        tempbh0 >>= 3;
-        tempbl0 >>= 3;
-
-        if (tempbh & 0x20) {
-                temp = (tempbl >> 4) & 0x02;
-
-                /* CR B4[1] */
-                xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~0x02, temp);
-
-        }
-        xgifb_reg_and_or(pVBInfo->P3d4, 0xB4, ~tempbh0, tempbl0);
-
-        CR4A = xgifb_reg_get(pVBInfo->P3d4, 0x4A);
-        tempbh &= 0x03;
-        tempbl &= 0x03;
-        tempbh <<= 2;
-        tempbl <<= 2; /* GPIOC,GPIOD */
-        xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~tempbh); /* enable GPIO write */
-        xgifb_reg_and_or(pVBInfo->P3d4, 0x48, ~tempbh, tempbl);
-}
-
-/* --------------------------------------------------------------------- */
-unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo)
-{
-        unsigned short index;
-
-        index = xgifb_reg_get(pVBInfo->P3d4, 0x36);
-        if (index < sizeof(XGI21_LCDCapList)
-                        / sizeof(struct XGI21_LVDSCapStruct))
-                return index;
-        return 0;
-}
-
-/* --------------------------------------------------------------------- */
-/* Function : XGI_XG21SetPanelDelay */
-/* Input : */
-/* Output : */
-/* Description : */
-/* I/P : bl : 1 ; T1 : the duration between CPL on and signal on */
-/* : bl : 2 ; T2 : the duration signal on and Vdd on */
-/* : bl : 3 ; T3 : the duration between CPL off and signal off */
-/* : bl : 4 ; T4 : the duration signal off and Vdd off */
-/* --------------------------------------------------------------------- */
-void XGI_XG21SetPanelDelay(unsigned short tempbl,
+static unsigned char XGI_XG21CheckLVDSMode(struct xgifb_video_info *xgifb_info,
+                unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
 {
-        unsigned short index;
-
-        index = XGI_GetLVDSOEMTableIndex(pVBInfo);
-        if (tempbl == 1)
-                mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S1);
-
-        if (tempbl == 2)
-                mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S2);
-
-        if (tempbl == 3)
-                mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S3);
-
-        if (tempbl == 4)
-                mdelay(pVBInfo->XG21_LVDSCapList[index].PSC_S4);
-}
-
-unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
-                unsigned short ModeIdIndex, struct vb_device_info *pVBInfo)
-{
-        unsigned short xres, yres, colordepth, modeflag, resindex,
-                        lvdstableindex;
+        unsigned short xres, yres, colordepth, modeflag, resindex;
 
         resindex = XGI_GetResInfo(ModeNo, ModeIdIndex, pVBInfo);
         if (ModeNo <= 0x13) {
@@ -6061,18 +5838,15 @@ unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
 
         }
 
-        lvdstableindex = XGI_GetLVDSOEMTableIndex(pVBInfo);
-        if (xres > (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE))
+        if (xres > xgifb_info->lvds_data.LVDSHDE)
                 return 0;
 
-        if (yres > (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE))
+        if (yres > xgifb_info->lvds_data.LVDSVDE)
                 return 0;
 
         if (ModeNo > 0x13) {
-                if ((xres != (pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                LVDSHDE)) ||
-                    (yres != (pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                LVDSVDE))) {
+                if (xres != xgifb_info->lvds_data.LVDSHDE ||
+                    yres != xgifb_info->lvds_data.LVDSVDE) {
                         colordepth = XGI_GetColorDepth(ModeNo,
                                                        ModeIdIndex,
                                                        pVBInfo);
@@ -6084,55 +5858,26 @@ unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
         return 1;
 }
 
-void XGI_SetXG21FPBits(struct vb_device_info *pVBInfo)
-{
-        unsigned char temp;
-
-        temp = xgifb_reg_get(pVBInfo->P3d4, 0x37); /* D[0] 1: 18bit */
-        temp = (temp & 1) << 6;
-        /* SR06[6] 18bit Dither */
-        xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0x40, temp);
-        /* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: dual 12bits */
-        xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0xc0, temp | 0x80);
-
-}
-
-void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo)
-{
-        unsigned char temp;
-
-        /* D[1:0] 01: 18bit, 00: dual 12, 10: single 24 */
-        temp = xgifb_reg_get(pVBInfo->P3d4, 0x37);
-        temp = (temp & 3) << 6;
-        /* SR06[7]0: dual 12/1: single 24 [6] 18bit Dither <= 0 h/w recommend */
-        xgifb_reg_and_or(pVBInfo->P3c4, 0x06, ~0xc0, temp & 0x80);
-        /* SR09[7] enable FP output, SR09[6] 1: sigle 18bits, 0: 24bits */
-        xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0xc0, temp | 0x80);
-
-}
-
-static void xgifb_set_lvds(int chip_id,
+static void xgifb_set_lvds(struct xgifb_video_info *xgifb_info,
+                           int chip_id,
                            unsigned short ModeNo,
                            unsigned short ModeIdIndex,
                            struct vb_device_info *pVBInfo)
 {
         unsigned char temp, Miscdata;
-        unsigned short xres, yres, modeflag, resindex, lvdstableindex;
+        unsigned short xres, yres, modeflag, resindex;
         unsigned short LVDSHT, LVDSHBS, LVDSHRS, LVDSHRE, LVDSHBE;
         unsigned short LVDSVT, LVDSVBS, LVDSVRS, LVDSVRE, LVDSVBE;
         unsigned short value;
 
-        lvdstableindex = XGI_GetLVDSOEMTableIndex(pVBInfo);
-        temp = (unsigned char) ((pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                        LVDS_Capability &
+        temp = (unsigned char) ((xgifb_info->lvds_data.LVDS_Capability &
                                 (LCDPolarity << 8)) >> 8);
         temp &= LCDPolarity;
         Miscdata = (unsigned char) inb(pVBInfo->P3cc);
 
         outb((Miscdata & 0x3F) | temp, pVBInfo->P3c2);
 
-        temp = (unsigned char) (pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                        LVDS_Capability & LCDPolarity);
+        temp = xgifb_info->lvds_data.LVDS_Capability & LCDPolarity;
         /* SR35[7] FP VSync polarity */
         xgifb_reg_and_or(pVBInfo->P3c4, 0x35, ~0x80, temp & 0x80);
         /* SR30[5] FP HSync polarity */
@@ -6159,48 +5904,43 @@ static void xgifb_set_lvds(int chip_id,
         if (!(modeflag & Charx8Dot))
                 xres = xres * 8 / 9;
 
-        LVDSHT = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHT;
+        LVDSHT = xgifb_info->lvds_data.LVDSHT;
 
-        LVDSHBS = xres + (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE
-                        - xres) / 2;
+        LVDSHBS = xres + (xgifb_info->lvds_data.LVDSHDE - xres) / 2;
         if ((ModeNo <= 0x13) && (modeflag & HalfDCLK))
                 LVDSHBS -= xres / 4;
 
         if (LVDSHBS > LVDSHT)
                 LVDSHBS -= LVDSHT;
 
-        LVDSHRS = LVDSHBS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHFP;
+        LVDSHRS = LVDSHBS + xgifb_info->lvds_data.LVDSHFP;
         if (LVDSHRS > LVDSHT)
                 LVDSHRS -= LVDSHT;
 
-        LVDSHRE = LVDSHRS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHSYNC;
+        LVDSHRE = LVDSHRS + xgifb_info->lvds_data.LVDSHSYNC;
         if (LVDSHRE > LVDSHT)
                 LVDSHRE -= LVDSHT;
 
-        LVDSHBE = LVDSHBS + LVDSHT
-                        - pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSHDE;
+        LVDSHBE = LVDSHBS + LVDSHT - xgifb_info->lvds_data.LVDSHDE;
 
-        LVDSVT = pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVT;
+        LVDSVT = xgifb_info->lvds_data.LVDSVT;
 
-        LVDSVBS = yres + (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE
-                        - yres) / 2;
+        LVDSVBS = yres + (xgifb_info->lvds_data.LVDSVDE - yres) / 2;
         if ((ModeNo > 0x13) && (modeflag & DoubleScanMode))
                 LVDSVBS += yres / 2;
 
         if (LVDSVBS > LVDSVT)
                 LVDSVBS -= LVDSVT;
 
-        LVDSVRS = LVDSVBS + pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVFP;
+        LVDSVRS = LVDSVBS + xgifb_info->lvds_data.LVDSVFP;
         if (LVDSVRS > LVDSVT)
                 LVDSVRS -= LVDSVT;
 
-        LVDSVRE = LVDSVRS + pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                        LVDSVSYNC;
+        LVDSVRE = LVDSVRS + xgifb_info->lvds_data.LVDSVSYNC;
         if (LVDSVRE > LVDSVT)
                 LVDSVRE -= LVDSVT;
 
-        LVDSVBE = LVDSVBS + LVDSVT
-                        - pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDSVDE;
+        LVDSVBE = LVDSVBS + LVDSVT - xgifb_info->lvds_data.LVDSVDE;
 
         temp = (unsigned char) xgifb_reg_get(pVBInfo->P3d4, 0x11);
         xgifb_reg_set(pVBInfo->P3d4, 0x11, temp & 0x7f); /* Unlock CRTC */
@@ -6300,13 +6040,9 @@ static void xgifb_set_lvds(int chip_id,
 
                 xgifb_reg_and_or(pVBInfo->P3c4, 0x31, ~0x30, value);
                 xgifb_reg_set(pVBInfo->P3c4,
-                              0x2B,
-                              pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                        VCLKData1);
+                              0x2B, xgifb_info->lvds_data.VCLKData1);
                 xgifb_reg_set(pVBInfo->P3c4,
-                              0x2C,
-                              pVBInfo->XG21_LVDSCapList[lvdstableindex].
-                                        VCLKData2);
+                              0x2C, xgifb_info->lvds_data.VCLKData2);
                 value += 0x10;
         }
 
@@ -6398,7 +6134,8 @@ static unsigned char XGI_EnableChISLCD(struct vb_device_info *pVBInfo)
         return 0;
 }
 
-void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
+static void XGI_DisableBridge(struct xgifb_video_info *xgifb_info,
+                struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short tempah = 0;
@@ -6442,7 +6179,7 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                                                 | SetSimuScanMode))) {
                         if (pVBInfo->SetFlag & GatingCRT)
                                 XGI_EnableGatingCRT(HwDeviceExtension, pVBInfo);
-                        XGI_DisplayOff(HwDeviceExtension, pVBInfo);
+                        XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
                 }
 
                 if (pVBInfo->VBInfo & SetCRT2ToLCDA) {
@@ -6464,7 +6201,6 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                     ((!(pVBInfo->VBInfo & SetCRT2ToLCDA)) &&
                     (pVBInfo->VBInfo &
                         (SetCRT2ToRAMDAC | SetCRT2ToLCD | SetCRT2ToTV))))
-                        /* BScreenOff=1 */
                         xgifb_reg_or(pVBInfo->Part1Port, 0x00, 0x80);
 
                 if ((pVBInfo->SetFlag & DisableChB) ||
@@ -6484,7 +6220,6 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                 }
         } else { /* {301} */
                 if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToTV)) {
-                        /* BScreenOff=1 */
                         xgifb_reg_or(pVBInfo->Part1Port, 0x00, 0x80);
                         /* Disable CRT2 */
                         xgifb_reg_and(pVBInfo->Part1Port, 0x1E, 0xDF);
@@ -6494,7 +6229,7 @@ void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
 
                 if (pVBInfo->VBInfo & (DisableCRT2Display | SetCRT2ToLCDA
                                 | SetSimuScanMode))
-                        XGI_DisplayOff(HwDeviceExtension, pVBInfo);
+                        XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
         }
 }
 
@@ -6610,17 +6345,6 @@ static void XGI_SetDelayComp(struct vb_device_info *pVBInfo)
 
                         if (pVBInfo->VBInfo & SetCRT2ToDualEdge)
                                 tempbl = tempbl >> 4;
-                        /*
-                        if (pVBInfo->VBInfo & SetCRT2ToRAMDAC)
-                                tempbl = CRT2Delay1;    // Get CRT2 Delay
-                        if (pVBInfo->VBType &
-                            (VB_XGI301B |
-                             VB_XGI302B |
-                             VB_XGI301LV |
-                             VB_XGI302LV |
-                             VB_XGI301C))
-                                tempbl = CRT2Delay2;
-                        */
                         if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
                                 /* Get LCD Delay */
                                 index = XGI_GetLCDCapPtr(pVBInfo);
@@ -6680,23 +6404,6 @@ static void XGI_SetLCDCap_A(unsigned short tempcx,
                                 (unsigned short) (0x30 | (tempcx & 0x00C0)));
                 xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x00);
         }
-
-        /*
-        if (tempcx & EnableLCD24bpp) {  // 24bits
-                xgifb_reg_and_or(pVBInfo->Part1Port,
-                                 0x19,
-                                 0x0F,
-                                 (unsigned short)(0x30 | (tempcx&0x00C0)));
-                xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x00);
-        } else {
-                xgifb_reg_and_or(pVBInfo->Part1Port,
-                                 0x19,
-                                 0x0F,
-                                 // Enable Dither
-                                 (unsigned short)(0x20 | (tempcx&0x00C0)));
-                xgifb_reg_and_or(pVBInfo->Part1Port, 0x1A, 0x7F, 0x80);
-        }
-        */
 }
 
 /* --------------------------------------------------------------------- */
@@ -6718,6 +6425,25 @@ static void XGI_SetLCDCap_B(unsigned short tempcx,
                                                 | 0x18)); /* Enable Dither */
 }
 
+static void XGI_LongWait(struct vb_device_info *pVBInfo)
+{
+        unsigned short i;
+
+        i = xgifb_reg_get(pVBInfo->P3c4, 0x1F);
+
+        if (!(i & 0xC0)) {
+                for (i = 0; i < 0xFFFF; i++) {
+                        if (!(inb(pVBInfo->P3da) & 0x08))
+                                break;
+                }
+
+                for (i = 0; i < 0xFFFF; i++) {
+                        if ((inb(pVBInfo->P3da) & 0x08))
+                                break;
+                }
+        }
+}
+
 static void SetSpectrum(struct vb_device_info *pVBInfo)
 {
         unsigned short index;
@@ -6940,14 +6666,12 @@ static void XGI_OEM310Setting(unsigned short ModeNo,
                               unsigned short ModeIdIndex,
                               struct vb_device_info *pVBInfo)
 {
-        /* GetPart1IO(); */
         XGI_SetDelayComp(pVBInfo);
 
         if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA))
                 XGI_SetLCDCap(pVBInfo);
 
         if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                /* GetPart2IO() */
                 XGI_SetPhaseIncr(pVBInfo);
                 XGI_SetYFilter(ModeNo, ModeIdIndex, pVBInfo);
                 XGI_SetAntiFlicker(ModeNo, ModeIdIndex, pVBInfo);
@@ -6963,7 +6687,7 @@ static void XGI_OEM310Setting(unsigned short ModeNo,
 /* Output : */
 /* Description : Origin code for crt2group */
 /* --------------------------------------------------------------------- */
-void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
+static void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
                 struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
@@ -6972,8 +6696,6 @@ void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
 
         unsigned char tempah;
 
-        /* // fix write part1 index 0 BTDRAM bit Bug
-         * xgifb_reg_set(pVBInfo->Part1Port, 0x03, 0x00); */
         tempah = 0;
         if (!(pVBInfo->VBInfo & DisableCRT2Display)) {
                 tempah = xgifb_reg_get(pVBInfo->Part1Port, 0x00);
@@ -6999,32 +6721,6 @@ void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
                 }
         }
 
-        /* 0210 shampoo
-        if (pVBInfo->VBInfo & DisableCRT2Display) {
-                tempah = 0;
-        }
-
-        xgifb_reg_set(pVBInfo->Part1Port, 0x00, tempah);
-        if (pVBInfo->VBInfo & (SetCRT2ToRAMDAC | SetCRT2ToTV | SetCRT2ToLCD)) {
-                tempcl = pVBInfo->ModeType;
-                if (ModeNo > 0x13) {
-                        tempcl -= ModeVGA;
-                        if ((tempcl > 0) || (tempcl == 0)) {
-                                tempah=(0x008>>tempcl) ;
-                                if (tempah == 0)
-                                        tempah = 1;
-                                tempah |= 0x040;
-                        }
-                } else {
-                        tempah = 0x040;
-                }
-
-                if (pVBInfo->VBInfo & SetInSlaveMode) {
-                        tempah = (tempah ^ 0x050);
-                }
-        }
-        */
-
         xgifb_reg_set(pVBInfo->Part1Port, 0x00, tempah);
         tempah = 0x08;
         tempbl = 0xf0;
@@ -7093,14 +6789,11 @@ void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
                 tempah |= 0x080;
 
                 if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                        /* if (!(pVBInfo->TVInfo &
-                                 (SetYPbPrMode525p | SetYPbPrMode750p))) { */
                         tempah |= 0x020;
                         if (ModeNo > 0x13) {
                                 if (pVBInfo->VBInfo & DriverMode)
                                         tempah = tempah ^ 0x20;
                         }
-                        /* } */
                 }
 
                 xgifb_reg_and_or(pVBInfo->Part4Port, 0x0D, ~0x0BF, tempah);
@@ -7110,12 +6803,8 @@ void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
                         tempah |= 0x40;
 
                 if (pVBInfo->VBInfo & SetCRT2ToTV) {
-                        /* if ((!(pVBInfo->VBInfo & SetCRT2ToHiVisionTV)) &&
-                               (!(pVBInfo->TVInfo &
-                                  (SetYPbPrMode525p | SetYPbPrMode750p)))) { */
                         if (pVBInfo->TVInfo & RPLLDIV2XO)
                                 tempah |= 0x40;
-                        /* } */
                 }
 
                 if ((pVBInfo->LCDResInfo == Panel1280x1024)
@@ -7219,57 +6908,6 @@ unsigned char XGI_BridgeIsOn(struct vb_device_info *pVBInfo)
         }
 }
 
-void XGI_LongWait(struct vb_device_info *pVBInfo)
-{
-        unsigned short i;
-
-        i = xgifb_reg_get(pVBInfo->P3c4, 0x1F);
-
-        if (!(i & 0xC0)) {
-                for (i = 0; i < 0xFFFF; i++) {
-                        if (!(inb(pVBInfo->P3da) & 0x08))
-                                break;
-                }
-
-                for (i = 0; i < 0xFFFF; i++) {
-                        if ((inb(pVBInfo->P3da) & 0x08))
-                                break;
-                }
-        }
-}
-
-static void XGI_VBLongWait(struct vb_device_info *pVBInfo)
-{
-        unsigned short tempal, temp, i, j;
-        return;
-        if (!(pVBInfo->VBInfo & SetCRT2ToTV)) {
-                temp = 0;
-                for (i = 0; i < 3; i++) {
-                        for (j = 0; j < 100; j++) {
-                                tempal = inb(pVBInfo->P3da);
-                                if (temp & 0x01) { /* VBWaitMode2 */
-                                        if ((tempal & 0x08))
-                                                continue;
-
-                                        if (!(tempal & 0x08))
-                                                break;
-
-                                } else { /* VBWaitMode1 */
-                                        if (!(tempal & 0x08))
-                                                continue;
-
-                                        if ((tempal & 0x08))
-                                                break;
-                                }
-                        }
-                        temp = temp ^ 0x01;
-                }
-        } else {
-                XGI_LongWait(pVBInfo);
-        }
-        return;
-}
-
 unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
                 unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
@@ -7322,12 +6960,6 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
         RefreshRateTableIndex = pVBInfo->EModeIDTable[ModeIdIndex].REFindex;
         ModeNo = pVBInfo->RefIndex[RefreshRateTableIndex].ModeID;
         if (pXGIHWDE->jChipType >= XG20) { /* for XG20, XG21, XG27 */
-                /*
-                if (pVBInfo->RefIndex[RefreshRateTableIndex].Ext_InfoFlag &
-                    XG2xNotSupport) {
-                        index++;
-                }
-                */
                 if ((pVBInfo->RefIndex[RefreshRateTableIndex].XRes == 800) &&
                     (pVBInfo->RefIndex[RefreshRateTableIndex].YRes == 600)) {
                         index++;
@@ -7371,7 +7003,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
                 temp = XGI_AjustCRT2Rate(ModeNo, ModeIdIndex,
                                 RefreshRateTableIndex, &i, pVBInfo);
         }
-        return RefreshRateTableIndex + i; /* return (0x01 | (temp1<<1)); */
+        return RefreshRateTableIndex + i;
 }
 
 static void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex,
@@ -7379,9 +7011,6 @@ static void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short RefreshRateTableIndex;
-        /* unsigned short temp ; */
-
-        /* pVBInfo->SelectCRT2Rate = 0; */
 
         pVBInfo->SetFlag |= ProgrammingCRT2;
         RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
@@ -7394,7 +7023,7 @@ static void XGI_SetLCDAGroup(unsigned short ModeNo, unsigned short ModeIdIndex,
         XGI_SetCRT2ECLK(ModeNo, ModeIdIndex, RefreshRateTableIndex, pVBInfo);
 }
 
-unsigned char XGI_SetCRT2Group301(unsigned short ModeNo,
+static unsigned char XGI_SetCRT2Group301(unsigned short ModeNo,
                 struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
@@ -7499,10 +7128,6 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo)
                 outb((unsigned char) DAC_TEST_PARMS[2], (pVBInfo->P3c8 + 1));
         }
 
-        XGI_VBLongWait(pVBInfo);
-        XGI_VBLongWait(pVBInfo);
-        XGI_VBLongWait(pVBInfo);
-
         mdelay(1);
 
         XGI_WaitDisply(pVBInfo);
@@ -7532,7 +7157,8 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo)
         xgifb_reg_set(pVBInfo->P3c4, 0x1F, (unsigned char) SR1F);
 }
 
-void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
+static void XGI_EnableBridge(struct xgifb_video_info *xgifb_info,
+                struct xgi_hw_device_info *HwDeviceExtension,
                 struct vb_device_info *pVBInfo)
 {
         unsigned short tempah;
@@ -7544,7 +7170,6 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                                 /* Power on */
                                 xgifb_reg_set(pVBInfo->Part1Port, 0x1E, 0x20);
                         } else {
-                                /* SetCRT2ToLCDA ) */
                                 if (pVBInfo->VBInfo & SetCRT2ToDualEdge) {
                                         /* Power on */
                                         xgifb_reg_set(pVBInfo->Part1Port,
@@ -7572,10 +7197,8 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                                                 pVBInfo->Part1Port, 0x2E);
 
                                 if (!(tempah & 0x80))
-                                        /* BVBDOENABLE = 1 */
                                         xgifb_reg_or(pVBInfo->Part1Port,
                                                         0x2E, 0x80);
-                                /* BScreenOFF = 0 */
                                 xgifb_reg_and(pVBInfo->Part1Port, 0x00, 0x7F);
                         }
                 }
@@ -7638,12 +7261,11 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                 xgifb_reg_or(pVBInfo->Part4Port, 0x1F, tempah);
 
                 if (!(pVBInfo->SetFlag & DisableChA)) {
-                        XGI_VBLongWait(pVBInfo);
                         if (!(pVBInfo->SetFlag & GatingCRT)) {
                                 XGI_DisableGatingCRT(HwDeviceExtension,
                                                      pVBInfo);
-                                XGI_DisplayOn(HwDeviceExtension, pVBInfo);
-                                XGI_VBLongWait(pVBInfo);
+                                XGI_DisplayOn(xgifb_info, HwDeviceExtension,
+                                                pVBInfo);
                         }
                 }
         } /* 301 */
@@ -7656,15 +7278,15 @@ void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
                 tempah = (unsigned char) xgifb_reg_get(pVBInfo->Part1Port,
                                 0x2E);
                 if (!(tempah & 0x80))
-                        /* BVBDOENABLE = 1 */
                         xgifb_reg_or(pVBInfo->Part1Port, 0x2E, 0x80);
 
                 xgifb_reg_and(pVBInfo->Part1Port, 0x00, 0x7F);
-                XGI_DisplayOn(HwDeviceExtension, pVBInfo);
+                XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo);
         } /* End of VB */
 }
 
-static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
+static void XGI_SetCRT1Group(struct xgifb_video_info *xgifb_info,
+                struct xgi_hw_device_info *HwDeviceExtension,
                 unsigned short ModeNo, unsigned short ModeIdIndex,
                 struct vb_device_info *pVBInfo)
 {
@@ -7672,18 +7294,14 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
 
         unsigned short XGINew_P3cc = pVBInfo->P3cc;
 
-        /* XGINew_CRT1Mode = ModeNo; // SaveModeID */
         StandTableIndex = XGI_GetModePtr(ModeNo, ModeIdIndex, pVBInfo);
-        /* XGI_SetBIOSData(ModeNo, ModeIdIndex); */
-        /* XGI_ClearBankRegs(ModeNo, ModeIdIndex); */
         XGI_SetSeqRegs(ModeNo, StandTableIndex, ModeIdIndex, pVBInfo);
-        XGI_SetMiscRegs(StandTableIndex, pVBInfo);
+        outb(pVBInfo->StandTable[StandTableIndex].MISC, pVBInfo->P3c2);
         XGI_SetCRTCRegs(HwDeviceExtension, StandTableIndex, pVBInfo);
         XGI_SetATTRegs(ModeNo, StandTableIndex, ModeIdIndex, pVBInfo);
         XGI_SetGRCRegs(StandTableIndex, pVBInfo);
         XGI_ClearExt1Regs(pVBInfo);
 
-        /* if (pVBInfo->IF_DEF_ExpLink) */
         if (HwDeviceExtension->jChipType == XG27) {
                 if (pVBInfo->IF_DEF_LVDS == 0)
                         XGI_SetDefaultVCLK(pVBInfo);
@@ -7735,11 +7353,6 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
                 temp = xgifb_reg_get(pVBInfo->P3d4, 0x38);
                 if (temp & 0xA0) {
 
-                        /* Enable write GPIOF */
-                        /* xgifb_reg_and(pVBInfo->P3d4, 0x4A, ~0x20); */
-                        /* P. DWN */
-                        /* xgifb_reg_and(pVBInfo->P3d4, 0x48, ~0x20); */
-                        /* XG21 CRT1 Timing */
                         if (HwDeviceExtension->jChipType == XG27)
                                 XGI_SetXG27CRTC(ModeNo, ModeIdIndex,
                                                 RefreshRateTableIndex, pVBInfo);
@@ -7754,10 +7367,9 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
                                         pVBInfo, RefreshRateTableIndex, ModeNo);
 
                         if (pVBInfo->IF_DEF_LVDS == 1)
-                                xgifb_set_lvds(HwDeviceExtension->jChipType,
+                                xgifb_set_lvds(xgifb_info,
+                                                HwDeviceExtension->jChipType,
                                                 ModeNo, ModeIdIndex, pVBInfo);
-                        /* P. ON */
-                        /* xgifb_reg_or(pVBInfo->P3d4, 0x48, 0x20); */
                 }
         }
 
@@ -7765,22 +7377,16 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
         XGI_SetCRT1FIFO(ModeNo, HwDeviceExtension, pVBInfo);
         XGI_SetCRT1ModeRegs(HwDeviceExtension, ModeNo, ModeIdIndex,
                         RefreshRateTableIndex, pVBInfo);
-
-        /* XGI_LoadCharacter(); //dif ifdef TVFont */
-
         XGI_LoadDAC(ModeNo, ModeIdIndex, pVBInfo);
-        /* XGI_ClearBuffer(HwDeviceExtension, ModeNo, pVBInfo); */
 }
 
-unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
+unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
+                        struct xgi_hw_device_info *HwDeviceExtension,
                         unsigned short ModeNo)
 {
         unsigned short ModeIdIndex;
-        /* unsigned char *pVBInfo->FBAddr =
-                                HwDeviceExtension->pjVideoMemoryAddress; */
         struct vb_device_info VBINF;
         struct vb_device_info *pVBInfo = &VBINF;
-        pVBInfo->ROMAddr = HwDeviceExtension->pjVirtualRomBase;
         pVBInfo->BaseAddr = (unsigned long) HwDeviceExtension->pjIOAddress;
         pVBInfo->IF_DEF_LVDS = 0;
         pVBInfo->IF_DEF_LCDA = 1;
@@ -7831,14 +7437,8 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
                 XGI_GetVBType(pVBInfo);
 
         InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo);
-        if (ModeNo & 0x80) {
+        if (ModeNo & 0x80)
                 ModeNo = ModeNo & 0x7F;
-                /* XGINew_flag_clearbuffer = 0; */
-        }
-        /* else {
-                XGINew_flag_clearbuffer = 1;
-        }
-        */
         xgifb_reg_set(pVBInfo->P3c4, 0x05, 0x86);
 
         if (HwDeviceExtension->jChipType < XG20) /* kuku 2004/06/25 1.Openkey */
@@ -7846,16 +7446,14 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
 
         XGI_SearchModeID(ModeNo, &ModeIdIndex, pVBInfo);
 
-        XGI_GetVGAType(HwDeviceExtension, pVBInfo);
-
         if (HwDeviceExtension->jChipType < XG20) { /* kuku 2004/06/25 */
                 XGI_GetVBInfo(ModeNo, ModeIdIndex, HwDeviceExtension, pVBInfo);
                 XGI_GetTVInfo(ModeNo, ModeIdIndex, pVBInfo);
                 XGI_GetLCDInfo(ModeNo, ModeIdIndex, pVBInfo);
-                XGI_DisableBridge(HwDeviceExtension, pVBInfo);
+                XGI_DisableBridge(xgifb_info, HwDeviceExtension, pVBInfo);
 
                 if (pVBInfo->VBInfo & (SetSimuScanMode | SetCRT2ToLCDA)) {
-                        XGI_SetCRT1Group(HwDeviceExtension, ModeNo,
+                        XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo,
                                         ModeIdIndex, pVBInfo);
 
                         if (pVBInfo->VBInfo & SetCRT2ToLCDA) {
@@ -7864,7 +7462,8 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
                         }
                 } else {
                         if (!(pVBInfo->VBInfo & SwitchToCRT2)) {
-                                XGI_SetCRT1Group(HwDeviceExtension, ModeNo,
+                                XGI_SetCRT1Group(xgifb_info,
+                                                HwDeviceExtension, ModeNo,
                                                 ModeIdIndex, pVBInfo);
                                 if (pVBInfo->VBInfo & SetCRT2ToLCDA) {
                                         XGI_SetLCDAGroup(ModeNo, ModeIdIndex,
@@ -7894,11 +7493,11 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
                 XGI_SetCRT2ModeRegs(ModeNo, HwDeviceExtension, pVBInfo);
                 XGI_OEM310Setting(ModeNo, ModeIdIndex, pVBInfo); /*0212*/
                 XGI_CloseCRTC(HwDeviceExtension, pVBInfo);
-                XGI_EnableBridge(HwDeviceExtension, pVBInfo);
+                XGI_EnableBridge(xgifb_info, HwDeviceExtension, pVBInfo);
         } /* !XG20 */
         else {
                 if (pVBInfo->IF_DEF_LVDS == 1)
-                        if (!XGI_XG21CheckLVDSMode(ModeNo,
+                        if (!XGI_XG21CheckLVDSMode(xgifb_info, ModeNo,
                                                    ModeIdIndex,
                                                    pVBInfo))
                                 return 0;
@@ -7914,39 +7513,13 @@ unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
                 pVBInfo->SetFlag = 0;
                 pVBInfo->VBInfo = DisableCRT2Display;
 
-                XGI_DisplayOff(HwDeviceExtension, pVBInfo);
+                XGI_DisplayOff(xgifb_info, HwDeviceExtension, pVBInfo);
 
-                XGI_SetCRT1Group(HwDeviceExtension, ModeNo, ModeIdIndex,
-                                pVBInfo);
+                XGI_SetCRT1Group(xgifb_info, HwDeviceExtension, ModeNo,
+                                ModeIdIndex, pVBInfo);
 
-                XGI_DisplayOn(HwDeviceExtension, pVBInfo);
-                /*
-                if (HwDeviceExtension->jChipType == XG21)
-                        xgifb_reg_and_or(pVBInfo->P3c4, 0x09, ~0x80, 0x80);
-                */
-        }
-
-        /*
-        if (ModeNo <= 0x13) {
-                modeflag = pVBInfo->SModeIDTable[ModeIdIndex].St_ModeFlag;
-        } else {
-                modeflag = pVBInfo->EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+                XGI_DisplayOn(xgifb_info, HwDeviceExtension, pVBInfo);
         }
-        pVBInfo->ModeType = modeflag&ModeInfoFlag;
-        pVBInfo->SetFlag = 0x00;
-        pVBInfo->VBInfo = DisableCRT2Display;
-        temp = XGINew_CheckMemorySize(HwDeviceExtension,
-                                      ModeNo,
-                                      ModeIdIndex,
-                                      pVBInfo);
-
-        if (temp == 0)
-                return (0);
-
-        XGI_DisplayOff(HwDeviceExtension, pVBInfo) ;
-        XGI_SetCRT1Group(HwDeviceExtension, ModeNo, ModeIdIndex, pVBInfo);
-        XGI_DisplayOn(HwDeviceExtension, pVBInfo);
-        */
 
         XGI_UpdateModeInfo(HwDeviceExtension, pVBInfo);
 
diff --git a/drivers/staging/xgifb/vb_setmode.h b/drivers/staging/xgifb/vb_setmode.h
index 1bd8667ff5cf..552482858c1c 100644
--- a/drivers/staging/xgifb/vb_setmode.h
+++ b/drivers/staging/xgifb/vb_setmode.h
@@ -6,66 +6,22 @@ extern void XGI_UnLockCRT2(struct xgi_hw_device_info *HwDeviceExtension,
                            struct vb_device_info *);
 extern void XGI_LockCRT2(struct xgi_hw_device_info *HwDeviceExtension,
                          struct vb_device_info *);
-extern void XGI_LongWait(struct vb_device_info *);
-extern void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
-                                struct xgi_hw_device_info *,
-                                struct vb_device_info *);
-extern void XGI_DisableBridge(struct xgi_hw_device_info *HwDeviceExtension,
-                              struct vb_device_info *);
-extern void XGI_EnableBridge(struct xgi_hw_device_info *HwDeviceExtension,
-                             struct vb_device_info *);
-extern void XGI_DisplayOff(struct xgi_hw_device_info *,
+extern void XGI_DisplayOff(struct xgifb_video_info *,
+                           struct xgi_hw_device_info *,
                            struct vb_device_info *);
-extern void XGI_DisplayOn(struct xgi_hw_device_info *,
-                          struct vb_device_info *);
 extern void XGI_GetVBType(struct vb_device_info *);
 extern void XGI_SenseCRT1(struct vb_device_info *);
-extern void XGI_GetVGAType(struct xgi_hw_device_info *HwDeviceExtension,
-                           struct vb_device_info *);
-extern void XGI_GetVBInfo(unsigned short ModeNo,
-                          unsigned short ModeIdIndex,
-                          struct xgi_hw_device_info *HwDeviceExtension,
-                          struct vb_device_info *);
-extern void XGI_GetTVInfo(unsigned short ModeNo,
-                          unsigned short ModeIdIndex,
-                          struct vb_device_info *);
-extern unsigned short XGI_GetResInfo(unsigned short ModeNo,
-                                     unsigned short ModeIdIndex,
-                                     struct vb_device_info *pVBInfo);
-
-extern unsigned char XGISetModeNew(struct xgi_hw_device_info *HwDeviceExtension,
+extern unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
+                                   struct xgi_hw_device_info *HwDeviceExtension,
                                    unsigned short ModeNo) ;
 
 extern unsigned char XGI_SearchModeID(unsigned short ModeNo,
                                       unsigned short *ModeIdIndex,
                                       struct vb_device_info *);
-extern unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
-                                    unsigned short ModeIdIndex,
-                                    struct vb_device_info *);
 extern unsigned char XGI_BridgeIsOn(struct vb_device_info *);
-
-extern unsigned char
-XGI_SetCRT2Group301(unsigned short ModeNo,
-                    struct xgi_hw_device_info *HwDeviceExtension,
-                    struct vb_device_info *);
 extern unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
                                          unsigned short ModeNo,
                                          unsigned short ModeIdIndex,
                                          struct vb_device_info *);
 
-extern void XGI_SetXG21FPBits(struct vb_device_info *pVBInfo);
-extern void XGI_SetXG27FPBits(struct vb_device_info *pVBInfo);
-extern void XGI_XG21BLSignalVDD(unsigned short tempbh,
-                                unsigned short tempbl,
-                                struct vb_device_info *pVBInfo);
-extern void XGI_XG27BLSignalVDD(unsigned short tempbh,
-                                unsigned short tempbl,
-                                struct vb_device_info *pVBInfo);
-extern void XGI_XG21SetPanelDelay(unsigned short tempbl,
-                                  struct vb_device_info *pVBInfo);
-extern unsigned char XGI_XG21CheckLVDSMode(unsigned short ModeNo,
-                                           unsigned short ModeIdIndex,
-                                           struct vb_device_info *pVBInfo);
-extern unsigned short XGI_GetLVDSOEMTableIndex(struct vb_device_info *pVBInfo);
-
 #endif
diff --git a/drivers/staging/xgifb/vb_struct.h b/drivers/staging/xgifb/vb_struct.h
index f9ade6f9f7ee..6556a0d6ff82 100644
--- a/drivers/staging/xgifb/vb_struct.h
+++ b/drivers/staging/xgifb/vb_struct.h
@@ -293,13 +293,12 @@ struct vb_device_info {
         unsigned short   IF_DEF_ExpLink;
         unsigned short   IF_DEF_HiVision;
         unsigned short   LCDResInfo, LCDTypeInfo, VBType;/*301b*/
-        unsigned short   VBInfo, TVInfo, LCDInfo, Set_VGAType;
+        unsigned short   VBInfo, TVInfo, LCDInfo;
         unsigned short   VBExtInfo;/*301lv*/
         unsigned short   SetFlag;
         unsigned short   NewFlickerMode;
         unsigned short   SelectCRT2Rate;
 
-        unsigned char *ROMAddr;
         void __iomem *FBAddr;
         unsigned long BaseAddr;
         unsigned long RelIO;
@@ -376,7 +375,6 @@ struct vb_device_info {
         unsigned char   *pXGINew_CR97 ;
 
         struct XGI330_LCDCapStruct  *LCDCapList;
-        struct XGI21_LVDSCapStruct  *XG21_LVDSCapList;
 
         struct XGI_TimingHStruct  *TimingH;
         struct XGI_TimingVStruct  *TimingV;
diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index b81ac7726d1c..e7946f1c1143 100644
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -2569,33 +2569,6 @@ static struct XGI330_LCDCapStruct  XGI_LCDCapList[] = {
         0x30, 0x10, 0x5A, 0x10, 0x10, 0x0A, 0xC0, 0x28, 0x10}
 };
 
-struct XGI21_LVDSCapStruct XGI21_LCDCapList[] = {
-        {DisableLCD24bpp + LCDPolarity,
-         2160, 1250, 1600, 1200,   64,    1,  192,    3,
-         0x70, 0x24, 0x20, 0x04, 0x0A, 0x02, 0xC8
-        },
-        {DisableLCD24bpp + LCDPolarity,
-         1688, 1066, 1280, 1024,   48,    1,   112,    3,
-         0x70, 0x44, 0x20, 0x04, 0x0A, 0x02, 0xC8
-        },
-        {DisableLCD24bpp + LCDPolarity + (LCDPolarity << 8),
-         1344,  806, 1024,  768,   24,    3,   136,    6,
-         0x6C, 0x65, 0x20, 0x04, 0x0A, 0x02, 0xC8
-        },
-        {DisableLCD24bpp + LCDPolarity,
-         1056,  628,  800,  600,   40,    1,  128,    4,
-         0x42, 0xE2, 0x20, 0x14, 0x0A, 0x02, 0x00
-        },
-        {DisableLCD24bpp + LCDPolarity,
-          928,  525,  800,  480,   40,   13,   48,    3,
-         0x52, 0xC5, 0x20, 0x14, 0x0A, 0x02, 0x00
-        },
-        {DisableLCD24bpp + LCDPolarity + (LCDPolarity << 8),
-          800,  525,  640,  480,   16,   10,   96,    2,
-         0x1B, 0xE1, 0x20, 0x04, 0x0A, 0x02, 0xC8
-        }
-};
-
 static struct XGI_Ext2Struct XGI330_RefIndex[] = {
         {Support32Bpp + SupportAllCRT2 + SyncPN, RES320x200, VCLK25_175,
         0x00, 0x10, 0x59, 320, 200},/* 00 */
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index 9b939b75c309..9e166bbb00c4 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -51,8 +51,6 @@ struct xgi_hw_device_info {
         unsigned long ulExternalChip; /* NO VB or other video bridge*/
                                       /* if ujVBChipID = VB_CHIP_UNKNOWN, */
 
-        unsigned char *pjVirtualRomBase; /* ROM image */
-
         void __iomem *pjVideoMemoryAddress;/* base virtual memory address */
                                             /* of Linear VGA memory */
 
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 56c1f9c80dc1..642840c612ac 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -787,7 +787,7 @@ static ssize_t zv_max_zsize_store(struct kobject *kobj,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        err = strict_strtoul(buf, 10, &val);
+        err = kstrtoul(buf, 10, &val);
         if (err || (val == 0) || (val > (PAGE_SIZE / 8) * 7))
                 return -EINVAL;
         zv_max_zsize = val;
@@ -819,7 +819,7 @@ static ssize_t zv_max_mean_zsize_store(struct kobject *kobj,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        err = strict_strtoul(buf, 10, &val);
+        err = kstrtoul(buf, 10, &val);
         if (err || (val == 0) || (val > (PAGE_SIZE / 8) * 7))
                 return -EINVAL;
         zv_max_mean_zsize = val;
@@ -853,7 +853,7 @@ static ssize_t zv_page_count_policy_percent_store(struct kobject *kobj,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        err = strict_strtoul(buf, 10, &val);
+        err = kstrtoul(buf, 10, &val);
         if (err || (val == 0) || (val > 150))
                 return -EINVAL;
         zv_page_count_policy_percent = val;
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c
index 09de99fbb7e0..2a2a92d389e6 100644
--- a/drivers/staging/zram/zram_drv.c
+++ b/drivers/staging/zram/zram_drv.c
@@ -653,7 +653,8 @@ int zram_init_device(struct zram *zram)
                 goto fail_no_table;
         }
 
-        zram->compress_buffer = (void *)__get_free_pages(__GFP_ZERO, 1);
+        zram->compress_buffer =
+                (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1);
         if (!zram->compress_buffer) {
                 pr_err("Error allocating compressor buffer space\n");
                 ret = -ENOMEM;
diff --git a/drivers/staging/zram/zram_sysfs.c b/drivers/staging/zram/zram_sysfs.c
index 0ea8ed296a9d..d521122826f6 100644
--- a/drivers/staging/zram/zram_sysfs.c
+++ b/drivers/staging/zram/zram_sysfs.c
@@ -58,7 +58,7 @@ static ssize_t disksize_store(struct device *dev,
         u64 disksize;
         struct zram *zram = dev_to_zram(dev);
 
-        ret = strict_strtoull(buf, 10, &disksize);
+        ret = kstrtoull(buf, 10, &disksize);
         if (ret)
                 return ret;
 
@@ -88,7 +88,7 @@ static ssize_t reset_store(struct device *dev,
                 struct device_attribute *attr, const char *buf, size_t len)
 {
         int ret;
-        unsigned long do_reset;
+        unsigned short do_reset;
         struct zram *zram;
         struct block_device *bdev;
 
@@ -99,7 +99,7 @@ static ssize_t reset_store(struct device *dev,
         if (bdev->bd_holders)
                 return -EBUSY;
 
-        ret = strict_strtoul(buf, 10, &do_reset);
+        ret = kstrtou16(buf, 10, &do_reset);
         if (ret)
                 return ret;
 
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index cea56033b34c..a09ce3ef5d74 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -417,7 +417,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
                                 __FILE__,__LINE__,tbuf,tbuf->count);
                         
                 /* Send the next block of data to device */
-                tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
+                set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
                 actual = tty->ops->write(tty, tbuf->buf, tbuf->count);
 
                 /* rollback was possible and has been done */
@@ -459,7 +459,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
         }
         
         if (!tbuf)
-                tty->flags  &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
         
         /* Clear the re-entry flag */
         spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
@@ -491,7 +491,7 @@ static void n_hdlc_tty_wakeup(struct tty_struct *tty)
                 return;
 
         if (tty != n_hdlc->tty) {
-                tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
                 return;
         }
 
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 39d6ab6551e0..d2256d08ee7e 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -61,7 +61,7 @@
  * controlling the space in the read buffer.
  */
 #define TTY_THRESHOLD_THROTTLE          128 /* now based on remaining room */
-#define TTY_THRESHOLD_UNTHROTTLE        128
+#define TTY_THRESHOLD_UNTHROTTLE        128
 
 /*
  * Special byte codes used in the echo buffer to represent operations
@@ -405,7 +405,7 @@ static ssize_t process_output_block(struct tty_struct *tty,
                                     const unsigned char *buf, unsigned int nr)
 {
         int     space;
-        int     i;
+        int     i;
         const unsigned char *cp;
 
         mutex_lock(&tty->output_lock);
@@ -1607,7 +1607,7 @@ static inline int input_available_p(struct tty_struct *tty, int amt)
 }
 
 /**
- *      copy_from_read_buf      -       copy read data directly
+ *      copy_from_read_buf      -       copy read data directly
  *      @tty: terminal device
  *      @b: user data
  *      @nr: size of data
@@ -1909,7 +1909,7 @@ do_it_again:
                 if (nr)
                         clear_bit(TTY_PUSH, &tty->flags);
         } else if (test_and_clear_bit(TTY_PUSH, &tty->flags))
-                 goto do_it_again;
+                goto do_it_again;
 
         n_tty_set_room(tty);
         return retval;
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index e18604b3fc7d..d8653ab6f498 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -446,19 +446,8 @@ static inline void legacy_pty_init(void) { }
 int pty_limit = NR_UNIX98_PTY_DEFAULT;
 static int pty_limit_min;
 static int pty_limit_max = NR_UNIX98_PTY_MAX;
-static int tty_count;
 static int pty_count;
 
-static inline void pty_inc_count(void)
-{
-        pty_count = (++tty_count) / 2;
-}
-
-static inline void pty_dec_count(void)
-{
-        pty_count = (--tty_count) / 2;
-}
-
 static struct cdev ptmx_cdev;
 
 static struct ctl_table pty_table[] = {
@@ -600,8 +589,7 @@ static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty)
          */
         tty_driver_kref_get(driver);
         tty->count++;
-        pty_inc_count(); /* tty */
-        pty_inc_count(); /* tty->link */
+        pty_count++;
         return 0;
 err_free_mem:
         deinitialize_tty_struct(o_tty);
@@ -613,15 +601,19 @@ err_free_tty:
         return -ENOMEM;
 }
 
-static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
+static void ptm_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
+{
+        pty_count--;
+}
+
+static void pts_unix98_remove(struct tty_driver *driver, struct tty_struct *tty)
 {
-        pty_dec_count();
 }
 
 static const struct tty_operations ptm_unix98_ops = {
         .lookup = ptm_unix98_lookup,
         .install = pty_unix98_install,
-        .remove = pty_unix98_remove,
+        .remove = ptm_unix98_remove,
         .open = pty_open,
         .close = pty_close,
         .write = pty_write,
@@ -638,7 +630,7 @@ static const struct tty_operations ptm_unix98_ops = {
 static const struct tty_operations pty_unix98_ops = {
         .lookup = pts_unix98_lookup,
         .install = pty_unix98_install,
-        .remove = pty_unix98_remove,
+        .remove = pts_unix98_remove,
         .open = pty_open,
         .close = pty_close,
         .write = pty_write,
diff --git a/drivers/tty/serial/8250.c b/drivers/tty/serial/8250.c
index eeadf1b8e093..9f50c4e3c2be 100644
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@ -129,32 +129,6 @@ static unsigned long probe_rsa[PORT_RSA_MAX];
 static unsigned int probe_rsa_count;
 #endif /* CONFIG_SERIAL_8250_RSA  */
 
-struct uart_8250_port {
-        struct uart_port        port;
-        struct timer_list       timer;          /* "no irq" timer */
-        struct list_head        list;           /* ports on this IRQ */
-        unsigned short          capabilities;   /* port capabilities */
-        unsigned short          bugs;           /* port bugs */
-        unsigned int            tx_loadsz;      /* transmit fifo load size */
-        unsigned char           acr;
-        unsigned char           ier;
-        unsigned char           lcr;
-        unsigned char           mcr;
-        unsigned char           mcr_mask;       /* mask of user bits */
-        unsigned char           mcr_force;      /* mask of forced bits */
-        unsigned char           cur_iotype;     /* Running I/O type */
-
-        /*
-         * Some bits in registers are cleared on a read, so they must
-         * be saved whenever the register is read but the bits will not
-         * be immediately processed.
-         */
-#define LSR_SAVE_FLAGS UART_LSR_BRK_ERROR_BITS
-        unsigned char           lsr_saved_flags;
-#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
-        unsigned char           msr_saved_flags;
-};
-
 struct irq_info {
         struct                  hlist_node node;
         int                     irq;
@@ -1326,8 +1300,6 @@ static void serial8250_stop_tx(struct uart_port *port)
         }
 }
 
-static void transmit_chars(struct uart_8250_port *up);
-
 static void serial8250_start_tx(struct uart_port *port)
 {
         struct uart_8250_port *up =
@@ -1344,7 +1316,7 @@ static void serial8250_start_tx(struct uart_port *port)
                         if ((up->port.type == PORT_RM9000) ?
                                 (lsr & UART_LSR_THRE) :
                                 (lsr & UART_LSR_TEMT))
-                                transmit_chars(up);
+                                serial8250_tx_chars(up);
                 }
         }
 
@@ -1401,11 +1373,16 @@ static void clear_rx_fifo(struct uart_8250_port *up)
         } while (1);
 }
 
-static void
-receive_chars(struct uart_8250_port *up, unsigned int *status)
+/*
+ * serial8250_rx_chars: processes according to the passed in LSR
+ * value, and returns the remaining LSR bits not handled
+ * by this Rx routine.
+ */
+unsigned char
+serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
 {
         struct tty_struct *tty = up->port.state->port.tty;
-        unsigned char ch, lsr = *status;
+        unsigned char ch;
         int max_count = 256;
         char flag;
 
@@ -1481,10 +1458,11 @@ ignore_char:
         spin_unlock(&up->port.lock);
         tty_flip_buffer_push(tty);
         spin_lock(&up->port.lock);
-        *status = lsr;
+        return lsr;
 }
+EXPORT_SYMBOL_GPL(serial8250_rx_chars);
 
-static void transmit_chars(struct uart_8250_port *up)
+void serial8250_tx_chars(struct uart_8250_port *up)
 {
         struct circ_buf *xmit = &up->port.state->xmit;
         int count;
@@ -1521,8 +1499,9 @@ static void transmit_chars(struct uart_8250_port *up)
         if (uart_circ_empty(xmit))
                 __stop_tx(up);
 }
+EXPORT_SYMBOL_GPL(serial8250_tx_chars);
 
-static unsigned int check_modem_status(struct uart_8250_port *up)
+unsigned int serial8250_modem_status(struct uart_8250_port *up)
 {
         unsigned int status = serial_in(up, UART_MSR);
 
@@ -1544,14 +1523,20 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
 
         return status;
 }
+EXPORT_SYMBOL_GPL(serial8250_modem_status);
 
 /*
  * This handles the interrupt from one port.
  */
-static void serial8250_handle_port(struct uart_8250_port *up)
+int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
 {
-        unsigned int status;
+        unsigned char status;
         unsigned long flags;
+        struct uart_8250_port *up =
+                container_of(port, struct uart_8250_port, port);
+
+        if (iir & UART_IIR_NO_INT)
+                return 0;
 
         spin_lock_irqsave(&up->port.lock, flags);
 
@@ -1560,25 +1545,13 @@ static void serial8250_handle_port(struct uart_8250_port *up)
         DEBUG_INTR("status = %x...", status);
 
         if (status & (UART_LSR_DR | UART_LSR_BI))
-                receive_chars(up, &status);
-        check_modem_status(up);
+                status = serial8250_rx_chars(up, status);
+        serial8250_modem_status(up);
         if (status & UART_LSR_THRE)
-                transmit_chars(up);
+                serial8250_tx_chars(up);
 
         spin_unlock_irqrestore(&up->port.lock, flags);
-}
-
-int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
-{
-        struct uart_8250_port *up =
-                container_of(port, struct uart_8250_port, port);
-
-        if (!(iir & UART_IIR_NO_INT)) {
-                serial8250_handle_port(up);
-                return 1;
-        }
-
-        return 0;
+        return 1;
 }
 EXPORT_SYMBOL_GPL(serial8250_handle_irq);
 
@@ -1619,11 +1592,13 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
         do {
                 struct uart_8250_port *up;
                 struct uart_port *port;
+                bool skip;
 
                 up = list_entry(l, struct uart_8250_port, list);
                 port = &up->port;
+                skip = pass_counter && up->port.flags & UPF_IIR_ONCE;
 
-                if (port->handle_irq(port)) {
+                if (!skip && port->handle_irq(port)) {
                         handled = 1;
                         end = NULL;
                 } else if (end == NULL)
@@ -1758,11 +1733,8 @@ static void serial_unlink_irq_chain(struct uart_8250_port *up)
 static void serial8250_timeout(unsigned long data)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)data;
-        unsigned int iir;
 
-        iir = serial_in(up, UART_IIR);
-        if (!(iir & UART_IIR_NO_INT))
-                serial8250_handle_port(up);
+        up->port.handle_irq(&up->port);
         mod_timer(&up->timer, jiffies + uart_poll_timeout(&up->port));
 }
 
@@ -1801,7 +1773,7 @@ static void serial8250_backup_timeout(unsigned long data)
         }
 
         if (!(iir & UART_IIR_NO_INT))
-                transmit_chars(up);
+                serial8250_tx_chars(up);
 
         if (is_real_interrupt(up->port.irq))
                 serial_out(up, UART_IER, ier);
@@ -1835,7 +1807,7 @@ static unsigned int serial8250_get_mctrl(struct uart_port *port)
         unsigned int status;
         unsigned int ret;
 
-        status = check_modem_status(up);
+        status = serial8250_modem_status(up);
 
         ret = 0;
         if (status & UART_MSR_DCD)
@@ -2000,7 +1972,7 @@ static int serial8250_startup(struct uart_port *port)
                 serial_outp(up, UART_IER, 0);
                 serial_outp(up, UART_LCR, 0);
                 serial_icr_write(up, UART_CSR, 0); /* Reset the UART */
-                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
                 serial_outp(up, UART_EFR, UART_EFR_ECB);
                 serial_outp(up, UART_LCR, 0);
         }
@@ -2848,7 +2820,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
 
         local_irq_save(flags);
         if (up->port.sysrq) {
-                /* serial8250_handle_port() already took the lock */
+                /* serial8250_handle_irq() already took the lock */
                 locked = 0;
         } else if (oops_in_progress) {
                 locked = spin_trylock(&up->port.lock);
@@ -2882,7 +2854,7 @@ serial8250_console_write(struct console *co, const char *s, unsigned int count)
          *      while processing with interrupts off.
          */
         if (up->msr_saved_flags)
-                check_modem_status(up);
+                serial8250_modem_status(up);
 
         if (locked)
                 spin_unlock(&up->port.lock);
diff --git a/drivers/tty/serial/8250.h b/drivers/tty/serial/8250.h
index 6edf4a6a22d4..ae027be57e25 100644
--- a/drivers/tty/serial/8250.h
+++ b/drivers/tty/serial/8250.h
@@ -13,6 +13,32 @@
 
 #include <linux/serial_8250.h>
 
+struct uart_8250_port {
+        struct uart_port        port;
+        struct timer_list       timer;          /* "no irq" timer */
+        struct list_head        list;           /* ports on this IRQ */
+        unsigned short          capabilities;   /* port capabilities */
+        unsigned short          bugs;           /* port bugs */
+        unsigned int            tx_loadsz;      /* transmit fifo load size */
+        unsigned char           acr;
+        unsigned char           ier;
+        unsigned char           lcr;
+        unsigned char           mcr;
+        unsigned char           mcr_mask;       /* mask of user bits */
+        unsigned char           mcr_force;      /* mask of forced bits */
+        unsigned char           cur_iotype;     /* Running I/O type */
+
+        /*
+         * Some bits in registers are cleared on a read, so they must
+         * be saved whenever the register is read but the bits will not
+         * be immediately processed.
+         */
+#define LSR_SAVE_FLAGS UART_LSR_BRK_ERROR_BITS
+        unsigned char           lsr_saved_flags;
+#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
+        unsigned char           msr_saved_flags;
+};
+
 struct old_serial_port {
         unsigned int uart;
         unsigned int baud_base;
diff --git a/drivers/tty/serial/8250_dw.c b/drivers/tty/serial/8250_dw.c
index bf1fba640c2d..f574eef3075f 100644
--- a/drivers/tty/serial/8250_dw.c
+++ b/drivers/tty/serial/8250_dw.c
@@ -177,17 +177,7 @@ static struct platform_driver dw8250_platform_driver = {
         .remove                 = __devexit_p(dw8250_remove),
 };
 
-static int __init dw8250_init(void)
-{
-        return platform_driver_register(&dw8250_platform_driver);
-}
-module_init(dw8250_init);
-
-static void __exit dw8250_exit(void)
-{
-        platform_driver_unregister(&dw8250_platform_driver);
-}
-module_exit(dw8250_exit);
+module_platform_driver(dw8250_platform_driver);
 
 MODULE_AUTHOR("Jamie Iles");
 MODULE_LICENSE("GPL");
diff --git a/drivers/tty/serial/8250_fsl.c b/drivers/tty/serial/8250_fsl.c
new file mode 100644
index 000000000000..f4d3c47b88e8
--- /dev/null
+++ b/drivers/tty/serial/8250_fsl.c
@@ -0,0 +1,63 @@
+#include <linux/serial_reg.h>
+#include <linux/serial_8250.h>
+
+#include "8250.h"
+
+/*
+ * Freescale 16550 UART "driver", Copyright (C) 2011 Paul Gortmaker.
+ *
+ * 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 isn't a full driver; it just provides an alternate IRQ
+ * handler to deal with an errata.  Everything else is just
+ * using the bog standard 8250 support.
+ *
+ * We follow code flow of serial8250_default_handle_irq() but add
+ * a check for a break and insert a dummy read on the Rx for the
+ * immediately following IRQ event.
+ *
+ * We re-use the already existing "bug handling" lsr_saved_flags
+ * field to carry the "what we just did" information from the one
+ * IRQ event to the next one.
+ */
+
+int fsl8250_handle_irq(struct uart_port *port)
+{
+        unsigned char lsr, orig_lsr;
+        unsigned long flags;
+        unsigned int iir;
+        struct uart_8250_port *up =
+                container_of(port, struct uart_8250_port, port);
+
+        spin_lock_irqsave(&up->port.lock, flags);
+
+        iir = port->serial_in(port, UART_IIR);
+        if (iir & UART_IIR_NO_INT) {
+                spin_unlock_irqrestore(&up->port.lock, flags);
+                return 0;
+        }
+
+        /* This is the WAR; if last event was BRK, then read and return */
+        if (unlikely(up->lsr_saved_flags & UART_LSR_BI)) {
+                up->lsr_saved_flags &= ~UART_LSR_BI;
+                port->serial_in(port, UART_RX);
+                spin_unlock_irqrestore(&up->port.lock, flags);
+                return 1;
+        }
+
+        lsr = orig_lsr = up->port.serial_in(&up->port, UART_LSR);
+
+        if (lsr & (UART_LSR_DR | UART_LSR_BI))
+                lsr = serial8250_rx_chars(up, lsr);
+
+        serial8250_modem_status(up);
+
+        if (lsr & UART_LSR_THRE)
+                serial8250_tx_chars(up);
+
+        up->lsr_saved_flags = orig_lsr;
+        spin_unlock_irqrestore(&up->port.lock, flags);
+        return 1;
+}
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c
index 825937a5f210..da2b0b0a183f 100644
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@ -1092,6 +1092,14 @@ static int skip_tx_en_setup(struct serial_private *priv,
         return pci_default_setup(priv, board, port, idx);
 }
 
+static int kt_serial_setup(struct serial_private *priv,
+                           const struct pciserial_board *board,
+                           struct uart_port *port, int idx)
+{
+        port->flags |= UPF_IIR_ONCE;
+        return skip_tx_en_setup(priv, board, port, idx);
+}
+
 static int pci_eg20t_init(struct pci_dev *dev)
 {
 #if defined(CONFIG_SERIAL_PCH_UART) || defined(CONFIG_SERIAL_PCH_UART_MODULE)
@@ -1110,7 +1118,18 @@ pci_xr17c154_setup(struct serial_private *priv,
         return pci_default_setup(priv, board, port, idx);
 }
 
-/* This should be in linux/pci_ids.h */
+static int try_enable_msi(struct pci_dev *dev)
+{
+        /* use msi if available, but fallback to legacy otherwise */
+        pci_enable_msi(dev);
+        return 0;
+}
+
+static void disable_msi(struct pci_dev *dev)
+{
+        pci_disable_msi(dev);
+}
+
 #define PCI_VENDOR_ID_SBSMODULARIO      0x124B
 #define PCI_SUBVENDOR_ID_SBSMODULARIO   0x124B
 #define PCI_DEVICE_ID_OCTPRO            0x0001
@@ -1133,9 +1152,14 @@ pci_xr17c154_setup(struct serial_private *priv,
 #define PCI_DEVICE_ID_TITAN_800E        0xA014
 #define PCI_DEVICE_ID_TITAN_200EI       0xA016
 #define PCI_DEVICE_ID_TITAN_200EISI     0xA017
+#define PCI_DEVICE_ID_TITAN_400V3       0xA310
+#define PCI_DEVICE_ID_TITAN_410V3       0xA312
+#define PCI_DEVICE_ID_TITAN_800V3       0xA314
+#define PCI_DEVICE_ID_TITAN_800V3B      0xA315
 #define PCI_DEVICE_ID_OXSEMI_16PCI958   0x9538
 #define PCIE_DEVICE_ID_NEO_2_OX_IBM     0x00F6
 #define PCI_DEVICE_ID_PLX_CRONYX_OMEGA  0xc001
+#define PCI_DEVICE_ID_INTEL_PATSBURG_KT 0x1d3d
 
 /* Unknown vendors/cards - this should not be in linux/pci_ids.h */
 #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
@@ -1220,6 +1244,15 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
                 .subdevice      = PCI_ANY_ID,
                 .setup          = ce4100_serial_setup,
         },
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_PATSBURG_KT,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .init           = try_enable_msi,
+                .setup          = kt_serial_setup,
+                .exit           = disable_msi,
+        },
         /*
          * ITE
          */
@@ -3414,6 +3447,18 @@ static struct pci_device_id serial_pci_tbl[] = {
         {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200EISI,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
                 pbn_oxsemi_2_4000000 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400V3,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_410V3,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800V3,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_4_921600 },
+        {       PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800V3B,
+                PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+                pbn_b0_4_921600 },
 
         {       PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,
                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 95b21a619900..f32a2ea70100 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -97,6 +97,11 @@ config SERIAL_8250_PNP
           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
@@ -457,7 +462,7 @@ config SERIAL_SAMSUNG
 config SERIAL_SAMSUNG_UARTS_4
         bool
         depends on ARM && PLAT_SAMSUNG
-        default y if CPU_S3C2443
+        default y if !(CPU_S3C2410 || SERIAL_S3C2412 || CPU_S3C2440 || CPU_S3C2442)
         help
           Internal node for the common case of 4 Samsung compatible UARTs
 
@@ -465,7 +470,7 @@ config SERIAL_SAMSUNG_UARTS
         int
         depends on ARM && PLAT_SAMSUNG
         default 6 if ARCH_S5P6450
-        default 4 if SERIAL_SAMSUNG_UARTS_4
+        default 4 if SERIAL_SAMSUNG_UARTS_4 || CPU_S3C2416
         default 3
         help
           Select the number of available UART ports for the Samsung S3C
@@ -495,46 +500,27 @@ config SERIAL_SAMSUNG_CONSOLE
           your boot loader about how to pass options to the kernel at
           boot time.)
 
-config SERIAL_S3C2410
-        tristate "Samsung S3C2410 Serial port support"
-        depends on SERIAL_SAMSUNG && CPU_S3C2410
-        default y if CPU_S3C2410
-        help
-          Serial port support for the Samsung S3C2410 SoC
-
-config SERIAL_S3C2412
-        tristate "Samsung S3C2412/S3C2413 Serial port support"
-        depends on SERIAL_SAMSUNG && CPU_S3C2412
-        default y if CPU_S3C2412
-        help
-          Serial port support for the Samsung S3C2412 and S3C2413 SoC
-
-config SERIAL_S3C2440
-        tristate "Samsung S3C2440/S3C2442/S3C2416 Serial port support"
-        depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442 || CPU_S3C2416)
-        default y if CPU_S3C2440
-        default y if CPU_S3C2442
-        select SERIAL_SAMSUNG_UARTS_4 if CPU_S3C2416
-        help
-          Serial port support for the Samsung S3C2440, S3C2416 and S3C2442 SoC
-
-config SERIAL_S3C6400
-        tristate "Samsung S3C6400/S3C6410/S5P6440/S5P6450/S5PC100 Serial port support"
-        depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5P6450 || CPU_S5PC100)
-        select SERIAL_SAMSUNG_UARTS_4
-        default y
-        help
-          Serial port support for the Samsung S3C6400, S3C6410, S5P6440, S5P6450
-          and S5PC100 SoCs
-
-config SERIAL_S5PV210
-        tristate "Samsung S5PV210 Serial port support"
-        depends on SERIAL_SAMSUNG && (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)
-        select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210 || SOC_EXYNOS4212)
-        default y
-        help
-          Serial port support for Samsung's S5P Family of SoC's
-
+config SERIAL_SIRFSOC
+        tristate "SiRF SoC Platform Serial port support"
+        depends on ARM && ARCH_PRIMA2
+        select SERIAL_CORE
+        help
+          Support for the on-chip UART on the CSR SiRFprimaII series,
+          providing /dev/ttySiRF0, 1 and 2 (note, some machines may not
+          provide all of these ports, depending on how the serial port
+          pins are configured).
+
+config SERIAL_SIRFSOC_CONSOLE
+        bool "Support for console on SiRF SoC serial port"
+        depends on SERIAL_SIRFSOC=y
+        select SERIAL_CORE_CONSOLE
+        help
+          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=ttySiRFx". (Try "man bootparam" or see the documentation of
+          your boot loader about how to pass options to the kernel at
+          boot time.)
 
 config SERIAL_MAX3100
         tristate "MAX3100 support"
@@ -1324,7 +1310,7 @@ config SERIAL_OF_PLATFORM
 
 config SERIAL_OMAP
         tristate "OMAP serial port support"
-        depends on ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4
+        depends on ARCH_OMAP2PLUS
         select SERIAL_CORE
         help
           If you have a machine based on an Texas Instruments OMAP CPU you
@@ -1575,6 +1561,15 @@ config SERIAL_PCH_UART
           ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
           ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
 
+config SERIAL_PCH_UART_CONSOLE
+        bool "Support for console on Intel EG20T PCH UART/OKI SEMICONDUCTOR ML7213 IOH"
+        depends on SERIAL_PCH_UART=y
+        select SERIAL_CORE_CONSOLE
+        help
+          Say Y here if you wish to use the PCH UART 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).
+
 config SERIAL_MSM_SMD
         bool "Enable tty device interface for some SMD ports"
         default n
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile
index e10cf5b54b6d..07e0494c6830 100644
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@ -28,6 +28,7 @@ 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
 obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
 obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
@@ -39,11 +40,6 @@ obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
 obj-$(CONFIG_SERIAL_BFIN) += bfin_uart.o
 obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
-obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o
-obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
-obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o
-obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o
-obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o
 obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
 obj-$(CONFIG_SERIAL_MAX3107) += max3107.o
 obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
@@ -94,3 +90,4 @@ obj-$(CONFIG_SERIAL_MSM_SMD)	+= msm_smd_tty.o
 obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
 obj-$(CONFIG_SERIAL_LANTIQ)     += lantiq.o
 obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
+obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o
diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index 77554fd68d1f..7162f70d9260 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c
@@ -577,7 +577,7 @@ static int __devinit apbuart_probe(struct platform_device *op)
         return 0;
 }
 
-static struct of_device_id __initdata apbuart_match[] = {
+static struct of_device_id apbuart_match[] = {
         {
          .name = "GAISLER_APBUART",
          },
@@ -597,7 +597,7 @@ static struct platform_driver grlib_apbuart_of_driver = {
 };
 
 
-static int grlib_apbuart_configure(void)
+static int __init grlib_apbuart_configure(void)
 {
         struct device_node *np;
         int line = 0;
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 4c823f341d98..10605ecc99ab 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -212,8 +212,9 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
 {
         struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
         unsigned int mode;
+        unsigned long flags;
 
-        spin_lock(&port->lock);
+        spin_lock_irqsave(&port->lock, flags);
 
         /* Disable interrupts */
         UART_PUT_IDR(port, atmel_port->tx_done_mask);
@@ -244,7 +245,7 @@ void atmel_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
         /* Enable interrupts */
         UART_PUT_IER(port, atmel_port->tx_done_mask);
 
-        spin_unlock(&port->lock);
+        spin_unlock_irqrestore(&port->lock, flags);
 
 }
 
@@ -1256,12 +1257,7 @@ static void atmel_set_termios(struct uart_port *port, struct ktermios *termios,
 
 static void atmel_set_ldisc(struct uart_port *port, int new)
 {
-        int line = port->line;
-
-        if (line >= port->state->port.tty->driver->num)
-                return;
-
-        if (port->state->port.tty->ldisc->ops->num == N_PPS) {
+        if (new == N_PPS) {
                 port->flags |= UPF_HARDPPS_CD;
                 atmel_enable_ms(port);
         } else {
diff --git a/drivers/tty/serial/bfin_sport_uart.c b/drivers/tty/serial/bfin_sport_uart.c
index ee101c0d358f..7fbc3a08f10d 100644
--- a/drivers/tty/serial/bfin_sport_uart.c
+++ b/drivers/tty/serial/bfin_sport_uart.c
@@ -299,8 +299,13 @@ static int sport_startup(struct uart_port *port)
                         dev_info(port->dev, "Unable to attach BlackFin UART over SPORT CTS interrupt. So, disable it.\n");
                 }
         }
-        if (up->rts_pin >= 0)
-                gpio_direction_output(up->rts_pin, 0);
+        if (up->rts_pin >= 0) {
+                if (gpio_request(up->rts_pin, DRV_NAME)) {
+                        dev_info(port->dev, "fail to request RTS PIN at GPIO_%d\n", up->rts_pin);
+                        up->rts_pin = -1;
+                } else
+                        gpio_direction_output(up->rts_pin, 0);
+        }
 #endif
 
         return 0;
@@ -445,6 +450,8 @@ static void sport_shutdown(struct uart_port *port)
 #ifdef CONFIG_SERIAL_BFIN_SPORT_CTSRTS
         if (up->cts_pin >= 0)
                 free_irq(gpio_to_irq(up->cts_pin), up);
+        if (up->rts_pin >= 0)
+                gpio_free(up->rts_pin);
 #endif
 }
 
@@ -803,17 +810,16 @@ static int __devinit sport_uart_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_IO, 0);
                 if (res == NULL)
                         sport->cts_pin = -1;
-                else
+                else {
                         sport->cts_pin = res->start;
+                        sport->port.flags |= ASYNC_CTS_FLOW;
+                }
 
                 res = platform_get_resource(pdev, IORESOURCE_IO, 1);
                 if (res == NULL)
                         sport->rts_pin = -1;
                 else
                         sport->rts_pin = res->start;
-
-                if (sport->rts_pin >= 0)
-                        gpio_request(sport->rts_pin, DRV_NAME);
 #endif
         }
 
@@ -853,10 +859,6 @@ static int __devexit sport_uart_remove(struct platform_device *pdev)
 
         if (sport) {
                 uart_remove_one_port(&sport_uart_reg, &sport->port);
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-                if (sport->rts_pin >= 0)
-                        gpio_free(sport->rts_pin);
-#endif
                 iounmap(sport->port.membase);
                 peripheral_free_list(
                         (unsigned short *)pdev->dev.platform_data);
diff --git a/drivers/tty/serial/bfin_sport_uart.h b/drivers/tty/serial/bfin_sport_uart.h
index 6d06ce1d5675..e4510ea135ce 100644
--- a/drivers/tty/serial/bfin_sport_uart.h
+++ b/drivers/tty/serial/bfin_sport_uart.h
@@ -45,11 +45,12 @@
 #define SPORT_GET_RX32(sport) \
 ({ \
         unsigned int __ret; \
+        unsigned long flags; \
         if (ANOMALY_05000473) \
-                local_irq_disable(); \
+                local_irq_save(flags); \
         __ret = bfin_read32((sport)->port.membase + OFFSET_RX); \
         if (ANOMALY_05000473) \
-                local_irq_enable(); \
+                local_irq_restore(flags); \
         __ret; \
 })
 #define SPORT_GET_RCR1(sport)           bfin_read16(((sport)->port.membase + OFFSET_RCR1))
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 66afb98b77b5..26953bfa6922 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -116,15 +116,22 @@ static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
 static irqreturn_t bfin_serial_mctrl_cts_int(int irq, void *dev_id)
 {
         struct bfin_serial_port *uart = dev_id;
-        unsigned int status;
-
-        status = bfin_serial_get_mctrl(&uart->port);
-        uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
+        unsigned int status = bfin_serial_get_mctrl(&uart->port);
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        uart->scts = 1;
+        struct tty_struct *tty = uart->port.state->port.tty;
+
         UART_CLEAR_SCTS(uart);
-        UART_CLEAR_IER(uart, EDSSI);
+        if (tty->hw_stopped) {
+                if (status) {
+                        tty->hw_stopped = 0;
+                        uart_write_wakeup(&uart->port);
+                }
+        } else {
+                if (!status)
+                        tty->hw_stopped = 1;
+        }
 #endif
+        uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
 
         return IRQ_HANDLED;
 }
@@ -175,13 +182,6 @@ static void bfin_serial_start_tx(struct uart_port *port)
         struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
         struct tty_struct *tty = uart->port.state->port.tty;
 
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port) & TIOCM_CTS)) {
-                uart->scts = 0;
-                uart_handle_cts_change(&uart->port, uart->scts);
-        }
-#endif
-
         /*
          * To avoid losting RX interrupt, we reset IR function
          * before sending data.
@@ -380,12 +380,6 @@ static irqreturn_t bfin_serial_tx_int(int irq, void *dev_id)
 {
         struct bfin_serial_port *uart = dev_id;
 
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port) & TIOCM_CTS)) {
-                uart->scts = 0;
-                uart_handle_cts_change(&uart->port, uart->scts);
-        }
-#endif
         spin_lock(&uart->port.lock);
         if (UART_GET_LSR(uart) & THRE)
                 bfin_serial_tx_chars(uart);
@@ -531,13 +525,6 @@ static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
         struct bfin_serial_port *uart = dev_id;
         struct circ_buf *xmit = &uart->port.state->xmit;
 
-#ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        if (uart->scts && !(bfin_serial_get_mctrl(&uart->port)&TIOCM_CTS)) {
-                uart->scts = 0;
-                uart_handle_cts_change(&uart->port, uart->scts);
-        }
-#endif
-
         spin_lock(&uart->port.lock);
         if (!(get_dma_curr_irqstat(uart->tx_dma_channel)&DMA_RUN)) {
                 disable_dma(uart->tx_dma_channel);
@@ -739,20 +726,26 @@ static int bfin_serial_startup(struct uart_port *port)
                         pr_info("Unable to attach BlackFin UART CTS interrupt. So, disable it.\n");
                 }
         }
-        if (uart->rts_pin >= 0)
-                gpio_direction_output(uart->rts_pin, 0);
+        if (uart->rts_pin >= 0) {
+                if (gpio_request(uart->rts_pin, DRIVER_NAME)) {
+                        pr_info("fail to request RTS PIN at GPIO_%d\n", uart->rts_pin);
+                        uart->rts_pin = -1;
+                } else
+                        gpio_direction_output(uart->rts_pin, 0);
+        }
 #endif
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
-        if (uart->cts_pin >= 0 && request_irq(uart->status_irq,
-                bfin_serial_mctrl_cts_int,
-                0, "BFIN_UART_MODEM_STATUS", uart)) {
-                uart->cts_pin = -1;
-                pr_info("Unable to attach BlackFin UART Modem Status interrupt.\n");
-        }
+        if (uart->cts_pin >= 0) {
+                if (request_irq(uart->status_irq, bfin_serial_mctrl_cts_int,
+                        IRQF_DISABLED, "BFIN_UART_MODEM_STATUS", uart)) {
+                        uart->cts_pin = -1;
+                        dev_info(port->dev, "Unable to attach BlackFin UART Modem Status interrupt.\n");
+                }
 
-        /* CTS RTS PINs are negative assertive. */
-        UART_PUT_MCR(uart, ACTS);
-        UART_SET_IER(uart, EDSSI);
+                /* CTS RTS PINs are negative assertive. */
+                UART_PUT_MCR(uart, ACTS);
+                UART_SET_IER(uart, EDSSI);
+        }
 #endif
 
         UART_SET_IER(uart, ERBFI);
@@ -792,6 +785,8 @@ static void bfin_serial_shutdown(struct uart_port *port)
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
         if (uart->cts_pin >= 0)
                 free_irq(gpio_to_irq(uart->cts_pin), uart);
+        if (uart->rts_pin >= 0)
+                gpio_free(uart->rts_pin);
 #endif
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
         if (uart->cts_pin >= 0)
@@ -1370,18 +1365,18 @@ static int bfin_serial_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_IO, 0);
                 if (res == NULL)
                         uart->cts_pin = -1;
-                else
+                else {
                         uart->cts_pin = res->start;
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
+                        uart->port.flags |= ASYNC_CTS_FLOW;
+#endif
+                }
 
                 res = platform_get_resource(pdev, IORESOURCE_IO, 1);
                 if (res == NULL)
                         uart->rts_pin = -1;
                 else
                         uart->rts_pin = res->start;
-# if defined(CONFIG_SERIAL_BFIN_CTSRTS)
-                if (uart->rts_pin >= 0)
-                        gpio_request(uart->rts_pin, DRIVER_NAME);
-# endif
 #endif
         }
 
@@ -1421,10 +1416,6 @@ static int __devexit bfin_serial_remove(struct platform_device *pdev)
 
         if (uart) {
                 uart_remove_one_port(&bfin_serial_reg, &uart->port);
-#ifdef CONFIG_SERIAL_BFIN_CTSRTS
-                if (uart->rts_pin >= 0)
-                        gpio_free(uart->rts_pin);
-#endif
                 iounmap(uart->port.membase);
                 peripheral_free_list(
                         (unsigned short *)pdev->dev.platform_data);
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 426434e5eb7c..7e925e20cbaa 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -1334,7 +1334,6 @@ MODULE_DEVICE_TABLE(spi, ifx_id_table);
 static const struct spi_driver ifx_spi_driver = {
         .driver = {
                 .name = DRVNAME,
-                .bus = &spi_bus_type,
                 .pm = &ifx_spi_pm,
                 .owner = THIS_MODULE},
         .probe = ifx_spi_spi_probe,
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 163fc9021f5a..0b7fed746b27 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -102,6 +102,7 @@
 #define  UCR2_STPB       (1<<6)  /* Stop */
 #define  UCR2_WS         (1<<5)  /* Word size */
 #define  UCR2_RTSEN      (1<<4)  /* Request to send interrupt enable */
+#define  UCR2_ATEN       (1<<3)  /* Aging Timer Enable */
 #define  UCR2_TXEN       (1<<2)  /* Transmitter enabled */
 #define  UCR2_RXEN       (1<<1)  /* Receiver enabled */
 #define  UCR2_SRST       (1<<0)  /* SW reset */
@@ -207,6 +208,12 @@ struct imx_port {
         struct imx_uart_data    *devdata;
 };
 
+struct imx_port_ucrs {
+        unsigned int    ucr1;
+        unsigned int    ucr2;
+        unsigned int    ucr3;
+};
+
 #ifdef CONFIG_IRDA
 #define USE_IRDA(sport) ((sport)->use_irda)
 #else
@@ -260,6 +267,27 @@ static inline int is_imx21_uart(struct imx_port *sport)
 }
 
 /*
+ * Save and restore functions for UCR1, UCR2 and UCR3 registers
+ */
+static void imx_port_ucrs_save(struct uart_port *port,
+                               struct imx_port_ucrs *ucr)
+{
+        /* save control registers */
+        ucr->ucr1 = readl(port->membase + UCR1);
+        ucr->ucr2 = readl(port->membase + UCR2);
+        ucr->ucr3 = readl(port->membase + UCR3);
+}
+
+static void imx_port_ucrs_restore(struct uart_port *port,
+                                  struct imx_port_ucrs *ucr)
+{
+        /* restore control registers */
+        writel(ucr->ucr1, port->membase + UCR1);
+        writel(ucr->ucr2, port->membase + UCR2);
+        writel(ucr->ucr3, port->membase + UCR3);
+}
+
+/*
  * Handle any change of modem status signal since we were last called.
  */
 static void imx_mctrl_check(struct imx_port *sport)
@@ -566,6 +594,9 @@ static irqreturn_t imx_int(int irq, void *dev_id)
         if (sts & USR1_RTSD)
                 imx_rtsint(irq, dev_id);
 
+        if (sts & USR1_AWAKE)
+                writel(USR1_AWAKE, sport->port.membase + USR1);
+
         return IRQ_HANDLED;
 }
 
@@ -901,6 +932,8 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
                         ucr2 |= UCR2_PROE;
         }
 
+        del_timer_sync(&sport->timer);
+
         /*
          * Ask the core to calculate the divisor for us.
          */
@@ -931,8 +964,6 @@ imx_set_termios(struct uart_port *port, struct ktermios *termios,
                         sport->port.ignore_status_mask |= URXD_OVRRUN;
         }
 
-        del_timer_sync(&sport->timer);
-
         /*
          * Update the per-port timeout.
          */
@@ -1079,6 +1110,70 @@ imx_verify_port(struct uart_port *port, struct serial_struct *ser)
         return ret;
 }
 
+#if defined(CONFIG_CONSOLE_POLL)
+static int imx_poll_get_char(struct uart_port *port)
+{
+        struct imx_port_ucrs old_ucr;
+        unsigned int status;
+        unsigned char c;
+
+        /* save control registers */
+        imx_port_ucrs_save(port, &old_ucr);
+
+        /* disable interrupts */
+        writel(UCR1_UARTEN, port->membase + UCR1);
+        writel(old_ucr.ucr2 & ~(UCR2_ATEN | UCR2_RTSEN | UCR2_ESCI),
+               port->membase + UCR2);
+        writel(old_ucr.ucr3 & ~(UCR3_DCD | UCR3_RI | UCR3_DTREN),
+               port->membase + UCR3);
+
+        /* poll */
+        do {
+                status = readl(port->membase + USR2);
+        } while (~status & USR2_RDR);
+
+        /* read */
+        c = readl(port->membase + URXD0);
+
+        /* restore control registers */
+        imx_port_ucrs_restore(port, &old_ucr);
+
+        return c;
+}
+
+static void imx_poll_put_char(struct uart_port *port, unsigned char c)
+{
+        struct imx_port_ucrs old_ucr;
+        unsigned int status;
+
+        /* save control registers */
+        imx_port_ucrs_save(port, &old_ucr);
+
+        /* disable interrupts */
+        writel(UCR1_UARTEN, port->membase + UCR1);
+        writel(old_ucr.ucr2 & ~(UCR2_ATEN | UCR2_RTSEN | UCR2_ESCI),
+               port->membase + UCR2);
+        writel(old_ucr.ucr3 & ~(UCR3_DCD | UCR3_RI | UCR3_DTREN),
+               port->membase + UCR3);
+
+        /* drain */
+        do {
+                status = readl(port->membase + USR1);
+        } while (~status & USR1_TRDY);
+
+        /* write */
+        writel(c, port->membase + URTX0);
+
+        /* flush */
+        do {
+                status = readl(port->membase + USR2);
+        } while (~status & USR2_TXDC);
+
+        /* restore control registers */
+        imx_port_ucrs_restore(port, &old_ucr);
+}
+#endif
+
 static struct uart_ops imx_pops = {
         .tx_empty       = imx_tx_empty,
         .set_mctrl      = imx_set_mctrl,
@@ -1096,6 +1191,10 @@ static struct uart_ops imx_pops = {
         .request_port   = imx_request_port,
         .config_port    = imx_config_port,
         .verify_port    = imx_verify_port,
+#if defined(CONFIG_CONSOLE_POLL)
+        .poll_get_char  = imx_poll_get_char,
+        .poll_put_char  = imx_poll_put_char,
+#endif
 };
 
 static struct imx_port *imx_ports[UART_NR];
@@ -1118,13 +1217,14 @@ static void
 imx_console_write(struct console *co, const char *s, unsigned int count)
 {
         struct imx_port *sport = imx_ports[co->index];
-        unsigned int old_ucr1, old_ucr2, ucr1;
+        struct imx_port_ucrs old_ucr;
+        unsigned int ucr1;
 
         /*
-         *      First, save UCR1/2 and then disable interrupts
+         *      First, save UCR1/2/3 and then disable interrupts
          */
-        ucr1 = old_ucr1 = readl(sport->port.membase + UCR1);
-        old_ucr2 = readl(sport->port.membase + UCR2);
+        imx_port_ucrs_save(&sport->port, &old_ucr);
+        ucr1 = old_ucr.ucr1;
 
         if (is_imx1_uart(sport))
                 ucr1 |= IMX1_UCR1_UARTCLKEN;
@@ -1133,18 +1233,17 @@ imx_console_write(struct console *co, const char *s, unsigned int count)
 
         writel(ucr1, sport->port.membase + UCR1);
 
-        writel(old_ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
+        writel(old_ucr.ucr2 | UCR2_TXEN, sport->port.membase + UCR2);
 
         uart_console_write(&sport->port, s, count, imx_console_putchar);
 
         /*
          *      Finally, wait for transmitter to become empty
-         *      and restore UCR1/2
+         *      and restore UCR1/2/3
          */
         while (!(readl(sport->port.membase + USR2) & USR2_TXDC));
 
-        writel(old_ucr1, sport->port.membase + UCR1);
-        writel(old_ucr2, sport->port.membase + UCR2);
+        imx_port_ucrs_restore(&sport->port, &old_ucr);
 }
 
 /*
@@ -1269,6 +1368,12 @@ static struct uart_driver imx_reg = {
 static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct imx_port *sport = platform_get_drvdata(dev);
+        unsigned int val;
+
+        /* enable wakeup from i.MX UART */
+        val = readl(sport->port.membase + UCR3);
+        val |= UCR3_AWAKEN;
+        writel(val, sport->port.membase + UCR3);
 
         if (sport)
                 uart_suspend_port(&imx_reg, &sport->port);
@@ -1279,6 +1384,12 @@ static int serial_imx_suspend(struct platform_device *dev, pm_message_t state)
 static int serial_imx_resume(struct platform_device *dev)
 {
         struct imx_port *sport = platform_get_drvdata(dev);
+        unsigned int val;
+
+        /* disable wakeup from i.MX UART */
+        val = readl(sport->port.membase + UCR3);
+        val &= ~UCR3_AWAKEN;
+        writel(val, sport->port.membase + UCR3);
 
         if (sport)
                 uart_resume_port(&imx_reg, &sport->port);
@@ -1287,6 +1398,10 @@ static int serial_imx_resume(struct platform_device *dev)
 }
 
 #ifdef CONFIG_OF
+/*
+ * This function returns 1 iff pdev isn't a device instatiated by dt, 0 iff it
+ * could successfully get all information from dt or a negative errno.
+ */
 static int serial_imx_probe_dt(struct imx_port *sport,
                 struct platform_device *pdev)
 {
@@ -1296,12 +1411,13 @@ static int serial_imx_probe_dt(struct imx_port *sport,
         int ret;
 
         if (!np)
-                return -ENODEV;
+                /* no device tree device */
+                return 1;
 
         ret = of_alias_get_id(np, "serial");
         if (ret < 0) {
                 dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret);
-                return -ENODEV;
+                return ret;
         }
         sport->port.line = ret;
 
@@ -1319,7 +1435,7 @@ static int serial_imx_probe_dt(struct imx_port *sport,
 static inline int serial_imx_probe_dt(struct imx_port *sport,
                 struct platform_device *pdev)
 {
-        return -ENODEV;
+        return 1;
 }
 #endif
 
@@ -1354,8 +1470,10 @@ static int serial_imx_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         ret = serial_imx_probe_dt(sport, pdev);
-        if (ret == -ENODEV)
+        if (ret > 0)
                 serial_imx_probe_pdata(sport, pdev);
+        else if (ret < 0)
+                goto free;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -1476,7 +1594,7 @@ static int __init imx_serial_init(void)
         if (ret != 0)
                 uart_unregister_driver(&imx_reg);
 
-        return 0;
+        return ret;
 }
 
 static void __exit imx_serial_exit(void)
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 08018934e013..94a6792bf97b 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -1000,11 +1000,8 @@ static void __init m32r_sio_register_ports(struct uart_driver *drv)
                 init_timer(&up->timer);
                 up->timer.function = m32r_sio_timeout;
 
-                /*
-                 * ALPHA_KLUDGE_MCR needs to be killed.
-                 */
-                up->mcr_mask = ~ALPHA_KLUDGE_MCR;
-                up->mcr_force = ALPHA_KLUDGE_MCR;
+                up->mcr_mask = ~0;
+                up->mcr_force = 0;
 
                 uart_add_one_port(drv, &up->port);
         }
diff --git a/drivers/tty/serial/max3100.c b/drivers/tty/serial/max3100.c
index 8a6cc8c30b5a..b4902b99cfd2 100644
--- a/drivers/tty/serial/max3100.c
+++ b/drivers/tty/serial/max3100.c
@@ -901,7 +901,6 @@ static int max3100_resume(struct spi_device *spi)
 static struct spi_driver max3100_driver = {
         .driver = {
                 .name           = "max3100",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
 
diff --git a/drivers/tty/serial/max3107-aava.c b/drivers/tty/serial/max3107-aava.c
index 90c40f22ec70..aae772a71de6 100644
--- a/drivers/tty/serial/max3107-aava.c
+++ b/drivers/tty/serial/max3107-aava.c
@@ -315,7 +315,6 @@ static int __devinit max3107_probe_aava(struct spi_device *spi)
 static struct spi_driver max3107_driver = {
         .driver = {
                 .name           = "aava-max3107",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
         .probe          = max3107_probe_aava,
diff --git a/drivers/tty/serial/max3107.c b/drivers/tty/serial/max3107.c
index 7827000db4f5..17c7ba805d98 100644
--- a/drivers/tty/serial/max3107.c
+++ b/drivers/tty/serial/max3107.c
@@ -1181,7 +1181,6 @@ static int max3107_probe_generic(struct spi_device *spi)
 static struct spi_driver max3107_driver = {
         .driver = {
                 .name           = "max3107",
-                .bus            = &spi_bus_type,
                 .owner          = THIS_MODULE,
         },
         .probe          = max3107_probe_generic,
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c
index e272d3919c67..a9234ba8f8d5 100644
--- a/drivers/tty/serial/mfd.c
+++ b/drivers/tty/serial/mfd.c
@@ -1154,7 +1154,6 @@ serial_hsu_console_setup(struct console *co, char *options)
         int bits = 8;
         int parity = 'n';
         int flow = 'n';
-        int ret;
 
         if (co->index == -1 || co->index >= serial_hsu_reg.nr)
                 co->index = 0;
@@ -1165,9 +1164,7 @@ serial_hsu_console_setup(struct console *co, char *options)
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
 
-        ret = uart_set_options(&up->port, co, baud, parity, bits, flow);
-
-        return ret;
+        return uart_set_options(&up->port, co, baud, parity, bits, flow);
 }
 
 static struct console serial_hsu_console = {
@@ -1176,9 +1173,13 @@ static struct console serial_hsu_console = {
         .device         = uart_console_device,
         .setup          = serial_hsu_console_setup,
         .flags          = CON_PRINTBUFFER,
-        .index          = 2,
+        .index          = -1,
         .data           = &serial_hsu_reg,
 };
+
+#define SERIAL_HSU_CONSOLE      (&serial_hsu_console)
+#else
+#define SERIAL_HSU_CONSOLE      NULL
 #endif
 
 struct uart_ops serial_hsu_pops = {
@@ -1208,6 +1209,7 @@ static struct uart_driver serial_hsu_reg = {
         .major          = TTY_MAJOR,
         .minor          = 128,
         .nr             = 3,
+        .cons           = SERIAL_HSU_CONSOLE,
 };
 
 #ifdef CONFIG_PM
@@ -1342,12 +1344,6 @@ static int serial_hsu_probe(struct pci_dev *pdev,
                 }
                 uart_add_one_port(&serial_hsu_reg, &uport->port);
 
-#ifdef CONFIG_SERIAL_MFD_HSU_CONSOLE
-                if (index == 2) {
-                        register_console(&serial_hsu_console);
-                        uport->port.cons = &serial_hsu_console;
-                }
-#endif
                 pci_set_drvdata(pdev, uport);
         }
 
diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index 4c309e869903..df2a2240a3ae 100644
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -876,7 +876,6 @@ static int __devexit serial_m3110_remove(struct spi_device *dev)
 static struct spi_driver uart_max3110_driver = {
         .driver = {
                         .name   = "spi_max3111",
-                        .bus    = &spi_bus_type,
                         .owner  = THIS_MODULE,
         },
         .probe          = serial_m3110_probe,
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 60c6eb850265..5e85e1e14c44 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -422,9 +422,9 @@ static int __devexit msm_hs_remove(struct platform_device *pdev)
                       msm_uport->rx.rbuffer);
         dma_pool_destroy(msm_uport->rx.pool);
 
-        dma_unmap_single(dev, msm_uport->rx.cmdptr_dmaaddr, sizeof(u32 *),
+        dma_unmap_single(dev, msm_uport->rx.cmdptr_dmaaddr, sizeof(u32),
                          DMA_TO_DEVICE);
-        dma_unmap_single(dev, msm_uport->tx.mapped_cmd_ptr_ptr, sizeof(u32 *),
+        dma_unmap_single(dev, msm_uport->tx.mapped_cmd_ptr_ptr, sizeof(u32),
                          DMA_TO_DEVICE);
         dma_unmap_single(dev, msm_uport->tx.mapped_cmd_ptr, sizeof(dmov_box),
                          DMA_TO_DEVICE);
@@ -812,7 +812,7 @@ static void msm_hs_submit_tx_locked(struct uart_port *uport)
         *tx->command_ptr_ptr = CMD_PTR_LP | DMOV_CMD_ADDR(tx->mapped_cmd_ptr);
 
         dma_sync_single_for_device(uport->dev, tx->mapped_cmd_ptr_ptr,
-                                   sizeof(u32 *), DMA_TO_DEVICE);
+                                   sizeof(u32), DMA_TO_DEVICE);
 
         /* Save tx_count to use in Callback */
         tx->tx_count = tx_count;
@@ -1087,12 +1087,10 @@ static void msm_hs_config_port(struct uart_port *uport, int cfg_flags)
 }
 
 /*  Handle CTS changes (Called from interrupt handler) */
-static void msm_hs_handle_delta_cts(struct uart_port *uport)
+static void msm_hs_handle_delta_cts_locked(struct uart_port *uport)
 {
-        unsigned long flags;
         struct msm_hs_port *msm_uport = UARTDM_TO_MSM(uport);
 
-        spin_lock_irqsave(&uport->lock, flags);
         clk_enable(msm_uport->clk);
 
         /* clear interrupt */
@@ -1100,7 +1098,6 @@ static void msm_hs_handle_delta_cts(struct uart_port *uport)
         uport->icount.cts++;
 
         clk_disable(msm_uport->clk);
-        spin_unlock_irqrestore(&uport->lock, flags);
 
         /* clear the IOCTL TIOCMIWAIT if called */
         wake_up_interruptible(&uport->state->port.delta_msr_wait);
@@ -1248,7 +1245,7 @@ static irqreturn_t msm_hs_isr(int irq, void *dev)
 
         /* Change in CTS interrupt */
         if (isr_status & UARTDM_ISR_DELTA_CTS_BMSK)
-                msm_hs_handle_delta_cts(uport);
+                msm_hs_handle_delta_cts_locked(uport);
 
         spin_unlock_irqrestore(&uport->lock, flags);
 
@@ -1537,7 +1534,7 @@ static int __devinit uartdm_init_port(struct uart_port *uport)
         if (!tx->command_ptr)
                 return -ENOMEM;
 
-        tx->command_ptr_ptr = kmalloc(sizeof(u32 *), GFP_KERNEL | __GFP_DMA);
+        tx->command_ptr_ptr = kmalloc(sizeof(u32), GFP_KERNEL | __GFP_DMA);
         if (!tx->command_ptr_ptr) {
                 ret = -ENOMEM;
                 goto err_tx_command_ptr_ptr;
@@ -1547,7 +1544,7 @@ static int __devinit uartdm_init_port(struct uart_port *uport)
                                             sizeof(dmov_box), DMA_TO_DEVICE);
         tx->mapped_cmd_ptr_ptr = dma_map_single(uport->dev,
                                                 tx->command_ptr_ptr,
-                                                sizeof(u32 *), DMA_TO_DEVICE);
+                                                sizeof(u32), DMA_TO_DEVICE);
         tx->xfer.cmdptr = DMOV_CMD_ADDR(tx->mapped_cmd_ptr_ptr);
 
         init_waitqueue_head(&rx->wait);
@@ -1575,7 +1572,7 @@ static int __devinit uartdm_init_port(struct uart_port *uport)
                 goto err_rx_command_ptr;
         }
 
-        rx->command_ptr_ptr = kmalloc(sizeof(u32 *), GFP_KERNEL | __GFP_DMA);
+        rx->command_ptr_ptr = kmalloc(sizeof(u32), GFP_KERNEL | __GFP_DMA);
         if (!rx->command_ptr_ptr) {
                 pr_err("%s(): cannot allocate rx->command_ptr_ptr", __func__);
                 ret = -ENOMEM;
@@ -1593,7 +1590,7 @@ static int __devinit uartdm_init_port(struct uart_port *uport)
         *rx->command_ptr_ptr = CMD_PTR_LP | DMOV_CMD_ADDR(rx->mapped_cmd_ptr);
 
         rx->cmdptr_dmaaddr = dma_map_single(uport->dev, rx->command_ptr_ptr,
-                                            sizeof(u32 *), DMA_TO_DEVICE);
+                                            sizeof(u32), DMA_TO_DEVICE);
         rx->xfer.cmdptr = DMOV_CMD_ADDR(rx->cmdptr_dmaaddr);
 
         INIT_WORK(&rx->tty_work, msm_hs_tty_flip_buffer_work);
@@ -1609,7 +1606,7 @@ err_dma_pool_alloc:
         dma_pool_destroy(msm_uport->rx.pool);
 err_dma_pool_create:
         dma_unmap_single(uport->dev, msm_uport->tx.mapped_cmd_ptr_ptr,
-                                sizeof(u32 *), DMA_TO_DEVICE);
+                                sizeof(u32), DMA_TO_DEVICE);
         dma_unmap_single(uport->dev, msm_uport->tx.mapped_cmd_ptr,
                                 sizeof(dmov_box), DMA_TO_DEVICE);
         kfree(msm_uport->tx.command_ptr_ptr);
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 7e02c9c344fe..55fd362b9879 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -145,11 +145,12 @@ static inline void mxs_auart_tx_chars(struct mxs_auart_port *s)
                         writel(xmit->buf[xmit->tail],
                                      s->port.membase + AUART_DATA);
                         xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-                        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-                                uart_write_wakeup(&s->port);
                 } else
                         break;
         }
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(&s->port);
+
         if (uart_circ_empty(&(s->port.state->xmit)))
                 writel(AUART_INTR_TXIEN,
                              s->port.membase + AUART_INTR_CLR);
@@ -424,7 +425,7 @@ static int mxs_auart_startup(struct uart_port *u)
 {
         struct mxs_auart_port *s = to_auart_port(u);
 
-        clk_enable(s->clk);
+        clk_prepare_enable(s->clk);
 
         writel(AUART_CTRL0_CLKGATE, u->membase + AUART_CTRL0_CLR);
 
@@ -453,7 +454,7 @@ static void mxs_auart_shutdown(struct uart_port *u)
         writel(AUART_INTR_RXIEN | AUART_INTR_RTIEN | AUART_INTR_CTSMIEN,
                         u->membase + AUART_INTR_CLR);
 
-        clk_disable(s->clk);
+        clk_disable_unprepare(s->clk);
 }
 
 static unsigned int mxs_auart_tx_empty(struct uart_port *u)
@@ -634,7 +635,7 @@ auart_console_setup(struct console *co, char *options)
         if (!s)
                 return -ENODEV;
 
-        clk_enable(s->clk);
+        clk_prepare_enable(s->clk);
 
         if (options)
                 uart_parse_options(options, &baud, &parity, &bits, &flow);
@@ -643,7 +644,7 @@ auart_console_setup(struct console *co, char *options)
 
         ret = uart_set_options(&s->port, co, baud, parity, bits, flow);
 
-        clk_disable(s->clk);
+        clk_disable_unprepare(s->clk);
 
         return ret;
 }
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 5e713d3ef1f4..d192dcbb82f5 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -37,17 +37,24 @@
 #include <linux/clk.h>
 #include <linux/serial_core.h>
 #include <linux/irq.h>
+#include <linux/pm_runtime.h>
+#include <linux/of.h>
 
 #include <plat/dma.h>
 #include <plat/dmtimer.h>
 #include <plat/omap-serial.h>
 
+#define DEFAULT_CLK_SPEED 48000000 /* 48Mhz*/
+
 static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
 
 /* Forward declaration of functions */
 static void uart_tx_dma_callback(int lch, u16 ch_status, void *data);
-static void serial_omap_rx_timeout(unsigned long uart_no);
+static void serial_omap_rxdma_poll(unsigned long uart_no);
 static int serial_omap_start_rxdma(struct uart_omap_port *up);
+static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1);
+
+static struct workqueue_struct *serial_omap_uart_wq;
 
 static inline unsigned int serial_in(struct uart_omap_port *up, int offset)
 {
@@ -102,6 +109,8 @@ static void serial_omap_stop_rxdma(struct uart_omap_port *up)
                 omap_free_dma(up->uart_dma.rx_dma_channel);
                 up->uart_dma.rx_dma_channel = OMAP_UART_DMA_CH_FREE;
                 up->uart_dma.rx_dma_used = false;
+                pm_runtime_mark_last_busy(&up->pdev->dev);
+                pm_runtime_put_autosuspend(&up->pdev->dev);
         }
 }
 
@@ -109,9 +118,12 @@ static void serial_omap_enable_ms(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
 
-        dev_dbg(up->port.dev, "serial_omap_enable_ms+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_enable_ms+%d\n", up->port.line);
+
+        pm_runtime_get_sync(&up->pdev->dev);
         up->ier |= UART_IER_MSI;
         serial_out(up, UART_IER, up->ier);
+        pm_runtime_put(&up->pdev->dev);
 }
 
 static void serial_omap_stop_tx(struct uart_port *port)
@@ -129,30 +141,40 @@ static void serial_omap_stop_tx(struct uart_port *port)
                 omap_stop_dma(up->uart_dma.tx_dma_channel);
                 omap_free_dma(up->uart_dma.tx_dma_channel);
                 up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
+                pm_runtime_mark_last_busy(&up->pdev->dev);
+                pm_runtime_put_autosuspend(&up->pdev->dev);
         }
 
+        pm_runtime_get_sync(&up->pdev->dev);
         if (up->ier & UART_IER_THRI) {
                 up->ier &= ~UART_IER_THRI;
                 serial_out(up, UART_IER, up->ier);
         }
+
+        pm_runtime_mark_last_busy(&up->pdev->dev);
+        pm_runtime_put_autosuspend(&up->pdev->dev);
 }
 
 static void serial_omap_stop_rx(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
 
+        pm_runtime_get_sync(&up->pdev->dev);
         if (up->use_dma)
                 serial_omap_stop_rxdma(up);
         up->ier &= ~UART_IER_RLSI;
         up->port.read_status_mask &= ~UART_LSR_DR;
         serial_out(up, UART_IER, up->ier);
+        pm_runtime_mark_last_busy(&up->pdev->dev);
+        pm_runtime_put_autosuspend(&up->pdev->dev);
 }
 
-static inline void receive_chars(struct uart_omap_port *up, int *status)
+static inline void receive_chars(struct uart_omap_port *up,
+                unsigned int *status)
 {
         struct tty_struct *tty = up->port.state->port.tty;
-        unsigned int flag;
-        unsigned char ch, lsr = *status;
+        unsigned int flag, lsr = *status;
+        unsigned char ch = 0;
         int max_count = 256;
 
         do {
@@ -262,7 +284,10 @@ static void serial_omap_start_tx(struct uart_port *port)
         int ret = 0;
 
         if (!up->use_dma) {
+                pm_runtime_get_sync(&up->pdev->dev);
                 serial_omap_enable_ier_thri(up);
+                pm_runtime_mark_last_busy(&up->pdev->dev);
+                pm_runtime_put_autosuspend(&up->pdev->dev);
                 return;
         }
 
@@ -272,6 +297,7 @@ static void serial_omap_start_tx(struct uart_port *port)
         xmit = &up->port.state->xmit;
 
         if (up->uart_dma.tx_dma_channel == OMAP_UART_DMA_CH_FREE) {
+                pm_runtime_get_sync(&up->pdev->dev);
                 ret = omap_request_dma(up->uart_dma.uart_dma_tx,
                                 "UART Tx DMA",
                                 (void *)uart_tx_dma_callback, up,
@@ -354,9 +380,13 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id)
         unsigned int iir, lsr;
         unsigned long flags;
 
+        pm_runtime_get_sync(&up->pdev->dev);
         iir = serial_in(up, UART_IIR);
-        if (iir & UART_IIR_NO_INT)
+        if (iir & UART_IIR_NO_INT) {
+                pm_runtime_mark_last_busy(&up->pdev->dev);
+                pm_runtime_put_autosuspend(&up->pdev->dev);
                 return IRQ_NONE;
+        }
 
         spin_lock_irqsave(&up->port.lock, flags);
         lsr = serial_in(up, UART_LSR);
@@ -378,6 +408,9 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id)
                 transmit_chars(up);
 
         spin_unlock_irqrestore(&up->port.lock, flags);
+        pm_runtime_mark_last_busy(&up->pdev->dev);
+        pm_runtime_put_autosuspend(&up->pdev->dev);
+
         up->port_activity = jiffies;
         return IRQ_HANDLED;
 }
@@ -388,22 +421,26 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
         unsigned long flags = 0;
         unsigned int ret = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->pdev->id);
+        pm_runtime_get_sync(&up->pdev->dev);
+        dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->port.line);
         spin_lock_irqsave(&up->port.lock, flags);
         ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
         spin_unlock_irqrestore(&up->port.lock, flags);
-
+        pm_runtime_put(&up->pdev->dev);
         return ret;
 }
 
 static unsigned int serial_omap_get_mctrl(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
-        unsigned char status;
+        unsigned int status;
         unsigned int ret = 0;
 
+        pm_runtime_get_sync(&up->pdev->dev);
         status = check_modem_status(up);
-        dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->pdev->id);
+        pm_runtime_put(&up->pdev->dev);
+
+        dev_dbg(up->port.dev, "serial_omap_get_mctrl+%d\n", up->port.line);
 
         if (status & UART_MSR_DCD)
                 ret |= TIOCM_CAR;
@@ -421,7 +458,7 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
         struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned char mcr = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_set_mctrl+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_set_mctrl+%d\n", up->port.line);
         if (mctrl & TIOCM_RTS)
                 mcr |= UART_MCR_RTS;
         if (mctrl & TIOCM_DTR)
@@ -433,8 +470,11 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
         if (mctrl & TIOCM_LOOP)
                 mcr |= UART_MCR_LOOP;
 
-        mcr |= up->mcr;
-        serial_out(up, UART_MCR, mcr);
+        pm_runtime_get_sync(&up->pdev->dev);
+        up->mcr = serial_in(up, UART_MCR);
+        up->mcr |= mcr;
+        serial_out(up, UART_MCR, up->mcr);
+        pm_runtime_put(&up->pdev->dev);
 }
 
 static void serial_omap_break_ctl(struct uart_port *port, int break_state)
@@ -442,7 +482,8 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
         struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned long flags = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_break_ctl+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_break_ctl+%d\n", up->port.line);
+        pm_runtime_get_sync(&up->pdev->dev);
         spin_lock_irqsave(&up->port.lock, flags);
         if (break_state == -1)
                 up->lcr |= UART_LCR_SBC;
@@ -450,6 +491,7 @@ static void serial_omap_break_ctl(struct uart_port *port, int break_state)
                 up->lcr &= ~UART_LCR_SBC;
         serial_out(up, UART_LCR, up->lcr);
         spin_unlock_irqrestore(&up->port.lock, flags);
+        pm_runtime_put(&up->pdev->dev);
 }
 
 static int serial_omap_startup(struct uart_port *port)
@@ -466,8 +508,9 @@ static int serial_omap_startup(struct uart_port *port)
         if (retval)
                 return retval;
 
-        dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_startup+%d\n", up->port.line);
 
+        pm_runtime_get_sync(&up->pdev->dev);
         /*
          * Clear the FIFO buffers and disable them.
          * (they will be reenabled in set_termios())
@@ -505,8 +548,8 @@ static int serial_omap_startup(struct uart_port *port)
                         (dma_addr_t *)&(up->uart_dma.tx_buf_dma_phys),
                         0);
                 init_timer(&(up->uart_dma.rx_timer));
-                up->uart_dma.rx_timer.function = serial_omap_rx_timeout;
-                up->uart_dma.rx_timer.data = up->pdev->id;
+                up->uart_dma.rx_timer.function = serial_omap_rxdma_poll;
+                up->uart_dma.rx_timer.data = up->port.line;
                 /* Currently the buffer size is 4KB. Can increase it */
                 up->uart_dma.rx_buf = dma_alloc_coherent(NULL,
                         up->uart_dma.rx_buf_size,
@@ -523,6 +566,8 @@ static int serial_omap_startup(struct uart_port *port)
         /* Enable module level wake up */
         serial_out(up, UART_OMAP_WER, OMAP_UART_WER_MOD_WKUP);
 
+        pm_runtime_mark_last_busy(&up->pdev->dev);
+        pm_runtime_put_autosuspend(&up->pdev->dev);
         up->port_activity = jiffies;
         return 0;
 }
@@ -532,7 +577,9 @@ static void serial_omap_shutdown(struct uart_port *port)
         struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned long flags = 0;
 
-        dev_dbg(up->port.dev, "serial_omap_shutdown+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_shutdown+%d\n", up->port.line);
+
+        pm_runtime_get_sync(&up->pdev->dev);
         /*
          * Disable interrupts from this port
          */
@@ -566,6 +613,8 @@ static void serial_omap_shutdown(struct uart_port *port)
                         up->uart_dma.rx_buf_dma_phys);
                 up->uart_dma.rx_buf = NULL;
         }
+
+        pm_runtime_put(&up->pdev->dev);
         free_irq(up->port.irq, up);
 }
 
@@ -573,8 +622,6 @@ static inline void
 serial_omap_configure_xonxoff
                 (struct uart_omap_port *up, struct ktermios *termios)
 {
-        unsigned char efr = 0;
-
         up->lcr = serial_in(up, UART_LCR);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         up->efr = serial_in(up, UART_EFR);
@@ -584,8 +631,7 @@ serial_omap_configure_xonxoff
         serial_out(up, UART_XOFF1, termios->c_cc[VSTOP]);
 
         /* clear SW control mode bits */
-        efr = up->efr;
-        efr &= OMAP_UART_SW_CLR;
+        up->efr &= OMAP_UART_SW_CLR;
 
         /*
          * IXON Flag:
@@ -593,7 +639,7 @@ serial_omap_configure_xonxoff
          * Transmit XON1, XOFF1
          */
         if (termios->c_iflag & IXON)
-                efr |= OMAP_UART_SW_TX;
+                up->efr |= OMAP_UART_SW_TX;
 
         /*
          * IXOFF Flag:
@@ -601,7 +647,7 @@ serial_omap_configure_xonxoff
          * Receiver compares XON1, XOFF1.
          */
         if (termios->c_iflag & IXOFF)
-                efr |= OMAP_UART_SW_RX;
+                up->efr |= OMAP_UART_SW_RX;
 
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
@@ -624,13 +670,21 @@ serial_omap_configure_xonxoff
          * load the new software flow control mode IXON or IXOFF
          * and restore the UARTi.EFR_REG[4] ENHANCED_EN value.
          */
-        serial_out(up, UART_EFR, efr | UART_EFR_SCD);
+        serial_out(up, UART_EFR, up->efr | UART_EFR_SCD);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
 
         serial_out(up, UART_MCR, up->mcr & ~UART_MCR_TCRTLR);
         serial_out(up, UART_LCR, up->lcr);
 }
 
+static void serial_omap_uart_qos_work(struct work_struct *work)
+{
+        struct uart_omap_port *up = container_of(work, struct uart_omap_port,
+                                                qos_work);
+
+        pm_qos_update_request(&up->pm_qos_request, up->latency);
+}
+
 static void
 serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
                         struct ktermios *old)
@@ -671,6 +725,16 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/13);
         quot = serial_omap_get_divisor(port, baud);
 
+        /* calculate wakeup latency constraint */
+        up->calc_latency = (1000000 * up->port.fifosize) /
+                                (1000 * baud / 8);
+        up->latency = up->calc_latency;
+        schedule_work(&up->qos_work);
+
+        up->dll = quot & 0xff;
+        up->dlh = quot >> 8;
+        up->mdr1 = UART_OMAP_MDR1_DISABLE;
+
         up->fcr = UART_FCR_R_TRIG_01 | UART_FCR_T_TRIG_01 |
                         UART_FCR_ENABLE_FIFO;
         if (up->use_dma)
@@ -680,6 +744,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
          * Ok, we're now changing the port state. Do it with
          * interrupts disabled.
          */
+        pm_runtime_get_sync(&up->pdev->dev);
         spin_lock_irqsave(&up->port.lock, flags);
 
         /*
@@ -723,6 +788,8 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
                 up->ier |= UART_IER_MSI;
         serial_out(up, UART_IER, up->ier);
         serial_out(up, UART_LCR, cval);         /* reset DLAB */
+        up->lcr = cval;
+        up->scr = OMAP_UART_SCR_TX_EMPTY;
 
         /* FIFOs and DMA Settings */
 
@@ -749,17 +816,22 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
 
         if (up->use_dma) {
                 serial_out(up, UART_TI752_TLR, 0);
-                serial_out(up, UART_OMAP_SCR,
-                        (UART_FCR_TRIGGER_4 | UART_FCR_TRIGGER_8));
+                up->scr |= (UART_FCR_TRIGGER_4 | UART_FCR_TRIGGER_8);
         }
 
+        serial_out(up, UART_OMAP_SCR, up->scr);
+
         serial_out(up, UART_EFR, up->efr);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
         serial_out(up, UART_MCR, up->mcr);
 
         /* Protocol, Baud Rate, and Interrupt Settings */
 
-        serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
+        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
+                serial_omap_mdr1_errataset(up, up->mdr1);
+        else
+                serial_out(up, UART_OMAP_MDR1, up->mdr1);
+
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         up->efr = serial_in(up, UART_EFR);
@@ -769,8 +841,8 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         serial_out(up, UART_IER, 0);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
-        serial_out(up, UART_DLL, quot & 0xff);          /* LS of divisor */
-        serial_out(up, UART_DLM, quot >> 8);            /* MS of divisor */
+        serial_out(up, UART_DLL, up->dll);      /* LS of divisor */
+        serial_out(up, UART_DLM, up->dlh);      /* MS of divisor */
 
         serial_out(up, UART_LCR, 0);
         serial_out(up, UART_IER, up->ier);
@@ -780,9 +852,14 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         serial_out(up, UART_LCR, cval);
 
         if (baud > 230400 && baud != 3000000)
-                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_13X_MODE);
+                up->mdr1 = UART_OMAP_MDR1_13X_MODE;
         else
-                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);
+                up->mdr1 = UART_OMAP_MDR1_16X_MODE;
+
+        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
+                serial_omap_mdr1_errataset(up, up->mdr1);
+        else
+                serial_out(up, UART_OMAP_MDR1, up->mdr1);
 
         /* Hardware Flow Control Configuration */
 
@@ -809,7 +886,8 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         serial_omap_configure_xonxoff(up, termios);
 
         spin_unlock_irqrestore(&up->port.lock, flags);
-        dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->pdev->id);
+        pm_runtime_put(&up->pdev->dev);
+        dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->port.line);
 }
 
 static void
@@ -819,7 +897,9 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
         struct uart_omap_port *up = (struct uart_omap_port *)port;
         unsigned char efr;
 
-        dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->port.line);
+
+        pm_runtime_get_sync(&up->pdev->dev);
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, efr | UART_EFR_ECB);
@@ -829,6 +909,15 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
         serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_EFR, efr);
         serial_out(up, UART_LCR, 0);
+
+        if (!device_may_wakeup(&up->pdev->dev)) {
+                if (!state)
+                        pm_runtime_forbid(&up->pdev->dev);
+                else
+                        pm_runtime_allow(&up->pdev->dev);
+        }
+
+        pm_runtime_put(&up->pdev->dev);
 }
 
 static void serial_omap_release_port(struct uart_port *port)
@@ -847,7 +936,7 @@ static void serial_omap_config_port(struct uart_port *port, int flags)
         struct uart_omap_port *up = (struct uart_omap_port *)port;
 
         dev_dbg(up->port.dev, "serial_omap_config_port+%d\n",
-                                                        up->pdev->id);
+                                                        up->port.line);
         up->port.type = PORT_OMAP;
 }
 
@@ -864,7 +953,7 @@ serial_omap_type(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
 
-        dev_dbg(up->port.dev, "serial_omap_type+%d\n", up->pdev->id);
+        dev_dbg(up->port.dev, "serial_omap_type+%d\n", up->port.line);
         return up->name;
 }
 
@@ -906,19 +995,26 @@ static inline void wait_for_xmitr(struct uart_omap_port *up)
 static void serial_omap_poll_put_char(struct uart_port *port, unsigned char ch)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
+
+        pm_runtime_get_sync(&up->pdev->dev);
         wait_for_xmitr(up);
         serial_out(up, UART_TX, ch);
+        pm_runtime_put(&up->pdev->dev);
 }
 
 static int serial_omap_poll_get_char(struct uart_port *port)
 {
         struct uart_omap_port *up = (struct uart_omap_port *)port;
-        unsigned int status = serial_in(up, UART_LSR);
+        unsigned int status;
 
+        pm_runtime_get_sync(&up->pdev->dev);
+        status = serial_in(up, UART_LSR);
         if (!(status & UART_LSR_DR))
                 return NO_POLL_CHAR;
 
-        return serial_in(up, UART_RX);
+        status = serial_in(up, UART_RX);
+        pm_runtime_put(&up->pdev->dev);
+        return status;
 }
 
 #endif /* CONFIG_CONSOLE_POLL */
@@ -946,6 +1042,8 @@ serial_omap_console_write(struct console *co, const char *s,
         unsigned int ier;
         int locked = 1;
 
+        pm_runtime_get_sync(&up->pdev->dev);
+
         local_irq_save(flags);
         if (up->port.sysrq)
                 locked = 0;
@@ -978,6 +1076,8 @@ serial_omap_console_write(struct console *co, const char *s,
         if (up->msr_saved_flags)
                 check_modem_status(up);
 
+        pm_runtime_mark_last_busy(&up->pdev->dev);
+        pm_runtime_put_autosuspend(&up->pdev->dev);
         if (locked)
                 spin_unlock(&up->port.lock);
         local_irq_restore(flags);
@@ -1014,7 +1114,7 @@ static struct console serial_omap_console = {
 
 static void serial_omap_add_console_port(struct uart_omap_port *up)
 {
-        serial_omap_console_ports[up->pdev->id] = up;
+        serial_omap_console_ports[up->port.line] = up;
 }
 
 #define OMAP_CONSOLE    (&serial_omap_console)
@@ -1060,26 +1160,30 @@ static struct uart_driver serial_omap_reg = {
         .cons           = OMAP_CONSOLE,
 };
 
-static int
-serial_omap_suspend(struct platform_device *pdev, pm_message_t state)
+#ifdef CONFIG_SUSPEND
+static int serial_omap_suspend(struct device *dev)
 {
-        struct uart_omap_port *up = platform_get_drvdata(pdev);
+        struct uart_omap_port *up = dev_get_drvdata(dev);
 
-        if (up)
+        if (up) {
                 uart_suspend_port(&serial_omap_reg, &up->port);
+                flush_work_sync(&up->qos_work);
+        }
+
         return 0;
 }
 
-static int serial_omap_resume(struct platform_device *dev)
+static int serial_omap_resume(struct device *dev)
 {
-        struct uart_omap_port *up = platform_get_drvdata(dev);
+        struct uart_omap_port *up = dev_get_drvdata(dev);
 
         if (up)
                 uart_resume_port(&serial_omap_reg, &up->port);
         return 0;
 }
+#endif
 
-static void serial_omap_rx_timeout(unsigned long uart_no)
+static void serial_omap_rxdma_poll(unsigned long uart_no)
 {
         struct uart_omap_port *up = ui[uart_no];
         unsigned int curr_dma_pos, curr_transmitted_size;
@@ -1089,9 +1193,9 @@ static void serial_omap_rx_timeout(unsigned long uart_no)
         if ((curr_dma_pos == up->uart_dma.prev_rx_dma_pos) ||
                              (curr_dma_pos == 0)) {
                 if (jiffies_to_msecs(jiffies - up->port_activity) <
-                                                        RX_TIMEOUT) {
+                                                up->uart_dma.rx_timeout) {
                         mod_timer(&up->uart_dma.rx_timer, jiffies +
-                                usecs_to_jiffies(up->uart_dma.rx_timeout));
+                                usecs_to_jiffies(up->uart_dma.rx_poll_rate));
                 } else {
                         serial_omap_stop_rxdma(up);
                         up->ier |= (UART_IER_RDI | UART_IER_RLSI);
@@ -1120,7 +1224,7 @@ static void serial_omap_rx_timeout(unsigned long uart_no)
                 }
         } else  {
                 mod_timer(&up->uart_dma.rx_timer, jiffies +
-                        usecs_to_jiffies(up->uart_dma.rx_timeout));
+                        usecs_to_jiffies(up->uart_dma.rx_poll_rate));
         }
         up->port_activity = jiffies;
 }
@@ -1135,6 +1239,7 @@ static int serial_omap_start_rxdma(struct uart_omap_port *up)
         int ret = 0;
 
         if (up->uart_dma.rx_dma_channel == -1) {
+                pm_runtime_get_sync(&up->pdev->dev);
                 ret = omap_request_dma(up->uart_dma.uart_dma_rx,
                                 "UART Rx DMA",
                                 (void *)uart_rx_dma_callback, up,
@@ -1158,7 +1263,7 @@ static int serial_omap_start_rxdma(struct uart_omap_port *up)
         /* FIXME: Cache maintenance needed here? */
         omap_start_dma(up->uart_dma.rx_dma_channel);
         mod_timer(&up->uart_dma.rx_timer, jiffies +
-                                usecs_to_jiffies(up->uart_dma.rx_timeout));
+                                usecs_to_jiffies(up->uart_dma.rx_poll_rate));
         up->uart_dma.rx_dma_used = true;
         return ret;
 }
@@ -1221,6 +1326,19 @@ static void uart_tx_dma_callback(int lch, u16 ch_status, void *data)
         return;
 }
 
+static struct omap_uart_port_info *of_get_uart_port_info(struct device *dev)
+{
+        struct omap_uart_port_info *omap_up_info;
+
+        omap_up_info = devm_kzalloc(dev, sizeof(*omap_up_info), GFP_KERNEL);
+        if (!omap_up_info)
+                return NULL; /* out of memory */
+
+        of_property_read_u32(dev->of_node, "clock-frequency",
+                                         &omap_up_info->uartclk);
+        return omap_up_info;
+}
+
 static int serial_omap_probe(struct platform_device *pdev)
 {
         struct uart_omap_port   *up;
@@ -1228,6 +1346,9 @@ static int serial_omap_probe(struct platform_device *pdev)
         struct omap_uart_port_info *omap_up_info = pdev->dev.platform_data;
         int ret = -ENOSPC;
 
+        if (pdev->dev.of_node)
+                omap_up_info = of_get_uart_port_info(&pdev->dev);
+
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!mem) {
                 dev_err(&pdev->dev, "no mem resource?\n");
@@ -1263,7 +1384,6 @@ static int serial_omap_probe(struct platform_device *pdev)
                 ret = -ENOMEM;
                 goto do_release_region;
         }
-        sprintf(up->name, "OMAP UART%d", pdev->id);
         up->pdev = pdev;
         up->port.dev = &pdev->dev;
         up->port.type = PORT_OMAP;
@@ -1273,34 +1393,74 @@ static int serial_omap_probe(struct platform_device *pdev)
         up->port.regshift = 2;
         up->port.fifosize = 64;
         up->port.ops = &serial_omap_pops;
-        up->port.line = pdev->id;
 
-        up->port.membase = omap_up_info->membase;
-        up->port.mapbase = omap_up_info->mapbase;
+        if (pdev->dev.of_node)
+                up->port.line = of_alias_get_id(pdev->dev.of_node, "serial");
+        else
+                up->port.line = pdev->id;
+
+        if (up->port.line < 0) {
+                dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n",
+                                                                up->port.line);
+                ret = -ENODEV;
+                goto err;
+        }
+
+        sprintf(up->name, "OMAP UART%d", up->port.line);
+        up->port.mapbase = mem->start;
+        up->port.membase = ioremap(mem->start, resource_size(mem));
+        if (!up->port.membase) {
+                dev_err(&pdev->dev, "can't ioremap UART\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+
         up->port.flags = omap_up_info->flags;
-        up->port.irqflags = omap_up_info->irqflags;
         up->port.uartclk = omap_up_info->uartclk;
+        if (!up->port.uartclk) {
+                up->port.uartclk = DEFAULT_CLK_SPEED;
+                dev_warn(&pdev->dev, "No clock speed specified: using default:"
+                                                "%d\n", DEFAULT_CLK_SPEED);
+        }
         up->uart_dma.uart_base = mem->start;
+        up->errata = omap_up_info->errata;
 
         if (omap_up_info->dma_enabled) {
                 up->uart_dma.uart_dma_tx = dma_tx->start;
                 up->uart_dma.uart_dma_rx = dma_rx->start;
                 up->use_dma = 1;
-                up->uart_dma.rx_buf_size = 4096;
-                up->uart_dma.rx_timeout = 2;
+                up->uart_dma.rx_buf_size = omap_up_info->dma_rx_buf_size;
+                up->uart_dma.rx_timeout = omap_up_info->dma_rx_timeout;
+                up->uart_dma.rx_poll_rate = omap_up_info->dma_rx_poll_rate;
                 spin_lock_init(&(up->uart_dma.tx_lock));
                 spin_lock_init(&(up->uart_dma.rx_lock));
                 up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
                 up->uart_dma.rx_dma_channel = OMAP_UART_DMA_CH_FREE;
         }
 
-        ui[pdev->id] = up;
+        up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+        up->calc_latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+        pm_qos_add_request(&up->pm_qos_request,
+                PM_QOS_CPU_DMA_LATENCY, up->latency);
+        serial_omap_uart_wq = create_singlethread_workqueue(up->name);
+        INIT_WORK(&up->qos_work, serial_omap_uart_qos_work);
+
+        pm_runtime_use_autosuspend(&pdev->dev);
+        pm_runtime_set_autosuspend_delay(&pdev->dev,
+                        omap_up_info->autosuspend_timeout);
+
+        pm_runtime_irq_safe(&pdev->dev);
+        pm_runtime_enable(&pdev->dev);
+        pm_runtime_get_sync(&pdev->dev);
+
+        ui[up->port.line] = up;
         serial_omap_add_console_port(up);
 
         ret = uart_add_one_port(&serial_omap_reg, &up->port);
         if (ret != 0)
                 goto do_release_region;
 
+        pm_runtime_put(&pdev->dev);
         platform_set_drvdata(pdev, up);
         return 0;
 err:
@@ -1315,22 +1475,168 @@ static int serial_omap_remove(struct platform_device *dev)
 {
         struct uart_omap_port *up = platform_get_drvdata(dev);
 
-        platform_set_drvdata(dev, NULL);
         if (up) {
+                pm_runtime_disable(&up->pdev->dev);
                 uart_remove_one_port(&serial_omap_reg, &up->port);
+                pm_qos_remove_request(&up->pm_qos_request);
+
                 kfree(up);
         }
+
+        platform_set_drvdata(dev, NULL);
         return 0;
 }
 
+/*
+ * Work Around for Errata i202 (2430, 3430, 3630, 4430 and 4460)
+ * The access to uart register after MDR1 Access
+ * causes UART to corrupt data.
+ *
+ * Need a delay =
+ * 5 L4 clock cycles + 5 UART functional clock cycle (@48MHz = ~0.2uS)
+ * give 10 times as much
+ */
+static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
+{
+        u8 timeout = 255;
+
+        serial_out(up, UART_OMAP_MDR1, mdr1);
+        udelay(2);
+        serial_out(up, UART_FCR, up->fcr | UART_FCR_CLEAR_XMIT |
+                        UART_FCR_CLEAR_RCVR);
+        /*
+         * Wait for FIFO to empty: when empty, RX_FIFO_E bit is 0 and
+         * TX_FIFO_E bit is 1.
+         */
+        while (UART_LSR_THRE != (serial_in(up, UART_LSR) &
+                                (UART_LSR_THRE | UART_LSR_DR))) {
+                timeout--;
+                if (!timeout) {
+                        /* Should *never* happen. we warn and carry on */
+                        dev_crit(&up->pdev->dev, "Errata i202: timedout %x\n",
+                                                serial_in(up, UART_LSR));
+                        break;
+                }
+                udelay(1);
+        }
+}
+
+static void serial_omap_restore_context(struct uart_omap_port *up)
+{
+        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
+                serial_omap_mdr1_errataset(up, UART_OMAP_MDR1_DISABLE);
+        else
+                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
+
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); /* Config B mode */
+        serial_out(up, UART_EFR, UART_EFR_ECB);
+        serial_out(up, UART_LCR, 0x0); /* Operational mode */
+        serial_out(up, UART_IER, 0x0);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); /* Config B mode */
+        serial_out(up, UART_DLL, up->dll);
+        serial_out(up, UART_DLM, up->dlh);
+        serial_out(up, UART_LCR, 0x0); /* Operational mode */
+        serial_out(up, UART_IER, up->ier);
+        serial_out(up, UART_FCR, up->fcr);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
+        serial_out(up, UART_MCR, up->mcr);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); /* Config B mode */
+        serial_out(up, UART_OMAP_SCR, up->scr);
+        serial_out(up, UART_EFR, up->efr);
+        serial_out(up, UART_LCR, up->lcr);
+        if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
+                serial_omap_mdr1_errataset(up, up->mdr1);
+        else
+                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);
+        struct omap_uart_port_info *pdata = dev->platform_data;
+
+        if (!up)
+                return -EINVAL;
+
+        if (!pdata || !pdata->enable_wakeup)
+                return 0;
+
+        if (pdata->get_context_loss_count)
+                up->context_loss_cnt = pdata->get_context_loss_count(dev);
+
+        if (device_may_wakeup(dev)) {
+                if (!up->wakeups_enabled) {
+                        pdata->enable_wakeup(up->pdev, true);
+                        up->wakeups_enabled = true;
+                }
+        } else {
+                if (up->wakeups_enabled) {
+                        pdata->enable_wakeup(up->pdev, false);
+                        up->wakeups_enabled = false;
+                }
+        }
+
+        /* Errata i291 */
+        if (up->use_dma && pdata->set_forceidle &&
+                        (up->errata & UART_ERRATA_i291_DMA_FORCEIDLE))
+                pdata->set_forceidle(up->pdev);
+
+        up->latency = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+        schedule_work(&up->qos_work);
+
+        return 0;
+}
+
+static int serial_omap_runtime_resume(struct device *dev)
+{
+        struct uart_omap_port *up = dev_get_drvdata(dev);
+        struct omap_uart_port_info *pdata = dev->platform_data;
+
+        if (up) {
+                if (pdata->get_context_loss_count) {
+                        u32 loss_cnt = pdata->get_context_loss_count(dev);
+
+                        if (up->context_loss_cnt != loss_cnt)
+                                serial_omap_restore_context(up);
+                }
+
+                /* Errata i291 */
+                if (up->use_dma && pdata->set_noidle &&
+                                (up->errata & UART_ERRATA_i291_DMA_FORCEIDLE))
+                        pdata->set_noidle(up->pdev);
+
+                up->latency = up->calc_latency;
+                schedule_work(&up->qos_work);
+        }
+
+        return 0;
+}
+#endif
+
+static const struct dev_pm_ops serial_omap_dev_pm_ops = {
+        SET_SYSTEM_SLEEP_PM_OPS(serial_omap_suspend, serial_omap_resume)
+        SET_RUNTIME_PM_OPS(serial_omap_runtime_suspend,
+                                serial_omap_runtime_resume, NULL)
+};
+
+#if defined(CONFIG_OF)
+static const struct of_device_id omap_serial_of_match[] = {
+        { .compatible = "ti,omap2-uart" },
+        { .compatible = "ti,omap3-uart" },
+        { .compatible = "ti,omap4-uart" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, omap_serial_of_match);
+#endif
+
 static struct platform_driver serial_omap_driver = {
         .probe          = serial_omap_probe,
         .remove         = serial_omap_remove,
-
-        .suspend        = serial_omap_suspend,
-        .resume         = serial_omap_resume,
         .driver         = {
                 .name   = DRIVER_NAME,
+                .pm     = &serial_omap_dev_pm_ops,
+                .of_match_table = of_match_ptr(omap_serial_of_match),
         },
 };
 
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index d6aba8c087e4..de0f613ed6f5 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -25,6 +25,9 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/dmi.h>
+#include <linux/console.h>
+#include <linux/nmi.h>
+#include <linux/delay.h>
 
 #include <linux/dmaengine.h>
 #include <linux/pch_dma.h>
@@ -198,6 +201,10 @@ enum {
 
 #define PCI_VENDOR_ID_ROHM              0x10DB
 
+#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+
+#define DEFAULT_BAUD_RATE 1843200 /* 1.8432MHz */
+
 struct pch_uart_buffer {
         unsigned char *buf;
         int size;
@@ -276,6 +283,9 @@ static struct pch_uart_driver_data drv_dat[] = {
         [pch_ml7831_uart1] = {PCH_UART_2LINE, 1},
 };
 
+#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
+static struct eg20t_port *pch_uart_ports[PCH_UART_NR];
+#endif
 static unsigned int default_baud = 9600;
 static const int trigger_level_256[4] = { 1, 64, 128, 224 };
 static const int trigger_level_64[4] = { 1, 16, 32, 56 };
@@ -1385,6 +1395,143 @@ static struct uart_ops pch_uart_ops = {
         .verify_port = pch_uart_verify_port
 };
 
+#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
+
+/*
+ *      Wait for transmitter & holding register to empty
+ */
+static void wait_for_xmitr(struct eg20t_port *up, int bits)
+{
+        unsigned int status, tmout = 10000;
+
+        /* Wait up to 10ms for the character(s) to be sent. */
+        for (;;) {
+                status = ioread8(up->membase + UART_LSR);
+
+                if ((status & bits) == bits)
+                        break;
+                if (--tmout == 0)
+                        break;
+                udelay(1);
+        }
+
+        /* Wait up to 1s for flow control if necessary */
+        if (up->port.flags & UPF_CONS_FLOW) {
+                unsigned int tmout;
+                for (tmout = 1000000; tmout; tmout--) {
+                        unsigned int msr = ioread8(up->membase + UART_MSR);
+                        if (msr & UART_MSR_CTS)
+                                break;
+                        udelay(1);
+                        touch_nmi_watchdog();
+                }
+        }
+}
+
+static void pch_console_putchar(struct uart_port *port, int ch)
+{
+        struct eg20t_port *priv =
+                container_of(port, struct eg20t_port, port);
+
+        wait_for_xmitr(priv, UART_LSR_THRE);
+        iowrite8(ch, priv->membase + PCH_UART_THR);
+}
+
+/*
+ *      Print a string to the serial port trying not to disturb
+ *      any possible real use of the port...
+ *
+ *      The console_lock must be held when we get here.
+ */
+static void
+pch_console_write(struct console *co, const char *s, unsigned int count)
+{
+        struct eg20t_port *priv;
+
+        unsigned long flags;
+        u8 ier;
+        int locked = 1;
+
+        priv = pch_uart_ports[co->index];
+
+        touch_nmi_watchdog();
+
+        local_irq_save(flags);
+        if (priv->port.sysrq) {
+                /* serial8250_handle_port() already took the lock */
+                locked = 0;
+        } else if (oops_in_progress) {
+                locked = spin_trylock(&priv->port.lock);
+        } else
+                spin_lock(&priv->port.lock);
+
+        /*
+         *      First save the IER then disable the interrupts
+         */
+        ier = ioread8(priv->membase + UART_IER);
+
+        pch_uart_hal_disable_interrupt(priv, PCH_UART_HAL_ALL_INT);
+
+        uart_console_write(&priv->port, s, count, pch_console_putchar);
+
+        /*
+         *      Finally, wait for transmitter to become empty
+         *      and restore the IER
+         */
+        wait_for_xmitr(priv, BOTH_EMPTY);
+        iowrite8(ier, priv->membase + UART_IER);
+
+        if (locked)
+                spin_unlock(&priv->port.lock);
+        local_irq_restore(flags);
+}
+
+static int __init pch_console_setup(struct console *co, char *options)
+{
+        struct uart_port *port;
+        int baud = 9600;
+        int bits = 8;
+        int parity = 'n';
+        int flow = 'n';
+
+        /*
+         * Check whether an invalid uart number has been specified, and
+         * if so, search for the first available port that does have
+         * console support.
+         */
+        if (co->index >= PCH_UART_NR)
+                co->index = 0;
+        port = &pch_uart_ports[co->index]->port;
+
+        if (!port || (!port->iobase && !port->membase))
+                return -ENODEV;
+
+        /* setup uartclock */
+        port->uartclk = DEFAULT_BAUD_RATE;
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static struct uart_driver pch_uart_driver;
+
+static struct console pch_console = {
+        .name           = PCH_UART_DRIVER_DEVICE,
+        .write          = pch_console_write,
+        .device         = uart_console_device,
+        .setup          = pch_console_setup,
+        .flags          = CON_PRINTBUFFER | CON_ANYTIME,
+        .index          = -1,
+        .data           = &pch_uart_driver,
+};
+
+#define PCH_CONSOLE     (&pch_console)
+#else
+#define PCH_CONSOLE     NULL
+#endif
+
 static struct uart_driver pch_uart_driver = {
         .owner = THIS_MODULE,
         .driver_name = KBUILD_MODNAME,
@@ -1392,6 +1539,7 @@ static struct uart_driver pch_uart_driver = {
         .major = 0,
         .minor = 0,
         .nr = PCH_UART_NR,
+        .cons = PCH_CONSOLE,
 };
 
 static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
@@ -1418,7 +1566,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         if (!rxbuf)
                 goto init_port_free_txbuf;
 
-        base_baud = 1843200; /* 1.8432MHz */
+        base_baud = DEFAULT_BAUD_RATE;
 
         /* quirk for CM-iTC board */
         board_name = dmi_get_system_info(DMI_BOARD_NAME);
@@ -1468,6 +1616,9 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         pci_set_drvdata(pdev, priv);
         pch_uart_hal_request(pdev, fifosize, base_baud);
 
+#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
+        pch_uart_ports[board->line_no] = priv;
+#endif
         ret = uart_add_one_port(&pch_uart_driver, &priv->port);
         if (ret < 0)
                 goto init_port_hal_free;
@@ -1475,6 +1626,9 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
         return priv;
 
 init_port_hal_free:
+#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
+        pch_uart_ports[board->line_no] = NULL;
+#endif
         free_page((unsigned long)rxbuf);
 init_port_free_txbuf:
         kfree(priv);
@@ -1497,6 +1651,10 @@ static void pch_uart_pci_remove(struct pci_dev *pdev)
         priv = (struct eg20t_port *)pci_get_drvdata(pdev);
 
         pci_disable_msi(pdev);
+
+#ifdef CONFIG_SERIAL_PCH_UART_CONSOLE
+        pch_uart_ports[priv->port.line] = NULL;
+#endif
         pch_uart_exit_port(priv);
         pci_disable_device(pdev);
         kfree(priv);
diff --git a/drivers/tty/serial/s3c2410.c b/drivers/tty/serial/s3c2410.c
deleted file mode 100644
index b1d7e7c1849d..000000000000
--- a/drivers/tty/serial/s3c2410.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Driver for Samsung S3C2410 SoC onboard UARTs.
- *
- * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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.
-*/
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-
-#include <asm/irq.h>
-#include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-
-#include "samsung.h"
-
-static int s3c2410_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2410_UCON_UCLK;
-        else
-                ucon &= ~S3C2410_UCON_UCLK;
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-static int s3c2410_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        clk->divisor = 1;
-        clk->name = (ucon & S3C2410_UCON_UCLK) ? "uclk" : "pclk";
-
-        return 0;
-}
-
-static int s3c2410_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        dbg("s3c2410_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        wr_regl(port, S3C2410_UCON,  cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2410_uart_inf = {
-        .name           = "Samsung S3C2410 UART",
-        .type           = PORT_S3C2410,
-        .fifosize       = 16,
-        .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2410_serial_getsource,
-        .set_clksrc     = s3c2410_serial_setsource,
-        .reset_port     = s3c2410_serial_resetport,
-};
-
-static int s3c2410_serial_probe(struct platform_device *dev)
-{
-        return s3c24xx_serial_probe(dev, &s3c2410_uart_inf);
-}
-
-static struct platform_driver s3c2410_serial_driver = {
-        .probe          = s3c2410_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c2410-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int __init s3c2410_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2410_serial_driver, &s3c2410_uart_inf);
-}
-
-static void __exit s3c2410_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2410_serial_driver);
-}
-
-module_init(s3c2410_serial_init);
-module_exit(s3c2410_serial_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_DESCRIPTION("Samsung S3C2410 SoC Serial port driver");
-MODULE_ALIAS("platform:s3c2410-uart");
diff --git a/drivers/tty/serial/s3c2412.c b/drivers/tty/serial/s3c2412.c
deleted file mode 100644
index 2234bf9ced45..000000000000
--- a/drivers/tty/serial/s3c2412.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Driver for Samsung S3C2412 and S3C2413 SoC onboard UARTs.
- *
- * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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.
-*/
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-
-#include <asm/irq.h>
-#include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-
-#include "samsung.h"
-
-static int s3c2412_serial_setsource(struct uart_port *port,
-                                     struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        ucon &= ~S3C2412_UCON_CLKMASK;
-
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2440_UCON_UCLK;
-        else if (strcmp(clk->name, "pclk") == 0)
-                ucon |= S3C2440_UCON_PCLK;
-        else if (strcmp(clk->name, "usysclk") == 0)
-                ucon |= S3C2412_UCON_USYSCLK;
-        else {
-                printk(KERN_ERR "unknown clock source %s\n", clk->name);
-                return -EINVAL;
-        }
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-
-static int s3c2412_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        switch (ucon & S3C2412_UCON_CLKMASK) {
-        case S3C2412_UCON_UCLK:
-                clk->divisor = 1;
-                clk->name = "uclk";
-                break;
-
-        case S3C2412_UCON_PCLK:
-        case S3C2412_UCON_PCLK2:
-                clk->divisor = 1;
-                clk->name = "pclk";
-                break;
-
-        case S3C2412_UCON_USYSCLK:
-                clk->divisor = 1;
-                clk->name = "usysclk";
-                break;
-        }
-
-        return 0;
-}
-
-static int s3c2412_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        dbg("%s: port=%p (%08lx), cfg=%p\n",
-            __func__, port, port->mapbase, cfg);
-
-        /* ensure we don't change the clock settings... */
-
-        ucon &= S3C2412_UCON_CLKMASK;
-
-        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2412_uart_inf = {
-        .name           = "Samsung S3C2412 UART",
-        .type           = PORT_S3C2412,
-        .fifosize       = 64,
-        .has_divslot    = 1,
-        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2412_serial_getsource,
-        .set_clksrc     = s3c2412_serial_setsource,
-        .reset_port     = s3c2412_serial_resetport,
-};
-
-/* device management */
-
-static int s3c2412_serial_probe(struct platform_device *dev)
-{
-        dbg("s3c2440_serial_probe: dev=%p\n", dev);
-        return s3c24xx_serial_probe(dev, &s3c2412_uart_inf);
-}
-
-static struct platform_driver s3c2412_serial_driver = {
-        .probe          = s3c2412_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c2412-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static inline int s3c2412_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2412_serial_driver, &s3c2412_uart_inf);
-}
-
-static inline void s3c2412_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2412_serial_driver);
-}
-
-module_init(s3c2412_serial_init);
-module_exit(s3c2412_serial_exit);
-
-MODULE_DESCRIPTION("Samsung S3C2412,S3C2413 SoC Serial port driver");
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:s3c2412-uart");
diff --git a/drivers/tty/serial/s3c2440.c b/drivers/tty/serial/s3c2440.c
deleted file mode 100644
index 1d0c324b813f..000000000000
--- a/drivers/tty/serial/s3c2440.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Driver for Samsung S3C2440 and S3C2442 SoC onboard UARTs.
- *
- * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *
- * 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.
-*/
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-
-#include <asm/irq.h>
-#include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
-#include <mach/regs-gpio.h>
-
-#include "samsung.h"
-
-
-static int s3c2440_serial_setsource(struct uart_port *port,
-                                     struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        /* todo - proper fclk<>nonfclk switch. */
-
-        ucon &= ~S3C2440_UCON_CLKMASK;
-
-        if (strcmp(clk->name, "uclk") == 0)
-                ucon |= S3C2440_UCON_UCLK;
-        else if (strcmp(clk->name, "pclk") == 0)
-                ucon |= S3C2440_UCON_PCLK;
-        else if (strcmp(clk->name, "fclk") == 0)
-                ucon |= S3C2440_UCON_FCLK;
-        else {
-                printk(KERN_ERR "unknown clock source %s\n", clk->name);
-                return -EINVAL;
-        }
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-
-static int s3c2440_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-        unsigned long ucon0, ucon1, ucon2;
-
-        switch (ucon & S3C2440_UCON_CLKMASK) {
-        case S3C2440_UCON_UCLK:
-                clk->divisor = 1;
-                clk->name = "uclk";
-                break;
-
-        case S3C2440_UCON_PCLK:
-        case S3C2440_UCON_PCLK2:
-                clk->divisor = 1;
-                clk->name = "pclk";
-                break;
-
-        case S3C2440_UCON_FCLK:
-                /* the fun of calculating the uart divisors on
-                 * the s3c2440 */
-
-                ucon0 = __raw_readl(S3C24XX_VA_UART0 + S3C2410_UCON);
-                ucon1 = __raw_readl(S3C24XX_VA_UART1 + S3C2410_UCON);
-                ucon2 = __raw_readl(S3C24XX_VA_UART2 + S3C2410_UCON);
-
-                printk("ucons: %08lx, %08lx, %08lx\n", ucon0, ucon1, ucon2);
-
-                ucon0 &= S3C2440_UCON0_DIVMASK;
-                ucon1 &= S3C2440_UCON1_DIVMASK;
-                ucon2 &= S3C2440_UCON2_DIVMASK;
-
-                if (ucon0 != 0) {
-                        clk->divisor = ucon0 >> S3C2440_UCON_DIVSHIFT;
-                        clk->divisor += 6;
-                } else if (ucon1 != 0) {
-                        clk->divisor = ucon1 >> S3C2440_UCON_DIVSHIFT;
-                        clk->divisor += 21;
-                } else if (ucon2 != 0) {
-                        clk->divisor = ucon2 >> S3C2440_UCON_DIVSHIFT;
-                        clk->divisor += 36;
-                } else {
-                        /* manual calims 44, seems to be 9 */
-                        clk->divisor = 9;
-                }
-
-                clk->name = "fclk";
-                break;
-        }
-
-        return 0;
-}
-
-static int s3c2440_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        dbg("s3c2440_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        /* ensure we don't change the clock settings... */
-
-        ucon &= (S3C2440_UCON0_DIVMASK | (3<<10));
-
-        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c2440_uart_inf = {
-        .name           = "Samsung S3C2440 UART",
-        .type           = PORT_S3C2440,
-        .fifosize       = 64,
-        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c2440_serial_getsource,
-        .set_clksrc     = s3c2440_serial_setsource,
-        .reset_port     = s3c2440_serial_resetport,
-};
-
-/* device management */
-
-static int s3c2440_serial_probe(struct platform_device *dev)
-{
-        dbg("s3c2440_serial_probe: dev=%p\n", dev);
-        return s3c24xx_serial_probe(dev, &s3c2440_uart_inf);
-}
-
-static struct platform_driver s3c2440_serial_driver = {
-        .probe          = s3c2440_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c2440-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int __init s3c2440_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c2440_serial_driver, &s3c2440_uart_inf);
-}
-
-static void __exit s3c2440_serial_exit(void)
-{
-        platform_driver_unregister(&s3c2440_serial_driver);
-}
-
-module_init(s3c2440_serial_init);
-module_exit(s3c2440_serial_exit);
-
-MODULE_DESCRIPTION("Samsung S3C2440,S3C2442 SoC Serial port driver");
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:s3c2440-uart");
diff --git a/drivers/tty/serial/s3c6400.c b/drivers/tty/serial/s3c6400.c
deleted file mode 100644
index e2f6913d84d5..000000000000
--- a/drivers/tty/serial/s3c6400.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Driver for Samsung S3C6400 and S3C6410 SoC onboard UARTs.
- *
- * Copyright 2008 Openmoko,  Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * 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.
-*/
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-
-#include <asm/irq.h>
-#include <mach/hardware.h>
-
-#include <plat/regs-serial.h>
-
-#include "samsung.h"
-
-static int s3c6400_serial_setsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        if (strcmp(clk->name, "uclk0") == 0) {
-                ucon &= ~S3C6400_UCON_CLKMASK;
-                ucon |= S3C6400_UCON_UCLK0;
-        } else if (strcmp(clk->name, "uclk1") == 0)
-                ucon |= S3C6400_UCON_UCLK1;
-        else if (strcmp(clk->name, "pclk") == 0) {
-                /* See notes about transitioning from UCLK to PCLK */
-                ucon &= ~S3C6400_UCON_UCLK0;
-        } else {
-                printk(KERN_ERR "unknown clock source %s\n", clk->name);
-                return -EINVAL;
-        }
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-
-static int s3c6400_serial_getsource(struct uart_port *port,
-                                    struct s3c24xx_uart_clksrc *clk)
-{
-        u32 ucon = rd_regl(port, S3C2410_UCON);
-
-        clk->divisor = 1;
-
-        switch (ucon & S3C6400_UCON_CLKMASK) {
-        case S3C6400_UCON_UCLK0:
-                clk->name = "uclk0";
-                break;
-
-        case S3C6400_UCON_UCLK1:
-                clk->name = "uclk1";
-                break;
-
-        case S3C6400_UCON_PCLK:
-        case S3C6400_UCON_PCLK2:
-                clk->name = "pclk";
-                break;
-        }
-
-        return 0;
-}
-
-static int s3c6400_serial_resetport(struct uart_port *port,
-                                    struct s3c2410_uartcfg *cfg)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        dbg("s3c6400_serial_resetport: port=%p (%08lx), cfg=%p\n",
-            port, port->mapbase, cfg);
-
-        /* ensure we don't change the clock settings... */
-
-        ucon &= S3C6400_UCON_CLKMASK;
-
-        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        return 0;
-}
-
-static struct s3c24xx_uart_info s3c6400_uart_inf = {
-        .name           = "Samsung S3C6400 UART",
-        .type           = PORT_S3C6400,
-        .fifosize       = 64,
-        .has_divslot    = 1,
-        .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
-        .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
-        .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
-        .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
-        .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
-        .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
-        .get_clksrc     = s3c6400_serial_getsource,
-        .set_clksrc     = s3c6400_serial_setsource,
-        .reset_port     = s3c6400_serial_resetport,
-};
-
-/* device management */
-
-static int s3c6400_serial_probe(struct platform_device *dev)
-{
-        dbg("s3c6400_serial_probe: dev=%p\n", dev);
-        return s3c24xx_serial_probe(dev, &s3c6400_uart_inf);
-}
-
-static struct platform_driver s3c6400_serial_driver = {
-        .probe          = s3c6400_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s3c6400-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int __init s3c6400_serial_init(void)
-{
-        return s3c24xx_serial_init(&s3c6400_serial_driver, &s3c6400_uart_inf);
-}
-
-static void __exit s3c6400_serial_exit(void)
-{
-        platform_driver_unregister(&s3c6400_serial_driver);
-}
-
-module_init(s3c6400_serial_init);
-module_exit(s3c6400_serial_exit);
-
-MODULE_DESCRIPTION("Samsung S3C6400,S3C6410 SoC Serial port driver");
-MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
-MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:s3c6400-uart");
diff --git a/drivers/tty/serial/s5pv210.c b/drivers/tty/serial/s5pv210.c
deleted file mode 100644
index 8b0b888a1b76..000000000000
--- a/drivers/tty/serial/s5pv210.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * Based on drivers/serial/s3c6400.c
- *
- * Driver for Samsung S5PV210 SoC UARTs.
- *
- * 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.
-*/
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/init.h>
-#include <linux/serial_core.h>
-#include <linux/serial.h>
-#include <linux/delay.h>
-
-#include <asm/irq.h>
-#include <mach/hardware.h>
-#include <plat/regs-serial.h>
-#include "samsung.h"
-
-static int s5pv210_serial_setsource(struct uart_port *port,
-                                        struct s3c24xx_uart_clksrc *clk)
-{
-        struct s3c2410_uartcfg *cfg = port->dev->platform_data;
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        if (cfg->flags & NO_NEED_CHECK_CLKSRC)
-                return 0;
-
-        if (strcmp(clk->name, "pclk") == 0)
-                ucon &= ~S5PV210_UCON_CLKMASK;
-        else if (strcmp(clk->name, "uclk1") == 0)
-                ucon |= S5PV210_UCON_CLKMASK;
-        else {
-                printk(KERN_ERR "unknown clock source %s\n", clk->name);
-                return -EINVAL;
-        }
-
-        wr_regl(port, S3C2410_UCON, ucon);
-        return 0;
-}
-
-
-static int s5pv210_serial_getsource(struct uart_port *port,
-                                        struct s3c24xx_uart_clksrc *clk)
-{
-        struct s3c2410_uartcfg *cfg = port->dev->platform_data;
-        u32 ucon = rd_regl(port, S3C2410_UCON);
-
-        clk->divisor = 1;
-
-        if (cfg->flags & NO_NEED_CHECK_CLKSRC)
-                return 0;
-
-        switch (ucon & S5PV210_UCON_CLKMASK) {
-        case S5PV210_UCON_PCLK:
-                clk->name = "pclk";
-                break;
-        case S5PV210_UCON_UCLK:
-                clk->name = "uclk1";
-                break;
-        }
-
-        return 0;
-}
-
-static int s5pv210_serial_resetport(struct uart_port *port,
-                                        struct s3c2410_uartcfg *cfg)
-{
-        unsigned long ucon = rd_regl(port, S3C2410_UCON);
-
-        ucon &= S5PV210_UCON_CLKMASK;
-        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
-        wr_regl(port, S3C2410_ULCON, cfg->ulcon);
-
-        /* reset both fifos */
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
-        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
-
-        /* It is need to delay When reset FIFO register */
-        udelay(1);
-
-        return 0;
-}
-
-#define S5PV210_UART_DEFAULT_INFO(fifo_size)                    \
-                .name           = "Samsung S5PV210 UART0",      \
-                .type           = PORT_S3C6400,                 \
-                .fifosize       = fifo_size,                    \
-                .has_divslot    = 1,                            \
-                .rx_fifomask    = S5PV210_UFSTAT_RXMASK,        \
-                .rx_fifoshift   = S5PV210_UFSTAT_RXSHIFT,       \
-                .rx_fifofull    = S5PV210_UFSTAT_RXFULL,        \
-                .tx_fifofull    = S5PV210_UFSTAT_TXFULL,        \
-                .tx_fifomask    = S5PV210_UFSTAT_TXMASK,        \
-                .tx_fifoshift   = S5PV210_UFSTAT_TXSHIFT,       \
-                .get_clksrc     = s5pv210_serial_getsource,     \
-                .set_clksrc     = s5pv210_serial_setsource,     \
-                .reset_port     = s5pv210_serial_resetport
-
-static struct s3c24xx_uart_info s5p_port_fifo256 = {
-        S5PV210_UART_DEFAULT_INFO(256),
-};
-
-static struct s3c24xx_uart_info s5p_port_fifo64 = {
-        S5PV210_UART_DEFAULT_INFO(64),
-};
-
-static struct s3c24xx_uart_info s5p_port_fifo16 = {
-        S5PV210_UART_DEFAULT_INFO(16),
-};
-
-static struct s3c24xx_uart_info *s5p_uart_inf[] = {
-        [0] = &s5p_port_fifo256,
-        [1] = &s5p_port_fifo64,
-        [2] = &s5p_port_fifo16,
-        [3] = &s5p_port_fifo16,
-};
-
-/* device management */
-static int s5p_serial_probe(struct platform_device *pdev)
-{
-        return s3c24xx_serial_probe(pdev, s5p_uart_inf[pdev->id]);
-}
-
-static struct platform_driver s5p_serial_driver = {
-        .probe          = s5p_serial_probe,
-        .remove         = __devexit_p(s3c24xx_serial_remove),
-        .driver         = {
-                .name   = "s5pv210-uart",
-                .owner  = THIS_MODULE,
-        },
-};
-
-static int __init s5p_serial_init(void)
-{
-        return s3c24xx_serial_init(&s5p_serial_driver, *s5p_uart_inf);
-}
-
-static void __exit s5p_serial_exit(void)
-{
-        platform_driver_unregister(&s5p_serial_driver);
-}
-
-module_init(s5p_serial_init);
-module_exit(s5p_serial_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:s5pv210-uart");
-MODULE_DESCRIPTION("Samsung S5PV210 UART Driver support");
-MODULE_AUTHOR("Thomas Abraham <thomas.ab@samsung.com>");
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index b31f1c3a2c4c..f96f37b5fec6 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -42,6 +42,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/cpufreq.h>
+#include <linux/of.h>
 
 #include <asm/irq.h>
 
@@ -49,6 +50,7 @@
 #include <mach/map.h>
 
 #include <plat/regs-serial.h>
+#include <plat/clock.h>
 
 #include "samsung.h"
 
@@ -190,10 +192,13 @@ static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *p
 
 static inline struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port)
 {
+        struct s3c24xx_uart_port *ourport;
+
         if (port->dev == NULL)
                 return NULL;
 
-        return (struct s3c2410_uartcfg *)port->dev->platform_data;
+        ourport = container_of(port, struct s3c24xx_uart_port, port);
+        return ourport->cfg;
 }
 
 static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
@@ -202,7 +207,7 @@ static int s3c24xx_serial_rx_fifocnt(struct s3c24xx_uart_port *ourport,
         struct s3c24xx_uart_info *info = ourport->info;
 
         if (ufstat & info->rx_fifofull)
-                return info->fifosize;
+                return ourport->port.fifosize;
 
         return (ufstat & info->rx_fifomask) >> info->rx_fifoshift;
 }
@@ -555,154 +560,98 @@ static void s3c24xx_serial_pm(struct uart_port *port, unsigned int level,
  *
 */
 
+#define MAX_CLK_NAME_LENGTH 15
 
-#define MAX_CLKS (8)
-
-static struct s3c24xx_uart_clksrc tmp_clksrc = {
-        .name           = "pclk",
-        .min_baud       = 0,
-        .max_baud       = 0,
-        .divisor        = 1,
-};
-
-static inline int
-s3c24xx_serial_getsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
+static inline int s3c24xx_serial_getsource(struct uart_port *port)
 {
         struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned int ucon;
 
-        return (info->get_clksrc)(port, c);
-}
-
-static inline int
-s3c24xx_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *c)
-{
-        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        if (info->num_clks == 1)
+                return 0;
 
-        return (info->set_clksrc)(port, c);
+        ucon = rd_regl(port, S3C2410_UCON);
+        ucon &= info->clksel_mask;
+        return ucon >> info->clksel_shift;
 }
 
-struct baud_calc {
-        struct s3c24xx_uart_clksrc      *clksrc;
-        unsigned int                     calc;
-        unsigned int                     divslot;
-        unsigned int                     quot;
-        struct clk                      *src;
-};
-
-static int s3c24xx_serial_calcbaud(struct baud_calc *calc,
-                                   struct uart_port *port,
-                                   struct s3c24xx_uart_clksrc *clksrc,
-                                   unsigned int baud)
+static void s3c24xx_serial_setsource(struct uart_port *port,
+                        unsigned int clk_sel)
 {
-        struct s3c24xx_uart_port *ourport = to_ourport(port);
-        unsigned long rate;
-
-        calc->src = clk_get(port->dev, clksrc->name);
-        if (calc->src == NULL || IS_ERR(calc->src))
-                return 0;
-
-        rate = clk_get_rate(calc->src);
-        rate /= clksrc->divisor;
+        struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned int ucon;
 
-        calc->clksrc = clksrc;
+        if (info->num_clks == 1)
+                return;
 
-        if (ourport->info->has_divslot) {
-                unsigned long div = rate / baud;
-
-                /* The UDIVSLOT register on the newer UARTs allows us to
-                 * get a divisor adjustment of 1/16th on the baud clock.
-                 *
-                 * We don't keep the UDIVSLOT value (the 16ths we calculated
-                 * by not multiplying the baud by 16) as it is easy enough
-                 * to recalculate.
-                 */
-
-                calc->quot = div / 16;
-                calc->calc = rate / div;
-        } else {
-                calc->quot = (rate + (8 * baud)) / (16 * baud);
-                calc->calc = (rate / (calc->quot * 16));
-        }
+        ucon = rd_regl(port, S3C2410_UCON);
+        if ((ucon & info->clksel_mask) >> info->clksel_shift == clk_sel)
+                return;
 
-        calc->quot--;
-        return 1;
+        ucon &= ~info->clksel_mask;
+        ucon |= clk_sel << info->clksel_shift;
+        wr_regl(port, S3C2410_UCON, ucon);
 }
 
-static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
-                                          struct s3c24xx_uart_clksrc **clksrc,
-                                          struct clk **clk,
-                                          unsigned int baud)
+static unsigned int s3c24xx_serial_getclk(struct s3c24xx_uart_port *ourport,
+                        unsigned int req_baud, struct clk **best_clk,
+                        unsigned int *clk_num)
 {
-        struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
-        struct s3c24xx_uart_clksrc *clkp;
-        struct baud_calc res[MAX_CLKS];
-        struct baud_calc *resptr, *best, *sptr;
-        int i;
-
-        clkp = cfg->clocks;
-        best = NULL;
-
-        if (cfg->clocks_size < 2) {
-                if (cfg->clocks_size == 0)
-                        clkp = &tmp_clksrc;
-
-                /* check to see if we're sourcing fclk, and if so we're
-                 * going to have to update the clock source
-                 */
-
-                if (strcmp(clkp->name, "fclk") == 0) {
-                        struct s3c24xx_uart_clksrc src;
-
-                        s3c24xx_serial_getsource(port, &src);
-
-                        /* check that the port already using fclk, and if
-                         * not, then re-select fclk
+        struct s3c24xx_uart_info *info = ourport->info;
+        struct clk *clk;
+        unsigned long rate;
+        unsigned int cnt, baud, quot, clk_sel, best_quot = 0;
+        char clkname[MAX_CLK_NAME_LENGTH];
+        int calc_deviation, deviation = (1 << 30) - 1;
+
+        *best_clk = NULL;
+        clk_sel = (ourport->cfg->clk_sel) ? ourport->cfg->clk_sel :
+                        ourport->info->def_clk_sel;
+        for (cnt = 0; cnt < info->num_clks; cnt++) {
+                if (!(clk_sel & (1 << cnt)))
+                        continue;
+
+                sprintf(clkname, "clk_uart_baud%d", cnt);
+                clk = clk_get(ourport->port.dev, clkname);
+                if (IS_ERR_OR_NULL(clk))
+                        continue;
+
+                rate = clk_get_rate(clk);
+                if (!rate)
+                        continue;
+
+                if (ourport->info->has_divslot) {
+                        unsigned long div = rate / req_baud;
+
+                        /* The UDIVSLOT register on the newer UARTs allows us to
+                         * get a divisor adjustment of 1/16th on the baud clock.
+                         *
+                         * We don't keep the UDIVSLOT value (the 16ths we
+                         * calculated by not multiplying the baud by 16) as it
+                         * is easy enough to recalculate.
                          */
 
-                        if (strcmp(src.name, clkp->name) == 0) {
-                                s3c24xx_serial_setsource(port, clkp);
-                                s3c24xx_serial_getsource(port, &src);
-                        }
-
-                        clkp->divisor = src.divisor;
-                }
-
-                s3c24xx_serial_calcbaud(res, port, clkp, baud);
-                best = res;
-                resptr = best + 1;
-        } else {
-                resptr = res;
-
-                for (i = 0; i < cfg->clocks_size; i++, clkp++) {
-                        if (s3c24xx_serial_calcbaud(resptr, port, clkp, baud))
-                                resptr++;
+                        quot = div / 16;
+                        baud = rate / div;
+                } else {
+                        quot = (rate + (8 * req_baud)) / (16 * req_baud);
+                        baud = rate / (quot * 16);
                 }
-        }
-
-        /* ok, we now need to select the best clock we found */
-
-        if (!best) {
-                unsigned int deviation = (1<<30)|((1<<30)-1);
-                int calc_deviation;
+                quot--;
 
-                for (sptr = res; sptr < resptr; sptr++) {
-                        calc_deviation = baud - sptr->calc;
-                        if (calc_deviation < 0)
-                                calc_deviation = -calc_deviation;
+                calc_deviation = req_baud - baud;
+                if (calc_deviation < 0)
+                        calc_deviation = -calc_deviation;
 
-                        if (calc_deviation < deviation) {
-                                best = sptr;
-                                deviation = calc_deviation;
-                        }
+                if (calc_deviation < deviation) {
+                        *best_clk = clk;
+                        best_quot = quot;
+                        *clk_num = cnt;
+                        deviation = calc_deviation;
                 }
         }
 
-        /* store results to pass back */
-
-        *clksrc = best->clksrc;
-        *clk    = best->src;
-
-        return best->quot;
+        return best_quot;
 }
 
 /* udivslot_table[]
@@ -735,10 +684,9 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
 {
         struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
-        struct s3c24xx_uart_clksrc *clksrc = NULL;
         struct clk *clk = NULL;
         unsigned long flags;
-        unsigned int baud, quot;
+        unsigned int baud, quot, clk_sel = 0;
         unsigned int ulcon;
         unsigned int umcon;
         unsigned int udivslot = 0;
@@ -754,17 +702,16 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
          */
 
         baud = uart_get_baud_rate(port, termios, old, 0, 115200*8);
-
+        quot = s3c24xx_serial_getclk(ourport, baud, &clk, &clk_sel);
         if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
                 quot = port->custom_divisor;
-        else
-                quot = s3c24xx_serial_getclk(port, &clksrc, &clk, baud);
+        if (!clk)
+                return;
 
         /* check to see if we need  to change clock source */
 
-        if (ourport->clksrc != clksrc || ourport->baudclk != clk) {
-                dbg("selecting clock %p\n", clk);
-                s3c24xx_serial_setsource(port, clksrc);
+        if (ourport->baudclk != clk) {
+                s3c24xx_serial_setsource(port, clk_sel);
 
                 if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
                         clk_disable(ourport->baudclk);
@@ -773,7 +720,6 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
 
                 clk_enable(clk);
 
-                ourport->clksrc = clksrc;
                 ourport->baudclk = clk;
                 ourport->baudclk_rate = clk ? clk_get_rate(clk) : 0;
         }
@@ -1020,16 +966,29 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS
 
 /* s3c24xx_serial_resetport
  *
- * wrapper to call the specific reset for this port (reset the fifos
- * and the settings)
+ * reset the fifos and other the settings.
 */
 
-static inline int s3c24xx_serial_resetport(struct uart_port *port,
-                                           struct s3c2410_uartcfg *cfg)
+static void s3c24xx_serial_resetport(struct uart_port *port,
+                                   struct s3c2410_uartcfg *cfg)
 {
         struct s3c24xx_uart_info *info = s3c24xx_port_to_info(port);
+        unsigned long ucon = rd_regl(port, S3C2410_UCON);
+        unsigned int ucon_mask;
+
+        ucon_mask = info->clksel_mask;
+        if (info->type == PORT_S3C2440)
+                ucon_mask |= S3C2440_UCON0_DIVMASK;
 
-        return (info->reset_port)(port, cfg);
+        ucon &= ucon_mask;
+        wr_regl(port, S3C2410_UCON,  ucon | cfg->ucon);
+
+        /* reset both fifos */
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);
+        wr_regl(port, S3C2410_UFCON, cfg->ufcon);
+
+        /* some delay is required after fifo reset */
+        udelay(1);
 }
 
 
@@ -1121,11 +1080,10 @@ static inline void s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart_port *p
  */
 
 static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
-                                    struct s3c24xx_uart_info *info,
                                     struct platform_device *platdev)
 {
         struct uart_port *port = &ourport->port;
-        struct s3c2410_uartcfg *cfg;
+        struct s3c2410_uartcfg *cfg = ourport->cfg;
         struct resource *res;
         int ret;
 
@@ -1134,30 +1092,16 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
         if (platdev == NULL)
                 return -ENODEV;
 
-        cfg = s3c24xx_dev_to_cfg(&platdev->dev);
-
         if (port->mapbase != 0)
                 return 0;
 
-        if (cfg->hwport > CONFIG_SERIAL_SAMSUNG_UARTS) {
-                printk(KERN_ERR "%s: port %d bigger than %d\n", __func__,
-                       cfg->hwport, CONFIG_SERIAL_SAMSUNG_UARTS);
-                return -ERANGE;
-        }
-
         /* setup info for port */
         port->dev       = &platdev->dev;
-        ourport->info   = info;
 
         /* Startup sequence is different for s3c64xx and higher SoC's */
         if (s3c24xx_serial_has_interrupt_mask(port))
                 s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
 
-        /* copy the info in from provided structure */
-        ourport->port.fifosize = info->fifosize;
-
-        dbg("s3c24xx_serial_init_port: %p (hw %d)...\n", port, cfg->hwport);
-
         port->uartclk = 1;
 
         if (cfg->uart_flags & UPF_CONS_FLOW) {
@@ -1215,43 +1159,74 @@ static ssize_t s3c24xx_serial_show_clksrc(struct device *dev,
         struct uart_port *port = s3c24xx_dev_to_port(dev);
         struct s3c24xx_uart_port *ourport = to_ourport(port);
 
-        return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->clksrc->name);
+        return snprintf(buf, PAGE_SIZE, "* %s\n", ourport->baudclk->name);
 }
 
 static DEVICE_ATTR(clock_source, S_IRUGO, s3c24xx_serial_show_clksrc, NULL);
 
+
 /* Device driver serial port probe */
 
+static const struct of_device_id s3c24xx_uart_dt_match[];
 static int probe_index;
 
-int s3c24xx_serial_probe(struct platform_device *dev,
-                         struct s3c24xx_uart_info *info)
+static inline struct s3c24xx_serial_drv_data *s3c24xx_get_driver_data(
+                        struct platform_device *pdev)
+{
+#ifdef CONFIG_OF
+        if (pdev->dev.of_node) {
+                const struct of_device_id *match;
+                match = of_match_node(s3c24xx_uart_dt_match, pdev->dev.of_node);
+                return (struct s3c24xx_serial_drv_data *)match->data;
+        }
+#endif
+        return (struct s3c24xx_serial_drv_data *)
+                        platform_get_device_id(pdev)->driver_data;
+}
+
+static int s3c24xx_serial_probe(struct platform_device *pdev)
 {
         struct s3c24xx_uart_port *ourport;
         int ret;
 
-        dbg("s3c24xx_serial_probe(%p, %p) %d\n", dev, info, probe_index);
+        dbg("s3c24xx_serial_probe(%p) %d\n", pdev, probe_index);
 
         ourport = &s3c24xx_serial_ports[probe_index];
+
+        ourport->drv_data = s3c24xx_get_driver_data(pdev);
+        if (!ourport->drv_data) {
+                dev_err(&pdev->dev, "could not find driver data\n");
+                return -ENODEV;
+        }
+
+        ourport->info = ourport->drv_data->info;
+        ourport->cfg = (pdev->dev.platform_data) ?
+                        (struct s3c2410_uartcfg *)pdev->dev.platform_data :
+                        ourport->drv_data->def_cfg;
+
+        ourport->port.fifosize = (ourport->info->fifosize) ?
+                ourport->info->fifosize :
+                ourport->drv_data->fifosize[probe_index];
+
         probe_index++;
 
         dbg("%s: initialising port %p...\n", __func__, ourport);
 
-        ret = s3c24xx_serial_init_port(ourport, info, dev);
+        ret = s3c24xx_serial_init_port(ourport, pdev);
         if (ret < 0)
                 goto probe_err;
 
         dbg("%s: adding port\n", __func__);
         uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
-        platform_set_drvdata(dev, &ourport->port);
+        platform_set_drvdata(pdev, &ourport->port);
 
-        ret = device_create_file(&dev->dev, &dev_attr_clock_source);
+        ret = device_create_file(&pdev->dev, &dev_attr_clock_source);
         if (ret < 0)
-                printk(KERN_ERR "%s: failed to add clksrc attr.\n", __func__);
+                dev_err(&pdev->dev, "failed to add clock source attr.\n");
 
         ret = s3c24xx_serial_cpufreq_register(ourport);
         if (ret < 0)
-                dev_err(&dev->dev, "failed to add cpufreq notifier\n");
+                dev_err(&pdev->dev, "failed to add cpufreq notifier\n");
 
         return 0;
 
@@ -1259,9 +1234,7 @@ int s3c24xx_serial_probe(struct platform_device *dev,
         return ret;
 }
 
-EXPORT_SYMBOL_GPL(s3c24xx_serial_probe);
-
-int __devexit s3c24xx_serial_remove(struct platform_device *dev)
+static int __devexit s3c24xx_serial_remove(struct platform_device *dev)
 {
         struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
 
@@ -1274,8 +1247,6 @@ int __devexit s3c24xx_serial_remove(struct platform_device *dev)
         return 0;
 }
 
-EXPORT_SYMBOL_GPL(s3c24xx_serial_remove);
-
 /* UART power management code */
 #ifdef CONFIG_PM_SLEEP
 static int s3c24xx_serial_suspend(struct device *dev)
@@ -1315,41 +1286,6 @@ static const struct dev_pm_ops s3c24xx_serial_pm_ops = {
 #define SERIAL_SAMSUNG_PM_OPS   NULL
 #endif /* CONFIG_PM_SLEEP */
 
-int s3c24xx_serial_init(struct platform_driver *drv,
-                        struct s3c24xx_uart_info *info)
-{
-        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-
-        drv->driver.pm = SERIAL_SAMSUNG_PM_OPS;
-
-        return platform_driver_register(drv);
-}
-
-EXPORT_SYMBOL_GPL(s3c24xx_serial_init);
-
-/* module initialisation code */
-
-static int __init s3c24xx_serial_modinit(void)
-{
-        int ret;
-
-        ret = uart_register_driver(&s3c24xx_uart_drv);
-        if (ret < 0) {
-                printk(KERN_ERR "failed to register UART driver\n");
-                return -1;
-        }
-
-        return 0;
-}
-
-static void __exit s3c24xx_serial_modexit(void)
-{
-        uart_unregister_driver(&s3c24xx_uart_drv);
-}
-
-module_init(s3c24xx_serial_modinit);
-module_exit(s3c24xx_serial_modexit);
-
 /* Console code */
 
 #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
@@ -1395,12 +1331,13 @@ static void __init
 s3c24xx_serial_get_options(struct uart_port *port, int *baud,
                            int *parity, int *bits)
 {
-        struct s3c24xx_uart_clksrc clksrc;
         struct clk *clk;
         unsigned int ulcon;
         unsigned int ucon;
         unsigned int ubrdiv;
         unsigned long rate;
+        unsigned int clk_sel;
+        char clk_name[MAX_CLK_NAME_LENGTH];
 
         ulcon  = rd_regl(port, S3C2410_ULCON);
         ucon   = rd_regl(port, S3C2410_UCON);
@@ -1445,44 +1382,21 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud,
 
                 /* now calculate the baud rate */
 
-                s3c24xx_serial_getsource(port, &clksrc);
+                clk_sel = s3c24xx_serial_getsource(port);
+                sprintf(clk_name, "clk_uart_baud%d", clk_sel);
 
-                clk = clk_get(port->dev, clksrc.name);
+                clk = clk_get(port->dev, clk_name);
                 if (!IS_ERR(clk) && clk != NULL)
-                        rate = clk_get_rate(clk) / clksrc.divisor;
+                        rate = clk_get_rate(clk);
                 else
                         rate = 1;
 
-
                 *baud = rate / (16 * (ubrdiv + 1));
                 dbg("calculated baud %d\n", *baud);
         }
 
 }
 
-/* s3c24xx_serial_init_ports
- *
- * initialise the serial ports from the machine provided initialisation
- * data.
-*/
-
-static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info **info)
-{
-        struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
-        struct platform_device **platdev_ptr;
-        int i;
-
-        dbg("s3c24xx_serial_init_ports: initialising ports...\n");
-
-        platdev_ptr = s3c24xx_uart_devs;
-
-        for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++, ptr++, platdev_ptr++) {
-                s3c24xx_serial_init_port(ptr, info[i], *platdev_ptr);
-        }
-
-        return 0;
-}
-
 static int __init
 s3c24xx_serial_console_setup(struct console *co, char *options)
 {
@@ -1526,11 +1440,6 @@ s3c24xx_serial_console_setup(struct console *co, char *options)
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
-/* s3c24xx_serial_initconsole
- *
- * initialise the console from one of the uart drivers
-*/
-
 static struct console s3c24xx_serial_console = {
         .name           = S3C24XX_SERIAL_NAME,
         .device         = uart_console_device,
@@ -1540,34 +1449,250 @@ static struct console s3c24xx_serial_console = {
         .setup          = s3c24xx_serial_console_setup,
         .data           = &s3c24xx_uart_drv,
 };
+#endif /* CONFIG_SERIAL_SAMSUNG_CONSOLE */
 
-int s3c24xx_serial_initconsole(struct platform_driver *drv,
-                               struct s3c24xx_uart_info **info)
+#ifdef CONFIG_CPU_S3C2410
+static struct s3c24xx_serial_drv_data s3c2410_serial_drv_data = {
+        .info = &(struct s3c24xx_uart_info) {
+                .name           = "Samsung S3C2410 UART",
+                .type           = PORT_S3C2410,
+                .fifosize       = 16,
+                .rx_fifomask    = S3C2410_UFSTAT_RXMASK,
+                .rx_fifoshift   = S3C2410_UFSTAT_RXSHIFT,
+                .rx_fifofull    = S3C2410_UFSTAT_RXFULL,
+                .tx_fifofull    = S3C2410_UFSTAT_TXFULL,
+                .tx_fifomask    = S3C2410_UFSTAT_TXMASK,
+                .tx_fifoshift   = S3C2410_UFSTAT_TXSHIFT,
+                .def_clk_sel    = S3C2410_UCON_CLKSEL0,
+                .num_clks       = 2,
+                .clksel_mask    = S3C2410_UCON_CLKMASK,
+                .clksel_shift   = S3C2410_UCON_CLKSHIFT,
+        },
+        .def_cfg = &(struct s3c2410_uartcfg) {
+                .ucon           = S3C2410_UCON_DEFAULT,
+                .ufcon          = S3C2410_UFCON_DEFAULT,
+        },
+};
+#define S3C2410_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2410_serial_drv_data)
+#else
+#define S3C2410_SERIAL_DRV_DATA (kernel_ulong_t)NULL
+#endif
 
-{
-        struct platform_device *dev = s3c24xx_uart_devs[0];
+#ifdef CONFIG_CPU_S3C2412
+static struct s3c24xx_serial_drv_data s3c2412_serial_drv_data = {
+        .info = &(struct s3c24xx_uart_info) {
+                .name           = "Samsung S3C2412 UART",
+                .type           = PORT_S3C2412,
+                .fifosize       = 64,
+                .has_divslot    = 1,
+                .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
+                .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
+                .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
+                .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
+                .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
+                .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
+                .def_clk_sel    = S3C2410_UCON_CLKSEL2,
+                .num_clks       = 4,
+                .clksel_mask    = S3C2412_UCON_CLKMASK,
+                .clksel_shift   = S3C2412_UCON_CLKSHIFT,
+        },
+        .def_cfg = &(struct s3c2410_uartcfg) {
+                .ucon           = S3C2410_UCON_DEFAULT,
+                .ufcon          = S3C2410_UFCON_DEFAULT,
+        },
+};
+#define S3C2412_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2412_serial_drv_data)
+#else
+#define S3C2412_SERIAL_DRV_DATA (kernel_ulong_t)NULL
+#endif
 
-        dbg("s3c24xx_serial_initconsole\n");
+#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2416) || \
+        defined(CONFIG_CPU_S3C2443)
+static struct s3c24xx_serial_drv_data s3c2440_serial_drv_data = {
+        .info = &(struct s3c24xx_uart_info) {
+                .name           = "Samsung S3C2440 UART",
+                .type           = PORT_S3C2440,
+                .fifosize       = 64,
+                .has_divslot    = 1,
+                .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
+                .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
+                .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
+                .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
+                .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
+                .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
+                .def_clk_sel    = S3C2410_UCON_CLKSEL2,
+                .num_clks       = 4,
+                .clksel_mask    = S3C2412_UCON_CLKMASK,
+                .clksel_shift   = S3C2412_UCON_CLKSHIFT,
+        },
+        .def_cfg = &(struct s3c2410_uartcfg) {
+                .ucon           = S3C2410_UCON_DEFAULT,
+                .ufcon          = S3C2410_UFCON_DEFAULT,
+        },
+};
+#define S3C2440_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c2440_serial_drv_data)
+#else
+#define S3C2440_SERIAL_DRV_DATA (kernel_ulong_t)NULL
+#endif
 
-        /* select driver based on the cpu */
+#if defined(CONFIG_CPU_S3C6400) || defined(CONFIG_CPU_S3C6410) || \
+        defined(CONFIG_CPU_S5P6440) || defined(CONFIG_CPU_S5P6450) || \
+        defined(CONFIG_CPU_S5PC100)
+static struct s3c24xx_serial_drv_data s3c6400_serial_drv_data = {
+        .info = &(struct s3c24xx_uart_info) {
+                .name           = "Samsung S3C6400 UART",
+                .type           = PORT_S3C6400,
+                .fifosize       = 64,
+                .has_divslot    = 1,
+                .rx_fifomask    = S3C2440_UFSTAT_RXMASK,
+                .rx_fifoshift   = S3C2440_UFSTAT_RXSHIFT,
+                .rx_fifofull    = S3C2440_UFSTAT_RXFULL,
+                .tx_fifofull    = S3C2440_UFSTAT_TXFULL,
+                .tx_fifomask    = S3C2440_UFSTAT_TXMASK,
+                .tx_fifoshift   = S3C2440_UFSTAT_TXSHIFT,
+                .def_clk_sel    = S3C2410_UCON_CLKSEL2,
+                .num_clks       = 4,
+                .clksel_mask    = S3C6400_UCON_CLKMASK,
+                .clksel_shift   = S3C6400_UCON_CLKSHIFT,
+        },
+        .def_cfg = &(struct s3c2410_uartcfg) {
+                .ucon           = S3C2410_UCON_DEFAULT,
+                .ufcon          = S3C2410_UFCON_DEFAULT,
+        },
+};
+#define S3C6400_SERIAL_DRV_DATA ((kernel_ulong_t)&s3c6400_serial_drv_data)
+#else
+#define S3C6400_SERIAL_DRV_DATA (kernel_ulong_t)NULL
+#endif
 
-        if (dev == NULL) {
-                printk(KERN_ERR "s3c24xx: no devices for console init\n");
-                return 0;
-        }
+#ifdef CONFIG_CPU_S5PV210
+static struct s3c24xx_serial_drv_data s5pv210_serial_drv_data = {
+        .info = &(struct s3c24xx_uart_info) {
+                .name           = "Samsung S5PV210 UART",
+                .type           = PORT_S3C6400,
+                .has_divslot    = 1,
+                .rx_fifomask    = S5PV210_UFSTAT_RXMASK,
+                .rx_fifoshift   = S5PV210_UFSTAT_RXSHIFT,
+                .rx_fifofull    = S5PV210_UFSTAT_RXFULL,
+                .tx_fifofull    = S5PV210_UFSTAT_TXFULL,
+                .tx_fifomask    = S5PV210_UFSTAT_TXMASK,
+                .tx_fifoshift   = S5PV210_UFSTAT_TXSHIFT,
+                .def_clk_sel    = S3C2410_UCON_CLKSEL0,
+                .num_clks       = 2,
+                .clksel_mask    = S5PV210_UCON_CLKMASK,
+                .clksel_shift   = S5PV210_UCON_CLKSHIFT,
+        },
+        .def_cfg = &(struct s3c2410_uartcfg) {
+                .ucon           = S5PV210_UCON_DEFAULT,
+                .ufcon          = S5PV210_UFCON_DEFAULT,
+        },
+        .fifosize = { 256, 64, 16, 16 },
+};
+#define S5PV210_SERIAL_DRV_DATA ((kernel_ulong_t)&s5pv210_serial_drv_data)
+#else
+#define S5PV210_SERIAL_DRV_DATA (kernel_ulong_t)NULL
+#endif
 
-        if (strcmp(dev->name, drv->driver.name) != 0)
-                return 0;
+#ifdef CONFIG_CPU_EXYNOS4210
+static struct s3c24xx_serial_drv_data exynos4210_serial_drv_data = {
+        .info = &(struct s3c24xx_uart_info) {
+                .name           = "Samsung Exynos4 UART",
+                .type           = PORT_S3C6400,
+                .has_divslot    = 1,
+                .rx_fifomask    = S5PV210_UFSTAT_RXMASK,
+                .rx_fifoshift   = S5PV210_UFSTAT_RXSHIFT,
+                .rx_fifofull    = S5PV210_UFSTAT_RXFULL,
+                .tx_fifofull    = S5PV210_UFSTAT_TXFULL,
+                .tx_fifomask    = S5PV210_UFSTAT_TXMASK,
+                .tx_fifoshift   = S5PV210_UFSTAT_TXSHIFT,
+                .def_clk_sel    = S3C2410_UCON_CLKSEL0,
+                .num_clks       = 1,
+                .clksel_mask    = 0,
+                .clksel_shift   = 0,
+        },
+        .def_cfg = &(struct s3c2410_uartcfg) {
+                .ucon           = S5PV210_UCON_DEFAULT,
+                .ufcon          = S5PV210_UFCON_DEFAULT,
+                .has_fracval    = 1,
+        },
+        .fifosize = { 256, 64, 16, 16 },
+};
+#define EXYNOS4210_SERIAL_DRV_DATA ((kernel_ulong_t)&exynos4210_serial_drv_data)
+#else
+#define EXYNOS4210_SERIAL_DRV_DATA (kernel_ulong_t)NULL
+#endif
 
-        s3c24xx_serial_console.data = &s3c24xx_uart_drv;
-        s3c24xx_serial_init_ports(info);
+static struct platform_device_id s3c24xx_serial_driver_ids[] = {
+        {
+                .name           = "s3c2410-uart",
+                .driver_data    = S3C2410_SERIAL_DRV_DATA,
+        }, {
+                .name           = "s3c2412-uart",
+                .driver_data    = S3C2412_SERIAL_DRV_DATA,
+        }, {
+                .name           = "s3c2440-uart",
+                .driver_data    = S3C2440_SERIAL_DRV_DATA,
+        }, {
+                .name           = "s3c6400-uart",
+                .driver_data    = S3C6400_SERIAL_DRV_DATA,
+        }, {
+                .name           = "s5pv210-uart",
+                .driver_data    = S5PV210_SERIAL_DRV_DATA,
+        }, {
+                .name           = "exynos4210-uart",
+                .driver_data    = EXYNOS4210_SERIAL_DRV_DATA,
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(platform, s3c24xx_serial_driver_ids);
 
-        register_console(&s3c24xx_serial_console);
-        return 0;
+#ifdef CONFIG_OF
+static const struct of_device_id s3c24xx_uart_dt_match[] = {
+        { .compatible = "samsung,exynos4210-uart",
+                .data = (void *)EXYNOS4210_SERIAL_DRV_DATA },
+        {},
+};
+MODULE_DEVICE_TABLE(of, s3c24xx_uart_dt_match);
+#else
+#define s3c24xx_uart_dt_match NULL
+#endif
+
+static struct platform_driver samsung_serial_driver = {
+        .probe          = s3c24xx_serial_probe,
+        .remove         = __devexit_p(s3c24xx_serial_remove),
+        .id_table       = s3c24xx_serial_driver_ids,
+        .driver         = {
+                .name   = "samsung-uart",
+                .owner  = THIS_MODULE,
+                .pm     = SERIAL_SAMSUNG_PM_OPS,
+                .of_match_table = s3c24xx_uart_dt_match,
+        },
+};
+
+/* module initialisation code */
+
+static int __init s3c24xx_serial_modinit(void)
+{
+        int ret;
+
+        ret = uart_register_driver(&s3c24xx_uart_drv);
+        if (ret < 0) {
+                printk(KERN_ERR "failed to register UART driver\n");
+                return -1;
+        }
+
+        return platform_driver_register(&samsung_serial_driver);
 }
 
-#endif /* CONFIG_SERIAL_SAMSUNG_CONSOLE */
+static void __exit s3c24xx_serial_modexit(void)
+{
+        uart_unregister_driver(&s3c24xx_uart_drv);
+}
+
+module_init(s3c24xx_serial_modinit);
+module_exit(s3c24xx_serial_modexit);
 
+MODULE_ALIAS("platform:samsung-uart");
 MODULE_DESCRIPTION("Samsung SoC Serial port driver");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/samsung.h b/drivers/tty/serial/samsung.h
index 8e87b788e5c6..1a4bca3e4179 100644
--- a/drivers/tty/serial/samsung.h
+++ b/drivers/tty/serial/samsung.h
@@ -19,20 +19,25 @@ struct s3c24xx_uart_info {
         unsigned long           tx_fifomask;
         unsigned long           tx_fifoshift;
         unsigned long           tx_fifofull;
+        unsigned int            def_clk_sel;
+        unsigned long           num_clks;
+        unsigned long           clksel_mask;
+        unsigned long           clksel_shift;
 
         /* uart port features */
 
         unsigned int            has_divslot:1;
 
-        /* clock source control */
-
-        int (*get_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
-        int (*set_clksrc)(struct uart_port *, struct s3c24xx_uart_clksrc *clk);
-
         /* uart controls */
         int (*reset_port)(struct uart_port *, struct s3c2410_uartcfg *);
 };
 
+struct s3c24xx_serial_drv_data {
+        struct s3c24xx_uart_info        *info;
+        struct s3c2410_uartcfg          *def_cfg;
+        unsigned int                    fifosize[CONFIG_SERIAL_SAMSUNG_UARTS];
+};
+
 struct s3c24xx_uart_port {
         unsigned char                   rx_claimed;
         unsigned char                   tx_claimed;
@@ -43,10 +48,13 @@ struct s3c24xx_uart_port {
         unsigned int                    tx_irq;
 
         struct s3c24xx_uart_info        *info;
-        struct s3c24xx_uart_clksrc      *clksrc;
         struct clk                      *clk;
         struct clk                      *baudclk;
         struct uart_port                port;
+        struct s3c24xx_serial_drv_data  *drv_data;
+
+        /* reference to platform data */
+        struct s3c2410_uartcfg          *cfg;
 
 #ifdef CONFIG_CPU_FREQ
         struct notifier_block           freq_transition;
@@ -56,7 +64,6 @@ struct s3c24xx_uart_port {
 /* conversion functions */
 
 #define s3c24xx_dev_to_port(__dev) (struct uart_port *)dev_get_drvdata(__dev)
-#define s3c24xx_dev_to_cfg(__dev) (struct s3c2410_uartcfg *)((__dev)->platform_data)
 
 /* register access controls */
 
@@ -69,17 +76,6 @@ struct s3c24xx_uart_port {
 #define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg))
 #define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg))
 
-extern int s3c24xx_serial_probe(struct platform_device *dev,
-                                struct s3c24xx_uart_info *uart);
-
-extern int __devexit s3c24xx_serial_remove(struct platform_device *dev);
-
-extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
-                                      struct s3c24xx_uart_info **uart);
-
-extern int s3c24xx_serial_init(struct platform_driver *drv,
-                               struct s3c24xx_uart_info *info);
-
 #ifdef CONFIG_SERIAL_SAMSUNG_DEBUG
 
 extern void printascii(const char *);
diff --git a/drivers/tty/serial/sc26xx.c b/drivers/tty/serial/sc26xx.c
index 75038ad2b242..e0b4b0a30a5a 100644
--- a/drivers/tty/serial/sc26xx.c
+++ b/drivers/tty/serial/sc26xx.c
@@ -736,19 +736,7 @@ static struct platform_driver sc26xx_driver = {
         },
 };
 
-static int __init sc26xx_init(void)
-{
-        return platform_driver_register(&sc26xx_driver);
-}
-
-static void __exit sc26xx_exit(void)
-{
-        platform_driver_unregister(&sc26xx_driver);
-}
-
-module_init(sc26xx_init);
-module_exit(sc26xx_exit);
-
+module_platform_driver(sc26xx_driver);
 
 MODULE_AUTHOR("Thomas Bogendörfer");
 MODULE_DESCRIPTION("SC681/SC2692 serial driver");
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 0406d7ff505e..c7bf31a6a7e7 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -22,6 +22,7 @@
  */
 #include <linux/module.h>
 #include <linux/tty.h>
+#include <linux/tty_flip.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/console.h>
@@ -60,6 +61,8 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
 static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
 static void uart_change_pm(struct uart_state *state, int pm_state);
 
+static void uart_port_shutdown(struct tty_port *port);
+
 /*
  * This routine is used by the interrupt handler to schedule processing in
  * the software interrupt portion of the driver.
@@ -128,25 +131,16 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
  * Startup the port.  This will be called once per open.  All calls
  * will be serialised by the per-port mutex.
  */
-static int uart_startup(struct tty_struct *tty, struct uart_state *state, int init_hw)
+static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
+                int init_hw)
 {
         struct uart_port *uport = state->uart_port;
         struct tty_port *port = &state->port;
         unsigned long page;
         int retval = 0;
 
-        if (port->flags & ASYNC_INITIALIZED)
-                return 0;
-
-        /*
-         * Set the TTY IO error marker - we will only clear this
-         * once we have successfully opened the port.  Also set
-         * up the tty->alt_speed kludge
-         */
-        set_bit(TTY_IO_ERROR, &tty->flags);
-
         if (uport->type == PORT_UNKNOWN)
-                return 0;
+                return 1;
 
         /*
          * Initialise and allocate the transmit and temporary
@@ -188,10 +182,6 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in
                                 tty->hw_stopped = 1;
                         spin_unlock_irq(&uport->lock);
                 }
-
-                set_bit(ASYNCB_INITIALIZED, &port->flags);
-
-                clear_bit(TTY_IO_ERROR, &tty->flags);
         }
 
         /*
@@ -200,6 +190,31 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in
          * now.
          */
         if (retval && capable(CAP_SYS_ADMIN))
+                return 1;
+
+        return retval;
+}
+
+static int uart_startup(struct tty_struct *tty, struct uart_state *state,
+                int init_hw)
+{
+        struct tty_port *port = &state->port;
+        int retval;
+
+        if (port->flags & ASYNC_INITIALIZED)
+                return 0;
+
+        /*
+         * Set the TTY IO error marker - we will only clear this
+         * once we have successfully opened the port.
+         */
+        set_bit(TTY_IO_ERROR, &tty->flags);
+
+        retval = uart_port_startup(tty, state, init_hw);
+        if (!retval) {
+                set_bit(ASYNCB_INITIALIZED, &port->flags);
+                clear_bit(TTY_IO_ERROR, &tty->flags);
+        } else if (retval > 0)
                 retval = 0;
 
         return retval;
@@ -228,24 +243,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
                 if (!tty || (tty->termios->c_cflag & HUPCL))
                         uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
 
-                /*
-                 * clear delta_msr_wait queue to avoid mem leaks: we may free
-                 * the irq here so the queue might never be woken up.  Note
-                 * that we won't end up waiting on delta_msr_wait again since
-                 * any outstanding file descriptors should be pointing at
-                 * hung_up_tty_fops now.
-                 */
-                wake_up_interruptible(&port->delta_msr_wait);
-
-                /*
-                 * Free the IRQ and disable the port.
-                 */
-                uport->ops->shutdown(uport);
-
-                /*
-                 * Ensure that the IRQ handler isn't running on another CPU.
-                 */
-                synchronize_irq(uport->irq);
+                uart_port_shutdown(port);
         }
 
         /*
@@ -423,7 +421,7 @@ uart_get_divisor(struct uart_port *port, unsigned int baud)
         if (baud == 38400 && (port->flags & UPF_SPD_MASK) == UPF_SPD_CUST)
                 quot = port->custom_divisor;
         else
-                quot = (port->uartclk + (8 * baud)) / (16 * baud);
+                quot = DIV_ROUND_CLOSEST(port->uartclk, 16 * baud);
 
         return quot;
 }
@@ -658,10 +656,10 @@ static int uart_get_info(struct uart_state *state,
         tmp.flags           = uport->flags;
         tmp.xmit_fifo_size  = uport->fifosize;
         tmp.baud_base       = uport->uartclk / 16;
-        tmp.close_delay     = port->close_delay / 10;
+        tmp.close_delay     = jiffies_to_msecs(port->close_delay) / 10;
         tmp.closing_wait    = port->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
                                 ASYNC_CLOSING_WAIT_NONE :
-                                port->closing_wait / 10;
+                                jiffies_to_msecs(port->closing_wait) / 10;
         tmp.custom_divisor  = uport->custom_divisor;
         tmp.hub6            = uport->hub6;
         tmp.io_type         = uport->iotype;
@@ -695,9 +693,10 @@ static int uart_set_info(struct tty_struct *tty, struct uart_state *state,
                 new_port += (unsigned long) new_serial.port_high << HIGH_BITS_OFFSET;
 
         new_serial.irq = irq_canonicalize(new_serial.irq);
-        close_delay = new_serial.close_delay * 10;
+        close_delay = msecs_to_jiffies(new_serial.close_delay * 10);
         closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
-                        ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
+                        ASYNC_CLOSING_WAIT_NONE :
+                        msecs_to_jiffies(new_serial.closing_wait * 10);
 
         /*
          * This semaphore protects port->count.  It is also
@@ -1265,47 +1264,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
 
         pr_debug("uart_close(%d) called\n", uport->line);
 
-        spin_lock_irqsave(&port->lock, flags);
-
-        if (tty_hung_up_p(filp)) {
-                spin_unlock_irqrestore(&port->lock, flags);
+        if (tty_port_close_start(port, tty, filp) == 0)
                 return;
-        }
-
-        if ((tty->count == 1) && (port->count != 1)) {
-                /*
-                 * Uh, oh.  tty->count is 1, which means that the tty
-                 * structure will be freed.  port->count should always
-                 * be one in these conditions.  If it's greater than
-                 * one, we've got real problems, since it means the
-                 * serial port won't be shutdown.
-                 */
-                printk(KERN_ERR "uart_close: bad serial port count; tty->count is 1, "
-                       "port->count is %d\n", port->count);
-                port->count = 1;
-        }
-        if (--port->count < 0) {
-                printk(KERN_ERR "uart_close: bad serial port count for %s: %d\n",
-                       tty->name, port->count);
-                port->count = 0;
-        }
-        if (port->count) {
-                spin_unlock_irqrestore(&port->lock, flags);
-                return;
-        }
-
-        /*
-         * Now we wait for the transmit buffer to clear; and we notify
-         * the line discipline to only process XON/XOFF characters by
-         * setting tty->closing.
-         */
-        set_bit(ASYNCB_CLOSING, &port->flags);
-        tty->closing = 1;
-        spin_unlock_irqrestore(&port->lock, flags);
-
-        if (port->closing_wait != ASYNC_CLOSING_WAIT_NONE)
-                tty_wait_until_sent_from_close(tty,
-                                msecs_to_jiffies(port->closing_wait));
 
         /*
          * At this point, we stop accepting input.  To do this, we
@@ -1337,7 +1297,8 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
         if (port->blocked_open) {
                 spin_unlock_irqrestore(&port->lock, flags);
                 if (port->close_delay)
-                        msleep_interruptible(port->close_delay);
+                        msleep_interruptible(
+                                        jiffies_to_msecs(port->close_delay));
                 spin_lock_irqsave(&port->lock, flags);
         } else if (!uart_console(uport)) {
                 spin_unlock_irqrestore(&port->lock, flags);
@@ -1441,6 +1402,36 @@ static void uart_hangup(struct tty_struct *tty)
         mutex_unlock(&port->mutex);
 }
 
+static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)
+{
+        return 0;
+}
+
+static void uart_port_shutdown(struct tty_port *port)
+{
+        struct uart_state *state = container_of(port, struct uart_state, port);
+        struct uart_port *uport = state->uart_port;
+
+        /*
+         * clear delta_msr_wait queue to avoid mem leaks: we may free
+         * the irq here so the queue might never be woken up.  Note
+         * that we won't end up waiting on delta_msr_wait again since
+         * any outstanding file descriptors should be pointing at
+         * hung_up_tty_fops now.
+         */
+        wake_up_interruptible(&port->delta_msr_wait);
+
+        /*
+         * Free the IRQ and disable the port.
+         */
+        uport->ops->shutdown(uport);
+
+        /*
+         * Ensure that the IRQ handler isn't running on another CPU.
+         */
+        synchronize_irq(uport->irq);
+}
+
 static int uart_carrier_raised(struct tty_port *port)
 {
         struct uart_state *state = container_of(port, struct uart_state, port);
@@ -1466,33 +1457,6 @@ static void uart_dtr_rts(struct tty_port *port, int onoff)
                 uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
 }
 
-static struct uart_state *uart_get(struct uart_driver *drv, int line)
-{
-        struct uart_state *state;
-        struct tty_port *port;
-        int ret = 0;
-
-        state = drv->state + line;
-        port = &state->port;
-        if (mutex_lock_interruptible(&port->mutex)) {
-                ret = -ERESTARTSYS;
-                goto err;
-        }
-
-        port->count++;
-        if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
-                ret = -ENXIO;
-                goto err_unlock;
-        }
-        return state;
-
- err_unlock:
-        port->count--;
-        mutex_unlock(&port->mutex);
- err:
-        return ERR_PTR(ret);
-}
-
 /*
  * calls to uart_open are serialised by the BKL in
  *   fs/char_dev.c:chrdev_open()
@@ -1506,26 +1470,29 @@ static struct uart_state *uart_get(struct uart_driver *drv, int line)
 static int uart_open(struct tty_struct *tty, struct file *filp)
 {
         struct uart_driver *drv = (struct uart_driver *)tty->driver->driver_state;
-        struct uart_state *state;
-        struct tty_port *port;
         int retval, line = tty->index;
+        struct uart_state *state = drv->state + line;
+        struct tty_port *port = &state->port;
 
         pr_debug("uart_open(%d) called\n", line);
 
         /*
-         * We take the semaphore inside uart_get to guarantee that we won't
-         * be re-entered while allocating the state structure, or while we
-         * request any IRQs that the driver may need.  This also has the nice
-         * side-effect that it delays the action of uart_hangup, so we can
-         * guarantee that state->port.tty will always contain something
-         * reasonable.
+         * We take the semaphore here to guarantee that we won't be re-entered
+         * while allocating the state structure, or while we request any IRQs
+         * that the driver may need.  This also has the nice side-effect that
+         * it delays the action of uart_hangup, so we can guarantee that
+         * state->port.tty will always contain something reasonable.
          */
-        state = uart_get(drv, line);
-        if (IS_ERR(state)) {
-                retval = PTR_ERR(state);
-                goto fail;
+        if (mutex_lock_interruptible(&port->mutex)) {
+                retval = -ERESTARTSYS;
+                goto end;
+        }
+
+        port->count++;
+        if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
+                retval = -ENXIO;
+                goto err_dec_count;
         }
-        port = &state->port;
 
         /*
          * Once we set tty->driver_data here, we are guaranteed that
@@ -1535,7 +1502,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         tty->driver_data = state;
         state->uart_port->state = state;
         tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0;
-        tty->alt_speed = 0;
         tty_port_tty_set(port, tty);
 
         /*
@@ -1543,9 +1509,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
          */
         if (tty_hung_up_p(filp)) {
                 retval = -EAGAIN;
-                port->count--;
-                mutex_unlock(&port->mutex);
-                goto fail;
+                goto err_dec_count;
         }
 
         /*
@@ -1566,8 +1530,12 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
         if (retval == 0)
                 retval = tty_port_block_til_ready(port, tty, filp);
 
-fail:
+end:
         return retval;
+err_dec_count:
+        port->count--;
+        mutex_unlock(&port->mutex);
+        goto end;
 }
 
 static const char *uart_type(struct uart_port *port)
@@ -1858,6 +1826,14 @@ uart_set_options(struct uart_port *port, struct console *co,
 EXPORT_SYMBOL_GPL(uart_set_options);
 #endif /* CONFIG_SERIAL_CORE_CONSOLE */
 
+/**
+ * uart_change_pm - set power state of the port
+ *
+ * @state: port descriptor
+ * @pm_state: new state
+ *
+ * Locking: port->mutex has to be held
+ */
 static void uart_change_pm(struct uart_state *state, int pm_state)
 {
         struct uart_port *port = state->uart_port;
@@ -2214,6 +2190,8 @@ static const struct tty_operations uart_ops = {
 };
 
 static const struct tty_port_operations uart_port_ops = {
+        .activate       = uart_port_activate,
+        .shutdown       = uart_port_shutdown,
         .carrier_raised = uart_carrier_raised,
         .dtr_rts        = uart_dtr_rts,
 };
@@ -2275,8 +2253,8 @@ int uart_register_driver(struct uart_driver *drv)
 
                 tty_port_init(port);
                 port->ops = &uart_port_ops;
-                port->close_delay     = 500;    /* .5 seconds */
-                port->closing_wait    = 30000;  /* 30 seconds */
+                port->close_delay     = HZ / 2; /* .5 seconds */
+                port->closing_wait    = 30 * HZ;/* 30 seconds */
         }
 
         retval = tty_register_driver(normal);
@@ -2467,6 +2445,99 @@ int uart_match_port(struct uart_port *port1, struct uart_port *port2)
 }
 EXPORT_SYMBOL(uart_match_port);
 
+/**
+ *      uart_handle_dcd_change - handle a change of carrier detect state
+ *      @uport: uart_port structure for the open port
+ *      @status: new carrier detect status, nonzero if active
+ */
+void uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
+{
+        struct uart_state *state = uport->state;
+        struct tty_port *port = &state->port;
+        struct tty_ldisc *ld = tty_ldisc_ref(port->tty);
+        struct pps_event_time ts;
+
+        if (ld && ld->ops->dcd_change)
+                pps_get_ts(&ts);
+
+        uport->icount.dcd++;
+#ifdef CONFIG_HARD_PPS
+        if ((uport->flags & UPF_HARDPPS_CD) && status)
+                hardpps();
+#endif
+
+        if (port->flags & ASYNC_CHECK_CD) {
+                if (status)
+                        wake_up_interruptible(&port->open_wait);
+                else if (port->tty)
+                        tty_hangup(port->tty);
+        }
+
+        if (ld && ld->ops->dcd_change)
+                ld->ops->dcd_change(port->tty, status, &ts);
+        if (ld)
+                tty_ldisc_deref(ld);
+}
+EXPORT_SYMBOL_GPL(uart_handle_dcd_change);
+
+/**
+ *      uart_handle_cts_change - handle a change of clear-to-send state
+ *      @uport: uart_port structure for the open port
+ *      @status: new clear to send status, nonzero if active
+ */
+void uart_handle_cts_change(struct uart_port *uport, unsigned int status)
+{
+        struct tty_port *port = &uport->state->port;
+        struct tty_struct *tty = port->tty;
+
+        uport->icount.cts++;
+
+        if (port->flags & ASYNC_CTS_FLOW) {
+                if (tty->hw_stopped) {
+                        if (status) {
+                                tty->hw_stopped = 0;
+                                uport->ops->start_tx(uport);
+                                uart_write_wakeup(uport);
+                        }
+                } else {
+                        if (!status) {
+                                tty->hw_stopped = 1;
+                                uport->ops->stop_tx(uport);
+                        }
+                }
+        }
+}
+EXPORT_SYMBOL_GPL(uart_handle_cts_change);
+
+/**
+ * uart_insert_char - push a char to the uart layer
+ *
+ * User is responsible to call tty_flip_buffer_push when they are done with
+ * insertion.
+ *
+ * @port: corresponding port
+ * @status: state of the serial port RX buffer (LSR for 8250)
+ * @overrun: mask of overrun bits in @status
+ * @ch: character to push
+ * @flag: flag for the character (see TTY_NORMAL and friends)
+ */
+void uart_insert_char(struct uart_port *port, unsigned int status,
+                 unsigned int overrun, unsigned int ch, unsigned int flag)
+{
+        struct tty_struct *tty = port->state->port.tty;
+
+        if ((status & port->ignore_status_mask & ~overrun) == 0)
+                tty_insert_flip_char(tty, ch, flag);
+
+        /*
+         * Overrun is special.  Since it's reported immediately,
+         * it doesn't affect the current character.
+         */
+        if (status & ~port->ignore_status_mask & overrun)
+                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+}
+EXPORT_SYMBOL_GPL(uart_insert_char);
+
 EXPORT_SYMBOL(uart_write_wakeup);
 EXPORT_SYMBOL(uart_register_driver);
 EXPORT_SYMBOL(uart_unregister_driver);
diff --git a/drivers/tty/serial/serial_cs.c b/drivers/tty/serial/serial_cs.c
index eef736ff810a..86090605a84e 100644
--- a/drivers/tty/serial/serial_cs.c
+++ b/drivers/tty/serial/serial_cs.c
@@ -317,7 +317,7 @@ static int serial_probe(struct pcmcia_device *link)
         info->p_dev = link;
         link->priv = info;
 
-        link->config_flags |= CONF_ENABLE_IRQ;
+        link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
         if (do_sound)
                 link->config_flags |= CONF_ENABLE_SPKR;
 
@@ -445,7 +445,7 @@ static int simple_config(struct pcmcia_device *link)
 
         /* First pass: look for a config entry that looks normal.
          * Two tries: without IO aliases, then with aliases */
-        link->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_SET_IO;
+        link->config_flags |= CONF_AUTO_SET_VPP;
         for (try = 0; try < 4; try++)
                 if (!pcmcia_loop_config(link, simple_config_check, &try))
                         goto found_port;
@@ -501,7 +501,8 @@ static int multi_config_check_notpicky(struct pcmcia_device *p_dev,
 {
         int *base2 = priv_data;
 
-        if (!p_dev->resource[0]->end || !p_dev->resource[1]->end)
+        if (!p_dev->resource[0]->end || !p_dev->resource[1]->end ||
+                p_dev->resource[0]->start + 8 != p_dev->resource[1]->start)
                 return -ENODEV;
 
         p_dev->resource[0]->end = p_dev->resource[1]->end = 8;
@@ -520,7 +521,6 @@ static int multi_config(struct pcmcia_device *link)
         struct serial_info *info = link->priv;
         int i, base2 = 0;
 
-        link->config_flags |= CONF_AUTO_SET_IO;
         /* First, look for a generic full-sized window */
         if (!pcmcia_loop_config(link, multi_config_check, &info->multi))
                 base2 = link->resource[0]->start + 8;
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
new file mode 100644
index 000000000000..a60523fee11b
--- /dev/null
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -0,0 +1,783 @@
+/*
+ * Driver for CSR SiRFprimaII onboard UARTs.
+ *
+ * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/init.h>
+#include <linux/sysrq.h>
+#include <linux/console.h>
+#include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/serial_core.h>
+#include <linux/serial.h>
+#include <linux/clk.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <asm/irq.h>
+#include <asm/mach/irq.h>
+#include <linux/pinctrl/pinmux.h>
+
+#include "sirfsoc_uart.h"
+
+static unsigned int
+sirfsoc_uart_pio_tx_chars(struct sirfsoc_uart_port *sirfport, int count);
+static unsigned int
+sirfsoc_uart_pio_rx_chars(struct uart_port *port, unsigned int max_rx_count);
+static struct uart_driver sirfsoc_uart_drv;
+
+static const struct sirfsoc_baudrate_to_regv baudrate_to_regv[] = {
+        {4000000, 2359296},
+        {3500000, 1310721},
+        {3000000, 1572865},
+        {2500000, 1245186},
+        {2000000, 1572866},
+        {1500000, 1245188},
+        {1152000, 1638404},
+        {1000000, 1572869},
+        {921600, 1114120},
+        {576000, 1245196},
+        {500000, 1245198},
+        {460800, 1572876},
+        {230400, 1310750},
+        {115200, 1310781},
+        {57600, 1310843},
+        {38400, 1114328},
+        {19200, 1114545},
+        {9600, 1114979},
+};
+
+static struct sirfsoc_uart_port sirfsoc_uart_ports[SIRFSOC_UART_NR] = {
+        [0] = {
+                .port = {
+                        .iotype         = UPIO_MEM,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 0,
+                },
+        },
+        [1] = {
+                .port = {
+                        .iotype         = UPIO_MEM,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 1,
+                },
+        },
+        [2] = {
+                .port = {
+                        .iotype         = UPIO_MEM,
+                        .flags          = UPF_BOOT_AUTOCONF,
+                        .line           = 2,
+                },
+        },
+};
+
+static inline struct sirfsoc_uart_port *to_sirfport(struct uart_port *port)
+{
+        return container_of(port, struct sirfsoc_uart_port, port);
+}
+
+static inline unsigned int sirfsoc_uart_tx_empty(struct uart_port *port)
+{
+        unsigned long reg;
+        reg = rd_regl(port, SIRFUART_TX_FIFO_STATUS);
+        if (reg & SIRFUART_FIFOEMPTY_MASK(port))
+                return TIOCSER_TEMT;
+        else
+                return 0;
+}
+
+static unsigned int sirfsoc_uart_get_mctrl(struct uart_port *port)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        if (!(sirfport->ms_enabled)) {
+                goto cts_asserted;
+        } else if (sirfport->hw_flow_ctrl) {
+                if (!(rd_regl(port, SIRFUART_AFC_CTRL) &
+                                                SIRFUART_CTS_IN_STATUS))
+                        goto cts_asserted;
+                else
+                        goto cts_deasserted;
+        }
+cts_deasserted:
+        return TIOCM_CAR | TIOCM_DSR;
+cts_asserted:
+        return TIOCM_CAR | TIOCM_DSR | TIOCM_CTS;
+}
+
+static void sirfsoc_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        unsigned int assert = mctrl & TIOCM_RTS;
+        unsigned int val = assert ? SIRFUART_AFC_CTRL_RX_THD : 0x0;
+        unsigned int current_val;
+        if (sirfport->hw_flow_ctrl) {
+                current_val = rd_regl(port, SIRFUART_AFC_CTRL) & ~0xFF;
+                val |= current_val;
+                wr_regl(port, SIRFUART_AFC_CTRL, val);
+        }
+}
+
+static void sirfsoc_uart_stop_tx(struct uart_port *port)
+{
+        unsigned int regv;
+        regv = rd_regl(port, SIRFUART_INT_EN);
+        wr_regl(port, SIRFUART_INT_EN, regv & ~SIRFUART_TX_INT_EN);
+}
+
+void sirfsoc_uart_start_tx(struct uart_port *port)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        unsigned long regv;
+        sirfsoc_uart_pio_tx_chars(sirfport, 1);
+        wr_regl(port, SIRFUART_TX_FIFO_OP, SIRFUART_TX_FIFO_START);
+        regv = rd_regl(port, SIRFUART_INT_EN);
+        wr_regl(port, SIRFUART_INT_EN, regv | SIRFUART_TX_INT_EN);
+}
+
+static void sirfsoc_uart_stop_rx(struct uart_port *port)
+{
+        unsigned long regv;
+        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
+        regv = rd_regl(port, SIRFUART_INT_EN);
+        wr_regl(port, SIRFUART_INT_EN, regv & ~SIRFUART_RX_IO_INT_EN);
+}
+
+static void sirfsoc_uart_disable_ms(struct uart_port *port)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        unsigned long reg;
+        sirfport->ms_enabled = 0;
+        if (!sirfport->hw_flow_ctrl)
+                return;
+        reg = rd_regl(port, SIRFUART_AFC_CTRL);
+        wr_regl(port, SIRFUART_AFC_CTRL, reg & ~0x3FF);
+        reg = rd_regl(port, SIRFUART_INT_EN);
+        wr_regl(port, SIRFUART_INT_EN, reg & ~SIRFUART_CTS_INT_EN);
+}
+
+static void sirfsoc_uart_enable_ms(struct uart_port *port)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        unsigned long reg;
+        unsigned long flg;
+        if (!sirfport->hw_flow_ctrl)
+                return;
+        flg = SIRFUART_AFC_RX_EN | SIRFUART_AFC_TX_EN;
+        reg = rd_regl(port, SIRFUART_AFC_CTRL);
+        wr_regl(port, SIRFUART_AFC_CTRL, reg | flg);
+        reg = rd_regl(port, SIRFUART_INT_EN);
+        wr_regl(port, SIRFUART_INT_EN, reg | SIRFUART_CTS_INT_EN);
+        uart_handle_cts_change(port,
+                !(rd_regl(port, SIRFUART_AFC_CTRL) & SIRFUART_CTS_IN_STATUS));
+        sirfport->ms_enabled = 1;
+}
+
+static void sirfsoc_uart_break_ctl(struct uart_port *port, int break_state)
+{
+        unsigned long ulcon = rd_regl(port, SIRFUART_LINE_CTRL);
+        if (break_state)
+                ulcon |= SIRFUART_SET_BREAK;
+        else
+                ulcon &= ~SIRFUART_SET_BREAK;
+        wr_regl(port, SIRFUART_LINE_CTRL, ulcon);
+}
+
+static unsigned int
+sirfsoc_uart_pio_rx_chars(struct uart_port *port, unsigned int max_rx_count)
+{
+        unsigned int ch, rx_count = 0;
+        struct tty_struct *tty;
+
+        tty = tty_port_tty_get(&port->state->port);
+        if (!tty)
+                return -ENODEV;
+
+        while (!(rd_regl(port, SIRFUART_RX_FIFO_STATUS) &
+                                        SIRFUART_FIFOEMPTY_MASK(port))) {
+                ch = rd_regl(port, SIRFUART_RX_FIFO_DATA) | SIRFUART_DUMMY_READ;
+                if (unlikely(uart_handle_sysrq_char(port, ch)))
+                        continue;
+                uart_insert_char(port, 0, 0, ch, TTY_NORMAL);
+                rx_count++;
+                if (rx_count >= max_rx_count)
+                        break;
+        }
+
+        port->icount.rx += rx_count;
+        tty_flip_buffer_push(tty);
+        tty_kref_put(tty);
+
+        return rx_count;
+}
+
+static unsigned int
+sirfsoc_uart_pio_tx_chars(struct sirfsoc_uart_port *sirfport, int count)
+{
+        struct uart_port *port = &sirfport->port;
+        struct circ_buf *xmit = &port->state->xmit;
+        unsigned int num_tx = 0;
+        while (!uart_circ_empty(xmit) &&
+                !(rd_regl(port, SIRFUART_TX_FIFO_STATUS) &
+                                        SIRFUART_FIFOFULL_MASK(port)) &&
+                count--) {
+                wr_regl(port, SIRFUART_TX_FIFO_DATA, xmit->buf[xmit->tail]);
+                xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
+                port->icount.tx++;
+                num_tx++;
+        }
+        if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
+                uart_write_wakeup(port);
+        return num_tx;
+}
+
+static irqreturn_t sirfsoc_uart_isr(int irq, void *dev_id)
+{
+        unsigned long intr_status;
+        unsigned long cts_status;
+        unsigned long flag = TTY_NORMAL;
+        struct sirfsoc_uart_port *sirfport = (struct sirfsoc_uart_port *)dev_id;
+        struct uart_port *port = &sirfport->port;
+        struct uart_state *state = port->state;
+        struct circ_buf *xmit = &port->state->xmit;
+        intr_status = rd_regl(port, SIRFUART_INT_STATUS);
+        wr_regl(port, SIRFUART_INT_STATUS, intr_status);
+        intr_status &= rd_regl(port, SIRFUART_INT_EN);
+        if (unlikely(intr_status & (SIRFUART_ERR_INT_STAT))) {
+                if (intr_status & SIRFUART_RXD_BREAK) {
+                        if (uart_handle_break(port))
+                                goto recv_char;
+                        uart_insert_char(port, intr_status,
+                                        SIRFUART_RX_OFLOW, 0, TTY_BREAK);
+                        return IRQ_HANDLED;
+                }
+                if (intr_status & SIRFUART_RX_OFLOW)
+                        port->icount.overrun++;
+                if (intr_status & SIRFUART_FRM_ERR) {
+                        port->icount.frame++;
+                        flag = TTY_FRAME;
+                }
+                if (intr_status & SIRFUART_PARITY_ERR)
+                        flag = TTY_PARITY;
+                wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_RESET);
+                wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
+                wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_START);
+                intr_status &= port->read_status_mask;
+                uart_insert_char(port, intr_status,
+                                        SIRFUART_RX_OFLOW_INT, 0, flag);
+        }
+recv_char:
+        if (intr_status & SIRFUART_CTS_INT_EN) {
+                cts_status = !(rd_regl(port, SIRFUART_AFC_CTRL) &
+                                                        SIRFUART_CTS_IN_STATUS);
+                if (cts_status != 0) {
+                        uart_handle_cts_change(port, 1);
+                } else {
+                        uart_handle_cts_change(port, 0);
+                        wake_up_interruptible(&state->port.delta_msr_wait);
+                }
+        }
+        if (intr_status & SIRFUART_RX_IO_INT_EN)
+                sirfsoc_uart_pio_rx_chars(port, SIRFSOC_UART_IO_RX_MAX_CNT);
+        if (intr_status & SIRFUART_TX_INT_EN) {
+                if (uart_circ_empty(xmit) || uart_tx_stopped(port)) {
+                        return IRQ_HANDLED;
+                } else {
+                        sirfsoc_uart_pio_tx_chars(sirfport,
+                                        SIRFSOC_UART_IO_TX_REASONABLE_CNT);
+                        if ((uart_circ_empty(xmit)) &&
+                                (rd_regl(port, SIRFUART_TX_FIFO_STATUS) &
+                                                SIRFUART_FIFOEMPTY_MASK(port)))
+                                sirfsoc_uart_stop_tx(port);
+                }
+        }
+        return IRQ_HANDLED;
+}
+
+static void sirfsoc_uart_start_rx(struct uart_port *port)
+{
+        unsigned long regv;
+        regv = rd_regl(port, SIRFUART_INT_EN);
+        wr_regl(port, SIRFUART_INT_EN, regv | SIRFUART_RX_IO_INT_EN);
+        wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_RESET);
+        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
+        wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_START);
+}
+
+static unsigned int
+sirfsoc_calc_sample_div(unsigned long baud_rate,
+                        unsigned long ioclk_rate, unsigned long *setted_baud)
+{
+        unsigned long min_delta = ~0UL;
+        unsigned short sample_div;
+        unsigned int regv = 0;
+        unsigned long ioclk_div;
+        unsigned long baud_tmp;
+        int temp_delta;
+
+        for (sample_div = SIRF_MIN_SAMPLE_DIV;
+                        sample_div <= SIRF_MAX_SAMPLE_DIV; sample_div++) {
+                ioclk_div = (ioclk_rate / (baud_rate * (sample_div + 1))) - 1;
+                if (ioclk_div > SIRF_IOCLK_DIV_MAX)
+                        continue;
+                baud_tmp = ioclk_rate / ((ioclk_div + 1) * (sample_div + 1));
+                temp_delta = baud_tmp - baud_rate;
+                temp_delta = (temp_delta > 0) ? temp_delta : -temp_delta;
+                if (temp_delta < min_delta) {
+                        regv = regv & (~SIRF_IOCLK_DIV_MASK);
+                        regv = regv | ioclk_div;
+                        regv = regv & (~SIRF_SAMPLE_DIV_MASK);
+                        regv = regv | (sample_div << SIRF_SAMPLE_DIV_SHIFT);
+                        min_delta = temp_delta;
+                        *setted_baud = baud_tmp;
+                }
+        }
+        return regv;
+}
+
+static void sirfsoc_uart_set_termios(struct uart_port *port,
+                                       struct ktermios *termios,
+                                       struct ktermios *old)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        unsigned long   ioclk_rate;
+        unsigned long   config_reg = 0;
+        unsigned long   baud_rate;
+        unsigned long   setted_baud;
+        unsigned long   flags;
+        unsigned long   ic;
+        unsigned int    clk_div_reg = 0;
+        unsigned long   temp_reg_val;
+        unsigned long   rx_time_out;
+        int             threshold_div;
+        int             temp;
+
+        ioclk_rate = 150000000;
+        switch (termios->c_cflag & CSIZE) {
+        default:
+        case CS8:
+                config_reg |= SIRFUART_DATA_BIT_LEN_8;
+                break;
+        case CS7:
+                config_reg |= SIRFUART_DATA_BIT_LEN_7;
+                break;
+        case CS6:
+                config_reg |= SIRFUART_DATA_BIT_LEN_6;
+                break;
+        case CS5:
+                config_reg |= SIRFUART_DATA_BIT_LEN_5;
+                break;
+        }
+        if (termios->c_cflag & CSTOPB)
+                config_reg |= SIRFUART_STOP_BIT_LEN_2;
+        baud_rate = uart_get_baud_rate(port, termios, old, 0, 4000000);
+        spin_lock_irqsave(&port->lock, flags);
+        port->read_status_mask = SIRFUART_RX_OFLOW_INT;
+        port->ignore_status_mask = 0;
+        /* read flags */
+        if (termios->c_iflag & INPCK)
+                port->read_status_mask |=
+                        SIRFUART_FRM_ERR_INT | SIRFUART_PARITY_ERR_INT;
+        if (termios->c_iflag & (BRKINT | PARMRK))
+                port->read_status_mask |= SIRFUART_RXD_BREAK_INT;
+        /* ignore flags */
+        if (termios->c_iflag & IGNPAR)
+                port->ignore_status_mask |=
+                        SIRFUART_FRM_ERR_INT | SIRFUART_PARITY_ERR_INT;
+        if ((termios->c_cflag & CREAD) == 0)
+                port->ignore_status_mask |= SIRFUART_DUMMY_READ;
+        /* enable parity if PARENB is set*/
+        if (termios->c_cflag & PARENB) {
+                if (termios->c_cflag & CMSPAR) {
+                        if (termios->c_cflag & PARODD)
+                                config_reg |= SIRFUART_STICK_BIT_MARK;
+                        else
+                                config_reg |= SIRFUART_STICK_BIT_SPACE;
+                } else if (termios->c_cflag & PARODD) {
+                        config_reg |= SIRFUART_STICK_BIT_ODD;
+                } else {
+                        config_reg |= SIRFUART_STICK_BIT_EVEN;
+                }
+        }
+        /* Hardware Flow Control Settings */
+        if (UART_ENABLE_MS(port, termios->c_cflag)) {
+                if (!sirfport->ms_enabled)
+                        sirfsoc_uart_enable_ms(port);
+        } else {
+                if (sirfport->ms_enabled)
+                        sirfsoc_uart_disable_ms(port);
+        }
+
+        /* common rate: fast calculation */
+        for (ic = 0; ic < SIRF_BAUD_RATE_SUPPORT_NR; ic++)
+                if (baud_rate == baudrate_to_regv[ic].baud_rate)
+                        clk_div_reg = baudrate_to_regv[ic].reg_val;
+        setted_baud = baud_rate;
+        /* arbitary rate setting */
+        if (unlikely(clk_div_reg == 0))
+                clk_div_reg = sirfsoc_calc_sample_div(baud_rate, ioclk_rate,
+                                                                &setted_baud);
+        wr_regl(port, SIRFUART_DIVISOR, clk_div_reg);
+
+        if (tty_termios_baud_rate(termios))
+                tty_termios_encode_baud_rate(termios, setted_baud, setted_baud);
+
+        /* set receive timeout */
+        rx_time_out = SIRFSOC_UART_RX_TIMEOUT(baud_rate, 20000);
+        rx_time_out = (rx_time_out > 0xFFFF) ? 0xFFFF : rx_time_out;
+        config_reg |= SIRFUART_RECV_TIMEOUT(rx_time_out);
+        temp_reg_val = rd_regl(port, SIRFUART_TX_FIFO_OP);
+        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
+        wr_regl(port, SIRFUART_TX_FIFO_OP,
+                                temp_reg_val & ~SIRFUART_TX_FIFO_START);
+        wr_regl(port, SIRFUART_TX_DMA_IO_CTRL, SIRFUART_TX_MODE_IO);
+        wr_regl(port, SIRFUART_RX_DMA_IO_CTRL, SIRFUART_RX_MODE_IO);
+        wr_regl(port, SIRFUART_LINE_CTRL, config_reg);
+
+        /* Reset Rx/Tx FIFO Threshold level for proper baudrate */
+        if (baud_rate < 1000000)
+                threshold_div = 1;
+        else
+                threshold_div = 2;
+        temp = port->line == 1 ? 16 : 64;
+        wr_regl(port, SIRFUART_TX_FIFO_CTRL, temp / threshold_div);
+        wr_regl(port, SIRFUART_RX_FIFO_CTRL, temp / threshold_div);
+        temp_reg_val |= SIRFUART_TX_FIFO_START;
+        wr_regl(port, SIRFUART_TX_FIFO_OP, temp_reg_val);
+        uart_update_timeout(port, termios->c_cflag, baud_rate);
+        sirfsoc_uart_start_rx(port);
+        wr_regl(port, SIRFUART_TX_RX_EN, SIRFUART_TX_EN | SIRFUART_RX_EN);
+        spin_unlock_irqrestore(&port->lock, flags);
+}
+
+static void startup_uart_controller(struct uart_port *port)
+{
+        unsigned long temp_regv;
+        int temp;
+        temp_regv = rd_regl(port, SIRFUART_TX_DMA_IO_CTRL);
+        wr_regl(port, SIRFUART_TX_DMA_IO_CTRL, temp_regv | SIRFUART_TX_MODE_IO);
+        temp_regv = rd_regl(port, SIRFUART_RX_DMA_IO_CTRL);
+        wr_regl(port, SIRFUART_RX_DMA_IO_CTRL, temp_regv | SIRFUART_RX_MODE_IO);
+        wr_regl(port, SIRFUART_TX_DMA_IO_LEN, 0);
+        wr_regl(port, SIRFUART_RX_DMA_IO_LEN, 0);
+        wr_regl(port, SIRFUART_TX_RX_EN, SIRFUART_RX_EN | SIRFUART_TX_EN);
+        wr_regl(port, SIRFUART_TX_FIFO_OP, SIRFUART_TX_FIFO_RESET);
+        wr_regl(port, SIRFUART_TX_FIFO_OP, 0);
+        wr_regl(port, SIRFUART_RX_FIFO_OP, SIRFUART_RX_FIFO_RESET);
+        wr_regl(port, SIRFUART_RX_FIFO_OP, 0);
+        temp = port->line == 1 ? 16 : 64;
+        wr_regl(port, SIRFUART_TX_FIFO_CTRL, temp);
+        wr_regl(port, SIRFUART_RX_FIFO_CTRL, temp);
+}
+
+static int sirfsoc_uart_startup(struct uart_port *port)
+{
+        struct sirfsoc_uart_port *sirfport      = to_sirfport(port);
+        unsigned int index                      = port->line;
+        int ret;
+        set_irq_flags(port->irq, IRQF_VALID | IRQF_NOAUTOEN);
+        ret = request_irq(port->irq,
+                                sirfsoc_uart_isr,
+                                0,
+                                SIRFUART_PORT_NAME,
+                                sirfport);
+        if (ret != 0) {
+                dev_err(port->dev, "UART%d request IRQ line (%d) failed.\n",
+                                                        index, port->irq);
+                goto irq_err;
+        }
+        startup_uart_controller(port);
+        enable_irq(port->irq);
+irq_err:
+        return ret;
+}
+
+static void sirfsoc_uart_shutdown(struct uart_port *port)
+{
+        struct sirfsoc_uart_port *sirfport = to_sirfport(port);
+        wr_regl(port, SIRFUART_INT_EN, 0);
+        free_irq(port->irq, sirfport);
+        if (sirfport->ms_enabled) {
+                sirfsoc_uart_disable_ms(port);
+                sirfport->ms_enabled = 0;
+        }
+}
+
+static const char *sirfsoc_uart_type(struct uart_port *port)
+{
+        return port->type == SIRFSOC_PORT_TYPE ? SIRFUART_PORT_NAME : NULL;
+}
+
+static int sirfsoc_uart_request_port(struct uart_port *port)
+{
+        void *ret;
+        ret = request_mem_region(port->mapbase,
+                                SIRFUART_MAP_SIZE, SIRFUART_PORT_NAME);
+        return ret ? 0 : -EBUSY;
+}
+
+static void sirfsoc_uart_release_port(struct uart_port *port)
+{
+        release_mem_region(port->mapbase, SIRFUART_MAP_SIZE);
+}
+
+static void sirfsoc_uart_config_port(struct uart_port *port, int flags)
+{
+        if (flags & UART_CONFIG_TYPE) {
+                port->type = SIRFSOC_PORT_TYPE;
+                sirfsoc_uart_request_port(port);
+        }
+}
+
+static struct uart_ops sirfsoc_uart_ops = {
+        .tx_empty       = sirfsoc_uart_tx_empty,
+        .get_mctrl      = sirfsoc_uart_get_mctrl,
+        .set_mctrl      = sirfsoc_uart_set_mctrl,
+        .stop_tx        = sirfsoc_uart_stop_tx,
+        .start_tx       = sirfsoc_uart_start_tx,
+        .stop_rx        = sirfsoc_uart_stop_rx,
+        .enable_ms      = sirfsoc_uart_enable_ms,
+        .break_ctl      = sirfsoc_uart_break_ctl,
+        .startup        = sirfsoc_uart_startup,
+        .shutdown       = sirfsoc_uart_shutdown,
+        .set_termios    = sirfsoc_uart_set_termios,
+        .type           = sirfsoc_uart_type,
+        .release_port   = sirfsoc_uart_release_port,
+        .request_port   = sirfsoc_uart_request_port,
+        .config_port    = sirfsoc_uart_config_port,
+};
+
+#ifdef CONFIG_SERIAL_SIRFSOC_CONSOLE
+static int __init sirfsoc_uart_console_setup(struct console *co, char *options)
+{
+        unsigned int baud = 115200;
+        unsigned int bits = 8;
+        unsigned int parity = 'n';
+        unsigned int flow = 'n';
+        struct uart_port *port = &sirfsoc_uart_ports[co->index].port;
+
+        if (co->index < 0 || co->index >= SIRFSOC_UART_NR)
+                return -EINVAL;
+
+        if (!port->mapbase)
+                return -ENODEV;
+
+        if (options)
+                uart_parse_options(options, &baud, &parity, &bits, &flow);
+        port->cons = co;
+        return uart_set_options(port, co, baud, parity, bits, flow);
+}
+
+static void sirfsoc_uart_console_putchar(struct uart_port *port, int ch)
+{
+        while (rd_regl(port,
+                SIRFUART_TX_FIFO_STATUS) & SIRFUART_FIFOFULL_MASK(port))
+                cpu_relax();
+        wr_regb(port, SIRFUART_TX_FIFO_DATA, ch);
+}
+
+static void sirfsoc_uart_console_write(struct console *co, const char *s,
+                                                        unsigned int count)
+{
+        struct uart_port *port = &sirfsoc_uart_ports[co->index].port;
+        uart_console_write(port, s, count, sirfsoc_uart_console_putchar);
+}
+
+static struct console sirfsoc_uart_console = {
+        .name           = SIRFSOC_UART_NAME,
+        .device         = uart_console_device,
+        .flags          = CON_PRINTBUFFER,
+        .index          = -1,
+        .write          = sirfsoc_uart_console_write,
+        .setup          = sirfsoc_uart_console_setup,
+        .data           = &sirfsoc_uart_drv,
+};
+
+static int __init sirfsoc_uart_console_init(void)
+{
+        register_console(&sirfsoc_uart_console);
+        return 0;
+}
+console_initcall(sirfsoc_uart_console_init);
+#endif
+
+static struct uart_driver sirfsoc_uart_drv = {
+        .owner          = THIS_MODULE,
+        .driver_name    = SIRFUART_PORT_NAME,
+        .nr             = SIRFSOC_UART_NR,
+        .dev_name       = SIRFSOC_UART_NAME,
+        .major          = SIRFSOC_UART_MAJOR,
+        .minor          = SIRFSOC_UART_MINOR,
+#ifdef CONFIG_SERIAL_SIRFSOC_CONSOLE
+        .cons                   = &sirfsoc_uart_console,
+#else
+        .cons                   = NULL,
+#endif
+};
+
+int sirfsoc_uart_probe(struct platform_device *pdev)
+{
+        struct sirfsoc_uart_port *sirfport;
+        struct uart_port *port;
+        struct resource *res;
+        int ret;
+
+        if (of_property_read_u32(pdev->dev.of_node, "cell-index", &pdev->id)) {
+                dev_err(&pdev->dev,
+                        "Unable to find cell-index in uart node.\n");
+                ret = -EFAULT;
+                goto err;
+        }
+
+        sirfport = &sirfsoc_uart_ports[pdev->id];
+        port = &sirfport->port;
+        port->dev = &pdev->dev;
+        port->private_data = sirfport;
+
+        if (of_find_property(pdev->dev.of_node, "hw_flow_ctrl", NULL))
+                sirfport->hw_flow_ctrl = 1;
+
+        if (of_property_read_u32(pdev->dev.of_node,
+                        "fifosize",
+                        &port->fifosize)) {
+                dev_err(&pdev->dev,
+                        "Unable to find fifosize in uart node.\n");
+                ret = -EFAULT;
+                goto err;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "Insufficient resources.\n");
+                ret = -EFAULT;
+                goto err;
+        }
+        port->mapbase = res->start;
+        port->membase = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+        if (!port->membase) {
+                dev_err(&pdev->dev, "Cannot remap resource.\n");
+                ret = -ENOMEM;
+                goto err;
+        }
+        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+        if (res == NULL) {
+                dev_err(&pdev->dev, "Insufficient resources.\n");
+                ret = -EFAULT;
+                goto irq_err;
+        }
+        port->irq = res->start;
+
+        if (sirfport->hw_flow_ctrl) {
+                sirfport->pmx = pinmux_get(&pdev->dev, NULL);
+                ret = IS_ERR(sirfport->pmx);
+                if (ret)
+                        goto pmx_err;
+
+                pinmux_enable(sirfport->pmx);
+        }
+
+        port->ops = &sirfsoc_uart_ops;
+        spin_lock_init(&port->lock);
+
+        platform_set_drvdata(pdev, sirfport);
+        ret = uart_add_one_port(&sirfsoc_uart_drv, port);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Cannot add UART port(%d).\n", pdev->id);
+                goto port_err;
+        }
+
+        return 0;
+
+port_err:
+        platform_set_drvdata(pdev, NULL);
+        if (sirfport->hw_flow_ctrl) {
+                pinmux_disable(sirfport->pmx);
+                pinmux_put(sirfport->pmx);
+        }
+pmx_err:
+irq_err:
+        devm_iounmap(&pdev->dev, port->membase);
+err:
+        return ret;
+}
+
+static int sirfsoc_uart_remove(struct platform_device *pdev)
+{
+        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
+        struct uart_port *port = &sirfport->port;
+        platform_set_drvdata(pdev, NULL);
+        if (sirfport->hw_flow_ctrl) {
+                pinmux_disable(sirfport->pmx);
+                pinmux_put(sirfport->pmx);
+        }
+        devm_iounmap(&pdev->dev, port->membase);
+        uart_remove_one_port(&sirfsoc_uart_drv, port);
+        return 0;
+}
+
+static int
+sirfsoc_uart_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
+        struct uart_port *port = &sirfport->port;
+        uart_suspend_port(&sirfsoc_uart_drv, port);
+        return 0;
+}
+
+static int sirfsoc_uart_resume(struct platform_device *pdev)
+{
+        struct sirfsoc_uart_port *sirfport = platform_get_drvdata(pdev);
+        struct uart_port *port = &sirfport->port;
+        uart_resume_port(&sirfsoc_uart_drv, port);
+        return 0;
+}
+
+static struct of_device_id sirfsoc_uart_ids[] __devinitdata = {
+        { .compatible = "sirf,prima2-uart", },
+        {}
+};
+MODULE_DEVICE_TABLE(of, sirfsoc_serial_of_match);
+
+static struct platform_driver sirfsoc_uart_driver = {
+        .probe          = sirfsoc_uart_probe,
+        .remove         = __devexit_p(sirfsoc_uart_remove),
+        .suspend        = sirfsoc_uart_suspend,
+        .resume         = sirfsoc_uart_resume,
+        .driver         = {
+                .name   = SIRFUART_PORT_NAME,
+                .owner  = THIS_MODULE,
+                .of_match_table = sirfsoc_uart_ids,
+        },
+};
+
+static int __init sirfsoc_uart_init(void)
+{
+        int ret = 0;
+
+        ret = uart_register_driver(&sirfsoc_uart_drv);
+        if (ret)
+                goto out;
+
+        ret = platform_driver_register(&sirfsoc_uart_driver);
+        if (ret)
+                uart_unregister_driver(&sirfsoc_uart_drv);
+out:
+        return ret;
+}
+module_init(sirfsoc_uart_init);
+
+static void __exit sirfsoc_uart_exit(void)
+{
+        platform_driver_unregister(&sirfsoc_uart_driver);
+        uart_unregister_driver(&sirfsoc_uart_drv);
+}
+module_exit(sirfsoc_uart_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Bin Shi <Bin.Shi@csr.com>, Rong Wang<Rong.Wang@csr.com>");
+MODULE_DESCRIPTION("CSR SiRFprimaII Uart Driver");
diff --git a/drivers/tty/serial/sirfsoc_uart.h b/drivers/tty/serial/sirfsoc_uart.h
new file mode 100644
index 000000000000..fc64260fa93c
--- /dev/null
+++ b/drivers/tty/serial/sirfsoc_uart.h
@@ -0,0 +1,185 @@
+/*
+ * Drivers for CSR SiRFprimaII onboard UARTs.
+ *
+ * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include <linux/bitops.h>
+
+/* UART Register Offset Define */
+#define SIRFUART_LINE_CTRL                      0x0040
+#define SIRFUART_TX_RX_EN                       0x004c
+#define SIRFUART_DIVISOR                        0x0050
+#define SIRFUART_INT_EN                         0x0054
+#define SIRFUART_INT_STATUS                     0x0058
+#define SIRFUART_TX_DMA_IO_CTRL                 0x0100
+#define SIRFUART_TX_DMA_IO_LEN                  0x0104
+#define SIRFUART_TX_FIFO_CTRL                   0x0108
+#define SIRFUART_TX_FIFO_LEVEL_CHK              0x010C
+#define SIRFUART_TX_FIFO_OP                     0x0110
+#define SIRFUART_TX_FIFO_STATUS                 0x0114
+#define SIRFUART_TX_FIFO_DATA                   0x0118
+#define SIRFUART_RX_DMA_IO_CTRL                 0x0120
+#define SIRFUART_RX_DMA_IO_LEN                  0x0124
+#define SIRFUART_RX_FIFO_CTRL                   0x0128
+#define SIRFUART_RX_FIFO_LEVEL_CHK              0x012C
+#define SIRFUART_RX_FIFO_OP                     0x0130
+#define SIRFUART_RX_FIFO_STATUS                 0x0134
+#define SIRFUART_RX_FIFO_DATA                   0x0138
+#define SIRFUART_AFC_CTRL                       0x0140
+#define SIRFUART_SWH_DMA_IO                     0x0148
+
+/* UART Line Control Register */
+#define SIRFUART_DATA_BIT_LEN_MASK              0x3
+#define SIRFUART_DATA_BIT_LEN_5                 BIT(0)
+#define SIRFUART_DATA_BIT_LEN_6                 1
+#define SIRFUART_DATA_BIT_LEN_7                 2
+#define SIRFUART_DATA_BIT_LEN_8                 3
+#define SIRFUART_STOP_BIT_LEN_1                 0
+#define SIRFUART_STOP_BIT_LEN_2                 BIT(2)
+#define SIRFUART_PARITY_EN                      BIT(3)
+#define SIRFUART_EVEN_BIT                       BIT(4)
+#define SIRFUART_STICK_BIT_MASK                 (7 << 3)
+#define SIRFUART_STICK_BIT_NONE                 (0 << 3)
+#define SIRFUART_STICK_BIT_EVEN                 BIT(3)
+#define SIRFUART_STICK_BIT_ODD                  (3 << 3)
+#define SIRFUART_STICK_BIT_MARK                 (5 << 3)
+#define SIRFUART_STICK_BIT_SPACE                (7 << 3)
+#define SIRFUART_SET_BREAK                      BIT(6)
+#define SIRFUART_LOOP_BACK                      BIT(7)
+#define SIRFUART_PARITY_MASK                    (7 << 3)
+#define SIRFUART_DUMMY_READ                     BIT(16)
+
+#define SIRFSOC_UART_RX_TIMEOUT(br, to) (((br) * (((to) + 999) / 1000)) / 1000)
+#define SIRFUART_RECV_TIMEOUT_MASK      (0xFFFF << 16)
+#define SIRFUART_RECV_TIMEOUT(x)        (((x) & 0xFFFF) << 16)
+
+/* UART Auto Flow Control */
+#define SIRFUART_AFC_RX_THD_MASK                0x000000FF
+#define SIRFUART_AFC_RX_EN                      BIT(8)
+#define SIRFUART_AFC_TX_EN                      BIT(9)
+#define SIRFUART_CTS_CTRL                       BIT(10)
+#define SIRFUART_RTS_CTRL                       BIT(11)
+#define SIRFUART_CTS_IN_STATUS                  BIT(12)
+#define SIRFUART_RTS_OUT_STATUS                 BIT(13)
+
+/* UART Interrupt Enable Register */
+#define SIRFUART_RX_DONE_INT                    BIT(0)
+#define SIRFUART_TX_DONE_INT                    BIT(1)
+#define SIRFUART_RX_OFLOW_INT                   BIT(2)
+#define SIRFUART_TX_ALLOUT_INT                  BIT(3)
+#define SIRFUART_RX_IO_DMA_INT                  BIT(4)
+#define SIRFUART_TX_IO_DMA_INT                  BIT(5)
+#define SIRFUART_RXFIFO_FULL_INT                BIT(6)
+#define SIRFUART_TXFIFO_EMPTY_INT               BIT(7)
+#define SIRFUART_RXFIFO_THD_INT                 BIT(8)
+#define SIRFUART_TXFIFO_THD_INT                 BIT(9)
+#define SIRFUART_FRM_ERR_INT                    BIT(10)
+#define SIRFUART_RXD_BREAK_INT                  BIT(11)
+#define SIRFUART_RX_TIMEOUT_INT                 BIT(12)
+#define SIRFUART_PARITY_ERR_INT                 BIT(13)
+#define SIRFUART_CTS_INT_EN                     BIT(14)
+#define SIRFUART_RTS_INT_EN                     BIT(15)
+
+/* UART Interrupt Status Register */
+#define SIRFUART_RX_DONE                        BIT(0)
+#define SIRFUART_TX_DONE                        BIT(1)
+#define SIRFUART_RX_OFLOW                       BIT(2)
+#define SIRFUART_TX_ALL_EMPTY                   BIT(3)
+#define SIRFUART_DMA_IO_RX_DONE                 BIT(4)
+#define SIRFUART_DMA_IO_TX_DONE                 BIT(5)
+#define SIRFUART_RXFIFO_FULL                    BIT(6)
+#define SIRFUART_TXFIFO_EMPTY                   BIT(7)
+#define SIRFUART_RXFIFO_THD_REACH               BIT(8)
+#define SIRFUART_TXFIFO_THD_REACH               BIT(9)
+#define SIRFUART_FRM_ERR                        BIT(10)
+#define SIRFUART_RXD_BREAK                      BIT(11)
+#define SIRFUART_RX_TIMEOUT                     BIT(12)
+#define SIRFUART_PARITY_ERR                     BIT(13)
+#define SIRFUART_CTS_CHANGE                     BIT(14)
+#define SIRFUART_RTS_CHANGE                     BIT(15)
+#define SIRFUART_PLUG_IN                        BIT(16)
+
+#define SIRFUART_ERR_INT_STAT                                   \
+                                (SIRFUART_RX_OFLOW |            \
+                                SIRFUART_FRM_ERR |              \
+                                SIRFUART_RXD_BREAK |            \
+                                SIRFUART_PARITY_ERR)
+#define SIRFUART_ERR_INT_EN                                     \
+                                (SIRFUART_RX_OFLOW_INT |        \
+                                SIRFUART_FRM_ERR_INT |          \
+                                SIRFUART_RXD_BREAK_INT |        \
+                                SIRFUART_PARITY_ERR_INT)
+#define SIRFUART_TX_INT_EN      SIRFUART_TXFIFO_EMPTY_INT
+#define SIRFUART_RX_IO_INT_EN                                   \
+                                (SIRFUART_RX_TIMEOUT_INT |      \
+                                SIRFUART_RXFIFO_THD_INT |       \
+                                SIRFUART_RXFIFO_FULL_INT |      \
+                                SIRFUART_ERR_INT_EN)
+
+/* UART FIFO Register */
+#define SIRFUART_TX_FIFO_STOP                   0x0
+#define SIRFUART_TX_FIFO_RESET                  0x1
+#define SIRFUART_TX_FIFO_START                  0x2
+#define SIRFUART_RX_FIFO_STOP                   0x0
+#define SIRFUART_RX_FIFO_RESET                  0x1
+#define SIRFUART_RX_FIFO_START                  0x2
+#define SIRFUART_TX_MODE_DMA                    0
+#define SIRFUART_TX_MODE_IO                     1
+#define SIRFUART_RX_MODE_DMA                    0
+#define SIRFUART_RX_MODE_IO                     1
+
+#define SIRFUART_RX_EN                          0x1
+#define SIRFUART_TX_EN                          0x2
+
+/* Generic Definitions */
+#define SIRFSOC_UART_NAME                       "ttySiRF"
+#define SIRFSOC_UART_MAJOR                      0
+#define SIRFSOC_UART_MINOR                      0
+#define SIRFUART_PORT_NAME                      "sirfsoc-uart"
+#define SIRFUART_MAP_SIZE                       0x200
+#define SIRFSOC_UART_NR                         3
+#define SIRFSOC_PORT_TYPE                       0xa5
+
+/* Baud Rate Calculation */
+#define SIRF_MIN_SAMPLE_DIV                     0xf
+#define SIRF_MAX_SAMPLE_DIV                     0x3f
+#define SIRF_IOCLK_DIV_MAX                      0xffff
+#define SIRF_SAMPLE_DIV_SHIFT                   16
+#define SIRF_IOCLK_DIV_MASK                     0xffff
+#define SIRF_SAMPLE_DIV_MASK                    0x3f0000
+#define SIRF_BAUD_RATE_SUPPORT_NR               18
+
+/* For Fast Baud Rate Calculation */
+struct sirfsoc_baudrate_to_regv {
+        unsigned int baud_rate;
+        unsigned int reg_val;
+};
+
+struct sirfsoc_uart_port {
+        unsigned char                   hw_flow_ctrl;
+        unsigned char                   ms_enabled;
+
+        struct uart_port                port;
+        struct pinmux                   *pmx;
+};
+
+/* Hardware Flow Control */
+#define SIRFUART_AFC_CTRL_RX_THD        0x70
+
+/* Register Access Control */
+#define portaddr(port, reg)             ((port)->membase + (reg))
+#define rd_regb(port, reg)              (__raw_readb(portaddr(port, reg)))
+#define rd_regl(port, reg)              (__raw_readl(portaddr(port, reg)))
+#define wr_regb(port, reg, val)         __raw_writeb(val, portaddr(port, reg))
+#define wr_regl(port, reg, val)         __raw_writel(val, portaddr(port, reg))
+
+/* UART Port Mask */
+#define SIRFUART_FIFOLEVEL_MASK(port)   ((port->line == 1) ? (0x1f) : (0x7f))
+#define SIRFUART_FIFOFULL_MASK(port)    ((port->line == 1) ? (0x20) : (0x80))
+#define SIRFUART_FIFOEMPTY_MASK(port)   ((port->line == 1) ? (0x40) : (0x100))
+
+/* I/O Mode */
+#define SIRFSOC_UART_IO_RX_MAX_CNT              256
+#define SIRFSOC_UART_IO_TX_REASONABLE_CNT       6
diff --git a/drivers/tty/serial/timbuart.c b/drivers/tty/serial/timbuart.c
index e76c8b747fb8..70f97491d8f2 100644
--- a/drivers/tty/serial/timbuart.c
+++ b/drivers/tty/serial/timbuart.c
@@ -513,20 +513,7 @@ static struct platform_driver timbuart_platform_driver = {
         .remove         = __devexit_p(timbuart_remove),
 };
 
-/*--------------------------------------------------------------------------*/
-
-static int __init timbuart_init(void)
-{
-        return platform_driver_register(&timbuart_platform_driver);
-}
-
-static void __exit timbuart_exit(void)
-{
-        platform_driver_unregister(&timbuart_platform_driver);
-}
-
-module_init(timbuart_init);
-module_exit(timbuart_exit);
+module_platform_driver(timbuart_platform_driver);
 
 MODULE_DESCRIPTION("Timberdale UART driver");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/tty/serial/vr41xx_siu.c b/drivers/tty/serial/vr41xx_siu.c
index 3beb6ab4fa68..83148e79ca13 100644
--- a/drivers/tty/serial/vr41xx_siu.c
+++ b/drivers/tty/serial/vr41xx_siu.c
@@ -961,18 +961,7 @@ static struct platform_driver siu_device_driver = {
         },
 };
 
-static int __init vr41xx_siu_init(void)
-{
-        return platform_driver_register(&siu_device_driver);
-}
-
-static void __exit vr41xx_siu_exit(void)
-{
-        platform_driver_unregister(&siu_device_driver);
-}
-
-module_init(vr41xx_siu_init);
-module_exit(vr41xx_siu_exit);
+module_platform_driver(siu_device_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:SIU");
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 3fdebd306b94..e41b9bbc107d 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -790,19 +790,24 @@ static void session_clear_tty(struct pid *session)
 void disassociate_ctty(int on_exit)
 {
         struct tty_struct *tty;
-        struct pid *tty_pgrp = NULL;
 
         if (!current->signal->leader)
                 return;
 
         tty = get_current_tty();
         if (tty) {
-                tty_pgrp = get_pid(tty->pgrp);
+                struct pid *tty_pgrp = get_pid(tty->pgrp);
                 if (on_exit) {
                         if (tty->driver->type != TTY_DRIVER_TYPE_PTY)
                                 tty_vhangup(tty);
                 }
                 tty_kref_put(tty);
+                if (tty_pgrp) {
+                        kill_pgrp(tty_pgrp, SIGHUP, on_exit);
+                        if (!on_exit)
+                                kill_pgrp(tty_pgrp, SIGCONT, on_exit);
+                        put_pid(tty_pgrp);
+                }
         } else if (on_exit) {
                 struct pid *old_pgrp;
                 spin_lock_irq(&current->sighand->siglock);
@@ -816,12 +821,6 @@ void disassociate_ctty(int on_exit)
                 }
                 return;
         }
-        if (tty_pgrp) {
-                kill_pgrp(tty_pgrp, SIGHUP, on_exit);
-                if (!on_exit)
-                        kill_pgrp(tty_pgrp, SIGCONT, on_exit);
-                put_pid(tty_pgrp);
-        }
 
         spin_lock_irq(&current->sighand->siglock);
         put_pid(current->signal->tty_old_pgrp);
@@ -1558,6 +1557,59 @@ static void release_tty(struct tty_struct *tty, int idx)
 }
 
 /**
+ *      tty_release_checks - check a tty before real release
+ *      @tty: tty to check
+ *      @o_tty: link of @tty (if any)
+ *      @idx: index of the tty
+ *
+ *      Performs some paranoid checking before true release of the @tty.
+ *      This is a no-op unless TTY_PARANOIA_CHECK is defined.
+ */
+static int tty_release_checks(struct tty_struct *tty, struct tty_struct *o_tty,
+                int idx)
+{
+#ifdef TTY_PARANOIA_CHECK
+        if (idx < 0 || idx >= tty->driver->num) {
+                printk(KERN_DEBUG "%s: bad idx when trying to free (%s)\n",
+                                __func__, tty->name);
+                return -1;
+        }
+
+        /* not much to check for devpts */
+        if (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)
+                return 0;
+
+        if (tty != tty->driver->ttys[idx]) {
+                printk(KERN_DEBUG "%s: driver.table[%d] not tty for (%s)\n",
+                                __func__, idx, tty->name);
+                return -1;
+        }
+        if (tty->termios != tty->driver->termios[idx]) {
+                printk(KERN_DEBUG "%s: driver.termios[%d] not termios for (%s)\n",
+                                __func__, idx, tty->name);
+                return -1;
+        }
+        if (tty->driver->other) {
+                if (o_tty != tty->driver->other->ttys[idx]) {
+                        printk(KERN_DEBUG "%s: other->table[%d] not o_tty for (%s)\n",
+                                        __func__, idx, tty->name);
+                        return -1;
+                }
+                if (o_tty->termios != tty->driver->other->termios[idx]) {
+                        printk(KERN_DEBUG "%s: other->termios[%d] not o_termios for (%s)\n",
+                                        __func__, idx, tty->name);
+                        return -1;
+                }
+                if (o_tty->link != tty) {
+                        printk(KERN_DEBUG "%s: bad pty pointers\n", __func__);
+                        return -1;
+                }
+        }
+#endif
+        return 0;
+}
+
+/**
  *      tty_release             -       vfs callback for close
  *      @inode: inode of tty
  *      @filp: file pointer for handle to tty
@@ -1585,11 +1637,11 @@ int tty_release(struct inode *inode, struct file *filp)
         int     idx;
         char    buf[64];
 
-        if (tty_paranoia_check(tty, inode, "tty_release_dev"))
+        if (tty_paranoia_check(tty, inode, __func__))
                 return 0;
 
         tty_lock();
-        check_tty_count(tty, "tty_release_dev");
+        check_tty_count(tty, __func__);
 
         __tty_fasync(-1, filp, 0);
 
@@ -1599,59 +1651,16 @@ int tty_release(struct inode *inode, struct file *filp)
         devpts = (tty->driver->flags & TTY_DRIVER_DEVPTS_MEM) != 0;
         o_tty = tty->link;
 
-#ifdef TTY_PARANOIA_CHECK
-        if (idx < 0 || idx >= tty->driver->num) {
-                printk(KERN_DEBUG "tty_release_dev: bad idx when trying to "
-                                  "free (%s)\n", tty->name);
+        if (tty_release_checks(tty, o_tty, idx)) {
                 tty_unlock();
                 return 0;
         }
-        if (!devpts) {
-                if (tty != tty->driver->ttys[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: driver.table[%d] not tty "
-                               "for (%s)\n", idx, tty->name);
-                        return 0;
-                }
-                if (tty->termios != tty->driver->termios[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: driver.termios[%d] not termios "
-                               "for (%s)\n",
-                               idx, tty->name);
-                        return 0;
-                }
-        }
-#endif
 
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "tty_release_dev of %s (tty count=%d)...",
-               tty_name(tty, buf), tty->count);
+        printk(KERN_DEBUG "%s: %s (tty count=%d)...\n", __func__,
+                        tty_name(tty, buf), tty->count);
 #endif
 
-#ifdef TTY_PARANOIA_CHECK
-        if (tty->driver->other &&
-             !(tty->driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
-                if (o_tty != tty->driver->other->ttys[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: other->table[%d] "
-                                          "not o_tty for (%s)\n",
-                               idx, tty->name);
-                        return 0 ;
-                }
-                if (o_tty->termios != tty->driver->other->termios[idx]) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: other->termios[%d] "
-                                          "not o_termios for (%s)\n",
-                               idx, tty->name);
-                        return 0;
-                }
-                if (o_tty->link != tty) {
-                        tty_unlock();
-                        printk(KERN_DEBUG "tty_release_dev: bad pty pointers\n");
-                        return 0;
-                }
-        }
-#endif
         if (tty->ops->close)
                 tty->ops->close(tty, filp);
 
@@ -1707,8 +1716,8 @@ int tty_release(struct inode *inode, struct file *filp)
                 if (!do_sleep)
                         break;
 
-                printk(KERN_WARNING "tty_release_dev: %s: read/write wait queue "
-                                    "active!\n", tty_name(tty, buf));
+                printk(KERN_WARNING "%s: %s: read/write wait queue active!\n",
+                                __func__, tty_name(tty, buf));
                 tty_unlock();
                 mutex_unlock(&tty_mutex);
                 schedule();
@@ -1721,15 +1730,14 @@ int tty_release(struct inode *inode, struct file *filp)
          */
         if (pty_master) {
                 if (--o_tty->count < 0) {
-                        printk(KERN_WARNING "tty_release_dev: bad pty slave count "
-                                            "(%d) for %s\n",
-                               o_tty->count, tty_name(o_tty, buf));
+                        printk(KERN_WARNING "%s: bad pty slave count (%d) for %s\n",
+                                __func__, o_tty->count, tty_name(o_tty, buf));
                         o_tty->count = 0;
                 }
         }
         if (--tty->count < 0) {
-                printk(KERN_WARNING "tty_release_dev: bad tty->count (%d) for %s\n",
-                       tty->count, tty_name(tty, buf));
+                printk(KERN_WARNING "%s: bad tty->count (%d) for %s\n",
+                                __func__, tty->count, tty_name(tty, buf));
                 tty->count = 0;
         }
 
@@ -1778,7 +1786,7 @@ int tty_release(struct inode *inode, struct file *filp)
         }
 
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "freeing tty structure...");
+        printk(KERN_DEBUG "%s: freeing tty structure...\n", __func__);
 #endif
         /*
          * Ask the line discipline code to release its structures
@@ -1798,6 +1806,83 @@ int tty_release(struct inode *inode, struct file *filp)
 }
 
 /**
+ *      tty_open_current_tty - get tty of current task for open
+ *      @device: device number
+ *      @filp: file pointer to tty
+ *      @return: tty of the current task iff @device is /dev/tty
+ *
+ *      We cannot return driver and index like for the other nodes because
+ *      devpts will not work then. It expects inodes to be from devpts FS.
+ */
+static struct tty_struct *tty_open_current_tty(dev_t device, struct file *filp)
+{
+        struct tty_struct *tty;
+
+        if (device != MKDEV(TTYAUX_MAJOR, 0))
+                return NULL;
+
+        tty = get_current_tty();
+        if (!tty)
+                return ERR_PTR(-ENXIO);
+
+        filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
+        /* noctty = 1; */
+        tty_kref_put(tty);
+        /* FIXME: we put a reference and return a TTY! */
+        return tty;
+}
+
+/**
+ *      tty_lookup_driver - lookup a tty driver for a given device file
+ *      @device: device number
+ *      @filp: file pointer to tty
+ *      @noctty: set if the device should not become a controlling tty
+ *      @index: index for the device in the @return driver
+ *      @return: driver for this inode (with increased refcount)
+ *
+ *      If @return is not erroneous, the caller is responsible to decrement the
+ *      refcount by tty_driver_kref_put.
+ *
+ *      Locking: tty_mutex protects get_tty_driver
+ */
+static struct tty_driver *tty_lookup_driver(dev_t device, struct file *filp,
+                int *noctty, int *index)
+{
+        struct tty_driver *driver;
+
+        switch (device) {
+#ifdef CONFIG_VT
+        case MKDEV(TTY_MAJOR, 0): {
+                extern struct tty_driver *console_driver;
+                driver = tty_driver_kref_get(console_driver);
+                *index = fg_console;
+                *noctty = 1;
+                break;
+        }
+#endif
+        case MKDEV(TTYAUX_MAJOR, 1): {
+                struct tty_driver *console_driver = console_device(index);
+                if (console_driver) {
+                        driver = tty_driver_kref_get(console_driver);
+                        if (driver) {
+                                /* Don't let /dev/console block */
+                                filp->f_flags |= O_NONBLOCK;
+                                *noctty = 1;
+                                break;
+                        }
+                }
+                return ERR_PTR(-ENODEV);
+        }
+        default:
+                driver = get_tty_driver(device, index);
+                if (!driver)
+                        return ERR_PTR(-ENODEV);
+                break;
+        }
+        return driver;
+}
+
+/**
  *      tty_open                -       open a tty device
  *      @inode: inode of device file
  *      @filp: file pointer to tty
@@ -1813,16 +1898,16 @@ int tty_release(struct inode *inode, struct file *filp)
  *      The termios state of a pty is reset on first open so that
  *      settings don't persist across reuse.
  *
- *      Locking: tty_mutex protects tty, get_tty_driver and tty_init_dev work.
+ *      Locking: tty_mutex protects tty, tty_lookup_driver and tty_init_dev.
  *               tty->count should protect the rest.
  *               ->siglock protects ->signal/->sighand
  */
 
 static int tty_open(struct inode *inode, struct file *filp)
 {
-        struct tty_struct *tty = NULL;
+        struct tty_struct *tty;
         int noctty, retval;
-        struct tty_driver *driver;
+        struct tty_driver *driver = NULL;
         int index;
         dev_t device = inode->i_rdev;
         unsigned saved_flags = filp->f_flags;
@@ -1841,66 +1926,22 @@ retry_open:
         mutex_lock(&tty_mutex);
         tty_lock();
 
-        if (device == MKDEV(TTYAUX_MAJOR, 0)) {
-                tty = get_current_tty();
-                if (!tty) {
-                        tty_unlock();
-                        mutex_unlock(&tty_mutex);
-                        tty_free_file(filp);
-                        return -ENXIO;
-                }
-                driver = tty_driver_kref_get(tty->driver);
-                index = tty->index;
-                filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
-                /* noctty = 1; */
-                /* FIXME: Should we take a driver reference ? */
-                tty_kref_put(tty);
-                goto got_driver;
-        }
-#ifdef CONFIG_VT
-        if (device == MKDEV(TTY_MAJOR, 0)) {
-                extern struct tty_driver *console_driver;
-                driver = tty_driver_kref_get(console_driver);
-                index = fg_console;
-                noctty = 1;
-                goto got_driver;
-        }
-#endif
-        if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-                struct tty_driver *console_driver = console_device(&index);
-                if (console_driver) {
-                        driver = tty_driver_kref_get(console_driver);
-                        if (driver) {
-                                /* Don't let /dev/console block */
-                                filp->f_flags |= O_NONBLOCK;
-                                noctty = 1;
-                                goto got_driver;
-                        }
+        tty = tty_open_current_tty(device, filp);
+        if (IS_ERR(tty)) {
+                retval = PTR_ERR(tty);
+                goto err_unlock;
+        } else if (!tty) {
+                driver = tty_lookup_driver(device, filp, &noctty, &index);
+                if (IS_ERR(driver)) {
+                        retval = PTR_ERR(driver);
+                        goto err_unlock;
                 }
-                tty_unlock();
-                mutex_unlock(&tty_mutex);
-                tty_free_file(filp);
-                return -ENODEV;
-        }
 
-        driver = get_tty_driver(device, &index);
-        if (!driver) {
-                tty_unlock();
-                mutex_unlock(&tty_mutex);
-                tty_free_file(filp);
-                return -ENODEV;
-        }
-got_driver:
-        if (!tty) {
                 /* check whether we're reopening an existing tty */
                 tty = tty_driver_lookup_tty(driver, inode, index);
-
                 if (IS_ERR(tty)) {
-                        tty_unlock();
-                        mutex_unlock(&tty_mutex);
-                        tty_driver_kref_put(driver);
-                        tty_free_file(filp);
-                        return PTR_ERR(tty);
+                        retval = PTR_ERR(tty);
+                        goto err_unlock;
                 }
         }
 
@@ -1912,21 +1953,22 @@ got_driver:
                 tty = tty_init_dev(driver, index, 0);
 
         mutex_unlock(&tty_mutex);
-        tty_driver_kref_put(driver);
+        if (driver)
+                tty_driver_kref_put(driver);
         if (IS_ERR(tty)) {
                 tty_unlock();
-                tty_free_file(filp);
-                return PTR_ERR(tty);
+                retval = PTR_ERR(tty);
+                goto err_file;
         }
 
         tty_add_file(tty, filp);
 
-        check_tty_count(tty, "tty_open");
+        check_tty_count(tty, __func__);
         if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
             tty->driver->subtype == PTY_TYPE_MASTER)
                 noctty = 1;
 #ifdef TTY_DEBUG_HANGUP
-        printk(KERN_DEBUG "opening %s...", tty->name);
+        printk(KERN_DEBUG "%s: opening %s...\n", __func__, tty->name);
 #endif
         if (tty->ops->open)
                 retval = tty->ops->open(tty, filp);
@@ -1940,8 +1982,8 @@ got_driver:
 
         if (retval) {
 #ifdef TTY_DEBUG_HANGUP
-                printk(KERN_DEBUG "error %d in opening %s...", retval,
-                       tty->name);
+                printk(KERN_DEBUG "%s: error %d in opening %s...\n", __func__,
+                                retval, tty->name);
 #endif
                 tty_unlock(); /* need to call tty_release without BTM */
                 tty_release(inode, filp);
@@ -1976,6 +2018,15 @@ got_driver:
         tty_unlock();
         mutex_unlock(&tty_mutex);
         return 0;
+err_unlock:
+        tty_unlock();
+        mutex_unlock(&tty_mutex);
+        /* after locks to avoid deadlock */
+        if (!IS_ERR_OR_NULL(driver))
+                tty_driver_kref_put(driver);
+err_file:
+        tty_free_file(filp);
+        return retval;
 }
 
 
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 8e0924f55446..24b95db75d84 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -1,19 +1,11 @@
 #include <linux/types.h>
-#include <linux/major.h>
 #include <linux/errno.h>
-#include <linux/signal.h>
-#include <linux/fcntl.h>
+#include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
-#include <linux/tty_flip.h>
-#include <linux/devpts_fs.h>
 #include <linux/file.h>
-#include <linux/console.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/kd.h>
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -24,18 +16,8 @@
 #include <linux/device.h>
 #include <linux/wait.h>
 #include <linux/bitops.h>
-#include <linux/delay.h>
 #include <linux/seq_file.h>
-
 #include <linux/uaccess.h>
-#include <asm/system.h>
-
-#include <linux/kbd_kern.h>
-#include <linux/vt_kern.h>
-#include <linux/selection.h>
-
-#include <linux/kmod.h>
-#include <linux/nsproxy.h>
 #include <linux/ratelimit.h>
 
 /*
@@ -558,8 +540,6 @@ static int tty_ldisc_wait_idle(struct tty_struct *tty, long timeout)
         long ret;
         ret = wait_event_timeout(tty_ldisc_idle,
                         atomic_read(&tty->ldisc->users) == 1, timeout);
-        if (ret < 0)
-                return ret;
         return ret > 0 ? 0 : -EBUSY;
 }
 
diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 45d3e80156d4..a0f3d6c4d39d 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -584,7 +584,7 @@ int con_set_default_unimap(struct vc_data *vc)
                         return 0;
                 dflt->refcount++;
                 *vc->vc_uni_pagedir_loc = (unsigned long)dflt;
-                if (p && --p->refcount) {
+                if (p && !--p->refcount) {
                         con_release_unimap(p);
                         kfree(p);
                 }
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 791f11bed606..75823a1abeb6 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -48,6 +48,7 @@ config USB_ARCH_HAS_OHCI
         default y if ARCH_DAVINCI_DA8XX
         default y if ARCH_CNS3XXX
         default y if PLAT_SPEAR
+        default y if ARCH_EXYNOS
         # PPC:
         default y if STB03xxx
         default y if PPC_MPC52xx
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 75eca7645227..53a7bc07dd8d 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -6,6 +6,8 @@
 
 obj-$(CONFIG_USB)               += core/
 
+obj-$(CONFIG_USB_OTG_UTILS)     += otg/
+
 obj-$(CONFIG_USB_DWC3)          += dwc3/
 
 obj-$(CONFIG_USB_MON)           += mon/
@@ -51,7 +53,6 @@ obj-$(CONFIG_USB_SPEEDTOUCH)	+= atm/
 
 obj-$(CONFIG_USB_MUSB_HDRC)     += musb/
 obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs/
-obj-$(CONFIG_USB_OTG_UTILS)     += otg/
 obj-$(CONFIG_USB_GADGET)        += gadget/
 
 obj-$(CONFIG_USB_COMMON)        += usb-common.o
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 57ae44cd0b88..6f3b6e267398 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -225,21 +225,10 @@ static struct platform_driver c67x00_driver = {
                 .name = "c67x00",
         },
 };
-MODULE_ALIAS("platform:c67x00");
-
-static int __init c67x00_init(void)
-{
-        return platform_driver_register(&c67x00_driver);
-}
 
-static void __exit c67x00_exit(void)
-{
-        platform_driver_unregister(&c67x00_driver);
-}
-
-module_init(c67x00_init);
-module_exit(c67x00_exit);
+module_platform_driver(c67x00_driver);
 
 MODULE_AUTHOR("Peter Korsgaard, Jan Veldeman, Grant Likely");
 MODULE_DESCRIPTION("Cypress C67X00 USB Controller Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:c67x00");
diff --git a/drivers/usb/c67x00/c67x00-hcd.c b/drivers/usb/c67x00/c67x00-hcd.c
index d3e1356d091e..75e47b860a53 100644
--- a/drivers/usb/c67x00/c67x00-hcd.c
+++ b/drivers/usb/c67x00/c67x00-hcd.c
@@ -271,7 +271,6 @@ static void c67x00_hcd_irq(struct c67x00_sie *sie, u16 int_status, u16 msg)
         if (int_status & SOFEOP_FLG(sie->sie_num)) {
                 c67x00_ll_usb_clear_status(sie, SOF_EOP_IRQ_FLG);
                 c67x00_sched_kick(c67x00);
-                set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
         }
 }
 
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index a8078d0638fa..9543b19d410c 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -58,12 +58,62 @@ static struct usb_driver acm_driver;
 static struct tty_driver *acm_tty_driver;
 static struct acm *acm_table[ACM_TTY_MINORS];
 
-static DEFINE_MUTEX(open_mutex);
+static DEFINE_MUTEX(acm_table_lock);
 
-#define ACM_READY(acm)  (acm && acm->dev && acm->port.count)
+/*
+ * acm_table accessors
+ */
 
-static const struct tty_port_operations acm_port_ops = {
-};
+/*
+ * Look up an ACM structure by index. If found and not disconnected, increment
+ * its refcount and return it with its mutex held.
+ */
+static struct acm *acm_get_by_index(unsigned index)
+{
+        struct acm *acm;
+
+        mutex_lock(&acm_table_lock);
+        acm = acm_table[index];
+        if (acm) {
+                mutex_lock(&acm->mutex);
+                if (acm->disconnected) {
+                        mutex_unlock(&acm->mutex);
+                        acm = NULL;
+                } else {
+                        tty_port_get(&acm->port);
+                        mutex_unlock(&acm->mutex);
+                }
+        }
+        mutex_unlock(&acm_table_lock);
+        return acm;
+}
+
+/*
+ * Try to find an available minor number and if found, associate it with 'acm'.
+ */
+static int acm_alloc_minor(struct acm *acm)
+{
+        int minor;
+
+        mutex_lock(&acm_table_lock);
+        for (minor = 0; minor < ACM_TTY_MINORS; minor++) {
+                if (!acm_table[minor]) {
+                        acm_table[minor] = acm;
+                        break;
+                }
+        }
+        mutex_unlock(&acm_table_lock);
+
+        return minor;
+}
+
+/* Release the minor number associated with 'acm'.  */
+static void acm_release_minor(struct acm *acm)
+{
+        mutex_lock(&acm_table_lock);
+        acm_table[acm->minor] = NULL;
+        mutex_unlock(&acm_table_lock);
+}
 
 /*
  * Functions for ACM control messages.
@@ -267,9 +317,6 @@ static void acm_ctrl_irq(struct urb *urb)
                 goto exit;
         }
 
-        if (!ACM_READY(acm))
-                goto exit;
-
         usb_mark_last_busy(acm->dev);
 
         data = (unsigned char *)(dr + 1);
@@ -429,8 +476,7 @@ static void acm_write_bulk(struct urb *urb)
         spin_lock_irqsave(&acm->write_lock, flags);
         acm_write_done(acm, wb);
         spin_unlock_irqrestore(&acm->write_lock, flags);
-        if (ACM_READY(acm))
-                schedule_work(&acm->work);
+        schedule_work(&acm->work);
 }
 
 static void acm_softint(struct work_struct *work)
@@ -440,8 +486,6 @@ static void acm_softint(struct work_struct *work)
 
         dev_vdbg(&acm->data->dev, "%s\n", __func__);
 
-        if (!ACM_READY(acm))
-                return;
         tty = tty_port_tty_get(&acm->port);
         if (!tty)
                 return;
@@ -453,93 +497,122 @@ static void acm_softint(struct work_struct *work)
  * TTY handlers
  */
 
-static int acm_tty_open(struct tty_struct *tty, struct file *filp)
+static int acm_tty_install(struct tty_driver *driver, struct tty_struct *tty)
 {
         struct acm *acm;
-        int rv = -ENODEV;
-
-        mutex_lock(&open_mutex);
+        int retval;
 
-        acm = acm_table[tty->index];
-        if (!acm || !acm->dev)
-                goto out;
-        else
-                rv = 0;
+        dev_dbg(tty->dev, "%s\n", __func__);
 
-        dev_dbg(&acm->control->dev, "%s\n", __func__);
+        acm = acm_get_by_index(tty->index);
+        if (!acm)
+                return -ENODEV;
 
-        set_bit(TTY_NO_WRITE_SPLIT, &tty->flags);
+        retval = tty_init_termios(tty);
+        if (retval)
+                goto error_init_termios;
 
         tty->driver_data = acm;
-        tty_port_tty_set(&acm->port, tty);
 
-        if (usb_autopm_get_interface(acm->control) < 0)
-                goto early_bail;
-        else
-                acm->control->needs_remote_wakeup = 1;
+        /* Final install (we use the default method) */
+        tty_driver_kref_get(driver);
+        tty->count++;
+        driver->ttys[tty->index] = tty;
+
+        return 0;
+
+error_init_termios:
+        tty_port_put(&acm->port);
+        return retval;
+}
+
+static int acm_tty_open(struct tty_struct *tty, struct file *filp)
+{
+        struct acm *acm = tty->driver_data;
+
+        dev_dbg(tty->dev, "%s\n", __func__);
+
+        return tty_port_open(&acm->port, tty, filp);
+}
+
+static int acm_port_activate(struct tty_port *port, struct tty_struct *tty)
+{
+        struct acm *acm = container_of(port, struct acm, port);
+        int retval = -ENODEV;
+
+        dev_dbg(&acm->control->dev, "%s\n", __func__);
 
         mutex_lock(&acm->mutex);
-        if (acm->port.count++) {
-                mutex_unlock(&acm->mutex);
-                usb_autopm_put_interface(acm->control);
-                goto out;
-        }
+        if (acm->disconnected)
+                goto disconnected;
+
+        retval = usb_autopm_get_interface(acm->control);
+        if (retval)
+                goto error_get_interface;
+
+        /*
+         * FIXME: Why do we need this? Allocating 64K of physically contiguous
+         * memory is really nasty...
+         */
+        set_bit(TTY_NO_WRITE_SPLIT, &tty->flags);
+        acm->control->needs_remote_wakeup = 1;
 
         acm->ctrlurb->dev = acm->dev;
         if (usb_submit_urb(acm->ctrlurb, GFP_KERNEL)) {
                 dev_err(&acm->control->dev,
                         "%s - usb_submit_urb(ctrl irq) failed\n", __func__);
-                goto bail_out;
+                goto error_submit_urb;
         }
 
-        if (0 > acm_set_control(acm, acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS) &&
+        acm->ctrlout = ACM_CTRL_DTR | ACM_CTRL_RTS;
+        if (acm_set_control(acm, acm->ctrlout) < 0 &&
             (acm->ctrl_caps & USB_CDC_CAP_LINE))
-                goto bail_out;
+                goto error_set_control;
 
         usb_autopm_put_interface(acm->control);
 
         if (acm_submit_read_urbs(acm, GFP_KERNEL))
-                goto bail_out;
-
-        set_bit(ASYNCB_INITIALIZED, &acm->port.flags);
-        rv = tty_port_block_til_ready(&acm->port, tty, filp);
+                goto error_submit_read_urbs;
 
         mutex_unlock(&acm->mutex);
-out:
-        mutex_unlock(&open_mutex);
-        return rv;
 
-bail_out:
-        acm->port.count--;
-        mutex_unlock(&acm->mutex);
+        return 0;
+
+error_submit_read_urbs:
+        acm->ctrlout = 0;
+        acm_set_control(acm, acm->ctrlout);
+error_set_control:
+        usb_kill_urb(acm->ctrlurb);
+error_submit_urb:
         usb_autopm_put_interface(acm->control);
-early_bail:
-        mutex_unlock(&open_mutex);
-        tty_port_tty_set(&acm->port, NULL);
-        return -EIO;
+error_get_interface:
+disconnected:
+        mutex_unlock(&acm->mutex);
+        return retval;
 }
 
-static void acm_tty_unregister(struct acm *acm)
+static void acm_port_destruct(struct tty_port *port)
 {
-        int i;
+        struct acm *acm = container_of(port, struct acm, port);
+
+        dev_dbg(&acm->control->dev, "%s\n", __func__);
 
         tty_unregister_device(acm_tty_driver, acm->minor);
+        acm_release_minor(acm);
         usb_put_intf(acm->control);
-        acm_table[acm->minor] = NULL;
-        usb_free_urb(acm->ctrlurb);
-        for (i = 0; i < ACM_NW; i++)
-                usb_free_urb(acm->wb[i].urb);
-        for (i = 0; i < acm->rx_buflimit; i++)
-                usb_free_urb(acm->read_urbs[i]);
         kfree(acm->country_codes);
         kfree(acm);
 }
 
-static void acm_port_down(struct acm *acm)
+static void acm_port_shutdown(struct tty_port *port)
 {
+        struct acm *acm = container_of(port, struct acm, port);
         int i;
 
-        if (acm->dev) {
+        dev_dbg(&acm->control->dev, "%s\n", __func__);
+
+        mutex_lock(&acm->mutex);
+        if (!acm->disconnected) {
                 usb_autopm_get_interface(acm->control);
                 acm_set_control(acm, acm->ctrlout = 0);
                 usb_kill_urb(acm->ctrlurb);
@@ -550,40 +623,28 @@ static void acm_port_down(struct acm *acm)
                 acm->control->needs_remote_wakeup = 0;
                 usb_autopm_put_interface(acm->control);
         }
+        mutex_unlock(&acm->mutex);
+}
+
+static void acm_tty_cleanup(struct tty_struct *tty)
+{
+        struct acm *acm = tty->driver_data;
+        dev_dbg(&acm->control->dev, "%s\n", __func__);
+        tty_port_put(&acm->port);
 }
 
 static void acm_tty_hangup(struct tty_struct *tty)
 {
         struct acm *acm = tty->driver_data;
+        dev_dbg(&acm->control->dev, "%s\n", __func__);
         tty_port_hangup(&acm->port);
-        mutex_lock(&open_mutex);
-        acm_port_down(acm);
-        mutex_unlock(&open_mutex);
 }
 
 static void acm_tty_close(struct tty_struct *tty, struct file *filp)
 {
         struct acm *acm = tty->driver_data;
-
-        /* Perform the closing process and see if we need to do the hardware
-           shutdown */
-        if (!acm)
-                return;
-
-        mutex_lock(&open_mutex);
-        if (tty_port_close_start(&acm->port, tty, filp) == 0) {
-                if (!acm->dev) {
-                        tty_port_tty_set(&acm->port, NULL);
-                        acm_tty_unregister(acm);
-                        tty->driver_data = NULL;
-                }
-                mutex_unlock(&open_mutex);
-                return;
-        }
-        acm_port_down(acm);
-        tty_port_close_end(&acm->port, tty);
-        tty_port_tty_set(&acm->port, NULL);
-        mutex_unlock(&open_mutex);
+        dev_dbg(&acm->control->dev, "%s\n", __func__);
+        tty_port_close(&acm->port, tty, filp);
 }
 
 static int acm_tty_write(struct tty_struct *tty,
@@ -595,8 +656,6 @@ static int acm_tty_write(struct tty_struct *tty,
         int wbn;
         struct acm_wb *wb;
 
-        if (!ACM_READY(acm))
-                return -EINVAL;
         if (!count)
                 return 0;
 
@@ -625,8 +684,6 @@ static int acm_tty_write(struct tty_struct *tty,
 static int acm_tty_write_room(struct tty_struct *tty)
 {
         struct acm *acm = tty->driver_data;
-        if (!ACM_READY(acm))
-                return -EINVAL;
         /*
          * Do not let the line discipline to know that we have a reserve,
          * or it might get too enthusiastic.
@@ -637,7 +694,11 @@ static int acm_tty_write_room(struct tty_struct *tty)
 static int acm_tty_chars_in_buffer(struct tty_struct *tty)
 {
         struct acm *acm = tty->driver_data;
-        if (!ACM_READY(acm))
+        /*
+         * if the device was unplugged then any remaining characters fell out
+         * of the connector ;)
+         */
+        if (acm->disconnected)
                 return 0;
         /*
          * This is inaccurate (overcounts), but it works.
@@ -649,9 +710,6 @@ static void acm_tty_throttle(struct tty_struct *tty)
 {
         struct acm *acm = tty->driver_data;
 
-        if (!ACM_READY(acm))
-                return;
-
         spin_lock_irq(&acm->read_lock);
         acm->throttle_req = 1;
         spin_unlock_irq(&acm->read_lock);
@@ -662,9 +720,6 @@ static void acm_tty_unthrottle(struct tty_struct *tty)
         struct acm *acm = tty->driver_data;
         unsigned int was_throttled;
 
-        if (!ACM_READY(acm))
-                return;
-
         spin_lock_irq(&acm->read_lock);
         was_throttled = acm->throttled;
         acm->throttled = 0;
@@ -679,8 +734,7 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state)
 {
         struct acm *acm = tty->driver_data;
         int retval;
-        if (!ACM_READY(acm))
-                return -EINVAL;
+
         retval = acm_send_break(acm, state ? 0xffff : 0);
         if (retval < 0)
                 dev_dbg(&acm->control->dev, "%s - send break failed\n",
@@ -692,9 +746,6 @@ static int acm_tty_tiocmget(struct tty_struct *tty)
 {
         struct acm *acm = tty->driver_data;
 
-        if (!ACM_READY(acm))
-                return -EINVAL;
-
         return (acm->ctrlout & ACM_CTRL_DTR ? TIOCM_DTR : 0) |
                (acm->ctrlout & ACM_CTRL_RTS ? TIOCM_RTS : 0) |
                (acm->ctrlin  & ACM_CTRL_DSR ? TIOCM_DSR : 0) |
@@ -709,9 +760,6 @@ static int acm_tty_tiocmset(struct tty_struct *tty,
         struct acm *acm = tty->driver_data;
         unsigned int newctrl;
 
-        if (!ACM_READY(acm))
-                return -EINVAL;
-
         newctrl = acm->ctrlout;
         set = (set & TIOCM_DTR ? ACM_CTRL_DTR : 0) |
                                         (set & TIOCM_RTS ? ACM_CTRL_RTS : 0);
@@ -728,11 +776,6 @@ static int acm_tty_tiocmset(struct tty_struct *tty,
 static int acm_tty_ioctl(struct tty_struct *tty,
                                         unsigned int cmd, unsigned long arg)
 {
-        struct acm *acm = tty->driver_data;
-
-        if (!ACM_READY(acm))
-                return -EINVAL;
-
         return -ENOIOCTLCMD;
 }
 
@@ -756,9 +799,6 @@ static void acm_tty_set_termios(struct tty_struct *tty,
         struct usb_cdc_line_coding newline;
         int newctrl = acm->ctrlout;
 
-        if (!ACM_READY(acm))
-                return;
-
         newline.dwDTERate = cpu_to_le32(tty_get_baud_rate(tty));
         newline.bCharFormat = termios->c_cflag & CSTOPB ? 2 : 0;
         newline.bParityType = termios->c_cflag & PARENB ?
@@ -788,6 +828,12 @@ static void acm_tty_set_termios(struct tty_struct *tty,
         }
 }
 
+static const struct tty_port_operations acm_port_ops = {
+        .shutdown = acm_port_shutdown,
+        .activate = acm_port_activate,
+        .destruct = acm_port_destruct,
+};
+
 /*
  * USB probe and disconnect routines.
  */
@@ -1047,12 +1093,6 @@ skip_normal_probe:
         }
 made_compressed_probe:
         dev_dbg(&intf->dev, "interfaces are valid\n");
-        for (minor = 0; minor < ACM_TTY_MINORS && acm_table[minor]; minor++);
-
-        if (minor == ACM_TTY_MINORS) {
-                dev_err(&intf->dev, "no more free acm devices\n");
-                return -ENODEV;
-        }
 
         acm = kzalloc(sizeof(struct acm), GFP_KERNEL);
         if (acm == NULL) {
@@ -1060,6 +1100,13 @@ made_compressed_probe:
                 goto alloc_fail;
         }
 
+        minor = acm_alloc_minor(acm);
+        if (minor == ACM_TTY_MINORS) {
+                dev_err(&intf->dev, "no more free acm devices\n");
+                kfree(acm);
+                return -ENODEV;
+        }
+
         ctrlsize = usb_endpoint_maxp(epctrl);
         readsize = usb_endpoint_maxp(epread) *
                                 (quirks == SINGLE_RX_URB ? 1 : 2);
@@ -1183,6 +1230,8 @@ made_compressed_probe:
                 i = device_create_file(&intf->dev, &dev_attr_wCountryCodes);
                 if (i < 0) {
                         kfree(acm->country_codes);
+                        acm->country_codes = NULL;
+                        acm->country_code_size = 0;
                         goto skip_countries;
                 }
 
@@ -1191,6 +1240,8 @@ made_compressed_probe:
                 if (i < 0) {
                         device_remove_file(&intf->dev, &dev_attr_wCountryCodes);
                         kfree(acm->country_codes);
+                        acm->country_codes = NULL;
+                        acm->country_code_size = 0;
                         goto skip_countries;
                 }
         }
@@ -1218,8 +1269,6 @@ skip_countries:
         usb_get_intf(control_interface);
         tty_register_device(acm_tty_driver, minor, &control_interface->dev);
 
-        acm_table[minor] = acm;
-
         return 0;
 alloc_fail7:
         for (i = 0; i < ACM_NW; i++)
@@ -1234,6 +1283,7 @@ alloc_fail5:
 alloc_fail4:
         usb_free_coherent(usb_dev, ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
 alloc_fail2:
+        acm_release_minor(acm);
         kfree(acm);
 alloc_fail:
         return -ENOMEM;
@@ -1259,12 +1309,16 @@ static void acm_disconnect(struct usb_interface *intf)
         struct acm *acm = usb_get_intfdata(intf);
         struct usb_device *usb_dev = interface_to_usbdev(intf);
         struct tty_struct *tty;
+        int i;
+
+        dev_dbg(&intf->dev, "%s\n", __func__);
 
         /* sibling interface is already cleaning up */
         if (!acm)
                 return;
 
-        mutex_lock(&open_mutex);
+        mutex_lock(&acm->mutex);
+        acm->disconnected = true;
         if (acm->country_codes) {
                 device_remove_file(&acm->control->dev,
                                 &dev_attr_wCountryCodes);
@@ -1272,33 +1326,32 @@ static void acm_disconnect(struct usb_interface *intf)
                                 &dev_attr_iCountryCodeRelDate);
         }
         device_remove_file(&acm->control->dev, &dev_attr_bmCapabilities);
-        acm->dev = NULL;
         usb_set_intfdata(acm->control, NULL);
         usb_set_intfdata(acm->data, NULL);
+        mutex_unlock(&acm->mutex);
+
+        tty = tty_port_tty_get(&acm->port);
+        if (tty) {
+                tty_vhangup(tty);
+                tty_kref_put(tty);
+        }
 
         stop_data_traffic(acm);
 
+        usb_free_urb(acm->ctrlurb);
+        for (i = 0; i < ACM_NW; i++)
+                usb_free_urb(acm->wb[i].urb);
+        for (i = 0; i < acm->rx_buflimit; i++)
+                usb_free_urb(acm->read_urbs[i]);
         acm_write_buffers_free(acm);
-        usb_free_coherent(usb_dev, acm->ctrlsize, acm->ctrl_buffer,
-                          acm->ctrl_dma);
+        usb_free_coherent(usb_dev, acm->ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
         acm_read_buffers_free(acm);
 
         if (!acm->combined_interfaces)
                 usb_driver_release_interface(&acm_driver, intf == acm->control ?
                                         acm->data : acm->control);
 
-        if (acm->port.count == 0) {
-                acm_tty_unregister(acm);
-                mutex_unlock(&open_mutex);
-                return;
-        }
-
-        mutex_unlock(&open_mutex);
-        tty = tty_port_tty_get(&acm->port);
-        if (tty) {
-                tty_hangup(tty);
-                tty_kref_put(tty);
-        }
+        tty_port_put(&acm->port);
 }
 
 #ifdef CONFIG_PM
@@ -1325,16 +1378,10 @@ static int acm_suspend(struct usb_interface *intf, pm_message_t message)
 
         if (cnt)
                 return 0;
-        /*
-        we treat opened interfaces differently,
-        we must guard against open
-        */
-        mutex_lock(&acm->mutex);
 
-        if (acm->port.count)
+        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags))
                 stop_data_traffic(acm);
 
-        mutex_unlock(&acm->mutex);
         return 0;
 }
 
@@ -1353,8 +1400,7 @@ static int acm_resume(struct usb_interface *intf)
         if (cnt)
                 return 0;
 
-        mutex_lock(&acm->mutex);
-        if (acm->port.count) {
+        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) {
                 rv = usb_submit_urb(acm->ctrlurb, GFP_NOIO);
 
                 spin_lock_irq(&acm->write_lock);
@@ -1378,7 +1424,6 @@ static int acm_resume(struct usb_interface *intf)
         }
 
 err_out:
-        mutex_unlock(&acm->mutex);
         return rv;
 }
 
@@ -1387,15 +1432,14 @@ static int acm_reset_resume(struct usb_interface *intf)
         struct acm *acm = usb_get_intfdata(intf);
         struct tty_struct *tty;
 
-        mutex_lock(&acm->mutex);
-        if (acm->port.count) {
+        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) {
                 tty = tty_port_tty_get(&acm->port);
                 if (tty) {
                         tty_hangup(tty);
                         tty_kref_put(tty);
                 }
         }
-        mutex_unlock(&acm->mutex);
+
         return acm_resume(intf);
 }
 
@@ -1604,8 +1648,10 @@ static struct usb_driver acm_driver = {
  */
 
 static const struct tty_operations acm_ops = {
+        .install =              acm_tty_install,
         .open =                 acm_tty_open,
         .close =                acm_tty_close,
+        .cleanup =              acm_tty_cleanup,
         .hangup =               acm_tty_hangup,
         .write =                acm_tty_write,
         .write_room =           acm_tty_write_room,
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index ca7937f26e27..35ef887b7417 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -101,6 +101,7 @@ struct acm {
         int transmitting;
         spinlock_t write_lock;
         struct mutex mutex;
+        bool disconnected;
         struct usb_cdc_line_coding line;                /* bits, stop, parity */
         struct work_struct work;                        /* work queue entry for line discipline waking up */
         unsigned int ctrlin;                            /* input control lines (DCD, DSR, RI, break, overruns) */
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index e3beaf229ee3..3af5e2dd1d82 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -86,6 +86,7 @@ struct async {
         void __user *userbuffer;
         void __user *userurb;
         struct urb *urb;
+        unsigned int mem_usage;
         int status;
         u32 secid;
         u8 bulk_addr;
@@ -108,8 +109,44 @@ enum snoop_when {
 
 #define USB_DEVICE_DEV          MKDEV(USB_DEVICE_MAJOR, 0)
 
-#define MAX_USBFS_BUFFER_SIZE   16384
+/* Limit on the total amount of memory we can allocate for transfers */
+static unsigned usbfs_memory_mb = 16;
+module_param(usbfs_memory_mb, uint, 0644);
+MODULE_PARM_DESC(usbfs_memory_mb,
+                "maximum MB allowed for usbfs buffers (0 = no limit)");
 
+/* Hard limit, necessary to avoid aithmetic overflow */
+#define USBFS_XFER_MAX          (UINT_MAX / 2 - 1000000)
+
+static atomic_t usbfs_memory_usage;     /* Total memory currently allocated */
+
+/* Check whether it's okay to allocate more memory for a transfer */
+static int usbfs_increase_memory_usage(unsigned amount)
+{
+        unsigned lim;
+
+        /*
+         * Convert usbfs_memory_mb to bytes, avoiding overflows.
+         * 0 means use the hard limit (effectively unlimited).
+         */
+        lim = ACCESS_ONCE(usbfs_memory_mb);
+        if (lim == 0 || lim > (USBFS_XFER_MAX >> 20))
+                lim = USBFS_XFER_MAX;
+        else
+                lim <<= 20;
+
+        atomic_add(amount, &usbfs_memory_usage);
+        if (atomic_read(&usbfs_memory_usage) <= lim)
+                return 0;
+        atomic_sub(amount, &usbfs_memory_usage);
+        return -ENOMEM;
+}
+
+/* Memory for a transfer is being deallocated */
+static void usbfs_decrease_memory_usage(unsigned amount)
+{
+        atomic_sub(amount, &usbfs_memory_usage);
+}
 
 static int connected(struct dev_state *ps)
 {
@@ -249,10 +286,12 @@ static struct async *alloc_async(unsigned int numisoframes)
 static void free_async(struct async *as)
 {
         put_pid(as->pid);
-        put_cred(as->cred);
+        if (as->cred)
+                put_cred(as->cred);
         kfree(as->urb->transfer_buffer);
         kfree(as->urb->setup_packet);
         usb_free_urb(as->urb);
+        usbfs_decrease_memory_usage(as->mem_usage);
         kfree(as);
 }
 
@@ -792,9 +831,15 @@ static int proc_control(struct dev_state *ps, void __user *arg)
         wLength = ctrl.wLength;         /* To suppress 64k PAGE_SIZE warning */
         if (wLength > PAGE_SIZE)
                 return -EINVAL;
+        ret = usbfs_increase_memory_usage(PAGE_SIZE + sizeof(struct urb) +
+                        sizeof(struct usb_ctrlrequest));
+        if (ret)
+                return ret;
         tbuf = (unsigned char *)__get_free_page(GFP_KERNEL);
-        if (!tbuf)
-                return -ENOMEM;
+        if (!tbuf) {
+                ret = -ENOMEM;
+                goto done;
+        }
         tmo = ctrl.timeout;
         snoop(&dev->dev, "control urb: bRequestType=%02x "
                 "bRequest=%02x wValue=%04x "
@@ -806,8 +851,8 @@ static int proc_control(struct dev_state *ps, void __user *arg)
         if (ctrl.bRequestType & 0x80) {
                 if (ctrl.wLength && !access_ok(VERIFY_WRITE, ctrl.data,
                                                ctrl.wLength)) {
-                        free_page((unsigned long)tbuf);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto done;
                 }
                 pipe = usb_rcvctrlpipe(dev, 0);
                 snoop_urb(dev, NULL, pipe, ctrl.wLength, tmo, SUBMIT, NULL, 0);
@@ -821,15 +866,15 @@ static int proc_control(struct dev_state *ps, void __user *arg)
                           tbuf, max(i, 0));
                 if ((i > 0) && ctrl.wLength) {
                         if (copy_to_user(ctrl.data, tbuf, i)) {
-                                free_page((unsigned long)tbuf);
-                                return -EFAULT;
+                                ret = -EFAULT;
+                                goto done;
                         }
                 }
         } else {
                 if (ctrl.wLength) {
                         if (copy_from_user(tbuf, ctrl.data, ctrl.wLength)) {
-                                free_page((unsigned long)tbuf);
-                                return -EFAULT;
+                                ret = -EFAULT;
+                                goto done;
                         }
                 }
                 pipe = usb_sndctrlpipe(dev, 0);
@@ -843,14 +888,18 @@ static int proc_control(struct dev_state *ps, void __user *arg)
                 usb_lock_device(dev);
                 snoop_urb(dev, NULL, pipe, max(i, 0), min(i, 0), COMPLETE, NULL, 0);
         }
-        free_page((unsigned long)tbuf);
         if (i < 0 && i != -EPIPE) {
                 dev_printk(KERN_DEBUG, &dev->dev, "usbfs: USBDEVFS_CONTROL "
                            "failed cmd %s rqt %u rq %u len %u ret %d\n",
                            current->comm, ctrl.bRequestType, ctrl.bRequest,
                            ctrl.wLength, i);
         }
-        return i;
+        ret = i;
+ done:
+        free_page((unsigned long) tbuf);
+        usbfs_decrease_memory_usage(PAGE_SIZE + sizeof(struct urb) +
+                        sizeof(struct usb_ctrlrequest));
+        return ret;
 }
 
 static int proc_bulk(struct dev_state *ps, void __user *arg)
@@ -877,15 +926,20 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)
         if (!usb_maxpacket(dev, pipe, !(bulk.ep & USB_DIR_IN)))
                 return -EINVAL;
         len1 = bulk.len;
-        if (len1 > MAX_USBFS_BUFFER_SIZE)
+        if (len1 >= USBFS_XFER_MAX)
                 return -EINVAL;
-        if (!(tbuf = kmalloc(len1, GFP_KERNEL)))
-                return -ENOMEM;
+        ret = usbfs_increase_memory_usage(len1 + sizeof(struct urb));
+        if (ret)
+                return ret;
+        if (!(tbuf = kmalloc(len1, GFP_KERNEL))) {
+                ret = -ENOMEM;
+                goto done;
+        }
         tmo = bulk.timeout;
         if (bulk.ep & 0x80) {
                 if (len1 && !access_ok(VERIFY_WRITE, bulk.data, len1)) {
-                        kfree(tbuf);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto done;
                 }
                 snoop_urb(dev, NULL, pipe, len1, tmo, SUBMIT, NULL, 0);
 
@@ -896,15 +950,15 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)
 
                 if (!i && len2) {
                         if (copy_to_user(bulk.data, tbuf, len2)) {
-                                kfree(tbuf);
-                                return -EFAULT;
+                                ret = -EFAULT;
+                                goto done;
                         }
                 }
         } else {
                 if (len1) {
                         if (copy_from_user(tbuf, bulk.data, len1)) {
-                                kfree(tbuf);
-                                return -EFAULT;
+                                ret = -EFAULT;
+                                goto done;
                         }
                 }
                 snoop_urb(dev, NULL, pipe, len1, tmo, SUBMIT, tbuf, len1);
@@ -914,10 +968,11 @@ static int proc_bulk(struct dev_state *ps, void __user *arg)
                 usb_lock_device(dev);
                 snoop_urb(dev, NULL, pipe, len2, i, COMPLETE, NULL, 0);
         }
+        ret = (i < 0 ? i : len2);
+ done:
         kfree(tbuf);
-        if (i < 0)
-                return i;
-        return len2;
+        usbfs_decrease_memory_usage(len1 + sizeof(struct urb));
+        return ret;
 }
 
 static int proc_resetep(struct dev_state *ps, void __user *arg)
@@ -1062,7 +1117,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
 {
         struct usbdevfs_iso_packet_desc *isopkt = NULL;
         struct usb_host_endpoint *ep;
-        struct async *as;
+        struct async *as = NULL;
         struct usb_ctrlrequest *dr = NULL;
         unsigned int u, totlen, isofrmlen;
         int ret, ifnum = -1;
@@ -1095,32 +1150,30 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
         }
         if (!ep)
                 return -ENOENT;
+
+        u = 0;
         switch(uurb->type) {
         case USBDEVFS_URB_TYPE_CONTROL:
                 if (!usb_endpoint_xfer_control(&ep->desc))
                         return -EINVAL;
-                /* min 8 byte setup packet,
-                 * max 8 byte setup plus an arbitrary data stage */
-                if (uurb->buffer_length < 8 ||
-                    uurb->buffer_length > (8 + MAX_USBFS_BUFFER_SIZE))
+                /* min 8 byte setup packet */
+                if (uurb->buffer_length < 8)
                         return -EINVAL;
                 dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
                 if (!dr)
                         return -ENOMEM;
                 if (copy_from_user(dr, uurb->buffer, 8)) {
-                        kfree(dr);
-                        return -EFAULT;
+                        ret = -EFAULT;
+                        goto error;
                 }
                 if (uurb->buffer_length < (le16_to_cpup(&dr->wLength) + 8)) {
-                        kfree(dr);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto error;
                 }
                 ret = check_ctrlrecip(ps, dr->bRequestType, dr->bRequest,
                                       le16_to_cpup(&dr->wIndex));
-                if (ret) {
-                        kfree(dr);
-                        return ret;
-                }
+                if (ret)
+                        goto error;
                 uurb->number_of_packets = 0;
                 uurb->buffer_length = le16_to_cpup(&dr->wLength);
                 uurb->buffer += 8;
@@ -1138,6 +1191,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                         __le16_to_cpup(&dr->wValue),
                         __le16_to_cpup(&dr->wIndex),
                         __le16_to_cpup(&dr->wLength));
+                u = sizeof(struct usb_ctrlrequest);
                 break;
 
         case USBDEVFS_URB_TYPE_BULK:
@@ -1151,8 +1205,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                         goto interrupt_urb;
                 }
                 uurb->number_of_packets = 0;
-                if (uurb->buffer_length > MAX_USBFS_BUFFER_SIZE)
-                        return -EINVAL;
                 break;
 
         case USBDEVFS_URB_TYPE_INTERRUPT:
@@ -1160,8 +1212,6 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                         return -EINVAL;
  interrupt_urb:
                 uurb->number_of_packets = 0;
-                if (uurb->buffer_length > MAX_USBFS_BUFFER_SIZE)
-                        return -EINVAL;
                 break;
 
         case USBDEVFS_URB_TYPE_ISO:
@@ -1176,50 +1226,53 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                 if (!(isopkt = kmalloc(isofrmlen, GFP_KERNEL)))
                         return -ENOMEM;
                 if (copy_from_user(isopkt, iso_frame_desc, isofrmlen)) {
-                        kfree(isopkt);
-                        return -EFAULT;
+                        ret = -EFAULT;
+                        goto error;
                 }
                 for (totlen = u = 0; u < uurb->number_of_packets; u++) {
                         /* arbitrary limit,
                          * sufficient for USB 2.0 high-bandwidth iso */
                         if (isopkt[u].length > 8192) {
-                                kfree(isopkt);
-                                return -EINVAL;
+                                ret = -EINVAL;
+                                goto error;
                         }
                         totlen += isopkt[u].length;
                 }
-                /* 3072 * 64 microframes */
-                if (totlen > 196608) {
-                        kfree(isopkt);
-                        return -EINVAL;
-                }
+                u *= sizeof(struct usb_iso_packet_descriptor);
                 uurb->buffer_length = totlen;
                 break;
 
         default:
                 return -EINVAL;
         }
+
+        if (uurb->buffer_length >= USBFS_XFER_MAX) {
+                ret = -EINVAL;
+                goto error;
+        }
         if (uurb->buffer_length > 0 &&
                         !access_ok(is_in ? VERIFY_WRITE : VERIFY_READ,
                                 uurb->buffer, uurb->buffer_length)) {
-                kfree(isopkt);
-                kfree(dr);
-                return -EFAULT;
+                ret = -EFAULT;
+                goto error;
         }
         as = alloc_async(uurb->number_of_packets);
         if (!as) {
-                kfree(isopkt);
-                kfree(dr);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto error;
         }
+        u += sizeof(struct async) + sizeof(struct urb) + uurb->buffer_length;
+        ret = usbfs_increase_memory_usage(u);
+        if (ret)
+                goto error;
+        as->mem_usage = u;
+
         if (uurb->buffer_length > 0) {
                 as->urb->transfer_buffer = kmalloc(uurb->buffer_length,
                                 GFP_KERNEL);
                 if (!as->urb->transfer_buffer) {
-                        kfree(isopkt);
-                        kfree(dr);
-                        free_async(as);
-                        return -ENOMEM;
+                        ret = -ENOMEM;
+                        goto error;
                 }
                 /* Isochronous input data may end up being discontiguous
                  * if some of the packets are short.  Clear the buffer so
@@ -1253,6 +1306,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
 
         as->urb->transfer_buffer_length = uurb->buffer_length;
         as->urb->setup_packet = (unsigned char *)dr;
+        dr = NULL;
         as->urb->start_frame = uurb->start_frame;
         as->urb->number_of_packets = uurb->number_of_packets;
         if (uurb->type == USBDEVFS_URB_TYPE_ISO ||
@@ -1268,6 +1322,7 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                 totlen += isopkt[u].length;
         }
         kfree(isopkt);
+        isopkt = NULL;
         as->ps = ps;
         as->userurb = arg;
         if (is_in && uurb->buffer_length > 0)
@@ -1282,8 +1337,8 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
         if (!is_in && uurb->buffer_length > 0) {
                 if (copy_from_user(as->urb->transfer_buffer, uurb->buffer,
                                 uurb->buffer_length)) {
-                        free_async(as);
-                        return -EFAULT;
+                        ret = -EFAULT;
+                        goto error;
                 }
         }
         snoop_urb(ps->dev, as->userurb, as->urb->pipe,
@@ -1329,10 +1384,16 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                 snoop_urb(ps->dev, as->userurb, as->urb->pipe,
                                 0, ret, COMPLETE, NULL, 0);
                 async_removepending(as);
-                free_async(as);
-                return ret;
+                goto error;
         }
         return 0;
+
+ error:
+        kfree(isopkt);
+        kfree(dr);
+        if (as)
+                free_async(as);
+        return ret;
 }
 
 static int proc_submiturb(struct dev_state *ps, void __user *arg)
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 45887a0ff873..d40ff9568813 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -45,10 +45,12 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
         struct usb_dynid *dynid;
         u32 idVendor = 0;
         u32 idProduct = 0;
+        unsigned int bInterfaceClass = 0;
         int fields = 0;
         int retval = 0;
 
-        fields = sscanf(buf, "%x %x", &idVendor, &idProduct);
+        fields = sscanf(buf, "%x %x %x", &idVendor, &idProduct,
+                                        &bInterfaceClass);
         if (fields < 2)
                 return -EINVAL;
 
@@ -60,6 +62,10 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
         dynid->id.idVendor = idVendor;
         dynid->id.idProduct = idProduct;
         dynid->id.match_flags = USB_DEVICE_ID_MATCH_DEVICE;
+        if (fields == 3) {
+                dynid->id.bInterfaceClass = (u8)bInterfaceClass;
+                dynid->id.match_flags |= USB_DEVICE_ID_MATCH_INT_CLASS;
+        }
 
         spin_lock(&dynids->lock);
         list_add_tail(&dynid->node, &dynids->list);
@@ -1073,17 +1079,10 @@ static int usb_suspend_interface(struct usb_device *udev,
                 goto done;
         driver = to_usb_driver(intf->dev.driver);
 
-        if (driver->suspend) {
-                status = driver->suspend(intf, msg);
-                if (status && !PMSG_IS_AUTO(msg))
-                        dev_err(&intf->dev, "%s error %d\n",
-                                        "suspend", status);
-        } else {
-                /* Later we will unbind the driver and reprobe */
-                intf->needs_binding = 1;
-                dev_warn(&intf->dev, "no %s for driver %s?\n",
-                                "suspend", driver->name);
-        }
+        /* at this time we know the driver supports suspend */
+        status = driver->suspend(intf, msg);
+        if (status && !PMSG_IS_AUTO(msg))
+                dev_err(&intf->dev, "suspend error %d\n", status);
 
  done:
         dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status);
@@ -1132,16 +1131,9 @@ static int usb_resume_interface(struct usb_device *udev,
                                         "reset_resume", driver->name);
                 }
         } else {
-                if (driver->resume) {
-                        status = driver->resume(intf);
-                        if (status)
-                                dev_err(&intf->dev, "%s error %d\n",
-                                                "resume", status);
-                } else {
-                        intf->needs_binding = 1;
-                        dev_warn(&intf->dev, "no %s for driver %s?\n",
-                                        "resume", driver->name);
-                }
+                status = driver->resume(intf);
+                if (status)
+                        dev_err(&intf->dev, "resume error %d\n", status);
         }
 
 done:
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c
index a004db35f6d0..d136b8f4c8a7 100644
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
@@ -453,10 +453,6 @@ static int resume_common(struct device *dev, int event)
 
         pci_set_master(pci_dev);
 
-        clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
-        if (hcd->shared_hcd)
-                clear_bit(HCD_FLAG_SAW_IRQ, &hcd->shared_hcd->flags);
-
         if (hcd->driver->pci_resume && !HCD_DEAD(hcd)) {
                 if (event != PM_EVENT_AUTO_RESUME)
                         wait_for_companions(pci_dev, hcd);
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 13222d352a61..eb19cba34ac9 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -658,7 +658,7 @@ error:
                                 len > offsetof(struct usb_device_descriptor,
                                                 bDeviceProtocol))
                         ((struct usb_device_descriptor *) ubuf)->
-                                        bDeviceProtocol = 1;
+                                bDeviceProtocol = USB_HUB_PR_HS_SINGLE_TT;
         }
 
         /* any errors get returned through the urb completion */
@@ -1168,20 +1168,6 @@ int usb_hcd_check_unlink_urb(struct usb_hcd *hcd, struct urb *urb,
         if (urb->unlinked)
                 return -EBUSY;
         urb->unlinked = status;
-
-        /* IRQ setup can easily be broken so that USB controllers
-         * never get completion IRQs ... maybe even the ones we need to
-         * finish unlinking the initial failed usb_set_address()
-         * or device descriptor fetch.
-         */
-        if (!HCD_SAW_IRQ(hcd) && !is_root_hub(urb->dev)) {
-                dev_warn(hcd->self.controller, "Unlink after no-IRQ?  "
-                        "Controller is probably using the wrong IRQ.\n");
-                set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
-                if (hcd->shared_hcd)
-                        set_bit(HCD_FLAG_SAW_IRQ, &hcd->shared_hcd->flags);
-        }
-
         return 0;
 }
 EXPORT_SYMBOL_GPL(usb_hcd_check_unlink_urb);
@@ -1412,11 +1398,10 @@ int usb_hcd_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
                                         ret = -EAGAIN;
                                 else
                                         urb->transfer_flags |= URB_DMA_MAP_SG;
-                                if (n != urb->num_sgs) {
-                                        urb->num_sgs = n;
+                                urb->num_mapped_sgs = n;
+                                if (n != urb->num_sgs)
                                         urb->transfer_flags |=
                                                         URB_DMA_SG_COMBINED;
-                                }
                         } else if (urb->sg) {
                                 struct scatterlist *sg = urb->sg;
                                 urb->transfer_dma = dma_map_page(
@@ -2148,16 +2133,12 @@ irqreturn_t usb_hcd_irq (int irq, void *__hcd)
          */
         local_irq_save(flags);
 
-        if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd))) {
+        if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd)))
                 rc = IRQ_NONE;
-        } else if (hcd->driver->irq(hcd) == IRQ_NONE) {
+        else if (hcd->driver->irq(hcd) == IRQ_NONE)
                 rc = IRQ_NONE;
-        } else {
-                set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
-                if (hcd->shared_hcd)
-                        set_bit(HCD_FLAG_SAW_IRQ, &hcd->shared_hcd->flags);
+        else
                 rc = IRQ_HANDLED;
-        }
 
         local_irq_restore(flags);
         return rc;
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 79781461eec9..79d339e2e700 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -84,7 +84,7 @@ struct usb_hub {
 
 static inline int hub_is_superspeed(struct usb_device *hdev)
 {
-        return (hdev->descriptor.bDeviceProtocol == 3);
+        return (hdev->descriptor.bDeviceProtocol == USB_HUB_PR_SS);
 }
 
 /* Protect struct usb_device->state and ->children members
@@ -1041,58 +1041,58 @@ static int hub_configure(struct usb_hub *hub,
                 dev_dbg(hub_dev, "standalone hub\n");
 
         switch (wHubCharacteristics & HUB_CHAR_LPSM) {
-                case 0x00:
-                        dev_dbg(hub_dev, "ganged power switching\n");
-                        break;
-                case 0x01:
-                        dev_dbg(hub_dev, "individual port power switching\n");
-                        break;
-                case 0x02:
-                case 0x03:
-                        dev_dbg(hub_dev, "no power switching (usb 1.0)\n");
-                        break;
+        case HUB_CHAR_COMMON_LPSM:
+                dev_dbg(hub_dev, "ganged power switching\n");
+                break;
+        case HUB_CHAR_INDV_PORT_LPSM:
+                dev_dbg(hub_dev, "individual port power switching\n");
+                break;
+        case HUB_CHAR_NO_LPSM:
+        case HUB_CHAR_LPSM:
+                dev_dbg(hub_dev, "no power switching (usb 1.0)\n");
+                break;
         }
 
         switch (wHubCharacteristics & HUB_CHAR_OCPM) {
-                case 0x00:
-                        dev_dbg(hub_dev, "global over-current protection\n");
-                        break;
-                case 0x08:
-                        dev_dbg(hub_dev, "individual port over-current protection\n");
-                        break;
-                case 0x10:
-                case 0x18:
-                        dev_dbg(hub_dev, "no over-current protection\n");
-                        break;
+        case HUB_CHAR_COMMON_OCPM:
+                dev_dbg(hub_dev, "global over-current protection\n");
+                break;
+        case HUB_CHAR_INDV_PORT_OCPM:
+                dev_dbg(hub_dev, "individual port over-current protection\n");
+                break;
+        case HUB_CHAR_NO_OCPM:
+        case HUB_CHAR_OCPM:
+                dev_dbg(hub_dev, "no over-current protection\n");
+                break;
         }
 
         spin_lock_init (&hub->tt.lock);
         INIT_LIST_HEAD (&hub->tt.clear_list);
         INIT_WORK(&hub->tt.clear_work, hub_tt_work);
         switch (hdev->descriptor.bDeviceProtocol) {
-                case 0:
-                        break;
-                case 1:
-                        dev_dbg(hub_dev, "Single TT\n");
-                        hub->tt.hub = hdev;
-                        break;
-                case 2:
-                        ret = usb_set_interface(hdev, 0, 1);
-                        if (ret == 0) {
-                                dev_dbg(hub_dev, "TT per port\n");
-                                hub->tt.multi = 1;
-                        } else
-                                dev_err(hub_dev, "Using single TT (err %d)\n",
-                                        ret);
-                        hub->tt.hub = hdev;
-                        break;
-                case 3:
-                        /* USB 3.0 hubs don't have a TT */
-                        break;
-                default:
-                        dev_dbg(hub_dev, "Unrecognized hub protocol %d\n",
-                                hdev->descriptor.bDeviceProtocol);
-                        break;
+        case USB_HUB_PR_FS:
+                break;
+        case USB_HUB_PR_HS_SINGLE_TT:
+                dev_dbg(hub_dev, "Single TT\n");
+                hub->tt.hub = hdev;
+                break;
+        case USB_HUB_PR_HS_MULTI_TT:
+                ret = usb_set_interface(hdev, 0, 1);
+                if (ret == 0) {
+                        dev_dbg(hub_dev, "TT per port\n");
+                        hub->tt.multi = 1;
+                } else
+                        dev_err(hub_dev, "Using single TT (err %d)\n",
+                                ret);
+                hub->tt.hub = hdev;
+                break;
+        case USB_HUB_PR_SS:
+                /* USB 3.0 hubs don't have a TT */
+                break;
+        default:
+                dev_dbg(hub_dev, "Unrecognized hub protocol %d\n",
+                        hdev->descriptor.bDeviceProtocol);
+                break;
         }
 
         /* Note 8 FS bit times == (8 bits / 12000000 bps) ~= 666ns */
@@ -1360,7 +1360,6 @@ descriptor_error:
         return -ENODEV;
 }
 
-/* No BKL needed */
 static int
 hub_ioctl(struct usb_interface *intf, unsigned int code, void *user_data)
 {
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index ecf12e15a7ef..4c65eb6a867a 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -117,9 +117,12 @@ static const struct usb_device_id usb_quirk_list[] = {
         { USB_DEVICE(0x06a3, 0x0006), .driver_info =
                         USB_QUIRK_CONFIG_INTF_STRINGS },
 
-        /* Guillemot Webcam Hercules Dualpix Exchange*/
+        /* Guillemot Webcam Hercules Dualpix Exchange (2nd ID) */
         { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* Guillemot Webcam Hercules Dualpix Exchange*/
+        { USB_DEVICE(0x06f8, 0x3005), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* M-Systems Flash Disk Pioneers */
         { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
 
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 3888778582c4..45e8479c377d 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -132,20 +132,6 @@ static inline int is_usb_device_driver(struct device_driver *drv)
                         for_devices;
 }
 
-/* translate USB error codes to codes user space understands */
-static inline int usb_translate_errors(int error_code)
-{
-        switch (error_code) {
-        case 0:
-        case -ENOMEM:
-        case -ENODEV:
-                return error_code;
-        default:
-                return -EIO;
-        }
-}
-
-
 /* for labeling diagnostics */
 extern const char *usbcore_name;
 
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 3c1d67d324fd..d8f741f9e56e 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,7 +1,10 @@
 config USB_DWC3
         tristate "DesignWare USB3 DRD Core Support"
-        depends on (USB || USB_GADGET)
+        depends on (USB && USB_GADGET)
         select USB_OTG_UTILS
+        select USB_GADGET_DUALSPEED
+        select USB_GADGET_SUPERSPEED
+        select USB_XHCI_PLATFORM
         help
           Say Y or M here if your system has a Dual Role SuperSpeed
           USB controller based on the DesignWare USB3 IP Core.
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 593d1dbc465b..900ae74357f1 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -4,10 +4,8 @@ ccflags-$(CONFIG_USB_DWC3_VERBOSE)	+= -DVERBOSE_DEBUG
 obj-$(CONFIG_USB_DWC3)                  += dwc3.o
 
 dwc3-y                                  := core.o
-
-ifneq ($(CONFIG_USB_GADGET_DWC3),)
-        dwc3-y                          += gadget.o ep0.o
-endif
+dwc3-y                                  += host.o
+dwc3-y                                  += gadget.o ep0.o
 
 ifneq ($(CONFIG_DEBUG_FS),)
         dwc3-y                          += debugfs.o
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 600d82348511..7c9df630dbe4 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -59,6 +59,60 @@
 
 #include "debug.h"
 
+static char *maximum_speed = "super";
+module_param(maximum_speed, charp, 0);
+MODULE_PARM_DESC(maximum_speed, "Maximum supported speed.");
+
+/* -------------------------------------------------------------------------- */
+
+#define DWC3_DEVS_POSSIBLE      32
+
+static DECLARE_BITMAP(dwc3_devs, DWC3_DEVS_POSSIBLE);
+
+int dwc3_get_device_id(void)
+{
+        int             id;
+
+again:
+        id = find_first_zero_bit(dwc3_devs, DWC3_DEVS_POSSIBLE);
+        if (id < DWC3_DEVS_POSSIBLE) {
+                int old;
+
+                old = test_and_set_bit(id, dwc3_devs);
+                if (old)
+                        goto again;
+        } else {
+                pr_err("dwc3: no space for new device\n");
+                id = -ENOMEM;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(dwc3_get_device_id);
+
+void dwc3_put_device_id(int id)
+{
+        int                     ret;
+
+        if (id < 0)
+                return;
+
+        ret = test_bit(id, dwc3_devs);
+        WARN(!ret, "dwc3: ID %d not in use\n", id);
+        clear_bit(id, dwc3_devs);
+}
+EXPORT_SYMBOL_GPL(dwc3_put_device_id);
+
+void dwc3_set_mode(struct dwc3 *dwc, u32 mode)
+{
+        u32 reg;
+
+        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
+        reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG));
+        reg |= DWC3_GCTL_PRTCAPDIR(mode);
+        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
+}
+
 /**
  * dwc3_core_soft_reset - Issues core soft reset and PHY reset
  * @dwc: pointer to our context structure
@@ -150,7 +204,7 @@ static void dwc3_free_event_buffers(struct dwc3 *dwc)
         struct dwc3_event_buffer        *evt;
         int i;
 
-        for (i = 0; i < DWC3_EVENT_BUFFERS_NUM; i++) {
+        for (i = 0; i < dwc->num_event_buffers; i++) {
                 evt = dwc->ev_buffs[i];
                 if (evt) {
                         dwc3_free_one_event_buffer(dwc, evt);
@@ -162,17 +216,25 @@ static void dwc3_free_event_buffers(struct dwc3 *dwc)
 /**
  * dwc3_alloc_event_buffers - Allocates @num event buffers of size @length
  * @dwc: Pointer to out controller context structure
- * @num: number of event buffers to allocate
  * @length: size of event buffer
  *
  * Returns 0 on success otherwise negative errno. In error the case, dwc
  * may contain some buffers allocated but not all which were requested.
  */
-static int __devinit dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned num,
-                unsigned length)
+static int __devinit dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned length)
 {
+        int                     num;
         int                     i;
 
+        num = DWC3_NUM_INT(dwc->hwparams.hwparams1);
+        dwc->num_event_buffers = num;
+
+        dwc->ev_buffs = kzalloc(sizeof(*dwc->ev_buffs) * num, GFP_KERNEL);
+        if (!dwc->ev_buffs) {
+                dev_err(dwc->dev, "can't allocate event buffers array\n");
+                return -ENOMEM;
+        }
+
         for (i = 0; i < num; i++) {
                 struct dwc3_event_buffer        *evt;
 
@@ -198,7 +260,7 @@ static int __devinit dwc3_event_buffers_setup(struct dwc3 *dwc)
         struct dwc3_event_buffer        *evt;
         int                             n;
 
-        for (n = 0; n < DWC3_EVENT_BUFFERS_NUM; n++) {
+        for (n = 0; n < dwc->num_event_buffers; n++) {
                 evt = dwc->ev_buffs[n];
                 dev_dbg(dwc->dev, "Event buf %p dma %08llx length %d\n",
                                 evt->buf, (unsigned long long) evt->dma,
@@ -221,7 +283,7 @@ static void dwc3_event_buffers_cleanup(struct dwc3 *dwc)
         struct dwc3_event_buffer        *evt;
         int                             n;
 
-        for (n = 0; n < DWC3_EVENT_BUFFERS_NUM; n++) {
+        for (n = 0; n < dwc->num_event_buffers; n++) {
                 evt = dwc->ev_buffs[n];
                 dwc3_writel(dwc->regs, DWC3_GEVNTADRLO(n), 0);
                 dwc3_writel(dwc->regs, DWC3_GEVNTADRHI(n), 0);
@@ -285,8 +347,32 @@ static int __devinit dwc3_core_init(struct dwc3 *dwc)
                 cpu_relax();
         } while (true);
 
-        ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_NUM,
-                        DWC3_EVENT_BUFFERS_SIZE);
+        dwc3_cache_hwparams(dwc);
+
+        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
+        reg &= ~DWC3_GCTL_SCALEDOWN(3);
+        reg &= ~DWC3_GCTL_DISSCRAMBLE;
+
+        switch (DWC3_GHWPARAMS1_EN_PWROPT(dwc->hwparams.hwparams1)) {
+        case DWC3_GHWPARAMS1_EN_PWROPT_CLK:
+                reg &= ~DWC3_GCTL_DSBLCLKGTNG;
+                break;
+        default:
+                dev_dbg(dwc->dev, "No power optimization available\n");
+        }
+
+        /*
+         * WORKAROUND: DWC3 revisions <1.90a have a bug
+         * when The device fails to connect at SuperSpeed
+         * and falls back to high-speed mode which causes
+         * the device to enter in a Connect/Disconnect loop
+         */
+        if (dwc->revision < DWC3_REVISION_190A)
+                reg |= DWC3_GCTL_U2RSTECN;
+
+        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
+
+        ret = dwc3_alloc_event_buffers(dwc, DWC3_EVENT_BUFFERS_SIZE);
         if (ret) {
                 dev_err(dwc->dev, "failed to allocate event buffers\n");
                 ret = -ENOMEM;
@@ -299,8 +385,6 @@ static int __devinit dwc3_core_init(struct dwc3 *dwc)
                 goto err1;
         }
 
-        dwc3_cache_hwparams(dwc);
-
         return 0;
 
 err1:
@@ -320,15 +404,17 @@ static void dwc3_core_exit(struct dwc3 *dwc)
 
 static int __devinit dwc3_probe(struct platform_device *pdev)
 {
-        const struct platform_device_id *id = platform_get_device_id(pdev);
         struct resource         *res;
         struct dwc3             *dwc;
-        void __iomem            *regs;
-        unsigned int            features = id->driver_data;
+
         int                     ret = -ENOMEM;
         int                     irq;
+
+        void __iomem            *regs;
         void                    *mem;
 
+        u8                      mode;
+
         mem = kzalloc(sizeof(*dwc) + DWC3_ALIGN_MASK, GFP_KERNEL);
         if (!mem) {
                 dev_err(&pdev->dev, "not enough memory\n");
@@ -343,6 +429,8 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
                 goto err1;
         }
 
+        dwc->res = res;
+
         res = request_mem_region(res->start, resource_size(res),
                         dev_name(&pdev->dev));
         if (!res) {
@@ -370,6 +458,17 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
         dwc->dev        = &pdev->dev;
         dwc->irq        = irq;
 
+        if (!strncmp("super", maximum_speed, 5))
+                dwc->maximum_speed = DWC3_DCFG_SUPERSPEED;
+        else if (!strncmp("high", maximum_speed, 4))
+                dwc->maximum_speed = DWC3_DCFG_HIGHSPEED;
+        else if (!strncmp("full", maximum_speed, 4))
+                dwc->maximum_speed = DWC3_DCFG_FULLSPEED1;
+        else if (!strncmp("low", maximum_speed, 3))
+                dwc->maximum_speed = DWC3_DCFG_LOWSPEED;
+        else
+                dwc->maximum_speed = DWC3_DCFG_SUPERSPEED;
+
         pm_runtime_enable(&pdev->dev);
         pm_runtime_get_sync(&pdev->dev);
         pm_runtime_forbid(&pdev->dev);
@@ -380,13 +479,44 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
                 goto err3;
         }
 
-        if (features & DWC3_HAS_PERIPHERAL) {
+        mode = DWC3_MODE(dwc->hwparams.hwparams0);
+
+        switch (mode) {
+        case DWC3_MODE_DEVICE:
+                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_DEVICE);
                 ret = dwc3_gadget_init(dwc);
                 if (ret) {
-                        dev_err(&pdev->dev, "failed to initialized gadget\n");
+                        dev_err(&pdev->dev, "failed to initialize gadget\n");
                         goto err4;
                 }
+                break;
+        case DWC3_MODE_HOST:
+                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_HOST);
+                ret = dwc3_host_init(dwc);
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to initialize host\n");
+                        goto err4;
+                }
+                break;
+        case DWC3_MODE_DRD:
+                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG);
+                ret = dwc3_host_init(dwc);
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to initialize host\n");
+                        goto err4;
+                }
+
+                ret = dwc3_gadget_init(dwc);
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to initialize gadget\n");
+                        goto err4;
+                }
+                break;
+        default:
+                dev_err(&pdev->dev, "Unsupported mode of operation %d\n", mode);
+                goto err4;
         }
+        dwc->mode = mode;
 
         ret = dwc3_debugfs_init(dwc);
         if (ret) {
@@ -399,8 +529,21 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
         return 0;
 
 err5:
-        if (features & DWC3_HAS_PERIPHERAL)
+        switch (mode) {
+        case DWC3_MODE_DEVICE:
+                dwc3_gadget_exit(dwc);
+                break;
+        case DWC3_MODE_HOST:
+                dwc3_host_exit(dwc);
+                break;
+        case DWC3_MODE_DRD:
+                dwc3_host_exit(dwc);
                 dwc3_gadget_exit(dwc);
+                break;
+        default:
+                /* do nothing */
+                break;
+        }
 
 err4:
         dwc3_core_exit(dwc);
@@ -420,10 +563,8 @@ err0:
 
 static int __devexit dwc3_remove(struct platform_device *pdev)
 {
-        const struct platform_device_id *id = platform_get_device_id(pdev);
         struct dwc3     *dwc = platform_get_drvdata(pdev);
         struct resource *res;
-        unsigned int    features = id->driver_data;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
@@ -432,8 +573,21 @@ static int __devexit dwc3_remove(struct platform_device *pdev)
 
         dwc3_debugfs_exit(dwc);
 
-        if (features & DWC3_HAS_PERIPHERAL)
+        switch (dwc->mode) {
+        case DWC3_MODE_DEVICE:
+                dwc3_gadget_exit(dwc);
+                break;
+        case DWC3_MODE_HOST:
+                dwc3_host_exit(dwc);
+                break;
+        case DWC3_MODE_DRD:
+                dwc3_host_exit(dwc);
                 dwc3_gadget_exit(dwc);
+                break;
+        default:
+                /* do nothing */
+                break;
+        }
 
         dwc3_core_exit(dwc);
         release_mem_region(res->start, resource_size(res));
@@ -443,30 +597,15 @@ static int __devexit dwc3_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct platform_device_id dwc3_id_table[] __devinitconst = {
-        {
-                .name   = "dwc3-omap",
-                .driver_data = (DWC3_HAS_PERIPHERAL
-                        | DWC3_HAS_XHCI
-                        | DWC3_HAS_OTG),
-        },
-        {
-                .name   = "dwc3-pci",
-                .driver_data = DWC3_HAS_PERIPHERAL,
-        },
-        {  },   /* Terminating Entry */
-};
-MODULE_DEVICE_TABLE(platform, dwc3_id_table);
-
 static struct platform_driver dwc3_driver = {
         .probe          = dwc3_probe,
         .remove         = __devexit_p(dwc3_remove),
         .driver         = {
                 .name   = "dwc3",
         },
-        .id_table       = dwc3_id_table,
 };
 
+MODULE_ALIAS("platform:dwc3");
 MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DESCRIPTION("DesignWare USB3 DRD Controller Driver");
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 29a8e1679e12..9e57f8e9bf17 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -41,6 +41,7 @@
 
 #include <linux/device.h>
 #include <linux/spinlock.h>
+#include <linux/ioport.h>
 #include <linux/list.h>
 #include <linux/dma-mapping.h>
 #include <linux/mm.h>
@@ -52,7 +53,6 @@
 /* Global constants */
 #define DWC3_ENDPOINTS_NUM      32
 
-#define DWC3_EVENT_BUFFERS_NUM  2
 #define DWC3_EVENT_BUFFERS_SIZE PAGE_SIZE
 #define DWC3_EVENT_TYPE_MASK    0xfe
 
@@ -153,6 +153,7 @@
 #define DWC3_GCTL_CLK_PIPEHALF  (2)
 #define DWC3_GCTL_CLK_MASK      (3)
 
+#define DWC3_GCTL_PRTCAP(n)     (((n) & (3 << 12)) >> 12)
 #define DWC3_GCTL_PRTCAPDIR(n)  (n << 12)
 #define DWC3_GCTL_PRTCAP_HOST   1
 #define DWC3_GCTL_PRTCAP_DEVICE 2
@@ -347,6 +348,7 @@ struct dwc3_ep {
         u32                     free_slot;
         u32                     busy_slot;
         const struct usb_endpoint_descriptor *desc;
+        const struct usb_ss_ep_comp_descriptor *comp_desc;
         struct dwc3             *dwc;
 
         unsigned                flags;
@@ -536,6 +538,31 @@ struct dwc3_hwparams {
         u32     hwparams8;
 };
 
+/* HWPARAMS0 */
+#define DWC3_MODE(n)            ((n) & 0x7)
+
+#define DWC3_MODE_DEVICE        0
+#define DWC3_MODE_HOST          1
+#define DWC3_MODE_DRD           2
+#define DWC3_MODE_HUB           3
+
+/* HWPARAMS1 */
+#define DWC3_NUM_INT(n) (((n) & (0x3f << 15)) >> 15)
+
+struct dwc3_request {
+        struct usb_request      request;
+        struct list_head        list;
+        struct dwc3_ep          *dep;
+
+        u8                      epnum;
+        struct dwc3_trb_hw      *trb;
+        dma_addr_t              trb_dma;
+
+        unsigned                direction:1;
+        unsigned                mapped:1;
+        unsigned                queued:1;
+};
+
 /**
  * struct dwc3 - representation of our controller
  * @ctrl_req: usb control request which is used for ep0
@@ -549,19 +576,24 @@ struct dwc3_hwparams {
  * @ep0_bounce_addr: dma address of ep0_bounce
  * @lock: for synchronizing
  * @dev: pointer to our struct device
+ * @xhci: pointer to our xHCI child
  * @event_buffer_list: a list of event buffers
  * @gadget: device side representation of the peripheral controller
  * @gadget_driver: pointer to the gadget driver
  * @regs: base address for our registers
  * @regs_size: address space size
  * @irq: IRQ number
+ * @num_event_buffers: calculated number of event buffers
+ * @u1u2: only used on revisions <1.83a for workaround
+ * @maximum_speed: maximum speed requested (mainly for testing purposes)
  * @revision: revision register contents
+ * @mode: mode of operation
  * @is_selfpowered: true when we are selfpowered
  * @three_stage_setup: set if we perform a three phase setup
- * @ep0_status_pending: ep0 status response without a req is pending
  * @ep0_bounced: true when we used bounce buffer
  * @ep0_expect_in: true when we expect a DATA IN transfer
  * @start_config_issued: true when StartConfig command has been issued
+ * @setup_packet_pending: true when there's a Setup Packet in FIFO. Workaround
  * @ep0_next_event: hold the next expected event
  * @ep0state: state of endpoint zero
  * @link_state: link state
@@ -579,12 +611,15 @@ struct dwc3 {
         dma_addr_t              ep0_trb_addr;
         dma_addr_t              setup_buf_addr;
         dma_addr_t              ep0_bounce_addr;
-        struct usb_request      ep0_usb_req;
+        struct dwc3_request     ep0_usb_req;
         /* device lock */
         spinlock_t              lock;
         struct device           *dev;
 
-        struct dwc3_event_buffer *ev_buffs[DWC3_EVENT_BUFFERS_NUM];
+        struct platform_device  *xhci;
+        struct resource         *res;
+
+        struct dwc3_event_buffer **ev_buffs;
         struct dwc3_ep          *eps[DWC3_ENDPOINTS_NUM];
 
         struct usb_gadget       gadget;
@@ -595,7 +630,11 @@ struct dwc3 {
 
         int                     irq;
 
+        u32                     num_event_buffers;
+        u32                     u1u2;
+        u32                     maximum_speed;
         u32                     revision;
+        u32                     mode;
 
 #define DWC3_REVISION_173A      0x5533173a
 #define DWC3_REVISION_175A      0x5533175a
@@ -607,10 +646,11 @@ struct dwc3 {
 
         unsigned                is_selfpowered:1;
         unsigned                three_stage_setup:1;
-        unsigned                ep0_status_pending:1;
         unsigned                ep0_bounced:1;
         unsigned                ep0_expect_in:1;
         unsigned                start_config_issued:1;
+        unsigned                setup_packet_pending:1;
+        unsigned                delayed_status:1;
 
         enum dwc3_ep0_next      ep0_next_event;
         enum dwc3_ep0_state     ep0state;
@@ -765,4 +805,16 @@ union dwc3_event {
 #define DWC3_HAS_XHCI                   BIT(1)
 #define DWC3_HAS_OTG                    BIT(3)
 
+/* prototypes */
+void dwc3_set_mode(struct dwc3 *dwc, u32 mode);
+
+int dwc3_host_init(struct dwc3 *dwc);
+void dwc3_host_exit(struct dwc3 *dwc);
+
+int dwc3_gadget_init(struct dwc3 *dwc);
+void dwc3_gadget_exit(struct dwc3 *dwc);
+
+extern int dwc3_get_device_id(void);
+extern void dwc3_put_device_id(int id);
+
 #endif /* __DRIVERS_USB_DWC3_CORE_H */
diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c
index fcfa91517ea1..433c97c15fc5 100644
--- a/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@ -44,12 +44,12 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/delay.h>
-
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include "core.h"
 #include "gadget.h"
 #include "io.h"
+#include "debug.h"
 
 #define dump_register(nm)                               \
 {                                                       \
@@ -395,6 +395,75 @@ static const struct file_operations dwc3_regdump_fops = {
         .release                = single_release,
 };
 
+static int dwc3_mode_show(struct seq_file *s, void *unused)
+{
+        struct dwc3             *dwc = s->private;
+        unsigned long           flags;
+        u32                     reg;
+
+        spin_lock_irqsave(&dwc->lock, flags);
+        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
+        spin_unlock_irqrestore(&dwc->lock, flags);
+
+        switch (DWC3_GCTL_PRTCAP(reg)) {
+        case DWC3_GCTL_PRTCAP_HOST:
+                seq_printf(s, "host\n");
+                break;
+        case DWC3_GCTL_PRTCAP_DEVICE:
+                seq_printf(s, "device\n");
+                break;
+        case DWC3_GCTL_PRTCAP_OTG:
+                seq_printf(s, "OTG\n");
+                break;
+        default:
+                seq_printf(s, "UNKNOWN %08x\n", DWC3_GCTL_PRTCAP(reg));
+        }
+
+        return 0;
+}
+
+static int dwc3_mode_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, dwc3_mode_show, inode->i_private);
+}
+
+static ssize_t dwc3_mode_write(struct file *file,
+                const char __user *ubuf, size_t count, loff_t *ppos)
+{
+        struct seq_file         *s = file->private_data;
+        struct dwc3             *dwc = s->private;
+        unsigned long           flags;
+        u32                     mode = 0;
+        char                    buf[32];
+
+        if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count)))
+                return -EFAULT;
+
+        if (!strncmp(buf, "host", 4))
+                mode |= DWC3_GCTL_PRTCAP_HOST;
+
+        if (!strncmp(buf, "device", 6))
+                mode |= DWC3_GCTL_PRTCAP_DEVICE;
+
+        if (!strncmp(buf, "otg", 3))
+                mode |= DWC3_GCTL_PRTCAP_OTG;
+
+        if (mode) {
+                spin_lock_irqsave(&dwc->lock, flags);
+                dwc3_set_mode(dwc, mode);
+                spin_unlock_irqrestore(&dwc->lock, flags);
+        }
+        return count;
+}
+
+static const struct file_operations dwc3_mode_fops = {
+        .open                   = dwc3_mode_open,
+        .write                  = dwc3_mode_write,
+        .read                   = seq_read,
+        .llseek                 = seq_lseek,
+        .release                = single_release,
+};
+
 int __devinit dwc3_debugfs_init(struct dwc3 *dwc)
 {
         struct dentry           *root;
@@ -402,7 +471,7 @@ int __devinit dwc3_debugfs_init(struct dwc3 *dwc)
         int                     ret;
 
         root = debugfs_create_dir(dev_name(dwc->dev), NULL);
-        if (IS_ERR(root)){
+        if (IS_ERR(root)) {
                 ret = PTR_ERR(root);
                 goto err0;
         }
@@ -415,6 +484,14 @@ int __devinit dwc3_debugfs_init(struct dwc3 *dwc)
                 ret = PTR_ERR(file);
                 goto err1;
         }
+
+        file = debugfs_create_file("mode", S_IRUGO | S_IWUSR, root,
+                        dwc, &dwc3_mode_fops);
+        if (IS_ERR(file)) {
+                ret = PTR_ERR(file);
+                goto err1;
+        }
+
         return 0;
 
 err1:
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 062552b5fc8a..3274ac8f1200 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -48,6 +48,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 
+#include "core.h"
 #include "io.h"
 
 /*
@@ -200,6 +201,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
         struct dwc3_omap        *omap;
         struct resource         *res;
 
+        int                     devid;
         int                     ret = -ENOMEM;
         int                     irq;
 
@@ -236,16 +238,20 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
                 goto err1;
         }
 
-        dwc3 = platform_device_alloc("dwc3-omap", -1);
+        devid = dwc3_get_device_id();
+        if (devid < 0)
+                goto err2;
+
+        dwc3 = platform_device_alloc("dwc3", devid);
         if (!dwc3) {
                 dev_err(&pdev->dev, "couldn't allocate dwc3 device\n");
-                goto err2;
+                goto err3;
         }
 
         context = kzalloc(resource_size(res), GFP_KERNEL);
         if (!context) {
                 dev_err(&pdev->dev, "couldn't allocate dwc3 context memory\n");
-                goto err3;
+                goto err4;
         }
 
         spin_lock_init(&omap->lock);
@@ -299,7 +305,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(&pdev->dev, "failed to request IRQ #%d --> %d\n",
                                 omap->irq, ret);
-                goto err4;
+                goto err5;
         }
 
         /* enable all IRQs */
@@ -322,26 +328,29 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
                         pdev->num_resources);
         if (ret) {
                 dev_err(&pdev->dev, "couldn't add resources to dwc3 device\n");
-                goto err5;
+                goto err6;
         }
 
         ret = platform_device_add(dwc3);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register dwc3 device\n");
-                goto err5;
+                goto err6;
         }
 
         return 0;
 
-err5:
+err6:
         free_irq(omap->irq, omap);
 
-err4:
+err5:
         kfree(omap->context);
 
-err3:
+err4:
         platform_device_put(dwc3);
 
+err3:
+        dwc3_put_device_id(devid);
+
 err2:
         iounmap(base);
 
@@ -358,6 +367,7 @@ static int __devexit dwc3_omap_remove(struct platform_device *pdev)
 
         platform_device_unregister(omap->dwc3);
 
+        dwc3_put_device_id(omap->dwc3->id);
         free_irq(omap->irq, omap);
         iounmap(omap->base);
 
@@ -384,18 +394,9 @@ static struct platform_driver dwc3_omap_driver = {
         },
 };
 
+module_platform_driver(dwc3_omap_driver);
+
+MODULE_ALIAS("platform:omap-dwc3");
 MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DESCRIPTION("DesignWare USB3 OMAP Glue Layer");
-
-static int __devinit dwc3_omap_init(void)
-{
-        return platform_driver_register(&dwc3_omap_driver);
-}
-module_init(dwc3_omap_init);
-
-static void __exit dwc3_omap_exit(void)
-{
-        platform_driver_unregister(&dwc3_omap_driver);
-}
-module_exit(dwc3_omap_exit);
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index f77c00042685..64e1f7c67b08 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -42,52 +42,17 @@
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 
+#include "core.h"
+
 /* FIXME define these in <linux/pci_ids.h> */
 #define PCI_VENDOR_ID_SYNOPSYS          0x16c3
 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd
 
-#define DWC3_PCI_DEVS_POSSIBLE  32
-
 struct dwc3_pci {
         struct device           *dev;
         struct platform_device  *dwc3;
 };
 
-static DECLARE_BITMAP(dwc3_pci_devs, DWC3_PCI_DEVS_POSSIBLE);
-
-static int dwc3_pci_get_device_id(struct dwc3_pci *glue)
-{
-        int             id;
-
-again:
-        id = find_first_zero_bit(dwc3_pci_devs, DWC3_PCI_DEVS_POSSIBLE);
-        if (id < DWC3_PCI_DEVS_POSSIBLE) {
-                int old;
-
-                old = test_and_set_bit(id, dwc3_pci_devs);
-                if (old)
-                        goto again;
-        } else {
-                dev_err(glue->dev, "no space for new device\n");
-                id = -ENOMEM;
-        }
-
-        return 0;
-}
-
-static void dwc3_pci_put_device_id(struct dwc3_pci *glue, int id)
-{
-        int                     ret;
-
-        if (id < 0)
-                return;
-
-        ret = test_bit(id, dwc3_pci_devs);
-        WARN(!ret, "Device: %s\nID %d not in use\n",
-                        dev_driver_string(glue->dev), id);
-        clear_bit(id, dwc3_pci_devs);
-}
-
 static int __devinit dwc3_pci_probe(struct pci_dev *pci,
                 const struct pci_device_id *id)
 {
@@ -114,11 +79,11 @@ static int __devinit dwc3_pci_probe(struct pci_dev *pci,
         pci_set_power_state(pci, PCI_D0);
         pci_set_master(pci);
 
-        devid = dwc3_pci_get_device_id(glue);
+        devid = dwc3_get_device_id();
         if (devid < 0)
                 goto err2;
 
-        dwc3 = platform_device_alloc("dwc3-pci", devid);
+        dwc3 = platform_device_alloc("dwc3", devid);
         if (!dwc3) {
                 dev_err(&pci->dev, "couldn't allocate dwc3 device\n");
                 goto err3;
@@ -163,13 +128,13 @@ err4:
         platform_device_put(dwc3);
 
 err3:
-        dwc3_pci_put_device_id(glue, devid);
+        dwc3_put_device_id(devid);
 
 err2:
         pci_disable_device(pci);
 
 err1:
-        kfree(pci);
+        kfree(glue);
 
 err0:
         return ret;
@@ -179,7 +144,7 @@ static void __devexit dwc3_pci_remove(struct pci_dev *pci)
 {
         struct dwc3_pci *glue = pci_get_drvdata(pci);
 
-        dwc3_pci_put_device_id(glue, glue->dwc3->id);
+        dwc3_put_device_id(glue->dwc3->id);
         platform_device_unregister(glue->dwc3);
         pci_set_drvdata(pci, NULL);
         pci_disable_device(pci);
@@ -196,7 +161,7 @@ static DEFINE_PCI_DEVICE_TABLE(dwc3_pci_id_table) = {
 MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table);
 
 static struct pci_driver dwc3_pci_driver = {
-        .name           = "pci-dwc3",
+        .name           = "dwc3-pci",
         .id_table       = dwc3_pci_id_table,
         .probe          = dwc3_pci_probe,
         .remove         = __devexit_p(dwc3_pci_remove),
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 69a4e43ddf59..2f51de57593a 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -48,13 +48,13 @@
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/usb/composite.h>
 
 #include "core.h"
 #include "gadget.h"
 #include "io.h"
 
-static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,
-                const struct dwc3_event_depevt *event);
+static void dwc3_ep0_do_control_status(struct dwc3 *dwc, u32 epnum);
 
 static const char *dwc3_ep0_state_string(enum dwc3_ep0_state state)
 {
@@ -125,6 +125,8 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
 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;
@@ -143,9 +145,7 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
          * IRQ we were waiting for is long gone.
          */
         if (dep->flags & DWC3_EP_PENDING_REQUEST) {
-                struct dwc3     *dwc = dep->dwc;
                 unsigned        direction;
-                u32             type;
 
                 direction = !!(dep->flags & DWC3_EP0_DIR_IN);
 
@@ -165,6 +165,13 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
                                 req->request.dma, req->request.length, type);
                 dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
                                 DWC3_EP0_DIR_IN);
+        } else if (dwc->delayed_status) {
+                dwc->delayed_status = false;
+
+                if (dwc->ep0state == EP0_STATUS_PHASE)
+                        dwc3_ep0_do_control_status(dwc, 1);
+                else
+                        dev_dbg(dwc->dev, "too early for delayed status\n");
         }
 
         return ret;
@@ -190,9 +197,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
         }
 
         /* we share one TRB for ep0/1 */
-        if (!list_empty(&dwc->eps[0]->request_list) ||
-                        !list_empty(&dwc->eps[1]->request_list) ||
-                        dwc->ep0_status_pending) {
+        if (!list_empty(&dep->request_list)) {
                 ret = -EBUSY;
                 goto out;
         }
@@ -214,8 +219,9 @@ static void dwc3_ep0_stall_and_restart(struct dwc3 *dwc)
         struct dwc3_ep          *dep = dwc->eps[0];
 
         /* stall is always issued on EP0 */
-        __dwc3_gadget_ep_set_halt(dwc->eps[0], 1);
-        dwc->eps[0]->flags = DWC3_EP_ENABLED;
+        __dwc3_gadget_ep_set_halt(dep, 1);
+        dep->flags = DWC3_EP_ENABLED;
+        dwc->delayed_status = false;
 
         if (!list_empty(&dep->request_list)) {
                 struct dwc3_request     *req;
@@ -254,17 +260,14 @@ static struct dwc3_ep *dwc3_wIndex_to_dep(struct dwc3 *dwc, __le16 wIndex_le)
         return NULL;
 }
 
-static void dwc3_ep0_send_status_response(struct dwc3 *dwc)
+static void dwc3_ep0_status_cmpl(struct usb_ep *ep, struct usb_request *req)
 {
-        dwc3_ep0_start_trans(dwc, 1, dwc->setup_buf_addr,
-                        dwc->ep0_usb_req.length,
-                        DWC3_TRBCTL_CONTROL_DATA);
 }
-
 /*
  * ch 9.4.5
  */
-static int dwc3_ep0_handle_status(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
+static int dwc3_ep0_handle_status(struct dwc3 *dwc,
+                struct usb_ctrlrequest *ctrl)
 {
         struct dwc3_ep          *dep;
         u32                     recip;
@@ -291,7 +294,7 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl
         case USB_RECIP_ENDPOINT:
                 dep = dwc3_wIndex_to_dep(dwc, ctrl->wIndex);
                 if (!dep)
-                       return -EINVAL;
+                        return -EINVAL;
 
                 if (dep->flags & DWC3_EP_STALL)
                         usb_status = 1 << USB_ENDPOINT_HALT;
@@ -302,10 +305,14 @@ static int dwc3_ep0_handle_status(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl
 
         response_pkt = (__le16 *) dwc->setup_buf;
         *response_pkt = cpu_to_le16(usb_status);
-        dwc->ep0_usb_req.length = sizeof(*response_pkt);
-        dwc->ep0_status_pending = 1;
 
-        return 0;
+        dep = dwc->eps[0];
+        dwc->ep0_usb_req.dep = dep;
+        dwc->ep0_usb_req.request.length = sizeof(*response_pkt);
+        dwc->ep0_usb_req.request.dma = dwc->setup_buf_addr;
+        dwc->ep0_usb_req.request.complete = dwc3_ep0_status_cmpl;
+
+        return __dwc3_gadget_ep0_queue(dep, &dwc->ep0_usb_req);
 }
 
 static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
@@ -396,8 +403,7 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
         case USB_RECIP_ENDPOINT:
                 switch (wValue) {
                 case USB_ENDPOINT_HALT:
-
-                        dep =  dwc3_wIndex_to_dep(dwc, ctrl->wIndex);
+                        dep =  dwc3_wIndex_to_dep(dwc, wIndex);
                         if (!dep)
                                 return -EINVAL;
                         ret = __dwc3_gadget_ep_set_halt(dep, set);
@@ -422,8 +428,15 @@ static int dwc3_ep0_set_address(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
         u32 reg;
 
         addr = le16_to_cpu(ctrl->wValue);
-        if (addr > 127)
+        if (addr > 127) {
+                dev_dbg(dwc->dev, "invalid device address %d\n", addr);
                 return -EINVAL;
+        }
+
+        if (dwc->dev_state == DWC3_CONFIGURED_STATE) {
+                dev_dbg(dwc->dev, "trying to set address when configured\n");
+                return -EINVAL;
+        }
 
         reg = dwc3_readl(dwc->regs, DWC3_DCFG);
         reg &= ~(DWC3_DCFG_DEVADDR_MASK);
@@ -473,8 +486,10 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
                 if (!cfg)
                         dwc->dev_state = DWC3_ADDRESS_STATE;
                 break;
+        default:
+                ret = -EINVAL;
         }
-        return 0;
+        return ret;
 }
 
 static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
@@ -537,6 +552,9 @@ static void dwc3_ep0_inspect_setup(struct dwc3 *dwc,
         else
                 ret = dwc3_ep0_delegate_req(dwc, ctrl);
 
+        if (ret == USB_GADGET_DELAYED_STATUS)
+                dwc->delayed_status = true;
+
         if (ret >= 0)
                 return;
 
@@ -550,27 +568,21 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
         struct dwc3_request     *r = NULL;
         struct usb_request      *ur;
         struct dwc3_trb         trb;
-        struct dwc3_ep          *dep;
+        struct dwc3_ep          *ep0;
         u32                     transferred;
         u8                      epnum;
 
         epnum = event->endpoint_number;
-        dep = dwc->eps[epnum];
+        ep0 = dwc->eps[0];
 
         dwc->ep0_next_event = DWC3_EP0_NRDY_STATUS;
 
-        if (!dwc->ep0_status_pending) {
-                r = next_request(&dwc->eps[0]->request_list);
-                ur = &r->request;
-        } else {
-                ur = &dwc->ep0_usb_req;
-                dwc->ep0_status_pending = 0;
-        }
+        r = next_request(&ep0->request_list);
+        ur = &r->request;
 
         dwc3_trb_to_nat(dwc->ep0_trb, &trb);
 
         if (dwc->ep0_bounced) {
-                struct dwc3_ep  *ep0 = dwc->eps[0];
 
                 transferred = min_t(u32, ur->length,
                                 ep0->endpoint.maxpacket - trb.length);
@@ -591,7 +603,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
                  * seems to be case when req.length > maxpacket. Could it be?
                  */
                 if (r)
-                        dwc3_gadget_giveback(dep, r, 0);
+                        dwc3_gadget_giveback(ep0, r, 0);
         }
 }
 
@@ -619,6 +631,7 @@ static void dwc3_ep0_xfer_complete(struct dwc3 *dwc,
         struct dwc3_ep          *dep = dwc->eps[event->endpoint_number];
 
         dep->flags &= ~DWC3_EP_BUSY;
+        dwc->setup_packet_pending = false;
 
         switch (dwc->ep0state) {
         case EP0_SETUP_PHASE:
@@ -643,7 +656,6 @@ static void dwc3_ep0_xfer_complete(struct dwc3 *dwc,
 static void dwc3_ep0_do_control_setup(struct dwc3 *dwc,
                 const struct dwc3_event_depevt *event)
 {
-        dwc->ep0state = EP0_SETUP_PHASE;
         dwc3_ep0_out_start(dwc);
 }
 
@@ -655,12 +667,6 @@ static void dwc3_ep0_do_control_data(struct dwc3 *dwc,
         int                     ret;
 
         dep = dwc->eps[0];
-        dwc->ep0state = EP0_DATA_PHASE;
-
-        if (dwc->ep0_status_pending) {
-                dwc3_ep0_send_status_response(dwc);
-                return;
-        }
 
         if (list_empty(&dep->request_list)) {
                 dev_vdbg(dwc->dev, "pending request for EP0 Data phase\n");
@@ -674,7 +680,6 @@ static void dwc3_ep0_do_control_data(struct dwc3 *dwc,
         req = next_request(&dep->request_list);
         req->direction = !!event->endpoint_number;
 
-        dwc->ep0state = EP0_DATA_PHASE;
         if (req->request.length == 0) {
                 ret = dwc3_ep0_start_trans(dwc, event->endpoint_number,
                                 dwc->ctrl_req_addr, 0,
@@ -706,35 +711,79 @@ static void dwc3_ep0_do_control_data(struct dwc3 *dwc,
         WARN_ON(ret < 0);
 }
 
-static void dwc3_ep0_do_control_status(struct dwc3 *dwc,
-                const struct dwc3_event_depevt *event)
+static int dwc3_ep0_start_control_status(struct dwc3_ep *dep)
 {
+        struct dwc3             *dwc = dep->dwc;
         u32                     type;
-        int                     ret;
-
-        dwc->ep0state = EP0_STATUS_PHASE;
 
         type = dwc->three_stage_setup ? DWC3_TRBCTL_CONTROL_STATUS3
                 : DWC3_TRBCTL_CONTROL_STATUS2;
 
-        ret = dwc3_ep0_start_trans(dwc, event->endpoint_number,
+        return dwc3_ep0_start_trans(dwc, dep->number,
                         dwc->ctrl_req_addr, 0, type);
+}
 
-        WARN_ON(ret < 0);
+static void dwc3_ep0_do_control_status(struct dwc3 *dwc, u32 epnum)
+{
+        struct dwc3_ep          *dep = dwc->eps[epnum];
+
+        WARN_ON(dwc3_ep0_start_control_status(dep));
 }
 
 static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
                 const struct dwc3_event_depevt *event)
 {
+        dwc->setup_packet_pending = true;
+
+        /*
+         * This part is very tricky: If we has just handled
+         * XferNotReady(Setup) and we're now expecting a
+         * XferComplete but, instead, we receive another
+         * XferNotReady(Setup), we should STALL and restart
+         * the state machine.
+         *
+         * In all other cases, we just continue waiting
+         * for the XferComplete event.
+         *
+         * We are a little bit unsafe here because we're
+         * not trying to ensure that last event was, indeed,
+         * XferNotReady(Setup).
+         *
+         * Still, we don't expect any condition where that
+         * should happen and, even if it does, it would be
+         * another error condition.
+         */
+        if (dwc->ep0_next_event == DWC3_EP0_COMPLETE) {
+                switch (event->status) {
+                case DEPEVT_STATUS_CONTROL_SETUP:
+                        dev_vdbg(dwc->dev, "Unexpected XferNotReady(Setup)\n");
+                        dwc3_ep0_stall_and_restart(dwc);
+                        break;
+                case DEPEVT_STATUS_CONTROL_DATA:
+                        /* FALLTHROUGH */
+                case DEPEVT_STATUS_CONTROL_STATUS:
+                        /* FALLTHROUGH */
+                default:
+                        dev_vdbg(dwc->dev, "waiting for XferComplete\n");
+                }
+
+                return;
+        }
+
         switch (event->status) {
         case DEPEVT_STATUS_CONTROL_SETUP:
                 dev_vdbg(dwc->dev, "Control Setup\n");
+
+                dwc->ep0state = EP0_SETUP_PHASE;
+
                 dwc3_ep0_do_control_setup(dwc, event);
                 break;
 
         case DEPEVT_STATUS_CONTROL_DATA:
                 dev_vdbg(dwc->dev, "Control Data\n");
 
+                dwc->ep0state = EP0_DATA_PHASE;
+
                 if (dwc->ep0_next_event != DWC3_EP0_NRDY_DATA) {
                         dev_vdbg(dwc->dev, "Expected %d got %d\n",
                                         dwc->ep0_next_event,
@@ -764,6 +813,8 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
         case DEPEVT_STATUS_CONTROL_STATUS:
                 dev_vdbg(dwc->dev, "Control Status\n");
 
+                dwc->ep0state = EP0_STATUS_PHASE;
+
                 if (dwc->ep0_next_event != DWC3_EP0_NRDY_STATUS) {
                         dev_vdbg(dwc->dev, "Expected %d got %d\n",
                                         dwc->ep0_next_event,
@@ -772,12 +823,19 @@ static void dwc3_ep0_xfernotready(struct dwc3 *dwc,
                         dwc3_ep0_stall_and_restart(dwc);
                         return;
                 }
-                dwc3_ep0_do_control_status(dwc, event);
+
+                if (dwc->delayed_status) {
+                        WARN_ON_ONCE(event->endpoint_number != 1);
+                        dev_vdbg(dwc->dev, "Mass Storage delayed status\n");
+                        return;
+                }
+
+                dwc3_ep0_do_control_status(dwc, event->endpoint_number);
         }
 }
 
 void dwc3_ep0_interrupt(struct dwc3 *dwc,
-                const const struct dwc3_event_depevt *event)
+                const struct dwc3_event_depevt *event)
 {
         u8                      epnum = event->endpoint_number;
 
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 25dbd8614e72..a696bde53222 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -65,6 +65,22 @@ void dwc3_map_buffer_to_dma(struct dwc3_request *req)
                 return;
         }
 
+        if (req->request.num_sgs) {
+                int     mapped;
+
+                mapped = dma_map_sg(dwc->dev, req->request.sg,
+                                req->request.num_sgs,
+                                req->direction ? DMA_TO_DEVICE
+                                : DMA_FROM_DEVICE);
+                if (mapped < 0) {
+                        dev_err(dwc->dev, "failed to map SGs\n");
+                        return;
+                }
+
+                req->request.num_mapped_sgs = mapped;
+                return;
+        }
+
         if (req->request.dma == DMA_ADDR_INVALID) {
                 req->request.dma = dma_map_single(dwc->dev, req->request.buf,
                                 req->request.length, req->direction
@@ -82,6 +98,17 @@ void dwc3_unmap_buffer_from_dma(struct dwc3_request *req)
                 return;
         }
 
+        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->direction ? DMA_TO_DEVICE
+                                : DMA_FROM_DEVICE);
+
+                req->request.num_mapped_sgs = 0;
+                return;
+        }
+
         if (req->mapped) {
                 dma_unmap_single(dwc->dev, req->request.dma,
                                 req->request.length, req->direction
@@ -97,7 +124,11 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
         struct dwc3                     *dwc = dep->dwc;
 
         if (req->queued) {
-                dep->busy_slot++;
+                if (req->request.num_mapped_sgs)
+                        dep->busy_slot += req->request.num_mapped_sgs;
+                else
+                        dep->busy_slot++;
+
                 /*
                  * Skip LINK TRB. We can't use req->trb and check for
                  * DWC3_TRBCTL_LINK_TRB because it points the TRB we just
@@ -108,6 +139,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
                         dep->busy_slot++;
         }
         list_del(&req->list);
+        req->trb = NULL;
 
         if (req->request.status == -EINPROGRESS)
                 req->request.status = status;
@@ -251,7 +283,8 @@ static int dwc3_gadget_start_config(struct dwc3 *dwc, struct dwc3_ep *dep)
 }
 
 static int dwc3_gadget_set_ep_config(struct dwc3 *dwc, struct dwc3_ep *dep,
-                const struct usb_endpoint_descriptor *desc)
+                const struct usb_endpoint_descriptor *desc,
+                const struct usb_ss_ep_comp_descriptor *comp_desc)
 {
         struct dwc3_gadget_ep_cmd_params params;
 
@@ -264,7 +297,7 @@ static int dwc3_gadget_set_ep_config(struct dwc3 *dwc, struct dwc3_ep *dep,
         params.param1 = DWC3_DEPCFG_XFER_COMPLETE_EN
                 | DWC3_DEPCFG_XFER_NOT_READY_EN;
 
-        if (usb_endpoint_xfer_bulk(desc) && dep->endpoint.max_streams) {
+        if (usb_ss_max_streams(comp_desc) && usb_endpoint_xfer_bulk(desc)) {
                 params.param1 |= DWC3_DEPCFG_STREAM_CAPABLE
                         | DWC3_DEPCFG_STREAM_EVENT_EN;
                 dep->stream_capable = true;
@@ -317,7 +350,8 @@ static int dwc3_gadget_set_xfer_resource(struct dwc3 *dwc, struct dwc3_ep *dep)
  * Caller should take care of locking
  */
 static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
-                const struct usb_endpoint_descriptor *desc)
+                const struct usb_endpoint_descriptor *desc,
+                const struct usb_ss_ep_comp_descriptor *comp_desc)
 {
         struct dwc3             *dwc = dep->dwc;
         u32                     reg;
@@ -329,7 +363,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                         return ret;
         }
 
-        ret = dwc3_gadget_set_ep_config(dwc, dep, desc);
+        ret = dwc3_gadget_set_ep_config(dwc, dep, desc, comp_desc);
         if (ret)
                 return ret;
 
@@ -343,6 +377,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
                         return ret;
 
                 dep->desc = desc;
+                dep->comp_desc = comp_desc;
                 dep->type = usb_endpoint_type(desc);
                 dep->flags |= DWC3_EP_ENABLED;
 
@@ -405,6 +440,7 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
 
         dep->stream_capable = false;
         dep->desc = NULL;
+        dep->comp_desc = NULL;
         dep->type = 0;
         dep->flags = 0;
 
@@ -473,7 +509,7 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,
         dev_vdbg(dwc->dev, "Enabling %s\n", dep->name);
 
         spin_lock_irqsave(&dwc->lock, flags);
-        ret = __dwc3_gadget_ep_enable(dep, desc);
+        ret = __dwc3_gadget_ep_enable(dep, desc, ep->comp_desc);
         spin_unlock_irqrestore(&dwc->lock, flags);
 
         return ret;
@@ -539,6 +575,85 @@ static void dwc3_gadget_ep_free_request(struct usb_ep *ep,
         kfree(req);
 }
 
+/**
+ * dwc3_prepare_one_trb - setup one TRB from one request
+ * @dep: endpoint for which this request is prepared
+ * @req: dwc3_request pointer
+ */
+static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
+                struct dwc3_request *req, dma_addr_t dma,
+                unsigned length, unsigned last, unsigned chain)
+{
+        struct dwc3             *dwc = dep->dwc;
+        struct dwc3_trb_hw      *trb_hw;
+        struct dwc3_trb         trb;
+
+        unsigned int            cur_slot;
+
+        dev_vdbg(dwc->dev, "%s: req %p dma %08llx length %d%s%s\n",
+                        dep->name, req, (unsigned long long) dma,
+                        length, last ? " last" : "",
+                        chain ? " chain" : "");
+
+        trb_hw = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
+        cur_slot = dep->free_slot;
+        dep->free_slot++;
+
+        /* Skip the LINK-TRB on ISOC */
+        if (((cur_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
+                        usb_endpoint_xfer_isoc(dep->desc))
+                return;
+
+        memset(&trb, 0, sizeof(trb));
+        if (!req->trb) {
+                dwc3_gadget_move_request_queued(req);
+                req->trb = trb_hw;
+                req->trb_dma = dwc3_trb_dma_offset(dep, trb_hw);
+        }
+
+        if (usb_endpoint_xfer_isoc(dep->desc)) {
+                trb.isp_imi = true;
+                trb.csp = true;
+        } else {
+                trb.chn = chain;
+                trb.lst = last;
+        }
+
+        if (usb_endpoint_xfer_bulk(dep->desc) && dep->stream_capable)
+                trb.sid_sofn = req->request.stream_id;
+
+        switch (usb_endpoint_type(dep->desc)) {
+        case USB_ENDPOINT_XFER_CONTROL:
+                trb.trbctl = DWC3_TRBCTL_CONTROL_SETUP;
+                break;
+
+        case USB_ENDPOINT_XFER_ISOC:
+                trb.trbctl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;
+
+                /* IOC every DWC3_TRB_NUM / 4 so we can refill */
+                if (!(cur_slot % (DWC3_TRB_NUM / 4)))
+                        trb.ioc = last;
+                break;
+
+        case USB_ENDPOINT_XFER_BULK:
+        case USB_ENDPOINT_XFER_INT:
+                trb.trbctl = DWC3_TRBCTL_NORMAL;
+                break;
+        default:
+                /*
+                 * This is only possible with faulty memory because we
+                 * checked it already :)
+                 */
+                BUG();
+        }
+
+        trb.length      = length;
+        trb.bplh        = dma;
+        trb.hwo         = true;
+
+        dwc3_trb_to_hw(&trb, trb_hw);
+}
+
 /*
  * dwc3_prepare_trbs - setup TRBs from requests
  * @dep: endpoint for which requests are being prepared
@@ -548,18 +663,17 @@ static void dwc3_gadget_ep_free_request(struct usb_ep *ep,
  * transfers. The functions returns once there are not more TRBs available or
  * it run out of requests.
  */
-static struct dwc3_request *dwc3_prepare_trbs(struct dwc3_ep *dep,
-                bool starting)
+static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
 {
-        struct dwc3_request     *req, *n, *ret = NULL;
-        struct dwc3_trb_hw      *trb_hw;
-        struct dwc3_trb         trb;
+        struct dwc3_request     *req, *n;
         u32                     trbs_left;
+        unsigned int            last_one = 0;
 
         BUILD_BUG_ON_NOT_POWER_OF_2(DWC3_TRB_NUM);
 
         /* the first request must not be queued */
         trbs_left = (dep->busy_slot - dep->free_slot) & DWC3_TRB_MASK;
+
         /*
          * if busy & slot are equal than it is either full or empty. If we are
          * starting to proceed requests then we are empty. Otherwise we ar
@@ -567,7 +681,7 @@ static struct dwc3_request *dwc3_prepare_trbs(struct dwc3_ep *dep,
          */
         if (!trbs_left) {
                 if (!starting)
-                        return NULL;
+                        return;
                 trbs_left = DWC3_TRB_NUM;
                 /*
                  * In case we start from scratch, we queue the ISOC requests
@@ -591,94 +705,62 @@ static struct dwc3_request *dwc3_prepare_trbs(struct dwc3_ep *dep,
 
         /* The last TRB is a link TRB, not used for xfer */
         if ((trbs_left <= 1) && usb_endpoint_xfer_isoc(dep->desc))
-                return NULL;
+                return;
 
         list_for_each_entry_safe(req, n, &dep->request_list, list) {
-                unsigned int last_one = 0;
-                unsigned int cur_slot;
+                unsigned        length;
+                dma_addr_t      dma;
 
-                trb_hw = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];
-                cur_slot = dep->free_slot;
-                dep->free_slot++;
+                if (req->request.num_mapped_sgs > 0) {
+                        struct usb_request *request = &req->request;
+                        struct scatterlist *sg = request->sg;
+                        struct scatterlist *s;
+                        int             i;
 
-                /* Skip the LINK-TRB on ISOC */
-                if (((cur_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
-                                usb_endpoint_xfer_isoc(dep->desc))
-                        continue;
+                        for_each_sg(sg, s, request->num_mapped_sgs, i) {
+                                unsigned chain = true;
 
-                dwc3_gadget_move_request_queued(req);
-                memset(&trb, 0, sizeof(trb));
-                trbs_left--;
+                                length = sg_dma_len(s);
+                                dma = sg_dma_address(s);
 
-                /* Is our TRB pool empty? */
-                if (!trbs_left)
-                        last_one = 1;
-                /* Is this the last request? */
-                if (list_empty(&dep->request_list))
-                        last_one = 1;
+                                if (i == (request->num_mapped_sgs - 1)
+                                                || sg_is_last(s)) {
+                                        last_one = true;
+                                        chain = false;
+                                }
 
-                /*
-                 * FIXME we shouldn't need to set LST bit always but we are
-                 * facing some weird problem with the Hardware where it doesn't
-                 * complete even though it has been previously started.
-                 *
-                 * While we're debugging the problem, as a workaround to
-                 * multiple TRBs handling, use only one TRB at a time.
-                 */
-                last_one = 1;
+                                trbs_left--;
+                                if (!trbs_left)
+                                        last_one = true;
 
-                req->trb = trb_hw;
-                if (!ret)
-                        ret = req;
+                                if (last_one)
+                                        chain = false;
 
-                trb.bplh = req->request.dma;
+                                dwc3_prepare_one_trb(dep, req, dma, length,
+                                                last_one, chain);
 
-                if (usb_endpoint_xfer_isoc(dep->desc)) {
-                        trb.isp_imi = true;
-                        trb.csp = true;
+                                if (last_one)
+                                        break;
+                        }
                 } else {
-                        trb.lst = last_one;
-                }
+                        dma = req->request.dma;
+                        length = req->request.length;
+                        trbs_left--;
 
-                if (usb_endpoint_xfer_bulk(dep->desc) && dep->stream_capable)
-                        trb.sid_sofn = req->request.stream_id;
-
-                switch (usb_endpoint_type(dep->desc)) {
-                case USB_ENDPOINT_XFER_CONTROL:
-                        trb.trbctl = DWC3_TRBCTL_CONTROL_SETUP;
-                        break;
+                        if (!trbs_left)
+                                last_one = 1;
 
-                case USB_ENDPOINT_XFER_ISOC:
-                        trb.trbctl = DWC3_TRBCTL_ISOCHRONOUS_FIRST;
+                        /* Is this the last request? */
+                        if (list_is_last(&req->list, &dep->request_list))
+                                last_one = 1;
 
-                        /* IOC every DWC3_TRB_NUM / 4 so we can refill */
-                        if (!(cur_slot % (DWC3_TRB_NUM / 4)))
-                                trb.ioc = last_one;
-                        break;
+                        dwc3_prepare_one_trb(dep, req, dma, length,
+                                        last_one, false);
 
-                case USB_ENDPOINT_XFER_BULK:
-                case USB_ENDPOINT_XFER_INT:
-                        trb.trbctl = DWC3_TRBCTL_NORMAL;
-                        break;
-                default:
-                        /*
-                         * This is only possible with faulty memory because we
-                         * checked it already :)
-                         */
-                        BUG();
+                        if (last_one)
+                                break;
                 }
-
-                trb.length      = req->request.length;
-                trb.hwo = true;
-
-                dwc3_trb_to_hw(&trb, trb_hw);
-                req->trb_dma = dwc3_trb_dma_offset(dep, trb_hw);
-
-                if (last_one)
-                        break;
         }
-
-        return ret;
 }
 
 static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
@@ -707,11 +789,13 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
                 /* req points to the first request which will be sent */
                 req = next_request(&dep->req_queued);
         } else {
+                dwc3_prepare_trbs(dep, start_new);
+
                 /*
                  * req points to the first request where HWO changed
                  * from 0 to 1
                  */
-                req = dwc3_prepare_trbs(dep, start_new);
+                req = next_request(&dep->req_queued);
         }
         if (!req) {
                 dep->flags |= DWC3_EP_PENDING_REQUEST;
@@ -745,8 +829,9 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
         dep->flags |= DWC3_EP_BUSY;
         dep->res_trans_idx = dwc3_gadget_ep_get_transfer_index(dwc,
                         dep->number);
-        if (!dep->res_trans_idx)
-                printk_once(KERN_ERR "%s() res_trans_idx is invalid\n", __func__);
+
+        WARN_ON_ONCE(!dep->res_trans_idx);
+
         return 0;
 }
 
@@ -1155,35 +1240,9 @@ static int dwc3_gadget_start(struct usb_gadget *g,
         dwc->gadget_driver      = driver;
         dwc->gadget.dev.driver  = &driver->driver;
 
-        reg = dwc3_readl(dwc->regs, DWC3_GCTL);
-
-        reg &= ~DWC3_GCTL_SCALEDOWN(3);
-        reg &= ~DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG);
-        reg &= ~DWC3_GCTL_DISSCRAMBLE;
-        reg |= DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_DEVICE);
-
-        switch (DWC3_GHWPARAMS1_EN_PWROPT(dwc->hwparams.hwparams0)) {
-        case DWC3_GHWPARAMS1_EN_PWROPT_CLK:
-                reg &= ~DWC3_GCTL_DSBLCLKGTNG;
-                break;
-        default:
-                dev_dbg(dwc->dev, "No power optimization available\n");
-        }
-
-        /*
-         * WORKAROUND: DWC3 revisions <1.90a have a bug
-         * when The device fails to connect at SuperSpeed
-         * and falls back to high-speed mode which causes
-         * the device to enter in a Connect/Disconnect loop
-         */
-        if (dwc->revision < DWC3_REVISION_190A)
-                reg |= DWC3_GCTL_U2RSTECN;
-
-        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
-
         reg = dwc3_readl(dwc->regs, DWC3_DCFG);
         reg &= ~(DWC3_DCFG_SPEED_MASK);
-        reg |= DWC3_DCFG_SUPERSPEED;
+        reg |= dwc->maximum_speed;
         dwc3_writel(dwc->regs, DWC3_DCFG, reg);
 
         dwc->start_config_issued = false;
@@ -1192,14 +1251,14 @@ static int dwc3_gadget_start(struct usb_gadget *g,
         dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
 
         dep = dwc->eps[0];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc);
+        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 goto err0;
         }
 
         dep = dwc->eps[1];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc);
+        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 goto err1;
@@ -1290,11 +1349,10 @@ static int __devinit dwc3_gadget_init_endpoints(struct dwc3 *dwc)
                                         &dwc->gadget.ep_list);
 
                         ret = dwc3_alloc_trb_pool(dep);
-                        if (ret) {
-                                dev_err(dwc->dev, "%s: failed to allocate TRB pool\n", dep->name);
+                        if (ret)
                                 return ret;
-                        }
                 }
+
                 INIT_LIST_HEAD(&dep->request_list);
                 INIT_LIST_HEAD(&dep->req_queued);
         }
@@ -1334,8 +1392,10 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
 
         do {
                 req = next_request(&dep->req_queued);
-                if (!req)
-                        break;
+                if (!req) {
+                        WARN_ON_ONCE(1);
+                        return 1;
+                }
 
                 dwc3_trb_to_nat(req->trb, &trb);
 
@@ -1400,6 +1460,31 @@ static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc,
                 dep->flags &= ~DWC3_EP_BUSY;
                 dep->res_trans_idx = 0;
         }
+
+        /*
+         * WORKAROUND: This is the 2nd half of U1/U2 -> U0 workaround.
+         * See dwc3_gadget_linksts_change_interrupt() for 1st half.
+         */
+        if (dwc->revision < DWC3_REVISION_183A) {
+                u32             reg;
+                int             i;
+
+                for (i = 0; i < DWC3_ENDPOINTS_NUM; i++) {
+                        struct dwc3_ep  *dep = dwc->eps[i];
+
+                        if (!(dep->flags & DWC3_EP_ENABLED))
+                                continue;
+
+                        if (!list_empty(&dep->req_queued))
+                                return;
+                }
+
+                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+                reg |= dwc->u1u2;
+                dwc3_writel(dwc->regs, DWC3_DCTL, reg);
+
+                dwc->u1u2 = 0;
+        }
 }
 
 static void dwc3_gadget_start_isoc(struct dwc3 *dwc,
@@ -1639,6 +1724,7 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc)
         dwc->start_config_issued = false;
 
         dwc->gadget.speed = USB_SPEED_UNKNOWN;
+        dwc->setup_packet_pending = false;
 }
 
 static void dwc3_gadget_usb3_phy_power(struct dwc3 *dwc, int on)
@@ -1675,6 +1761,40 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
 
         dev_vdbg(dwc->dev, "%s\n", __func__);
 
+        /*
+         * WORKAROUND: DWC3 revisions <1.88a have an issue which
+         * would cause a missing Disconnect Event if there's a
+         * pending Setup Packet in the FIFO.
+         *
+         * There's no suggested workaround on the official Bug
+         * report, which states that "unless the driver/application
+         * is doing any special handling of a disconnect event,
+         * there is no functional issue".
+         *
+         * Unfortunately, it turns out that we _do_ some special
+         * handling of a disconnect event, namely complete all
+         * pending transfers, notify gadget driver of the
+         * disconnection, and so on.
+         *
+         * Our suggested workaround is to follow the Disconnect
+         * Event steps here, instead, based on a setup_packet_pending
+         * flag. Such flag gets set whenever we have a XferNotReady
+         * event on EP0 and gets cleared on XferComplete for the
+         * same endpoint.
+         *
+         * Refers to:
+         *
+         * STAR#9000466709: RTL: Device : Disconnect event not
+         * generated if setup packet pending in FIFO
+         */
+        if (dwc->revision < DWC3_REVISION_188A) {
+                if (dwc->setup_packet_pending)
+                        dwc3_gadget_disconnect_interrupt(dwc);
+        }
+
+        /* after reset -> Default State */
+        dwc->dev_state = DWC3_DEFAULT_STATE;
+
         /* Enable PHYs */
         dwc3_gadget_usb2_phy_power(dwc, true);
         dwc3_gadget_usb3_phy_power(dwc, true);
@@ -1755,6 +1875,22 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
 
         switch (speed) {
         case DWC3_DCFG_SUPERSPEED:
+                /*
+                 * WORKAROUND: DWC3 revisions <1.90a have an issue which
+                 * would cause a missing USB3 Reset event.
+                 *
+                 * In such situations, we should force a USB3 Reset
+                 * event by calling our dwc3_gadget_reset_interrupt()
+                 * routine.
+                 *
+                 * Refers to:
+                 *
+                 * STAR#9000483510: RTL: SS : USB3 reset event may
+                 * not be generated always when the link enters poll
+                 */
+                if (dwc->revision < DWC3_REVISION_190A)
+                        dwc3_gadget_reset_interrupt(dwc);
+
                 dwc3_gadget_ep0_desc.wMaxPacketSize = cpu_to_le16(512);
                 dwc->gadget.ep0->maxpacket = 512;
                 dwc->gadget.speed = USB_SPEED_SUPER;
@@ -1781,14 +1917,14 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
         dwc3_gadget_disable_phy(dwc, dwc->gadget.speed);
 
         dep = dwc->eps[0];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc);
+        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 return;
         }
 
         dep = dwc->eps[1];
-        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc);
+        ret = __dwc3_gadget_ep_enable(dep, &dwc3_gadget_ep0_desc, NULL);
         if (ret) {
                 dev_err(dwc->dev, "failed to enable %s\n", dep->name);
                 return;
@@ -1818,8 +1954,55 @@ static void dwc3_gadget_wakeup_interrupt(struct dwc3 *dwc)
 static void dwc3_gadget_linksts_change_interrupt(struct dwc3 *dwc,
                 unsigned int evtinfo)
 {
-        /*  The fith bit says SuperSpeed yes or no. */
-        dwc->link_state = evtinfo & DWC3_LINK_STATE_MASK;
+        enum dwc3_link_state    next = evtinfo & DWC3_LINK_STATE_MASK;
+
+        /*
+         * WORKAROUND: DWC3 Revisions <1.83a have an issue which, depending
+         * on the link partner, the USB session might do multiple entry/exit
+         * of low power states before a transfer takes place.
+         *
+         * Due to this problem, we might experience lower throughput. The
+         * suggested workaround is to disable DCTL[12:9] bits if we're
+         * transitioning from U1/U2 to U0 and enable those bits again
+         * after a transfer completes and there are no pending transfers
+         * on any of the enabled endpoints.
+         *
+         * This is the first half of that workaround.
+         *
+         * Refers to:
+         *
+         * STAR#9000446952: RTL: Device SS : if U1/U2 ->U0 takes >128us
+         * core send LGO_Ux entering U0
+         */
+        if (dwc->revision < DWC3_REVISION_183A) {
+                if (next == DWC3_LINK_STATE_U0) {
+                        u32     u1u2;
+                        u32     reg;
+
+                        switch (dwc->link_state) {
+                        case DWC3_LINK_STATE_U1:
+                        case DWC3_LINK_STATE_U2:
+                                reg = dwc3_readl(dwc->regs, DWC3_DCTL);
+                                u1u2 = reg & (DWC3_DCTL_INITU2ENA
+                                                | DWC3_DCTL_ACCEPTU2ENA
+                                                | DWC3_DCTL_INITU1ENA
+                                                | DWC3_DCTL_ACCEPTU1ENA);
+
+                                if (!dwc->u1u2)
+                                        dwc->u1u2 = reg & u1u2;
+
+                                reg &= ~u1u2;
+
+                                dwc3_writel(dwc->regs, DWC3_DCTL, reg);
+                                break;
+                        default:
+                                /* do nothing */
+                                break;
+                        }
+                }
+        }
+
+        dwc->link_state = next;
 
         dev_vdbg(dwc->dev, "%s link %d\n", __func__, dwc->link_state);
 }
@@ -1925,7 +2108,7 @@ static irqreturn_t dwc3_interrupt(int irq, void *_dwc)
 
         spin_lock(&dwc->lock);
 
-        for (i = 0; i < DWC3_EVENT_BUFFERS_NUM; i++) {
+        for (i = 0; i < dwc->num_event_buffers; i++) {
                 irqreturn_t status;
 
                 status = dwc3_process_event_buf(dwc, i);
@@ -1986,9 +2169,10 @@ int __devinit dwc3_gadget_init(struct dwc3 *dwc)
         dev_set_name(&dwc->gadget.dev, "gadget");
 
         dwc->gadget.ops                 = &dwc3_gadget_ops;
-        dwc->gadget.is_dualspeed        = true;
+        dwc->gadget.max_speed           = USB_SPEED_SUPER;
         dwc->gadget.speed               = USB_SPEED_UNKNOWN;
         dwc->gadget.dev.parent          = dwc->dev;
+        dwc->gadget.sg_supported        = true;
 
         dma_set_coherent_mask(&dwc->gadget.dev, dwc->dev->coherent_dma_mask);
 
@@ -2076,7 +2260,6 @@ err0:
 void dwc3_gadget_exit(struct dwc3 *dwc)
 {
         int                     irq;
-        int                     i;
 
         usb_del_gadget_udc(&dwc->gadget);
         irq = platform_get_irq(to_platform_device(dwc->dev), 0);
@@ -2084,9 +2267,6 @@ void dwc3_gadget_exit(struct dwc3 *dwc)
         dwc3_writel(dwc->regs, DWC3_DEVTEN, 0x00);
         free_irq(irq, dwc);
 
-        for (i = 0; i < ARRAY_SIZE(dwc->eps); i++)
-                __dwc3_gadget_ep_disable(dwc->eps[i]);
-
         dwc3_gadget_free_endpoints(dwc);
 
         dma_free_coherent(dwc->dev, 512, dwc->ep0_bounce,
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 71145a449d99..d97f467d41cc 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -79,19 +79,6 @@ struct dwc3_gadget_ep_cmd_params {
 
 /* -------------------------------------------------------------------------- */
 
-struct dwc3_request {
-        struct usb_request      request;
-        struct list_head        list;
-        struct dwc3_ep          *dep;
-
-        u8                      epnum;
-        struct dwc3_trb_hw      *trb;
-        dma_addr_t              trb_dma;
-
-        unsigned                direction:1;
-        unsigned                mapped:1;
-        unsigned                queued:1;
-};
 #define to_dwc3_request(r)      (container_of(r, struct dwc3_request, request))
 
 static inline struct dwc3_request *next_request(struct list_head *list)
@@ -110,23 +97,11 @@ static inline void dwc3_gadget_move_request_queued(struct dwc3_request *req)
         list_move_tail(&req->list, &dep->req_queued);
 }
 
-#if defined(CONFIG_USB_GADGET_DWC3) || defined(CONFIG_USB_GADGET_DWC3_MODULE)
-int dwc3_gadget_init(struct dwc3 *dwc);
-void dwc3_gadget_exit(struct dwc3 *dwc);
-#else
-static inline int dwc3_gadget_init(struct dwc3 *dwc) { return 0; }
-static inline void dwc3_gadget_exit(struct dwc3 *dwc) { }
-static inline int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep,
-                unsigned cmd, struct dwc3_gadget_ep_cmd_params *params)
-{
-        return 0;
-}
-#endif
-
 void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
                 int status);
 
-void dwc3_ep0_interrupt(struct dwc3 *dwc, const struct dwc3_event_depevt *event);
+void dwc3_ep0_interrupt(struct dwc3 *dwc,
+                const struct dwc3_event_depevt *event);
 void dwc3_ep0_out_start(struct dwc3 *dwc);
 int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,
                 gfp_t gfp_flags);
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
new file mode 100644
index 000000000000..7cfe211b6c37
--- /dev/null
+++ b/drivers/usb/dwc3/host.c
@@ -0,0 +1,102 @@
+/**
+ * host.c - DesignWare USB3 DRD Controller Host Glue
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Authors: Felipe Balbi <balbi@ti.com>,
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The names of the above-listed copyright holders may not be used
+ *    to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2, as published by the Free
+ * Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/platform_device.h>
+
+#include "core.h"
+
+static struct resource generic_resources[] = {
+        {
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+int dwc3_host_init(struct dwc3 *dwc)
+{
+        struct platform_device  *xhci;
+        int                     ret;
+
+        xhci = platform_device_alloc("xhci", -1);
+        if (!xhci) {
+                dev_err(dwc->dev, "couldn't allocate xHCI device\n");
+                ret = -ENOMEM;
+                goto err0;
+        }
+
+        dma_set_coherent_mask(&xhci->dev, dwc->dev->coherent_dma_mask);
+
+        xhci->dev.parent        = dwc->dev;
+        xhci->dev.dma_mask      = dwc->dev->dma_mask;
+        xhci->dev.dma_parms     = dwc->dev->dma_parms;
+
+        dwc->xhci = xhci;
+
+        /* setup resources */
+        generic_resources[0].start = dwc->irq;
+
+        generic_resources[1].start = dwc->res->start;
+        generic_resources[1].end = dwc->res->start + 0x7fff;
+
+        ret = platform_device_add_resources(xhci, generic_resources,
+                        ARRAY_SIZE(generic_resources));
+        if (ret) {
+                dev_err(dwc->dev, "couldn't add resources to xHCI device\n");
+                goto err1;
+        }
+
+        ret = platform_device_add(xhci);
+        if (ret) {
+                dev_err(dwc->dev, "failed to register xHCI device\n");
+                goto err1;
+        }
+
+        return 0;
+
+err1:
+        platform_device_put(xhci);
+
+err0:
+        return ret;
+}
+
+void dwc3_host_exit(struct dwc3 *dwc)
+{
+        platform_device_unregister(dwc->xhci);
+}
diff --git a/drivers/usb/dwc3/io.h b/drivers/usb/dwc3/io.h
index bc957db1ea4b..071d561f3e68 100644
--- a/drivers/usb/dwc3/io.h
+++ b/drivers/usb/dwc3/io.h
@@ -39,7 +39,7 @@
 #ifndef __DRIVERS_USB_DWC3_IO_H
 #define __DRIVERS_USB_DWC3_IO_H
 
-#include <asm/io.h>
+#include <linux/io.h>
 
 static inline u32 dwc3_readl(void __iomem *base, u32 offset)
 {
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 12a401a144b7..7ecb68a67411 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -15,6 +15,7 @@
 
 menuconfig USB_GADGET
         tristate "USB Gadget Support"
+        select NLS
         help
            USB is a master/slave protocol, organized with one master
            host (such as a PC) controlling up to 127 peripheral devices.
@@ -124,7 +125,6 @@ config USB_GADGET_STORAGE_NUM_BUFFERS
 #
 choice
         prompt "USB Peripheral Controller"
-        depends on USB_GADGET
         help
            A USB device uses a controller to talk to its host.
            Systems should have only one such upstream link.
@@ -234,7 +234,6 @@ config USB_R8A66597
 
 config USB_RENESAS_USBHS_UDC
         tristate 'Renesas USBHS controller'
-        depends on SUPERH || ARCH_SHMOBILE
         depends on USB_RENESAS_USBHS
         select USB_GADGET_DUALSPEED
         help
@@ -309,25 +308,13 @@ config USB_S3C_HSUDC
 
           This driver has been tested on S3C2416 and S3C2450 processors.
 
-config USB_PXA_U2O
-        tristate "PXA9xx Processor USB2.0 controller"
-        depends on ARCH_MMP
+config USB_MV_UDC
+        tristate "Marvell USB2.0 Device Controller"
         select USB_GADGET_DUALSPEED
         help
-          PXA9xx Processor series include a high speed USB2.0 device
-          controller, which support high speed and full speed USB peripheral.
-
-config USB_GADGET_DWC3
-        tristate "DesignWare USB3.0 (DRD) Controller"
-        depends on USB_DWC3
-        select USB_GADGET_DUALSPEED
-        select USB_GADGET_SUPERSPEED
-        help
-          DesignWare USB3.0 controller is a SuperSpeed USB3.0 Controller
-          which can be configured for peripheral-only, host-only, hub-only
-          and Dual-Role operation. This Controller was first integrated into
-          the OMAP5 series of processors. More information about the OMAP5
-          version of this controller, refer to http://www.ti.com/omap5.
+          Marvell Socs (including PXA and MMP series) include a high speed
+          USB2.0 OTG controller, which can be configured as high speed or
+          full speed USB peripheral.
 
 #
 # Controllers available in both integrated and discrete versions
@@ -543,12 +530,10 @@ endchoice
 # Selected by UDC drivers that support high-speed operation.
 config USB_GADGET_DUALSPEED
         bool
-        depends on USB_GADGET
 
 # Selected by UDC drivers that support super-speed opperation
 config USB_GADGET_SUPERSPEED
         bool
-        depends on USB_GADGET
         depends on USB_GADGET_DUALSPEED
 
 #
@@ -556,7 +541,6 @@ config USB_GADGET_SUPERSPEED
 #
 choice
         tristate "USB Gadget Drivers"
-        depends on USB_GADGET
         default USB_ETH
         help
           A Linux "Gadget Driver" talks to the USB Peripheral Controller
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index b54ac6190890..b7f6eefc3927 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -27,7 +27,7 @@ obj-$(CONFIG_USB_S3C_HSOTG)	+= s3c-hsotg.o
 obj-$(CONFIG_USB_S3C_HSUDC)     += s3c-hsudc.o
 obj-$(CONFIG_USB_LANGWELL)      += langwell_udc.o
 obj-$(CONFIG_USB_EG20T)         += pch_udc.o
-obj-$(CONFIG_USB_PXA_U2O)       += mv_udc.o
+obj-$(CONFIG_USB_MV_UDC)        += mv_udc.o
 mv_udc-y                        := mv_udc_core.o
 obj-$(CONFIG_USB_CI13XXX_MSM)   += ci13xxx_msm.o
 obj-$(CONFIG_USB_FUSB300)       += fusb300_udc.o
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 45f422ac103f..e9a2c5c44454 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -1959,7 +1959,7 @@ static int amd5536_start(struct usb_gadget_driver *driver,
         u32 tmp;
 
         if (!driver || !bind || !driver->setup
-                        || driver->speed < USB_SPEED_HIGH)
+                        || driver->max_speed < USB_SPEED_HIGH)
                 return -EINVAL;
         if (!dev)
                 return -ENODEV;
@@ -3349,7 +3349,7 @@ static int udc_probe(struct udc *dev)
         dev_set_name(&dev->gadget.dev, "gadget");
         dev->gadget.dev.release = gadget_release;
         dev->gadget.name = name;
-        dev->gadget.is_dualspeed = 1;
+        dev->gadget.max_speed = USB_SPEED_HIGH;
 
         /* init registers, interrupts, ... */
         startup_registers(dev);
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 8efe0fa9228d..143a7256b598 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1633,7 +1633,7 @@ static int at91_start(struct usb_gadget_driver *driver,
         unsigned long   flags;
 
         if (!driver
-                        || driver->speed < USB_SPEED_FULL
+                        || driver->max_speed < USB_SPEED_FULL
                         || !bind
                         || !driver->setup) {
                 DBG("bad parameter.\n");
@@ -1748,7 +1748,7 @@ static int __init at91udc_probe(struct platform_device *pdev)
 
         /* rm9200 needs manual D+ pullup; off by default */
         if (cpu_is_at91rm9200()) {
-                if (udc->board.pullup_pin <= 0) {
+                if (gpio_is_valid(udc->board.pullup_pin)) {
                         DBG("no D+ pullup?\n");
                         retval = -ENODEV;
                         goto fail0;
@@ -1815,7 +1815,7 @@ static int __init at91udc_probe(struct platform_device *pdev)
                 DBG("request irq %d failed\n", udc->udp_irq);
                 goto fail1;
         }
-        if (udc->board.vbus_pin > 0) {
+        if (gpio_is_valid(udc->board.vbus_pin)) {
                 retval = gpio_request(udc->board.vbus_pin, "udc_vbus");
                 if (retval < 0) {
                         DBG("request vbus pin failed\n");
@@ -1859,10 +1859,10 @@ static int __init at91udc_probe(struct platform_device *pdev)
         INFO("%s version %s\n", driver_name, DRIVER_VERSION);
         return 0;
 fail4:
-        if (udc->board.vbus_pin > 0 && !udc->board.vbus_polled)
+        if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled)
                 free_irq(udc->board.vbus_pin, udc);
 fail3:
-        if (udc->board.vbus_pin > 0)
+        if (gpio_is_valid(udc->board.vbus_pin))
                 gpio_free(udc->board.vbus_pin);
 fail2:
         free_irq(udc->udp_irq, udc);
@@ -1897,7 +1897,7 @@ static int __exit at91udc_remove(struct platform_device *pdev)
 
         device_init_wakeup(&pdev->dev, 0);
         remove_debug_file(udc);
-        if (udc->board.vbus_pin > 0) {
+        if (gpio_is_valid(udc->board.vbus_pin)) {
                 free_irq(udc->board.vbus_pin, udc);
                 gpio_free(udc->board.vbus_pin);
         }
@@ -1941,7 +1941,7 @@ static int at91udc_suspend(struct platform_device *pdev, pm_message_t mesg)
                 enable_irq_wake(udc->udp_irq);
 
         udc->active_suspend = wake;
-        if (udc->board.vbus_pin > 0 && !udc->board.vbus_polled && wake)
+        if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled && wake)
                 enable_irq_wake(udc->board.vbus_pin);
         return 0;
 }
@@ -1951,7 +1951,7 @@ static int at91udc_resume(struct platform_device *pdev)
         struct at91_udc *udc = platform_get_drvdata(pdev);
         unsigned long   flags;
 
-        if (udc->board.vbus_pin > 0 && !udc->board.vbus_polled &&
+        if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled &&
             udc->active_suspend)
                 disable_irq_wake(udc->board.vbus_pin);
 
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index 271a9d873608..e2fb6d583bd9 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -1038,7 +1038,7 @@ static struct usba_udc the_udc = {
         .gadget = {
                 .ops            = &usba_udc_ops,
                 .ep_list        = LIST_HEAD_INIT(the_udc.gadget.ep_list),
-                .is_dualspeed   = 1,
+                .max_speed      = USB_SPEED_HIGH,
                 .name           = "atmel_usba_udc",
                 .dev    = {
                         .init_name      = "gadget",
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c
index 9a0c3979ff43..27e313718422 100644
--- a/drivers/usb/gadget/ci13xxx_udc.c
+++ b/drivers/usb/gadget/ci13xxx_udc.c
@@ -182,6 +182,16 @@ static inline int hw_ep_bit(int num, int dir)
         return num + (dir ? 16 : 0);
 }
 
+static int ep_to_bit(int n)
+{
+        int fill = 16 - hw_ep_max / 2;
+
+        if (n >= hw_ep_max / 2)
+                n += fill;
+
+        return n;
+}
+
 /**
  * hw_aread: reads from register bitfield
  * @addr: address relative to bus map
@@ -440,12 +450,13 @@ static int hw_ep_get_halt(int num, int dir)
 /**
  * hw_test_and_clear_setup_status: test & clear setup status (execute without
  *                                 interruption)
- * @n: bit number (endpoint)
+ * @n: endpoint number
  *
  * This function returns setup status
  */
 static int hw_test_and_clear_setup_status(int n)
 {
+        n = ep_to_bit(n);
         return hw_ctest_and_clear(CAP_ENDPTSETUPSTAT, BIT(n));
 }
 
@@ -641,12 +652,13 @@ static int hw_register_write(u16 addr, u32 data)
 /**
  * hw_test_and_clear_complete: test & clear complete status (execute without
  *                             interruption)
- * @n: bit number (endpoint)
+ * @n: endpoint number
  *
  * This function returns complete status
  */
 static int hw_test_and_clear_complete(int n)
 {
+        n = ep_to_bit(n);
         return hw_ctest_and_clear(CAP_ENDPTCOMPLETE, BIT(n));
 }
 
@@ -754,8 +766,11 @@ static ssize_t show_device(struct device *dev, struct device_attribute *attr,
 
         n += scnprintf(buf + n, PAGE_SIZE - n, "speed             = %d\n",
                        gadget->speed);
+        n += scnprintf(buf + n, PAGE_SIZE - n, "max_speed         = %d\n",
+                       gadget->max_speed);
+        /* TODO: Scheduled for removal in 3.8. */
         n += scnprintf(buf + n, PAGE_SIZE - n, "is_dualspeed      = %d\n",
-                       gadget->is_dualspeed);
+                       gadget_is_dualspeed(gadget));
         n += scnprintf(buf + n, PAGE_SIZE - n, "is_otg            = %d\n",
                        gadget->is_otg);
         n += scnprintf(buf + n, PAGE_SIZE - n, "is_a_peripheral   = %d\n",
@@ -798,7 +813,7 @@ static ssize_t show_driver(struct device *dev, struct device_attribute *attr,
         n += scnprintf(buf + n, PAGE_SIZE - n, "function  = %s\n",
                        (driver->function ? driver->function : ""));
         n += scnprintf(buf + n, PAGE_SIZE - n, "max speed = %d\n",
-                       driver->speed);
+                       driver->max_speed);
 
         return n;
 }
@@ -2563,9 +2578,7 @@ static int ci13xxx_start(struct usb_gadget_driver *driver,
         if (driver             == NULL ||
             bind               == NULL ||
             driver->setup      == NULL ||
-            driver->disconnect == NULL ||
-            driver->suspend    == NULL ||
-            driver->resume     == NULL)
+            driver->disconnect == NULL)
                 return -EINVAL;
         else if (udc         == NULL)
                 return -ENODEV;
@@ -2693,8 +2706,6 @@ static int ci13xxx_stop(struct usb_gadget_driver *driver)
             driver->unbind     == NULL ||
             driver->setup      == NULL ||
             driver->disconnect == NULL ||
-            driver->suspend    == NULL ||
-            driver->resume     == NULL ||
             driver             != udc->driver)
                 return -EINVAL;
 
@@ -2793,7 +2804,7 @@ static irqreturn_t udc_irq(void)
                         isr_statistics.pci++;
                         udc->gadget.speed = hw_port_is_high_speed() ?
                                 USB_SPEED_HIGH : USB_SPEED_FULL;
-                        if (udc->suspended) {
+                        if (udc->suspended && udc->driver->resume) {
                                 spin_unlock(udc->lock);
                                 udc->driver->resume(&udc->gadget);
                                 spin_lock(udc->lock);
@@ -2807,7 +2818,8 @@ static irqreturn_t udc_irq(void)
                         isr_tr_complete_handler(udc);
                 }
                 if (USBi_SLI & intr) {
-                        if (udc->gadget.speed != USB_SPEED_UNKNOWN) {
+                        if (udc->gadget.speed != USB_SPEED_UNKNOWN &&
+                            udc->driver->suspend) {
                                 udc->suspended = 1;
                                 spin_unlock(udc->lock);
                                 udc->driver->suspend(&udc->gadget);
@@ -2871,7 +2883,7 @@ static int udc_probe(struct ci13xxx_udc_driver *driver, struct device *dev,
 
         udc->gadget.ops          = &usb_gadget_ops;
         udc->gadget.speed        = USB_SPEED_UNKNOWN;
-        udc->gadget.is_dualspeed = 1;
+        udc->gadget.max_speed    = USB_SPEED_HIGH;
         udc->gadget.is_otg       = 0;
         udc->gadget.name         = driver->name;
 
diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h
index 23707775cb43..f4871e1fac59 100644
--- a/drivers/usb/gadget/ci13xxx_udc.h
+++ b/drivers/usb/gadget/ci13xxx_udc.h
@@ -127,7 +127,7 @@ struct ci13xxx {
         struct ci13xxx_ep          ci13xxx_ep[ENDPT_MAX]; /* extended endpts */
         u32                        ep0_dir;    /* ep0 direction */
 #define ep0out ci13xxx_ep[0]
-#define ep0in  ci13xxx_ep[16]
+#define ep0in  ci13xxx_ep[hw_ep_max / 2]
         u8                         remote_wakeup; /* Is remote wakeup feature
                                                         enabled by the host? */
         u8                         suspended;  /* suspended by the host */
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index f71b0787983f..a95de6a4a134 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1535,9 +1535,9 @@ composite_resume(struct usb_gadget *gadget)
 
 static struct usb_gadget_driver composite_driver = {
 #ifdef CONFIG_USB_GADGET_SUPERSPEED
-        .speed          = USB_SPEED_SUPER,
+        .max_speed      = USB_SPEED_SUPER,
 #else
-        .speed          = USB_SPEED_HIGH,
+        .max_speed      = USB_SPEED_HIGH,
 #endif
 
         .unbind         = composite_unbind,
@@ -1584,8 +1584,8 @@ int usb_composite_probe(struct usb_composite_driver *driver,
                 driver->iProduct = driver->name;
         composite_driver.function =  (char *) driver->name;
         composite_driver.driver.name = driver->name;
-        composite_driver.speed = min((u8)composite_driver.speed,
-                                     (u8)driver->max_speed);
+        composite_driver.max_speed =
+                min_t(u8, composite_driver.max_speed, driver->max_speed);
         composite = driver;
         composite_gadget_bind = bind;
 
diff --git a/drivers/usb/gadget/dbgp.c b/drivers/usb/gadget/dbgp.c
index 6256420089f3..19d7bb0df75a 100644
--- a/drivers/usb/gadget/dbgp.c
+++ b/drivers/usb/gadget/dbgp.c
@@ -404,7 +404,7 @@ fail:
 
 static struct usb_gadget_driver dbgp_driver = {
         .function = "dbgp",
-        .speed = USB_SPEED_HIGH,
+        .max_speed = USB_SPEED_HIGH,
         .unbind = dbgp_unbind,
         .setup = dbgp_setup,
         .disconnect = dbgp_disconnect,
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index ab8f1b488d54..db815c2da7ed 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -823,19 +823,18 @@ static int dummy_pullup (struct usb_gadget *_gadget, int value)
 
         if (value && dum->driver) {
                 if (mod_data.is_super_speed)
-                        dum->gadget.speed = dum->driver->speed;
+                        dum->gadget.speed = dum->driver->max_speed;
                 else if (mod_data.is_high_speed)
                         dum->gadget.speed = min_t(u8, USB_SPEED_HIGH,
-                                        dum->driver->speed);
+                                        dum->driver->max_speed);
                 else
                         dum->gadget.speed = USB_SPEED_FULL;
                 dummy_udc_udpate_ep0(dum);
 
-                if (dum->gadget.speed < dum->driver->speed)
+                if (dum->gadget.speed < dum->driver->max_speed)
                         dev_dbg(udc_dev(dum), "This device can perform faster"
-                                        " if you connect it to a %s port...\n",
-                                        (dum->driver->speed == USB_SPEED_SUPER ?
-                                         "SuperSpeed" : "HighSpeed"));
+                                " if you connect it to a %s port...\n",
+                                usb_speed_string(dum->driver->max_speed));
         }
         dum_hcd = gadget_to_dummy_hcd(_gadget);
 
@@ -898,7 +897,7 @@ static int dummy_udc_start(struct usb_gadget *g,
         struct dummy_hcd        *dum_hcd = gadget_to_dummy_hcd(g);
         struct dummy            *dum = dum_hcd->dum;
 
-        if (driver->speed == USB_SPEED_UNKNOWN)
+        if (driver->max_speed == USB_SPEED_UNKNOWN)
                 return -EINVAL;
 
         /*
@@ -977,7 +976,7 @@ static int dummy_udc_probe (struct platform_device *pdev)
 
         dum->gadget.name = gadget_name;
         dum->gadget.ops = &dummy_ops;
-        dum->gadget.is_dualspeed = 1;
+        dum->gadget.max_speed = USB_SPEED_SUPER;
 
         dev_set_name(&dum->gadget.dev, "gadget");
         dum->gadget.dev.parent = &pdev->dev;
diff --git a/drivers/usb/gadget/epautoconf.c b/drivers/usb/gadget/epautoconf.c
index 4dff83d2f265..753aa0683ac1 100644
--- a/drivers/usb/gadget/epautoconf.c
+++ b/drivers/usb/gadget/epautoconf.c
@@ -149,7 +149,7 @@ ep_matches (
         switch (type) {
         case USB_ENDPOINT_XFER_INT:
                 /* INT:  limit 64 bytes full speed, 1024 high/super speed */
-                if (!gadget->is_dualspeed && max > 64)
+                if (!gadget_is_dualspeed(gadget) && max > 64)
                         return 0;
                 /* FALLTHROUGH */
 
@@ -157,12 +157,12 @@ ep_matches (
                 /* ISO:  limit 1023 bytes full speed, 1024 high/super speed */
                 if (ep->maxpacket < max)
                         return 0;
-                if (!gadget->is_dualspeed && max > 1023)
+                if (!gadget_is_dualspeed(gadget) && max > 1023)
                         return 0;
 
                 /* BOTH:  "high bandwidth" works only at high speed */
                 if ((desc->wMaxPacketSize & cpu_to_le16(3<<11))) {
-                        if (!gadget->is_dualspeed)
+                        if (!gadget_is_dualspeed(gadget))
                                 return 0;
                         /* configure your hardware with enough buffering!! */
                 }
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index b5f6f9fef9c7..f63dc6c150d2 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1399,7 +1399,7 @@ static int ffs_epfiles_create(struct ffs_data *ffs)
         ENTER();
 
         count = ffs->eps_count;
-        epfiles = kzalloc(count * sizeof *epfiles, GFP_KERNEL);
+        epfiles = kcalloc(count, sizeof(*epfiles), GFP_KERNEL);
         if (!epfiles)
                 return -ENOMEM;
 
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 1a6f415c0d02..6353eca1e852 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -1873,17 +1873,14 @@ static int check_command(struct fsg_common *common, int cmnd_size,
                     common->lun, lun);
 
         /* Check the LUN */
-        if (common->lun < common->nluns) {
-                curlun = &common->luns[common->lun];
-                common->curlun = curlun;
+        curlun = common->curlun;
+        if (curlun) {
                 if (common->cmnd[0] != REQUEST_SENSE) {
                         curlun->sense_data = SS_NO_SENSE;
                         curlun->sense_data_info = 0;
                         curlun->info_valid = 0;
                 }
         } else {
-                common->curlun = NULL;
-                curlun = NULL;
                 common->bad_lun_okay = 0;
 
                 /*
@@ -1929,6 +1926,17 @@ static int check_command(struct fsg_common *common, int cmnd_size,
         return 0;
 }
 
+/* wrapper of check_command for data size in blocks handling */
+static int check_command_size_in_blocks(struct fsg_common *common,
+                int cmnd_size, enum data_direction data_dir,
+                unsigned int mask, int needs_medium, const char *name)
+{
+        if (common->curlun)
+                common->data_size_from_cmnd <<= common->curlun->blkbits;
+        return check_command(common, cmnd_size, data_dir,
+                        mask, needs_medium, name);
+}
+
 static int do_scsi_command(struct fsg_common *common)
 {
         struct fsg_buffhd       *bh;
@@ -2011,9 +2019,9 @@ static int do_scsi_command(struct fsg_common *common)
 
         case READ_6:
                 i = common->cmnd[4];
-                common->data_size_from_cmnd = (i == 0 ? 256 : i) <<
-                                common->curlun->blkbits;
-                reply = check_command(common, 6, DATA_DIR_TO_HOST,
+                common->data_size_from_cmnd = (i == 0) ? 256 : i;
+                reply = check_command_size_in_blocks(common, 6,
+                                      DATA_DIR_TO_HOST,
                                       (7<<1) | (1<<4), 1,
                                       "READ(6)");
                 if (reply == 0)
@@ -2022,9 +2030,9 @@ static int do_scsi_command(struct fsg_common *common)
 
         case READ_10:
                 common->data_size_from_cmnd =
-                                get_unaligned_be16(&common->cmnd[7]) <<
-                                                common->curlun->blkbits;
-                reply = check_command(common, 10, DATA_DIR_TO_HOST,
+                                get_unaligned_be16(&common->cmnd[7]);
+                reply = check_command_size_in_blocks(common, 10,
+                                      DATA_DIR_TO_HOST,
                                       (1<<1) | (0xf<<2) | (3<<7), 1,
                                       "READ(10)");
                 if (reply == 0)
@@ -2033,9 +2041,9 @@ static int do_scsi_command(struct fsg_common *common)
 
         case READ_12:
                 common->data_size_from_cmnd =
-                                get_unaligned_be32(&common->cmnd[6]) <<
-                                                common->curlun->blkbits;
-                reply = check_command(common, 12, DATA_DIR_TO_HOST,
+                                get_unaligned_be32(&common->cmnd[6]);
+                reply = check_command_size_in_blocks(common, 12,
+                                      DATA_DIR_TO_HOST,
                                       (1<<1) | (0xf<<2) | (0xf<<6), 1,
                                       "READ(12)");
                 if (reply == 0)
@@ -2134,9 +2142,9 @@ static int do_scsi_command(struct fsg_common *common)
 
         case WRITE_6:
                 i = common->cmnd[4];
-                common->data_size_from_cmnd = (i == 0 ? 256 : i) <<
-                                        common->curlun->blkbits;
-                reply = check_command(common, 6, DATA_DIR_FROM_HOST,
+                common->data_size_from_cmnd = (i == 0) ? 256 : i;
+                reply = check_command_size_in_blocks(common, 6,
+                                      DATA_DIR_FROM_HOST,
                                       (7<<1) | (1<<4), 1,
                                       "WRITE(6)");
                 if (reply == 0)
@@ -2145,9 +2153,9 @@ static int do_scsi_command(struct fsg_common *common)
 
         case WRITE_10:
                 common->data_size_from_cmnd =
-                                get_unaligned_be16(&common->cmnd[7]) <<
-                                                common->curlun->blkbits;
-                reply = check_command(common, 10, DATA_DIR_FROM_HOST,
+                                get_unaligned_be16(&common->cmnd[7]);
+                reply = check_command_size_in_blocks(common, 10,
+                                      DATA_DIR_FROM_HOST,
                                       (1<<1) | (0xf<<2) | (3<<7), 1,
                                       "WRITE(10)");
                 if (reply == 0)
@@ -2156,9 +2164,9 @@ static int do_scsi_command(struct fsg_common *common)
 
         case WRITE_12:
                 common->data_size_from_cmnd =
-                                get_unaligned_be32(&common->cmnd[6]) <<
-                                                common->curlun->blkbits;
-                reply = check_command(common, 12, DATA_DIR_FROM_HOST,
+                                get_unaligned_be32(&common->cmnd[6]);
+                reply = check_command_size_in_blocks(common, 12,
+                                      DATA_DIR_FROM_HOST,
                                       (1<<1) | (0xf<<2) | (0xf<<6), 1,
                                       "WRITE(12)");
                 if (reply == 0)
@@ -2273,6 +2281,10 @@ static int received_cbw(struct fsg_dev *fsg, struct fsg_buffhd *bh)
         if (common->data_size == 0)
                 common->data_dir = DATA_DIR_NONE;
         common->lun = cbw->Lun;
+        if (common->lun >= 0 && common->lun < common->nluns)
+                common->curlun = &common->luns[common->lun];
+        else
+                common->curlun = NULL;
         common->tag = cbw->Tag;
         return 0;
 }
@@ -2763,7 +2775,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
          * Create the LUNs, open their backing files, and register the
          * LUN devices in sysfs.
          */
-        curlun = kzalloc(nluns * sizeof *curlun, GFP_KERNEL);
+        curlun = kcalloc(nluns, sizeof(*curlun), GFP_KERNEL);
         if (unlikely(!curlun)) {
                 rc = -ENOMEM;
                 goto error_release;
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 11b5196284ae..e0f30fc70e45 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -2297,19 +2297,17 @@ static int check_command(struct fsg_dev *fsg, int cmnd_size,
                         DBG(fsg, "using LUN %d from CBW, "
                                         "not LUN %d from CDB\n",
                                         fsg->lun, lun);
-        } else
-                fsg->lun = lun;         // Use LUN from the command
+        }
 
         /* Check the LUN */
-        if (fsg->lun < fsg->nluns) {
-                fsg->curlun = curlun = &fsg->luns[fsg->lun];
+        curlun = fsg->curlun;
+        if (curlun) {
                 if (fsg->cmnd[0] != REQUEST_SENSE) {
                         curlun->sense_data = SS_NO_SENSE;
                         curlun->sense_data_info = 0;
                         curlun->info_valid = 0;
                 }
         } else {
-                fsg->curlun = curlun = NULL;
                 fsg->bad_lun_okay = 0;
 
                 /* INQUIRY and REQUEST SENSE commands are explicitly allowed
@@ -2351,6 +2349,16 @@ static int check_command(struct fsg_dev *fsg, int cmnd_size,
         return 0;
 }
 
+/* wrapper of check_command for data size in blocks handling */
+static int check_command_size_in_blocks(struct fsg_dev *fsg, int cmnd_size,
+                enum data_direction data_dir, unsigned int mask,
+                int needs_medium, const char *name)
+{
+        if (fsg->curlun)
+                fsg->data_size_from_cmnd <<= fsg->curlun->blkbits;
+        return check_command(fsg, cmnd_size, data_dir,
+                        mask, needs_medium, name);
+}
 
 static int do_scsi_command(struct fsg_dev *fsg)
 {
@@ -2425,26 +2433,27 @@ static int do_scsi_command(struct fsg_dev *fsg)
 
         case READ_6:
                 i = fsg->cmnd[4];
-                fsg->data_size_from_cmnd = (i == 0 ? 256 : i) << fsg->curlun->blkbits;
-                if ((reply = check_command(fsg, 6, DATA_DIR_TO_HOST,
+                fsg->data_size_from_cmnd = (i == 0) ? 256 : i;
+                if ((reply = check_command_size_in_blocks(fsg, 6,
+                                DATA_DIR_TO_HOST,
                                 (7<<1) | (1<<4), 1,
                                 "READ(6)")) == 0)
                         reply = do_read(fsg);
                 break;
 
         case READ_10:
-                fsg->data_size_from_cmnd =
-                                get_unaligned_be16(&fsg->cmnd[7]) << fsg->curlun->blkbits;
-                if ((reply = check_command(fsg, 10, DATA_DIR_TO_HOST,
+                fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
+                if ((reply = check_command_size_in_blocks(fsg, 10,
+                                DATA_DIR_TO_HOST,
                                 (1<<1) | (0xf<<2) | (3<<7), 1,
                                 "READ(10)")) == 0)
                         reply = do_read(fsg);
                 break;
 
         case READ_12:
-                fsg->data_size_from_cmnd =
-                                get_unaligned_be32(&fsg->cmnd[6]) << fsg->curlun->blkbits;
-                if ((reply = check_command(fsg, 12, DATA_DIR_TO_HOST,
+                fsg->data_size_from_cmnd = get_unaligned_be32(&fsg->cmnd[6]);
+                if ((reply = check_command_size_in_blocks(fsg, 12,
+                                DATA_DIR_TO_HOST,
                                 (1<<1) | (0xf<<2) | (0xf<<6), 1,
                                 "READ(12)")) == 0)
                         reply = do_read(fsg);
@@ -2529,26 +2538,27 @@ static int do_scsi_command(struct fsg_dev *fsg)
 
         case WRITE_6:
                 i = fsg->cmnd[4];
-                fsg->data_size_from_cmnd = (i == 0 ? 256 : i) << fsg->curlun->blkbits;
-                if ((reply = check_command(fsg, 6, DATA_DIR_FROM_HOST,
+                fsg->data_size_from_cmnd = (i == 0) ? 256 : i;
+                if ((reply = check_command_size_in_blocks(fsg, 6,
+                                DATA_DIR_FROM_HOST,
                                 (7<<1) | (1<<4), 1,
                                 "WRITE(6)")) == 0)
                         reply = do_write(fsg);
                 break;
 
         case WRITE_10:
-                fsg->data_size_from_cmnd =
-                                get_unaligned_be16(&fsg->cmnd[7]) << fsg->curlun->blkbits;
-                if ((reply = check_command(fsg, 10, DATA_DIR_FROM_HOST,
+                fsg->data_size_from_cmnd = get_unaligned_be16(&fsg->cmnd[7]);
+                if ((reply = check_command_size_in_blocks(fsg, 10,
+                                DATA_DIR_FROM_HOST,
                                 (1<<1) | (0xf<<2) | (3<<7), 1,
                                 "WRITE(10)")) == 0)
                         reply = do_write(fsg);
                 break;
 
         case WRITE_12:
-                fsg->data_size_from_cmnd =
-                                get_unaligned_be32(&fsg->cmnd[6]) << fsg->curlun->blkbits;
-                if ((reply = check_command(fsg, 12, DATA_DIR_FROM_HOST,
+                fsg->data_size_from_cmnd = get_unaligned_be32(&fsg->cmnd[6]);
+                if ((reply = check_command_size_in_blocks(fsg, 12,
+                                DATA_DIR_FROM_HOST,
                                 (1<<1) | (0xf<<2) | (0xf<<6), 1,
                                 "WRITE(12)")) == 0)
                         reply = do_write(fsg);
@@ -2715,7 +2725,17 @@ static int get_next_command(struct fsg_dev *fsg)
                 memcpy(fsg->cmnd, fsg->cbbuf_cmnd, fsg->cmnd_size);
                 fsg->cbbuf_cmnd_size = 0;
                 spin_unlock_irq(&fsg->lock);
+
+                /* Use LUN from the command */
+                fsg->lun = fsg->cmnd[1] >> 5;
         }
+
+        /* Update current lun */
+        if (fsg->lun >= 0 && fsg->lun < fsg->nluns)
+                fsg->curlun = &fsg->luns[fsg->lun];
+        else
+                fsg->curlun = NULL;
+
         return rc;
 }
 
@@ -3584,7 +3604,7 @@ static void fsg_resume(struct usb_gadget *gadget)
 /*-------------------------------------------------------------------------*/
 
 static struct usb_gadget_driver         fsg_driver = {
-        .speed          = USB_SPEED_SUPER,
+        .max_speed      = USB_SPEED_SUPER,
         .function       = (char *) fsg_string_product,
         .unbind         = fsg_unbind,
         .disconnect     = fsg_disconnect,
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index e00cf92409ce..b95697c03d07 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2336,7 +2336,7 @@ static int fsl_qe_start(struct usb_gadget_driver *driver,
         if (!udc_controller)
                 return -ENODEV;
 
-        if (!driver || driver->speed < USB_SPEED_FULL
+        if (!driver || driver->max_speed < USB_SPEED_FULL
                         || !bind || !driver->disconnect || !driver->setup)
                 return -EINVAL;
 
@@ -2350,7 +2350,7 @@ static int fsl_qe_start(struct usb_gadget_driver *driver,
         /* hook up the driver */
         udc_controller->driver = driver;
         udc_controller->gadget.dev.driver = &driver->driver;
-        udc_controller->gadget.speed = (enum usb_device_speed)(driver->speed);
+        udc_controller->gadget.speed = driver->max_speed;
         spin_unlock_irqrestore(&udc_controller->lock, flags);
 
         retval = bind(&udc_controller->gadget);
@@ -2814,20 +2814,7 @@ static struct platform_driver udc_driver = {
 #endif
 };
 
-static int __init qe_udc_init(void)
-{
-        printk(KERN_INFO "%s: %s, %s\n", driver_name, driver_desc,
-                        DRIVER_VERSION);
-        return platform_driver_register(&udc_driver);
-}
-
-static void __exit qe_udc_exit(void)
-{
-        platform_driver_unregister(&udc_driver);
-}
-
-module_init(qe_udc_init);
-module_exit(qe_udc_exit);
+module_platform_driver(udc_driver);
 
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index dd28ef3def71..d7ea6c076ce9 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1934,7 +1934,7 @@ static int fsl_start(struct usb_gadget_driver *driver,
         if (!udc_controller)
                 return -ENODEV;
 
-        if (!driver || driver->speed < USB_SPEED_FULL
+        if (!driver || driver->max_speed < USB_SPEED_FULL
                         || !bind || !driver->disconnect || !driver->setup)
                 return -EINVAL;
 
@@ -2525,7 +2525,7 @@ static int __init fsl_udc_probe(struct platform_device *pdev)
 
         /* Setup gadget structure */
         udc_controller->gadget.ops = &fsl_gadget_ops;
-        udc_controller->gadget.is_dualspeed = 1;
+        udc_controller->gadget.max_speed = USB_SPEED_HIGH;
         udc_controller->gadget.ep0 = &udc_controller->eps[0].ep;
         INIT_LIST_HEAD(&udc_controller->gadget.ep_list);
         udc_controller->gadget.speed = USB_SPEED_UNKNOWN;
diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/fusb300_udc.c
index 74da206c8406..5831cb4a0b35 100644
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/fusb300_udc.c
@@ -1317,7 +1317,7 @@ static int fusb300_udc_start(struct usb_gadget_driver *driver,
         int retval;
 
         if (!driver
-                        || driver->speed < USB_SPEED_FULL
+                        || driver->max_speed < USB_SPEED_FULL
                         || !bind
                         || !driver->setup)
                 return -EINVAL;
@@ -1463,7 +1463,7 @@ static int __init fusb300_probe(struct platform_device *pdev)
 
         dev_set_name(&fusb300->gadget.dev, "gadget");
 
-        fusb300->gadget.is_dualspeed = 1;
+        fusb300->gadget.max_speed = USB_SPEED_HIGH;
         fusb300->gadget.dev.parent = &pdev->dev;
         fusb300->gadget.dev.dma_mask = pdev->dev.dma_mask;
         fusb300->gadget.dev.release = pdev->dev.release;
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 7f87805cddc4..5af70fcce139 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1357,7 +1357,7 @@ static int goku_start(struct usb_gadget_driver *driver,
         int                     retval;
 
         if (!driver
-                        || driver->speed < USB_SPEED_FULL
+                        || driver->max_speed < USB_SPEED_FULL
                         || !bind
                         || !driver->disconnect
                         || !driver->setup)
@@ -1796,6 +1796,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         spin_lock_init(&dev->lock);
         dev->pdev = pdev;
         dev->gadget.ops = &goku_ops;
+        dev->gadget.max_speed = USB_SPEED_FULL;
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&dev->gadget.dev, "gadget");
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c
index 2d978c0e7ced..8d1c75abd73d 100644
--- a/drivers/usb/gadget/imx_udc.c
+++ b/drivers/usb/gadget/imx_udc.c
@@ -1336,7 +1336,7 @@ static int imx_udc_start(struct usb_gadget_driver *driver,
         int retval;
 
         if (!driver
-                || driver->speed < USB_SPEED_FULL
+                || driver->max_speed < USB_SPEED_FULL
                 || !bind
                 || !driver->disconnect
                 || !driver->setup)
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 6b7ea25af0fe..ae04266dba1b 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1766,9 +1766,9 @@ gadgetfs_suspend (struct usb_gadget *gadget)
 
 static struct usb_gadget_driver gadgetfs_driver = {
 #ifdef  CONFIG_USB_GADGET_DUALSPEED
-        .speed          = USB_SPEED_HIGH,
+        .max_speed      = USB_SPEED_HIGH,
 #else
-        .speed          = USB_SPEED_FULL,
+        .max_speed      = USB_SPEED_FULL,
 #endif
         .function       = (char *) driver_desc,
         .unbind         = gadgetfs_unbind,
@@ -1792,7 +1792,7 @@ static int gadgetfs_probe (struct usb_gadget *gadget)
 }
 
 static struct usb_gadget_driver probe_driver = {
-        .speed          = USB_SPEED_HIGH,
+        .max_speed      = USB_SPEED_HIGH,
         .unbind         = gadgetfs_nop,
         .setup          = (void *)gadgetfs_nop,
         .disconnect     = gadgetfs_nop,
diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c
index c9fa3bf5b377..fa0fcc11263f 100644
--- a/drivers/usb/gadget/langwell_udc.c
+++ b/drivers/usb/gadget/langwell_udc.c
@@ -3267,7 +3267,7 @@ static int langwell_udc_probe(struct pci_dev *pdev,
         dev->gadget.ep0 = &dev->ep[0].ep;       /* gadget ep0 */
         INIT_LIST_HEAD(&dev->gadget.ep_list);   /* ep_list */
         dev->gadget.speed = USB_SPEED_UNKNOWN;  /* speed */
-        dev->gadget.is_dualspeed = 1;           /* support dual speed */
+        dev->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */
 #ifdef  OTG_TRANSCEIVER
         dev->gadget.is_otg = 1;                 /* support otg mode */
 #endif
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 9aa1cbbee45b..3608b3bd5732 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1472,7 +1472,7 @@ static int m66592_start(struct usb_gadget_driver *driver,
         int retval;
 
         if (!driver
-                        || driver->speed < USB_SPEED_HIGH
+                        || driver->max_speed < USB_SPEED_HIGH
                         || !bind
                         || !driver->setup)
                 return -EINVAL;
@@ -1653,7 +1653,7 @@ static int __init m66592_probe(struct platform_device *pdev)
         m66592->gadget.ops = &m66592_gadget_ops;
         device_initialize(&m66592->gadget.dev);
         dev_set_name(&m66592->gadget.dev, "gadget");
-        m66592->gadget.is_dualspeed = 1;
+        m66592->gadget.max_speed = USB_SPEED_HIGH;
         m66592->gadget.dev.parent = &pdev->dev;
         m66592->gadget.dev.dma_mask = pdev->dev.dma_mask;
         m66592->gadget.dev.release = pdev->dev.release;
diff --git a/drivers/usb/gadget/mv_udc.h b/drivers/usb/gadget/mv_udc.h
index daa75c12f336..34aadfae723d 100644
--- a/drivers/usb/gadget/mv_udc.h
+++ b/drivers/usb/gadget/mv_udc.h
@@ -180,7 +180,7 @@ struct mv_udc {
 
         struct mv_cap_regs __iomem      *cap_regs;
         struct mv_op_regs __iomem       *op_regs;
-        unsigned int                    phy_regs;
+        void __iomem                    *phy_regs;
         unsigned int                    max_eps;
         struct mv_dqh                   *ep_dqh;
         size_t                          ep_dqh_size;
@@ -211,11 +211,14 @@ struct mv_udc {
                                 softconnected:1,
                                 force_fs:1,
                                 clock_gating:1,
-                                active:1;
+                                active:1,
+                                stopped:1;      /* stop bit is setted */
 
         struct work_struct      vbus_work;
         struct workqueue_struct *qwork;
 
+        struct otg_transceiver  *transceiver;
+
         struct mv_usb_platform_data     *pdata;
 
         /* some SOC has mutiple clock sources for USB*/
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index 892412103dd8..f97e737d26f7 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -276,11 +276,12 @@ static void done(struct mv_ep *ep, struct mv_req *req, int status)
 
 static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
 {
-        u32 tmp, epstatus, bit_pos, direction;
         struct mv_udc *udc;
         struct mv_dqh *dqh;
+        u32 bit_pos, direction;
+        u32 usbcmd, epstatus;
         unsigned int loops;
-        int readsafe, retval = 0;
+        int retval = 0;
 
         udc = ep->udc;
         direction = ep_dir(ep);
@@ -293,30 +294,18 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
                 lastreq = list_entry(ep->queue.prev, struct mv_req, queue);
                 lastreq->tail->dtd_next =
                         req->head->td_dma & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
-                if (readl(&udc->op_regs->epprime) & bit_pos) {
-                        loops = LOOPS(PRIME_TIMEOUT);
-                        while (readl(&udc->op_regs->epprime) & bit_pos) {
-                                if (loops == 0) {
-                                        retval = -ETIME;
-                                        goto done;
-                                }
-                                udelay(LOOPS_USEC);
-                                loops--;
-                        }
-                        if (readl(&udc->op_regs->epstatus) & bit_pos)
-                                goto done;
-                }
-                readsafe = 0;
+
+                wmb();
+
+                if (readl(&udc->op_regs->epprime) & bit_pos)
+                        goto done;
+
                 loops = LOOPS(READSAFE_TIMEOUT);
-                while (readsafe == 0) {
-                        if (loops == 0) {
-                                retval = -ETIME;
-                                goto done;
-                        }
+                while (1) {
                         /* start with setting the semaphores */
-                        tmp = readl(&udc->op_regs->usbcmd);
-                        tmp |= USBCMD_ATDTW_TRIPWIRE_SET;
-                        writel(tmp, &udc->op_regs->usbcmd);
+                        usbcmd = readl(&udc->op_regs->usbcmd);
+                        usbcmd |= USBCMD_ATDTW_TRIPWIRE_SET;
+                        writel(usbcmd, &udc->op_regs->usbcmd);
 
                         /* read the endpoint status */
                         epstatus = readl(&udc->op_regs->epstatus) & bit_pos;
@@ -329,98 +318,46 @@ static int queue_dtd(struct mv_ep *ep, struct mv_req *req)
                          * primed.
                          */
                         if (readl(&udc->op_regs->usbcmd)
-                                & USBCMD_ATDTW_TRIPWIRE_SET) {
-                                readsafe = 1;
-                        }
+                                & USBCMD_ATDTW_TRIPWIRE_SET)
+                                break;
+
                         loops--;
+                        if (loops == 0) {
+                                dev_err(&udc->dev->dev,
+                                        "Timeout for ATDTW_TRIPWIRE...\n");
+                                retval = -ETIME;
+                                goto done;
+                        }
                         udelay(LOOPS_USEC);
                 }
 
                 /* Clear the semaphore */
-                tmp = readl(&udc->op_regs->usbcmd);
-                tmp &= USBCMD_ATDTW_TRIPWIRE_CLEAR;
-                writel(tmp, &udc->op_regs->usbcmd);
-
-                /* If endpoint is not active, we activate it now. */
-                if (!epstatus) {
-                        if (direction == EP_DIR_IN) {
-                                struct mv_dtd *curr_dtd = dma_to_virt(
-                                        &udc->dev->dev, dqh->curr_dtd_ptr);
-
-                                loops = LOOPS(DTD_TIMEOUT);
-                                while (curr_dtd->size_ioc_sts
-                                        & DTD_STATUS_ACTIVE) {
-                                        if (loops == 0) {
-                                                retval = -ETIME;
-                                                goto done;
-                                        }
-                                        loops--;
-                                        udelay(LOOPS_USEC);
-                                }
-                        }
-                        /* No other transfers on the queue */
+                usbcmd = readl(&udc->op_regs->usbcmd);
+                usbcmd &= USBCMD_ATDTW_TRIPWIRE_CLEAR;
+                writel(usbcmd, &udc->op_regs->usbcmd);
 
-                        /* Write dQH next pointer and terminate bit to 0 */
-                        dqh->next_dtd_ptr = req->head->td_dma
-                                & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
-                        dqh->size_ioc_int_sts = 0;
+                if (epstatus)
+                        goto done;
+        }
 
-                        /*
-                         * Ensure that updates to the QH will
-                         * occur before priming.
-                         */
-                        wmb();
+        /* Write dQH next pointer and terminate bit to 0 */
+        dqh->next_dtd_ptr = req->head->td_dma
+                                & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
 
-                        /* Prime the Endpoint */
-                        writel(bit_pos, &udc->op_regs->epprime);
-                }
-        } else {
-                /* Write dQH next pointer and terminate bit to 0 */
-                dqh->next_dtd_ptr = req->head->td_dma
-                        & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
-                dqh->size_ioc_int_sts = 0;
+        /* clear active and halt bit, in case set from a previous error */
+        dqh->size_ioc_int_sts &= ~(DTD_STATUS_ACTIVE | DTD_STATUS_HALTED);
 
-                /* Ensure that updates to the QH will occur before priming. */
-                wmb();
+        /* Ensure that updates to the QH will occure before priming. */
+        wmb();
 
-                /* Prime the Endpoint */
-                writel(bit_pos, &udc->op_regs->epprime);
+        /* Prime the Endpoint */
+        writel(bit_pos, &udc->op_regs->epprime);
 
-                if (direction == EP_DIR_IN) {
-                        /* FIXME add status check after prime the IN ep */
-                        int prime_again;
-                        u32 curr_dtd_ptr = dqh->curr_dtd_ptr;
-
-                        loops = LOOPS(DTD_TIMEOUT);
-                        prime_again = 0;
-                        while ((curr_dtd_ptr != req->head->td_dma)) {
-                                curr_dtd_ptr = dqh->curr_dtd_ptr;
-                                if (loops == 0) {
-                                        dev_err(&udc->dev->dev,
-                                                "failed to prime %s\n",
-                                                ep->name);
-                                        retval = -ETIME;
-                                        goto done;
-                                }
-                                loops--;
-                                udelay(LOOPS_USEC);
-
-                                if (loops == (LOOPS(DTD_TIMEOUT) >> 2)) {
-                                        if (prime_again)
-                                                goto done;
-                                        dev_info(&udc->dev->dev,
-                                                "prime again\n");
-                                        writel(bit_pos,
-                                                &udc->op_regs->epprime);
-                                        prime_again = 1;
-                                }
-                        }
-                }
-        }
 done:
         return retval;
 }
 
+
 static struct mv_dtd *build_dtd(struct mv_req *req, unsigned *length,
                 dma_addr_t *dma, int *is_last)
 {
@@ -841,6 +778,27 @@ mv_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
         return 0;
 }
 
+static void mv_prime_ep(struct mv_ep *ep, struct mv_req *req)
+{
+        struct mv_dqh *dqh = ep->dqh;
+        u32 bit_pos;
+
+        /* Write dQH next pointer and terminate bit to 0 */
+        dqh->next_dtd_ptr = req->head->td_dma
+                & EP_QUEUE_HEAD_NEXT_POINTER_MASK;
+
+        /* clear active and halt bit, in case set from a previous error */
+        dqh->size_ioc_int_sts &= ~(DTD_STATUS_ACTIVE | DTD_STATUS_HALTED);
+
+        /* Ensure that updates to the QH will occure before priming. */
+        wmb();
+
+        bit_pos = 1 << (((ep_dir(ep) == EP_DIR_OUT) ? 0 : 16) + ep->ep_num);
+
+        /* Prime the Endpoint */
+        writel(bit_pos, &ep->udc->op_regs->epprime);
+}
+
 /* dequeues (cancels, unlinks) an I/O request from an endpoint */
 static int mv_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 {
@@ -883,15 +841,13 @@ static int mv_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 
                 /* The request isn't the last request in this ep queue */
                 if (req->queue.next != &ep->queue) {
-                        struct mv_dqh *qh;
                         struct mv_req *next_req;
 
-                        qh = ep->dqh;
-                        next_req = list_entry(req->queue.next, struct mv_req,
-                                        queue);
+                        next_req = list_entry(req->queue.next,
+                                struct mv_req, queue);
 
                         /* Point the QH to the first TD of next request */
-                        writel((u32) next_req->head, &qh->curr_dtd_ptr);
+                        mv_prime_ep(ep, next_req);
                 } else {
                         struct mv_dqh *qh;
 
@@ -1056,6 +1012,8 @@ static void udc_stop(struct mv_udc *udc)
                 USBINTR_PORT_CHANGE_DETECT_EN | USBINTR_RESET_EN);
         writel(tmp, &udc->op_regs->usbintr);
 
+        udc->stopped = 1;
+
         /* Reset the Run the bit in the command register to stop VUSB */
         tmp = readl(&udc->op_regs->usbcmd);
         tmp &= ~USBCMD_RUN_STOP;
@@ -1072,6 +1030,8 @@ static void udc_start(struct mv_udc *udc)
         /* Enable interrupts */
         writel(usbintr, &udc->op_regs->usbintr);
 
+        udc->stopped = 0;
+
         /* Set the Run bit in the command register */
         writel(USBCMD_RUN_STOP, &udc->op_regs->usbcmd);
 }
@@ -1134,11 +1094,11 @@ static int udc_reset(struct mv_udc *udc)
         return 0;
 }
 
-static int mv_udc_enable(struct mv_udc *udc)
+static int mv_udc_enable_internal(struct mv_udc *udc)
 {
         int retval;
 
-        if (udc->clock_gating == 0 || udc->active)
+        if (udc->active)
                 return 0;
 
         dev_dbg(&udc->dev->dev, "enable udc\n");
@@ -1157,9 +1117,17 @@ static int mv_udc_enable(struct mv_udc *udc)
         return 0;
 }
 
-static void mv_udc_disable(struct mv_udc *udc)
+static int mv_udc_enable(struct mv_udc *udc)
 {
-        if (udc->clock_gating && udc->active) {
+        if (udc->clock_gating)
+                return mv_udc_enable_internal(udc);
+
+        return 0;
+}
+
+static void mv_udc_disable_internal(struct mv_udc *udc)
+{
+        if (udc->active) {
                 dev_dbg(&udc->dev->dev, "disable udc\n");
                 if (udc->pdata->phy_deinit)
                         udc->pdata->phy_deinit(udc->phy_regs);
@@ -1168,6 +1136,12 @@ static void mv_udc_disable(struct mv_udc *udc)
         }
 }
 
+static void mv_udc_disable(struct mv_udc *udc)
+{
+        if (udc->clock_gating)
+                mv_udc_disable_internal(udc);
+}
+
 static int mv_udc_get_frame(struct usb_gadget *gadget)
 {
         struct mv_udc *udc;
@@ -1178,7 +1152,7 @@ static int mv_udc_get_frame(struct usb_gadget *gadget)
 
         udc = container_of(gadget, struct mv_udc, gadget);
 
-        retval = readl(udc->op_regs->frindex) & USB_FRINDEX_MASKS;
+        retval = readl(&udc->op_regs->frindex) & USB_FRINDEX_MASKS;
 
         return retval;
 }
@@ -1212,10 +1186,11 @@ static int mv_udc_vbus_session(struct usb_gadget *gadget, int is_active)
         udc = container_of(gadget, struct mv_udc, gadget);
         spin_lock_irqsave(&udc->lock, flags);
 
+        udc->vbus_active = (is_active != 0);
+
         dev_dbg(&udc->dev->dev, "%s: softconnect %d, vbus_active %d\n",
                 __func__, udc->softconnect, udc->vbus_active);
 
-        udc->vbus_active = (is_active != 0);
         if (udc->driver && udc->softconnect && udc->vbus_active) {
                 retval = mv_udc_enable(udc);
                 if (retval == 0) {
@@ -1244,10 +1219,11 @@ static int mv_udc_pullup(struct usb_gadget *gadget, int is_on)
         udc = container_of(gadget, struct mv_udc, gadget);
         spin_lock_irqsave(&udc->lock, flags);
 
+        udc->softconnect = (is_on != 0);
+
         dev_dbg(&udc->dev->dev, "%s: softconnect %d, vbus_active %d\n",
                         __func__, udc->softconnect, udc->vbus_active);
 
-        udc->softconnect = (is_on != 0);
         if (udc->driver && udc->softconnect && udc->vbus_active) {
                 retval = mv_udc_enable(udc);
                 if (retval == 0) {
@@ -1407,6 +1383,20 @@ static int mv_udc_start(struct usb_gadget_driver *driver,
                 return retval;
         }
 
+        if (udc->transceiver) {
+                retval = otg_set_peripheral(udc->transceiver, &udc->gadget);
+                if (retval) {
+                        dev_err(&udc->dev->dev,
+                                "unable to register peripheral to otg\n");
+                        if (driver->unbind) {
+                                driver->unbind(&udc->gadget);
+                                udc->gadget.dev.driver = NULL;
+                                udc->driver = NULL;
+                        }
+                        return retval;
+                }
+        }
+
         /* pullup is always on */
         mv_udc_pullup(&udc->gadget, 1);
 
@@ -2026,6 +2016,10 @@ static irqreturn_t mv_udc_irq(int irq, void *dev)
         struct mv_udc *udc = (struct mv_udc *)dev;
         u32 status, intr;
 
+        /* Disable ISR when stopped bit is set */
+        if (udc->stopped)
+                return IRQ_NONE;
+
         spin_lock(&udc->lock);
 
         status = readl(&udc->op_regs->usbsts);
@@ -2109,7 +2103,12 @@ static int __devexit mv_udc_remove(struct platform_device *dev)
                 destroy_workqueue(udc->qwork);
         }
 
-        if (udc->pdata && udc->pdata->vbus && udc->clock_gating)
+        /*
+         * If we have transceiver inited,
+         * then vbus irq will not be requested in udc driver.
+         */
+        if (udc->pdata && udc->pdata->vbus
+                && udc->clock_gating && udc->transceiver == NULL)
                 free_irq(udc->pdata->vbus->irq, &dev->dev);
 
         /* free memory allocated in probe */
@@ -2129,11 +2128,9 @@ static int __devexit mv_udc_remove(struct platform_device *dev)
 
         if (udc->cap_regs)
                 iounmap(udc->cap_regs);
-        udc->cap_regs = NULL;
 
         if (udc->phy_regs)
-                iounmap((void *)udc->phy_regs);
-        udc->phy_regs = 0;
+                iounmap(udc->phy_regs);
 
         if (udc->status_req) {
                 kfree(udc->status_req->req.buf);
@@ -2182,6 +2179,11 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
 
         udc->dev = dev;
 
+#ifdef CONFIG_USB_OTG_UTILS
+        if (pdata->mode == MV_USB_MODE_OTG)
+                udc->transceiver = otg_get_transceiver();
+#endif
+
         udc->clknum = pdata->clknum;
         for (clk_i = 0; clk_i < udc->clknum; clk_i++) {
                 udc->clk[clk_i] = clk_get(&dev->dev, pdata->clkname[clk_i]);
@@ -2213,24 +2215,20 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
                 goto err_iounmap_capreg;
         }
 
-        udc->phy_regs = (unsigned int)ioremap(r->start, resource_size(r));
-        if (udc->phy_regs == 0) {
+        udc->phy_regs = ioremap(r->start, resource_size(r));
+        if (udc->phy_regs == NULL) {
                 dev_err(&dev->dev, "failed to map phy I/O memory\n");
                 retval = -EBUSY;
                 goto err_iounmap_capreg;
         }
 
         /* we will acces controller register, so enable the clk */
-        udc_clock_enable(udc);
-        if (pdata->phy_init) {
-                retval = pdata->phy_init(udc->phy_regs);
-                if (retval) {
-                        dev_err(&dev->dev, "phy init error %d\n", retval);
-                        goto err_iounmap_phyreg;
-                }
-        }
+        retval = mv_udc_enable_internal(udc);
+        if (retval)
+                goto err_iounmap_phyreg;
 
-        udc->op_regs = (struct mv_op_regs __iomem *)((u32)udc->cap_regs
+        udc->op_regs =
+                (struct mv_op_regs __iomem *)((unsigned long)udc->cap_regs
                 + (readl(&udc->cap_regs->caplength_hciversion)
                         & CAPLENGTH_MASK));
         udc->max_eps = readl(&udc->cap_regs->dccparams) & DCCPARAMS_DEN_MASK;
@@ -2312,7 +2310,7 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
         udc->gadget.ep0 = &udc->eps[0].ep;      /* gadget ep0 */
         INIT_LIST_HEAD(&udc->gadget.ep_list);   /* ep_list */
         udc->gadget.speed = USB_SPEED_UNKNOWN;  /* speed */
-        udc->gadget.is_dualspeed = 1;           /* support dual speed */
+        udc->gadget.max_speed = USB_SPEED_HIGH; /* support dual speed */
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&udc->gadget.dev, "gadget");
@@ -2328,7 +2326,9 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
         eps_init(udc);
 
         /* VBUS detect: we can disable/enable clock on demand.*/
-        if (pdata->vbus) {
+        if (udc->transceiver)
+                udc->clock_gating = 1;
+        else if (pdata->vbus) {
                 udc->clock_gating = 1;
                 retval = request_threaded_irq(pdata->vbus->irq, NULL,
                                 mv_udc_vbus_irq, IRQF_ONESHOT, "vbus", udc);
@@ -2354,11 +2354,9 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
          * If not, it means that VBUS detection is not supported, we
          * have to enable vbus active all the time to let controller work.
          */
-        if (udc->clock_gating) {
-                if (udc->pdata->phy_deinit)
-                        udc->pdata->phy_deinit(udc->phy_regs);
-                udc_clock_disable(udc);
-        } else
+        if (udc->clock_gating)
+                mv_udc_disable_internal(udc);
+        else
                 udc->vbus_active = 1;
 
         retval = usb_add_gadget_udc(&dev->dev, &udc->gadget);
@@ -2371,7 +2369,8 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
         return 0;
 
 err_unregister:
-        if (udc->pdata && udc->pdata->vbus && udc->clock_gating)
+        if (udc->pdata && udc->pdata->vbus
+                && udc->clock_gating && udc->transceiver == NULL)
                 free_irq(pdata->vbus->irq, &dev->dev);
         device_unregister(&udc->gadget.dev);
 err_free_irq:
@@ -2387,11 +2386,9 @@ err_free_dma:
         dma_free_coherent(&dev->dev, udc->ep_dqh_size,
                         udc->ep_dqh, udc->ep_dqh_dma);
 err_disable_clock:
-        if (udc->pdata->phy_deinit)
-                udc->pdata->phy_deinit(udc->phy_regs);
-        udc_clock_disable(udc);
+        mv_udc_disable_internal(udc);
 err_iounmap_phyreg:
-        iounmap((void *)udc->phy_regs);
+        iounmap(udc->phy_regs);
 err_iounmap_capreg:
         iounmap(udc->cap_regs);
 err_put_clk:
@@ -2407,7 +2404,30 @@ static int mv_udc_suspend(struct device *_dev)
 {
         struct mv_udc *udc = the_controller;
 
-        udc_stop(udc);
+        /* if OTG is enabled, the following will be done in OTG driver*/
+        if (udc->transceiver)
+                return 0;
+
+        if (udc->pdata->vbus && udc->pdata->vbus->poll)
+                if (udc->pdata->vbus->poll() == VBUS_HIGH) {
+                        dev_info(&udc->dev->dev, "USB cable is connected!\n");
+                        return -EAGAIN;
+                }
+
+        /*
+         * only cable is unplugged, udc can suspend.
+         * So do not care about clock_gating == 1.
+         */
+        if (!udc->clock_gating) {
+                udc_stop(udc);
+
+                spin_lock_irq(&udc->lock);
+                /* stop all usb activities */
+                stop_activity(udc, udc->driver);
+                spin_unlock_irq(&udc->lock);
+
+                mv_udc_disable_internal(udc);
+        }
 
         return 0;
 }
@@ -2417,20 +2437,22 @@ static int mv_udc_resume(struct device *_dev)
         struct mv_udc *udc = the_controller;
         int retval;
 
-        if (udc->pdata->phy_init) {
-                retval = udc->pdata->phy_init(udc->phy_regs);
-                if (retval) {
-                        dev_err(&udc->dev->dev,
-                                "init phy error %d when resume back\n",
-                                retval);
+        /* if OTG is enabled, the following will be done in OTG driver*/
+        if (udc->transceiver)
+                return 0;
+
+        if (!udc->clock_gating) {
+                retval = mv_udc_enable_internal(udc);
+                if (retval)
                         return retval;
+
+                if (udc->driver && udc->softconnect) {
+                        udc_reset(udc);
+                        ep0_reset(udc);
+                        udc_start(udc);
                 }
         }
 
-        udc_reset(udc);
-        ep0_reset(udc);
-        udc_start(udc);
-
         return 0;
 }
 
@@ -2457,30 +2479,16 @@ static struct platform_driver udc_driver = {
         .shutdown       = mv_udc_shutdown,
         .driver         = {
                 .owner  = THIS_MODULE,
-                .name   = "pxa-u2o",
+                .name   = "mv-udc",
 #ifdef CONFIG_PM
                 .pm     = &mv_udc_pm_ops,
 #endif
         },
 };
-MODULE_ALIAS("platform:pxa-u2o");
 
+module_platform_driver(udc_driver);
+MODULE_ALIAS("platform:mv-udc");
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Chao Xie <chao.xie@marvell.com>");
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
-
-
-static int __init init(void)
-{
-        return platform_driver_register(&udc_driver);
-}
-module_init(init);
-
-
-static void __exit cleanup(void)
-{
-        platform_driver_unregister(&udc_driver);
-}
-module_exit(cleanup);
-
diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/net2272.c
index d1b76368472f..4c81d540bc26 100644
--- a/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/net2272.c
@@ -1459,7 +1459,7 @@ static int net2272_start(struct usb_gadget *_gadget,
         unsigned i;
 
         if (!driver || !driver->unbind || !driver->setup ||
-            driver->speed != USB_SPEED_HIGH)
+            driver->max_speed != USB_SPEED_HIGH)
                 return -EINVAL;
 
         dev = container_of(_gadget, struct net2272, gadget);
@@ -2235,7 +2235,7 @@ net2272_probe_init(struct device *dev, unsigned int irq)
         ret->irq = irq;
         ret->dev = dev;
         ret->gadget.ops = &net2272_ops;
-        ret->gadget.is_dualspeed = 1;
+        ret->gadget.max_speed = USB_SPEED_HIGH;
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&ret->gadget.dev, "gadget");
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index da2b9d0be3ca..cf1f36454d08 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -1881,7 +1881,7 @@ static int net2280_start(struct usb_gadget *_gadget,
          * (dev->usb->xcvrdiag & FORCE_FULL_SPEED_MODE)
          * "must not be used in normal operation"
          */
-        if (!driver || driver->speed < USB_SPEED_HIGH
+        if (!driver || driver->max_speed < USB_SPEED_HIGH
                         || !driver->setup)
                 return -EINVAL;
 
@@ -2698,7 +2698,7 @@ static int net2280_probe (struct pci_dev *pdev, const struct pci_device_id *id)
         spin_lock_init (&dev->lock);
         dev->pdev = pdev;
         dev->gadget.ops = &net2280_ops;
-        dev->gadget.is_dualspeed = 1;
+        dev->gadget.max_speed = USB_SPEED_HIGH;
 
         /* the "gadget" abstracts/virtualizes the controller */
         dev_set_name(&dev->gadget.dev, "gadget");
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 788989a10223..7db5bbe6251b 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2110,7 +2110,7 @@ static int omap_udc_start(struct usb_gadget_driver *driver,
                 return -ENODEV;
         if (!driver
                         // FIXME if otg, check:  driver->is_otg
-                        || driver->speed < USB_SPEED_FULL
+                        || driver->max_speed < USB_SPEED_FULL
                         || !bind || !driver->setup)
                 return -EINVAL;
 
@@ -2676,6 +2676,7 @@ omap_udc_setup(struct platform_device *odev, struct otg_transceiver *xceiv)
         INIT_LIST_HEAD(&udc->gadget.ep_list);
         INIT_LIST_HEAD(&udc->iso);
         udc->gadget.speed = USB_SPEED_UNKNOWN;
+        udc->gadget.max_speed = USB_SPEED_FULL;
         udc->gadget.name = driver_name;
 
         device_initialize(&udc->gadget.dev);
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/pch_udc.c
index 5048a0c07640..dd2313cce1d3 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/pch_udc.c
@@ -2693,7 +2693,7 @@ static int pch_udc_start(struct usb_gadget_driver *driver,
         struct pch_udc_dev      *dev = pch_udc;
         int                     retval;
 
-        if (!driver || (driver->speed == USB_SPEED_UNKNOWN) || !bind ||
+        if (!driver || (driver->max_speed == USB_SPEED_UNKNOWN) || !bind ||
             !driver->setup || !driver->unbind || !driver->disconnect) {
                 dev_err(&dev->pdev->dev,
                         "%s: invalid driver parameter\n", __func__);
@@ -2941,7 +2941,7 @@ static int pch_udc_probe(struct pci_dev *pdev,
         dev->gadget.dev.dma_mask = pdev->dev.dma_mask;
         dev->gadget.dev.release = gadget_release;
         dev->gadget.name = KBUILD_MODNAME;
-        dev->gadget.is_dualspeed = 1;
+        dev->gadget.max_speed = USB_SPEED_HIGH;
 
         retval = device_register(&dev->gadget.dev);
         if (retval)
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 65a8834f274b..d83134b0f78a 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -1141,7 +1141,7 @@ printer_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                                 break;
 #ifdef CONFIG_USB_GADGET_DUALSPEED
                         case USB_DT_DEVICE_QUALIFIER:
-                                if (!gadget->is_dualspeed)
+                                if (!gadget_is_dualspeed(gadget))
                                         break;
                                 /*
                                  * assumes ep0 uses the same value for both
@@ -1155,7 +1155,7 @@ printer_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                                 break;
 
                         case USB_DT_OTHER_SPEED_CONFIG:
-                                if (!gadget->is_dualspeed)
+                                if (!gadget_is_dualspeed(gadget))
                                         break;
                                 /* FALLTHROUGH */
 #endif /* CONFIG_USB_GADGET_DUALSPEED */
@@ -1535,7 +1535,7 @@ fail:
 /*-------------------------------------------------------------------------*/
 
 static struct usb_gadget_driver printer_driver = {
-        .speed          = DEVSPEED,
+        .max_speed      = DEVSPEED,
 
         .function       = (char *) driver_desc,
         .unbind         = printer_unbind,
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index c090a7e3ecf8..dd470635f4f7 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -1264,7 +1264,7 @@ static int pxa25x_start(struct usb_gadget_driver *driver,
         int                     retval;
 
         if (!driver
-                        || driver->speed < USB_SPEED_FULL
+                        || driver->max_speed < USB_SPEED_FULL
                         || !bind
                         || !driver->disconnect
                         || !driver->setup)
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 18b6b091f2a6..f4c44eb806c3 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1807,7 +1807,7 @@ static int pxa27x_udc_start(struct usb_gadget_driver *driver,
         struct pxa_udc *udc = the_controller;
         int retval;
 
-        if (!driver || driver->speed < USB_SPEED_FULL || !bind
+        if (!driver || driver->max_speed < USB_SPEED_FULL || !bind
                         || !driver->disconnect || !driver->setup)
                 return -EINVAL;
         if (!udc)
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index fc719a3f8557..f5b8d215e1d5 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1746,7 +1746,7 @@ static int r8a66597_start(struct usb_gadget *gadget,
         struct r8a66597 *r8a66597 = gadget_to_r8a66597(gadget);
 
         if (!driver
-                        || driver->speed < USB_SPEED_HIGH
+                        || driver->max_speed < USB_SPEED_HIGH
                         || !driver->setup)
                 return -EINVAL;
         if (!r8a66597)
@@ -1911,7 +1911,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
 
         r8a66597->gadget.ops = &r8a66597_gadget_ops;
         dev_set_name(&r8a66597->gadget.dev, "gadget");
-        r8a66597->gadget.is_dualspeed = 1;
+        r8a66597->gadget.max_speed = USB_SPEED_HIGH;
         r8a66597->gadget.dev.parent = &pdev->dev;
         r8a66597->gadget.dev.dma_mask = pdev->dev.dma_mask;
         r8a66597->gadget.dev.release = pdev->dev.release;
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index b31448229f0b..69295ba9d99a 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2586,7 +2586,7 @@ static int s3c_hsotg_start(struct usb_gadget_driver *driver,
                 return -EINVAL;
         }
 
-        if (driver->speed < USB_SPEED_FULL)
+        if (driver->max_speed < USB_SPEED_FULL)
                 dev_err(hsotg->dev, "%s: bad speed\n", __func__);
 
         if (!bind || !driver->setup) {
@@ -3362,7 +3362,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
 
         dev_set_name(&hsotg->gadget.dev, "gadget");
 
-        hsotg->gadget.is_dualspeed = 1;
+        hsotg->gadget.max_speed = USB_SPEED_HIGH;
         hsotg->gadget.ops = &s3c_hsotg_gadget_ops;
         hsotg->gadget.name = dev_name(dev);
 
@@ -3467,18 +3467,7 @@ static struct platform_driver s3c_hsotg_driver = {
         .resume         = s3c_hsotg_resume,
 };
 
-static int __init s3c_hsotg_modinit(void)
-{
-        return platform_driver_register(&s3c_hsotg_driver);
-}
-
-static void __exit s3c_hsotg_modexit(void)
-{
-        platform_driver_unregister(&s3c_hsotg_driver);
-}
-
-module_init(s3c_hsotg_modinit);
-module_exit(s3c_hsotg_modexit);
+module_platform_driver(s3c_hsotg_driver);
 
 MODULE_DESCRIPTION("Samsung S3C USB High-speed/OtG device");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/s3c-hsudc.c
index 20a553b46aed..df8661d266cb 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/s3c-hsudc.c
@@ -28,9 +28,10 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/otg.h>
 #include <linux/prefetch.h>
+#include <linux/platform_data/s3c-hsudc.h>
+#include <linux/regulator/consumer.h>
 
 #include <mach/regs-s3c2443-clock.h>
-#include <plat/udc.h>
 
 #define S3C_HSUDC_REG(x)        (x)
 
@@ -87,6 +88,12 @@
 #define DATA_STATE_XMIT                 (1)
 #define DATA_STATE_RECV                 (2)
 
+static const char * const s3c_hsudc_supply_names[] = {
+        "vdda",         /* analog phy supply, 3.3V */
+        "vddi",         /* digital phy supply, 1.2V */
+        "vddosc",       /* oscillator supply, 1.8V - 3.3V */
+};
+
 /**
  * struct s3c_hsudc_ep - Endpoint representation used by driver.
  * @ep: USB gadget layer representation of device endpoint.
@@ -139,6 +146,7 @@ struct s3c_hsudc {
         struct device *dev;
         struct s3c24xx_hsudc_platdata *pd;
         struct otg_transceiver *transceiver;
+        struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsudc_supply_names)];
         spinlock_t lock;
         void __iomem *regs;
         struct resource *mem_rsrc;
@@ -153,7 +161,6 @@ struct s3c_hsudc {
 #define ep_index(_ep)           ((_ep)->bEndpointAddress & \
                                         USB_ENDPOINT_NUMBER_MASK)
 
-static struct s3c_hsudc *the_controller;
 static const char driver_name[] = "s3c-udc";
 static const char ep0name[] = "ep0-control";
 
@@ -282,8 +289,7 @@ static void s3c_hsudc_nuke_ep(struct s3c_hsudc_ep *hsep, int status)
  * All the endpoints are stopped and any pending transfer requests if any on
  * the endpoint are terminated.
  */
-static void s3c_hsudc_stop_activity(struct s3c_hsudc *hsudc,
-                          struct usb_gadget_driver *driver)
+static void s3c_hsudc_stop_activity(struct s3c_hsudc *hsudc)
 {
         struct s3c_hsudc_ep *hsep;
         int epnum;
@@ -295,10 +301,6 @@ static void s3c_hsudc_stop_activity(struct s3c_hsudc *hsudc,
                 hsep->stopped = 1;
                 s3c_hsudc_nuke_ep(hsep, -ESHUTDOWN);
         }
-
-        spin_unlock(&hsudc->lock);
-        driver->disconnect(&hsudc->gadget);
-        spin_lock(&hsudc->lock);
 }
 
 /**
@@ -1135,16 +1137,15 @@ static irqreturn_t s3c_hsudc_irq(int irq, void *_dev)
         return IRQ_HANDLED;
 }
 
-static int s3c_hsudc_start(struct usb_gadget_driver *driver,
-                int (*bind)(struct usb_gadget *))
+static int s3c_hsudc_start(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
 {
-        struct s3c_hsudc *hsudc = the_controller;
+        struct s3c_hsudc *hsudc = to_hsudc(gadget);
         int ret;
 
         if (!driver
-                || driver->speed < USB_SPEED_FULL
-                || !bind
-                || !driver->unbind || !driver->disconnect || !driver->setup)
+                || driver->max_speed < USB_SPEED_FULL
+                || !driver->setup)
                 return -EINVAL;
 
         if (!hsudc)
@@ -1155,21 +1156,12 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver,
 
         hsudc->driver = driver;
         hsudc->gadget.dev.driver = &driver->driver;
-        hsudc->gadget.speed = USB_SPEED_UNKNOWN;
-        ret = device_add(&hsudc->gadget.dev);
-        if (ret) {
-                dev_err(hsudc->dev, "failed to probe gadget device");
-                return ret;
-        }
 
-        ret = bind(&hsudc->gadget);
-        if (ret) {
-                dev_err(hsudc->dev, "%s: bind failed\n", hsudc->gadget.name);
-                device_del(&hsudc->gadget.dev);
-
-                hsudc->driver = NULL;
-                hsudc->gadget.dev.driver = NULL;
-                return ret;
+        ret = regulator_bulk_enable(ARRAY_SIZE(hsudc->supplies),
+                                    hsudc->supplies);
+        if (ret != 0) {
+                dev_err(hsudc->dev, "failed to enable supplies: %d\n", ret);
+                goto err_supplies;
         }
 
         /* connect to bus through transceiver */
@@ -1178,13 +1170,7 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver,
                 if (ret) {
                         dev_err(hsudc->dev, "%s: can't bind to transceiver\n",
                                         hsudc->gadget.name);
-                        driver->unbind(&hsudc->gadget);
-
-                        device_del(&hsudc->gadget.dev);
-
-                        hsudc->driver = NULL;
-                        hsudc->gadget.dev.driver = NULL;
-                        return ret;
+                        goto err_otg;
                 }
         }
 
@@ -1197,34 +1183,43 @@ static int s3c_hsudc_start(struct usb_gadget_driver *driver,
                 hsudc->pd->gpio_init();
 
         return 0;
+err_otg:
+        regulator_bulk_disable(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
+err_supplies:
+        hsudc->driver = NULL;
+        hsudc->gadget.dev.driver = NULL;
+        return ret;
 }
 
-static int s3c_hsudc_stop(struct usb_gadget_driver *driver)
+static int s3c_hsudc_stop(struct usb_gadget *gadget,
+                struct usb_gadget_driver *driver)
 {
-        struct s3c_hsudc *hsudc = the_controller;
+        struct s3c_hsudc *hsudc = to_hsudc(gadget);
         unsigned long flags;
 
         if (!hsudc)
                 return -ENODEV;
 
-        if (!driver || driver != hsudc->driver || !driver->unbind)
+        if (!driver || driver != hsudc->driver)
                 return -EINVAL;
 
         spin_lock_irqsave(&hsudc->lock, flags);
-        hsudc->driver = 0;
+        hsudc->driver = NULL;
+        hsudc->gadget.dev.driver = NULL;
+        hsudc->gadget.speed = USB_SPEED_UNKNOWN;
         s3c_hsudc_uninit_phy();
         if (hsudc->pd->gpio_uninit)
                 hsudc->pd->gpio_uninit();
-        s3c_hsudc_stop_activity(hsudc, driver);
+        s3c_hsudc_stop_activity(hsudc);
         spin_unlock_irqrestore(&hsudc->lock, flags);
 
         if (hsudc->transceiver)
                 (void) otg_set_peripheral(hsudc->transceiver, NULL);
 
-        driver->unbind(&hsudc->gadget);
-        device_del(&hsudc->gadget.dev);
         disable_irq(hsudc->irq);
 
+        regulator_bulk_disable(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
+
         dev_info(hsudc->dev, "unregistered gadget driver '%s'\n",
                         driver->driver.name);
         return 0;
@@ -1242,7 +1237,7 @@ static int s3c_hsudc_gadget_getframe(struct usb_gadget *gadget)
 
 static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
 {
-        struct s3c_hsudc *hsudc = the_controller;
+        struct s3c_hsudc *hsudc = to_hsudc(gadget);
 
         if (!hsudc)
                 return -ENODEV;
@@ -1255,18 +1250,18 @@ static int s3c_hsudc_vbus_draw(struct usb_gadget *gadget, unsigned mA)
 
 static struct usb_gadget_ops s3c_hsudc_gadget_ops = {
         .get_frame      = s3c_hsudc_gadget_getframe,
-        .start          = s3c_hsudc_start,
-        .stop           = s3c_hsudc_stop,
+        .udc_start      = s3c_hsudc_start,
+        .udc_stop       = s3c_hsudc_stop,
         .vbus_draw      = s3c_hsudc_vbus_draw,
 };
 
-static int s3c_hsudc_probe(struct platform_device *pdev)
+static int __devinit s3c_hsudc_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct resource *res;
         struct s3c_hsudc *hsudc;
         struct s3c24xx_hsudc_platdata *pd = pdev->dev.platform_data;
-        int ret;
+        int ret, i;
 
         hsudc = kzalloc(sizeof(struct s3c_hsudc) +
                         sizeof(struct s3c_hsudc_ep) * pd->epnum,
@@ -1276,13 +1271,22 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        the_controller = hsudc;
         platform_set_drvdata(pdev, dev);
         hsudc->dev = dev;
         hsudc->pd = pdev->dev.platform_data;
 
         hsudc->transceiver = otg_get_transceiver();
 
+        for (i = 0; i < ARRAY_SIZE(hsudc->supplies); i++)
+                hsudc->supplies[i].supply = s3c_hsudc_supply_names[i];
+
+        ret = regulator_bulk_get(dev, ARRAY_SIZE(hsudc->supplies),
+                                 hsudc->supplies);
+        if (ret != 0) {
+                dev_err(dev, "failed to request supplies: %d\n", ret);
+                goto err_supplies;
+        }
+
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
                 dev_err(dev, "unable to obtain driver resource data\n");
@@ -1307,10 +1311,9 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 
         spin_lock_init(&hsudc->lock);
 
-        device_initialize(&hsudc->gadget.dev);
         dev_set_name(&hsudc->gadget.dev, "gadget");
 
-        hsudc->gadget.is_dualspeed = 1;
+        hsudc->gadget.max_speed = USB_SPEED_HIGH;
         hsudc->gadget.ops = &s3c_hsudc_gadget_ops;
         hsudc->gadget.name = dev_name(dev);
         hsudc->gadget.dev.parent = dev;
@@ -1319,6 +1322,7 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
 
         hsudc->gadget.is_otg = 0;
         hsudc->gadget.is_a_peripheral = 0;
+        hsudc->gadget.speed = USB_SPEED_UNKNOWN;
 
         s3c_hsudc_setup_ep(hsudc);
 
@@ -1348,12 +1352,20 @@ static int s3c_hsudc_probe(struct platform_device *pdev)
         disable_irq(hsudc->irq);
         local_irq_enable();
 
+        ret = device_register(&hsudc->gadget.dev);
+        if (ret) {
+                put_device(&hsudc->gadget.dev);
+                goto err_add_device;
+        }
+
         ret = usb_add_gadget_udc(&pdev->dev, &hsudc->gadget);
         if (ret)
                 goto err_add_udc;
 
         return 0;
 err_add_udc:
+        device_unregister(&hsudc->gadget.dev);
+err_add_device:
         clk_disable(hsudc->uclk);
         clk_put(hsudc->uclk);
 err_clk:
@@ -1362,10 +1374,13 @@ err_irq:
         iounmap(hsudc->regs);
 
 err_remap:
-        release_resource(hsudc->mem_rsrc);
-        kfree(hsudc->mem_rsrc);
-
+        release_mem_region(res->start, resource_size(res));
 err_res:
+        if (hsudc->transceiver)
+                otg_put_transceiver(hsudc->transceiver);
+
+        regulator_bulk_free(ARRAY_SIZE(hsudc->supplies), hsudc->supplies);
+err_supplies:
         kfree(hsudc);
         return ret;
 }
@@ -1377,21 +1392,10 @@ static struct platform_driver s3c_hsudc_driver = {
         },
         .probe          = s3c_hsudc_probe,
 };
-MODULE_ALIAS("platform:s3c-hsudc");
-
-static int __init s3c_hsudc_modinit(void)
-{
-        return platform_driver_register(&s3c_hsudc_driver);
-}
 
-static void __exit s3c_hsudc_modexit(void)
-{
-        platform_driver_unregister(&s3c_hsudc_driver);
-}
-
-module_init(s3c_hsudc_modinit);
-module_exit(s3c_hsudc_modexit);
+module_platform_driver(s3c_hsudc_driver);
 
 MODULE_DESCRIPTION("Samsung S3C24XX USB high-speed controller driver");
 MODULE_AUTHOR("Thomas Abraham <thomas.ab@samsung.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c-hsudc");
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index fac4c650d4bb..3f87cb9344bb 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -1683,9 +1683,9 @@ static int s3c2410_udc_start(struct usb_gadget_driver *driver,
         if (udc->driver)
                 return -EBUSY;
 
-        if (!bind || !driver->setup || driver->speed < USB_SPEED_FULL) {
+        if (!bind || !driver->setup || driver->max_speed < USB_SPEED_FULL) {
                 printk(KERN_ERR "Invalid driver: bind %p setup %p speed %d\n",
-                        bind, driver->setup, driver->speed);
+                        bind, driver->setup, driver->max_speed);
                 return -EINVAL;
         }
 #if defined(MODULE)
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c
index 6939e17f4580..0b0d12ccc487 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@ -371,14 +371,28 @@ static ssize_t usb_udc_softconn_store(struct device *dev,
 }
 static DEVICE_ATTR(soft_connect, S_IWUSR, NULL, usb_udc_softconn_store);
 
-static ssize_t usb_udc_speed_show(struct device *dev,
+#define USB_UDC_SPEED_ATTR(name, param)                                 \
+ssize_t usb_udc_##param##_show(struct device *dev,                      \
+                struct device_attribute *attr, char *buf)               \
+{                                                                       \
+        struct usb_udc *udc = container_of(dev, struct usb_udc, dev);   \
+        return snprintf(buf, PAGE_SIZE, "%s\n",                         \
+                        usb_speed_string(udc->gadget->param));          \
+}                                                                       \
+static DEVICE_ATTR(name, S_IRUSR, usb_udc_##param##_show, NULL)
+
+static USB_UDC_SPEED_ATTR(current_speed, speed);
+static USB_UDC_SPEED_ATTR(maximum_speed, max_speed);
+
+/* TODO: Scheduled for removal in 3.8. */
+static ssize_t usb_udc_is_dualspeed_show(struct device *dev,
                 struct device_attribute *attr, char *buf)
 {
         struct usb_udc          *udc = container_of(dev, struct usb_udc, dev);
-        return snprintf(buf, PAGE_SIZE, "%s\n",
-                        usb_speed_string(udc->gadget->speed));
+        return snprintf(buf, PAGE_SIZE, "%d\n",
+                        gadget_is_dualspeed(udc->gadget));
 }
-static DEVICE_ATTR(speed, S_IRUGO, usb_udc_speed_show, NULL);
+static DEVICE_ATTR(is_dualspeed, S_IRUSR, usb_udc_is_dualspeed_show, NULL);
 
 #define USB_UDC_ATTR(name)                                      \
 ssize_t usb_udc_##name##_show(struct device *dev,               \
@@ -391,7 +405,6 @@ ssize_t usb_udc_##name##_show(struct device *dev,		\
 }                                                               \
 static DEVICE_ATTR(name, S_IRUGO, usb_udc_##name##_show, NULL)
 
-static USB_UDC_ATTR(is_dualspeed);
 static USB_UDC_ATTR(is_otg);
 static USB_UDC_ATTR(is_a_peripheral);
 static USB_UDC_ATTR(b_hnp_enable);
@@ -401,7 +414,8 @@ static USB_UDC_ATTR(a_alt_hnp_support);
 static struct attribute *usb_udc_attrs[] = {
         &dev_attr_srp.attr,
         &dev_attr_soft_connect.attr,
-        &dev_attr_speed.attr,
+        &dev_attr_current_speed.attr,
+        &dev_attr_maximum_speed.attr,
 
         &dev_attr_is_dualspeed.attr,
         &dev_attr_is_otg.attr,
diff --git a/drivers/usb/gadget/usbstring.c b/drivers/usb/gadget/usbstring.c
index 58c4d37d312a..4d25b9009edf 100644
--- a/drivers/usb/gadget/usbstring.c
+++ b/drivers/usb/gadget/usbstring.c
@@ -13,82 +13,17 @@
 #include <linux/string.h>
 #include <linux/device.h>
 #include <linux/init.h>
+#include <linux/nls.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
-#include <asm/unaligned.h>
-
-
-static int utf8_to_utf16le(const char *s, __le16 *cp, unsigned len)
-{
-        int     count = 0;
-        u8      c;
-        u16     uchar;
-
-        /* this insists on correct encodings, though not minimal ones.
-         * BUT it currently rejects legit 4-byte UTF-8 code points,
-         * which need surrogate pairs.  (Unicode 3.1 can use them.)
-         */
-        while (len != 0 && (c = (u8) *s++) != 0) {
-                if (unlikely(c & 0x80)) {
-                        // 2-byte sequence:
-                        // 00000yyyyyxxxxxx = 110yyyyy 10xxxxxx
-                        if ((c & 0xe0) == 0xc0) {
-                                uchar = (c & 0x1f) << 6;
-
-                                c = (u8) *s++;
-                                if ((c & 0xc0) != 0x80)
-                                        goto fail;
-                                c &= 0x3f;
-                                uchar |= c;
-
-                        // 3-byte sequence (most CJKV characters):
-                        // zzzzyyyyyyxxxxxx = 1110zzzz 10yyyyyy 10xxxxxx
-                        } else if ((c & 0xf0) == 0xe0) {
-                                uchar = (c & 0x0f) << 12;
-
-                                c = (u8) *s++;
-                                if ((c & 0xc0) != 0x80)
-                                        goto fail;
-                                c &= 0x3f;
-                                uchar |= c << 6;
-
-                                c = (u8) *s++;
-                                if ((c & 0xc0) != 0x80)
-                                        goto fail;
-                                c &= 0x3f;
-                                uchar |= c;
-
-                                /* no bogus surrogates */
-                                if (0xd800 <= uchar && uchar <= 0xdfff)
-                                        goto fail;
-
-                        // 4-byte sequence (surrogate pairs, currently rare):
-                        // 11101110wwwwzzzzyy + 110111yyyyxxxxxx
-                        //     = 11110uuu 10uuzzzz 10yyyyyy 10xxxxxx
-                        // (uuuuu = wwww + 1)
-                        // FIXME accept the surrogate code points (only)
-
-                        } else
-                                goto fail;
-                } else
-                        uchar = c;
-                put_unaligned_le16(uchar, cp++);
-                count++;
-                len--;
-        }
-        return count;
-fail:
-        return -1;
-}
-
 
 /**
  * usb_gadget_get_string - fill out a string descriptor 
  * @table: of c strings encoded using UTF-8
  * @id: string id, from low byte of wValue in get string descriptor
- * @buf: at least 256 bytes
+ * @buf: at least 256 bytes, must be 16-bit aligned
  *
  * Finds the UTF-8 string matching the ID, and converts it into a
  * string descriptor in utf16-le.
@@ -125,8 +60,8 @@ usb_gadget_get_string (struct usb_gadget_strings *table, int id, u8 *buf)
 
         /* string descriptors have length, tag, then UTF16-LE text */
         len = min ((size_t) 126, strlen (s->s));
-        memset (buf + 2, 0, 2 * len);   /* zero all the bytes */
-        len = utf8_to_utf16le(s->s, (__le16 *)&buf[2], len);
+        len = utf8s_to_utf16s(s->s, len, UTF16_LITTLE_ENDIAN,
+                        (wchar_t *) &buf[2], 126);
         if (len < 0)
                 return -EINVAL;
         buf [0] = (len + 1) * 2;
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 060e0e2b1ae6..4c0c9734251d 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -194,6 +194,15 @@ config USB_EHCI_S5P
        help
          Enable support for the S5P SOC's on-chip EHCI controller.
 
+config USB_EHCI_MV
+        bool "EHCI support for Marvell on-chip controller"
+        depends on USB_EHCI_HCD
+        select USB_EHCI_ROOT_HUB_TT
+        ---help---
+          Enables support for Marvell (including PXA and MMP series) on-chip
+          USB SPH and OTG controller. SPH is a single port host, and it can
+          only be EHCI host. OTG is controller that can switch to host mode.
+
 config USB_W90X900_EHCI
         bool "W90X900(W90P910) EHCI support"
         depends on USB_EHCI_HCD && ARCH_W90X900
@@ -371,6 +380,12 @@ config USB_OHCI_SH
           Enables support for the on-chip OHCI controller on the SuperH.
           If you use the PCI OHCI controller, this option is not necessary.
 
+config USB_OHCI_EXYNOS
+        boolean "OHCI support for Samsung EXYNOS SoC Series"
+        depends on USB_OHCI_HCD && ARCH_EXYNOS
+        help
+         Enable support for the Samsung Exynos SOC's on-chip OHCI controller.
+
 config USB_CNS3XXX_OHCI
         bool "Cavium CNS3XXX OHCI Module"
         depends on USB_OHCI_HCD && ARCH_CNS3XXX
diff --git a/drivers/usb/host/ehci-au1xxx.c b/drivers/usb/host/ehci-au1xxx.c
index 18bafa99fe57..bf7441afed16 100644
--- a/drivers/usb/host/ehci-au1xxx.c
+++ b/drivers/usb/host/ehci-au1xxx.c
@@ -23,6 +23,7 @@ static int au1xxx_ehci_setup(struct usb_hcd *hcd)
         int ret = ehci_init(hcd);
 
         ehci->need_io_watchdog = 0;
+        ehci_reset(ehci);
         return ret;
 }
 
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 3ff9f82f7263..e311a511529b 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -48,6 +48,10 @@
 #include <asm/system.h>
 #include <asm/unaligned.h>
 
+#if defined(CONFIG_PPC_PS3)
+#include <asm/firmware.h>
+#endif
+
 /*-------------------------------------------------------------------------*/
 
 /*
@@ -230,12 +234,58 @@ static int ehci_halt (struct ehci_hcd *ehci)
                           STS_HALT, STS_HALT, 16 * 125);
 }
 
+#if defined(CONFIG_USB_SUSPEND) && defined(CONFIG_PPC_PS3)
+
+/*
+ * The EHCI controller of the Cell Super Companion Chip used in the
+ * PS3 will stop the root hub after all root hub ports are suspended.
+ * When in this condition handshake will return -ETIMEDOUT.  The
+ * STS_HLT bit will not be set, so inspection of the frame index is
+ * used here to test for the condition.  If the condition is found
+ * return success to allow the USB suspend to complete.
+ */
+
+static int handshake_for_broken_root_hub(struct ehci_hcd *ehci,
+                                         void __iomem *ptr, u32 mask, u32 done,
+                                         int usec)
+{
+        unsigned int old_index;
+        int error;
+
+        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
+                return -ETIMEDOUT;
+
+        old_index = ehci_read_frame_index(ehci);
+
+        error = handshake(ehci, ptr, mask, done, usec);
+
+        if (error == -ETIMEDOUT && ehci_read_frame_index(ehci) == old_index)
+                return 0;
+
+        return error;
+}
+
+#else
+
+static int handshake_for_broken_root_hub(struct ehci_hcd *ehci,
+                                         void __iomem *ptr, u32 mask, u32 done,
+                                         int usec)
+{
+        return -ETIMEDOUT;
+}
+
+#endif
+
 static int handshake_on_error_set_halt(struct ehci_hcd *ehci, void __iomem *ptr,
                                        u32 mask, u32 done, int usec)
 {
         int error;
 
         error = handshake(ehci, ptr, mask, done, usec);
+        if (error == -ETIMEDOUT)
+                error = handshake_for_broken_root_hub(ehci, ptr, mask, done,
+                                                      usec);
+
         if (error) {
                 ehci_halt(ehci);
                 ehci->rh_state = EHCI_RH_HALTED;
@@ -620,6 +670,7 @@ static int ehci_init(struct usb_hcd *hcd)
         hw = ehci->async->hw;
         hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
         hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
+        hw->hw_info1 |= cpu_to_hc32(ehci, (1 << 7));    /* I = 1 */
         hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
         hw->hw_qtd_next = EHCI_LIST_END(ehci);
         ehci->async->qh_state = QH_STATE_LINKED;
@@ -677,22 +728,13 @@ static int ehci_init(struct usb_hcd *hcd)
 static int ehci_run (struct usb_hcd *hcd)
 {
         struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
-        int                     retval;
         u32                     temp;
         u32                     hcc_params;
 
         hcd->uses_new_polling = 1;
 
         /* EHCI spec section 4.1 */
-        /*
-         * TDI driver does the ehci_reset in their reset callback.
-         * Don't reset here, because configuration settings will
-         * vanish.
-         */
-        if (!ehci_is_TDI(ehci) && (retval = ehci_reset(ehci)) != 0) {
-                ehci_mem_cleanup(ehci);
-                return retval;
-        }
+
         ehci_writel(ehci, ehci->periodic_dma, &ehci->regs->frame_list);
         ehci_writel(ehci, (u32)ehci->async->qh_dma, &ehci->regs->async_next);
 
@@ -1324,11 +1366,16 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ehci_pxa168_driver
 #endif
 
-#ifdef CONFIG_NLM_XLR
+#ifdef CONFIG_CPU_XLR
 #include "ehci-xls.c"
 #define PLATFORM_DRIVER         ehci_xls_driver
 #endif
 
+#ifdef CONFIG_USB_EHCI_MV
+#include "ehci-mv.c"
+#define        PLATFORM_DRIVER         ehci_mv_driver
+#endif
+
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
     !defined(XILINX_OF_PLATFORM_DRIVER)
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c
new file mode 100644
index 000000000000..52a604fb9321
--- /dev/null
+++ b/drivers/usb/host/ehci-mv.c
@@ -0,0 +1,391 @@
+/*
+ * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
+ * Author: Chao Xie <chao.xie@marvell.com>
+ *        Neil Zhang <zhangwm@marvell.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/usb/otg.h>
+#include <linux/platform_data/mv_usb.h>
+
+#define CAPLENGTH_MASK         (0xff)
+
+struct ehci_hcd_mv {
+        struct usb_hcd *hcd;
+
+        /* Which mode does this ehci running OTG/Host ? */
+        int mode;
+
+        void __iomem *phy_regs;
+        void __iomem *cap_regs;
+        void __iomem *op_regs;
+
+        struct otg_transceiver *otg;
+
+        struct mv_usb_platform_data *pdata;
+
+        /* clock source and total clock number */
+        unsigned int clknum;
+        struct clk *clk[0];
+};
+
+static void ehci_clock_enable(struct ehci_hcd_mv *ehci_mv)
+{
+        unsigned int i;
+
+        for (i = 0; i < ehci_mv->clknum; i++)
+                clk_enable(ehci_mv->clk[i]);
+}
+
+static void ehci_clock_disable(struct ehci_hcd_mv *ehci_mv)
+{
+        unsigned int i;
+
+        for (i = 0; i < ehci_mv->clknum; i++)
+                clk_disable(ehci_mv->clk[i]);
+}
+
+static int mv_ehci_enable(struct ehci_hcd_mv *ehci_mv)
+{
+        int retval;
+
+        ehci_clock_enable(ehci_mv);
+        if (ehci_mv->pdata->phy_init) {
+                retval = ehci_mv->pdata->phy_init(ehci_mv->phy_regs);
+                if (retval)
+                        return retval;
+        }
+
+        return 0;
+}
+
+static void mv_ehci_disable(struct ehci_hcd_mv *ehci_mv)
+{
+        if (ehci_mv->pdata->phy_deinit)
+                ehci_mv->pdata->phy_deinit(ehci_mv->phy_regs);
+        ehci_clock_disable(ehci_mv);
+}
+
+static int mv_ehci_reset(struct usb_hcd *hcd)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        struct device *dev = hcd->self.controller;
+        struct ehci_hcd_mv *ehci_mv = dev_get_drvdata(dev);
+        int retval;
+
+        if (ehci_mv == NULL) {
+                dev_err(dev, "Can not find private ehci data\n");
+                return -ENODEV;
+        }
+
+        /*
+         * data structure init
+         */
+        retval = ehci_init(hcd);
+        if (retval) {
+                dev_err(dev, "ehci_init failed %d\n", retval);
+                return retval;
+        }
+
+        hcd->has_tt = 1;
+        ehci->sbrn = 0x20;
+
+        retval = ehci_reset(ehci);
+        if (retval) {
+                dev_err(dev, "ehci_reset failed %d\n", retval);
+                return retval;
+        }
+
+        return 0;
+}
+
+static const struct hc_driver mv_ehci_hc_driver = {
+        .description = hcd_name,
+        .product_desc = "Marvell EHCI",
+        .hcd_priv_size = sizeof(struct ehci_hcd),
+
+        /*
+         * generic hardware linkage
+         */
+        .irq = ehci_irq,
+        .flags = HCD_MEMORY | HCD_USB2,
+
+        /*
+         * basic lifecycle operations
+         */
+        .reset = mv_ehci_reset,
+        .start = ehci_run,
+        .stop = ehci_stop,
+        .shutdown = ehci_shutdown,
+
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue = ehci_urb_enqueue,
+        .urb_dequeue = ehci_urb_dequeue,
+        .endpoint_disable = ehci_endpoint_disable,
+        .endpoint_reset = ehci_endpoint_reset,
+        .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+
+        /*
+         * scheduling support
+         */
+        .get_frame_number = ehci_get_frame,
+
+        /*
+         * root hub support
+         */
+        .hub_status_data = ehci_hub_status_data,
+        .hub_control = ehci_hub_control,
+        .bus_suspend = ehci_bus_suspend,
+        .bus_resume = ehci_bus_resume,
+};
+
+static int mv_ehci_probe(struct platform_device *pdev)
+{
+        struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
+        struct usb_hcd *hcd;
+        struct ehci_hcd *ehci;
+        struct ehci_hcd_mv *ehci_mv;
+        struct resource *r;
+        int clk_i, retval = -ENODEV;
+        u32 offset;
+        size_t size;
+
+        if (!pdata) {
+                dev_err(&pdev->dev, "missing platform_data\n");
+                return -ENODEV;
+        }
+
+        if (usb_disabled())
+                return -ENODEV;
+
+        hcd = usb_create_hcd(&mv_ehci_hc_driver, &pdev->dev, "mv ehci");
+        if (!hcd)
+                return -ENOMEM;
+
+        size = sizeof(*ehci_mv) + sizeof(struct clk *) * pdata->clknum;
+        ehci_mv = kzalloc(size, GFP_KERNEL);
+        if (ehci_mv == NULL) {
+                dev_err(&pdev->dev, "cannot allocate ehci_hcd_mv\n");
+                retval = -ENOMEM;
+                goto err_put_hcd;
+        }
+
+        platform_set_drvdata(pdev, ehci_mv);
+        ehci_mv->pdata = pdata;
+        ehci_mv->hcd = hcd;
+
+        ehci_mv->clknum = pdata->clknum;
+        for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++) {
+                ehci_mv->clk[clk_i] =
+                    clk_get(&pdev->dev, pdata->clkname[clk_i]);
+                if (IS_ERR(ehci_mv->clk[clk_i])) {
+                        dev_err(&pdev->dev, "error get clck \"%s\"\n",
+                                pdata->clkname[clk_i]);
+                        retval = PTR_ERR(ehci_mv->clk[clk_i]);
+                        goto err_put_clk;
+                }
+        }
+
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phyregs");
+        if (r == NULL) {
+                dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
+                retval = -ENODEV;
+                goto err_put_clk;
+        }
+
+        ehci_mv->phy_regs = ioremap(r->start, resource_size(r));
+        if (ehci_mv->phy_regs == 0) {
+                dev_err(&pdev->dev, "failed to map phy I/O memory\n");
+                retval = -EFAULT;
+                goto err_put_clk;
+        }
+
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "capregs");
+        if (!r) {
+                dev_err(&pdev->dev, "no I/O memory resource defined\n");
+                retval = -ENODEV;
+                goto err_iounmap_phyreg;
+        }
+
+        ehci_mv->cap_regs = ioremap(r->start, resource_size(r));
+        if (ehci_mv->cap_regs == NULL) {
+                dev_err(&pdev->dev, "failed to map I/O memory\n");
+                retval = -EFAULT;
+                goto err_iounmap_phyreg;
+        }
+
+        retval = mv_ehci_enable(ehci_mv);
+        if (retval) {
+                dev_err(&pdev->dev, "init phy error %d\n", retval);
+                goto err_iounmap_capreg;
+        }
+
+        offset = readl(ehci_mv->cap_regs) & CAPLENGTH_MASK;
+        ehci_mv->op_regs =
+                (void __iomem *) ((unsigned long) ehci_mv->cap_regs + offset);
+
+        hcd->rsrc_start = r->start;
+        hcd->rsrc_len = r->end - r->start + 1;
+        hcd->regs = ehci_mv->op_regs;
+
+        hcd->irq = platform_get_irq(pdev, 0);
+        if (!hcd->irq) {
+                dev_err(&pdev->dev, "Cannot get irq.");
+                retval = -ENODEV;
+                goto err_disable_clk;
+        }
+
+        ehci = hcd_to_ehci(hcd);
+        ehci->caps = (struct ehci_caps *) ehci_mv->cap_regs;
+        ehci->regs = (struct ehci_regs *) ehci_mv->op_regs;
+        ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+
+        ehci_mv->mode = pdata->mode;
+        if (ehci_mv->mode == MV_USB_MODE_OTG) {
+#ifdef CONFIG_USB_OTG_UTILS
+                ehci_mv->otg = otg_get_transceiver();
+                if (!ehci_mv->otg) {
+                        dev_err(&pdev->dev,
+                                "unable to find transceiver\n");
+                        retval = -ENODEV;
+                        goto err_disable_clk;
+                }
+
+                retval = otg_set_host(ehci_mv->otg, &hcd->self);
+                if (retval < 0) {
+                        dev_err(&pdev->dev,
+                                "unable to register with transceiver\n");
+                        retval = -ENODEV;
+                        goto err_put_transceiver;
+                }
+                /* otg will enable clock before use as host */
+                mv_ehci_disable(ehci_mv);
+#else
+                dev_info(&pdev->dev, "MV_USB_MODE_OTG "
+                         "must have CONFIG_USB_OTG_UTILS enabled\n");
+                goto err_disable_clk;
+#endif
+        } else {
+                if (pdata->set_vbus)
+                        pdata->set_vbus(1);
+
+                retval = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
+                if (retval) {
+                        dev_err(&pdev->dev,
+                                "failed to add hcd with err %d\n", retval);
+                        goto err_set_vbus;
+                }
+        }
+
+        if (pdata->private_init)
+                pdata->private_init(ehci_mv->op_regs, ehci_mv->phy_regs);
+
+        dev_info(&pdev->dev,
+                 "successful find EHCI device with regs 0x%p irq %d"
+                 " working in %s mode\n", hcd->regs, hcd->irq,
+                 ehci_mv->mode == MV_USB_MODE_OTG ? "OTG" : "Host");
+
+        return 0;
+
+err_set_vbus:
+        if (pdata->set_vbus)
+                pdata->set_vbus(0);
+#ifdef CONFIG_USB_OTG_UTILS
+err_put_transceiver:
+        if (ehci_mv->otg)
+                otg_put_transceiver(ehci_mv->otg);
+#endif
+err_disable_clk:
+        mv_ehci_disable(ehci_mv);
+err_iounmap_capreg:
+        iounmap(ehci_mv->cap_regs);
+err_iounmap_phyreg:
+        iounmap(ehci_mv->phy_regs);
+err_put_clk:
+        for (clk_i--; clk_i >= 0; clk_i--)
+                clk_put(ehci_mv->clk[clk_i]);
+        platform_set_drvdata(pdev, NULL);
+        kfree(ehci_mv);
+err_put_hcd:
+        usb_put_hcd(hcd);
+
+        return retval;
+}
+
+static int mv_ehci_remove(struct platform_device *pdev)
+{
+        struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
+        struct usb_hcd *hcd = ehci_mv->hcd;
+        int clk_i;
+
+        if (hcd->rh_registered)
+                usb_remove_hcd(hcd);
+
+        if (ehci_mv->otg) {
+                otg_set_host(ehci_mv->otg, NULL);
+                otg_put_transceiver(ehci_mv->otg);
+        }
+
+        if (ehci_mv->mode == MV_USB_MODE_HOST) {
+                if (ehci_mv->pdata->set_vbus)
+                        ehci_mv->pdata->set_vbus(0);
+
+                mv_ehci_disable(ehci_mv);
+        }
+
+        iounmap(ehci_mv->cap_regs);
+        iounmap(ehci_mv->phy_regs);
+
+        for (clk_i = 0; clk_i < ehci_mv->clknum; clk_i++)
+                clk_put(ehci_mv->clk[clk_i]);
+
+        platform_set_drvdata(pdev, NULL);
+
+        kfree(ehci_mv);
+        usb_put_hcd(hcd);
+
+        return 0;
+}
+
+MODULE_ALIAS("mv-ehci");
+
+static const struct platform_device_id ehci_id_table[] = {
+        {"pxa-u2oehci", PXA_U2OEHCI},
+        {"pxa-sph", PXA_SPH},
+        {"mmp3-hsic", MMP3_HSIC},
+        {"mmp3-fsic", MMP3_FSIC},
+        {},
+};
+
+static void mv_ehci_shutdown(struct platform_device *pdev)
+{
+        struct ehci_hcd_mv *ehci_mv = platform_get_drvdata(pdev);
+        struct usb_hcd *hcd = ehci_mv->hcd;
+
+        if (!hcd->rh_registered)
+                return;
+
+        if (hcd->driver->shutdown)
+                hcd->driver->shutdown(hcd);
+}
+
+static struct platform_driver ehci_mv_driver = {
+        .probe = mv_ehci_probe,
+        .remove = mv_ehci_remove,
+        .shutdown = mv_ehci_shutdown,
+        .driver = {
+                   .name = "mv-ehci",
+                   .bus = &platform_bus_type,
+                   },
+        .id_table = ehci_id_table,
+};
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c
index ba1f51361134..c0104882c72d 100644
--- a/drivers/usb/host/ehci-octeon.c
+++ b/drivers/usb/host/ehci-octeon.c
@@ -155,6 +155,8 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
         /* cache this readonly data; minimize chip reads */
         ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
 
+        ehci_reset(ehci);
+
         ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (ret) {
                 dev_dbg(&pdev->dev, "failed to add hcd with err %d\n", ret);
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index e39b0297bad1..bba9850f32f0 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -41,6 +41,7 @@
 #include <linux/usb/ulpi.h>
 #include <plat/usb.h>
 #include <linux/regulator/consumer.h>
+#include <linux/pm_runtime.h>
 
 /* EHCI Register Set */
 #define EHCI_INSNREG04                                  (0xA0)
@@ -190,11 +191,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
                 }
         }
 
-        ret = omap_usbhs_enable(dev);
-        if (ret) {
-                dev_err(dev, "failed to start usbhs with err %d\n", ret);
-                goto err_enable;
-        }
+        pm_runtime_enable(dev);
+        pm_runtime_get_sync(dev);
 
         /*
          * An undocumented "feature" in the OMAP3 EHCI controller,
@@ -228,6 +226,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         /* cache this readonly data; minimize chip reads */
         omap_ehci->hcs_params = readl(&omap_ehci->caps->hcs_params);
 
+        ehci_reset(omap_ehci);
+
         ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (ret) {
                 dev_err(dev, "failed to add hcd with err %d\n", ret);
@@ -240,11 +240,8 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         return 0;
 
 err_add_hcd:
-        omap_usbhs_disable(dev);
-
-err_enable:
         disable_put_regulator(pdata);
-        usb_put_hcd(hcd);
+        pm_runtime_put_sync(dev);
 
 err_io:
         iounmap(regs);
@@ -266,10 +263,12 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
         struct usb_hcd *hcd     = dev_get_drvdata(dev);
 
         usb_remove_hcd(hcd);
-        omap_usbhs_disable(dev);
         disable_put_regulator(dev->platform_data);
         iounmap(hcd->regs);
         usb_put_hcd(hcd);
+        pm_runtime_put_sync(dev);
+        pm_runtime_disable(dev);
+
         return 0;
 }
 
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index a68a2a5c4b83..6c6a5a3b4ea7 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -172,7 +172,7 @@ static const struct hc_driver ehci_orion_hc_driver = {
 
 static void __init
 ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
-                                struct mbus_dram_target_info *dram)
+                             const struct mbus_dram_target_info *dram)
 {
         int i;
 
@@ -182,7 +182,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
         }
 
         for (i = 0; i < dram->num_cs; i++) {
-                struct mbus_dram_window *cs = dram->cs + i;
+                const struct mbus_dram_window *cs = dram->cs + i;
 
                 wrl(USB_WINDOW_CTRL(i), ((cs->size - 1) & 0xffff0000) |
                                         (cs->mbus_attr << 8) |
@@ -194,6 +194,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd,
 static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
 {
         struct orion_ehci_data *pd = pdev->dev.platform_data;
+        const struct mbus_dram_target_info *dram;
         struct resource *res;
         struct usb_hcd *hcd;
         struct ehci_hcd *ehci;
@@ -259,8 +260,9 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
         /*
          * (Re-)program MBUS remapping windows if we are asked to.
          */
-        if (pd != NULL && pd->dram != NULL)
-                ehci_orion_conf_mbus_windows(hcd, pd->dram);
+        dram = mv_mbus_dram_info();
+        if (dram)
+                ehci_orion_conf_mbus_windows(hcd, dram);
 
         /*
          * setup Orion USB controller.
diff --git a/drivers/usb/host/ehci-ps3.c b/drivers/usb/host/ehci-ps3.c
index 2dc32da75cfc..a20e496eb479 100644
--- a/drivers/usb/host/ehci-ps3.c
+++ b/drivers/usb/host/ehci-ps3.c
@@ -21,6 +21,34 @@
 #include <asm/firmware.h>
 #include <asm/ps3.h>
 
+static void ps3_ehci_setup_insnreg(struct ehci_hcd *ehci)
+{
+        /* PS3 HC internal setup register offsets. */
+
+        enum ps3_ehci_hc_insnreg {
+                ps3_ehci_hc_insnreg01 = 0x084,
+                ps3_ehci_hc_insnreg02 = 0x088,
+                ps3_ehci_hc_insnreg03 = 0x08c,
+        };
+
+        /* PS3 EHCI HC errata fix 316 - The PS3 EHCI HC will reset its
+         * internal INSNREGXX setup regs back to the chip default values
+         * on Host Controller Reset (CMD_RESET) or Light Host Controller
+         * Reset (CMD_LRESET).  The work-around for this is for the HC
+         * driver to re-initialise these regs when ever the HC is reset.
+         */
+
+        /* Set burst transfer counts to 256 out, 32 in. */
+
+        writel_be(0x01000020, (void __iomem *)ehci->regs +
+                ps3_ehci_hc_insnreg01);
+
+        /* Enable burst transfer counts. */
+
+        writel_be(0x00000001, (void __iomem *)ehci->regs +
+                ps3_ehci_hc_insnreg03);
+}
+
 static int ps3_ehci_hc_reset(struct usb_hcd *hcd)
 {
         int result;
@@ -49,6 +77,8 @@ static int ps3_ehci_hc_reset(struct usb_hcd *hcd)
 
         ehci_reset(ehci);
 
+        ps3_ehci_setup_insnreg(ehci);
+
         return result;
 }
 
diff --git a/drivers/usb/host/ehci-pxa168.c b/drivers/usb/host/ehci-pxa168.c
index ac0c16e8f539..8d0e7a22e711 100644
--- a/drivers/usb/host/ehci-pxa168.c
+++ b/drivers/usb/host/ehci-pxa168.c
@@ -299,7 +299,7 @@ static int __devinit ehci_pxa168_drv_probe(struct platform_device *pdev)
         ehci = hcd_to_ehci(hcd);
         ehci->caps = hcd->regs + 0x100;
         ehci->regs = hcd->regs + 0x100 +
-                HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
+                HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
         ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
         hcd->has_tt = 1;
         ehci->sbrn = 0x20;
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 4e4066c35a09..36ca5077cdf7 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -373,6 +373,17 @@ qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh)
  retry_xacterr:
                 if ((token & QTD_STS_ACTIVE) == 0) {
 
+                        /* Report Data Buffer Error: non-fatal but useful */
+                        if (token & QTD_STS_DBE)
+                                ehci_dbg(ehci,
+                                        "detected DataBufferErr for urb %p ep%d%s len %d, qtd %p [qh %p]\n",
+                                        urb,
+                                        usb_endpoint_num(&urb->ep->desc),
+                                        usb_endpoint_dir_in(&urb->ep->desc) ? "in" : "out",
+                                        urb->transfer_buffer_length,
+                                        qtd,
+                                        qh);
+
                         /* on STALL, error, and short reads this urb must
                          * complete and all its qtds must be recycled.
                          */
@@ -647,7 +658,7 @@ qh_urb_transaction (
         /*
          * data transfer stage:  buffer setup
          */
-        i = urb->num_sgs;
+        i = urb->num_mapped_sgs;
         if (len > 0 && i > 0) {
                 sg = urb->sg;
                 buf = sg_dma_address(sg);
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 024b65c4990d..293f7412992e 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -14,8 +14,6 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
-#include <mach/regs-pmu.h>
-#include <plat/cpu.h>
 #include <plat/ehci.h>
 #include <plat/usb-phy.h>
 
@@ -136,6 +134,8 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev)
         /* cache this readonly data; minimize chip reads */
         ehci->hcs_params = readl(&ehci->caps->hcs_params);
 
+        ehci_reset(ehci);
+
         err = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (err) {
                 dev_err(&pdev->dev, "Failed to add USB HCD\n");
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index db9d1b4bfbdc..dbc7fe8ca9e7 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -21,7 +21,12 @@
 #include <linux/platform_data/tegra_usb.h>
 #include <linux/irq.h>
 #include <linux/usb/otg.h>
+#include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+
 #include <mach/usb_phy.h>
+#include <mach/iomap.h>
 
 #define TEGRA_USB_DMA_ALIGN 32
 
@@ -574,6 +579,35 @@ static const struct hc_driver tegra_ehci_hc_driver = {
         .port_handed_over       = ehci_port_handed_over,
 };
 
+static int setup_vbus_gpio(struct platform_device *pdev)
+{
+        int err = 0;
+        int gpio;
+
+        if (!pdev->dev.of_node)
+                return 0;
+
+        gpio = of_get_named_gpio(pdev->dev.of_node, "nvidia,vbus-gpio", 0);
+        if (!gpio_is_valid(gpio))
+                return 0;
+
+        err = gpio_request(gpio, "vbus_gpio");
+        if (err) {
+                dev_err(&pdev->dev, "can't request vbus gpio %d", gpio);
+                return err;
+        }
+        err = gpio_direction_output(gpio, 1);
+        if (err) {
+                dev_err(&pdev->dev, "can't enable vbus\n");
+                return err;
+        }
+        gpio_set_value(gpio, 1);
+
+        return err;
+}
+
+static u64 tegra_ehci_dma_mask = DMA_BIT_MASK(32);
+
 static int tegra_ehci_probe(struct platform_device *pdev)
 {
         struct resource *res;
@@ -590,6 +624,15 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
+        /* Right now device-tree probed devices don't get dma_mask set.
+         * Since shared usb code relies on it, set it here for now.
+         * Once we have dma capability bindings this can go away.
+         */
+        if (!pdev->dev.dma_mask)
+                pdev->dev.dma_mask = &tegra_ehci_dma_mask;
+
+        setup_vbus_gpio(pdev);
+
         tegra = kzalloc(sizeof(struct tegra_ehci_hcd), GFP_KERNEL);
         if (!tegra)
                 return -ENOMEM;
@@ -640,6 +683,28 @@ static int tegra_ehci_probe(struct platform_device *pdev)
                 goto fail_io;
         }
 
+        /* This is pretty ugly and needs to be fixed when we do only
+         * device-tree probing. Old code relies on the platform_device
+         * numbering that we lack for device-tree-instantiated devices.
+         */
+        if (instance < 0) {
+                switch (res->start) {
+                case TEGRA_USB_BASE:
+                        instance = 0;
+                        break;
+                case TEGRA_USB2_BASE:
+                        instance = 1;
+                        break;
+                case TEGRA_USB3_BASE:
+                        instance = 2;
+                        break;
+                default:
+                        err = -ENODEV;
+                        dev_err(&pdev->dev, "unknown usb instance\n");
+                        goto fail_phy;
+                }
+        }
+
         tegra->phy = tegra_usb_phy_open(instance, hcd->regs, pdata->phy_config,
                                                 TEGRA_USB_PHY_MODE_HOST);
         if (IS_ERR(tegra->phy)) {
@@ -773,6 +838,11 @@ static void tegra_ehci_hcd_shutdown(struct platform_device *pdev)
                 hcd->driver->shutdown(hcd);
 }
 
+static struct of_device_id tegra_ehci_of_match[] __devinitdata = {
+        { .compatible = "nvidia,tegra20-ehci", },
+        { },
+};
+
 static struct platform_driver tegra_ehci_driver = {
         .probe          = tegra_ehci_probe,
         .remove         = tegra_ehci_remove,
@@ -783,5 +853,6 @@ static struct platform_driver tegra_ehci_driver = {
         .shutdown       = tegra_ehci_hcd_shutdown,
         .driver         = {
                 .name   = "tegra-ehci",
+                .of_match_table = tegra_ehci_of_match,
         }
 };
diff --git a/drivers/usb/host/ehci-vt8500.c b/drivers/usb/host/ehci-vt8500.c
index 54d1ab8aec49..c1eda73916cd 100644
--- a/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@ -132,6 +132,8 @@ static int vt8500_ehci_drv_probe(struct platform_device *pdev)
 
         ehci_port_power(ehci, 1);
 
+        ehci_reset(ehci);
+
         ret = usb_add_hcd(hcd, pdev->resource[1].start,
                           IRQF_SHARED);
         if (ret == 0) {
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index d661cf7de140..3d2e26cbb34c 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -78,6 +78,8 @@ static int __devinit usb_w90x900_probe(const struct hc_driver *driver,
         if (irq < 0)
                 goto err4;
 
+        ehci_reset(ehci);
+
         retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
         if (retval != 0)
                 goto err4;
diff --git a/drivers/usb/host/ehci-xls.c b/drivers/usb/host/ehci-xls.c
index b4fb511d24bc..72f08196f8cd 100644
--- a/drivers/usb/host/ehci-xls.c
+++ b/drivers/usb/host/ehci-xls.c
@@ -69,7 +69,7 @@ int ehci_xls_probe_internal(const struct hc_driver *driver,
         }
 
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                 driver->description)) {
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 4ed6d19f2a54..d2623747b489 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -824,17 +824,7 @@ static struct platform_driver of_fhci_driver = {
         .remove         = __devexit_p(of_fhci_remove),
 };
 
-static int __init fhci_module_init(void)
-{
-        return platform_driver_register(&of_fhci_driver);
-}
-module_init(fhci_module_init);
-
-static void __exit fhci_module_exit(void)
-{
-        platform_driver_unregister(&of_fhci_driver);
-}
-module_exit(fhci_module_exit);
+module_platform_driver(of_fhci_driver);
 
 MODULE_DESCRIPTION("USB Freescale Host Controller Interface Driver");
 MODULE_AUTHOR("Shlomi Gridish <gridish@freescale.com>, "
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 9037035ad1e4..7916e56a725e 100644
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -297,17 +297,7 @@ static struct platform_driver fsl_usb2_mph_dr_driver = {
         .remove = __devexit_p(fsl_usb2_mph_dr_of_remove),
 };
 
-static int __init fsl_usb2_mph_dr_init(void)
-{
-        return platform_driver_register(&fsl_usb2_mph_dr_driver);
-}
-module_init(fsl_usb2_mph_dr_init);
-
-static void __exit fsl_usb2_mph_dr_exit(void)
-{
-        platform_driver_unregister(&fsl_usb2_mph_dr_driver);
-}
-module_exit(fsl_usb2_mph_dr_exit);
+module_platform_driver(fsl_usb2_mph_dr_driver);
 
 MODULE_DESCRIPTION("FSL MPH DR OF devices driver");
 MODULE_AUTHOR("Anatolij Gustschin <agust@denx.de>");
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index 43b3ca48d753..104730dabd2d 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -776,7 +776,6 @@ static int hwahc_probe(struct usb_interface *usb_iface,
                 goto error_alloc;
         }
         usb_hcd->wireless = 1;
-        set_bit(HCD_FLAG_SAW_IRQ, &usb_hcd->flags);
         wusbhc = usb_hcd_to_wusbhc(usb_hcd);
         hwahc = container_of(wusbhc, struct hwahc, wusbhc);
         hwahc_init(hwahc);
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index dbf0f156ed9e..ff471c1c165e 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1924,18 +1924,7 @@ static struct platform_driver imx21_hcd_driver = {
         .resume = NULL,
 };
 
-static int __init imx21_hcd_init(void)
-{
-        return platform_driver_register(&imx21_hcd_driver);
-}
-
-static void __exit imx21_hcd_cleanup(void)
-{
-        platform_driver_unregister(&imx21_hcd_driver);
-}
-
-module_init(imx21_hcd_init);
-module_exit(imx21_hcd_cleanup);
+module_platform_driver(imx21_hcd_driver);
 
 MODULE_DESCRIPTION("i.MX21 USB Host controller");
 MODULE_AUTHOR("Martin Fuzzey");
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 27dfab80ed8f..fc72d44bf787 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -32,6 +32,13 @@ static struct kmem_cache *qtd_cachep;
 static struct kmem_cache *qh_cachep;
 static struct kmem_cache *urb_listitem_cachep;
 
+enum queue_head_types {
+        QH_CONTROL,
+        QH_BULK,
+        QH_INTERRUPT,
+        QH_END
+};
+
 struct isp1760_hcd {
         u32 hcs_params;
         spinlock_t              lock;
@@ -40,7 +47,7 @@ struct isp1760_hcd {
         struct slotinfo         int_slots[32];
         int                     int_done_map;
         struct memory_chunk memory_pool[BLOCKS];
-        struct list_head        controlqhs, bulkqhs, interruptqhs;
+        struct list_head        qh_list[QH_END];
 
         /* periodic schedule support */
 #define DEFAULT_I_TDPS          1024
@@ -406,12 +413,12 @@ static int priv_init(struct usb_hcd *hcd)
 {
         struct isp1760_hcd              *priv = hcd_to_priv(hcd);
         u32                     hcc_params;
+        int i;
 
         spin_lock_init(&priv->lock);
 
-        INIT_LIST_HEAD(&priv->interruptqhs);
-        INIT_LIST_HEAD(&priv->controlqhs);
-        INIT_LIST_HEAD(&priv->bulkqhs);
+        for (i = 0; i < QH_END; i++)
+                INIT_LIST_HEAD(&priv->qh_list[i]);
 
         /*
          * hw default: 1K periodic list heads, one per frame.
@@ -930,9 +937,9 @@ void schedule_ptds(struct usb_hcd *hcd)
         struct isp1760_hcd *priv;
         struct isp1760_qh *qh, *qh_next;
         struct list_head *ep_queue;
-        struct usb_host_endpoint *ep;
         LIST_HEAD(urb_list);
         struct urb_listitem *urb_listitem, *urb_listitem_next;
+        int i;
 
         if (!hcd) {
                 WARN_ON(1);
@@ -944,28 +951,13 @@ void schedule_ptds(struct usb_hcd *hcd)
         /*
          * check finished/retired xfers, transfer payloads, call urb_done()
          */
-        ep_queue = &priv->interruptqhs;
-        while (ep_queue) {
+        for (i = 0; i < QH_END; i++) {
+                ep_queue = &priv->qh_list[i];
                 list_for_each_entry_safe(qh, qh_next, ep_queue, qh_list) {
-                        ep = list_entry(qh->qtd_list.next, struct isp1760_qtd,
-                                                        qtd_list)->urb->ep;
                         collect_qtds(hcd, qh, &urb_list);
-                        if (list_empty(&qh->qtd_list)) {
+                        if (list_empty(&qh->qtd_list))
                                 list_del(&qh->qh_list);
-                                if (ep->hcpriv == NULL) {
-                                        /* Endpoint has been disabled, so we
-                                        can free the associated queue head. */
-                                        qh_free(qh);
-                                }
-                        }
                 }
-
-                if (ep_queue == &priv->interruptqhs)
-                        ep_queue = &priv->controlqhs;
-                else if (ep_queue == &priv->controlqhs)
-                        ep_queue = &priv->bulkqhs;
-                else
-                        ep_queue = NULL;
         }
 
         list_for_each_entry_safe(urb_listitem, urb_listitem_next, &urb_list,
@@ -998,17 +990,10 @@ void schedule_ptds(struct usb_hcd *hcd)
          *
          * I'm sure this scheme could be improved upon!
          */
-        ep_queue = &priv->controlqhs;
-        while (ep_queue) {
+        for (i = 0; i < QH_END; i++) {
+                ep_queue = &priv->qh_list[i];
                 list_for_each_entry_safe(qh, qh_next, ep_queue, qh_list)
                         enqueue_qtds(hcd, qh);
-
-                if (ep_queue == &priv->controlqhs)
-                        ep_queue = &priv->interruptqhs;
-                else if (ep_queue == &priv->interruptqhs)
-                        ep_queue = &priv->bulkqhs;
-                else
-                        ep_queue = NULL;
         }
 }
 
@@ -1543,16 +1528,16 @@ static int isp1760_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
 
         switch (usb_pipetype(urb->pipe)) {
         case PIPE_CONTROL:
-                ep_queue = &priv->controlqhs;
+                ep_queue = &priv->qh_list[QH_CONTROL];
                 break;
         case PIPE_BULK:
-                ep_queue = &priv->bulkqhs;
+                ep_queue = &priv->qh_list[QH_BULK];
                 break;
         case PIPE_INTERRUPT:
                 if (urb->interval < 0)
                         return -EINVAL;
                 /* FIXME: Check bandwidth  */
-                ep_queue = &priv->interruptqhs;
+                ep_queue = &priv->qh_list[QH_INTERRUPT];
                 break;
         case PIPE_ISOCHRONOUS:
                 dev_err(hcd->self.controller, "%s: isochronous USB packets "
@@ -1714,8 +1699,8 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
 {
         struct isp1760_hcd *priv = hcd_to_priv(hcd);
         unsigned long spinflags;
-        struct isp1760_qh *qh;
-        struct isp1760_qtd *qtd;
+        struct isp1760_qh *qh, *qh_iter;
+        int i;
 
         spin_lock_irqsave(&priv->lock, spinflags);
 
@@ -1723,14 +1708,17 @@ static void isp1760_endpoint_disable(struct usb_hcd *hcd,
         if (!qh)
                 goto out;
 
-        list_for_each_entry(qtd, &qh->qtd_list, qtd_list)
-                if (qtd->status != QTD_RETIRE) {
-                        dequeue_urb_from_qtd(hcd, qh, qtd);
-                        qtd->urb->status = -ECONNRESET;
-                }
+        WARN_ON(!list_empty(&qh->qtd_list));
 
+        for (i = 0; i < QH_END; i++)
+                list_for_each_entry(qh_iter, &priv->qh_list[i], qh_list)
+                        if (qh_iter == qh) {
+                                list_del(&qh_iter->qh_list);
+                                i = QH_END;
+                                break;
+                        }
+        qh_free(qh);
         ep->hcpriv = NULL;
-        /* Cannot free qh here since it will be parsed by schedule_ptds() */
 
         schedule_ptds(hcd);
 
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 2ac4ac2e4ef9..4592dc17a9f9 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -47,23 +47,27 @@ static int of_isp1760_probe(struct platform_device *dev)
         int virq;
         resource_size_t res_len;
         int ret;
-        const unsigned int *prop;
         unsigned int devflags = 0;
         enum of_gpio_flags gpio_flags;
+        u32 bus_width = 0;
 
         drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
         if (!drvdata)
                 return -ENOMEM;
 
         ret = of_address_to_resource(dp, 0, &memory);
-        if (ret)
-                return -ENXIO;
+        if (ret) {
+                ret = -ENXIO;
+                goto free_data;
+        }
 
         res_len = resource_size(&memory);
 
         res = request_mem_region(memory.start, res_len, dev_name(&dev->dev));
-        if (!res)
-                return -EBUSY;
+        if (!res) {
+                ret = -EBUSY;
+                goto free_data;
+        }
 
         if (of_irq_map_one(dp, 0, &oirq)) {
                 ret = -ENODEV;
@@ -77,8 +81,8 @@ static int of_isp1760_probe(struct platform_device *dev)
                 devflags |= ISP1760_FLAG_ISP1761;
 
         /* Some systems wire up only 16 of the 32 data lines */
-        prop = of_get_property(dp, "bus-width", NULL);
-        if (prop && *prop == 16)
+        of_property_read_u32(dp, "bus-width", &bus_width);
+        if (bus_width == 16)
                 devflags |= ISP1760_FLAG_BUS_WIDTH_16;
 
         if (of_get_property(dp, "port1-otg", NULL) != NULL)
@@ -125,6 +129,7 @@ free_gpio:
                 gpio_free(drvdata->rst_gpio);
 release_reg:
         release_mem_region(memory.start, res_len);
+free_data:
         kfree(drvdata);
         return ret;
 }
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 95a9fec38e89..5df0b0e3392b 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -223,7 +223,7 @@ static void ohci_at91_usb_set_power(struct at91_usbh_data *pdata, int port, int
         if (port < 0 || port >= 2)
                 return;
 
-        if (pdata->vbus_pin[port] <= 0)
+        if (!gpio_is_valid(pdata->vbus_pin[port]))
                 return;
 
         gpio_set_value(pdata->vbus_pin[port], !pdata->vbus_pin_inverted ^ enable);
@@ -234,7 +234,7 @@ static int ohci_at91_usb_get_power(struct at91_usbh_data *pdata, int port)
         if (port < 0 || port >= 2)
                 return -EINVAL;
 
-        if (pdata->vbus_pin[port] <= 0)
+        if (!gpio_is_valid(pdata->vbus_pin[port]))
                 return -EINVAL;
 
         return gpio_get_value(pdata->vbus_pin[port]) ^ !pdata->vbus_pin_inverted;
@@ -465,7 +465,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
 
         if (pdata) {
                 for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
-                        if (pdata->vbus_pin[i] <= 0)
+                        if (!gpio_is_valid(pdata->vbus_pin[i]))
                                 continue;
                         gpio_request(pdata->vbus_pin[i], "ohci_vbus");
                         ohci_at91_usb_set_power(pdata, i, 1);
@@ -474,7 +474,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev)
                 for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
                         int ret;
 
-                        if (pdata->overcurrent_pin[i] <= 0)
+                        if (!gpio_is_valid(pdata->overcurrent_pin[i]))
                                 continue;
                         gpio_request(pdata->overcurrent_pin[i], "ohci_overcurrent");
 
@@ -499,14 +499,14 @@ static int ohci_hcd_at91_drv_remove(struct platform_device *pdev)
 
         if (pdata) {
                 for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
-                        if (pdata->vbus_pin[i] <= 0)
+                        if (!gpio_is_valid(pdata->vbus_pin[i]))
                                 continue;
                         ohci_at91_usb_set_power(pdata, i, 0);
                         gpio_free(pdata->vbus_pin[i]);
                 }
 
                 for (i = 0; i < ARRAY_SIZE(pdata->overcurrent_pin); i++) {
-                        if (pdata->overcurrent_pin[i] <= 0)
+                        if (!gpio_is_valid(pdata->overcurrent_pin[i]))
                                 continue;
                         free_irq(gpio_to_irq(pdata->overcurrent_pin[i]), pdev);
                         gpio_free(pdata->overcurrent_pin[i]);
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index 9b66df8278f3..40d886adff53 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -173,12 +173,9 @@ static int ohci_hcd_au1xxx_drv_suspend(struct device *dev)
          * mark HW unaccessible, bail out if RH has been resumed. Use
          * the spinlock to properly synchronize with possible pending
          * RH suspend or resume activity.
-         *
-         * This is still racy as hcd->state is manipulated outside of
-         * any locks =P But that will be a different fix.
          */
         spin_lock_irqsave(&ohci->lock, flags);
-        if (hcd->state != HC_STATE_SUSPENDED) {
+        if (ohci->rh_state != OHCI_RH_SUSPENDED) {
                 rc = -EINVAL;
                 goto bail;
         }
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index d7d34492934a..5179fcd73d8a 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -127,6 +127,19 @@ static char *hcfs2string (int state)
         return "?";
 }
 
+static const char *rh_state_string(struct ohci_hcd *ohci)
+{
+        switch (ohci->rh_state) {
+        case OHCI_RH_HALTED:
+                return "halted";
+        case OHCI_RH_SUSPENDED:
+                return "suspended";
+        case OHCI_RH_RUNNING:
+                return "running";
+        }
+        return "?";
+}
+
 // dump control and status registers
 static void
 ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
@@ -136,9 +149,10 @@ ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
 
         temp = ohci_readl (controller, &regs->revision) & 0xff;
         ohci_dbg_sw (controller, next, size,
-                "OHCI %d.%d, %s legacy support registers\n",
+                "OHCI %d.%d, %s legacy support registers, rh state %s\n",
                 0x03 & (temp >> 4), (temp & 0x0f),
-                (temp & 0x0100) ? "with" : "NO");
+                (temp & 0x0100) ? "with" : "NO",
+                rh_state_string(controller));
 
         temp = ohci_readl (controller, &regs->control);
         ohci_dbg_sw (controller, next, size,
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index dc45d489d00e..3d63574d2c7e 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -179,8 +179,6 @@ static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_
         ohci->next_statechange = jiffies;
 
         ep93xx_stop_hc(&pdev->dev);
-        hcd->state = HC_STATE_SUSPENDED;
-
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
new file mode 100644
index 000000000000..55aa35aa3d7b
--- /dev/null
+++ b/drivers/usb/host/ohci-exynos.c
@@ -0,0 +1,274 @@
+/*
+ * SAMSUNG EXYNOS USB HOST OHCI Controller
+ *
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * Author: Jingoo Han <jg1.han@samsung.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <mach/ohci.h>
+#include <plat/usb-phy.h>
+
+struct exynos_ohci_hcd {
+        struct device *dev;
+        struct usb_hcd *hcd;
+        struct clk *clk;
+};
+
+static int ohci_exynos_start(struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        int ret;
+
+        ohci_dbg(ohci, "ohci_exynos_start, ohci:%p", ohci);
+
+        ret = ohci_init(ohci);
+        if (ret < 0)
+                return ret;
+
+        ret = ohci_run(ohci);
+        if (ret < 0) {
+                err("can't start %s", hcd->self.bus_name);
+                ohci_stop(hcd);
+                return ret;
+        }
+
+        return 0;
+}
+
+static const struct hc_driver exynos_ohci_hc_driver = {
+        .description            = hcd_name,
+        .product_desc           = "EXYNOS OHCI Host Controller",
+        .hcd_priv_size          = sizeof(struct ohci_hcd),
+
+        .irq                    = ohci_irq,
+        .flags                  = HCD_MEMORY|HCD_USB11,
+
+        .start                  = ohci_exynos_start,
+        .stop                   = ohci_stop,
+        .shutdown               = ohci_shutdown,
+
+        .get_frame_number       = ohci_get_frame,
+
+        .urb_enqueue            = ohci_urb_enqueue,
+        .urb_dequeue            = ohci_urb_dequeue,
+        .endpoint_disable       = ohci_endpoint_disable,
+
+        .hub_status_data        = ohci_hub_status_data,
+        .hub_control            = ohci_hub_control,
+#ifdef  CONFIG_PM
+        .bus_suspend            = ohci_bus_suspend,
+        .bus_resume             = ohci_bus_resume,
+#endif
+        .start_port_reset       = ohci_start_port_reset,
+};
+
+static int __devinit exynos_ohci_probe(struct platform_device *pdev)
+{
+        struct exynos4_ohci_platdata *pdata;
+        struct exynos_ohci_hcd *exynos_ohci;
+        struct usb_hcd *hcd;
+        struct ohci_hcd *ohci;
+        struct resource *res;
+        int irq;
+        int err;
+
+        pdata = pdev->dev.platform_data;
+        if (!pdata) {
+                dev_err(&pdev->dev, "No platform data defined\n");
+                return -EINVAL;
+        }
+
+        exynos_ohci = kzalloc(sizeof(struct exynos_ohci_hcd), GFP_KERNEL);
+        if (!exynos_ohci)
+                return -ENOMEM;
+
+        exynos_ohci->dev = &pdev->dev;
+
+        hcd = usb_create_hcd(&exynos_ohci_hc_driver, &pdev->dev,
+                                        dev_name(&pdev->dev));
+        if (!hcd) {
+                dev_err(&pdev->dev, "Unable to create HCD\n");
+                err = -ENOMEM;
+                goto fail_hcd;
+        }
+
+        exynos_ohci->hcd = hcd;
+        exynos_ohci->clk = clk_get(&pdev->dev, "usbhost");
+
+        if (IS_ERR(exynos_ohci->clk)) {
+                dev_err(&pdev->dev, "Failed to get usbhost clock\n");
+                err = PTR_ERR(exynos_ohci->clk);
+                goto fail_clk;
+        }
+
+        err = clk_enable(exynos_ohci->clk);
+        if (err)
+                goto fail_clken;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "Failed to get I/O memory\n");
+                err = -ENXIO;
+                goto fail_io;
+        }
+
+        hcd->rsrc_start = res->start;
+        hcd->rsrc_len = resource_size(res);
+        hcd->regs = ioremap(res->start, resource_size(res));
+        if (!hcd->regs) {
+                dev_err(&pdev->dev, "Failed to remap I/O memory\n");
+                err = -ENOMEM;
+                goto fail_io;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (!irq) {
+                dev_err(&pdev->dev, "Failed to get IRQ\n");
+                err = -ENODEV;
+                goto fail;
+        }
+
+        if (pdata->phy_init)
+                pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+
+        ohci = hcd_to_ohci(hcd);
+        ohci_hcd_init(ohci);
+
+        err = usb_add_hcd(hcd, irq, IRQF_SHARED);
+        if (err) {
+                dev_err(&pdev->dev, "Failed to add USB HCD\n");
+                goto fail;
+        }
+
+        platform_set_drvdata(pdev, exynos_ohci);
+
+        return 0;
+
+fail:
+        iounmap(hcd->regs);
+fail_io:
+        clk_disable(exynos_ohci->clk);
+fail_clken:
+        clk_put(exynos_ohci->clk);
+fail_clk:
+        usb_put_hcd(hcd);
+fail_hcd:
+        kfree(exynos_ohci);
+        return err;
+}
+
+static int __devexit exynos_ohci_remove(struct platform_device *pdev)
+{
+        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
+        struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
+        struct usb_hcd *hcd = exynos_ohci->hcd;
+
+        usb_remove_hcd(hcd);
+
+        if (pdata && pdata->phy_exit)
+                pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+
+        iounmap(hcd->regs);
+
+        clk_disable(exynos_ohci->clk);
+        clk_put(exynos_ohci->clk);
+
+        usb_put_hcd(hcd);
+        kfree(exynos_ohci);
+
+        return 0;
+}
+
+static void exynos_ohci_shutdown(struct platform_device *pdev)
+{
+        struct exynos_ohci_hcd *exynos_ohci = platform_get_drvdata(pdev);
+        struct usb_hcd *hcd = exynos_ohci->hcd;
+
+        if (hcd->driver->shutdown)
+                hcd->driver->shutdown(hcd);
+}
+
+#ifdef CONFIG_PM
+static int exynos_ohci_suspend(struct device *dev)
+{
+        struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = exynos_ohci->hcd;
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        struct platform_device *pdev = to_platform_device(dev);
+        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
+        unsigned long flags;
+        int rc = 0;
+
+        /*
+         * Root hub was already suspended. Disable irq emission and
+         * mark HW unaccessible, bail out if RH has been resumed. Use
+         * the spinlock to properly synchronize with possible pending
+         * RH suspend or resume activity.
+         *
+         * This is still racy as hcd->state is manipulated outside of
+         * any locks =P But that will be a different fix.
+         */
+        spin_lock_irqsave(&ohci->lock, flags);
+        if (hcd->state != HC_STATE_SUSPENDED && hcd->state != HC_STATE_HALT) {
+                rc = -EINVAL;
+                goto fail;
+        }
+
+        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+
+        if (pdata && pdata->phy_exit)
+                pdata->phy_exit(pdev, S5P_USB_PHY_HOST);
+fail:
+        spin_unlock_irqrestore(&ohci->lock, flags);
+
+        return rc;
+}
+
+static int exynos_ohci_resume(struct device *dev)
+{
+        struct exynos_ohci_hcd *exynos_ohci = dev_get_drvdata(dev);
+        struct usb_hcd *hcd = exynos_ohci->hcd;
+        struct platform_device *pdev = to_platform_device(dev);
+        struct exynos4_ohci_platdata *pdata = pdev->dev.platform_data;
+
+        if (pdata && pdata->phy_init)
+                pdata->phy_init(pdev, S5P_USB_PHY_HOST);
+
+        /* Mark hardware accessible again as we are out of D3 state by now */
+        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+
+        ohci_finish_controller_resume(hcd);
+
+        return 0;
+}
+#else
+#define exynos_ohci_suspend     NULL
+#define exynos_ohci_resume      NULL
+#endif
+
+static const struct dev_pm_ops exynos_ohci_pm_ops = {
+        .suspend        = exynos_ohci_suspend,
+        .resume         = exynos_ohci_resume,
+};
+
+static struct platform_driver exynos_ohci_driver = {
+        .probe          = exynos_ohci_probe,
+        .remove         = __devexit_p(exynos_ohci_remove),
+        .shutdown       = exynos_ohci_shutdown,
+        .driver = {
+                .name   = "exynos-ohci",
+                .owner  = THIS_MODULE,
+                .pm     = &exynos_ohci_pm_ops,
+        }
+};
+
+MODULE_ALIAS("platform:exynos-ohci");
+MODULE_AUTHOR("Jingoo Han <jg1.han@samsung.com>");
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index b2639191549e..5f5a63241436 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -209,7 +209,7 @@ static int ohci_urb_enqueue (
                 retval = -ENODEV;
                 goto fail;
         }
-        if (!HC_IS_RUNNING(hcd->state)) {
+        if (ohci->rh_state != OHCI_RH_RUNNING) {
                 retval = -ENODEV;
                 goto fail;
         }
@@ -274,7 +274,7 @@ static int ohci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
         rc = usb_hcd_check_unlink_urb(hcd, urb, status);
         if (rc) {
                 ;       /* Do nothing */
-        } else if (HC_IS_RUNNING(hcd->state)) {
+        } else if (ohci->rh_state == OHCI_RH_RUNNING) {
                 urb_priv_t  *urb_priv;
 
                 /* Unless an IRQ completed the unlink while it was being
@@ -321,7 +321,7 @@ ohci_endpoint_disable (struct usb_hcd *hcd, struct usb_host_endpoint *ep)
 rescan:
         spin_lock_irqsave (&ohci->lock, flags);
 
-        if (!HC_IS_RUNNING (hcd->state)) {
+        if (ohci->rh_state != OHCI_RH_RUNNING) {
 sanitize:
                 ed->state = ED_IDLE;
                 if (quirk_zfmicro(ohci) && ed->type == PIPE_INTERRUPT)
@@ -377,6 +377,7 @@ static void ohci_usb_reset (struct ohci_hcd *ohci)
         ohci->hc_control = ohci_readl (ohci, &ohci->regs->control);
         ohci->hc_control &= OHCI_CTRL_RWC;
         ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
+        ohci->rh_state = OHCI_RH_HALTED;
 }
 
 /* ohci_shutdown forcibly disables IRQs and DMA, helping kexec and
@@ -500,7 +501,7 @@ static int ohci_init (struct ohci_hcd *ohci)
         if (distrust_firmware)
                 ohci->flags |= OHCI_QUIRK_HUB_POWER;
 
-        disable (ohci);
+        ohci->rh_state = OHCI_RH_HALTED;
         ohci->regs = hcd->regs;
 
         /* REVISIT this BIOS handshake is now moved into PCI "quirks", and
@@ -575,7 +576,7 @@ static int ohci_run (struct ohci_hcd *ohci)
         int                     first = ohci->fminterval == 0;
         struct usb_hcd          *hcd = ohci_to_hcd(ohci);
 
-        disable (ohci);
+        ohci->rh_state = OHCI_RH_HALTED;
 
         /* boot firmware should have set this up (5.1.1.3.1) */
         if (first) {
@@ -688,7 +689,7 @@ retry:
         ohci->hc_control &= OHCI_CTRL_RWC;
         ohci->hc_control |= OHCI_CONTROL_INIT | OHCI_USB_OPER;
         ohci_writel (ohci, ohci->hc_control, &ohci->regs->control);
-        hcd->state = HC_STATE_RUNNING;
+        ohci->rh_state = OHCI_RH_RUNNING;
 
         /* wake on ConnectStatusChange, matching external hubs */
         ohci_writel (ohci, RH_HS_DRWE, &ohci->regs->roothub.status);
@@ -725,7 +726,6 @@ retry:
 
         // POTPGT delay is bits 24-31, in 2 ms units.
         mdelay ((val >> 23) & 0x1fe);
-        hcd->state = HC_STATE_RUNNING;
 
         if (quirk_zfmicro(ohci)) {
                 /* Create timer to watch for bad queue state on ZF Micro */
@@ -761,7 +761,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
          * of dead, unclocked, or unplugged (CardBus...) devices
          */
         if (ints == ~(u32)0) {
-                disable (ohci);
+                ohci->rh_state = OHCI_RH_HALTED;
                 ohci_dbg (ohci, "device removed!\n");
                 usb_hc_died(hcd);
                 return IRQ_HANDLED;
@@ -771,7 +771,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
         ints &= ohci_readl(ohci, &regs->intrenable);
 
         /* interrupt for some other device? */
-        if (ints == 0 || unlikely(hcd->state == HC_STATE_HALT))
+        if (ints == 0 || unlikely(ohci->rh_state == OHCI_RH_HALTED))
                 return IRQ_NOTMINE;
 
         if (ints & OHCI_INTR_UE) {
@@ -786,8 +786,8 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
 
                         schedule_work (&ohci->nec_work);
                 } else {
-                        disable (ohci);
                         ohci_err (ohci, "OHCI Unrecoverable Error, disabled\n");
+                        ohci->rh_state = OHCI_RH_HALTED;
                         usb_hc_died(hcd);
                 }
 
@@ -871,11 +871,11 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
         if ((ints & OHCI_INTR_SF) != 0
                         && !ohci->ed_rm_list
                         && !ohci->ed_to_check
-                        && HC_IS_RUNNING(hcd->state))
+                        && ohci->rh_state == OHCI_RH_RUNNING)
                 ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);
         spin_unlock (&ohci->lock);
 
-        if (HC_IS_RUNNING(hcd->state)) {
+        if (ohci->rh_state == OHCI_RH_RUNNING) {
                 ohci_writel (ohci, ints, &regs->intrstatus);
                 ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);
                 // flush those writes
@@ -929,7 +929,7 @@ static int ohci_restart (struct ohci_hcd *ohci)
         struct urb_priv *priv;
 
         spin_lock_irq(&ohci->lock);
-        disable (ohci);
+        ohci->rh_state = OHCI_RH_HALTED;
 
         /* Recycle any "live" eds/tds (and urbs). */
         if (!list_empty (&ohci->pending))
@@ -1005,6 +1005,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ohci_hcd_s3c2410_driver
 #endif
 
+#ifdef CONFIG_USB_OHCI_EXYNOS
+#include "ohci-exynos.c"
+#define PLATFORM_DRIVER         exynos_ohci_driver
+#endif
+
 #ifdef CONFIG_USB_OHCI_HCD_OMAP1
 #include "ohci-omap.c"
 #define OMAP1_PLATFORM_DRIVER   ohci_hcd_omap_driver
@@ -1111,7 +1116,7 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ohci_hcd_ath79_driver
 #endif
 
-#ifdef CONFIG_NLM_XLR
+#ifdef CONFIG_CPU_XLR
 #include "ohci-xls.c"
 #define PLATFORM_DRIVER         ohci_xls_driver
 #endif
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 2f00040fc408..836772dfabd3 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -111,6 +111,7 @@ __acquires(ohci->lock)
         if (!autostop) {
                 ohci->next_statechange = jiffies + msecs_to_jiffies (5);
                 ohci->autostop = 0;
+                ohci->rh_state = OHCI_RH_SUSPENDED;
         }
 
 done:
@@ -140,7 +141,7 @@ __acquires(ohci->lock)
 
         if (ohci->hc_control & (OHCI_CTRL_IR | OHCI_SCHED_ENABLES)) {
                 /* this can happen after resuming a swsusp snapshot */
-                if (hcd->state == HC_STATE_RESUMING) {
+                if (ohci->rh_state != OHCI_RH_RUNNING) {
                         ohci_dbg (ohci, "BIOS/SMM active, control %03x\n",
                                         ohci->hc_control);
                         status = -EBUSY;
@@ -274,6 +275,7 @@ skip_resume:
                 (void) ohci_readl (ohci, &ohci->regs->control);
         }
 
+        ohci->rh_state = OHCI_RH_RUNNING;
         return 0;
 }
 
@@ -336,11 +338,8 @@ static void ohci_finish_controller_resume(struct usb_hcd *hcd)
         /* If needed, reinitialize and suspend the root hub */
         if (need_reinit) {
                 spin_lock_irq(&ohci->lock);
-                hcd->state = HC_STATE_RESUMING;
                 ohci_rh_resume(ohci);
-                hcd->state = HC_STATE_QUIESCING;
                 ohci_rh_suspend(ohci, 0);
-                hcd->state = HC_STATE_SUSPENDED;
                 spin_unlock_irq(&ohci->lock);
         }
 
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index e4b8782cc6e2..db3968656d21 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -516,7 +516,6 @@ static int ohci_omap_suspend(struct platform_device *dev, pm_message_t message)
         ohci->next_statechange = jiffies;
 
         omap_ohci_clock_power(0);
-        ohci_to_hcd(ohci)->state = HC_STATE_SUSPENDED;
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-omap3.c b/drivers/usb/host/ohci-omap3.c
index 516ebc4d6cc2..1b8133b6e451 100644
--- a/drivers/usb/host/ohci-omap3.c
+++ b/drivers/usb/host/ohci-omap3.c
@@ -31,6 +31,7 @@
 
 #include <linux/platform_device.h>
 #include <plat/usb.h>
+#include <linux/pm_runtime.h>
 
 /*-------------------------------------------------------------------------*/
 
@@ -134,7 +135,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
         int                     irq;
 
         if (usb_disabled())
-                goto err_end;
+                return -ENODEV;
 
         if (!dev->parent) {
                 dev_err(dev, "Missing parent device\n");
@@ -172,11 +173,8 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
         hcd->rsrc_len = resource_size(res);
         hcd->regs =  regs;
 
-        ret = omap_usbhs_enable(dev);
-        if (ret) {
-                dev_dbg(dev, "failed to start ohci\n");
-                goto err_end;
-        }
+        pm_runtime_enable(dev);
+        pm_runtime_get_sync(dev);
 
         ohci_hcd_init(hcd_to_ohci(hcd));
 
@@ -189,9 +187,7 @@ static int __devinit ohci_hcd_omap3_probe(struct platform_device *pdev)
         return 0;
 
 err_add_hcd:
-        omap_usbhs_disable(dev);
-
-err_end:
+        pm_runtime_put_sync(dev);
         usb_put_hcd(hcd);
 
 err_io:
@@ -220,9 +216,9 @@ static int __devexit ohci_hcd_omap3_remove(struct platform_device *pdev)
 
         iounmap(hcd->regs);
         usb_remove_hcd(hcd);
-        omap_usbhs_disable(dev);
+        pm_runtime_put_sync(dev);
+        pm_runtime_disable(dev);
         usb_put_hcd(hcd);
-
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index bc01b064585a..6109810cc2d3 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -308,12 +308,9 @@ static int ohci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
          * mark HW unaccessible, bail out if RH has been resumed. Use
          * the spinlock to properly synchronize with possible pending
          * RH suspend or resume activity.
-         *
-         * This is still racy as hcd->state is manipulated outside of
-         * any locks =P But that will be a different fix.
          */
         spin_lock_irqsave (&ohci->lock, flags);
-        if (hcd->state != HC_STATE_SUSPENDED) {
+        if (ohci->rh_state != OHCI_RH_SUSPENDED) {
                 rc = -EINVAL;
                 goto bail;
         }
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 29dfefe1c726..6313e4439f37 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -502,8 +502,6 @@ static int ohci_hcd_pxa27x_drv_suspend(struct device *dev)
         ohci->ohci.next_statechange = jiffies;
 
         pxa27x_stop_hc(ohci, dev);
-        hcd->state = HC_STATE_SUSPENDED;
-
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 15dc51ded61a..c5a1ea9145fa 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -912,7 +912,7 @@ rescan_all:
                 /* only take off EDs that the HC isn't using, accounting for
                  * frame counter wraps and EDs with partially retired TDs
                  */
-                if (likely (HC_IS_RUNNING(ohci_to_hcd(ohci)->state))) {
+                if (likely(ohci->rh_state == OHCI_RH_RUNNING)) {
                         if (tick_before (tick, ed->tick)) {
 skip_ed:
                                 last = &ed->ed_next;
@@ -1012,7 +1012,7 @@ rescan_this:
 
                 /* but if there's work queued, reschedule */
                 if (!list_empty (&ed->td_list)) {
-                        if (HC_IS_RUNNING(ohci_to_hcd(ohci)->state))
+                        if (ohci->rh_state == OHCI_RH_RUNNING)
                                 ed_schedule (ohci, ed);
                 }
 
@@ -1021,9 +1021,7 @@ rescan_this:
         }
 
         /* maybe reenable control and bulk lists */
-        if (HC_IS_RUNNING(ohci_to_hcd(ohci)->state)
-                        && ohci_to_hcd(ohci)->state != HC_STATE_QUIESCING
-                        && !ohci->ed_rm_list) {
+        if (ohci->rh_state == OHCI_RH_RUNNING && !ohci->ed_rm_list) {
                 u32     command = 0, control = 0;
 
                 if (ohci->ed_controltail) {
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index a1877c47601e..56dcf069246d 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -486,15 +486,66 @@ static int __devexit ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int ohci_hcd_s3c2410_drv_suspend(struct device *dev)
+{
+        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+        struct platform_device *pdev = to_platform_device(dev);
+        unsigned long flags;
+        int rc = 0;
+
+        /*
+         * Root hub was already suspended. Disable irq emission and
+         * mark HW unaccessible, bail out if RH has been resumed. Use
+         * the spinlock to properly synchronize with possible pending
+         * RH suspend or resume activity.
+         */
+        spin_lock_irqsave(&ohci->lock, flags);
+        if (ohci->rh_state != OHCI_RH_SUSPENDED) {
+                rc = -EINVAL;
+                goto bail;
+        }
+
+        clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+
+        s3c2410_stop_hc(pdev);
+bail:
+        spin_unlock_irqrestore(&ohci->lock, flags);
+
+        return rc;
+}
+
+static int ohci_hcd_s3c2410_drv_resume(struct device *dev)
+{
+        struct usb_hcd *hcd = dev_get_drvdata(dev);
+        struct platform_device *pdev = to_platform_device(dev);
+
+        s3c2410_start_hc(pdev, hcd);
+
+        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
+        ohci_finish_controller_resume(hcd);
+
+        return 0;
+}
+#else
+#define ohci_hcd_s3c2410_drv_suspend    NULL
+#define ohci_hcd_s3c2410_drv_resume     NULL
+#endif
+
+static const struct dev_pm_ops ohci_hcd_s3c2410_pm_ops = {
+        .suspend        = ohci_hcd_s3c2410_drv_suspend,
+        .resume         = ohci_hcd_s3c2410_drv_resume,
+};
+
 static struct platform_driver ohci_hcd_s3c2410_driver = {
         .probe          = ohci_hcd_s3c2410_drv_probe,
         .remove         = __devexit_p(ohci_hcd_s3c2410_drv_remove),
         .shutdown       = usb_hcd_platform_shutdown,
-        /*.suspend      = ohci_hcd_s3c2410_drv_suspend, */
-        /*.resume       = ohci_hcd_s3c2410_drv_resume, */
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "s3c2410-ohci",
+                .pm     = &ohci_hcd_s3c2410_pm_ops,
         },
 };
 
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c
index afc4eb6bb9d0..84686d90805b 100644
--- a/drivers/usb/host/ohci-sh.c
+++ b/drivers/usb/host/ohci-sh.c
@@ -29,7 +29,6 @@ static int ohci_sh_start(struct usb_hcd *hcd)
         ohci_hcd_init(ohci);
         ohci_init(ohci);
         ohci_run(ohci);
-        hcd->state = HC_STATE_RUNNING;
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 968cea2b6d4e..5596ac2ba1ca 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -224,7 +224,6 @@ static int ohci_sm501_suspend(struct platform_device *pdev, pm_message_t msg)
         ohci->next_statechange = jiffies;
 
         sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 0);
-        ohci_to_hcd(ohci)->state = HC_STATE_SUSPENDED;
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c
index 69874654f3b5..95c16489e883 100644
--- a/drivers/usb/host/ohci-spear.c
+++ b/drivers/usb/host/ohci-spear.c
@@ -203,7 +203,6 @@ static int spear_ohci_hcd_drv_suspend(struct platform_device *dev,
         ohci->next_statechange = jiffies;
 
         spear_stop_ohci(ohci_p);
-        ohci_to_hcd(ohci)->state = HC_STATE_SUSPENDED;
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 06331d931171..120bfe6ede38 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -318,9 +318,6 @@ static int ohci_hcd_tmio_drv_suspend(struct platform_device *dev, pm_message_t s
                 if (ret)
                         return ret;
         }
-
-        hcd->state = HC_STATE_SUSPENDED;
-
         return 0;
 }
 
diff --git a/drivers/usb/host/ohci-xls.c b/drivers/usb/host/ohci-xls.c
index a3a9c6f45b91..a2247867af86 100644
--- a/drivers/usb/host/ohci-xls.c
+++ b/drivers/usb/host/ohci-xls.c
@@ -40,7 +40,7 @@ static int ohci_xls_probe_internal(const struct hc_driver *driver,
                 goto err1;
         }
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                         driver->description)) {
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index 0795b934d00c..8ff6f7ea96fd 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -344,6 +344,12 @@ typedef struct urb_priv {
  * a subset of what the full implementation needs. (Linus)
  */
 
+enum ohci_rh_state {
+        OHCI_RH_HALTED,
+        OHCI_RH_SUSPENDED,
+        OHCI_RH_RUNNING
+};
+
 struct ohci_hcd {
         spinlock_t              lock;
 
@@ -384,6 +390,7 @@ struct ohci_hcd {
         /*
          * driver state
          */
+        enum ohci_rh_state      rh_state;
         int                     num_ports;
         int                     load [NUM_INTS];
         u32                     hc_control;     /* copy of hc control reg */
@@ -679,11 +686,6 @@ static inline u16 ohci_hwPSW(const struct ohci_hcd *ohci,
 
 /*-------------------------------------------------------------------------*/
 
-static inline void disable (struct ohci_hcd *ohci)
-{
-        ohci_to_hcd(ohci)->state = HC_STATE_HALT;
-}
-
 #define FI                      0x2edf          /* 12000 bits per frame (-1) */
 #define FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
 #define FIT                     (1 << 31)
@@ -707,7 +709,7 @@ static inline void periodic_reinit (struct ohci_hcd *ohci)
 #define read_roothub(hc, register, mask) ({ \
         u32 temp = ohci_readl (hc, &hc->regs->roothub.register); \
         if (temp == -1) \
-                disable (hc); \
+                hc->rh_state = OHCI_RH_HALTED; \
         else if (hc->flags & OHCI_QUIRK_AMD756) \
                 while (temp & mask) \
                         temp = ohci_readl (hc, &hc->regs->roothub.register); \
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index dcd889803f0f..6f62de5c6e35 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -3951,24 +3951,7 @@ static struct platform_driver oxu_driver = {
         }
 };
 
-static int __init oxu_module_init(void)
-{
-        int retval = 0;
-
-        retval = platform_driver_register(&oxu_driver);
-        if (retval < 0)
-                return retval;
-
-        return retval;
-}
-
-static void __exit oxu_module_cleanup(void)
-{
-        platform_driver_unregister(&oxu_driver);
-}
-
-module_init(oxu_module_init);
-module_exit(oxu_module_cleanup);
+module_platform_driver(oxu_driver);
 
 MODULE_DESCRIPTION("Oxford OXU210HP HCD driver - ver. " DRIVER_VERSION);
 MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index f6ca80ee4cec..d2c6f5ac4626 100644
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -943,7 +943,7 @@ static int uhci_submit_common(struct uhci_hcd *uhci, struct urb *urb,
         if (usb_pipein(urb->pipe))
                 status |= TD_CTRL_SPD;
 
-        i = urb->num_sgs;
+        i = urb->num_mapped_sgs;
         if (len > 0 && i > 0) {
                 sg = urb->sg;
                 data = sg_dma_address(sg);
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index a403b53e86b9..76083ae92138 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -443,7 +443,7 @@ static int qset_add_urb_sg(struct whc *whc, struct whc_qset *qset, struct urb *u
 
         remaining = urb->transfer_buffer_length;
 
-        for_each_sg(urb->sg, sg, urb->num_sgs, i) {
+        for_each_sg(urb->sg, sg, urb->num_mapped_sgs, i) {
                 dma_addr_t dma_addr;
                 size_t dma_remaining;
                 dma_addr_t sp, ep;
@@ -561,7 +561,7 @@ static int qset_add_urb_sg_linearize(struct whc *whc, struct whc_qset *qset,
 
         remaining = urb->transfer_buffer_length;
 
-        for_each_sg(urb->sg, sg, urb->num_sgs, i) {
+        for_each_sg(urb->sg, sg, urb->num_mapped_sgs, i) {
                 size_t len;
                 size_t sg_remaining;
                 void *orig;
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 430e88fd3f6c..35e257f79c7b 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -57,17 +57,15 @@ static void xhci_common_hub_descriptor(struct xhci_hcd *xhci,
         desc->bHubContrCurrent = 0;
 
         desc->bNbrPorts = ports;
-        /* Ugh, these should be #defines, FIXME */
-        /* Using table 11-13 in USB 2.0 spec. */
         temp = 0;
-        /* Bits 1:0 - support port power switching, or power always on */
+        /* Bits 1:0 - support per-port power switching, or power always on */
         if (HCC_PPC(xhci->hcc_params))
-                temp |= 0x0001;
+                temp |= HUB_CHAR_INDV_PORT_LPSM;
         else
-                temp |= 0x0002;
+                temp |= HUB_CHAR_NO_LPSM;
         /* Bit  2 - root hubs are not part of a compound device */
         /* Bits 4:3 - individual port over current protection */
-        temp |= 0x0008;
+        temp |= HUB_CHAR_INDV_PORT_OCPM;
         /* Bits 6:5 - no TTs in root ports */
         /* Bit  7 - no port indicators */
         desc->wHubCharacteristics = cpu_to_le16(temp);
@@ -86,9 +84,9 @@ static void xhci_usb2_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
         ports = xhci->num_usb2_ports;
 
         xhci_common_hub_descriptor(xhci, desc, ports);
-        desc->bDescriptorType = 0x29;
+        desc->bDescriptorType = USB_DT_HUB;
         temp = 1 + (ports / 8);
-        desc->bDescLength = 7 + 2 * temp;
+        desc->bDescLength = USB_DT_HUB_NONVAR_SIZE + 2 * temp;
 
         /* The Device Removable bits are reported on a byte granularity.
          * If the port doesn't exist within that byte, the bit is set to 0.
@@ -137,8 +135,8 @@ static void xhci_usb3_hub_descriptor(struct usb_hcd *hcd, struct xhci_hcd *xhci,
 
         ports = xhci->num_usb3_ports;
         xhci_common_hub_descriptor(xhci, desc, ports);
-        desc->bDescriptorType = 0x2a;
-        desc->bDescLength = 12;
+        desc->bDescriptorType = USB_DT_SS_HUB;
+        desc->bDescLength = USB_DT_SS_HUB_SIZE;
 
         /* header decode latency should be zero for roothubs,
          * see section 4.23.5.2.
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 0e4b25fa3bcd..36cbe2226a44 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -42,15 +42,12 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci, gfp_t flag
         seg = kzalloc(sizeof *seg, flags);
         if (!seg)
                 return NULL;
-        xhci_dbg(xhci, "Allocating priv segment structure at %p\n", seg);
 
         seg->trbs = dma_pool_alloc(xhci->segment_pool, flags, &dma);
         if (!seg->trbs) {
                 kfree(seg);
                 return NULL;
         }
-        xhci_dbg(xhci, "// Allocating segment at %p (virtual) 0x%llx (DMA)\n",
-                        seg->trbs, (unsigned long long)dma);
 
         memset(seg->trbs, 0, SEGMENT_SIZE);
         seg->dma = dma;
@@ -62,12 +59,9 @@ static struct xhci_segment *xhci_segment_alloc(struct xhci_hcd *xhci, gfp_t flag
 static void xhci_segment_free(struct xhci_hcd *xhci, struct xhci_segment *seg)
 {
         if (seg->trbs) {
-                xhci_dbg(xhci, "Freeing DMA segment at %p (virtual) 0x%llx (DMA)\n",
-                                seg->trbs, (unsigned long long)seg->dma);
                 dma_pool_free(xhci->segment_pool, seg->trbs, seg->dma);
                 seg->trbs = NULL;
         }
-        xhci_dbg(xhci, "Freeing priv segment structure at %p\n", seg);
         kfree(seg);
 }
 
@@ -101,9 +95,6 @@ static void xhci_link_segments(struct xhci_hcd *xhci, struct xhci_segment *prev,
                         val |= TRB_CHAIN;
                 prev->trbs[TRBS_PER_SEGMENT-1].link.control = cpu_to_le32(val);
         }
-        xhci_dbg(xhci, "Linking segment 0x%llx to segment 0x%llx (DMA)\n",
-                        (unsigned long long)prev->dma,
-                        (unsigned long long)next->dma);
 }
 
 /* XXX: Do we need the hcd structure in all these functions? */
@@ -117,7 +108,6 @@ void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring)
         if (ring->first_seg) {
                 first_seg = ring->first_seg;
                 seg = first_seg->next;
-                xhci_dbg(xhci, "Freeing ring at %p\n", ring);
                 while (seg != first_seg) {
                         struct xhci_segment *next = seg->next;
                         xhci_segment_free(xhci, seg);
@@ -160,7 +150,6 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
         struct xhci_segment     *prev;
 
         ring = kzalloc(sizeof *(ring), flags);
-        xhci_dbg(xhci, "Allocating ring at %p\n", ring);
         if (!ring)
                 return NULL;
 
@@ -191,9 +180,6 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
                 /* See section 4.9.2.1 and 6.4.4.1 */
                 prev->trbs[TRBS_PER_SEGMENT-1].link.control |=
                         cpu_to_le32(LINK_TOGGLE);
-                xhci_dbg(xhci, "Wrote link toggle flag to"
-                                " segment %p (virtual), 0x%llx (DMA)\n",
-                                prev, (unsigned long long)prev->dma);
         }
         xhci_initialize_ring_info(ring);
         return ring;
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 9f1d4b15d818..b90e1386418b 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -155,10 +155,6 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring, bool consumer
         while (last_trb(xhci, ring, ring->deq_seg, next)) {
                 if (consumer && last_trb_on_last_seg(xhci, ring, ring->deq_seg, next)) {
                         ring->cycle_state = (ring->cycle_state ? 0 : 1);
-                        if (!in_interrupt())
-                                xhci_dbg(xhci, "Toggle cycle state for ring %p = %i\n",
-                                                ring,
-                                                (unsigned int) ring->cycle_state);
                 }
                 ring->deq_seg = ring->deq_seg->next;
                 ring->dequeue = ring->deq_seg->trbs;
@@ -231,10 +227,6 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring,
                         /* Toggle the cycle bit after the last ring segment. */
                         if (last_trb_on_last_seg(xhci, ring, ring->enq_seg, next)) {
                                 ring->cycle_state = (ring->cycle_state ? 0 : 1);
-                                if (!in_interrupt())
-                                        xhci_dbg(xhci, "Toggle cycle state for ring %p = %i\n",
-                                                        ring,
-                                                        (unsigned int) ring->cycle_state);
                         }
                 }
                 ring->enq_seg = ring->enq_seg->next;
@@ -560,12 +552,9 @@ static void td_to_noop(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
                                         cpu_to_le32(TRB_CYCLE);
                         cur_trb->generic.field[3] |= cpu_to_le32(
                                 TRB_TYPE(TRB_TR_NOOP));
-                        xhci_dbg(xhci, "Cancel TRB %p (0x%llx dma) "
-                                        "in seg %p (0x%llx dma)\n",
-                                        cur_trb,
-                                        (unsigned long long)xhci_trb_virt_to_dma(cur_seg, cur_trb),
-                                        cur_seg,
-                                        (unsigned long long)cur_seg->dma);
+                        xhci_dbg(xhci, "TRB to noop at offset 0x%llx\n",
+                                        (unsigned long long)
+                                        xhci_trb_virt_to_dma(cur_seg, cur_trb));
                 }
                 if (cur_trb == cur_td->last_trb)
                         break;
@@ -705,9 +694,9 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci,
          */
         list_for_each(entry, &ep->cancelled_td_list) {
                 cur_td = list_entry(entry, struct xhci_td, cancelled_td_list);
-                xhci_dbg(xhci, "Cancelling TD starting at %p, 0x%llx (dma).\n",
-                                cur_td->first_trb,
-                                (unsigned long long)xhci_trb_virt_to_dma(cur_td->start_seg, cur_td->first_trb));
+                xhci_dbg(xhci, "Removing canceled TD starting at 0x%llx (dma).\n",
+                                (unsigned long long)xhci_trb_virt_to_dma(
+                                        cur_td->start_seg, cur_td->first_trb));
                 ep_ring = xhci_urb_to_transfer_ring(xhci, cur_td->urb);
                 if (!ep_ring) {
                         /* This shouldn't happen unless a driver is mucking
@@ -1627,7 +1616,6 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
         ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index);
         trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
 
-        xhci_debug_trb(xhci, xhci->event_ring->dequeue);
         switch (trb_comp_code) {
         case COMP_SUCCESS:
                 if (event_trb == ep_ring->dequeue) {
@@ -1643,7 +1631,6 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
                 }
                 break;
         case COMP_SHORT_TX:
-                xhci_warn(xhci, "WARN: short transfer on control ep\n");
                 if (td->urb->transfer_flags & URB_SHORT_NOT_OK)
                         *status = -EREMOTEIO;
                 else
@@ -1946,6 +1933,16 @@ static int handle_tx_event(struct xhci_hcd *xhci,
         xdev = xhci->devs[slot_id];
         if (!xdev) {
                 xhci_err(xhci, "ERROR Transfer event pointed to bad slot\n");
+                xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",
+                         (unsigned long long) xhci_trb_virt_to_dma(
+                                 xhci->event_ring->deq_seg,
+                                 xhci->event_ring->dequeue),
+                         lower_32_bits(le64_to_cpu(event->buffer)),
+                         upper_32_bits(le64_to_cpu(event->buffer)),
+                         le32_to_cpu(event->transfer_len),
+                         le32_to_cpu(event->flags));
+                xhci_dbg(xhci, "Event ring:\n");
+                xhci_debug_segment(xhci, xhci->event_ring->deq_seg);
                 return -ENODEV;
         }
 
@@ -1959,6 +1956,16 @@ static int handle_tx_event(struct xhci_hcd *xhci,
             EP_STATE_DISABLED) {
                 xhci_err(xhci, "ERROR Transfer event for disabled endpoint "
                                 "or incorrect stream ring\n");
+                xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",
+                         (unsigned long long) xhci_trb_virt_to_dma(
+                                 xhci->event_ring->deq_seg,
+                                 xhci->event_ring->dequeue),
+                         lower_32_bits(le64_to_cpu(event->buffer)),
+                         upper_32_bits(le64_to_cpu(event->buffer)),
+                         le32_to_cpu(event->transfer_len),
+                         le32_to_cpu(event->flags));
+                xhci_dbg(xhci, "Event ring:\n");
+                xhci_debug_segment(xhci, xhci->event_ring->deq_seg);
                 return -ENODEV;
         }
 
@@ -1985,7 +1992,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                 xhci_dbg(xhci, "Stopped on No-op or Link TRB\n");
                 break;
         case COMP_STALL:
-                xhci_warn(xhci, "WARN: Stalled endpoint\n");
+                xhci_dbg(xhci, "Stalled endpoint\n");
                 ep->ep_state |= EP_HALTED;
                 status = -EPIPE;
                 break;
@@ -1995,11 +2002,11 @@ static int handle_tx_event(struct xhci_hcd *xhci,
                 break;
         case COMP_SPLIT_ERR:
         case COMP_TX_ERR:
-                xhci_warn(xhci, "WARN: transfer error on endpoint\n");
+                xhci_dbg(xhci, "Transfer error on endpoint\n");
                 status = -EPROTO;
                 break;
         case COMP_BABBLE:
-                xhci_warn(xhci, "WARN: babble error on endpoint\n");
+                xhci_dbg(xhci, "Babble error on endpoint\n");
                 status = -EOVERFLOW;
                 break;
         case COMP_DB_ERR:
@@ -2390,17 +2397,7 @@ hw_died:
 
 irqreturn_t xhci_msi_irq(int irq, struct usb_hcd *hcd)
 {
-        irqreturn_t ret;
-        struct xhci_hcd *xhci;
-
-        xhci = hcd_to_xhci(hcd);
-        set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
-        if (xhci->shared_hcd)
-                set_bit(HCD_FLAG_SAW_IRQ, &xhci->shared_hcd->flags);
-
-        ret = xhci_irq(hcd);
-
-        return ret;
+        return xhci_irq(hcd);
 }
 
 /****           Endpoint Ring Operations        ****/
@@ -2488,11 +2485,6 @@ static int prepare_ring(struct xhci_hcd *xhci, struct xhci_ring *ep_ring,
                         /* Toggle the cycle bit after the last ring segment. */
                         if (last_trb_on_last_seg(xhci, ring, ring->enq_seg, next)) {
                                 ring->cycle_state = (ring->cycle_state ? 0 : 1);
-                                if (!in_interrupt()) {
-                                        xhci_dbg(xhci, "queue_trb: Toggle cycle "
-                                                "state for ring %p = %i\n",
-                                                ring, (unsigned int)ring->cycle_state);
-                                }
                         }
                         ring->enq_seg = ring->enq_seg->next;
                         ring->enqueue = ring->enq_seg->trbs;
@@ -2561,13 +2553,11 @@ static unsigned int count_sg_trbs_needed(struct xhci_hcd *xhci, struct urb *urb)
         struct scatterlist *sg;
 
         sg = NULL;
-        num_sgs = urb->num_sgs;
+        num_sgs = urb->num_mapped_sgs;
         temp = urb->transfer_buffer_length;
 
-        xhci_dbg(xhci, "count sg list trbs: \n");
         num_trbs = 0;
         for_each_sg(urb->sg, sg, num_sgs, i) {
-                unsigned int previous_total_trbs = num_trbs;
                 unsigned int len = sg_dma_len(sg);
 
                 /* Scatter gather list entries may cross 64KB boundaries */
@@ -2582,22 +2572,11 @@ static unsigned int count_sg_trbs_needed(struct xhci_hcd *xhci, struct urb *urb)
                         num_trbs++;
                         running_total += TRB_MAX_BUFF_SIZE;
                 }
-                xhci_dbg(xhci, " sg #%d: dma = %#llx, len = %#x (%d), num_trbs = %d\n",
-                                i, (unsigned long long)sg_dma_address(sg),
-                                len, len, num_trbs - previous_total_trbs);
-
                 len = min_t(int, len, temp);
                 temp -= len;
                 if (temp == 0)
                         break;
         }
-        xhci_dbg(xhci, "\n");
-        if (!in_interrupt())
-                xhci_dbg(xhci, "ep %#x - urb len = %d, sglist used, "
-                                "num_trbs = %d\n",
-                                urb->ep->desc.bEndpointAddress,
-                                urb->transfer_buffer_length,
-                                num_trbs);
         return num_trbs;
 }
 
@@ -2745,7 +2724,7 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 return -EINVAL;
 
         num_trbs = count_sg_trbs_needed(xhci, urb);
-        num_sgs = urb->num_sgs;
+        num_sgs = urb->num_mapped_sgs;
         total_packet_count = roundup(urb->transfer_buffer_length,
                         usb_endpoint_maxp(&urb->ep->desc));
 
@@ -2783,8 +2762,6 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         trb_buff_len = min_t(int, trb_buff_len, this_sg_len);
         if (trb_buff_len > urb->transfer_buffer_length)
                 trb_buff_len = urb->transfer_buffer_length;
-        xhci_dbg(xhci, "First length to xfer from 1st sglist entry = %u\n",
-                        trb_buff_len);
 
         first_trb = true;
         /* Queue the first TRB, even if it's zero-length */
@@ -2816,11 +2793,6 @@ static int queue_bulk_sg_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 if (usb_urb_dir_in(urb))
                         field |= TRB_ISP;
 
-                xhci_dbg(xhci, " sg entry: dma = %#x, len = %#x (%d), "
-                                "64KB boundary at %#x, end dma = %#x\n",
-                                (unsigned int) addr, trb_buff_len, trb_buff_len,
-                                (unsigned int) (addr + TRB_MAX_BUFF_SIZE) & ~(TRB_MAX_BUFF_SIZE - 1),
-                                (unsigned int) addr + trb_buff_len);
                 if (TRB_MAX_BUFF_SIZE -
                                 (addr & (TRB_MAX_BUFF_SIZE - 1)) < trb_buff_len) {
                         xhci_warn(xhci, "WARN: sg dma xfer crosses 64KB boundaries!\n");
@@ -2926,15 +2898,6 @@ int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         }
         /* FIXME: this doesn't deal with URB_ZERO_PACKET - need one more */
 
-        if (!in_interrupt())
-                xhci_dbg(xhci, "ep %#x - urb len = %#x (%d), "
-                                "addr = %#llx, num_trbs = %d\n",
-                                urb->ep->desc.bEndpointAddress,
-                                urb->transfer_buffer_length,
-                                urb->transfer_buffer_length,
-                                (unsigned long long)urb->transfer_dma,
-                                num_trbs);
-
         ret = prepare_transfer(xhci, xhci->devs[slot_id],
                         ep_index, urb->stream_id,
                         num_trbs, urb, 0, false, mem_flags);
@@ -3055,9 +3018,6 @@ int xhci_queue_ctrl_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
         if (!urb->setup_packet)
                 return -EINVAL;
 
-        if (!in_interrupt())
-                xhci_dbg(xhci, "Queueing ctrl tx for slot id %d, ep %d\n",
-                                slot_id, ep_index);
         /* 1 TRB for setup, 1 for status */
         num_trbs = 2;
         /*
@@ -3249,15 +3209,6 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags,
                 return -EINVAL;
         }
 
-        if (!in_interrupt())
-                xhci_dbg(xhci, "ep %#x - urb len = %#x (%d),"
-                                " addr = %#llx, num_tds = %d\n",
-                                urb->ep->desc.bEndpointAddress,
-                                urb->transfer_buffer_length,
-                                urb->transfer_buffer_length,
-                                (unsigned long long)urb->transfer_dma,
-                                num_tds);
-
         start_addr = (u64) urb->transfer_dma;
         start_trb = &ep_ring->enqueue->generic;
         start_cycle = ep_ring->cycle_state;
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index a1afb7c39f7e..6bbe3c3a7111 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -200,14 +200,14 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
 
         ret = pci_enable_msi(pdev);
         if (ret) {
-                xhci_err(xhci, "failed to allocate MSI entry\n");
+                xhci_dbg(xhci, "failed to allocate MSI entry\n");
                 return ret;
         }
 
         ret = request_irq(pdev->irq, (irq_handler_t)xhci_msi_irq,
                                 0, "xhci_hcd", xhci_to_hcd(xhci));
         if (ret) {
-                xhci_err(xhci, "disable MSI interrupt\n");
+                xhci_dbg(xhci, "disable MSI interrupt\n");
                 pci_disable_msi(pdev);
         }
 
@@ -270,7 +270,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
 
         ret = pci_enable_msix(pdev, xhci->msix_entries, xhci->msix_count);
         if (ret) {
-                xhci_err(xhci, "Failed to enable MSI-X\n");
+                xhci_dbg(xhci, "Failed to enable MSI-X\n");
                 goto free_entries;
         }
 
@@ -286,7 +286,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
         return ret;
 
 disable_msix:
-        xhci_err(xhci, "disable MSI-X interrupt\n");
+        xhci_dbg(xhci, "disable MSI-X interrupt\n");
         xhci_free_irq(xhci);
         pci_disable_msix(pdev);
 free_entries:
@@ -1333,9 +1333,6 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 goto done;
         }
 
-        xhci_dbg(xhci, "Cancel URB %p\n", urb);
-        xhci_dbg(xhci, "Event ring:\n");
-        xhci_debug_ring(xhci, xhci->event_ring);
         ep_index = xhci_get_endpoint_index(&urb->ep->desc);
         ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index];
         ep_ring = xhci_urb_to_transfer_ring(xhci, urb);
@@ -1344,12 +1341,18 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 goto done;
         }
 
-        xhci_dbg(xhci, "Endpoint ring:\n");
-        xhci_debug_ring(xhci, ep_ring);
-
         urb_priv = urb->hcpriv;
-
-        for (i = urb_priv->td_cnt; i < urb_priv->length; i++) {
+        i = urb_priv->td_cnt;
+        if (i < urb_priv->length)
+                xhci_dbg(xhci, "Cancel URB %p, dev %s, ep 0x%x, "
+                                "starting at offset 0x%llx\n",
+                                urb, urb->dev->devpath,
+                                urb->ep->desc.bEndpointAddress,
+                                (unsigned long long) xhci_trb_virt_to_dma(
+                                        urb_priv->td[i]->start_seg,
+                                        urb_priv->td[i]->first_trb));
+
+        for (; i < urb_priv->length; i++) {
                 td = urb_priv->td[i];
                 list_add_tail(&td->cancelled_td_list, &ep->cancelled_td_list);
         }
@@ -1620,6 +1623,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
                 /* FIXME: can we allocate more resources for the HC? */
                 break;
         case COMP_BW_ERR:
+        case COMP_2ND_BW_ERR:
                 dev_warn(&udev->dev, "Not enough bandwidth "
                                 "for new device state.\n");
                 ret = -ENOSPC;
@@ -2796,8 +2800,7 @@ static int xhci_calculate_streams_and_bitmask(struct xhci_hcd *xhci,
                 if (ret < 0)
                         return ret;
 
-                max_streams = USB_SS_MAX_STREAMS(
-                                eps[i]->ss_ep_comp.bmAttributes);
+                max_streams = usb_ss_max_streams(&eps[i]->ss_ep_comp);
                 if (max_streams < (*num_streams - 1)) {
                         xhci_dbg(xhci, "Ep 0x%x only supports %u stream IDs.\n",
                                         eps[i]->desc.bEndpointAddress,
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 3c8fbd2772ea..fb99c8379142 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1033,7 +1033,6 @@ struct xhci_transfer_event {
 /* Invalid Stream ID Error */
 #define COMP_STRID_ERR  34
 /* Secondary Bandwidth Error - may be returned by a Configure Endpoint cmd */
-/* FIXME - check for this */
 #define COMP_2ND_BW_ERR 35
 /* Split Transaction Error */
 #define COMP_SPLIT_ERR  36
@@ -1356,7 +1355,7 @@ static inline unsigned int hcd_index(struct usb_hcd *hcd)
                 return 1;
 }
 
-/* There is one ehci_hci structure per controller */
+/* There is one xhci_hcd structure per controller */
 struct xhci_hcd {
         struct usb_hcd *main_hcd;
         struct usb_hcd *shared_hcd;
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c
index 1dc7e9581cc6..1c61830e96f9 100644
--- a/drivers/usb/misc/isight_firmware.c
+++ b/drivers/usb/misc/isight_firmware.c
@@ -55,8 +55,9 @@ static int isight_firmware_load(struct usb_interface *intf,
 
         ptr = firmware->data;
 
+        buf[0] = 0x01;
         if (usb_control_msg
-            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\1", 1,
+            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, buf, 1,
              300) != 1) {
                 printk(KERN_ERR
                        "Failed to initialise isight firmware loader\n");
@@ -100,8 +101,9 @@ static int isight_firmware_load(struct usb_interface *intf,
                 }
         }
 
+        buf[0] = 0x00;
         if (usb_control_msg
-            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, "\0", 1,
+            (dev, usb_sndctrlpipe(dev, 0), 0xa0, 0x40, 0xe600, 0, buf, 1,
              300) != 1) {
                 printk(KERN_ERR "isight firmware loading completion failed\n");
                 ret = -ENODEV;
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index bd6d00802eab..959145baf3cf 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -1765,7 +1765,6 @@ static int test_unaligned_bulk(
  * off just killing the userspace task and waiting for it to exit.
  */
 
-/* No BKL needed */
 static int
 usbtest_ioctl(struct usb_interface *intf, unsigned int code, void *buf)
 {
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 07a03460a598..f70cab3beeec 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -5,14 +5,13 @@
 
 # (M)HDRC = (Multipoint) Highspeed Dual-Role Controller
 config USB_MUSB_HDRC
+        tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
         depends on USB && USB_GADGET
-        depends on (ARM || (BF54x && !BF544) || (BF52x && !BF522 && !BF523))
         select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
         select TWL4030_USB if MACH_OMAP_3430SDP
         select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
         select USB_OTG_UTILS
         select USB_GADGET_DUALSPEED
-        tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
         help
           Say Y here if your system has a dual role high speed USB
           controller based on the Mentor Graphics silicon IP.  Then
@@ -31,9 +30,10 @@ config USB_MUSB_HDRC
           To compile this driver as a module, choose M here; the
           module will be called "musb-hdrc".
 
+if USB_MUSB_HDRC
+
 choice
         prompt "Platform Glue Layer"
-        depends on USB_MUSB_HDRC
 
 config USB_MUSB_DAVINCI
         tristate "DaVinci"
@@ -45,7 +45,6 @@ config USB_MUSB_DA8XX
 
 config USB_MUSB_TUSB6010
         tristate "TUSB6010"
-        depends on ARCH_OMAP
 
 config USB_MUSB_OMAP2PLUS
         tristate "OMAP2430 and onwards"
@@ -65,46 +64,54 @@ config USB_MUSB_UX500
 
 endchoice
 
-config MUSB_PIO_ONLY
-        bool 'Disable DMA (always use PIO)'
-        depends on USB_MUSB_HDRC
-        default USB_MUSB_TUSB6010 || USB_MUSB_DA8XX || USB_MUSB_AM35X
+choice
+        prompt 'MUSB DMA mode'
+        default USB_UX500_DMA if USB_MUSB_UX500
+        default USB_INVENTRA_DMA if USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
+        default USB_TI_CPPI_DMA if USB_MUSB_DAVINCI
+        default USB_TUSB_OMAP_DMA if USB_MUSB_TUSB6010
+        default MUSB_PIO_ONLY if USB_MUSB_TUSB6010 || USB_MUSB_DA8XX || USB_MUSB_AM35X
         help
-          All data is copied between memory and FIFO by the CPU.
-          DMA controllers are ignored.
-
-          Do not select 'n' here unless DMA support for your SOC or board
-          is unavailable (or unstable).  When DMA is enabled at compile time,
-          you can still disable it at run time using the "use_dma=n" module
-          parameter.
+          Unfortunately, only one option can be enabled here. Ideally one
+          should be able to build all these drivers into one kernel to
+          allow using DMA on multiplatform kernels.
 
 config USB_UX500_DMA
-        bool
-        depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-        default USB_MUSB_UX500
+        bool 'ST Ericsson U8500 and U5500'
+        depends on USB_MUSB_UX500
         help
           Enable DMA transfers on UX500 platforms.
 
 config USB_INVENTRA_DMA
-        bool
-        depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-        default USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
+        bool 'Inventra'
+        depends on USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
         help
           Enable DMA transfers using Mentor's engine.
 
 config USB_TI_CPPI_DMA
-        bool
-        depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-        default USB_MUSB_DAVINCI
+        bool 'TI CPPI (Davinci)'
+        depends on USB_MUSB_DAVINCI
         help
           Enable DMA transfers when TI CPPI DMA is available.
 
 config USB_TUSB_OMAP_DMA
-        bool
-        depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
+        bool 'TUSB 6010'
         depends on USB_MUSB_TUSB6010
         depends on ARCH_OMAP
-        default y
         help
           Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
 
+config MUSB_PIO_ONLY
+        bool 'Disable DMA (always use PIO)'
+        help
+          All data is copied between memory and FIFO by the CPU.
+          DMA controllers are ignored.
+
+          Do not choose this unless DMA support for your SOC or board
+          is unavailable (or unstable).  When DMA is enabled at compile time,
+          you can still disable it at run time using the "use_dma=n" module
+          parameter.
+
+endchoice
+
+endif # USB_MUSB_HDRC
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index d8fd9d092dec..88bfb9dee4bf 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -24,25 +24,7 @@ obj-$(CONFIG_USB_MUSB_UX500)			+= ux500.o
 # PIO only, or DMA (several potential schemes).
 # though PIO is always there to back up DMA, and for ep0
 
-ifneq ($(CONFIG_MUSB_PIO_ONLY),y)
-
-  ifeq ($(CONFIG_USB_INVENTRA_DMA),y)
-    musb_hdrc-y                 += musbhsdma.o
-
-  else
-    ifeq ($(CONFIG_USB_TI_CPPI_DMA),y)
-      musb_hdrc-y               += cppi_dma.o
-
-    else
-      ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y)
-        musb_hdrc-y             += tusb6010_omap.o
-
-      else
-        ifeq ($(CONFIG_USB_UX500_DMA),y)
-          musb_hdrc-y           += ux500_dma.o
-
-        endif
-      endif
-    endif
-  endif
-endif
+musb_hdrc-$(CONFIG_USB_INVENTRA_DMA)            += musbhsdma.o
+musb_hdrc-$(CONFIG_USB_TI_CPPI_DMA)             += cppi_dma.o
+musb_hdrc-$(CONFIG_USB_TUSB_OMAP_DMA)           += tusb6010_omap.o
+musb_hdrc-$(CONFIG_USB_UX500_DMA)               += ux500_dma.o
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index b63ab1570103..f6ff7923048b 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -661,7 +661,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 int_usb,
 
                 handled = IRQ_HANDLED;
                 musb->is_active = 1;
-                set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
 
                 musb->ep0_stage = MUSB_EP0_START;
 
@@ -1432,7 +1431,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
                 struct musb_hw_ep       *hw_ep = musb->endpoints + i;
 
                 hw_ep->fifo = MUSB_FIFO_OFFSET(i) + mbase;
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
                 hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i);
                 hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i);
                 hw_ep->fifo_sync_va =
@@ -1631,6 +1630,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit)
                 }
         }
 }
+EXPORT_SYMBOL_GPL(musb_dma_completion);
 
 #else
 #define use_dma                 0
@@ -2012,8 +2012,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)
         if (status < 0)
                 goto fail3;
 
-        pm_runtime_put(musb->controller);
-
         status = musb_init_debugfs(musb);
         if (status < 0)
                 goto fail4;
@@ -2158,6 +2156,7 @@ static void musb_save_context(struct musb *musb)
                 if (!epio)
                         continue;
 
+                musb_writeb(musb_base, MUSB_INDEX, i);
                 musb->context.index_regs[i].txmaxp =
                         musb_readw(epio, MUSB_TXMAXP);
                 musb->context.index_regs[i].txcsr =
@@ -2233,6 +2232,7 @@ static void musb_restore_context(struct musb *musb)
                 if (!epio)
                         continue;
 
+                musb_writeb(musb_base, MUSB_INDEX, i);
                 musb_writew(epio, MUSB_TXMAXP,
                         musb->context.index_regs[i].txmaxp);
                 musb_writew(epio, MUSB_TXCSR,
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index b3c065ab9dbc..3d28fb8a2dc9 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -40,7 +40,6 @@
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/timer.h>
-#include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -311,6 +310,7 @@ struct musb_context_registers {
         u8 index, testmode;
 
         u8 devctl, busctl, misc;
+        u32 otg_interfsel;
 
         struct musb_csr_regs index_regs[MUSB_C_NUM_EPS];
 };
@@ -327,6 +327,7 @@ struct musb {
 
         irqreturn_t             (*isr)(int, void *);
         struct work_struct      irq_work;
+        struct work_struct      otg_notifier_work;
         u16                     hwvers;
 
 /* this hub status bit is reserved by USB 2.0 and not seen by usbcore */
@@ -372,6 +373,7 @@ struct musb {
         u16                     int_tx;
 
         struct otg_transceiver  *xceiv;
+        u8                      xceiv_event;
 
         int nIrq;
         unsigned                irq_wake:1;
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 742eada5002e..27ba8f799462 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -43,8 +43,8 @@
 #define ERR(fmt, args...) yprintk(KERN_ERR, fmt, ## args)
 
 #ifdef CONFIG_DEBUG_FS
-extern int musb_init_debugfs(struct musb *musb);
-extern void musb_exit_debugfs(struct musb *musb);
+int musb_init_debugfs(struct musb *musb);
+void musb_exit_debugfs(struct musb *musb);
 #else
 static inline int musb_init_debugfs(struct musb *musb)
 {
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index 61f4ee466df7..13d9af9bf920 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -33,11 +33,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/list.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 
@@ -46,10 +42,6 @@
 #include "musb_core.h"
 #include "musb_debug.h"
 
-#ifdef CONFIG_ARCH_DAVINCI
-#include "davinci.h"
-#endif
-
 struct musb_register_map {
         char                    *name;
         unsigned                offset;
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 922148ff8d29..ac3d2eec20fe 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -40,8 +40,6 @@
 #include <linux/smp.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
-#include <linux/moduleparam.h>
-#include <linux/stat.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 
@@ -1844,7 +1842,7 @@ int __init musb_gadget_setup(struct musb *musb)
          */
 
         musb->g.ops = &musb_gadget_operations;
-        musb->g.is_dualspeed = 1;
+        musb->g.max_speed = USB_SPEED_HIGH;
         musb->g.speed = USB_SPEED_UNKNOWN;
 
         /* this "gadget" abstracts/virtualizes the controller */
@@ -1903,7 +1901,7 @@ static int musb_gadget_start(struct usb_gadget *g,
         unsigned long           flags;
         int                     retval = -EINVAL;
 
-        if (driver->speed < USB_SPEED_HIGH)
+        if (driver->max_speed < USB_SPEED_HIGH)
                 goto err0;
 
         pm_runtime_get_sync(musb->controller);
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 6a0d0467ec74..e40d7647caf1 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -37,7 +37,6 @@
 #include <linux/list.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
-#include <linux/init.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
 
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 03c6ccdbb3be..e61aa95f2d2a 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -74,7 +74,7 @@ static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
         { __raw_writel(data, addr + offset); }
 
 
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
 
 /*
  * TUSB6010 doesn't allow 8-bit access; 16-bit access is the minimum.
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index ba85f273e487..c27bbbf32b52 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -29,7 +29,6 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/list.h>
-#include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
@@ -228,21 +227,25 @@ static int musb_otg_notifications(struct notifier_block *nb,
                 unsigned long event, void *unused)
 {
         struct musb     *musb = container_of(nb, struct musb, nb);
+
+        musb->xceiv_event = event;
+        schedule_work(&musb->otg_notifier_work);
+
+        return 0;
+}
+
+static void musb_otg_notifier_work(struct work_struct *data_notifier_work)
+{
+        struct musb *musb = container_of(data_notifier_work, struct musb, otg_notifier_work);
         struct device *dev = musb->controller;
         struct musb_hdrc_platform_data *pdata = dev->platform_data;
         struct omap_musb_board_data *data = pdata->board_data;
 
-        switch (event) {
+        switch (musb->xceiv_event) {
         case USB_EVENT_ID:
                 dev_dbg(musb->controller, "ID GND\n");
 
-                if (is_otg_enabled(musb)) {
-                        if (musb->gadget_driver) {
-                                pm_runtime_get_sync(musb->controller);
-                                otg_init(musb->xceiv);
-                                omap2430_musb_set_vbus(musb, 1);
-                        }
-                } else {
+                if (!is_otg_enabled(musb) || musb->gadget_driver) {
                         pm_runtime_get_sync(musb->controller);
                         otg_init(musb->xceiv);
                         omap2430_musb_set_vbus(musb, 1);
@@ -274,10 +277,7 @@ static int musb_otg_notifications(struct notifier_block *nb,
                 break;
         default:
                 dev_dbg(musb->controller, "ID float\n");
-                return NOTIFY_DONE;
         }
-
-        return NOTIFY_OK;
 }
 
 static int omap2430_musb_init(struct musb *musb)
@@ -297,6 +297,8 @@ static int omap2430_musb_init(struct musb *musb)
                 return -ENODEV;
         }
 
+        INIT_WORK(&musb->otg_notifier_work, musb_otg_notifier_work);
+
         status = pm_runtime_get_sync(dev);
         if (status < 0) {
                 dev_err(dev, "pm_runtime_get_sync FAILED");
@@ -334,7 +336,6 @@ static int omap2430_musb_init(struct musb *musb)
         return 0;
 
 err1:
-        pm_runtime_disable(dev);
         return status;
 }
 
@@ -350,20 +351,19 @@ static void omap2430_musb_enable(struct musb *musb)
 
         case USB_EVENT_ID:
                 otg_init(musb->xceiv);
-                if (data->interface_type == MUSB_INTERFACE_UTMI) {
-                        devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
-                        /* start the session */
-                        devctl |= MUSB_DEVCTL_SESSION;
-                        musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
-                        while (musb_readb(musb->mregs, MUSB_DEVCTL) &
-                                                MUSB_DEVCTL_BDEVICE) {
-                                cpu_relax();
-
-                                if (time_after(jiffies, timeout)) {
-                                        dev_err(musb->controller,
-                                        "configured as A device timeout");
-                                        break;
-                                }
+                if (data->interface_type != MUSB_INTERFACE_UTMI)
+                        break;
+                devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
+                /* start the session */
+                devctl |= MUSB_DEVCTL_SESSION;
+                musb_writeb(musb->mregs, MUSB_DEVCTL, devctl);
+                while (musb_readb(musb->mregs, MUSB_DEVCTL) &
+                                MUSB_DEVCTL_BDEVICE) {
+                        cpu_relax();
+
+                        if (time_after(jiffies, timeout)) {
+                                dev_err(dev, "configured as A device timeout");
+                                break;
                         }
                 }
                 break;
@@ -478,7 +478,6 @@ static int __exit omap2430_remove(struct platform_device *pdev)
         platform_device_del(glue->musb);
         platform_device_put(glue->musb);
         pm_runtime_put(&pdev->dev);
-        pm_runtime_disable(&pdev->dev);
         kfree(glue);
 
         return 0;
@@ -491,6 +490,9 @@ static int omap2430_runtime_suspend(struct device *dev)
         struct omap2430_glue            *glue = dev_get_drvdata(dev);
         struct musb                     *musb = glue_to_musb(glue);
 
+        musb->context.otg_interfsel = musb_readl(musb->mregs,
+                                                OTG_INTERFSEL);
+
         omap2430_low_level_exit(musb);
         otg_set_suspend(musb->xceiv, 1);
 
@@ -503,6 +505,9 @@ static int omap2430_runtime_resume(struct device *dev)
         struct musb                     *musb = glue_to_musb(glue);
 
         omap2430_low_level_init(musb);
+        musb_writel(musb->mregs, OTG_INTERFSEL,
+                                        musb->context.otg_interfsel);
+
         otg_set_suspend(musb->xceiv, 0);
 
         return 0;
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index ec1480191f78..1f405616e6cd 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -56,6 +56,7 @@ u8 tusb_get_revision(struct musb *musb)
 
         return rev;
 }
+EXPORT_SYMBOL_GPL(tusb_get_revision);
 
 static int tusb_print_revision(struct musb *musb)
 {
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c
index ef4333f4bbe0..a163632877af 100644
--- a/drivers/usb/musb/ux500_dma.c
+++ b/drivers/usb/musb/ux500_dma.c
@@ -37,7 +37,6 @@ struct ux500_dma_channel {
         struct dma_channel channel;
         struct ux500_dma_controller *controller;
         struct musb_hw_ep *hw_ep;
-        struct work_struct channel_work;
         struct dma_chan *dma_chan;
         unsigned int cur_len;
         dma_cookie_t cookie;
@@ -56,31 +55,11 @@ struct ux500_dma_controller {
         dma_addr_t phy_base;
 };
 
-/* Work function invoked from DMA callback to handle tx transfers. */
-static void ux500_tx_work(struct work_struct *data)
-{
-        struct ux500_dma_channel *ux500_channel = container_of(data,
-                struct ux500_dma_channel, channel_work);
-        struct musb_hw_ep       *hw_ep = ux500_channel->hw_ep;
-        struct musb *musb = hw_ep->musb;
-        unsigned long flags;
-
-        dev_dbg(musb->controller, "DMA tx transfer done on hw_ep=%d\n",
-                hw_ep->epnum);
-
-        spin_lock_irqsave(&musb->lock, flags);
-        ux500_channel->channel.actual_len = ux500_channel->cur_len;
-        ux500_channel->channel.status = MUSB_DMA_STATUS_FREE;
-        musb_dma_completion(musb, hw_ep->epnum,
-                                ux500_channel->is_tx);
-        spin_unlock_irqrestore(&musb->lock, flags);
-}
-
 /* Work function invoked from DMA callback to handle rx transfers. */
-static void ux500_rx_work(struct work_struct *data)
+void ux500_dma_callback(void *private_data)
 {
-        struct ux500_dma_channel *ux500_channel = container_of(data,
-                struct ux500_dma_channel, channel_work);
+        struct dma_channel *channel = private_data;
+        struct ux500_dma_channel *ux500_channel = channel->private_data;
         struct musb_hw_ep       *hw_ep = ux500_channel->hw_ep;
         struct musb *musb = hw_ep->musb;
         unsigned long flags;
@@ -94,14 +73,7 @@ static void ux500_rx_work(struct work_struct *data)
         musb_dma_completion(musb, hw_ep->epnum,
                 ux500_channel->is_tx);
         spin_unlock_irqrestore(&musb->lock, flags);
-}
-
-void ux500_dma_callback(void *private_data)
-{
-        struct dma_channel *channel = (struct dma_channel *)private_data;
-        struct ux500_dma_channel *ux500_channel = channel->private_data;
 
-        schedule_work(&ux500_channel->channel_work);
 }
 
 static bool ux500_configure_channel(struct dma_channel *channel,
@@ -330,7 +302,6 @@ static int ux500_dma_controller_start(struct dma_controller *c)
         void **param_array;
         struct ux500_dma_channel *channel_array;
         u32 ch_count;
-        void (*musb_channel_work)(struct work_struct *);
         dma_cap_mask_t mask;
 
         if ((data->num_rx_channels > UX500_MUSB_DMA_NUM_RX_CHANNELS) ||
@@ -347,7 +318,6 @@ static int ux500_dma_controller_start(struct dma_controller *c)
         channel_array = controller->rx_channel;
         ch_count = data->num_rx_channels;
         param_array = data->dma_rx_param_array;
-        musb_channel_work = ux500_rx_work;
 
         for (dir = 0; dir < 2; dir++) {
                 for (ch_num = 0; ch_num < ch_count; ch_num++) {
@@ -374,15 +344,12 @@ static int ux500_dma_controller_start(struct dma_controller *c)
                                 return -EBUSY;
                         }
 
-                        INIT_WORK(&ux500_channel->channel_work,
-                                musb_channel_work);
                 }
 
                 /* Prepare the loop for TX channels */
                 channel_array = controller->tx_channel;
                 ch_count = data->num_tx_channels;
                 param_array = data->dma_tx_param_array;
-                musb_channel_work = ux500_tx_work;
                 is_tx = 1;
         }
 
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index c66481ad98d7..2a25955881fc 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -82,9 +82,9 @@ config NOP_USB_XCEIV
         tristate "NOP USB Transceiver Driver"
         select USB_OTG_UTILS
         help
-         this driver is to be used by all the usb transceiver which are either
-         built-in with usb ip or which are autonomous and doesn't require any
-         phy programming such as ISP1x04 etc.
+          This driver is to be used by all the usb transceiver which are either
+          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"
@@ -114,13 +114,13 @@ config USB_MSM_OTG
           has an external PHY.
 
 config AB8500_USB
-        tristate "AB8500 USB Transceiver Driver"
-        depends on AB8500_CORE
-        select USB_OTG_UTILS
-        help
-          Enable this to support the USB OTG transceiver in AB8500 chip.
-          This transceiver supports high and full speed devices plus,
-          in host mode, low speed.
+        tristate "AB8500 USB Transceiver Driver"
+        depends on AB8500_CORE
+        select USB_OTG_UTILS
+        help
+          Enable this to support the USB OTG transceiver in AB8500 chip.
+          This transceiver supports high and full speed devices plus,
+          in host mode, low speed.
 
 config FSL_USB2_OTG
         bool "Freescale USB OTG Transceiver Driver"
@@ -130,4 +130,16 @@ config FSL_USB2_OTG
         help
           Enable this to support Freescale USB OTG transceiver.
 
+config USB_MV_OTG
+        tristate "Marvell USB OTG support"
+        depends on USB_MV_UDC
+        select USB_OTG
+        select USB_OTG_UTILS
+        help
+          Say Y here if you want to build Marvell USB OTG transciever
+          driver in kernel (including PXA and MMP series). This driver
+          implements role switch between EHCI host driver and gadget driver.
+
+          To compile this driver as a module, choose M here.
+
 endif # USB || OTG
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index 566655c53331..b2c5a9598637 100644
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_USB_MSM_OTG)	+= msm_otg.o
 obj-$(CONFIG_AB8500_USB)        += ab8500-usb.o
 fsl_usb2_otg-objs               := fsl_otg.o otg_fsm.o
 obj-$(CONFIG_FSL_USB2_OTG)      += fsl_usb2_otg.o
+obj-$(CONFIG_USB_MV_OTG)        += mv_otg.o
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index 2d9cc445fc73..a190850d2d3b 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -1151,18 +1151,7 @@ struct platform_driver fsl_otg_driver = {
         },
 };
 
-static int __init fsl_usb_otg_init(void)
-{
-        pr_info(DRIVER_INFO "\n");
-        return platform_driver_register(&fsl_otg_driver);
-}
-module_init(fsl_usb_otg_init);
-
-static void __exit fsl_usb_otg_exit(void)
-{
-        platform_driver_unregister(&fsl_otg_driver);
-}
-module_exit(fsl_usb_otg_exit);
+module_platform_driver(fsl_otg_driver);
 
 MODULE_DESCRIPTION(DRIVER_INFO);
 MODULE_AUTHOR(DRIVER_AUTHOR);
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c
new file mode 100644
index 000000000000..db0d4fcdc8e2
--- /dev/null
+++ b/drivers/usb/otg/mv_otg.c
@@ -0,0 +1,957 @@
+/*
+ * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
+ * Author: Chao Xie <chao.xie@marvell.com>
+ *         Neil Zhang <zhangwm@marvell.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <linux/device.h>
+#include <linux/proc_fs.h>
+#include <linux/clk.h>
+#include <linux/workqueue.h>
+#include <linux/platform_device.h>
+
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/otg.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/hcd.h>
+#include <linux/platform_data/mv_usb.h>
+
+#include "mv_otg.h"
+
+#define DRIVER_DESC     "Marvell USB OTG transceiver driver"
+#define DRIVER_VERSION  "Jan 20, 2010"
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");
+
+static const char driver_name[] = "mv-otg";
+
+static char *state_string[] = {
+        "undefined",
+        "b_idle",
+        "b_srp_init",
+        "b_peripheral",
+        "b_wait_acon",
+        "b_host",
+        "a_idle",
+        "a_wait_vrise",
+        "a_wait_bcon",
+        "a_host",
+        "a_suspend",
+        "a_peripheral",
+        "a_wait_vfall",
+        "a_vbus_err"
+};
+
+static int mv_otg_set_vbus(struct otg_transceiver *otg, bool on)
+{
+        struct mv_otg *mvotg = container_of(otg, struct mv_otg, otg);
+        if (mvotg->pdata->set_vbus == NULL)
+                return -ENODEV;
+
+        return mvotg->pdata->set_vbus(on);
+}
+
+static int mv_otg_set_host(struct otg_transceiver *otg,
+                           struct usb_bus *host)
+{
+        otg->host = host;
+
+        return 0;
+}
+
+static int mv_otg_set_peripheral(struct otg_transceiver *otg,
+                                 struct usb_gadget *gadget)
+{
+        otg->gadget = gadget;
+
+        return 0;
+}
+
+static void mv_otg_run_state_machine(struct mv_otg *mvotg,
+                                     unsigned long delay)
+{
+        dev_dbg(&mvotg->pdev->dev, "transceiver is updated\n");
+        if (!mvotg->qwork)
+                return;
+
+        queue_delayed_work(mvotg->qwork, &mvotg->work, delay);
+}
+
+static void mv_otg_timer_await_bcon(unsigned long data)
+{
+        struct mv_otg *mvotg = (struct mv_otg *) data;
+
+        mvotg->otg_ctrl.a_wait_bcon_timeout = 1;
+
+        dev_info(&mvotg->pdev->dev, "B Device No Response!\n");
+
+        if (spin_trylock(&mvotg->wq_lock)) {
+                mv_otg_run_state_machine(mvotg, 0);
+                spin_unlock(&mvotg->wq_lock);
+        }
+}
+
+static int mv_otg_cancel_timer(struct mv_otg *mvotg, unsigned int id)
+{
+        struct timer_list *timer;
+
+        if (id >= OTG_TIMER_NUM)
+                return -EINVAL;
+
+        timer = &mvotg->otg_ctrl.timer[id];
+
+        if (timer_pending(timer))
+                del_timer(timer);
+
+        return 0;
+}
+
+static int mv_otg_set_timer(struct mv_otg *mvotg, unsigned int id,
+                            unsigned long interval,
+                            void (*callback) (unsigned long))
+{
+        struct timer_list *timer;
+
+        if (id >= OTG_TIMER_NUM)
+                return -EINVAL;
+
+        timer = &mvotg->otg_ctrl.timer[id];
+        if (timer_pending(timer)) {
+                dev_err(&mvotg->pdev->dev, "Timer%d is already running\n", id);
+                return -EBUSY;
+        }
+
+        init_timer(timer);
+        timer->data = (unsigned long) mvotg;
+        timer->function = callback;
+        timer->expires = jiffies + interval;
+        add_timer(timer);
+
+        return 0;
+}
+
+static int mv_otg_reset(struct mv_otg *mvotg)
+{
+        unsigned int loops;
+        u32 tmp;
+
+        /* Stop the controller */
+        tmp = readl(&mvotg->op_regs->usbcmd);
+        tmp &= ~USBCMD_RUN_STOP;
+        writel(tmp, &mvotg->op_regs->usbcmd);
+
+        /* Reset the controller to get default values */
+        writel(USBCMD_CTRL_RESET, &mvotg->op_regs->usbcmd);
+
+        loops = 500;
+        while (readl(&mvotg->op_regs->usbcmd) & USBCMD_CTRL_RESET) {
+                if (loops == 0) {
+                        dev_err(&mvotg->pdev->dev,
+                                "Wait for RESET completed TIMEOUT\n");
+                        return -ETIMEDOUT;
+                }
+                loops--;
+                udelay(20);
+        }
+
+        writel(0x0, &mvotg->op_regs->usbintr);
+        tmp = readl(&mvotg->op_regs->usbsts);
+        writel(tmp, &mvotg->op_regs->usbsts);
+
+        return 0;
+}
+
+static void mv_otg_init_irq(struct mv_otg *mvotg)
+{
+        u32 otgsc;
+
+        mvotg->irq_en = OTGSC_INTR_A_SESSION_VALID
+            | OTGSC_INTR_A_VBUS_VALID;
+        mvotg->irq_status = OTGSC_INTSTS_A_SESSION_VALID
+            | OTGSC_INTSTS_A_VBUS_VALID;
+
+        if (mvotg->pdata->vbus == NULL) {
+                mvotg->irq_en |= OTGSC_INTR_B_SESSION_VALID
+                    | OTGSC_INTR_B_SESSION_END;
+                mvotg->irq_status |= OTGSC_INTSTS_B_SESSION_VALID
+                    | OTGSC_INTSTS_B_SESSION_END;
+        }
+
+        if (mvotg->pdata->id == NULL) {
+                mvotg->irq_en |= OTGSC_INTR_USB_ID;
+                mvotg->irq_status |= OTGSC_INTSTS_USB_ID;
+        }
+
+        otgsc = readl(&mvotg->op_regs->otgsc);
+        otgsc |= mvotg->irq_en;
+        writel(otgsc, &mvotg->op_regs->otgsc);
+}
+
+static void mv_otg_start_host(struct mv_otg *mvotg, int on)
+{
+        struct otg_transceiver *otg = &mvotg->otg;
+        struct usb_hcd *hcd;
+
+        if (!otg->host)
+                return;
+
+        dev_info(&mvotg->pdev->dev, "%s host\n", on ? "start" : "stop");
+
+        hcd = bus_to_hcd(otg->host);
+
+        if (on)
+                usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
+        else
+                usb_remove_hcd(hcd);
+}
+
+static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on)
+{
+        struct otg_transceiver *otg = &mvotg->otg;
+
+        if (!otg->gadget)
+                return;
+
+        dev_info(otg->dev, "gadget %s\n", on ? "on" : "off");
+
+        if (on)
+                usb_gadget_vbus_connect(otg->gadget);
+        else
+                usb_gadget_vbus_disconnect(otg->gadget);
+}
+
+static void otg_clock_enable(struct mv_otg *mvotg)
+{
+        unsigned int i;
+
+        for (i = 0; i < mvotg->clknum; i++)
+                clk_enable(mvotg->clk[i]);
+}
+
+static void otg_clock_disable(struct mv_otg *mvotg)
+{
+        unsigned int i;
+
+        for (i = 0; i < mvotg->clknum; i++)
+                clk_disable(mvotg->clk[i]);
+}
+
+static int mv_otg_enable_internal(struct mv_otg *mvotg)
+{
+        int retval = 0;
+
+        if (mvotg->active)
+                return 0;
+
+        dev_dbg(&mvotg->pdev->dev, "otg enabled\n");
+
+        otg_clock_enable(mvotg);
+        if (mvotg->pdata->phy_init) {
+                retval = mvotg->pdata->phy_init(mvotg->phy_regs);
+                if (retval) {
+                        dev_err(&mvotg->pdev->dev,
+                                "init phy error %d\n", retval);
+                        otg_clock_disable(mvotg);
+                        return retval;
+                }
+        }
+        mvotg->active = 1;
+
+        return 0;
+
+}
+
+static int mv_otg_enable(struct mv_otg *mvotg)
+{
+        if (mvotg->clock_gating)
+                return mv_otg_enable_internal(mvotg);
+
+        return 0;
+}
+
+static void mv_otg_disable_internal(struct mv_otg *mvotg)
+{
+        if (mvotg->active) {
+                dev_dbg(&mvotg->pdev->dev, "otg disabled\n");
+                if (mvotg->pdata->phy_deinit)
+                        mvotg->pdata->phy_deinit(mvotg->phy_regs);
+                otg_clock_disable(mvotg);
+                mvotg->active = 0;
+        }
+}
+
+static void mv_otg_disable(struct mv_otg *mvotg)
+{
+        if (mvotg->clock_gating)
+                mv_otg_disable_internal(mvotg);
+}
+
+static void mv_otg_update_inputs(struct mv_otg *mvotg)
+{
+        struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl;
+        u32 otgsc;
+
+        otgsc = readl(&mvotg->op_regs->otgsc);
+
+        if (mvotg->pdata->vbus) {
+                if (mvotg->pdata->vbus->poll() == VBUS_HIGH) {
+                        otg_ctrl->b_sess_vld = 1;
+                        otg_ctrl->b_sess_end = 0;
+                } else {
+                        otg_ctrl->b_sess_vld = 0;
+                        otg_ctrl->b_sess_end = 1;
+                }
+        } else {
+                otg_ctrl->b_sess_vld = !!(otgsc & OTGSC_STS_B_SESSION_VALID);
+                otg_ctrl->b_sess_end = !!(otgsc & OTGSC_STS_B_SESSION_END);
+        }
+
+        if (mvotg->pdata->id)
+                otg_ctrl->id = !!mvotg->pdata->id->poll();
+        else
+                otg_ctrl->id = !!(otgsc & OTGSC_STS_USB_ID);
+
+        if (mvotg->pdata->otg_force_a_bus_req && !otg_ctrl->id)
+                otg_ctrl->a_bus_req = 1;
+
+        otg_ctrl->a_sess_vld = !!(otgsc & OTGSC_STS_A_SESSION_VALID);
+        otg_ctrl->a_vbus_vld = !!(otgsc & OTGSC_STS_A_VBUS_VALID);
+
+        dev_dbg(&mvotg->pdev->dev, "%s: ", __func__);
+        dev_dbg(&mvotg->pdev->dev, "id %d\n", otg_ctrl->id);
+        dev_dbg(&mvotg->pdev->dev, "b_sess_vld %d\n", otg_ctrl->b_sess_vld);
+        dev_dbg(&mvotg->pdev->dev, "b_sess_end %d\n", otg_ctrl->b_sess_end);
+        dev_dbg(&mvotg->pdev->dev, "a_vbus_vld %d\n", otg_ctrl->a_vbus_vld);
+        dev_dbg(&mvotg->pdev->dev, "a_sess_vld %d\n", otg_ctrl->a_sess_vld);
+}
+
+static void mv_otg_update_state(struct mv_otg *mvotg)
+{
+        struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl;
+        struct otg_transceiver *otg = &mvotg->otg;
+        int old_state = otg->state;
+
+        switch (old_state) {
+        case OTG_STATE_UNDEFINED:
+                otg->state = OTG_STATE_B_IDLE;
+                /* FALL THROUGH */
+        case OTG_STATE_B_IDLE:
+                if (otg_ctrl->id == 0)
+                        otg->state = OTG_STATE_A_IDLE;
+                else if (otg_ctrl->b_sess_vld)
+                        otg->state = OTG_STATE_B_PERIPHERAL;
+                break;
+        case OTG_STATE_B_PERIPHERAL:
+                if (!otg_ctrl->b_sess_vld || otg_ctrl->id == 0)
+                        otg->state = OTG_STATE_B_IDLE;
+                break;
+        case OTG_STATE_A_IDLE:
+                if (otg_ctrl->id)
+                        otg->state = OTG_STATE_B_IDLE;
+                else if (!(otg_ctrl->a_bus_drop) &&
+                         (otg_ctrl->a_bus_req || otg_ctrl->a_srp_det))
+                        otg->state = OTG_STATE_A_WAIT_VRISE;
+                break;
+        case OTG_STATE_A_WAIT_VRISE:
+                if (otg_ctrl->a_vbus_vld)
+                        otg->state = OTG_STATE_A_WAIT_BCON;
+                break;
+        case OTG_STATE_A_WAIT_BCON:
+                if (otg_ctrl->id || otg_ctrl->a_bus_drop
+                    || otg_ctrl->a_wait_bcon_timeout) {
+                        mv_otg_cancel_timer(mvotg, A_WAIT_BCON_TIMER);
+                        mvotg->otg_ctrl.a_wait_bcon_timeout = 0;
+                        otg->state = OTG_STATE_A_WAIT_VFALL;
+                        otg_ctrl->a_bus_req = 0;
+                } else if (!otg_ctrl->a_vbus_vld) {
+                        mv_otg_cancel_timer(mvotg, A_WAIT_BCON_TIMER);
+                        mvotg->otg_ctrl.a_wait_bcon_timeout = 0;
+                        otg->state = OTG_STATE_A_VBUS_ERR;
+                } else if (otg_ctrl->b_conn) {
+                        mv_otg_cancel_timer(mvotg, A_WAIT_BCON_TIMER);
+                        mvotg->otg_ctrl.a_wait_bcon_timeout = 0;
+                        otg->state = OTG_STATE_A_HOST;
+                }
+                break;
+        case OTG_STATE_A_HOST:
+                if (otg_ctrl->id || !otg_ctrl->b_conn
+                    || otg_ctrl->a_bus_drop)
+                        otg->state = OTG_STATE_A_WAIT_BCON;
+                else if (!otg_ctrl->a_vbus_vld)
+                        otg->state = OTG_STATE_A_VBUS_ERR;
+                break;
+        case OTG_STATE_A_WAIT_VFALL:
+                if (otg_ctrl->id
+                    || (!otg_ctrl->b_conn && otg_ctrl->a_sess_vld)
+                    || otg_ctrl->a_bus_req)
+                        otg->state = OTG_STATE_A_IDLE;
+                break;
+        case OTG_STATE_A_VBUS_ERR:
+                if (otg_ctrl->id || otg_ctrl->a_clr_err
+                    || otg_ctrl->a_bus_drop) {
+                        otg_ctrl->a_clr_err = 0;
+                        otg->state = OTG_STATE_A_WAIT_VFALL;
+                }
+                break;
+        default:
+                break;
+        }
+}
+
+static void mv_otg_work(struct work_struct *work)
+{
+        struct mv_otg *mvotg;
+        struct otg_transceiver *otg;
+        int old_state;
+
+        mvotg = container_of((struct delayed_work *)work, struct mv_otg, work);
+
+run:
+        /* work queue is single thread, or we need spin_lock to protect */
+        otg = &mvotg->otg;
+        old_state = otg->state;
+
+        if (!mvotg->active)
+                return;
+
+        mv_otg_update_inputs(mvotg);
+        mv_otg_update_state(mvotg);
+
+        if (old_state != otg->state) {
+                dev_info(&mvotg->pdev->dev, "change from state %s to %s\n",
+                         state_string[old_state],
+                         state_string[otg->state]);
+
+                switch (otg->state) {
+                case OTG_STATE_B_IDLE:
+                        mvotg->otg.default_a = 0;
+                        if (old_state == OTG_STATE_B_PERIPHERAL)
+                                mv_otg_start_periphrals(mvotg, 0);
+                        mv_otg_reset(mvotg);
+                        mv_otg_disable(mvotg);
+                        break;
+                case OTG_STATE_B_PERIPHERAL:
+                        mv_otg_enable(mvotg);
+                        mv_otg_start_periphrals(mvotg, 1);
+                        break;
+                case OTG_STATE_A_IDLE:
+                        mvotg->otg.default_a = 1;
+                        mv_otg_enable(mvotg);
+                        if (old_state == OTG_STATE_A_WAIT_VFALL)
+                                mv_otg_start_host(mvotg, 0);
+                        mv_otg_reset(mvotg);
+                        break;
+                case OTG_STATE_A_WAIT_VRISE:
+                        mv_otg_set_vbus(&mvotg->otg, 1);
+                        break;
+                case OTG_STATE_A_WAIT_BCON:
+                        if (old_state != OTG_STATE_A_HOST)
+                                mv_otg_start_host(mvotg, 1);
+                        mv_otg_set_timer(mvotg, A_WAIT_BCON_TIMER,
+                                         T_A_WAIT_BCON,
+                                         mv_otg_timer_await_bcon);
+                        /*
+                         * Now, we directly enter A_HOST. So set b_conn = 1
+                         * here. In fact, it need host driver to notify us.
+                         */
+                        mvotg->otg_ctrl.b_conn = 1;
+                        break;
+                case OTG_STATE_A_HOST:
+                        break;
+                case OTG_STATE_A_WAIT_VFALL:
+                        /*
+                         * Now, we has exited A_HOST. So set b_conn = 0
+                         * here. In fact, it need host driver to notify us.
+                         */
+                        mvotg->otg_ctrl.b_conn = 0;
+                        mv_otg_set_vbus(&mvotg->otg, 0);
+                        break;
+                case OTG_STATE_A_VBUS_ERR:
+                        break;
+                default:
+                        break;
+                }
+                goto run;
+        }
+}
+
+static irqreturn_t mv_otg_irq(int irq, void *dev)
+{
+        struct mv_otg *mvotg = dev;
+        u32 otgsc;
+
+        otgsc = readl(&mvotg->op_regs->otgsc);
+        writel(otgsc, &mvotg->op_regs->otgsc);
+
+        /*
+         * if we have vbus, then the vbus detection for B-device
+         * will be done by mv_otg_inputs_irq().
+         */
+        if (mvotg->pdata->vbus)
+                if ((otgsc & OTGSC_STS_USB_ID) &&
+                    !(otgsc & OTGSC_INTSTS_USB_ID))
+                        return IRQ_NONE;
+
+        if ((otgsc & mvotg->irq_status) == 0)
+                return IRQ_NONE;
+
+        mv_otg_run_state_machine(mvotg, 0);
+
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t mv_otg_inputs_irq(int irq, void *dev)
+{
+        struct mv_otg *mvotg = dev;
+
+        /* The clock may disabled at this time */
+        if (!mvotg->active) {
+                mv_otg_enable(mvotg);
+                mv_otg_init_irq(mvotg);
+        }
+
+        mv_otg_run_state_machine(mvotg, 0);
+
+        return IRQ_HANDLED;
+}
+
+static ssize_t
+get_a_bus_req(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct mv_otg *mvotg = dev_get_drvdata(dev);
+        return scnprintf(buf, PAGE_SIZE, "%d\n",
+                         mvotg->otg_ctrl.a_bus_req);
+}
+
+static ssize_t
+set_a_bus_req(struct device *dev, struct device_attribute *attr,
+              const char *buf, size_t count)
+{
+        struct mv_otg *mvotg = dev_get_drvdata(dev);
+
+        if (count > 2)
+                return -1;
+
+        /* We will use this interface to change to A device */
+        if (mvotg->otg.state != OTG_STATE_B_IDLE
+            && mvotg->otg.state != OTG_STATE_A_IDLE)
+                return -1;
+
+        /* The clock may disabled and we need to set irq for ID detected */
+        mv_otg_enable(mvotg);
+        mv_otg_init_irq(mvotg);
+
+        if (buf[0] == '1') {
+                mvotg->otg_ctrl.a_bus_req = 1;
+                mvotg->otg_ctrl.a_bus_drop = 0;
+                dev_dbg(&mvotg->pdev->dev,
+                        "User request: a_bus_req = 1\n");
+
+                if (spin_trylock(&mvotg->wq_lock)) {
+                        mv_otg_run_state_machine(mvotg, 0);
+                        spin_unlock(&mvotg->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
+set_a_clr_err(struct device *dev, struct device_attribute *attr,
+              const char *buf, size_t count)
+{
+        struct mv_otg *mvotg = dev_get_drvdata(dev);
+        if (!mvotg->otg.default_a)
+                return -1;
+
+        if (count > 2)
+                return -1;
+
+        if (buf[0] == '1') {
+                mvotg->otg_ctrl.a_clr_err = 1;
+                dev_dbg(&mvotg->pdev->dev,
+                        "User request: a_clr_err = 1\n");
+        }
+
+        if (spin_trylock(&mvotg->wq_lock)) {
+                mv_otg_run_state_machine(mvotg, 0);
+                spin_unlock(&mvotg->wq_lock);
+        }
+
+        return count;
+}
+
+static DEVICE_ATTR(a_clr_err, S_IWUSR, NULL, set_a_clr_err);
+
+static ssize_t
+get_a_bus_drop(struct device *dev, struct device_attribute *attr,
+               char *buf)
+{
+        struct mv_otg *mvotg = dev_get_drvdata(dev);
+        return scnprintf(buf, PAGE_SIZE, "%d\n",
+                         mvotg->otg_ctrl.a_bus_drop);
+}
+
+static ssize_t
+set_a_bus_drop(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t count)
+{
+        struct mv_otg *mvotg = dev_get_drvdata(dev);
+        if (!mvotg->otg.default_a)
+                return -1;
+
+        if (count > 2)
+                return -1;
+
+        if (buf[0] == '0') {
+                mvotg->otg_ctrl.a_bus_drop = 0;
+                dev_dbg(&mvotg->pdev->dev,
+                        "User request: a_bus_drop = 0\n");
+        } else if (buf[0] == '1') {
+                mvotg->otg_ctrl.a_bus_drop = 1;
+                mvotg->otg_ctrl.a_bus_req = 0;
+                dev_dbg(&mvotg->pdev->dev,
+                        "User request: a_bus_drop = 1\n");
+                dev_dbg(&mvotg->pdev->dev,
+                        "User request: and a_bus_req = 0\n");
+        }
+
+        if (spin_trylock(&mvotg->wq_lock)) {
+                mv_otg_run_state_machine(mvotg, 0);
+                spin_unlock(&mvotg->wq_lock);
+        }
+
+        return count;
+}
+
+static DEVICE_ATTR(a_bus_drop, S_IRUGO | S_IWUSR,
+                   get_a_bus_drop, set_a_bus_drop);
+
+static struct attribute *inputs_attrs[] = {
+        &dev_attr_a_bus_req.attr,
+        &dev_attr_a_clr_err.attr,
+        &dev_attr_a_bus_drop.attr,
+        NULL,
+};
+
+static struct attribute_group inputs_attr_group = {
+        .name = "inputs",
+        .attrs = inputs_attrs,
+};
+
+int mv_otg_remove(struct platform_device *pdev)
+{
+        struct mv_otg *mvotg = platform_get_drvdata(pdev);
+        int clk_i;
+
+        sysfs_remove_group(&mvotg->pdev->dev.kobj, &inputs_attr_group);
+
+        if (mvotg->irq)
+                free_irq(mvotg->irq, mvotg);
+
+        if (mvotg->pdata->vbus)
+                free_irq(mvotg->pdata->vbus->irq, mvotg);
+        if (mvotg->pdata->id)
+                free_irq(mvotg->pdata->id->irq, mvotg);
+
+        if (mvotg->qwork) {
+                flush_workqueue(mvotg->qwork);
+                destroy_workqueue(mvotg->qwork);
+        }
+
+        mv_otg_disable(mvotg);
+
+        if (mvotg->cap_regs)
+                iounmap(mvotg->cap_regs);
+
+        if (mvotg->phy_regs)
+                iounmap(mvotg->phy_regs);
+
+        for (clk_i = 0; clk_i <= mvotg->clknum; clk_i++)
+                clk_put(mvotg->clk[clk_i]);
+
+        otg_set_transceiver(NULL);
+        platform_set_drvdata(pdev, NULL);
+
+        kfree(mvotg);
+
+        return 0;
+}
+
+static int mv_otg_probe(struct platform_device *pdev)
+{
+        struct mv_usb_platform_data *pdata = pdev->dev.platform_data;
+        struct mv_otg *mvotg;
+        struct resource *r;
+        int retval = 0, clk_i, i;
+        size_t size;
+
+        if (pdata == NULL) {
+                dev_err(&pdev->dev, "failed to get platform data\n");
+                return -ENODEV;
+        }
+
+        size = sizeof(*mvotg) + sizeof(struct clk *) * pdata->clknum;
+        mvotg = kzalloc(size, GFP_KERNEL);
+        if (!mvotg) {
+                dev_err(&pdev->dev, "failed to allocate memory!\n");
+                return -ENOMEM;
+        }
+
+        platform_set_drvdata(pdev, mvotg);
+
+        mvotg->pdev = pdev;
+        mvotg->pdata = pdata;
+
+        mvotg->clknum = pdata->clknum;
+        for (clk_i = 0; clk_i < mvotg->clknum; clk_i++) {
+                mvotg->clk[clk_i] = clk_get(&pdev->dev, pdata->clkname[clk_i]);
+                if (IS_ERR(mvotg->clk[clk_i])) {
+                        retval = PTR_ERR(mvotg->clk[clk_i]);
+                        goto err_put_clk;
+                }
+        }
+
+        mvotg->qwork = create_singlethread_workqueue("mv_otg_queue");
+        if (!mvotg->qwork) {
+                dev_dbg(&pdev->dev, "cannot create workqueue for OTG\n");
+                retval = -ENOMEM;
+                goto err_put_clk;
+        }
+
+        INIT_DELAYED_WORK(&mvotg->work, mv_otg_work);
+
+        /* OTG common part */
+        mvotg->pdev = pdev;
+        mvotg->otg.dev = &pdev->dev;
+        mvotg->otg.label = driver_name;
+        mvotg->otg.set_host = mv_otg_set_host;
+        mvotg->otg.set_peripheral = mv_otg_set_peripheral;
+        mvotg->otg.set_vbus = mv_otg_set_vbus;
+        mvotg->otg.state = OTG_STATE_UNDEFINED;
+
+        for (i = 0; i < OTG_TIMER_NUM; i++)
+                init_timer(&mvotg->otg_ctrl.timer[i]);
+
+        r = platform_get_resource_byname(mvotg->pdev,
+                                         IORESOURCE_MEM, "phyregs");
+        if (r == NULL) {
+                dev_err(&pdev->dev, "no phy I/O memory resource defined\n");
+                retval = -ENODEV;
+                goto err_destroy_workqueue;
+        }
+
+        mvotg->phy_regs = ioremap(r->start, resource_size(r));
+        if (mvotg->phy_regs == NULL) {
+                dev_err(&pdev->dev, "failed to map phy I/O memory\n");
+                retval = -EFAULT;
+                goto err_destroy_workqueue;
+        }
+
+        r = platform_get_resource_byname(mvotg->pdev,
+                                         IORESOURCE_MEM, "capregs");
+        if (r == NULL) {
+                dev_err(&pdev->dev, "no I/O memory resource defined\n");
+                retval = -ENODEV;
+                goto err_unmap_phyreg;
+        }
+
+        mvotg->cap_regs = ioremap(r->start, resource_size(r));
+        if (mvotg->cap_regs == NULL) {
+                dev_err(&pdev->dev, "failed to map I/O memory\n");
+                retval = -EFAULT;
+                goto err_unmap_phyreg;
+        }
+
+        /* we will acces controller register, so enable the udc controller */
+        retval = mv_otg_enable_internal(mvotg);
+        if (retval) {
+                dev_err(&pdev->dev, "mv otg enable error %d\n", retval);
+                goto err_unmap_capreg;
+        }
+
+        mvotg->op_regs =
+                (struct mv_otg_regs __iomem *) ((unsigned long) mvotg->cap_regs
+                        + (readl(mvotg->cap_regs) & CAPLENGTH_MASK));
+
+        if (pdata->id) {
+                retval = request_threaded_irq(pdata->id->irq, NULL,
+                                              mv_otg_inputs_irq,
+                                              IRQF_ONESHOT, "id", mvotg);
+                if (retval) {
+                        dev_info(&pdev->dev,
+                                 "Failed to request irq for ID\n");
+                        pdata->id = NULL;
+                }
+        }
+
+        if (pdata->vbus) {
+                mvotg->clock_gating = 1;
+                retval = request_threaded_irq(pdata->vbus->irq, NULL,
+                                              mv_otg_inputs_irq,
+                                              IRQF_ONESHOT, "vbus", mvotg);
+                if (retval) {
+                        dev_info(&pdev->dev,
+                                 "Failed to request irq for VBUS, "
+                                 "disable clock gating\n");
+                        mvotg->clock_gating = 0;
+                        pdata->vbus = NULL;
+                }
+        }
+
+        if (pdata->disable_otg_clock_gating)
+                mvotg->clock_gating = 0;
+
+        mv_otg_reset(mvotg);
+        mv_otg_init_irq(mvotg);
+
+        r = platform_get_resource(mvotg->pdev, IORESOURCE_IRQ, 0);
+        if (r == NULL) {
+                dev_err(&pdev->dev, "no IRQ resource defined\n");
+                retval = -ENODEV;
+                goto err_disable_clk;
+        }
+
+        mvotg->irq = r->start;
+        if (request_irq(mvotg->irq, mv_otg_irq, IRQF_SHARED,
+                        driver_name, mvotg)) {
+                dev_err(&pdev->dev, "Request irq %d for OTG failed\n",
+                        mvotg->irq);
+                mvotg->irq = 0;
+                retval = -ENODEV;
+                goto err_disable_clk;
+        }
+
+        retval = otg_set_transceiver(&mvotg->otg);
+        if (retval < 0) {
+                dev_err(&pdev->dev, "can't register transceiver, %d\n",
+                        retval);
+                goto err_free_irq;
+        }
+
+        retval = sysfs_create_group(&pdev->dev.kobj, &inputs_attr_group);
+        if (retval < 0) {
+                dev_dbg(&pdev->dev,
+                        "Can't register sysfs attr group: %d\n", retval);
+                goto err_set_transceiver;
+        }
+
+        spin_lock_init(&mvotg->wq_lock);
+        if (spin_trylock(&mvotg->wq_lock)) {
+                mv_otg_run_state_machine(mvotg, 2 * HZ);
+                spin_unlock(&mvotg->wq_lock);
+        }
+
+        dev_info(&pdev->dev,
+                 "successful probe OTG device %s clock gating.\n",
+                 mvotg->clock_gating ? "with" : "without");
+
+        return 0;
+
+err_set_transceiver:
+        otg_set_transceiver(NULL);
+err_free_irq:
+        free_irq(mvotg->irq, mvotg);
+err_disable_clk:
+        if (pdata->vbus)
+                free_irq(pdata->vbus->irq, mvotg);
+        if (pdata->id)
+                free_irq(pdata->id->irq, mvotg);
+        mv_otg_disable_internal(mvotg);
+err_unmap_capreg:
+        iounmap(mvotg->cap_regs);
+err_unmap_phyreg:
+        iounmap(mvotg->phy_regs);
+err_destroy_workqueue:
+        flush_workqueue(mvotg->qwork);
+        destroy_workqueue(mvotg->qwork);
+err_put_clk:
+        for (clk_i--; clk_i >= 0; clk_i--)
+                clk_put(mvotg->clk[clk_i]);
+
+        platform_set_drvdata(pdev, NULL);
+        kfree(mvotg);
+
+        return retval;
+}
+
+#ifdef CONFIG_PM
+static int mv_otg_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct mv_otg *mvotg = platform_get_drvdata(pdev);
+
+        if (mvotg->otg.state != OTG_STATE_B_IDLE) {
+                dev_info(&pdev->dev,
+                         "OTG state is not B_IDLE, it is %d!\n",
+                         mvotg->otg.state);
+                return -EAGAIN;
+        }
+
+        if (!mvotg->clock_gating)
+                mv_otg_disable_internal(mvotg);
+
+        return 0;
+}
+
+static int mv_otg_resume(struct platform_device *pdev)
+{
+        struct mv_otg *mvotg = platform_get_drvdata(pdev);
+        u32 otgsc;
+
+        if (!mvotg->clock_gating) {
+                mv_otg_enable_internal(mvotg);
+
+                otgsc = readl(&mvotg->op_regs->otgsc);
+                otgsc |= mvotg->irq_en;
+                writel(otgsc, &mvotg->op_regs->otgsc);
+
+                if (spin_trylock(&mvotg->wq_lock)) {
+                        mv_otg_run_state_machine(mvotg, 0);
+                        spin_unlock(&mvotg->wq_lock);
+                }
+        }
+        return 0;
+}
+#endif
+
+static struct platform_driver mv_otg_driver = {
+        .probe = mv_otg_probe,
+        .remove = __exit_p(mv_otg_remove),
+        .driver = {
+                   .owner = THIS_MODULE,
+                   .name = driver_name,
+                   },
+#ifdef CONFIG_PM
+        .suspend = mv_otg_suspend,
+        .resume = mv_otg_resume,
+#endif
+};
+
+static int __init mv_otg_init(void)
+{
+        return platform_driver_register(&mv_otg_driver);
+}
+
+static void __exit mv_otg_exit(void)
+{
+        platform_driver_unregister(&mv_otg_driver);
+}
+
+module_init(mv_otg_init);
+module_exit(mv_otg_exit);
diff --git a/drivers/usb/otg/mv_otg.h b/drivers/usb/otg/mv_otg.h
new file mode 100644
index 000000000000..be6ca1437645
--- /dev/null
+++ b/drivers/usb/otg/mv_otg.h
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2011 Marvell International Ltd. 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.
+ */
+
+#ifndef __MV_USB_OTG_CONTROLLER__
+#define __MV_USB_OTG_CONTROLLER__
+
+#include <linux/types.h>
+
+/* Command Register Bit Masks */
+#define USBCMD_RUN_STOP                 (0x00000001)
+#define USBCMD_CTRL_RESET               (0x00000002)
+
+/* otgsc Register Bit Masks */
+#define OTGSC_CTRL_VUSB_DISCHARGE               0x00000001
+#define OTGSC_CTRL_VUSB_CHARGE                  0x00000002
+#define OTGSC_CTRL_OTG_TERM                     0x00000008
+#define OTGSC_CTRL_DATA_PULSING                 0x00000010
+#define OTGSC_STS_USB_ID                        0x00000100
+#define OTGSC_STS_A_VBUS_VALID                  0x00000200
+#define OTGSC_STS_A_SESSION_VALID               0x00000400
+#define OTGSC_STS_B_SESSION_VALID               0x00000800
+#define OTGSC_STS_B_SESSION_END                 0x00001000
+#define OTGSC_STS_1MS_TOGGLE                    0x00002000
+#define OTGSC_STS_DATA_PULSING                  0x00004000
+#define OTGSC_INTSTS_USB_ID                     0x00010000
+#define OTGSC_INTSTS_A_VBUS_VALID               0x00020000
+#define OTGSC_INTSTS_A_SESSION_VALID            0x00040000
+#define OTGSC_INTSTS_B_SESSION_VALID            0x00080000
+#define OTGSC_INTSTS_B_SESSION_END              0x00100000
+#define OTGSC_INTSTS_1MS                        0x00200000
+#define OTGSC_INTSTS_DATA_PULSING               0x00400000
+#define OTGSC_INTR_USB_ID                       0x01000000
+#define OTGSC_INTR_A_VBUS_VALID                 0x02000000
+#define OTGSC_INTR_A_SESSION_VALID              0x04000000
+#define OTGSC_INTR_B_SESSION_VALID              0x08000000
+#define OTGSC_INTR_B_SESSION_END                0x10000000
+#define OTGSC_INTR_1MS_TIMER                    0x20000000
+#define OTGSC_INTR_DATA_PULSING                 0x40000000
+
+#define CAPLENGTH_MASK          (0xff)
+
+/* Timer's interval, unit 10ms */
+#define T_A_WAIT_VRISE          100
+#define T_A_WAIT_BCON           2000
+#define T_A_AIDL_BDIS           100
+#define T_A_BIDL_ADIS           20
+#define T_B_ASE0_BRST           400
+#define T_B_SE0_SRP             300
+#define T_B_SRP_FAIL            2000
+#define T_B_DATA_PLS            10
+#define T_B_SRP_INIT            100
+#define T_A_SRP_RSPNS           10
+#define T_A_DRV_RSM             5
+
+enum otg_function {
+        OTG_B_DEVICE = 0,
+        OTG_A_DEVICE
+};
+
+enum mv_otg_timer {
+        A_WAIT_BCON_TIMER = 0,
+        OTG_TIMER_NUM
+};
+
+/* PXA OTG state machine */
+struct mv_otg_ctrl {
+        /* internal variables */
+        u8 a_set_b_hnp_en;      /* A-Device set b_hnp_en */
+        u8 b_srp_done;
+        u8 b_hnp_en;
+
+        /* OTG inputs */
+        u8 a_bus_drop;
+        u8 a_bus_req;
+        u8 a_clr_err;
+        u8 a_bus_resume;
+        u8 a_bus_suspend;
+        u8 a_conn;
+        u8 a_sess_vld;
+        u8 a_srp_det;
+        u8 a_vbus_vld;
+        u8 b_bus_req;           /* B-Device Require Bus */
+        u8 b_bus_resume;
+        u8 b_bus_suspend;
+        u8 b_conn;
+        u8 b_se0_srp;
+        u8 b_sess_end;
+        u8 b_sess_vld;
+        u8 id;
+        u8 a_suspend_req;
+
+        /*Timer event */
+        u8 a_aidl_bdis_timeout;
+        u8 b_ase0_brst_timeout;
+        u8 a_bidl_adis_timeout;
+        u8 a_wait_bcon_timeout;
+
+        struct timer_list timer[OTG_TIMER_NUM];
+};
+
+#define VUSBHS_MAX_PORTS        8
+
+struct mv_otg_regs {
+        u32 usbcmd;             /* Command register */
+        u32 usbsts;             /* Status register */
+        u32 usbintr;            /* Interrupt enable */
+        u32 frindex;            /* Frame index */
+        u32 reserved1[1];
+        u32 deviceaddr;         /* Device Address */
+        u32 eplistaddr;         /* Endpoint List Address */
+        u32 ttctrl;             /* HOST TT status and control */
+        u32 burstsize;          /* Programmable Burst Size */
+        u32 txfilltuning;       /* Host Transmit Pre-Buffer Packet Tuning */
+        u32 reserved[4];
+        u32 epnak;              /* Endpoint NAK */
+        u32 epnaken;            /* Endpoint NAK Enable */
+        u32 configflag;         /* Configured Flag register */
+        u32 portsc[VUSBHS_MAX_PORTS];   /* Port Status/Control x, x = 1..8 */
+        u32 otgsc;
+        u32 usbmode;            /* USB Host/Device mode */
+        u32 epsetupstat;        /* Endpoint Setup Status */
+        u32 epprime;            /* Endpoint Initialize */
+        u32 epflush;            /* Endpoint De-initialize */
+        u32 epstatus;           /* Endpoint Status */
+        u32 epcomplete;         /* Endpoint Interrupt On Complete */
+        u32 epctrlx[16];        /* Endpoint Control, where x = 0.. 15 */
+        u32 mcr;                /* Mux Control */
+        u32 isr;                /* Interrupt Status */
+        u32 ier;                /* Interrupt Enable */
+};
+
+struct mv_otg {
+        struct otg_transceiver otg;
+        struct mv_otg_ctrl otg_ctrl;
+
+        /* base address */
+        void __iomem *phy_regs;
+        void __iomem *cap_regs;
+        struct mv_otg_regs __iomem *op_regs;
+
+        struct platform_device *pdev;
+        int irq;
+        u32 irq_status;
+        u32 irq_en;
+
+        struct delayed_work work;
+        struct workqueue_struct *qwork;
+
+        spinlock_t wq_lock;
+
+        struct mv_usb_platform_data *pdata;
+
+        unsigned int active;
+        unsigned int clock_gating;
+        unsigned int clknum;
+        struct clk *clk[0];
+};
+
+#endif
diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 08c679c0dde5..e9a5b1d2615e 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -95,25 +95,15 @@ struct usbhs_priv *usbhs_pdev_to_priv(struct platform_device *pdev)
 /*
  *              syscfg functions
  */
-void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable)
+static void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable)
 {
         usbhs_bset(priv, SYSCFG, SCKE, enable ? SCKE : 0);
 }
 
-void usbhs_sys_hispeed_ctrl(struct usbhs_priv *priv, int enable)
-{
-        usbhs_bset(priv, SYSCFG, HSE, enable ? HSE : 0);
-}
-
-void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable)
-{
-        usbhs_bset(priv, SYSCFG, USBE, enable ? USBE : 0);
-}
-
 void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable)
 {
-        u16 mask = DCFM | DRPD | DPRPU;
-        u16 val  = DCFM | DRPD;
+        u16 mask = DCFM | DRPD | DPRPU | HSE | USBE;
+        u16 val  = DCFM | DRPD | HSE | USBE;
         int has_otg = usbhs_get_dparam(priv, has_otg);
 
         if (has_otg)
@@ -130,8 +120,8 @@ void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable)
 
 void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable)
 {
-        u16 mask = DCFM | DRPD | DPRPU;
-        u16 val  = DPRPU;
+        u16 mask = DCFM | DRPD | DPRPU | HSE | USBE;
+        u16 val  = DPRPU | HSE | USBE;
 
         /*
          * if enable
@@ -142,6 +132,11 @@ void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable)
         usbhs_bset(priv, SYSCFG, mask, enable ? val : 0);
 }
 
+void usbhs_sys_set_test_mode(struct usbhs_priv *priv, u16 mode)
+{
+        usbhs_write(priv, TESTMODE, mode);
+}
+
 /*
  *              frame functions
  */
@@ -229,7 +224,7 @@ static void usbhsc_bus_init(struct usbhs_priv *priv)
 /*
  *              device configuration
  */
-int usbhs_set_device_speed(struct usbhs_priv *priv, int devnum,
+int usbhs_set_device_config(struct usbhs_priv *priv, int devnum,
                            u16 upphub, u16 hubport, u16 speed)
 {
         struct device *dev = usbhs_priv_to_dev(priv);
@@ -301,18 +296,25 @@ static u32 usbhsc_default_pipe_type[] = {
  */
 static void usbhsc_power_ctrl(struct usbhs_priv *priv, int enable)
 {
+        struct platform_device *pdev = usbhs_priv_to_pdev(priv);
         struct device *dev = usbhs_priv_to_dev(priv);
 
         if (enable) {
                 /* enable PM */
                 pm_runtime_get_sync(dev);
 
+                /* enable platform power */
+                usbhs_platform_call(priv, power_ctrl, pdev, priv->base, enable);
+
                 /* USB on */
                 usbhs_sys_clock_ctrl(priv, enable);
         } else {
                 /* USB off */
                 usbhs_sys_clock_ctrl(priv, enable);
 
+                /* disable platform power */
+                usbhs_platform_call(priv, power_ctrl, pdev, priv->base, enable);
+
                 /* disable PM */
                 pm_runtime_put_sync(dev);
         }
@@ -388,7 +390,7 @@ static void usbhsc_notify_hotplug(struct work_struct *work)
         usbhsc_hotplug(priv);
 }
 
-int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)
+static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)
 {
         struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
         int delay = usbhs_get_dparam(priv, detection_delay);
@@ -398,7 +400,8 @@ int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)
          * To make sure safety context,
          * use workqueue for usbhs_notify_hotplug
          */
-        schedule_delayed_work(&priv->notify_hotplug_work, delay);
+        schedule_delayed_work(&priv->notify_hotplug_work,
+                              msecs_to_jiffies(delay));
         return 0;
 }
 
@@ -637,18 +640,7 @@ static struct platform_driver renesas_usbhs_driver = {
         .remove         = __devexit_p(usbhs_remove),
 };
 
-static int __init usbhs_init(void)
-{
-        return platform_driver_register(&renesas_usbhs_driver);
-}
-
-static void __exit usbhs_exit(void)
-{
-        platform_driver_unregister(&renesas_usbhs_driver);
-}
-
-module_init(usbhs_init);
-module_exit(usbhs_exit);
+module_platform_driver(renesas_usbhs_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Renesas USB driver");
diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index 8729da5c3be6..d79b3e27db95 100644
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -33,6 +33,7 @@ struct usbhs_priv;
 #define SYSCFG          0x0000
 #define BUSWAIT         0x0002
 #define DVSTCTR         0x0008
+#define TESTMODE        0x000C
 #define CFIFO           0x0014
 #define CFIFOSEL        0x0020
 #define CFIFOCTR        0x0022
@@ -275,19 +276,15 @@ u16 usbhs_read(struct usbhs_priv *priv, u32 reg);
 void usbhs_write(struct usbhs_priv *priv, u32 reg, u16 data);
 void usbhs_bset(struct usbhs_priv *priv, u32 reg, u16 mask, u16 data);
 
-int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev);
-
 #define usbhs_lock(p, f) spin_lock_irqsave(usbhs_priv_to_lock(p), f)
 #define usbhs_unlock(p, f) spin_unlock_irqrestore(usbhs_priv_to_lock(p), f)
 
 /*
  * sysconfig
  */
-void usbhs_sys_clock_ctrl(struct usbhs_priv *priv, int enable);
-void usbhs_sys_hispeed_ctrl(struct usbhs_priv *priv, int enable);
-void usbhs_sys_usb_ctrl(struct usbhs_priv *priv, int enable);
 void usbhs_sys_host_ctrl(struct usbhs_priv *priv, int enable);
 void usbhs_sys_function_ctrl(struct usbhs_priv *priv, int enable);
+void usbhs_sys_set_test_mode(struct usbhs_priv *priv, u16 mode);
 
 /*
  * usb request
@@ -311,7 +308,7 @@ int usbhs_frame_get_num(struct usbhs_priv *priv);
 /*
  * device config
  */
-int usbhs_set_device_speed(struct usbhs_priv *priv, int devnum, u16 upphub,
+int usbhs_set_device_config(struct usbhs_priv *priv, int devnum, u16 upphub,
                            u16 hubport, u16 speed);
 
 /*
diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
index ffdf5d15085e..b51fcd80d244 100644
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@ -56,7 +56,7 @@ static struct usbhs_pkt_handle usbhsf_null_handler = {
 void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
                     void (*done)(struct usbhs_priv *priv,
                                  struct usbhs_pkt *pkt),
-                    void *buf, int len, int zero)
+                    void *buf, int len, int zero, int sequence)
 {
         struct usbhs_priv *priv = usbhs_pipe_to_priv(pipe);
         struct device *dev = usbhs_priv_to_dev(priv);
@@ -90,6 +90,7 @@ void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
         pkt->zero       = zero;
         pkt->actual     = 0;
         pkt->done       = done;
+        pkt->sequence   = sequence;
 
         usbhs_unlock(priv, flags);
         /********************  spin unlock ******************/
@@ -481,6 +482,9 @@ static int usbhsf_pio_try_push(struct usbhs_pkt *pkt, int *is_done)
         int i, ret, len;
         int is_short;
 
+        usbhs_pipe_data_sequence(pipe, pkt->sequence);
+        pkt->sequence = -1; /* -1 sequence will be ignored */
+
         ret = usbhsf_fifo_select(pipe, fifo, 1);
         if (ret < 0)
                 return 0;
@@ -584,6 +588,8 @@ static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done)
         /*
          * pipe enable to prepare packet receive
          */
+        usbhs_pipe_data_sequence(pipe, pkt->sequence);
+        pkt->sequence = -1; /* -1 sequence will be ignored */
 
         usbhs_pipe_enable(pipe);
         usbhsf_rx_irq_ctrl(pipe, 1);
@@ -641,6 +647,7 @@ static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done)
          * "Operation" - "FIFO Buffer Memory" - "FIFO Port Function"
          */
         if (0 == rcv_len) {
+                pkt->zero = 1;
                 usbhsf_fifo_clear(pipe, fifo);
                 goto usbhs_fifo_read_end;
         }
diff --git a/drivers/usb/renesas_usbhs/fifo.h b/drivers/usb/renesas_usbhs/fifo.h
index 32a7b246b28d..f68609c0f489 100644
--- a/drivers/usb/renesas_usbhs/fifo.h
+++ b/drivers/usb/renesas_usbhs/fifo.h
@@ -59,6 +59,7 @@ struct usbhs_pkt {
         int trans;
         int actual;
         int zero;
+        int sequence;
 };
 
 struct usbhs_pkt_handle {
@@ -95,7 +96,7 @@ void usbhs_pkt_init(struct usbhs_pkt *pkt);
 void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,
                     void (*done)(struct usbhs_priv *priv,
                                  struct usbhs_pkt *pkt),
-                    void *buf, int len, int zero);
+                    void *buf, int len, int zero, int sequence);
 struct usbhs_pkt *usbhs_pkt_pop(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt);
 void usbhs_pkt_start(struct usbhs_pipe *pipe);
 
diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index ad96a3896729..1b97fb12694b 100644
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -50,7 +50,9 @@ static int usbhsm_autonomy_irq_vbus(struct usbhs_priv *priv,
 {
         struct platform_device *pdev = usbhs_priv_to_pdev(priv);
 
-        return usbhsc_drvcllbck_notify_hotplug(pdev);
+        renesas_usbhs_call_notify_hotplug(pdev);
+
+        return 0;
 }
 
 void usbhs_mod_autonomy_mode(struct usbhs_priv *priv)
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
index 7f4e80338570..528691d5f3e2 100644
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -14,6 +14,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+#include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -44,7 +45,6 @@ struct usbhsg_uep {
 struct usbhsg_gpriv {
         struct usb_gadget        gadget;
         struct usbhs_mod         mod;
-        struct list_head         link;
 
         struct usbhsg_uep       *uep;
         int                      uep_size;
@@ -114,16 +114,6 @@ struct usbhsg_recip_handle {
 #define usbhsg_status_clr(gp, b) (gp->status &= ~b)
 #define usbhsg_status_has(gp, b) (gp->status &   b)
 
-/* controller */
-LIST_HEAD(the_controller_link);
-
-#define usbhsg_for_each_controller(gpriv)\
-        list_for_each_entry(gpriv, &the_controller_link, link)
-#define usbhsg_controller_register(gpriv)\
-        list_add_tail(&(gpriv)->link, &the_controller_link)
-#define usbhsg_controller_unregister(gpriv)\
-        list_del_init(&(gpriv)->link)
-
 /*
  *              queue push/pop
  */
@@ -164,7 +154,7 @@ static void usbhsg_queue_push(struct usbhsg_uep *uep,
         req->actual = 0;
         req->status = -EINPROGRESS;
         usbhs_pkt_push(pipe, pkt, usbhsg_queue_done,
-                       req->buf, req->length, req->zero);
+                       req->buf, req->length, req->zero, -1);
         usbhs_pkt_start(pipe);
 
         dev_dbg(dev, "pipe %d : queue push (%d)\n",
@@ -195,7 +185,7 @@ static int usbhsg_dma_map(struct device *dev,
         }
 
         if (dma_mapping_error(dev, pkt->dma)) {
-                dev_err(dev, "dma mapping error %x\n", pkt->dma);
+                dev_err(dev, "dma mapping error %llx\n", (u64)pkt->dma);
                 return -EIO;
         }
 
@@ -271,6 +261,8 @@ static int usbhsg_recip_handler_std_clear_endpoint(struct usbhs_priv *priv,
 
         usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
 
+        usbhs_pkt_start(pipe);
+
         return 0;
 }
 
@@ -282,6 +274,145 @@ struct usbhsg_recip_handle req_clear_feature = {
 };
 
 /*
+ *              USB_TYPE_STANDARD / set feature functions
+ */
+static int usbhsg_recip_handler_std_set_device(struct usbhs_priv *priv,
+                                                 struct usbhsg_uep *uep,
+                                                 struct usb_ctrlrequest *ctrl)
+{
+        switch (le16_to_cpu(ctrl->wValue)) {
+        case USB_DEVICE_TEST_MODE:
+                usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
+                udelay(100);
+                usbhs_sys_set_test_mode(priv, le16_to_cpu(ctrl->wIndex >> 8));
+                break;
+        default:
+                usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
+                break;
+        }
+
+        return 0;
+}
+
+static int usbhsg_recip_handler_std_set_endpoint(struct usbhs_priv *priv,
+                                                 struct usbhsg_uep *uep,
+                                                 struct usb_ctrlrequest *ctrl)
+{
+        struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
+
+        usbhs_pipe_stall(pipe);
+
+        usbhsg_recip_handler_std_control_done(priv, uep, ctrl);
+
+        return 0;
+}
+
+struct usbhsg_recip_handle req_set_feature = {
+        .name           = "set feature",
+        .device         = usbhsg_recip_handler_std_set_device,
+        .interface      = usbhsg_recip_handler_std_control_done,
+        .endpoint       = usbhsg_recip_handler_std_set_endpoint,
+};
+
+/*
+ *              USB_TYPE_STANDARD / get status functions
+ */
+static void __usbhsg_recip_send_complete(struct usb_ep *ep,
+                                         struct usb_request *req)
+{
+        struct usbhsg_request *ureq = usbhsg_req_to_ureq(req);
+
+        /* free allocated recip-buffer/usb_request */
+        kfree(ureq->pkt.buf);
+        usb_ep_free_request(ep, req);
+}
+
+static void __usbhsg_recip_send_status(struct usbhsg_gpriv *gpriv,
+                                       unsigned short status)
+{
+        struct usbhsg_uep *dcp = usbhsg_gpriv_to_dcp(gpriv);
+        struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(dcp);
+        struct device *dev = usbhsg_gpriv_to_dev(gpriv);
+        struct usb_request *req;
+        unsigned short *buf;
+
+        /* alloc new usb_request for recip */
+        req = usb_ep_alloc_request(&dcp->ep, GFP_ATOMIC);
+        if (!req) {
+                dev_err(dev, "recip request allocation fail\n");
+                return;
+        }
+
+        /* alloc recip data buffer */
+        buf = kmalloc(sizeof(*buf), GFP_ATOMIC);
+        if (!buf) {
+                usb_ep_free_request(&dcp->ep, req);
+                dev_err(dev, "recip data allocation fail\n");
+                return;
+        }
+
+        /* recip data is status */
+        *buf = cpu_to_le16(status);
+
+        /* allocated usb_request/buffer will be freed */
+        req->complete   = __usbhsg_recip_send_complete;
+        req->buf        = buf;
+        req->length     = sizeof(*buf);
+        req->zero       = 0;
+
+        /* push packet */
+        pipe->handler = &usbhs_fifo_pio_push_handler;
+        usbhsg_queue_push(dcp, usbhsg_req_to_ureq(req));
+}
+
+static int usbhsg_recip_handler_std_get_device(struct usbhs_priv *priv,
+                                               struct usbhsg_uep *uep,
+                                               struct usb_ctrlrequest *ctrl)
+{
+        struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
+        unsigned short status = 1 << USB_DEVICE_SELF_POWERED;
+
+        __usbhsg_recip_send_status(gpriv, status);
+
+        return 0;
+}
+
+static int usbhsg_recip_handler_std_get_interface(struct usbhs_priv *priv,
+                                                  struct usbhsg_uep *uep,
+                                                  struct usb_ctrlrequest *ctrl)
+{
+        struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
+        unsigned short status = 0;
+
+        __usbhsg_recip_send_status(gpriv, status);
+
+        return 0;
+}
+
+static int usbhsg_recip_handler_std_get_endpoint(struct usbhs_priv *priv,
+                                                 struct usbhsg_uep *uep,
+                                                 struct usb_ctrlrequest *ctrl)
+{
+        struct usbhsg_gpriv *gpriv = usbhsg_uep_to_gpriv(uep);
+        struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
+        unsigned short status = 0;
+
+        if (usbhs_pipe_is_stall(pipe))
+                status = 1 << USB_ENDPOINT_HALT;
+
+        __usbhsg_recip_send_status(gpriv, status);
+
+        return 0;
+}
+
+struct usbhsg_recip_handle req_get_status = {
+        .name           = "get status",
+        .device         = usbhsg_recip_handler_std_get_device,
+        .interface      = usbhsg_recip_handler_std_get_interface,
+        .endpoint       = usbhsg_recip_handler_std_get_endpoint,
+};
+
+/*
  *              USB_TYPE handler
  */
 static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
@@ -303,8 +434,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
         pipe = usbhsg_uep_to_pipe(uep);
         if (!pipe) {
                 dev_err(dev, "wrong recip request\n");
-                ret = -EINVAL;
-                goto usbhsg_recip_run_handle_end;
+                return -EINVAL;
         }
 
         switch (recip) {
@@ -327,20 +457,10 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
         }
 
         if (func) {
-                unsigned long flags;
-
                 dev_dbg(dev, "%s (pipe %d :%s)\n", handler->name, nth, msg);
-
-                /********************  spin lock ********************/
-                usbhs_lock(priv, flags);
                 ret = func(priv, uep, ctrl);
-                usbhs_unlock(priv, flags);
-                /********************  spin unlock ******************/
         }
 
-usbhsg_recip_run_handle_end:
-        usbhs_pkt_start(pipe);
-
         return ret;
 }
 
@@ -412,6 +532,12 @@ static int usbhsg_irq_ctrl_stage(struct usbhs_priv *priv,
                 case USB_REQ_CLEAR_FEATURE:
                         recip_handler = &req_clear_feature;
                         break;
+                case USB_REQ_SET_FEATURE:
+                        recip_handler = &req_set_feature;
+                        break;
+                case USB_REQ_GET_STATUS:
+                        recip_handler = &req_get_status;
+                        break;
                 }
         }
 
@@ -439,14 +565,16 @@ static int usbhsg_pipe_disable(struct usbhsg_uep *uep)
         struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);
         struct usbhs_pkt *pkt;
 
-        usbhs_pipe_disable(pipe);
-
         while (1) {
                 pkt = usbhs_pkt_pop(pipe, NULL);
                 if (!pkt)
                         break;
+
+                usbhsg_queue_pop(uep, usbhsg_pkt_to_ureq(pkt), -ECONNRESET);
         }
 
+        usbhs_pipe_disable(pipe);
+
         return 0;
 }
 
@@ -681,9 +809,7 @@ static int usbhsg_try_start(struct usbhs_priv *priv, u32 status)
          * - function
          * - usb module
          */
-        usbhs_sys_hispeed_ctrl(priv, 1);
         usbhs_sys_function_ctrl(priv, 1);
-        usbhs_sys_usb_ctrl(priv, 1);
 
         /*
          * enable irq callback
@@ -731,9 +857,8 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
         gpriv->gadget.speed = USB_SPEED_UNKNOWN;
 
         /* disable sys */
-        usbhs_sys_hispeed_ctrl(priv, 0);
+        usbhs_sys_set_test_mode(priv, 0);
         usbhs_sys_function_ctrl(priv, 0);
-        usbhs_sys_usb_ctrl(priv, 0);
 
         usbhsg_pipe_disable(dcp);
 
@@ -755,7 +880,7 @@ static int usbhsg_gadget_start(struct usb_gadget *gadget,
 
         if (!driver             ||
             !driver->setup      ||
-            driver->speed < USB_SPEED_FULL)
+            driver->max_speed < USB_SPEED_FULL)
                 return -EINVAL;
 
         /* first hook up the driver ... */
@@ -866,7 +991,7 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
         gpriv->gadget.dev.parent        = dev;
         gpriv->gadget.name              = "renesas_usbhs_udc";
         gpriv->gadget.ops               = &usbhsg_gadget_ops;
-        gpriv->gadget.is_dualspeed      = 1;
+        gpriv->gadget.max_speed         = USB_SPEED_HIGH;
         ret = device_register(&gpriv->gadget.dev);
         if (ret < 0)
                 goto err_add_udc;
@@ -896,8 +1021,6 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
                 }
         }
 
-        usbhsg_controller_register(gpriv);
-
         ret = usb_add_gadget_udc(dev, &gpriv->gadget);
         if (ret)
                 goto err_register;
@@ -926,8 +1049,6 @@ void usbhs_mod_gadget_remove(struct usbhs_priv *priv)
 
         device_unregister(&gpriv->gadget.dev);
 
-        usbhsg_controller_unregister(gpriv);
-
         kfree(gpriv->uep);
         kfree(gpriv);
 }
diff --git a/drivers/usb/renesas_usbhs/mod_host.c b/drivers/usb/renesas_usbhs/mod_host.c
index 7955de589951..1834cf50888c 100644
--- a/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@ -45,36 +45,34 @@
  *
  * +--------+                                   pipes are reused for each uep.
  * | udev 1 |-+- [uep 0 (dcp) ] --+             pipe will be switched when
- * +--------+ |                   |             target device was changed
+ * +--------+ |                   |             other device requested
  *            +- [uep 1 (bulk)] --|---+            +--------------+
  *            |                   +--------------> | pipe0 (dcp)  |
- *            +- [uep 2 (bulk)] --|---|---+        +--------------+
- *                                |   |   |        | pipe1 (isoc) |
- * +--------+                     |   |   |        +--------------+
- * | udev 2 |-+- [uep 0 (dcp) ] --+   +-- |------> | pipe2 (bulk) |
- * +--------+ |                   |   |   |        +--------------+
- *            +- [uep 1 (int) ] --|-+ |   +------> | pipe3 (bulk) |
- *                                | | |   |        +--------------+
- * +--------+                     | +-|---|------> | pipe4 (int)  |
- * | udev 3 |-+- [uep 0 (dcp) ] --+   |   |        +--------------+
- * +--------+ |                       |   |        | ....         |
- *            +- [uep 1 (bulk)] ------+   |        | ....         |
+ *            +- [uep 2 (bulk)] -@    |            +--------------+
+ *                                    |            | pipe1 (isoc) |
+ * +--------+                         |            +--------------+
+ * | udev 2 |-+- [uep 0 (dcp) ] -@    +----------> | pipe2 (bulk) |
+ * +--------+ |                                    +--------------+
+ *            +- [uep 1 (int) ] ----+     +------> | pipe3 (bulk) |
+ *                                  |     |        +--------------+
+ * +--------+                       +-----|------> | pipe4 (int)  |
+ * | udev 3 |-+- [uep 0 (dcp) ] -@        |        +--------------+
+ * +--------+ |                           |        | ....         |
+ *            +- [uep 1 (bulk)] -@        |        | ....         |
  *            |                           |
  *            +- [uep 2 (bulk)]-----------+
+ *
+ * @ :  uep requested free pipe, but all have been used.
+ *      now it is waiting for free pipe
  */
 
 
 /*
  *              struct
  */
-struct usbhsh_pipe_info {
-        unsigned int            usr_cnt; /* see usbhsh_endpoint_alloc() */
-};
-
 struct usbhsh_request {
         struct urb              *urb;
         struct usbhs_pkt        pkt;
-        struct list_head        ureq_link; /* see hpriv :: ureq_link_xxx */
 };
 
 struct usbhsh_device {
@@ -83,11 +81,10 @@ struct usbhsh_device {
 };
 
 struct usbhsh_ep {
-        struct usbhs_pipe       *pipe;
+        struct usbhs_pipe       *pipe;   /* attached pipe */
         struct usbhsh_device    *udev;   /* attached udev */
+        struct usb_host_endpoint *ep;
         struct list_head        ep_list; /* list to usbhsh_device */
-
-        int maxp;
 };
 
 #define USBHSH_DEVICE_MAX       10 /* see DEVADDn / DCPMAXP / PIPEMAXP */
@@ -98,16 +95,9 @@ struct usbhsh_hpriv {
 
         struct usbhsh_device    udev[USBHSH_DEVICE_MAX];
 
-        struct usbhsh_pipe_info *pipe_info;
-        int                      pipe_size;
-
         u32     port_stat;      /* USB_PORT_STAT_xxx */
 
         struct completion       setup_ack_done;
-
-        /* see usbhsh_req_alloc/free */
-        struct list_head        ureq_link_active;
-        struct list_head        ureq_link_free;
 };
 
 
@@ -119,17 +109,6 @@ static const char usbhsh_hcd_name[] = "renesas_usbhs host";
 #define usbhsh_priv_to_hpriv(priv) \
         container_of(usbhs_mod_get(priv, USBHS_HOST), struct usbhsh_hpriv, mod)
 
-#define __usbhsh_for_each_hpipe(start, pos, h, i)       \
-        for (i = start, pos = (h)->hpipe + i;           \
-             i < (h)->hpipe_size;                       \
-             i++, pos = (h)->hpipe + i)
-
-#define usbhsh_for_each_hpipe(pos, hpriv, i)    \
-        __usbhsh_for_each_hpipe(1, pos, hpriv, i)
-
-#define usbhsh_for_each_hpipe_with_dcp(pos, hpriv, i)   \
-        __usbhsh_for_each_hpipe(0, pos, hpriv, i)
-
 #define __usbhsh_for_each_udev(start, pos, h, i)        \
         for (i = start, pos = (h)->udev + i;            \
              i < USBHSH_DEVICE_MAX;                     \
@@ -152,15 +131,20 @@ static const char usbhsh_hcd_name[] = "renesas_usbhs host";
 #define usbhsh_ep_to_uep(u)     ((u)->hcpriv)
 #define usbhsh_uep_to_pipe(u)   ((u)->pipe)
 #define usbhsh_uep_to_udev(u)   ((u)->udev)
+#define usbhsh_uep_to_ep(u)     ((u)->ep)
+
 #define usbhsh_urb_to_ureq(u)   ((u)->hcpriv)
 #define usbhsh_urb_to_usbv(u)   ((u)->dev)
 
 #define usbhsh_usbv_to_udev(d)  dev_get_drvdata(&(d)->dev)
 
 #define usbhsh_udev_to_usbv(h)  ((h)->usbv)
+#define usbhsh_udev_is_used(h)  usbhsh_udev_to_usbv(h)
 
-#define usbhsh_pipe_info(p)     ((p)->mod_private)
+#define usbhsh_pipe_to_uep(p)   ((p)->mod_private)
 
+#define usbhsh_device_parent(d)         (usbhsh_usbv_to_udev((d)->usbv->parent))
+#define usbhsh_device_hubport(d)        ((d)->usbv->portnum)
 #define usbhsh_device_number(h, d)      ((int)((d) - (h)->udev))
 #define usbhsh_device_nth(h, d)         ((h)->udev + d)
 #define usbhsh_device0(h)               usbhsh_device_nth(h, 0)
@@ -170,38 +154,13 @@ static const char usbhsh_hcd_name[] = "renesas_usbhs host";
 #define usbhsh_port_stat_clear(h, s)    ((h)->port_stat &= ~(s))
 #define usbhsh_port_stat_get(h)         ((h)->port_stat)
 
-#define usbhsh_pkt_to_req(p)    \
+#define usbhsh_pkt_to_ureq(p)   \
         container_of((void *)p, struct usbhsh_request, pkt)
 
 /*
  *              req alloc/free
  */
-static void usbhsh_req_list_init(struct usbhsh_hpriv *hpriv)
-{
-        INIT_LIST_HEAD(&hpriv->ureq_link_active);
-        INIT_LIST_HEAD(&hpriv->ureq_link_free);
-}
-
-static void usbhsh_req_list_quit(struct usbhsh_hpriv *hpriv)
-{
-        struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
-        struct device *dev = usbhsh_hcd_to_dev(hcd);
-        struct usbhsh_request *ureq, *next;
-
-        /* kfree all active ureq */
-        list_for_each_entry_safe(ureq, next,
-                                 &hpriv->ureq_link_active,
-                                 ureq_link) {
-                dev_err(dev, "active ureq (%p) is force freed\n", ureq);
-                kfree(ureq);
-        }
-
-        /* kfree all free ureq */
-        list_for_each_entry_safe(ureq, next, &hpriv->ureq_link_free, ureq_link)
-                kfree(ureq);
-}
-
-static struct usbhsh_request *usbhsh_req_alloc(struct usbhsh_hpriv *hpriv,
+static struct usbhsh_request *usbhsh_ureq_alloc(struct usbhsh_hpriv *hpriv,
                                                struct urb *urb,
                                                gfp_t mem_flags)
 {
@@ -209,270 +168,460 @@ static struct usbhsh_request *usbhsh_req_alloc(struct usbhsh_hpriv *hpriv,
         struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
         struct device *dev = usbhs_priv_to_dev(priv);
 
-        if (list_empty(&hpriv->ureq_link_free)) {
-                /*
-                 * create new one if there is no free ureq
-                 */
-                ureq = kzalloc(sizeof(struct usbhsh_request), mem_flags);
-                if (ureq)
-                        INIT_LIST_HEAD(&ureq->ureq_link);
-        } else {
-                /*
-                 * reuse "free" ureq if exist
-                 */
-                ureq = list_entry(hpriv->ureq_link_free.next,
-                                  struct usbhsh_request,
-                                  ureq_link);
-                if (ureq)
-                        list_del_init(&ureq->ureq_link);
-        }
-
+        ureq = kzalloc(sizeof(struct usbhsh_request), mem_flags);
         if (!ureq) {
                 dev_err(dev, "ureq alloc fail\n");
                 return NULL;
         }
 
         usbhs_pkt_init(&ureq->pkt);
-
-        /*
-         * push it to "active" list
-         */
-        list_add_tail(&ureq->ureq_link, &hpriv->ureq_link_active);
         ureq->urb = urb;
+        usbhsh_urb_to_ureq(urb) = ureq;
 
         return ureq;
 }
 
-static void usbhsh_req_free(struct usbhsh_hpriv *hpriv,
+static void usbhsh_ureq_free(struct usbhsh_hpriv *hpriv,
                             struct usbhsh_request *ureq)
 {
-        struct usbhs_pkt *pkt = &ureq->pkt;
+        usbhsh_urb_to_ureq(ureq->urb) = NULL;
+        ureq->urb = NULL;
 
-        usbhs_pkt_init(pkt);
+        kfree(ureq);
+}
 
+/*
+ *              status
+ */
+static int usbhsh_is_running(struct usbhsh_hpriv *hpriv)
+{
         /*
-         * removed from "active" list,
-         * and push it to "free" list
+         * we can decide some device is attached or not
+         * by checking mod.irq_attch
+         * see
+         *      usbhsh_irq_attch()
+         *      usbhsh_irq_dtch()
          */
-        ureq->urb = NULL;
-        list_del_init(&ureq->ureq_link);
-        list_add_tail(&ureq->ureq_link, &hpriv->ureq_link_free);
+        return (hpriv->mod.irq_attch == NULL);
 }
 
 /*
- *              device control
+ *              pipe control
  */
-
-static int usbhsh_device_has_endpoint(struct usbhsh_device *udev)
+static void usbhsh_endpoint_sequence_save(struct usbhsh_hpriv *hpriv,
+                                          struct urb *urb,
+                                          struct usbhs_pkt *pkt)
 {
-        return !list_empty(&udev->ep_list_head);
-}
+        int len = urb->actual_length;
+        int maxp = usb_endpoint_maxp(&urb->ep->desc);
+        int t = 0;
 
-static struct usbhsh_device *usbhsh_device_alloc(struct usbhsh_hpriv *hpriv,
-                                                 struct urb *urb)
-{
-        struct usbhsh_device *udev = NULL;
-        struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
-        struct device *dev = usbhsh_hcd_to_dev(hcd);
-        struct usb_device *usbv = usbhsh_urb_to_usbv(urb);
-        struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
-        int i;
+        /* DCP is out of sequence control */
+        if (usb_pipecontrol(urb->pipe))
+                return;
 
         /*
-         * device 0
+         * renesas_usbhs pipe has a limitation in a number.
+         * So, driver should re-use the limited pipe for each device/endpoint.
+         * DATA0/1 sequence should be saved for it.
+         * see [image of mod_host]
+         *     [HARDWARE LIMITATION]
          */
-        if (0 == usb_pipedevice(urb->pipe)) {
-                udev = usbhsh_device0(hpriv);
-                goto usbhsh_device_find;
-        }
 
         /*
-         * find unused device
+         * next sequence depends on actual_length
+         *
+         * ex) actual_length = 1147, maxp = 512
+         * data0 : 512
+         * data1 : 512
+         * data0 : 123
+         * data1 is the next sequence
          */
-        usbhsh_for_each_udev(udev, hpriv, i) {
-                if (usbhsh_udev_to_usbv(udev))
-                        continue;
-                goto usbhsh_device_find;
+        t = len / maxp;
+        if (len % maxp)
+                t++;
+        if (pkt->zero)
+                t++;
+        t %= 2;
+
+        if (t)
+                usb_dotoggle(urb->dev,
+                             usb_pipeendpoint(urb->pipe),
+                             usb_pipeout(urb->pipe));
+}
+
+static struct usbhsh_device *usbhsh_device_get(struct usbhsh_hpriv *hpriv,
+                                               struct urb *urb);
+
+static int usbhsh_pipe_attach(struct usbhsh_hpriv *hpriv,
+                              struct urb *urb)
+{
+        struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
+        struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep);
+        struct usbhsh_device *udev = usbhsh_device_get(hpriv, urb);
+        struct usbhs_pipe *pipe;
+        struct usb_endpoint_descriptor *desc = &urb->ep->desc;
+        struct device *dev = usbhs_priv_to_dev(priv);
+        unsigned long flags;
+        int dir_in_req = !!usb_pipein(urb->pipe);
+        int is_dcp = usb_endpoint_xfer_control(desc);
+        int i, dir_in;
+        int ret = -EBUSY;
+
+        /********************  spin lock ********************/
+        usbhs_lock(priv, flags);
+
+        if (unlikely(usbhsh_uep_to_pipe(uep))) {
+                dev_err(dev, "uep already has pipe\n");
+                goto usbhsh_pipe_attach_done;
         }
 
-        dev_err(dev, "no free usbhsh_device\n");
+        usbhs_for_each_pipe_with_dcp(pipe, priv, i) {
 
-        return NULL;
+                /* check pipe type */
+                if (!usbhs_pipe_type_is(pipe, usb_endpoint_type(desc)))
+                        continue;
 
-usbhsh_device_find:
-        if (usbhsh_device_has_endpoint(udev))
-                dev_warn(dev, "udev have old endpoint\n");
+                /* check pipe direction if normal pipe */
+                if (!is_dcp) {
+                        dir_in = !!usbhs_pipe_is_dir_in(pipe);
+                        if (0 != (dir_in - dir_in_req))
+                                continue;
+                }
 
-        /* uep will be attached */
-        INIT_LIST_HEAD(&udev->ep_list_head);
+                /* check pipe is free */
+                if (usbhsh_pipe_to_uep(pipe))
+                        continue;
 
-        /*
-         * usbhsh_usbv_to_udev()
-         * usbhsh_udev_to_usbv()
-         * will be enable
-         */
-        dev_set_drvdata(&usbv->dev, udev);
-        udev->usbv = usbv;
+                /*
+                 * attach pipe to uep
+                 *
+                 * usbhs_pipe_config_update() should be called after
+                 * usbhs_set_device_config()
+                 * see
+                 *  DCPMAXP/PIPEMAXP
+                 */
+                usbhsh_uep_to_pipe(uep)         = pipe;
+                usbhsh_pipe_to_uep(pipe)        = uep;
 
-        /* set device config */
-        usbhs_set_device_speed(priv,
-                               usbhsh_device_number(hpriv, udev),
-                               usbhsh_device_number(hpriv, udev),
-                               0, /* FIXME no parent */
-                               usbv->speed);
+                usbhs_pipe_config_update(pipe,
+                                         usbhsh_device_number(hpriv, udev),
+                                         usb_endpoint_num(desc),
+                                         usb_endpoint_maxp(desc));
 
-        dev_dbg(dev, "%s [%d](%p)\n", __func__,
-                usbhsh_device_number(hpriv, udev), udev);
+                dev_dbg(dev, "%s [%d-%d(%s:%s)]\n", __func__,
+                        usbhsh_device_number(hpriv, udev),
+                        usb_endpoint_num(desc),
+                        usbhs_pipe_name(pipe),
+                        dir_in_req ? "in" : "out");
 
-        return udev;
+                ret = 0;
+                break;
+        }
+
+usbhsh_pipe_attach_done:
+        usbhs_unlock(priv, flags);
+        /********************  spin unlock ******************/
+
+        return ret;
 }
 
-static void usbhsh_device_free(struct usbhsh_hpriv *hpriv,
-                               struct usbhsh_device *udev)
+static void usbhsh_pipe_detach(struct usbhsh_hpriv *hpriv,
+                               struct usbhsh_ep *uep)
 {
-        struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
-        struct device *dev = usbhsh_hcd_to_dev(hcd);
-        struct usb_device *usbv = usbhsh_udev_to_usbv(udev);
+        struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
+        struct usbhs_pipe *pipe;
+        struct device *dev = usbhs_priv_to_dev(priv);
+        unsigned long flags;
 
-        dev_dbg(dev, "%s [%d](%p)\n", __func__,
-                usbhsh_device_number(hpriv, udev), udev);
+        /********************  spin lock ********************/
+        usbhs_lock(priv, flags);
 
-        if (usbhsh_device_has_endpoint(udev))
-                dev_warn(dev, "udev still have endpoint\n");
+        pipe = usbhsh_uep_to_pipe(uep);
 
-        /*
-         * usbhsh_usbv_to_udev()
-         * usbhsh_udev_to_usbv()
-         * will be disable
-         */
-        dev_set_drvdata(&usbv->dev, NULL);
-        udev->usbv = NULL;
+        if (unlikely(!pipe)) {
+                dev_err(dev, "uep doens't have pipe\n");
+        } else {
+                struct usb_host_endpoint *ep = usbhsh_uep_to_ep(uep);
+                struct usbhsh_device *udev = usbhsh_uep_to_udev(uep);
+
+                /* detach pipe from uep */
+                usbhsh_uep_to_pipe(uep)         = NULL;
+                usbhsh_pipe_to_uep(pipe)        = NULL;
+
+                dev_dbg(dev, "%s [%d-%d(%s)]\n", __func__,
+                        usbhsh_device_number(hpriv, udev),
+                        usb_endpoint_num(&ep->desc),
+                        usbhs_pipe_name(pipe));
+        }
+
+        usbhs_unlock(priv, flags);
+        /********************  spin unlock ******************/
 }
 
 /*
- *              end-point control
+ *              endpoint control
  */
-struct usbhsh_ep *usbhsh_endpoint_alloc(struct usbhsh_hpriv *hpriv,
-                                        struct usbhsh_device *udev,
-                                        struct usb_host_endpoint *ep,
-                                        int dir_in_req,
-                                        gfp_t mem_flags)
+static int usbhsh_endpoint_attach(struct usbhsh_hpriv *hpriv,
+                                  struct urb *urb,
+                                  gfp_t mem_flags)
 {
         struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
-        struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
+        struct usbhsh_device *udev = usbhsh_device_get(hpriv, urb);
+        struct usb_host_endpoint *ep = urb->ep;
         struct usbhsh_ep *uep;
-        struct usbhsh_pipe_info *info;
-        struct usbhs_pipe *pipe, *best_pipe;
-        struct device *dev = usbhsh_hcd_to_dev(hcd);
+        struct device *dev = usbhs_priv_to_dev(priv);
         struct usb_endpoint_descriptor *desc = &ep->desc;
-        int type, i, dir_in;
-        unsigned int min_usr;
-
-        dir_in_req = !!dir_in_req;
+        unsigned long flags;
 
         uep = kzalloc(sizeof(struct usbhsh_ep), mem_flags);
         if (!uep) {
                 dev_err(dev, "usbhsh_ep alloc fail\n");
-                return NULL;
+                return -ENOMEM;
         }
 
-        if (usb_endpoint_xfer_control(desc)) {
-                best_pipe = usbhsh_hpriv_to_dcp(hpriv);
-                goto usbhsh_endpoint_alloc_find_pipe;
+        /********************  spin lock ********************/
+        usbhs_lock(priv, flags);
+
+        /*
+         * init endpoint
+         */
+        INIT_LIST_HEAD(&uep->ep_list);
+        list_add_tail(&uep->ep_list, &udev->ep_list_head);
+
+        usbhsh_uep_to_udev(uep) = udev;
+        usbhsh_uep_to_ep(uep)   = ep;
+        usbhsh_ep_to_uep(ep)    = uep;
+
+        usbhs_unlock(priv, flags);
+        /********************  spin unlock ******************/
+
+        dev_dbg(dev, "%s [%d-%d]\n", __func__,
+                usbhsh_device_number(hpriv, udev),
+                usb_endpoint_num(desc));
+
+        return 0;
+}
+
+static void usbhsh_endpoint_detach(struct usbhsh_hpriv *hpriv,
+                                   struct usb_host_endpoint *ep)
+{
+        struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
+        struct device *dev = usbhs_priv_to_dev(priv);
+        struct usbhsh_ep *uep = usbhsh_ep_to_uep(ep);
+        unsigned long flags;
+
+        if (!uep)
+                return;
+
+        dev_dbg(dev, "%s [%d-%d]\n", __func__,
+                usbhsh_device_number(hpriv, usbhsh_uep_to_udev(uep)),
+                usb_endpoint_num(&ep->desc));
+
+        if (usbhsh_uep_to_pipe(uep))
+                usbhsh_pipe_detach(hpriv, uep);
+
+        /********************  spin lock ********************/
+        usbhs_lock(priv, flags);
+
+        /* remove this endpoint from udev */
+        list_del_init(&uep->ep_list);
+
+        usbhsh_uep_to_udev(uep) = NULL;
+        usbhsh_uep_to_ep(uep)   = NULL;
+        usbhsh_ep_to_uep(ep)    = NULL;
+
+        usbhs_unlock(priv, flags);
+        /********************  spin unlock ******************/
+
+        kfree(uep);
+}
+
+static void usbhsh_endpoint_detach_all(struct usbhsh_hpriv *hpriv,
+                                       struct usbhsh_device *udev)
+{
+        struct usbhsh_ep *uep, *next;
+
+        list_for_each_entry_safe(uep, next, &udev->ep_list_head, ep_list)
+                usbhsh_endpoint_detach(hpriv, usbhsh_uep_to_ep(uep));
+}
+
+/*
+ *              device control
+ */
+static int usbhsh_connected_to_rhdev(struct usb_hcd *hcd,
+                                     struct usbhsh_device *udev)
+{
+        struct usb_device *usbv = usbhsh_udev_to_usbv(udev);
+
+        return hcd->self.root_hub == usbv->parent;
+}
+
+static int usbhsh_device_has_endpoint(struct usbhsh_device *udev)
+{
+        return !list_empty(&udev->ep_list_head);
+}
+
+static struct usbhsh_device *usbhsh_device_get(struct usbhsh_hpriv *hpriv,
+                                               struct urb *urb)
+{
+        struct usb_device *usbv = usbhsh_urb_to_usbv(urb);
+        struct usbhsh_device *udev = usbhsh_usbv_to_udev(usbv);
+
+        /* usbhsh_device_attach() is still not called */
+        if (!udev)
+                return NULL;
+
+        /* if it is device0, return it */
+        if (0 == usb_pipedevice(urb->pipe))
+                return usbhsh_device0(hpriv);
+
+        /* return attached device */
+        return udev;
+}
+
+static struct usbhsh_device *usbhsh_device_attach(struct usbhsh_hpriv *hpriv,
+                                                 struct urb *urb)
+{
+        struct usbhsh_device *udev = NULL;
+        struct usbhsh_device *udev0 = usbhsh_device0(hpriv);
+        struct usbhsh_device *pos;
+        struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
+        struct device *dev = usbhsh_hcd_to_dev(hcd);
+        struct usb_device *usbv = usbhsh_urb_to_usbv(urb);
+        struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
+        unsigned long flags;
+        u16 upphub, hubport;
+        int i;
+
+        /*
+         * This function should be called only while urb is pointing to device0.
+         * It will attach unused usbhsh_device to urb (usbv),
+         * and initialize device0.
+         * You can use usbhsh_device_get() to get "current" udev,
+         * and usbhsh_usbv_to_udev() is for "attached" udev.
+         */
+        if (0 != usb_pipedevice(urb->pipe)) {
+                dev_err(dev, "%s fail: urb isn't pointing device0\n", __func__);
+                return NULL;
         }
 
+        /********************  spin lock ********************/
+        usbhs_lock(priv, flags);
+
         /*
-         * find best pipe for endpoint
-         * see
-         *      HARDWARE LIMITATION
+         * find unused device
          */
-        type = usb_endpoint_type(desc);
-        min_usr = ~0;
-        best_pipe = NULL;
-        usbhs_for_each_pipe(pipe, priv, i) {
-                if (!usbhs_pipe_type_is(pipe, type))
+        usbhsh_for_each_udev(pos, hpriv, i) {
+                if (usbhsh_udev_is_used(pos))
                         continue;
+                udev = pos;
+                break;
+        }
 
-                dir_in = !!usbhs_pipe_is_dir_in(pipe);
-                if (0 != (dir_in - dir_in_req))
-                        continue;
+        if (udev) {
+                /*
+                 * usbhsh_usbv_to_udev()
+                 * usbhsh_udev_to_usbv()
+                 * will be enable
+                 */
+                dev_set_drvdata(&usbv->dev, udev);
+                udev->usbv = usbv;
+        }
 
-                info = usbhsh_pipe_info(pipe);
+        usbhs_unlock(priv, flags);
+        /********************  spin unlock ******************/
 
-                if (min_usr > info->usr_cnt) {
-                        min_usr         = info->usr_cnt;
-                        best_pipe       = pipe;
-                }
+        if (!udev) {
+                dev_err(dev, "no free usbhsh_device\n");
+                return NULL;
         }
 
-        if (unlikely(!best_pipe)) {
-                dev_err(dev, "couldn't find best pipe\n");
-                kfree(uep);
-                return NULL;
+        if (usbhsh_device_has_endpoint(udev)) {
+                dev_warn(dev, "udev have old endpoint\n");
+                usbhsh_endpoint_detach_all(hpriv, udev);
+        }
+
+        if (usbhsh_device_has_endpoint(udev0)) {
+                dev_warn(dev, "udev0 have old endpoint\n");
+                usbhsh_endpoint_detach_all(hpriv, udev0);
         }
-usbhsh_endpoint_alloc_find_pipe:
+
+        /* uep will be attached */
+        INIT_LIST_HEAD(&udev0->ep_list_head);
+        INIT_LIST_HEAD(&udev->ep_list_head);
+
         /*
-         * init uep
+         * set device0 config
          */
-        uep->pipe       = best_pipe;
-        uep->maxp       = usb_endpoint_maxp(desc);
-        usbhsh_uep_to_udev(uep) = udev;
-        usbhsh_ep_to_uep(ep)    = uep;
+        usbhs_set_device_config(priv,
+                                0, 0, 0, usbv->speed);
 
         /*
-         * update pipe user count
+         * set new device config
          */
-        info = usbhsh_pipe_info(best_pipe);
-        info->usr_cnt++;
+        upphub  = 0;
+        hubport = 0;
+        if (!usbhsh_connected_to_rhdev(hcd, udev)) {
+                /* if udev is not connected to rhdev, it means parent is Hub */
+                struct usbhsh_device *parent = usbhsh_device_parent(udev);
 
-        /* init this endpoint, and attach it to udev */
-        INIT_LIST_HEAD(&uep->ep_list);
-        list_add_tail(&uep->ep_list, &udev->ep_list_head);
+                upphub  = usbhsh_device_number(hpriv, parent);
+                hubport = usbhsh_device_hubport(udev);
 
-        /*
-         * usbhs_pipe_config_update() should be called after
-         * usbhs_device_config()
-         * see
-         *  DCPMAXP/PIPEMAXP
-         */
-        usbhs_pipe_sequence_data0(uep->pipe);
-        usbhs_pipe_config_update(uep->pipe,
-                                 usbhsh_device_number(hpriv, udev),
-                                 usb_endpoint_num(desc),
-                                 uep->maxp);
+                dev_dbg(dev, "%s connecte to Hub [%d:%d](%p)\n", __func__,
+                        upphub, hubport, parent);
+        }
 
-        dev_dbg(dev, "%s [%d-%s](%p)\n", __func__,
-                usbhsh_device_number(hpriv, udev),
-                usbhs_pipe_name(uep->pipe), uep);
+        usbhs_set_device_config(priv,
+                               usbhsh_device_number(hpriv, udev),
+                               upphub, hubport, usbv->speed);
 
-        return uep;
+        dev_dbg(dev, "%s [%d](%p)\n", __func__,
+                usbhsh_device_number(hpriv, udev), udev);
+
+        return udev;
 }
 
-void usbhsh_endpoint_free(struct usbhsh_hpriv *hpriv,
-                          struct usb_host_endpoint *ep)
+static void usbhsh_device_detach(struct usbhsh_hpriv *hpriv,
+                               struct usbhsh_device *udev)
 {
+        struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
         struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
-        struct device *dev = usbhs_priv_to_dev(priv);
-        struct usbhsh_ep *uep = usbhsh_ep_to_uep(ep);
-        struct usbhsh_pipe_info *info;
+        struct device *dev = usbhsh_hcd_to_dev(hcd);
+        struct usb_device *usbv = usbhsh_udev_to_usbv(udev);
+        unsigned long flags;
 
-        if (!uep)
-                return;
+        dev_dbg(dev, "%s [%d](%p)\n", __func__,
+                usbhsh_device_number(hpriv, udev), udev);
 
-        dev_dbg(dev, "%s [%d-%s](%p)\n", __func__,
-                usbhsh_device_number(hpriv, usbhsh_uep_to_udev(uep)),
-                usbhs_pipe_name(uep->pipe), uep);
+        if (usbhsh_device_has_endpoint(udev)) {
+                dev_warn(dev, "udev still have endpoint\n");
+                usbhsh_endpoint_detach_all(hpriv, udev);
+        }
 
-        info = usbhsh_pipe_info(uep->pipe);
-        info->usr_cnt--;
+        /*
+         * There is nothing to do if it is device0.
+         * see
+         *  usbhsh_device_attach()
+         *  usbhsh_device_get()
+         */
+        if (0 == usbhsh_device_number(hpriv, udev))
+                return;
 
-        /* remove this endpoint from udev */
-        list_del_init(&uep->ep_list);
+        /********************  spin lock ********************/
+        usbhs_lock(priv, flags);
 
-        usbhsh_uep_to_udev(uep) = NULL;
-        usbhsh_ep_to_uep(ep) = NULL;
+        /*
+         * usbhsh_usbv_to_udev()
+         * usbhsh_udev_to_usbv()
+         * will be disable
+         */
+        dev_set_drvdata(&usbv->dev, NULL);
+        udev->usbv = NULL;
 
-        kfree(uep);
+        usbhs_unlock(priv, flags);
+        /********************  spin unlock ******************/
 }
 
 /*
@@ -480,11 +629,12 @@ void usbhsh_endpoint_free(struct usbhsh_hpriv *hpriv,
  */
 static void usbhsh_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt)
 {
-        struct usbhsh_request *ureq = usbhsh_pkt_to_req(pkt);
+        struct usbhsh_request *ureq = usbhsh_pkt_to_ureq(pkt);
         struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
         struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
         struct urb *urb = ureq->urb;
         struct device *dev = usbhs_priv_to_dev(priv);
+        int status = 0;
 
         dev_dbg(dev, "%s\n", __func__);
 
@@ -493,29 +643,43 @@ static void usbhsh_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt)
                 return;
         }
 
+        if (!usbhsh_is_running(hpriv))
+                status = -ESHUTDOWN;
+
         urb->actual_length = pkt->actual;
-        usbhsh_req_free(hpriv, ureq);
-        usbhsh_urb_to_ureq(urb) = NULL;
+        usbhsh_ureq_free(hpriv, ureq);
+
+        usbhsh_endpoint_sequence_save(hpriv, urb, pkt);
+        usbhsh_pipe_detach(hpriv, usbhsh_ep_to_uep(urb->ep));
 
         usb_hcd_unlink_urb_from_ep(hcd, urb);
-        usb_hcd_giveback_urb(hcd, urb, 0);
+        usb_hcd_giveback_urb(hcd, urb, status);
 }
 
 static int usbhsh_queue_push(struct usb_hcd *hcd,
-                             struct usbhs_pipe *pipe,
-                             struct urb *urb)
+                             struct urb *urb,
+                             gfp_t mem_flags)
 {
-        struct usbhsh_request *ureq = usbhsh_urb_to_ureq(urb);
-        struct usbhs_pkt *pkt = &ureq->pkt;
+        struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd);
+        struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep);
+        struct usbhs_pipe *pipe = usbhsh_uep_to_pipe(uep);
         struct device *dev = usbhsh_hcd_to_dev(hcd);
+        struct usbhsh_request *ureq;
         void *buf;
-        int len;
+        int len, sequence;
 
         if (usb_pipeisoc(urb->pipe)) {
                 dev_err(dev, "pipe iso is not supported now\n");
                 return -EIO;
         }
 
+        /* this ureq will be freed on usbhsh_queue_done() */
+        ureq = usbhsh_ureq_alloc(hpriv, urb, mem_flags);
+        if (unlikely(!ureq)) {
+                dev_err(dev, "ureq alloc fail\n");
+                return -ENOMEM;
+        }
+
         if (usb_pipein(urb->pipe))
                 pipe->handler = &usbhs_fifo_pio_pop_handler;
         else
@@ -524,25 +688,59 @@ static int usbhsh_queue_push(struct usb_hcd *hcd,
         buf = (void *)(urb->transfer_buffer + urb->actual_length);
         len = urb->transfer_buffer_length - urb->actual_length;
 
+        sequence = usb_gettoggle(urb->dev,
+                                 usb_pipeendpoint(urb->pipe),
+                                 usb_pipeout(urb->pipe));
+
         dev_dbg(dev, "%s\n", __func__);
-        usbhs_pkt_push(pipe, pkt, usbhsh_queue_done,
-                       buf, len, (urb->transfer_flags & URB_ZERO_PACKET));
+        usbhs_pkt_push(pipe, &ureq->pkt, usbhsh_queue_done,
+                       buf, len, (urb->transfer_flags & URB_ZERO_PACKET),
+                       sequence);
+
         usbhs_pkt_start(pipe);
 
         return 0;
 }
 
+static void usbhsh_queue_force_pop(struct usbhs_priv *priv,
+                                   struct usbhs_pipe *pipe)
+{
+        struct usbhs_pkt *pkt;
+
+        while (1) {
+                pkt = usbhs_pkt_pop(pipe, NULL);
+                if (!pkt)
+                        break;
+
+                /*
+                 * if all packet are gone, usbhsh_endpoint_disable()
+                 * will be called.
+                 * then, attached device/endpoint/pipe will be detached
+                 */
+                usbhsh_queue_done(priv, pkt);
+        }
+}
+
+static void usbhsh_queue_force_pop_all(struct usbhs_priv *priv)
+{
+        struct usbhs_pipe *pos;
+        int i;
+
+        usbhs_for_each_pipe_with_dcp(pos, priv, i)
+                usbhsh_queue_force_pop(priv, pos);
+}
+
 /*
  *              DCP setup stage
  */
 static int usbhsh_is_request_address(struct urb *urb)
 {
-        struct usb_ctrlrequest *cmd;
+        struct usb_ctrlrequest *req;
 
-        cmd = (struct usb_ctrlrequest *)urb->setup_packet;
+        req = (struct usb_ctrlrequest *)urb->setup_packet;
 
-        if ((DeviceOutRequest    == cmd->bRequestType << 8) &&
-            (USB_REQ_SET_ADDRESS == cmd->bRequest))
+        if ((DeviceOutRequest    == req->bRequestType << 8) &&
+            (USB_REQ_SET_ADDRESS == req->bRequest))
                 return 1;
         else
                 return 0;
@@ -570,11 +768,15 @@ static void usbhsh_setup_stage_packet_push(struct usbhsh_hpriv *hpriv,
         /*
          * renesas_usbhs can not use original usb address.
          * see HARDWARE LIMITATION.
-         * modify usb address here.
+         * modify usb address here to use attached device.
+         * see usbhsh_device_attach()
          */
         if (usbhsh_is_request_address(urb)) {
-                /* FIXME */
-                req.wValue = 1;
+                struct usb_device *usbv = usbhsh_urb_to_usbv(urb);
+                struct usbhsh_device *udev = usbhsh_usbv_to_udev(usbv);
+
+                /* udev is a attached device */
+                req.wValue = usbhsh_device_number(hpriv, udev);
                 dev_dbg(dev, "create new address - %d\n", req.wValue);
         }
 
@@ -595,82 +797,80 @@ static void usbhsh_setup_stage_packet_push(struct usbhsh_hpriv *hpriv,
 static void usbhsh_data_stage_packet_done(struct usbhs_priv *priv,
                                           struct usbhs_pkt *pkt)
 {
-        struct usbhsh_request *ureq = usbhsh_pkt_to_req(pkt);
+        struct usbhsh_request *ureq = usbhsh_pkt_to_ureq(pkt);
         struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
-        struct urb *urb = ureq->urb;
 
         /* this ureq was connected to urb when usbhsh_urb_enqueue()  */
 
-        usbhsh_req_free(hpriv, ureq);
-        usbhsh_urb_to_ureq(urb) = NULL;
+        usbhsh_ureq_free(hpriv, ureq);
 }
 
-static void usbhsh_data_stage_packet_push(struct usbhsh_hpriv *hpriv,
-                                          struct urb *urb,
-                                          struct usbhs_pipe *pipe)
+static int usbhsh_data_stage_packet_push(struct usbhsh_hpriv *hpriv,
+                                         struct urb *urb,
+                                         struct usbhs_pipe *pipe,
+                                         gfp_t mem_flags)
+
 {
         struct usbhsh_request *ureq;
-        struct usbhs_pkt *pkt;
 
-        /*
-         * FIXME
-         *
-         * data stage uses ureq which is connected to urb
-         * see usbhsh_urb_enqueue() :: alloc new request.
-         * it will be freed in usbhsh_data_stage_packet_done()
-         */
-        ureq    = usbhsh_urb_to_ureq(urb);
-        pkt     = &ureq->pkt;
+        /* this ureq will be freed on usbhsh_data_stage_packet_done() */
+        ureq = usbhsh_ureq_alloc(hpriv, urb, mem_flags);
+        if (unlikely(!ureq))
+                return -ENOMEM;
 
         if (usb_pipein(urb->pipe))
                 pipe->handler = &usbhs_dcp_data_stage_in_handler;
         else
                 pipe->handler = &usbhs_dcp_data_stage_out_handler;
 
-        usbhs_pkt_push(pipe, pkt,
+        usbhs_pkt_push(pipe, &ureq->pkt,
                        usbhsh_data_stage_packet_done,
                        urb->transfer_buffer,
                        urb->transfer_buffer_length,
-                       (urb->transfer_flags & URB_ZERO_PACKET));
+                       (urb->transfer_flags & URB_ZERO_PACKET),
+                       -1);
+
+        return 0;
 }
 
 /*
  *              DCP status stage
  */
-static void usbhsh_status_stage_packet_push(struct usbhsh_hpriv *hpriv,
+static int usbhsh_status_stage_packet_push(struct usbhsh_hpriv *hpriv,
                                             struct urb *urb,
-                                            struct usbhs_pipe *pipe)
+                                            struct usbhs_pipe *pipe,
+                                            gfp_t mem_flags)
 {
         struct usbhsh_request *ureq;
-        struct usbhs_pkt *pkt;
 
-        /*
-         * FIXME
-         *
-         * status stage uses allocated ureq.
-         * it will be freed on usbhsh_queue_done()
-         */
-        ureq    = usbhsh_req_alloc(hpriv, urb, GFP_KERNEL);
-        pkt     = &ureq->pkt;
+        /* This ureq will be freed on usbhsh_queue_done() */
+        ureq = usbhsh_ureq_alloc(hpriv, urb, mem_flags);
+        if (unlikely(!ureq))
+                return -ENOMEM;
 
         if (usb_pipein(urb->pipe))
                 pipe->handler = &usbhs_dcp_status_stage_in_handler;
         else
                 pipe->handler = &usbhs_dcp_status_stage_out_handler;
 
-        usbhs_pkt_push(pipe, pkt,
+        usbhs_pkt_push(pipe, &ureq->pkt,
                        usbhsh_queue_done,
                        NULL,
                        urb->transfer_buffer_length,
-                       0);
+                       0, -1);
+
+        return 0;
 }
 
 static int usbhsh_dcp_queue_push(struct usb_hcd *hcd,
-                                 struct usbhsh_hpriv *hpriv,
-                                 struct usbhs_pipe *pipe,
-                                 struct urb *urb)
+                                 struct urb *urb,
+                                 gfp_t mflags)
 {
+        struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd);
+        struct usbhsh_ep *uep = usbhsh_ep_to_uep(urb->ep);
+        struct usbhs_pipe *pipe = usbhsh_uep_to_pipe(uep);
         struct device *dev = usbhsh_hcd_to_dev(hcd);
+        int ret;
 
         dev_dbg(dev, "%s\n", __func__);
 
@@ -686,13 +886,22 @@ static int usbhsh_dcp_queue_push(struct usb_hcd *hcd,
          *
          * It is pushed only when urb has buffer.
          */
-        if (urb->transfer_buffer_length)
-                usbhsh_data_stage_packet_push(hpriv, urb, pipe);
+        if (urb->transfer_buffer_length) {
+                ret = usbhsh_data_stage_packet_push(hpriv, urb, pipe, mflags);
+                if (ret < 0) {
+                        dev_err(dev, "data stage failed\n");
+                        return ret;
+                }
+        }
 
         /*
          * status stage
          */
-        usbhsh_status_stage_packet_push(hpriv, urb, pipe);
+        ret = usbhsh_status_stage_packet_push(hpriv, urb, pipe, mflags);
+        if (ret < 0) {
+                dev_err(dev, "status stage failed\n");
+                return ret;
+        }
 
         /*
          * start pushed packets
@@ -729,71 +938,82 @@ static int usbhsh_urb_enqueue(struct usb_hcd *hcd,
         struct usbhsh_hpriv *hpriv = usbhsh_hcd_to_hpriv(hcd);
         struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
         struct device *dev = usbhs_priv_to_dev(priv);
-        struct usb_device *usbv = usbhsh_urb_to_usbv(urb);
         struct usb_host_endpoint *ep = urb->ep;
-        struct usbhsh_request *ureq;
-        struct usbhsh_device *udev, *new_udev = NULL;
-        struct usbhs_pipe *pipe;
-        struct usbhsh_ep *uep;
+        struct usbhsh_device *new_udev = NULL;
         int is_dir_in = usb_pipein(urb->pipe);
-
+        int i;
         int ret;
 
         dev_dbg(dev, "%s (%s)\n", __func__, is_dir_in ? "in" : "out");
 
+        if (!usbhsh_is_running(hpriv)) {
+                ret = -EIO;
+                dev_err(dev, "host is not running\n");
+                goto usbhsh_urb_enqueue_error_not_linked;
+        }
+
         ret = usb_hcd_link_urb_to_ep(hcd, urb);
-        if (ret)
+        if (ret) {
+                dev_err(dev, "urb link failed\n");
                 goto usbhsh_urb_enqueue_error_not_linked;
+        }
 
         /*
-         * get udev
+         * attach udev if needed
+         * see [image of mod_host]
          */
-        udev = usbhsh_usbv_to_udev(usbv);
-        if (!udev) {
-                new_udev = usbhsh_device_alloc(hpriv, urb);
-                if (!new_udev)
+        if (!usbhsh_device_get(hpriv, urb)) {
+                new_udev = usbhsh_device_attach(hpriv, urb);
+                if (!new_udev) {
+                        ret = -EIO;
+                        dev_err(dev, "device attach failed\n");
                         goto usbhsh_urb_enqueue_error_not_linked;
-
-                udev = new_udev;
+                }
         }
 
         /*
-         * get uep
+         * attach endpoint if needed
+         * see [image of mod_host]
          */
-        uep = usbhsh_ep_to_uep(ep);
-        if (!uep) {
-                uep = usbhsh_endpoint_alloc(hpriv, udev, ep,
-                                            is_dir_in, mem_flags);
-                if (!uep)
+        if (!usbhsh_ep_to_uep(ep)) {
+                ret = usbhsh_endpoint_attach(hpriv, urb, mem_flags);
+                if (ret < 0) {
+                        dev_err(dev, "endpoint attach failed\n");
                         goto usbhsh_urb_enqueue_error_free_device;
+                }
         }
-        pipe = usbhsh_uep_to_pipe(uep);
 
         /*
-         * alloc new request
+         * attach pipe to endpoint
+         * see [image of mod_host]
          */
-        ureq = usbhsh_req_alloc(hpriv, urb, mem_flags);
-        if (unlikely(!ureq)) {
-                ret = -ENOMEM;
+        for (i = 0; i < 1024; i++) {
+                ret = usbhsh_pipe_attach(hpriv, urb);
+                if (ret < 0)
+                        msleep(100);
+                else
+                        break;
+        }
+        if (ret < 0) {
+                dev_err(dev, "pipe attach failed\n");
                 goto usbhsh_urb_enqueue_error_free_endpoint;
         }
-        usbhsh_urb_to_ureq(urb) = ureq;
 
         /*
          * push packet
          */
         if (usb_pipecontrol(urb->pipe))
-                usbhsh_dcp_queue_push(hcd, hpriv, pipe, urb);
+                ret = usbhsh_dcp_queue_push(hcd, urb, mem_flags);
         else
-                usbhsh_queue_push(hcd, pipe, urb);
+                ret = usbhsh_queue_push(hcd, urb, mem_flags);
 
-        return 0;
+        return ret;
 
 usbhsh_urb_enqueue_error_free_endpoint:
-        usbhsh_endpoint_free(hpriv, ep);
+        usbhsh_endpoint_detach(hpriv, ep);
 usbhsh_urb_enqueue_error_free_device:
         if (new_udev)
-                usbhsh_device_free(hpriv, new_udev);
+                usbhsh_device_detach(hpriv, new_udev);
 usbhsh_urb_enqueue_error_not_linked:
 
         dev_dbg(dev, "%s error\n", __func__);
@@ -807,8 +1027,11 @@ static int usbhsh_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
         struct usbhsh_request *ureq = usbhsh_urb_to_ureq(urb);
 
         if (ureq) {
-                usbhsh_req_free(hpriv, ureq);
-                usbhsh_urb_to_ureq(urb) = NULL;
+                struct usbhs_priv *priv = usbhsh_hpriv_to_priv(hpriv);
+                struct usbhs_pkt *pkt = &ureq->pkt;
+
+                usbhs_pkt_pop(pkt->pipe, pkt);
+                usbhsh_queue_done(priv, pkt);
         }
 
         return 0;
@@ -823,7 +1046,7 @@ static void usbhsh_endpoint_disable(struct usb_hcd *hcd,
 
         /*
          * this function might be called manytimes by same hcd/ep
-         * in-endpoitn == out-endpoint if ep == dcp.
+         * in-endpoint == out-endpoint if ep == dcp.
          */
         if (!uep)
                 return;
@@ -831,15 +1054,14 @@ static void usbhsh_endpoint_disable(struct usb_hcd *hcd,
         udev    = usbhsh_uep_to_udev(uep);
         hpriv   = usbhsh_hcd_to_hpriv(hcd);
 
-        usbhsh_endpoint_free(hpriv, ep);
-        ep->hcpriv = NULL;
+        usbhsh_endpoint_detach(hpriv, ep);
 
         /*
          * if there is no endpoint,
          * free device
          */
         if (!usbhsh_device_has_endpoint(udev))
-                usbhsh_device_free(hpriv, udev);
+                usbhsh_device_detach(hpriv, udev);
 }
 
 static int usbhsh_hub_status_data(struct usb_hcd *hcd, char *buf)
@@ -919,6 +1141,8 @@ static int __usbhsh_hub_port_feature(struct usbhsh_hpriv *hpriv,
                                        USB_PORT_STAT_HIGH_SPEED |
                                        USB_PORT_STAT_LOW_SPEED);
 
+                usbhsh_queue_force_pop_all(priv);
+
                 usbhs_bus_send_reset(priv);
                 msleep(20);
                 usbhs_bus_send_sof_enable(priv);
@@ -1082,6 +1306,20 @@ static int usbhsh_irq_attch(struct usbhs_priv *priv,
         usbhsh_port_stat_set(hpriv, USB_PORT_STAT_CONNECTION);
         usbhsh_port_stat_set(hpriv, USB_PORT_STAT_C_CONNECTION << 16);
 
+        /*
+         * attch interrupt might happen infinitely on some device
+         * (on self power USB hub ?)
+         * disable it here.
+         *
+         * usbhsh_is_running() becomes effective
+         * according to this process.
+         * see
+         *      usbhsh_is_running()
+         *      usbhsh_urb_enqueue()
+         */
+        hpriv->mod.irq_attch = NULL;
+        usbhs_irq_callback_update(priv, &hpriv->mod);
+
         return 0;
 }
 
@@ -1096,6 +1334,24 @@ static int usbhsh_irq_dtch(struct usbhs_priv *priv,
         usbhsh_port_stat_clear(hpriv, USB_PORT_STAT_CONNECTION);
         usbhsh_port_stat_set(hpriv, USB_PORT_STAT_C_CONNECTION << 16);
 
+        /*
+         * enable attch interrupt again
+         *
+         * usbhsh_is_running() becomes invalid
+         * according to this process.
+         * see
+         *      usbhsh_is_running()
+         *      usbhsh_urb_enqueue()
+         */
+        hpriv->mod.irq_attch = usbhsh_irq_attch;
+        usbhs_irq_callback_update(priv, &hpriv->mod);
+
+        /*
+         * usbhsh_queue_force_pop_all() should be called
+         * after usbhsh_is_running() becomes invalid.
+         */
+        usbhsh_queue_force_pop_all(priv);
+
         return 0;
 }
 
@@ -1131,7 +1387,6 @@ static int usbhsh_irq_setup_err(struct usbhs_priv *priv,
 static void usbhsh_pipe_init_for_host(struct usbhs_priv *priv)
 {
         struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
-        struct usbhsh_pipe_info *pipe_info = hpriv->pipe_info;
         struct usbhs_pipe *pipe;
         u32 *pipe_type = usbhs_get_dparam(priv, pipe_type);
         int pipe_size = usbhs_get_dparam(priv, pipe_size);
@@ -1140,7 +1395,6 @@ static void usbhsh_pipe_init_for_host(struct usbhs_priv *priv)
         /* init all pipe */
         old_type = USB_ENDPOINT_XFER_CONTROL;
         for (i = 0; i < pipe_size; i++) {
-                pipe_info[i].usr_cnt    = 0;
 
                 /*
                  * data "output" will be finished as soon as possible,
@@ -1174,7 +1428,7 @@ static void usbhsh_pipe_init_for_host(struct usbhs_priv *priv)
                                                  dir_in);
                 }
 
-                pipe->mod_private = pipe_info + i;
+                pipe->mod_private = NULL;
         }
 }
 
@@ -1205,9 +1459,7 @@ static int usbhsh_start(struct usbhs_priv *priv)
          * - host
          * - usb module
          */
-        usbhs_sys_hispeed_ctrl(priv, 1);
         usbhs_sys_host_ctrl(priv, 1);
-        usbhs_sys_usb_ctrl(priv, 1);
 
         /*
          * enable irq callback
@@ -1242,9 +1494,7 @@ static int usbhsh_stop(struct usbhs_priv *priv)
         usb_remove_hcd(hcd);
 
         /* disable sys */
-        usbhs_sys_hispeed_ctrl(priv, 0);
         usbhs_sys_host_ctrl(priv, 0);
-        usbhs_sys_usb_ctrl(priv, 0);
 
         dev_dbg(dev, "quit host\n");
 
@@ -1255,10 +1505,8 @@ int usbhs_mod_host_probe(struct usbhs_priv *priv)
 {
         struct usbhsh_hpriv *hpriv;
         struct usb_hcd *hcd;
-        struct usbhsh_pipe_info *pipe_info;
         struct usbhsh_device *udev;
         struct device *dev = usbhs_priv_to_dev(priv);
-        int pipe_size = usbhs_get_dparam(priv, pipe_size);
         int i;
 
         /* initialize hcd */
@@ -1269,12 +1517,6 @@ int usbhs_mod_host_probe(struct usbhs_priv *priv)
         }
         hcd->has_tt = 1; /* for low/full speed */
 
-        pipe_info = kzalloc(sizeof(*pipe_info) * pipe_size, GFP_KERNEL);
-        if (!pipe_info) {
-                dev_err(dev, "Could not allocate pipe_info\n");
-                goto usbhs_mod_host_probe_err;
-        }
-
         /*
          * CAUTION
          *
@@ -1294,9 +1536,6 @@ int usbhs_mod_host_probe(struct usbhs_priv *priv)
         hpriv->mod.name         = "host";
         hpriv->mod.start        = usbhsh_start;
         hpriv->mod.stop         = usbhsh_stop;
-        hpriv->pipe_info        = pipe_info;
-        hpriv->pipe_size        = pipe_size;
-        usbhsh_req_list_init(hpriv);
         usbhsh_port_stat_init(hpriv);
 
         /* init all device */
@@ -1308,11 +1547,6 @@ int usbhs_mod_host_probe(struct usbhs_priv *priv)
         dev_info(dev, "host probed\n");
 
         return 0;
-
-usbhs_mod_host_probe_err:
-        usb_put_hcd(hcd);
-
-        return -ENOMEM;
 }
 
 int usbhs_mod_host_remove(struct usbhs_priv *priv)
@@ -1320,8 +1554,6 @@ int usbhs_mod_host_remove(struct usbhs_priv *priv)
         struct usbhsh_hpriv *hpriv = usbhsh_priv_to_hpriv(priv);
         struct usb_hcd *hcd = usbhsh_hpriv_to_hcd(hpriv);
 
-        usbhsh_req_list_quit(hpriv);
-
         usb_put_hcd(hcd);
 
         return 0;
diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index c74389ce2177..feb06d6d2814 100644
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -257,6 +257,13 @@ void usbhs_pipe_stall(struct usbhs_pipe *pipe)
         }
 }
 
+int usbhs_pipe_is_stall(struct usbhs_pipe *pipe)
+{
+        u16 pid = usbhsp_pipectrl_get(pipe) & PID_MASK;
+
+        return (int)(pid == PID_STALL10 || pid == PID_STALL11);
+}
+
 /*
  *              pipe setup
  */
@@ -323,8 +330,7 @@ static u16 usbhsp_setup_pipecfg(struct usbhs_pipe *pipe,
         if (dir_in)
                 usbhsp_flags_set(pipe, IS_DIR_HOST);
 
-        if ((is_host  && !dir_in) ||
-            (!is_host && dir_in))
+        if (!!is_host ^ !!dir_in)
                 dir |= DIR_OUT;
 
         if (!dir)
@@ -471,10 +477,27 @@ int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe)
         return usbhsp_flags_has(pipe, IS_DIR_HOST);
 }
 
-void usbhs_pipe_data_sequence(struct usbhs_pipe *pipe, int data)
+void usbhs_pipe_data_sequence(struct usbhs_pipe *pipe, int sequence)
 {
         u16 mask = (SQCLR | SQSET);
-        u16 val = (data) ? SQSET : SQCLR;
+        u16 val;
+
+        /*
+         * sequence
+         *  0  : data0
+         *  1  : data1
+         *  -1 : no change
+         */
+        switch (sequence) {
+        case 0:
+                val = SQCLR;
+                break;
+        case 1:
+                val = SQSET;
+                break;
+        default:
+                return;
+        }
 
         usbhsp_pipectrl_set(pipe, mask, val);
 }
diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h
index 6334fc644cc0..fa18b7dc2b2a 100644
--- a/drivers/usb/renesas_usbhs/pipe.h
+++ b/drivers/usb/renesas_usbhs/pipe.h
@@ -87,6 +87,7 @@ int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);
 void usbhs_pipe_enable(struct usbhs_pipe *pipe);
 void usbhs_pipe_disable(struct usbhs_pipe *pipe);
 void usbhs_pipe_stall(struct usbhs_pipe *pipe);
+int usbhs_pipe_is_stall(struct usbhs_pipe *pipe);
 void usbhs_pipe_select_fifo(struct usbhs_pipe *pipe, struct usbhs_fifo *fifo);
 void usbhs_pipe_config_update(struct usbhs_pipe *pipe, u16 devsel,
                               u16 epnum, u16 maxp);
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
deleted file mode 100644
index f13fd488ebec..000000000000
--- a/drivers/usb/serial/ChangeLog.history
+++ /dev/null
@@ -1,730 +0,0 @@
-This is the contents of some of the drivers/usb/serial/ files that had  old
-changelog comments.  They were quite old, and out of date, and we don't keep
-them anymore, so I've put them here, away from the source files, in case
-people still care to see them.
-
-- Greg Kroah-Hartman <greg@kroah.com> October 20, 2005
-
------------------------------------------------------------------------
-usb-serial.h Change Log comments:
-
- (03/26/2002) gkh
-        removed the port->tty check from port_paranoia_check() due to serial
-        consoles not having a tty device assigned to them.
-
- (12/03/2001) gkh
-        removed active from the port structure.
-        added documentation to the usb_serial_device_type structure
-
- (10/10/2001) gkh
-        added vendor and product to serial structure.  Needed to determine device
-        owner when the device is disconnected.
-
- (05/30/2001) gkh
-        added sem to port structure and removed port_lock
-
- (10/05/2000) gkh
-        Added interrupt_in_endpointAddress and bulk_in_endpointAddress to help
-        fix bug with urb->dev not being set properly, now that the usb core
-        needs it.
-
- (09/11/2000) gkh
-        Added usb_serial_debug_data function to help get rid of #DEBUG in the
-        drivers.
-
- (08/28/2000) gkh
-        Added port_lock to port structure.
-
- (08/08/2000) gkh
-        Added open_count to port structure.
-
- (07/23/2000) gkh
-        Added bulk_out_endpointAddress to port structure.
-
- (07/19/2000) gkh, pberger, and borchers
-        Modifications to allow usb-serial drivers to be modules.
-
------------------------------------------------------------------------
-usb-serial.c Change Log comments:
-
- (12/10/2002) gkh
-        Split the ports off into their own struct device, and added a
-        usb-serial bus driver.
-
- (11/19/2002) gkh
-        removed a few #ifdefs for the generic code and cleaned up the failure
-        logic in initialization.
-
- (10/02/2002) gkh
-        moved the console code to console.c and out of this file.
-
- (06/05/2002) gkh
-        moved location of startup() call in serial_probe() until after all
-        of the port information and endpoints are initialized.  This makes
-        things easier for some drivers.
-
- (04/10/2002) gkh
-        added serial_read_proc function which creates a
-        /proc/tty/driver/usb-serial file.
-
- (03/27/2002) gkh
-        Got USB serial console code working properly and merged into the main
-        version of the tree.  Thanks to Randy Dunlap for the initial version
-        of this code, and for pushing me to finish it up.
-        The USB serial console works with any usb serial driver device.
-
- (03/21/2002) gkh
-        Moved all manipulation of port->open_count into the core.  Now the
-        individual driver's open and close functions are called only when the
-        first open() and last close() is called.  Making the drivers a bit
-        smaller and simpler.
-        Fixed a bug if a driver didn't have the owner field set.
-
- (02/26/2002) gkh
-        Moved all locking into the main serial_* functions, instead of having
-        the individual drivers have to grab the port semaphore.  This should
-        reduce races.
-        Reworked the MOD_INC logic a bit to always increment and decrement, even
-        if the generic driver is being used.
-
- (10/10/2001) gkh
-        usb_serial_disconnect() now sets the serial->dev pointer is to NULL to
-        help prevent child drivers from accessing the device since it is now
-        gone.
-
- (09/13/2001) gkh
-        Moved generic driver initialize after we have registered with the USB
-        core.  Thanks to Randy Dunlap for pointing this problem out.
-
- (07/03/2001) gkh
-        Fixed module paramater size.  Thanks to John Brockmeyer for the pointer.
-        Fixed vendor and product getting defined through the MODULE_PARM macro
-        if the Generic driver wasn't compiled in.
-        Fixed problem with generic_shutdown() not being called for drivers that
-        don't have a shutdown() function.
-
- (06/06/2001) gkh
-        added evil hack that is needed for the prolific pl2303 device due to the
-        crazy way its endpoints are set up.
-
- (05/30/2001) gkh
-        switched from using spinlock to a semaphore, which fixes lots of problems.
-
- (04/08/2001) gb
-        Identify version on module load.
-
- 2001_02_05 gkh
-        Fixed buffer overflows bug with the generic serial driver.  Thanks to
-        Todd Squires <squirest@ct0.com> for fixing this.
-
- (01/10/2001) gkh
-        Fixed bug where the generic serial adaptor grabbed _any_ device that was
-        offered to it.
-
- (12/12/2000) gkh
-        Removed MOD_INC and MOD_DEC from poll and disconnect functions, and
-        moved them to the serial_open and serial_close functions.
-        Also fixed bug with there not being a MOD_DEC for the generic driver
-        (thanks to Gary Brubaker for finding this.)
-
- (11/29/2000) gkh
-        Small NULL pointer initialization cleanup which saves a bit of disk image
-
- (11/01/2000) Adam J. Richter
-        instead of using idVendor/idProduct pairs, usb serial drivers
-        now identify their hardware interest with usb_device_id tables,
-        which they usually have anyhow for use with MODULE_DEVICE_TABLE.
-
- (10/05/2000) gkh
-        Fixed bug with urb->dev not being set properly, now that the usb
-        core needs it.
-
- (09/11/2000) gkh
-        Removed DEBUG #ifdefs with call to usb_serial_debug_data
-
- (08/28/2000) gkh
-        Added port_lock to port structure.
-        Added locks for SMP safeness to generic driver
-        Fixed the ability to open a generic device's port more than once.
-
- (07/23/2000) gkh
-        Added bulk_out_endpointAddress to port structure.
-
- (07/19/2000) gkh, pberger, and borchers
-        Modifications to allow usb-serial drivers to be modules.
-
- (07/03/2000) gkh
-        Added more debugging to serial_ioctl call
-
- (06/25/2000) gkh
-        Changed generic_write_bulk_callback to not call wake_up_interruptible
-        directly, but to have port_softint do it at a safer time.
-
- (06/23/2000) gkh
-        Cleaned up debugging statements in a quest to find UHCI timeout bug.
-
- (05/22/2000) gkh
-        Changed the makefile, enabling the big CONFIG_USB_SERIAL_SOMTHING to be
-        removed from the individual device source files.
-
- (05/03/2000) gkh
-        Added the Digi Acceleport driver from Al Borchers and Peter Berger.
-
- (05/02/2000) gkh
-        Changed devfs and tty register code to work properly now. This was based on
-        the ACM driver changes by Vojtech Pavlik.
-
- (04/27/2000) Ryan VanderBijl
-        Put calls to *_paranoia_checks into one function.
-
- (04/23/2000) gkh
-        Fixed bug that Randy Dunlap found for Generic devices with no bulk out ports.
-        Moved when the startup code printed out the devices that are supported.
-
- (04/19/2000) gkh
-        Added driver for ZyXEL omni.net lcd plus ISDN TA
-        Made startup info message specify which drivers were compiled in.
-
- (04/03/2000) gkh
-        Changed the probe process to remove the module unload races.
-        Changed where the tty layer gets initialized to have devfs work nicer.
-        Added initial devfs support.
-
- (03/26/2000) gkh
-        Split driver up into device specific pieces.
-
- (03/19/2000) gkh
-        Fixed oops that could happen when device was removed while a program
-        was talking to the device.
-        Removed the static urbs and now all urbs are created and destroyed
-        dynamically.
-        Reworked the internal interface. Now everything is based on the
-        usb_serial_port structure instead of the larger usb_serial structure.
-        This fixes the bug that a multiport device could not have more than
-        one port open at one time.
-
- (03/17/2000) gkh
-        Added config option for debugging messages.
-        Added patch for keyspan pda from Brian Warner.
-
- (03/06/2000) gkh
-        Added the keyspan pda code from Brian Warner <warner@lothar.com>
-        Moved a bunch of the port specific stuff into its own structure. This
-        is in anticipation of the true multiport devices (there's a bug if you
-        try to access more than one port of any multiport device right now)
-
- (02/21/2000) gkh
-        Made it so that any serial devices only have to specify which functions
-        they want to overload from the generic function calls (great,
-        inheritance in C, in a driver, just what I wanted...)
-        Added support for set_termios and ioctl function calls. No drivers take
-        advantage of this yet.
-        Removed the #ifdef MODULE, now there is no module specific code.
-        Cleaned up a few comments in usb-serial.h that were wrong (thanks again
-        to Miles Lott).
-        Small fix to get_free_serial.
-
- (02/14/2000) gkh
-        Removed the Belkin and Peracom functionality from the driver due to
-        the lack of support from the vendor, and me not wanting people to
-        accidenatly buy the device, expecting it to work with Linux.
-        Added read_bulk_callback and write_bulk_callback to the type structure
-        for the needs of the FTDI and WhiteHEAT driver.
-        Changed all reverences to FTDI to FTDI_SIO at the request of Bill
-        Ryder.
-        Changed the output urb size back to the max endpoint size to make
-        the ftdi_sio driver have it easier, and due to the fact that it didn't
-        really increase the speed any.
-
- (02/11/2000) gkh
-        Added VISOR_FUNCTION_CONSOLE to the visor startup function. This was a
-        patch from Miles Lott (milos@insync.net).
-        Fixed bug with not restoring the minor range that a device grabs, if
-        the startup function fails (thanks Miles for finding this).
-
- (02/05/2000) gkh
-        Added initial framework for the Keyspan PDA serial converter so that
-        Brian Warner has a place to put his code.
-        Made the ezusb specific functions generic enough that different
-        devices can use them (whiteheat and keyspan_pda both need them).
-        Split out a whole bunch of structure and other stuff to a separate
-        usb-serial.h file.
-        Made the Visor connection messages a little more understandable, now
-        that Miles Lott (milos@insync.net) has gotten the Generic channel to
-        work. Also made them always show up in the log file.
-
- (01/25/2000) gkh
-        Added initial framework for FTDI serial converter so that Bill Ryder
-        has a place to put his code.
-        Added the vendor specific info from Handspring. Now we can print out
-        informational debug messages as well as understand what is happening.
-
- (01/23/2000) gkh
-        Fixed problem of crash when trying to open a port that didn't have a
-        device assigned to it. Made the minor node finding a little smarter,
-        now it looks to find a continuous space for the new device.
-
- (01/21/2000) gkh
-        Fixed bug in visor_startup with patch from Miles Lott (milos@insync.net)
-        Fixed get_serial_by_minor which was all messed up for multi port
-        devices. Fixed multi port problem for generic devices. Now the number
-        of ports is determined by the number of bulk out endpoints for the
-        generic device.
-
- (01/19/2000) gkh
-        Removed lots of cruft that was around from the old (pre urb) driver
-        interface.
-        Made the serial_table dynamic. This should save lots of memory when
-        the number of minor nodes goes up to 256.
-        Added initial support for devices that have more than one port.
-        Added more debugging comments for the Visor, and added a needed
-        set_configuration call.
-
- (01/17/2000) gkh
-        Fixed the WhiteHEAT firmware (my processing tool had a bug)
-        and added new debug loader firmware for it.
-        Removed the put_char function as it isn't really needed.
-        Added visor startup commands as found by the Win98 dump.
-
- (01/13/2000) gkh
-        Fixed the vendor id for the generic driver to the one I meant it to be.
-
- (01/12/2000) gkh
-        Forget the version numbering...that's pretty useless...
-        Made the driver able to be compiled so that the user can select which
-        converter they want to use. This allows people who only want the Visor
-        support to not pay the memory size price of the WhiteHEAT.
-        Fixed bug where the generic driver (idVendor=0000 and idProduct=0000)
-        grabbed the root hub. Not good.
-
- version 0.4.0 (01/10/2000) gkh
-        Added whiteheat.h containing the firmware for the ConnectTech WhiteHEAT
-        device. Added startup function to allow firmware to be downloaded to
-        a device if it needs to be.
-        Added firmware download logic to the WhiteHEAT device.
-        Started to add #defines to split up the different drivers for potential
-        configuration option.
-
- version 0.3.1 (12/30/99) gkh
-      Fixed problems with urb for bulk out.
-      Added initial support for multiple sets of endpoints. This enables
-      the Handspring Visor to be attached successfully. Only the first
-      bulk in / bulk out endpoint pair is being used right now.
-
- version 0.3.0 (12/27/99) gkh
-        Added initial support for the Handspring Visor based on a patch from
-        Miles Lott (milos@sneety.insync.net)
-        Cleaned up the code a bunch and converted over to using urbs only.
-
- version 0.2.3 (12/21/99) gkh
-        Added initial support for the Connect Tech WhiteHEAT converter.
-        Incremented the number of ports in expectation of getting the
-        WhiteHEAT to work properly (4 ports per connection).
-        Added notification on insertion and removal of what port the
-        device is/was connected to (and what kind of device it was).
-
- version 0.2.2 (12/16/99) gkh
-        Changed major number to the new allocated number. We're legal now!
-
- version 0.2.1 (12/14/99) gkh
-        Fixed bug that happens when device node is opened when there isn't a
-        device attached to it. Thanks to marek@webdesign.no for noticing this.
-
- version 0.2.0 (11/10/99) gkh
-        Split up internals to make it easier to add different types of serial
-        converters to the code.
-        Added a "generic" driver that gets it's vendor and product id
-        from when the module is loaded. Thanks to David E. Nelson (dnelson@jump.net)
-        for the idea and sample code (from the usb scanner driver.)
-        Cleared up any licensing questions by releasing it under the GNU GPL.
-
- version 0.1.2 (10/25/99) gkh
-        Fixed bug in detecting device.
-
- version 0.1.1 (10/05/99) gkh
-        Changed the major number to not conflict with anything else.
-
- version 0.1 (09/28/99) gkh
-        Can recognize the two different devices and start up a read from
-        device when asked to. Writes also work. No control signals yet, this
-        all is vendor specific data (i.e. no spec), also no control for
-        different baud rates or other bit settings.
-        Currently we are using the same devid as the acm driver. This needs
-        to change.
-
------------------------------------------------------------------------
-visor.c Change Log comments:
-
- (06/03/2003) Judd Montgomery <judd at jpilot.org>
-     Added support for module parameter options for untested/unknown
-     devices.
-
- (03/09/2003) gkh
-        Added support for the Sony Clie NZ90V device.  Thanks to Martin Brachtl
-        <brachtl@redgrep.cz> for the information.
-
- (03/05/2003) gkh
-        Think Treo support is now working.
-
- (04/03/2002) gkh
-        Added support for the Sony OS 4.1 devices.  Thanks to Hiroyuki ARAKI
-        <hiro@zob.ne.jp> for the information.
-
- (03/27/2002) gkh
-        Removed assumptions that port->tty was always valid (is not true
-        for usb serial console devices.)
-
- (03/23/2002) gkh
-        Added support for the Palm i705 device, thanks to Thomas Riemer
-        <tom@netmech.com> for the information.
-
- (03/21/2002) gkh
-        Added support for the Palm m130 device, thanks to Udo Eisenbarth
-        <udo.eisenbarth@web.de> for the information.
-
- (02/27/2002) gkh
-        Reworked the urb handling logic.  We have no more pool, but dynamically
-        allocate the urb and the transfer buffer on the fly.  In testing this
-        does not incure any measurable overhead.  This also relies on the fact
-        that we have proper reference counting logic for urbs.
-
- (02/21/2002) SilaS
-  Added initial support for the Palm m515 devices.
-
- (02/14/2002) gkh
-        Added support for the Clie S-360 device.
-
- (12/18/2001) gkh
-        Added better Clie support for 3.5 devices.  Thanks to Geoffrey Levand
-        for the patch.
-
- (11/11/2001) gkh
-        Added support for the m125 devices, and added check to prevent oopses
-        for Clié devices that lie about the number of ports they have.
-
- (08/30/2001) gkh
-        Added support for the Clie devices, both the 3.5 and 4.0 os versions.
-        Many thanks to Daniel Burke, and Bryan Payne for helping with this.
-
- (08/23/2001) gkh
-        fixed a few potential bugs pointed out by Oliver Neukum.
-
- (05/30/2001) gkh
-        switched from using spinlock to a semaphore, which fixes lots of problems.
-
- (05/28/2000) gkh
-        Added initial support for the Palm m500 and Palm m505 devices.
-
- (04/08/2001) gb
-        Identify version on module load.
-
- (01/21/2000) gkh
-        Added write_room and chars_in_buffer, as they were previously using the
-        generic driver versions which is all wrong now that we are using an urb
-        pool.  Thanks to Wolfgang Grandegger for pointing this out to me.
-        Removed count assignment in the write function, which was not needed anymore
-        either.  Thanks to Al Borchers for pointing this out.
-
- (12/12/2000) gkh
-        Moved MOD_DEC to end of visor_close to be nicer, as the final write
-        message can sleep.
-
- (11/12/2000) gkh
-        Fixed bug with data being dropped on the floor by forcing tty->low_latency
-        to be on.  Hopefully this fixes the OHCI issue!
-
- (11/01/2000) Adam J. Richter
-        usb_device_id table support
-
- (10/05/2000) gkh
-        Fixed bug with urb->dev not being set properly, now that the usb
-        core needs it.
-
- (09/11/2000) gkh
-        Got rid of always calling kmalloc for every urb we wrote out to the
-        device.
-        Added visor_read_callback so we can keep track of bytes in and out for
-        those people who like to know the speed of their device.
-        Removed DEBUG #ifdefs with call to usb_serial_debug_data
-
- (09/06/2000) gkh
-        Fixed oops in visor_exit.  Need to uncomment usb_unlink_urb call _after_
-        the host controller drivers set urb->dev = NULL when the urb is finished.
-
- (08/28/2000) gkh
-        Added locks for SMP safeness.
-
- (08/08/2000) gkh
-        Fixed endian problem in visor_startup.
-        Fixed MOD_INC and MOD_DEC logic and the ability to open a port more
-        than once.
-
- (07/23/2000) gkh
-        Added pool of write urbs to speed up transfers to the visor.
-
- (07/19/2000) gkh
-        Added module_init and module_exit functions to handle the fact that this
-        driver is a loadable module now.
-
- (07/03/2000) gkh
-        Added visor_set_ioctl and visor_set_termios functions (they don't do much
-        of anything, but are good for debugging.)
-
- (06/25/2000) gkh
-        Fixed bug in visor_unthrottle that should help with the disconnect in PPP
-        bug that people have been reporting.
-
- (06/23/2000) gkh
-        Cleaned up debugging statements in a quest to find UHCI timeout bug.
-
- (04/27/2000) Ryan VanderBijl
-        Fixed memory leak in visor_close
-
- (03/26/2000) gkh
-        Split driver up into device specific pieces.
-
------------------------------------------------------------------------
-pl2303.c Change Log comments:
-
- 2002_Mar_26 gkh
-        allowed driver to work properly if there is no tty assigned to a port
-        (this happens for serial console devices.)
-
- 2001_Oct_06 gkh
-        Added RTS and DTR line control.  Thanks to joe@bndlg.de for parts of it.
-
- 2001_Sep_19 gkh
-        Added break support.
-
- 2001_Aug_30 gkh
-        fixed oops in write_bulk_callback.
-
- 2001_Aug_28 gkh
-        reworked buffer logic to be like other usb-serial drivers.  Hopefully
-        removing some reported problems.
-
- 2001_Jun_06 gkh
-        finished porting to 2.4 format.
-
-
------------------------------------------------------------------------
-io_edgeport.c Change Log comments:
-
- 2003_04_03 al borchers
-  - fixed a bug (that shows up with dosemu) where the tty struct is
-    used in a callback after it has been freed
-
- 2.3 2002_03_08 greg kroah-hartman
-        - fixed bug when multiple devices were attached at the same time.
-
- 2.2 2001_11_14 greg kroah-hartman
-        - fixed bug in edge_close that kept the port from being used more
-          than once.
-        - fixed memory leak on device removal.
-        - fixed potential double free of memory when command urb submitting
-          failed.
-        - other small cleanups when the device is removed
-
- 2.1 2001_07_09 greg kroah-hartman
-        - added support for TIOCMBIS and TIOCMBIC.
-
-     (04/08/2001) gb
-        - Identify version on module load.
-
- 2.0 2001_03_05 greg kroah-hartman
-        - reworked entire driver to fit properly in with the other usb-serial
-          drivers.  Occasional oopses still happen, but it's a good start.
-
- 1.2.3 (02/23/2001) greg kroah-hartman
-        - changed device table to work properly for 2.4.x final format.
-        - fixed problem with dropping data at high data rates.
-
- 1.2.2 (11/27/2000) greg kroah-hartman
-        - cleaned up more NTisms.
-        - Added device table for 2.4.0-test11
-
- 1.2.1 (11/08/2000) greg kroah-hartman
-        - Started to clean up NTisms.
-        - Fixed problem with dev field of urb for kernels >= 2.4.0-test9
-
- 1.2 (10/17/2000) David Iacovelli
-        Remove all EPIC code and GPL source
-  Fix RELEVANT_IFLAG macro to include flow control
-  changes port configuration changes.
-  Fix redefinition of SERIAL_MAGIC
-  Change all timeout values to 5 seconds
-  Tried to fix the UHCI multiple urb submission, but failed miserably.
-  it seems to work fine with OHCI.
-  ( Greg take a look at the #if 0 at end of WriteCmdUsb() we must
-    find a way to work arount this UHCI bug )
-
- 1.1 (10/11/2000) David Iacovelli
-  Fix XON/XOFF flow control to support both IXON and IXOFF
-
- 0.9.27 (06/30/2000) David Iacovelli
-  Added transmit queue and now allocate urb for command writes.
-
- 0.9.26 (06/29/2000) David Iacovelli
-  Add support for 80251 based edgeport
-
- 0.9.25 (06/27/2000) David Iacovelli
-  Do not close the port if it has multiple opens.
-
- 0.9.24 (05/26/2000) David Iacovelli
-  Add IOCTLs to support RXTX and JAVA POS
-  and first cut at running BlackBox Demo
-
- 0.9.23 (05/24/2000) David Iacovelli
-  Add IOCTLs to support RXTX and JAVA POS
-
- 0.9.22 (05/23/2000) David Iacovelli
-  fixed bug in enumeration.  If epconfig turns on mapping by
-  path after a device is already plugged in, we now update
-  the mapping correctly
-
- 0.9.21 (05/16/2000) David Iacovelli
-  Added BlockUntilChaseResp() to also wait for txcredits
-  Updated the way we allocate and handle write URBs
-        Add debug code to dump buffers
-
- 0.9.20 (05/01/2000) David Iacovelli
-        change driver to use usb/tts/
-
- 0.9.19 (05/01/2000) David Iacovelli
-  Update code to compile if DEBUG is off
-
- 0.9.18 (04/28/2000) David Iacovelli
-  cleanup and test tty_register with devfs
-
- 0.9.17 (04/27/2000) greg kroah-hartman
-        changed tty_register around to be like the way it
-        was before, but now it works properly with devfs.
-
- 0.9.16 (04/26/2000) david iacovelli
-  Fixed bug in GetProductInfo()
-
- 0.9.15 (04/25/2000) david iacovelli
-        Updated enumeration
-
- 0.9.14 (04/24/2000) david iacovelli
-  Removed all config/status IOCTLS and
-  converted to using /proc/edgeport
-  still playing with devfs
-
- 0.9.13 (04/24/2000) david iacovelli
-  Removed configuration based on ttyUSB0
-  Added support for configuration using /prod/edgeport
-  first attempt at using devfs (not working yet!)
-  Added IOCTL to GetProductInfo()
-  Added support for custom baud rates
-        Add support for random port numbers
-
- 0.9.12 (04/18/2000) david iacovelli
-        added additional configuration IOCTLs
-  use ttyUSB0 for configuration
-
- 0.9.11 (04/17/2000) greg kroah-hartman
-        fixed module initialization race conditions.
-        made all urbs dynamically allocated.
-        made driver devfs compatible. now it only registers the tty device
-        when the device is actually plugged in.
-
- 0.9.10 (04/13/2000) greg kroah-hartman
-        added proc interface framework.
-
- 0.9.9 (04/13/2000) david iacovelli
-        added enumeration code and ioctls to configure the device
-
- 0.9.8 (04/12/2000) david iacovelli
-  Change interrupt read start when device is plugged in
-  and stop when device is removed
-        process interrupt reads when all ports are closed
-  (keep value of rxBytesAvail consistent with the edgeport)
-  set the USB_BULK_QUEUE flag so that we can shove a bunch
-  of urbs at once down the pipe
-
- 0.9.7 (04/10/2000) david iacovelli
-        start to add enumeration code.
-  generate serial number for epic devices
-  add support for kdb
-
- 0.9.6 (03/30/2000) david iacovelli
-  add IOCTL to get string, manufacture, and boot descriptors
-
- 0.9.5 (03/14/2000) greg kroah-hartman
-        more error checking added to SerialOpen to try to fix UHCI open problem
-
- 0.9.4 (03/09/2000) greg kroah-hartman
-        added more error checking to handle oops when data is hanging
-        around and tty is abruptly closed.
-
- 0.9.3 (03/09/2000) david iacovelli
-        Add epic support for xon/xoff chars
-        play with performance
-
- 0.9.2 (03/08/2000) greg kroah-hartman
-        changed most "info" calls to "dbg"
-        implemented flow control properly in the termios call
-
- 0.9.1 (03/08/2000) david iacovelli
-        added EPIC support
-        enabled bootloader update
-
- 0.9 (03/08/2000) greg kroah-hartman
-        Release to IO networks.
-        Integrated changes that David made
-  made getting urbs for writing SMP safe
-
- 0.8 (03/07/2000) greg kroah-hartman
-        Release to IO networks.
-        Fixed problems that were seen in code by David.
-  Now both Edgeport/4 and Edgeport/2 works properly.
-  Changed most of the functions to use port instead of serial.
-
- 0.7 (02/27/2000) greg kroah-hartman
-        Milestone 3 release.
-        Release to IO Networks
-        ioctl for waiting on line change implemented.
-        ioctl for getting statistics implemented.
-        multiport support working.
-        lsr and msr registers are now handled properly.
-        change break now hooked up and working.
-        support for all known Edgeport devices.
-
- 0.6 (02/22/2000) greg kroah-hartman
-        Release to IO networks.
-        CHASE is implemented correctly when port is closed.
-        SerialOpen now blocks correctly until port is fully opened.
-
- 0.5 (02/20/2000) greg kroah-hartman
-        Release to IO networks.
-        Known problems:
-                modem status register changes are not sent on to the user
-                CHASE is not implemented when the port is closed.
-
- 0.4 (02/16/2000) greg kroah-hartman
-        Second cut at the CeBit demo.
-        Doesn't leak memory on every write to the port
-        Still small leaks on startup.
-        Added support for Edgeport/2 and Edgeport/8
-
- 0.3 (02/15/2000) greg kroah-hartman
-        CeBit demo release.
-        Force the line settings to 4800, 8, 1, e for the demo.
-        Warning! This version leaks memory like crazy!
-
- 0.2 (01/30/2000) greg kroah-hartman
-        Milestone 1 release.
-        Device is found by USB subsystem, enumerated, firmware is downloaded
-        and the descriptors are printed to the debug log, config is set, and
-        green light starts to blink. Open port works, and data can be sent
-        and received at the default settings of the UART. Loopback connector
-        and debug log confirms this.
-
- 0.1 (01/23/2000) greg kroah-hartman
-        Initial release to help IO Networks try to set up their test system.
-        Edgeport4 is recognized, firmware is downloaded, config is set so
-        device blinks green light every 3 sec. Port is bound, but opening,
-        closing, and sending data do not work properly.
-
-
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index d6921fa1403c..f9f29b289f2f 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -20,50 +20,7 @@
  * TODO:
  * -- Add true modem contol line query capability.  Currently we track the
  *    states reported by the interrupt and the states we request.
- * -- Add error reporting back to application for UART error conditions.
- *    Just point me at how to implement this and I'll do it. I've put the
- *    framework in, but haven't analyzed the "tty_flip" interface yet.
  * -- Add support for flush commands
- * -- Add everything that is missing :)
- *
- * 27-Nov-2001 gkh
- *      compressed all the differnent device entries into 1.
- *
- * 30-May-2001 gkh
- *      switched from using spinlock to a semaphore, which fixes lots of
- *      problems.
- *
- * 08-Apr-2001 gb
- *      - Identify version on module load.
- *
- * 12-Mar-2001 gkh
- *      - Added support for the GoHubs GO-COM232 device which is the same as the
- *        Peracom device.
- *
- * 06-Nov-2000 gkh
- *      - Added support for the old Belkin and Peracom devices.
- *      - Made the port able to be opened multiple times.
- *      - Added some defaults incase the line settings are things these devices
- *        can't support.
- *
- * 18-Oct-2000 William Greathouse
- *    Released into the wild (linux-usb-devel)
- *
- * 17-Oct-2000 William Greathouse
- *    Add code to recognize firmware version and set hardware flow control
- *    appropriately.  Belkin states that firmware prior to 3.05 does not
- *    operate correctly in hardware handshake mode.  I have verified this
- *    on firmware 2.05 -- for both RTS and DTR input flow control, the control
- *    line is not reset.  The test performed by the Belkin Win* driver is
- *    to enable hardware flow control for firmware 2.06 or greater and
- *    for 1.00 or prior.  I am only enabling for 2.06 or greater.
- *
- * 12-Oct-2000 William Greathouse
- *    First cut at supporting Belkin USB Serial Adapter F5U103
- *    I did not have a copy of the original work to support this
- *    adapter, so pardon any stupid mistakes.  All of the information
- *    I am using to write this driver was acquired by using a modified
- *    UsbSnoop on Windows2000 and from examining the other USB drivers.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 6ae1c0688b5e..0e77511060c0 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -335,13 +335,12 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port)
                 goto out;
 
         dbg("%s - submitting interrupt urb", __func__);
-        port->interrupt_in_urb->dev = serial->dev;
         r = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (r) {
                 dev_err(&port->dev, "%s - failed submitting interrupt urb,"
                         " error %d\n", __func__, r);
                 ch341_close(port);
-                return -EPROTO;
+                goto out;
         }
 
         r = usb_serial_generic_open(tty, port);
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index fd67cc53545b..adfe660ed008 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -92,6 +92,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
         { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
         { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
+        { USB_DEVICE(0x10C4, 0x81A9) }, /* Multiplex RC Interface */
         { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */
         { USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */
         { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
@@ -280,7 +281,10 @@ static int cp210x_get_config(struct usb_serial_port *port, u8 request,
                 dbg("%s - Unable to send config request, "
                                 "request=0x%x size=%d result=%d\n",
                                 __func__, request, size, result);
-                return -EPROTO;
+                if (result > 0)
+                        result = -EPROTO;
+
+                return result;
         }
 
         return 0;
@@ -331,7 +335,10 @@ static int cp210x_set_config(struct usb_serial_port *port, u8 request,
                 dbg("%s - Unable to send request, "
                                 "request=0x%x size=%d result=%d\n",
                                 __func__, request, size, result);
-                return -EPROTO;
+                if (result > 0)
+                        result = -EPROTO;
+
+                return result;
         }
 
         return 0;
@@ -395,10 +402,11 @@ static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         dbg("%s - port %d", __func__, port->number);
 
-        if (cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) {
-                dev_err(&port->dev, "%s - Unable to enable UART\n",
-                                __func__);
-                return -EPROTO;
+        result = cp210x_set_config_single(port, CP210X_IFC_ENABLE,
+                                                                UART_ENABLE);
+        if (result) {
+                dev_err(&port->dev, "%s - Unable to enable UART\n", __func__);
+                return result;
         }
 
         result = usb_serial_generic_open(tty, port);
@@ -520,18 +528,13 @@ static void cp210x_get_termios_port(struct usb_serial_port *port,
                 cflag |= PARENB;
                 break;
         case BITS_PARITY_MARK:
-                dbg("%s - parity = MARK (not supported, disabling parity)",
-                                __func__);
-                cflag &= ~PARENB;
-                bits &= ~BITS_PARITY_MASK;
-                cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                dbg("%s - parity = MARK", __func__);
+                cflag |= (PARENB|PARODD|CMSPAR);
                 break;
         case BITS_PARITY_SPACE:
-                dbg("%s - parity = SPACE (not supported, disabling parity)",
-                                __func__);
-                cflag &= ~PARENB;
-                bits &= ~BITS_PARITY_MASK;
-                cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                dbg("%s - parity = SPACE", __func__);
+                cflag &= ~PARODD;
+                cflag |= (PARENB|CMSPAR);
                 break;
         default:
                 dbg("%s - Unknown parity mode, disabling parity", __func__);
@@ -588,7 +591,6 @@ static void cp210x_set_termios(struct tty_struct *tty,
         if (!tty)
                 return;
 
-        tty->termios->c_cflag &= ~CMSPAR;
         cflag = tty->termios->c_cflag;
         old_cflag = old_termios->c_cflag;
         baud = cp210x_quantise_baudrate(tty_get_baud_rate(tty));
@@ -643,16 +645,27 @@ static void cp210x_set_termios(struct tty_struct *tty,
                                         "not supported by device\n");
         }
 
-        if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) {
+        if ((cflag     & (PARENB|PARODD|CMSPAR)) !=
+            (old_cflag & (PARENB|PARODD|CMSPAR))) {
                 cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2);
                 bits &= ~BITS_PARITY_MASK;
                 if (cflag & PARENB) {
-                        if (cflag & PARODD) {
-                                bits |= BITS_PARITY_ODD;
-                                dbg("%s - parity = ODD", __func__);
+                        if (cflag & CMSPAR) {
+                            if (cflag & PARODD) {
+                                    bits |= BITS_PARITY_MARK;
+                                    dbg("%s - parity = MARK", __func__);
+                            } else {
+                                    bits |= BITS_PARITY_SPACE;
+                                    dbg("%s - parity = SPACE", __func__);
+                            }
                         } else {
-                                bits |= BITS_PARITY_EVEN;
-                                dbg("%s - parity = EVEN", __func__);
+                            if (cflag & PARODD) {
+                                    bits |= BITS_PARITY_ODD;
+                                    dbg("%s - parity = ODD", __func__);
+                            } else {
+                                    bits |= BITS_PARITY_EVEN;
+                                    dbg("%s - parity = EVEN", __func__);
+                            }
                         }
                 }
                 if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2))
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index f744ab7a3b19..98bf83349838 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -138,7 +138,6 @@ static int cyberjack_startup(struct usb_serial *serial)
 
         for (i = 0; i < serial->num_ports; ++i) {
                 int result;
-                serial->port[i]->interrupt_in_urb->dev = serial->dev;
                 result = usb_submit_urb(serial->port[i]->interrupt_in_urb,
                                         GFP_KERNEL);
                 if (result)
@@ -208,7 +207,6 @@ static void cyberjack_close(struct usb_serial_port *port)
 static int cyberjack_write(struct tty_struct *tty,
         struct usb_serial_port *port, const unsigned char *buf, int count)
 {
-        struct usb_serial *serial = port->serial;
         struct cyberjack_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
         int result;
@@ -221,22 +219,18 @@ static int cyberjack_write(struct tty_struct *tty,
                 return 0;
         }
 
-        spin_lock_bh(&port->lock);
-        if (port->write_urb_busy) {
-                spin_unlock_bh(&port->lock);
+        if (!test_and_clear_bit(0, &port->write_urbs_free)) {
                 dbg("%s - already writing", __func__);
                 return 0;
         }
-        port->write_urb_busy = 1;
-        spin_unlock_bh(&port->lock);
 
         spin_lock_irqsave(&priv->lock, flags);
 
         if (count+priv->wrfilled > sizeof(priv->wrbuf)) {
                 /* To much data for buffer. Reset buffer. */
                 priv->wrfilled = 0;
-                port->write_urb_busy = 0;
                 spin_unlock_irqrestore(&priv->lock, flags);
+                set_bit(0, &port->write_urbs_free);
                 return 0;
         }
 
@@ -265,13 +259,7 @@ static int cyberjack_write(struct tty_struct *tty,
                 priv->wrsent = length;
 
                 /* set up our urb */
-                usb_fill_bulk_urb(port->write_urb, serial->dev,
-                              usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress),
-                              port->write_urb->transfer_buffer, length,
-                              ((serial->type->write_bulk_callback) ?
-                               serial->type->write_bulk_callback :
-                               cyberjack_write_bulk_callback),
-                              port);
+                port->write_urb->transfer_buffer_length = length;
 
                 /* send the data out the bulk port */
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
@@ -283,7 +271,7 @@ static int cyberjack_write(struct tty_struct *tty,
                         priv->wrfilled = 0;
                         priv->wrsent = 0;
                         spin_unlock_irqrestore(&priv->lock, flags);
-                        port->write_urb_busy = 0;
+                        set_bit(0, &port->write_urbs_free);
                         return 0;
                 }
 
@@ -351,7 +339,6 @@ static void cyberjack_read_int_callback(struct urb *urb)
                 spin_unlock(&priv->lock);
 
                 if (!old_rdtodo) {
-                        port->read_urb->dev = port->serial->dev;
                         result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                         if (result)
                                 dev_err(&port->dev, "%s - failed resubmitting "
@@ -362,7 +349,6 @@ static void cyberjack_read_int_callback(struct urb *urb)
         }
 
 resubmit:
-        port->interrupt_in_urb->dev = port->serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         if (result)
                 dev_err(&port->dev, "usb_submit_urb(read int) failed\n");
@@ -415,7 +401,6 @@ static void cyberjack_read_bulk_callback(struct urb *urb)
 
         /* Continue to read if we have still urbs to do. */
         if (todo /* || (urb->actual_length==port->bulk_in_endpointAddress)*/) {
-                port->read_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                 if (result)
                         dev_err(&port->dev, "%s - failed resubmitting read "
@@ -432,7 +417,7 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
 
         dbg("%s - port %d", __func__, port->number);
 
-        port->write_urb_busy = 0;
+        set_bit(0, &port->write_urbs_free);
         if (status) {
                 dbg("%s - nonzero write bulk status received: %d",
                     __func__, status);
@@ -455,13 +440,7 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
                 priv->wrsent += length;
 
                 /* set up our urb */
-                usb_fill_bulk_urb(port->write_urb, port->serial->dev,
-                              usb_sndbulkpipe(port->serial->dev, port->bulk_out_endpointAddress),
-                              port->write_urb->transfer_buffer, length,
-                              ((port->serial->type->write_bulk_callback) ?
-                               port->serial->type->write_bulk_callback :
-                               cyberjack_write_bulk_callback),
-                              port);
+                port->write_urb->transfer_buffer_length = length;
 
                 /* send the data out the bulk port */
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index d9906eb9d16a..07680d6b792b 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -16,32 +16,6 @@
  *
  * See http://geocities.com/i0xox0i for information on this driver and the
  * earthmate usb device.
- *
- *  Lonnie Mendez <dignome@gmail.com>
- *  4-29-2005
- *      Fixed problem where setting or retreiving the serial config would fail
- *      with EPIPE.  Removed CRTS toggling so the driver behaves more like
- *      other usbserial adapters.  Issued new interval of 1ms instead of the
- *      default 10ms.  As a result, transfer speed has been substantially
- *      increased from avg. 850bps to avg. 3300bps.  initial termios has also
- *      been modified.  Cleaned up code and formatting issues so it is more
- *      readable.  Replaced the C++ style comments.
- *
- *  Lonnie Mendez <dignome@gmail.com>
- *  12-15-2004
- *      Incorporated write buffering from pl2303 driver.  Fixed bug with line
- *      handling so both lines are raised in cypress_open. (was dropping rts)
- *      Various code cleanups made as well along with other misc bug fixes.
- *
- *  Lonnie Mendez <dignome@gmail.com>
- *  04-10-2004
- *      Driver modified to support dynamic line settings.  Various improvements
- *      and features.
- *
- *  Neil Whelchel
- *  10-2003
- *      Driver first released.
- *
  */
 
 /* Thanks to Neil Whelchel for writing the first cypress m8 implementation
@@ -1162,8 +1136,6 @@ static void cypress_unthrottle(struct tty_struct *tty)
                 return;
 
         if (actually_throttled) {
-                port->interrupt_in_urb->dev = port->serial->dev;
-
                 result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
                 if (result) {
                         dev_err(&port->dev, "%s - failed submitting read urb, "
@@ -1352,7 +1324,6 @@ static void cypress_write_int_callback(struct urb *urb)
                 dbg("%s - nonzero write bulk status received: %d",
                         __func__, status);
                 port->interrupt_out_urb->transfer_buffer_length = 1;
-                port->interrupt_out_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);
                 if (!result)
                         return;
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index e92cbefc0f88..6d26a77d0f2a 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -13,222 +13,6 @@
 *
 *  Peter Berger (pberger@brimson.com)
 *  Al Borchers (borchers@steinerpoint.com)
-* 
-* (12/03/2001) gkh
-*       switched to using port->port.count instead of private version.
-*       Removed port->active
-*
-* (04/08/2001) gb
-*       Identify version on module load.
-*
-* (11/01/2000) Adam J. Richter
-*       usb_device_id table support
-* 
-* (11/01/2000) pberger and borchers
-*    -- Turned off the USB_DISABLE_SPD flag for write bulk urbs--it caused
-*       USB 4 ports to hang on startup.
-*    -- Serialized access to write urbs by adding the dp_write_urb_in_use
-*       flag; otherwise, the driver caused SMP system hangs.  Watching the
-*       urb status is not sufficient.
-*
-* (10/05/2000) gkh
-*    -- Fixed bug with urb->dev not being set properly, now that the usb
-*       core needs it.
-* 
-*  (8/8/2000) pberger and borchers
-*    -- Fixed close so that 
-*       - it can timeout while waiting for transmit idle, if needed;
-*       - it ignores interrupts when flushing the port, turning
-*         of modem signalling, and so on;
-*       - it waits for the flush to really complete before returning.
-*    -- Read_bulk_callback and write_bulk_callback check for a closed
-*       port before using the tty struct or writing to the port.
-*    -- The two changes above fix the oops caused by interrupted closes.
-*    -- Added interruptible args to write_oob_command and set_modem_signals
-*       and added a timeout arg to transmit_idle; needed for fixes to
-*       close.
-*    -- Added code for rx_throttle and rx_unthrottle so that input flow
-*       control works.
-*    -- Added code to set overrun, parity, framing, and break errors
-*       (untested).
-*    -- Set USB_DISABLE_SPD flag for write bulk urbs, so no 0 length
-*       bulk writes are done.  These hung the Digi USB device.  The
-*       0 length bulk writes were a new feature of usb-uhci added in
-*       the 2.4.0-test6 kernels.
-*    -- Fixed mod inc race in open; do mod inc before sleeping to wait
-*       for a close to finish.
-*
-*  (7/31/2000) pberger
-*    -- Fixed bugs with hardware handshaking:
-*       - Added code to set/clear tty->hw_stopped in digi_read_oob_callback()
-*         and digi_set_termios()
-*    -- Added code in digi_set_termios() to
-*       - add conditional in code handling transition from B0 to only
-*         set RTS if RTS/CTS flow control is either not in use or if
-*         the port is not currently throttled.
-*       - handle turning off CRTSCTS.
-*
-*  (7/30/2000) borchers
-*    -- Added support for more than one Digi USB device by moving
-*       globals to a private structure in the pointed to from the
-*       usb_serial structure.
-*    -- Moved the modem change and transmit idle wait queues into
-*       the port private structure, so each port has its own queue
-*       rather than sharing global queues.
-*    -- Added support for break signals.
-*
-*  (7/25/2000) pberger
-*    -- Added USB-2 support.  Note: the USB-2 supports 3 devices: two
-*       serial and a parallel port.  The parallel port is implemented
-*       as a serial-to-parallel converter.  That is, the driver actually
-*       presents all three USB-2 interfaces as serial ports, but the third
-*       one physically connects to a parallel device.  Thus, for example,
-*       one could plug a parallel printer into the USB-2's third port,
-*       but from the kernel's (and userland's) point of view what's
-*       actually out there is a serial device.
-*
-*  (7/15/2000) borchers
-*    -- Fixed race in open when a close is in progress.
-*    -- Keep count of opens and dec the module use count for each
-*       outstanding open when shutdown is called (on disconnect).
-*    -- Fixed sanity checks in read_bulk_callback and write_bulk_callback
-*       so pointers are checked before use.
-*    -- Split read bulk callback into in band and out of band
-*       callbacks, and no longer restart read chains if there is
-*       a status error or a sanity error.  This fixed the seg
-*       faults and other errors we used to get on disconnect.
-*    -- Port->active is once again a flag as usb-serial intended it
-*       to be, not a count.  Since it was only a char it would
-*       have been limited to 256 simultaneous opens.  Now the open
-*       count is kept in the port private structure in dp_open_count.
-*    -- Added code for modularization of the digi_acceleport driver.
-*
-*  (6/27/2000) pberger and borchers
-*    -- Zeroed out sync field in the wakeup_task before first use;
-*       otherwise the uninitialized value might prevent the task from
-*       being scheduled.
-*    -- Initialized ret value to 0 in write_bulk_callback, otherwise
-*       the uninitialized value could cause a spurious debugging message.
-*
-*  (6/22/2000) pberger and borchers
-*    -- Made cond_wait_... inline--apparently on SPARC the flags arg
-*       to spin_lock_irqsave cannot be passed to another function
-*       to call spin_unlock_irqrestore.  Thanks to Pauline Middelink.
-*    -- In digi_set_modem_signals the inner nested spin locks use just
-*       spin_lock() rather than spin_lock_irqsave().  The old code
-*       mistakenly left interrupts off.  Thanks to Pauline Middelink.
-*    -- copy_from_user (which can sleep) is no longer called while a
-*       spinlock is held.  We copy to a local buffer before getting
-*       the spinlock--don't like the extra copy but the code is simpler.
-*    -- Printk and dbg are no longer called while a spin lock is held.
-*
-*  (6/4/2000) pberger and borchers
-*    -- Replaced separate calls to spin_unlock_irqrestore and
-*       interruptible_sleep_on_timeout with a new function
-*       cond_wait_interruptible_timeout_irqrestore.  This eliminates
-*       the race condition where the wake up could happen after
-*       the unlock and before the sleep.
-*    -- Close now waits for output to drain.
-*    -- Open waits until any close in progress is finished.
-*    -- All out of band responses are now processed, not just the
-*       first in a USB packet.
-*    -- Fixed a bug that prevented the driver from working when the
-*       first Digi port was not the first USB serial port--the driver
-*       was mistakenly using the external USB serial port number to
-*       try to index into its internal ports.
-*    -- Fixed an SMP bug -- write_bulk_callback is called directly from
-*       an interrupt, so spin_lock_irqsave/spin_unlock_irqrestore are
-*       needed for locks outside write_bulk_callback that are also
-*       acquired by write_bulk_callback to prevent deadlocks.
-*    -- Fixed support for select() by making digi_chars_in_buffer()
-*       return 256 when -EINPROGRESS is set, as the line discipline
-*       code in n_tty.c expects.
-*    -- Fixed an include file ordering problem that prevented debugging
-*       messages from working.
-*    -- Fixed an intermittent timeout problem that caused writes to
-*       sometimes get stuck on some machines on some kernels.  It turns
-*       out in these circumstances write_chan() (in n_tty.c) was
-*       asleep waiting for our wakeup call.  Even though we call
-*       wake_up_interruptible() in digi_write_bulk_callback(), there is
-*       a race condition that could cause the wakeup to fail: if our
-*       wake_up_interruptible() call occurs between the time that our
-*       driver write routine finishes and write_chan() sets current->state
-*       to TASK_INTERRUPTIBLE, the effect of our wakeup setting the state
-*       to TASK_RUNNING will be lost and write_chan's subsequent call to
-*       schedule() will never return (unless it catches a signal).
-*       This race condition occurs because write_bulk_callback() (and thus
-*       the wakeup) are called asynchronously from an interrupt, rather than
-*       from the scheduler.  We can avoid the race by calling the wakeup
-*       from the scheduler queue and that's our fix:  Now, at the end of
-*       write_bulk_callback() we queue up a wakeup call on the scheduler
-*       task queue.  We still also invoke the wakeup directly since that
-*       squeezes a bit more performance out of the driver, and any lost
-*       race conditions will get cleaned up at the next scheduler run.
-*
-*       NOTE:  The problem also goes away if you comment out
-*       the two code lines in write_chan() where current->state
-*       is set to TASK_RUNNING just before calling driver.write() and to
-*       TASK_INTERRUPTIBLE immediately afterwards.  This is why the
-*       problem did not show up with the 2.2 kernels -- they do not
-*       include that code.
-*
-*  (5/16/2000) pberger and borchers
-*    -- Added timeouts to sleeps, to defend against lost wake ups.
-*    -- Handle transition to/from B0 baud rate in digi_set_termios.
-*
-*  (5/13/2000) pberger and borchers
-*    -- All commands now sent on out of band port, using
-*       digi_write_oob_command.
-*    -- Get modem control signals whenever they change, support TIOCMGET/
-*       SET/BIS/BIC ioctls.
-*    -- digi_set_termios now supports parity, word size, stop bits, and
-*       receive enable.
-*    -- Cleaned up open and close, use digi_set_termios and
-*       digi_write_oob_command to set port parameters.
-*    -- Added digi_startup_device to start read chains on all ports.
-*    -- Write buffer is only used when count==1, to be sure put_char can
-*       write a char (unless the buffer is full).
-*
-*  (5/10/2000) pberger and borchers
-*    -- Added MOD_INC_USE_COUNT/MOD_DEC_USE_COUNT calls on open/close.
-*    -- Fixed problem where the first incoming character is lost on
-*       port opens after the first close on that port.  Now we keep
-*       the read_urb chain open until shutdown.
-*    -- Added more port conditioning calls in digi_open and digi_close.
-*    -- Convert port->active to a use count so that we can deal with multiple
-*       opens and closes properly.
-*    -- Fixed some problems with the locking code.
-*
-*  (5/3/2000) pberger and borchers
-*    -- First alpha version of the driver--many known limitations and bugs.
-*
-*
-*  Locking and SMP
-*
-*  - Each port, including the out-of-band port, has a lock used to
-*    serialize all access to the port's private structure.
-*  - The port lock is also used to serialize all writes and access to
-*    the port's URB.
-*  - The port lock is also used for the port write_wait condition
-*    variable.  Holding the port lock will prevent a wake up on the
-*    port's write_wait; this can be used with cond_wait_... to be sure
-*    the wake up is not lost in a race when dropping the lock and
-*    sleeping waiting for the wakeup.
-*  - digi_write() does not sleep, since it is sometimes called on
-*    interrupt time.
-*  - digi_write_bulk_callback() and digi_read_bulk_callback() are
-*    called directly from interrupts.  Hence spin_lock_irqsave()
-*    and spin_unlock_irqrestore() are used in the rest of the code
-*    for any locks they acquire.
-*  - digi_write_bulk_callback() gets the port lock before waking up
-*    processes sleeping on the port write_wait.  It also schedules
-*    wake ups so they happen from the scheduler, because the tty
-*    system can miss wake ups from interrupts.
-*  - All sleeps use a timeout of DIGI_RETRY_TIMEOUT before looping to
-*    recheck the condition they are sleeping on.  This is defensive,
-*    in case a wake up is lost.
-*  - Following Documentation/DocBook/kernel-locking.tmpl no spin locks
-*    are held when calling copy_to/from_user or printk.
 */
 
 #include <linux/kernel.h>
@@ -654,7 +438,6 @@ static int digi_write_oob_command(struct usb_serial_port *port,
                         len &= ~3;
                 memcpy(oob_port->write_urb->transfer_buffer, buf, len);
                 oob_port->write_urb->transfer_buffer_length = len;
-                oob_port->write_urb->dev = port->serial->dev;
                 ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);
                 if (ret == 0) {
                         oob_priv->dp_write_urb_in_use = 1;
@@ -732,7 +515,6 @@ static int digi_write_inb_command(struct usb_serial_port *port,
                         memcpy(data, buf, len);
                         port->write_urb->transfer_buffer_length = len;
                 }
-                port->write_urb->dev = port->serial->dev;
 
                 ret = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (ret == 0) {
@@ -803,7 +585,6 @@ static int digi_set_modem_signals(struct usb_serial_port *port,
         data[7] = 0;
 
         oob_port->write_urb->transfer_buffer_length = 8;
-        oob_port->write_urb->dev = port->serial->dev;
 
         ret = usb_submit_urb(oob_port->write_urb, GFP_ATOMIC);
         if (ret == 0) {
@@ -899,10 +680,8 @@ static void digi_rx_unthrottle(struct tty_struct *tty)
         spin_lock_irqsave(&priv->dp_port_lock, flags);
 
         /* restart read chain */
-        if (priv->dp_throttle_restart) {
-                port->read_urb->dev = port->serial->dev;
+        if (priv->dp_throttle_restart)
                 ret = usb_submit_urb(port->read_urb, GFP_ATOMIC);
-        }
 
         /* turn throttle off */
         priv->dp_throttled = 0;
@@ -1195,7 +974,6 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port,
         }
 
         port->write_urb->transfer_buffer_length = data_len+2;
-        port->write_urb->dev = port->serial->dev;
 
         *data++ = DIGI_CMD_SEND_DATA;
         *data++ = data_len;
@@ -1271,7 +1049,6 @@ static void digi_write_bulk_callback(struct urb *urb)
                         = (unsigned char)priv->dp_out_buf_len;
                 port->write_urb->transfer_buffer_length =
                                                 priv->dp_out_buf_len + 2;
-                port->write_urb->dev = serial->dev;
                 memcpy(port->write_urb->transfer_buffer + 2, priv->dp_out_buf,
                         priv->dp_out_buf_len);
                 ret = usb_submit_urb(port->write_urb, GFP_ATOMIC);
@@ -1473,7 +1250,6 @@ static int digi_startup_device(struct usb_serial *serial)
         /* set USB_DISABLE_SPD flag for write bulk urbs */
         for (i = 0; i < serial->type->num_ports + 1; i++) {
                 port = serial->port[i];
-                port->write_urb->dev = port->serial->dev;
                 ret = usb_submit_urb(port->read_urb, GFP_KERNEL);
                 if (ret != 0) {
                         dev_err(&port->dev,
@@ -1616,7 +1392,6 @@ static void digi_read_bulk_callback(struct urb *urb)
         }
 
         /* continue read */
-        urb->dev = port->serial->dev;
         ret = usb_submit_urb(urb, GFP_ATOMIC);
         if (ret != 0 && ret != -EPERM) {
                 dev_err(&port->dev,
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index ff3db5d056a5..c290df97108e 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2105,6 +2105,9 @@ static void ftdi_set_termios(struct tty_struct *tty,
 
         cflag = termios->c_cflag;
 
+        if (old_termios == 0)
+                goto no_skip;
+
         if (old_termios->c_cflag == termios->c_cflag
             && old_termios->c_ispeed == termios->c_ispeed
             && old_termios->c_ospeed == termios->c_ospeed)
@@ -2118,6 +2121,7 @@ static void ftdi_set_termios(struct tty_struct *tty,
             (termios->c_cflag & (CSIZE|PARODD|PARENB|CMSPAR|CSTOPB)))
                 goto no_data_parity_stop_changes;
 
+no_skip:
         /* Set number of data bits, parity, stop bits */
 
         urb_value = 0;
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 1a49ca9c8ea5..bf12565f8e87 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -901,7 +901,6 @@ static int garmin_init_session(struct usb_serial_port *port)
                 usb_kill_urb(port->interrupt_in_urb);
 
                 dbg("%s - adding interrupt input", __func__);
-                port->interrupt_in_urb->dev = serial->dev;
                 status = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
                 if (status)
                         dev_err(&serial->dev->dev,
@@ -1277,7 +1276,6 @@ static void garmin_read_int_callback(struct urb *urb)
         unsigned long flags;
         int retval;
         struct usb_serial_port *port = urb->context;
-        struct usb_serial *serial = port->serial;
         struct garmin_data *garmin_data_p = usb_get_serial_port_data(port);
         unsigned char *data = urb->transfer_buffer;
         int status = urb->status;
@@ -1311,12 +1309,6 @@ static void garmin_read_int_callback(struct urb *urb)
                 if (0 == (garmin_data_p->flags & FLAGS_BULK_IN_ACTIVE)) {
 
                         /* bulk data available */
-                        usb_fill_bulk_urb(port->read_urb, serial->dev,
-                                        usb_rcvbulkpipe(serial->dev,
-                                                port->bulk_in_endpointAddress),
-                                        port->read_urb->transfer_buffer,
-                                        port->read_urb->transfer_buffer_length,
-                                        garmin_read_bulk_callback, port);
                         retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                         if (retval) {
                                 dev_err(&port->dev,
@@ -1353,7 +1345,6 @@ static void garmin_read_int_callback(struct urb *urb)
 
         garmin_read_process(garmin_data_p, data, urb->actual_length, 0);
 
-        port->interrupt_in_urb->dev = port->serial->dev;
         retval = usb_submit_urb(urb, GFP_ATOMIC);
         if (retval)
                 dev_err(&urb->dev->dev,
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index e4db5ad2bc55..f7403576f99f 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -1,7 +1,7 @@
 /*
  * USB Serial Converter Generic functions
  *
- * Copyright (C) 2010 Johan Hovold (jhovold@gmail.com)
+ * Copyright (C) 2010 - 2011 Johan Hovold (jhovold@gmail.com)
  * Copyright (C) 1999 - 2002 Greg Kroah-Hartman (greg@kroah.com)
  *
  *      This program is free software; you can redistribute it and/or
@@ -132,7 +132,7 @@ int usb_serial_generic_open(struct tty_struct *tty, struct usb_serial_port *port
 
         /* if we have a bulk endpoint, start reading from it */
         if (port->bulk_in_size)
-                result = usb_serial_generic_submit_read_urb(port, GFP_KERNEL);
+                result = usb_serial_generic_submit_read_urbs(port, GFP_KERNEL);
 
         return result;
 }
@@ -157,8 +157,10 @@ static void generic_cleanup(struct usb_serial_port *port)
                         kfifo_reset_out(&port->write_fifo);
                         spin_unlock_irqrestore(&port->lock, flags);
                 }
-                if (port->bulk_in_size)
-                        usb_kill_urb(port->read_urb);
+                if (port->bulk_in_size) {
+                        for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i)
+                                usb_kill_urb(port->read_urbs[i]);
+                }
         }
 }
 
@@ -308,19 +310,52 @@ int usb_serial_generic_chars_in_buffer(struct tty_struct *tty)
         return chars;
 }
 
-int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
+static int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
+                                                int index, gfp_t mem_flags)
+{
+        int res;
+
+        if (!test_and_clear_bit(index, &port->read_urbs_free))
+                return 0;
+
+        dbg("%s - port %d, urb %d\n", __func__, port->number, index);
+
+        res = usb_submit_urb(port->read_urbs[index], mem_flags);
+        if (res) {
+                if (res != -EPERM) {
+                        dev_err(&port->dev,
+                                        "%s - usb_submit_urb failed: %d\n",
+                                        __func__, res);
+                }
+                set_bit(index, &port->read_urbs_free);
+                return res;
+        }
+
+        return 0;
+}
+
+int usb_serial_generic_submit_read_urbs(struct usb_serial_port *port,
                                         gfp_t mem_flags)
 {
-        int result;
+        int res;
+        int i;
 
-        result = usb_submit_urb(port->read_urb, mem_flags);
-        if (result && result != -EPERM) {
-                dev_err(&port->dev, "%s - error submitting urb: %d\n",
-                                                        __func__, result);
+        dbg("%s - port %d", __func__, port->number);
+
+        for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) {
+                res = usb_serial_generic_submit_read_urb(port, i, mem_flags);
+                if (res)
+                        goto err;
         }
-        return result;
+
+        return 0;
+err:
+        for (; i >= 0; --i)
+                usb_kill_urb(port->read_urbs[i]);
+
+        return res;
 }
-EXPORT_SYMBOL_GPL(usb_serial_generic_submit_read_urb);
+EXPORT_SYMBOL_GPL(usb_serial_generic_submit_read_urbs);
 
 void usb_serial_generic_process_read_urb(struct urb *urb)
 {
@@ -356,14 +391,19 @@ void usb_serial_generic_read_bulk_callback(struct urb *urb)
 {
         struct usb_serial_port *port = urb->context;
         unsigned char *data = urb->transfer_buffer;
-        int status = urb->status;
         unsigned long flags;
+        int i;
 
-        dbg("%s - port %d", __func__, port->number);
+        for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) {
+                if (urb == port->read_urbs[i])
+                        break;
+        }
+        set_bit(i, &port->read_urbs_free);
 
-        if (unlikely(status != 0)) {
-                dbg("%s - nonzero read bulk status received: %d",
-                    __func__, status);
+        dbg("%s - port %d, urb %d, len %d\n", __func__, port->number, i,
+                                                        urb->actual_length);
+        if (urb->status) {
+                dbg("%s - non-zero urb status: %d\n", __func__, urb->status);
                 return;
         }
 
@@ -376,7 +416,7 @@ void usb_serial_generic_read_bulk_callback(struct urb *urb)
         port->throttled = port->throttle_req;
         if (!port->throttled) {
                 spin_unlock_irqrestore(&port->lock, flags);
-                usb_serial_generic_submit_read_urb(port, GFP_ATOMIC);
+                usb_serial_generic_submit_read_urb(port, i, GFP_ATOMIC);
         } else
                 spin_unlock_irqrestore(&port->lock, flags);
 }
@@ -443,7 +483,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
         spin_unlock_irq(&port->lock);
 
         if (was_throttled)
-                usb_serial_generic_submit_read_urb(port, GFP_KERNEL);
+                usb_serial_generic_submit_read_urbs(port, GFP_KERNEL);
 }
 EXPORT_SYMBOL_GPL(usb_serial_generic_unthrottle);
 
@@ -509,8 +549,9 @@ int usb_serial_generic_resume(struct usb_serial *serial)
                 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
                         continue;
 
-                if (port->read_urb) {
-                        r = usb_submit_urb(port->read_urb, GFP_NOIO);
+                if (port->bulk_in_size) {
+                        r = usb_serial_generic_submit_read_urbs(port,
+                                                                GFP_NOIO);
                         if (r < 0)
                                 c++;
                 }
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 2ee807523f53..abd2ee2b2f99 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -610,7 +610,6 @@ static void edge_interrupt_callback(struct urb *urb)
 
                                         /* we have pending bytes on the
                                            bulk in pipe, send a request */
-                                        edge_serial->read_urb->dev = edge_serial->serial->dev;
                                         result = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);
                                         if (result) {
                                                 dev_err(&edge_serial->serial->dev->dev, "%s - usb_submit_urb(read bulk) failed with result = %d\n", __func__, result);
@@ -711,7 +710,6 @@ static void edge_bulk_in_callback(struct urb *urb)
         /* check to see if there's any more data for us to read */
         if (edge_serial->rxBytesAvail > 0) {
                 dbg("%s - posting a read", __func__);
-                edge_serial->read_urb->dev = edge_serial->serial->dev;
                 retval = usb_submit_urb(edge_serial->read_urb, GFP_ATOMIC);
                 if (retval) {
                         dev_err(&urb->dev->dev,
@@ -1330,7 +1328,6 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
         edge_port->txCredits -= count;
         edge_port->icount.tx += count;
 
-        urb->dev = edge_serial->serial->dev;
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status) {
                 /* something went wrong */
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 0aac00afb5c8..e44d375edaad 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -15,13 +15,6 @@
  * For questions or problems with this driver, contact Inside Out
  * Networks technical support, or Peter Berger <pberger@brimson.com>,
  * or Al Borchers <alborchers@steinerpoint.com>.
- *
- * Version history:
- *
- *      July 11, 2002   Removed 4 port device structure since all TI UMP
- *                      chips have only 2 ports
- *                      David Iacovelli (davidi@ionetworks.com)
- *
  */
 
 #include <linux/kernel.h>
@@ -1777,12 +1770,11 @@ static void edge_bulk_in_callback(struct urb *urb)
 exit:
         /* continue read unless stopped */
         spin_lock(&edge_port->ep_lock);
-        if (edge_port->ep_read_urb_state == EDGE_READ_URB_RUNNING) {
-                urb->dev = edge_port->port->serial->dev;
+        if (edge_port->ep_read_urb_state == EDGE_READ_URB_RUNNING)
                 retval = usb_submit_urb(urb, GFP_ATOMIC);
-        } else if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPING) {
+        else if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPING)
                 edge_port->ep_read_urb_state = EDGE_READ_URB_STOPPED;
-        }
+
         spin_unlock(&edge_port->ep_lock);
         if (retval)
                 dev_err(&urb->dev->dev,
@@ -1959,9 +1951,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
                         status = -EINVAL;
                         goto release_es_lock;
                 }
-                urb->complete = edge_interrupt_callback;
                 urb->context = edge_serial;
-                urb->dev = dev;
                 status = usb_submit_urb(urb, GFP_KERNEL);
                 if (status) {
                         dev_err(&port->dev,
@@ -1987,9 +1977,7 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
                 goto unlink_int_urb;
         }
         edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
-        urb->complete = edge_bulk_in_callback;
         urb->context = edge_port;
-        urb->dev = dev;
         status = usb_submit_urb(urb, GFP_KERNEL);
         if (status) {
                 dev_err(&port->dev,
@@ -2118,12 +2106,7 @@ static void edge_send(struct tty_struct *tty)
                                 port->write_urb->transfer_buffer);
 
         /* set up our urb */
-        usb_fill_bulk_urb(port->write_urb, port->serial->dev,
-                           usb_sndbulkpipe(port->serial->dev,
-                                            port->bulk_out_endpointAddress),
-                           port->write_urb->transfer_buffer, count,
-                           edge_bulk_out_callback,
-                           port);
+        port->write_urb->transfer_buffer_length = count;
 
         /* send the data out the bulk port */
         result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
@@ -2267,9 +2250,6 @@ static int restart_read(struct edgeport_port *edge_port)
 
         if (edge_port->ep_read_urb_state == EDGE_READ_URB_STOPPED) {
                 urb = edge_port->port->read_urb;
-                urb->complete = edge_bulk_in_callback;
-                urb->context = edge_port;
-                urb->dev = edge_port->port->serial->dev;
                 status = usb_submit_urb(urb, GFP_ATOMIC);
         }
         edge_port->ep_read_urb_state = EDGE_READ_URB_RUNNING;
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 4735931b4c7b..36f5cbe90485 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -8,40 +8,6 @@
  *      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.
- *
- * (12/12/2002) ganesh
- *      Added support for practically all devices supported by ActiveSync
- *      on Windows. Thanks to Wes Cilldhaire <billybobjoehenrybob@hotmail.com>.
- *
- * (26/11/2002) ganesh
- *      Added insmod options to specify product and vendor id.
- *      Use modprobe ipaq vendor=0xfoo product=0xbar
- *
- * (26/7/2002) ganesh
- *      Fixed up broken error handling in ipaq_open. Retry the "kickstart"
- *      packet much harder - this drastically reduces connection failures.
- *
- * (30/4/2002) ganesh
- *      Added support for the Casio EM500. Completely untested. Thanks
- *      to info from Nathan <wfilardo@fuse.net>
- *
- * (19/3/2002) ganesh
- *      Don't submit urbs while holding spinlocks. Not strictly necessary
- *      in 2.5.x.
- *
- * (8/3/2002) ganesh
- *      The ipaq sometimes emits a '\0' before the CLIENT string. At this
- *      point of time, the ppp ldisc is not yet attached to the tty, so
- *      n_tty echoes "^ " to the ipaq, which messes up the chat. In 2.5.6-pre2
- *      this causes a panic because echo_char() tries to sleep in interrupt
- *      context.
- *      The fix is to tell the upper layers that this is a raw device so that
- *      echoing is suppressed. Thanks to Lyle Lindholm for a detailed bug
- *      report.
- *
- * (25/2/2002) ganesh
- *      Added support for the HP Jornada 548 and 568. Completely untested.
- *      Thanks to info from Heath Robinson and Arieh Davidoff.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index ccbce4066d04..0c537da0d3cd 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -22,38 +22,6 @@
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
- *
- * 2008_Jun_02  Felipe Balbi <me@felipebalbi.com>
- *      Introduced common header to be used also in USB Gadget Framework.
- *      Still needs some other style fixes.
- *
- * 2007_Jun_21  Alan Cox <alan@lxorguk.ukuu.org.uk>
- *      Minimal cleanups for some of the driver problens and tty layer abuse.
- *      Still needs fixing to allow multiple dongles.
- *
- * 2002_Mar_07  greg kh
- *      moved some needed structures and #define values from the
- *      net/irda/irda-usb.h file into our file, as we don't want to depend on
- *      that codebase compiling correctly :)
- *
- * 2002_Jan_14  gb
- *      Added module parameter to force specific number of XBOFs.
- *      Added ir_xbof_change().
- *      Reorganized read_bulk_callback error handling.
- *      Switched from FILL_BULK_URB() to usb_fill_bulk_urb().
- *
- * 2001_Nov_08  greg kh
- *      Changed the irda_usb_find_class_desc() function based on comments and
- *      code from Martin Diehl.
- *
- * 2001_Nov_01  greg kh
- *      Added support for more IrDA USB devices.
- *      Added support for zero packet.  Added buffer override paramater, so
- *      users can transfer larger packets at once if they wish.  Both patches
- *      came from Dag Brattli <dag@obexcode.com>.
- *
- * 2001_Oct_07  greg kh
- *      initial version released.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
index 6aca631a407a..64d0ffd4440b 100644
--- a/drivers/usb/serial/iuu_phoenix.c
+++ b/drivers/usb/serial/iuu_phoenix.c
@@ -1168,15 +1168,14 @@ static int iuu_open(struct tty_struct *tty, struct usb_serial_port *port)
                           port->write_urb->transfer_buffer, 1,
                           read_rxcmd_callback, port);
         result = usb_submit_urb(port->write_urb, GFP_KERNEL);
-
         if (result) {
                 dev_err(&port->dev, "%s - failed submitting read urb,"
                         " error %d\n", __func__, result);
                 iuu_close(port);
-                return -EPROTO;
         } else {
                 dbg("%s - rxcmd OK", __func__);
         }
+
         return result;
 }
 
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index a442352d7b61..bc8dc203e818 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -25,73 +25,6 @@
 
   Tip 'o the hat to IBM (and previously Linuxcare :) for supporting
   staff in their work on open source projects.
-
-  Change History
-
-    2003sep04   LPM (Keyspan) add support for new single port product USA19HS.
-                                Improve setup message handling for all devices.
-
-    Wed Feb 19 22:00:00 PST 2003 (Jeffrey S. Laing <keyspan@jsl.com>)
-      Merged the current (1/31/03) Keyspan code with the current (2.4.21-pre4)
-      Linux source tree.  The Linux tree lacked support for the 49WLC and
-      others.  The Keyspan patches didn't work with the current kernel.
-
-    2003jan30   LPM     add support for the 49WLC and MPR
-
-    Wed Apr 25 12:00:00 PST 2002 (Keyspan)
-      Started with Hugh Blemings' code dated Jan 17, 2002.  All adapters
-      now supported (including QI and QW).  Modified port open, port
-      close, and send setup() logic to fix various data and endpoint
-      synchronization bugs and device LED status bugs.  Changed keyspan_
-      write_room() to accurately return transmit buffer availability.
-      Changed forwardingLength from 1 to 16 for all adapters.
-
-    Fri Oct 12 16:45:00 EST 2001
-      Preliminary USA-19QI and USA-28 support (both test OK for me, YMMV)
-
-    Wed Apr 25 12:00:00 PST 2002 (Keyspan)
-      Started with Hugh Blemings' code dated Jan 17, 2002.  All adapters
-      now supported (including QI and QW).  Modified port open, port
-      close, and send setup() logic to fix various data and endpoint
-      synchronization bugs and device LED status bugs.  Changed keyspan_
-      write_room() to accurately return transmit buffer availability.
-      Changed forwardingLength from 1 to 16 for all adapters.
-
-    Fri Oct 12 16:45:00 EST 2001
-      Preliminary USA-19QI and USA-28 support (both test OK for me, YMMV)
-
-    Mon Oct  8 14:29:00 EST 2001 hugh
-      Fixed bug that prevented mulitport devices operating correctly
-      if they weren't the first unit attached.
-
-    Sat Oct  6 12:31:21 EST 2001 hugh
-      Added support for USA-28XA and -28XB, misc cleanups, break support
-      for usa26 based models thanks to David Gibson.
-
-    Thu May 31 11:56:42 PDT 2001 gkh
-      switched from using spinlock to a semaphore
-
-    (04/08/2001) gb
-        Identify version on module load.
-
-    (11/01/2000) Adam J. Richter
-        usb_device_id table support.
-
-    Tue Oct 10 23:15:33 EST 2000 Hugh
-      Merged Paul's changes with my USA-49W mods.  Work in progress
-      still...
-
-    Wed Jul 19 14:00:42 EST 2000 gkh
-      Added module_init and module_exit functions to handle the fact that
-      this driver is a loadable module now.
-
-    Tue Jul 18 16:14:52 EST 2000 Hugh
-      Basic character input/output for USA-19 now mostly works,
-      fixed at 9600 baud for the moment.
-
-    Sat Jul  8 11:11:48 EST 2000 Hugh
-      First public release - nothing works except the firmware upload.
-      Tested on PPC and x86 architectures, seems to behave...
 */
 
 
@@ -397,7 +330,6 @@ static int keyspan_write(struct tty_struct *tty,
                 /* send the data out the bulk port */
                 this_urb->transfer_buffer_length = todo + dataOffset;
 
-                this_urb->dev = port->serial->dev;
                 err = usb_submit_urb(this_urb, GFP_ATOMIC);
                 if (err != 0)
                         dbg("usb_submit_urb(write bulk) failed (%d)", err);
@@ -463,7 +395,6 @@ static void	usa26_indat_callback(struct urb *urb)
         tty_kref_put(tty);
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = port->serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -559,7 +490,6 @@ static void	usa26_instat_callback(struct urb *urb)
         }
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -609,7 +539,6 @@ static void usa28_indat_callback(struct urb *urb)
                 tty_kref_put(tty);
 
                 /* Resubmit urb so we continue receiving */
-                urb->dev = port->serial->dev;
                 err = usb_submit_urb(urb, GFP_ATOMIC);
                 if (err != 0)
                         dbg("%s - resubmit read urb failed. (%d)",
@@ -694,7 +623,6 @@ static void	usa28_instat_callback(struct urb *urb)
         }
 
                 /* Resubmit urb so we continue receiving */
-        urb->dev = serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -789,8 +717,6 @@ static void	usa49_instat_callback(struct urb *urb)
         }
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = serial->dev;
-
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -848,7 +774,6 @@ static void	usa49_indat_callback(struct urb *urb)
         tty_kref_put(tty);
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = port->serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -919,8 +844,6 @@ static void usa49wg_indat_callback(struct urb *urb)
         }
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = serial->dev;
-
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -996,7 +919,6 @@ static void usa90_indat_callback(struct urb *urb)
         }
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = port->serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -1047,7 +969,6 @@ static void	usa90_instat_callback(struct urb *urb)
         }
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -1123,7 +1044,6 @@ static void	usa67_instat_callback(struct urb *urb)
         }
 
         /* Resubmit urb so we continue receiving */
-        urb->dev = serial->dev;
         err = usb_submit_urb(urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - resubmit read urb failed. (%d)", __func__, err);
@@ -1223,7 +1143,6 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
                 urb = p_priv->in_urbs[i];
                 if (urb == NULL)
                         continue;
-                urb->dev = serial->dev;
 
                 /* make sure endpoint data toggle is synchronized
                    with the device */
@@ -1239,7 +1158,6 @@ static int keyspan_open(struct tty_struct *tty, struct usb_serial_port *port)
                 urb = p_priv->out_urbs[i];
                 if (urb == NULL)
                         continue;
-                urb->dev = serial->dev;
                 /* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe),
                                                 usb_pipeout(urb->pipe), 0); */
         }
@@ -1956,7 +1874,6 @@ static int keyspan_usa26_send_setup(struct usb_serial *serial,
         /* send the data out the device on control endpoint */
         this_urb->transfer_buffer_length = sizeof(msg);
 
-        this_urb->dev = serial->dev;
         err = usb_submit_urb(this_urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err);
@@ -2084,7 +2001,6 @@ static int keyspan_usa28_send_setup(struct usb_serial *serial,
         /* send the data out the device on control endpoint */
         this_urb->transfer_buffer_length = sizeof(msg);
 
-        this_urb->dev = serial->dev;
         err = usb_submit_urb(this_urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - usb_submit_urb(setup) failed", __func__);
@@ -2271,8 +2187,6 @@ static int keyspan_usa49_send_setup(struct usb_serial *serial,
 
                 /* send the data out the device on control endpoint */
                 this_urb->transfer_buffer_length = sizeof(msg);
-
-                this_urb->dev = serial->dev;
         }
         err = usb_submit_urb(this_urb, GFP_ATOMIC);
         if (err != 0)
@@ -2415,7 +2329,6 @@ static int keyspan_usa90_send_setup(struct usb_serial *serial,
         /* send the data out the device on control endpoint */
         this_urb->transfer_buffer_length = sizeof(msg);
 
-        this_urb->dev = serial->dev;
         err = usb_submit_urb(this_urb, GFP_ATOMIC);
         if (err != 0)
                 dbg("%s - usb_submit_urb(setup) failed (%d)", __func__, err);
@@ -2561,7 +2474,6 @@ static int keyspan_usa67_send_setup(struct usb_serial *serial,
 
         /* send the data out the device on control endpoint */
         this_urb->transfer_buffer_length = sizeof(msg);
-        this_urb->dev = serial->dev;
 
         err = usb_submit_urb(this_urb, GFP_ATOMIC);
         if (err != 0)
@@ -2650,14 +2562,12 @@ static int keyspan_startup(struct usb_serial *serial)
         keyspan_setup_urbs(serial);
 
         if (s_priv->instat_urb != NULL) {
-                s_priv->instat_urb->dev = serial->dev;
                 err = usb_submit_urb(s_priv->instat_urb, GFP_KERNEL);
                 if (err != 0)
                         dbg("%s - submit instat urb failed %d", __func__,
                                 err);
         }
         if (s_priv->indat_urb != NULL) {
-                s_priv->indat_urb->dev = serial->dev;
                 err = usb_submit_urb(s_priv->indat_urb, GFP_KERNEL);
                 if (err != 0)
                         dbg("%s - submit indat urb failed %d", __func__,
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index d5c0c6ab4966..a40615674a68 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -12,59 +12,6 @@
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
- *
- * (09/07/2001) gkh
- *      cleaned up the Xircom support.  Added ids for Entregra device which is
- *      the same as the Xircom device.  Enabled the code to be compiled for
- *      either Xircom or Keyspan devices.
- *
- * (08/11/2001) Cristian M. Craciunescu
- *      support for Xircom PGSDB9
- *
- * (05/31/2001) gkh
- *      switched from using spinlock to a semaphore, which fixes lots of
- *      problems.
- *
- * (04/08/2001) gb
- *      Identify version on module load.
- *
- * (11/01/2000) Adam J. Richter
- *      usb_device_id table support
- *
- * (10/05/2000) gkh
- *      Fixed bug with urb->dev not being set properly, now that the usb
- *      core needs it.
- *
- * (08/28/2000) gkh
- *      Added locks for SMP safeness.
- *      Fixed MOD_INC and MOD_DEC logic and the ability to open a port more
- *      than once.
- *
- * (07/20/2000) borchers
- *      - keyspan_pda_write no longer sleeps if it is called on interrupt time;
- *        PPP and the line discipline with stty echo on can call write on
- *        interrupt time and this would cause an oops if write slept
- *      - if keyspan_pda_write is in an interrupt, it will not call
- *        usb_control_msg (which sleeps) to query the room in the device
- *        buffer, it simply uses the current room value it has
- *      - if the urb is busy or if it is throttled keyspan_pda_write just
- *        returns 0, rather than sleeping to wait for this to change; the
- *        write_chan code in n_tty.c will sleep if needed before calling
- *        keyspan_pda_write again
- *      - if the device needs to be unthrottled, write now queues up the
- *        call to usb_control_msg (which sleeps) to unthrottle the device
- *      - the wakeups from keyspan_pda_write_bulk_callback are queued rather
- *        than done directly from the callback to avoid the race in write_chan
- *      - keyspan_pda_chars_in_buffer also indicates its buffer is full if the
- *        urb status is -EINPROGRESS, meaning it cannot write at the moment
- *
- * (07/19/2000) gkh
- *      Added module_init and module_exit functions to handle the fact that this
- *      driver is a loadable module now.
- *
- * (03/26/2000) gkh
- *      Split driver up into device specific pieces.
- *
  */
 
 
@@ -290,7 +237,6 @@ static void keyspan_pda_rx_unthrottle(struct tty_struct *tty)
         struct usb_serial_port *port = tty->driver_data;
         /* just restart the receive interrupt URB */
         dbg("keyspan_pda_rx_unthrottle port %d", port->number);
-        port->interrupt_in_urb->dev = port->serial->dev;
         if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL))
                 dbg(" usb_submit_urb(read urb) failed");
 }
@@ -532,11 +478,11 @@ static int keyspan_pda_write(struct tty_struct *tty,
            the device is full (wait until it says there is room)
         */
         spin_lock_bh(&port->lock);
-        if (port->write_urb_busy || priv->tx_throttled) {
+        if (!test_bit(0, &port->write_urbs_free) || priv->tx_throttled) {
                 spin_unlock_bh(&port->lock);
                 return 0;
         }
-        port->write_urb_busy = 1;
+        clear_bit(0, &port->write_urbs_free);
         spin_unlock_bh(&port->lock);
 
         /* At this point the URB is in our control, nobody else can submit it
@@ -598,7 +544,6 @@ static int keyspan_pda_write(struct tty_struct *tty,
 
                 priv->tx_room -= count;
 
-                port->write_urb->dev = port->serial->dev;
                 rc = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (rc) {
                         dbg(" usb_submit_urb(write bulk) failed");
@@ -618,7 +563,7 @@ static int keyspan_pda_write(struct tty_struct *tty,
         rc = count;
 exit:
         if (rc < 0)
-                port->write_urb_busy = 0;
+                set_bit(0, &port->write_urbs_free);
         return rc;
 }
 
@@ -628,7 +573,7 @@ static void keyspan_pda_write_bulk_callback(struct urb *urb)
         struct usb_serial_port *port = urb->context;
         struct keyspan_pda_private *priv;
 
-        port->write_urb_busy = 0;
+        set_bit(0, &port->write_urbs_free);
         priv = usb_get_serial_port_data(port);
 
         /* queue up a wakeup at scheduler time */
@@ -661,7 +606,7 @@ static int keyspan_pda_chars_in_buffer(struct tty_struct *tty)
            n_tty.c:normal_poll() ) that we're not writeable. */
 
         spin_lock_irqsave(&port->lock, flags);
-        if (port->write_urb_busy || priv->tx_throttled)
+        if (!test_bit(0, &port->write_urbs_free) || priv->tx_throttled)
                 ret = 256;
         spin_unlock_irqrestore(&port->lock, flags);
         return ret;
@@ -717,7 +662,6 @@ static int keyspan_pda_open(struct tty_struct *tty,
         priv->tx_throttled = *room ? 0 : 1;
 
         /*Start reading from the device*/
-        port->interrupt_in_urb->dev = serial->dev;
         rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (rc) {
                 dbg("%s - usb_submit_urb(read int) failed", __func__);
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index ddd146300ddb..5d3beeeb5fd9 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -20,18 +20,6 @@
  *
  * Supported readers: USB TWIN, KAAN Standard Plus and SecOVID Reader Plus
  * (Adapter K), B1 Professional and KAAN Professional (Adapter B)
- *
- * (21/05/2004) tw
- *      Fix bug with P'n'P readers
- *
- * (28/05/2003) tw
- *      Add support for KAAN SIM
- *
- * (12/09/2002) tw
- *      Adapted to 2.5.
- *
- * (11/08/2002) tw
- *      Initial version.
  */
 
 
@@ -231,9 +219,6 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
         dbg("%s - port %d", __func__, port->number);
         priv = usb_get_serial_port_data(port);
 
-        /* someone sets the dev to 0 if the close method has been called */
-        port->interrupt_in_urb->dev = port->serial->dev;
-
         /* allocate memory for transfer buffer */
         transfer_buffer = kzalloc(transfer_buffer_length, GFP_KERNEL);
         if (!transfer_buffer)
@@ -393,8 +378,6 @@ static void kobil_read_int_callback(struct urb *urb)
                 tty_flip_buffer_push(tty);
         }
         tty_kref_put(tty);
-        /* someone sets the dev to 0 if the close method has been called */
-        port->interrupt_in_urb->dev = port->serial->dev;
 
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         dbg("%s - port %d Send read URB returns: %i",
@@ -475,17 +458,9 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port,
                 priv->filled = 0;
                 priv->cur_pos = 0;
 
-                /* someone sets the dev to 0 if the close method
-                   has been called */
-                port->interrupt_in_urb->dev = port->serial->dev;
-
                 /* start reading (except TWIN and KAAN SIM) */
                 if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID ||
                         priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) {
-                        /* someone sets the dev to 0 if the close method has
-                           been called */
-                        port->interrupt_in_urb->dev = port->serial->dev;
-
                         result = usb_submit_urb(port->interrupt_in_urb,
                                                                 GFP_NOIO);
                         dbg("%s - port %d Send read URB returns: %i",
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index ba0d28727ccb..a975bb80303f 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -19,50 +19,6 @@
  *   DTR/RTS signal handling may be incomplete or incorrect. I have mainly
  *   implemented what I have seen with SniffUSB or found in belkin_sa.c.
  *   For further TODOs check also belkin_sa.c.
- *
- * TEST STATUS:
- *   Basic tests have been performed with minicom/zmodem transfers and
- *   modem dialing under Linux 2.4.0-test10 (for me it works fine).
- *
- * 04-Nov-2003 Bill Marr <marr at flex dot com>
- *   - Mimic Windows driver by sending 2 USB 'device request' messages
- *     following normal 'baud rate change' message.  This allows data to be
- *     transmitted to RS-232 devices which don't assert the 'CTS' signal.
- *
- * 10-Nov-2001 Wolfgang Grandegger
- *   - Fixed an endianess problem with the baudrate selection for PowerPC.
- *
- * 06-Dec-2001 Martin Hamilton <martinh@gnu.org>
- *   - Added support for the Belkin F5U109 DB9 adaptor
- *
- * 30-May-2001 Greg Kroah-Hartman
- *   - switched from using spinlock to a semaphore, which fixes lots of
- *     problems.
- *
- * 04-May-2001 Stelian Pop
- *   - Set the maximum bulk output size for Sitecom U232-P25 model to 16 bytes
- *     instead of the device reported 32 (using 32 bytes causes many data
- *     loss, Windows driver uses 16 too).
- *
- * 02-May-2001 Stelian Pop
- *   - Fixed the baud calculation for Sitecom U232-P25 model
- *
- * 08-Apr-2001 gb
- *   - Identify version on module load.
- *
- * 06-Jan-2001 Cornel Ciocirlan
- *   - Added support for Sitecom U232-P25 model (Product Id 0x0230)
- *   - Added support for D-Link DU-H3SP USB BAY (Product Id 0x0200)
- *
- * 29-Nov-2000 Greg Kroah-Hartman
- *   - Added device id table to fit with 2.4.0-test11 structure.
- *   - took out DEAL_WITH_TWO_INT_IN_ENDPOINTS #define as it's not needed
- *     (lots of things will change if/when the usb-serial core changes to
- *     handle these issues.
- *
- * 27-Nov-2000 Wolfgang Grandegge
- *   A version for kernel 2.4.0-test10 released to the Linux community
- *   (via linux-usb-devel).
  */
 
 #include <linux/kernel.h>
@@ -526,7 +482,6 @@ static int  mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)
         mct_u232_msr_to_state(&priv->control_state, priv->last_msr);
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        port->read_urb->dev = port->serial->dev;
         retval = usb_submit_urb(port->read_urb, GFP_KERNEL);
         if (retval) {
                 dev_err(&port->dev,
@@ -535,7 +490,6 @@ static int  mct_u232_open(struct tty_struct *tty, struct usb_serial_port *port)
                 goto error;
         }
 
-        port->interrupt_in_urb->dev = port->serial->dev;
         retval = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (retval) {
                 usb_kill_urb(port->read_urb);
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 3524a105d042..19d112f51b97 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -939,14 +939,7 @@ static void mos7720_bulk_in_callback(struct urb *urb)
         }
         tty_kref_put(tty);
 
-        if (!port->read_urb) {
-                dbg("URB KILLED !!!");
-                return;
-        }
-
         if (port->read_urb->status != -EINPROGRESS) {
-                port->read_urb->dev = port->serial->dev;
-
                 retval = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                 if (retval)
                         dbg("usb_submit_urb(read bulk) failed, retval = %d",
@@ -1014,7 +1007,6 @@ static int mos77xx_calc_num_ports(struct usb_serial *serial)
 static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port)
 {
         struct usb_serial *serial;
-        struct usb_serial_port *port0;
         struct urb *urb;
         struct moschip_port *mos7720_port;
         int response;
@@ -1029,8 +1021,6 @@ static int mos7720_open(struct tty_struct *tty, struct usb_serial_port *port)
         if (mos7720_port == NULL)
                 return -ENODEV;
 
-        port0 = serial->port[0];
-
         usb_clear_halt(serial->dev, port->write_urb->pipe);
         usb_clear_halt(serial->dev, port->read_urb->pipe);
 
@@ -1735,8 +1725,6 @@ static void change_port_settings(struct tty_struct *tty,
         write_mos_reg(serial, port_number, IER, 0x0c);
 
         if (port->read_urb->status != -EINPROGRESS) {
-                port->read_urb->dev = serial->dev;
-
                 status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                 if (status)
                         dbg("usb_submit_urb(read bulk) failed, status = %d",
@@ -1786,13 +1774,7 @@ static void mos7720_set_termios(struct tty_struct *tty,
         /* change the port settings to the new ones specified */
         change_port_settings(tty, mos7720_port, old_termios);
 
-        if (!port->read_urb) {
-                dbg("%s", "URB KILLED !!!!!");
-                return;
-        }
-
         if (port->read_urb->status != -EINPROGRESS) {
-                port->read_urb->dev = serial->dev;
                 status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                 if (status)
                         dbg("usb_submit_urb(read bulk) failed, status = %d",
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index c72abd524983..55cfd6265b98 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -792,8 +792,6 @@ static void mos7840_bulk_in_callback(struct urb *urb)
         }
 
 
-        mos7840_port->read_urb->dev = serial->dev;
-
         mos7840_port->read_urb_busy = true;
         retval = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
 
@@ -2058,7 +2056,6 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
         mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data);
 
         if (mos7840_port->read_urb_busy == false) {
-                mos7840_port->read_urb->dev = serial->dev;
                 mos7840_port->read_urb_busy = true;
                 status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
                 if (status) {
@@ -2130,7 +2127,6 @@ static void mos7840_set_termios(struct tty_struct *tty,
         }
 
         if (mos7840_port->read_urb_busy == false) {
-                mos7840_port->read_urb->dev = serial->dev;
                 mos7840_port->read_urb_busy = true;
                 status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC);
                 if (status) {
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 60f38d5e64fc..45a8c55881d3 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -9,31 +9,6 @@
  * driver
  *
  * Please report both successes and troubles to the author at omninet@kroah.com
- *
- * (05/30/2001) gkh
- *      switched from using spinlock to a semaphore, which fixes lots of
- *      problems.
- *
- * (04/08/2001) gb
- *      Identify version on module load.
- *
- * (11/01/2000) Adam J. Richter
- *      usb_device_id table support
- *
- * (10/05/2000) gkh
- *      Fixed bug with urb->dev not being set properly, now that the usb
- *      core needs it.
- *
- * (08/28/2000) gkh
- *      Added locks for SMP safeness.
- *      Fixed MOD_INC and MOD_DEC logic and the ability to open a port more
- *      than once.
- *      Fixed potential race in omninet_write_bulk_callback
- *
- * (07/19/2000) gkh
- *      Added module_init and module_exit functions to handle the fact that this
- *      driver is a loadable module now.
- *
  */
 
 #include <linux/kernel.h>
@@ -44,7 +19,6 @@
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
 #include <linux/module.h>
-#include <linux/spinlock.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
@@ -174,12 +148,6 @@ static int omninet_open(struct tty_struct *tty, struct usb_serial_port *port)
         tty_port_tty_set(&wport->port, tty);
 
         /* Start reading from the device */
-        usb_fill_bulk_urb(port->read_urb, serial->dev,
-                        usb_rcvbulkpipe(serial->dev,
-                                port->bulk_in_endpointAddress),
-                        port->read_urb->transfer_buffer,
-                        port->read_urb->transfer_buffer_length,
-                        omninet_read_bulk_callback, port);
         result = usb_submit_urb(port->read_urb, GFP_KERNEL);
         if (result)
                 dev_err(&port->dev,
@@ -236,11 +204,6 @@ static void omninet_read_bulk_callback(struct urb *urb)
         }
 
         /* Continue trying to always read  */
-        usb_fill_bulk_urb(urb, port->serial->dev,
-                        usb_rcvbulkpipe(port->serial->dev,
-                                        port->bulk_in_endpointAddress),
-                        urb->transfer_buffer, urb->transfer_buffer_length,
-                        omninet_read_bulk_callback, port);
         result = usb_submit_urb(urb, GFP_ATOMIC);
         if (result)
                 dev_err(&port->dev,
@@ -267,14 +230,10 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
                 return 0;
         }
 
-        spin_lock_bh(&wport->lock);
-        if (wport->write_urb_busy) {
-                spin_unlock_bh(&wport->lock);
+        if (!test_and_clear_bit(0, &port->write_urbs_free)) {
                 dbg("%s - already writing", __func__);
                 return 0;
         }
-        wport->write_urb_busy = 1;
-        spin_unlock_bh(&wport->lock);
 
         count = (count > OMNINET_BULKOUTSIZE) ? OMNINET_BULKOUTSIZE : count;
 
@@ -292,10 +251,9 @@ static int omninet_write(struct tty_struct *tty, struct usb_serial_port *port,
         /* send the data out the bulk port, always 64 bytes */
         wport->write_urb->transfer_buffer_length = 64;
 
-        wport->write_urb->dev = serial->dev;
         result = usb_submit_urb(wport->write_urb, GFP_ATOMIC);
         if (result) {
-                wport->write_urb_busy = 0;
+                set_bit(0, &wport->write_urbs_free);
                 dev_err(&port->dev,
                         "%s - failed submitting write urb, error %d\n",
                         __func__, result);
@@ -314,8 +272,7 @@ static int omninet_write_room(struct tty_struct *tty)
 
         int room = 0; /* Default: no room */
 
-        /* FIXME: no consistent locking for write_urb_busy */
-        if (wport->write_urb_busy)
+        if (test_bit(0, &wport->write_urbs_free))
                 room = wport->bulk_out_size - OMNINET_HEADERLEN;
 
         dbg("%s - returns %d", __func__, room);
@@ -332,7 +289,7 @@ static void omninet_write_bulk_callback(struct urb *urb)
 
         dbg("%s - port %0x", __func__, port->number);
 
-        port->write_urb_busy = 0;
+        set_bit(0, &port->write_urbs_free);
         if (status) {
                 dbg("%s - nonzero write bulk status received: %d",
                     __func__, status);
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index c248a9147439..691f57a9d712 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -384,7 +384,6 @@ static void opticon_unthrottle(struct tty_struct *tty)
         priv->actually_throttled = false;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        priv->bulk_read_urb->dev = port->serial->dev;
         if (was_throttled) {
                 result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
                 if (result)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 6dd64534fad0..c96b6b6509fb 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -476,6 +476,10 @@ static void option_instat_callback(struct urb *urb);
 #define VIETTEL_VENDOR_ID                       0x2262
 #define VIETTEL_PRODUCT_VT1000                  0x0002
 
+/* ZD Incorporated */
+#define ZD_VENDOR_ID                            0x0685
+#define ZD_PRODUCT_7000                         0x7000
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -1178,6 +1182,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CLU528) },
         { 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) },
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 4c29e6c2bda7..2161d1c3c089 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -264,7 +264,6 @@ static void setup_line(struct work_struct *work)
         spin_unlock_irqrestore(&priv->lock, flags);
 
         dbg("%s(): submitting interrupt urb", __func__);
-        port->interrupt_in_urb->dev = port->serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
@@ -321,7 +320,6 @@ static void send_data(struct work_struct *work)
                 priv->flags.write_urb_in_use = 0;
 
                 dbg("%s(): submitting interrupt urb", __func__);
-                port->interrupt_in_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->interrupt_in_urb, GFP_NOIO);
                 if (result != 0) {
                         dev_err(&port->dev, "%s(): usb_submit_urb() failed"
@@ -334,7 +332,6 @@ static void send_data(struct work_struct *work)
                                         port->write_urb->transfer_buffer,
                                         count, &port->lock);
         port->write_urb->transfer_buffer_length = count;
-        port->write_urb->dev = port->serial->dev;
         result = usb_submit_urb(port->write_urb, GFP_NOIO);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
@@ -583,13 +580,12 @@ static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port)
         kfree(buf);
 
         dbg("%s(): submitting interrupt urb", __func__);
-        port->interrupt_in_urb->dev = serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
                                " with error %d\n", __func__, result);
                 oti6858_close(port);
-                return -EPROTO;
+                return result;
         }
 
         /* setup termios */
@@ -837,7 +833,6 @@ static void oti6858_read_int_callback(struct urb *urb)
         if (can_recv) {
                 int result;
 
-                port->read_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                 if (result != 0) {
                         priv->flags.read_urb_in_use = 0;
@@ -866,7 +861,6 @@ static void oti6858_read_int_callback(struct urb *urb)
                 int result;
 
 /*              dbg("%s(): submitting interrupt urb", __func__); */
-                urb->dev = port->serial->dev;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result != 0) {
                         dev_err(&urb->dev->dev,
@@ -894,18 +888,6 @@ static void oti6858_read_bulk_callback(struct urb *urb)
         spin_unlock_irqrestore(&priv->lock, flags);
 
         if (status != 0) {
-                /*
-                if (status == -EPROTO) {
-                        * PL2303 mysteriously fails with -EPROTO reschedule
-                           the read *
-                        dbg("%s - caught -EPROTO, resubmitting the urb",
-                                                                __func__);
-                        result = usb_submit_urb(urb, GFP_ATOMIC);
-                        if (result)
-                                dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __func__, result);
-                        return;
-                }
-                */
                 dbg("%s(): unable to handle the error, exiting", __func__);
                 return;
         }
@@ -918,7 +900,6 @@ static void oti6858_read_bulk_callback(struct urb *urb)
         tty_kref_put(tty);
 
         /* schedule the interrupt urb */
-        port->interrupt_in_urb->dev = port->serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         if (result != 0 && result != -EPERM) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
@@ -955,7 +936,6 @@ static void oti6858_write_bulk_callback(struct urb *urb)
                 dbg("%s(): overflow in write", __func__);
 
                 port->write_urb->transfer_buffer_length = 1;
-                port->write_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result) {
                         dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
@@ -968,7 +948,6 @@ static void oti6858_write_bulk_callback(struct urb *urb)
         priv->flags.write_urb_in_use = 0;
 
         /* schedule the interrupt urb if we are still open */
-        port->interrupt_in_urb->dev = port->serial->dev;
         dbg("%s(): submitting interrupt urb", __func__);
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         if (result != 0) {
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index fc2d66f7f4eb..329295615d06 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -502,21 +502,20 @@ static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
         if (tty)
                 pl2303_set_termios(tty, port, &tmp_termios);
 
-        dbg("%s - submitting read urb", __func__);
-        result = usb_serial_generic_submit_read_urb(port, GFP_KERNEL);
-        if (result) {
-                pl2303_close(port);
-                return -EPROTO;
-        }
-
         dbg("%s - submitting interrupt urb", __func__);
         result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (result) {
                 dev_err(&port->dev, "%s - failed submitting interrupt urb,"
                         " error %d\n", __func__, result);
-                pl2303_close(port);
-                return -EPROTO;
+                return result;
         }
+
+        result = usb_serial_generic_open(tty, port);
+        if (result) {
+                usb_kill_urb(port->interrupt_in_urb);
+                return result;
+        }
+
         port->port.drain_delay = 256;
         return 0;
 }
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index b18179bda0d8..f2485429172f 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -681,7 +681,6 @@ static void sierra_instat_callback(struct urb *urb)
         /* Resubmit urb so we continue receiving IRQ data */
         if (status != -ESHUTDOWN && status != -ENOENT) {
                 usb_mark_last_busy(serial->dev);
-                urb->dev = serial->dev;
                 err = usb_submit_urb(urb, GFP_ATOMIC);
                 if (err && err != -EPERM)
                         dev_err(&port->dev, "%s: resubmit intr urb "
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c
index 7096f799b071..c70cc012d03f 100644
--- a/drivers/usb/serial/symbolserial.c
+++ b/drivers/usb/serial/symbolserial.c
@@ -182,7 +182,6 @@ static void symbol_unthrottle(struct tty_struct *tty)
         priv->actually_throttled = false;
         spin_unlock_irq(&priv->lock);
 
-        priv->int_urb->dev = port->serial->dev;
         if (was_throttled) {
                 result = usb_submit_urb(priv->int_urb, GFP_KERNEL);
                 if (result)
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index ea8445689c85..4af21f46096e 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -535,9 +535,7 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
                         status = -EINVAL;
                         goto release_lock;
                 }
-                urb->complete = ti_interrupt_callback;
                 urb->context = tdev;
-                urb->dev = dev;
                 status = usb_submit_urb(urb, GFP_KERNEL);
                 if (status) {
                         dev_err(&port->dev,
@@ -619,9 +617,7 @@ static int ti_open(struct tty_struct *tty, struct usb_serial_port *port)
                 goto unlink_int_urb;
         }
         tport->tp_read_urb_state = TI_READ_URB_RUNNING;
-        urb->complete = ti_bulk_in_callback;
         urb->context = tport;
-        urb->dev = dev;
         status = usb_submit_urb(urb, GFP_KERNEL);
         if (status) {
                 dev_err(&port->dev, "%s - submit read urb failed, %d\n",
@@ -1236,12 +1232,11 @@ static void ti_bulk_in_callback(struct urb *urb)
 exit:
         /* continue to read unless stopping */
         spin_lock(&tport->tp_lock);
-        if (tport->tp_read_urb_state == TI_READ_URB_RUNNING) {
-                urb->dev = port->serial->dev;
+        if (tport->tp_read_urb_state == TI_READ_URB_RUNNING)
                 retval = usb_submit_urb(urb, GFP_ATOMIC);
-        } else if (tport->tp_read_urb_state == TI_READ_URB_STOPPING) {
+        else if (tport->tp_read_urb_state == TI_READ_URB_STOPPING)
                 tport->tp_read_urb_state = TI_READ_URB_STOPPED;
-        }
+
         spin_unlock(&tport->tp_lock);
         if (retval)
                 dev_err(dev, "%s - resubmit read urb failed, %d\n",
@@ -1574,9 +1569,7 @@ static int ti_restart_read(struct ti_port *tport, struct tty_struct *tty)
                 tport->tp_read_urb_state = TI_READ_URB_RUNNING;
                 urb = tport->tp_port->read_urb;
                 spin_unlock_irqrestore(&tport->tp_lock, flags);
-                urb->complete = ti_bulk_in_callback;
                 urb->context = tport;
-                urb->dev = tport->tp_port->serial->dev;
                 status = usb_submit_urb(urb, GFP_KERNEL);
         } else  {
                 tport->tp_read_urb_state = TI_READ_URB_RUNNING;
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index cc274fdf2627..ce6c1a65a544 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -50,7 +50,7 @@ static struct usb_driver usb_serial_driver = {
         .disconnect =   usb_serial_disconnect,
         .suspend =      usb_serial_suspend,
         .resume =       usb_serial_resume,
-        .no_dynamic_id =        1,
+        .no_dynamic_id =        1,
         .supports_autosuspend = 1,
 };
 
@@ -260,6 +260,10 @@ static int serial_activate(struct tty_port *tport, struct tty_struct *tty)
         else
                 retval = port->serial->type->open(tty, port);
         mutex_unlock(&serial->disc_mutex);
+
+        if (retval < 0)
+                retval = usb_translate_errors(retval);
+
         return retval;
 }
 
@@ -360,7 +364,8 @@ static int serial_write(struct tty_struct *tty, const unsigned char *buf,
 
         /* pass on to the driver specific version of this function */
         retval = port->serial->type->write(tty, port, buf, count);
-
+        if (retval < 0)
+                retval = usb_translate_errors(retval);
 exit:
         return retval;
 }
@@ -562,8 +567,8 @@ static void kill_traffic(struct usb_serial_port *port)
 {
         int i;
 
-        usb_kill_urb(port->read_urb);
-        usb_kill_urb(port->write_urb);
+        for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i)
+                usb_kill_urb(port->read_urbs[i]);
         for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i)
                 usb_kill_urb(port->write_urbs[i]);
         /*
@@ -595,17 +600,17 @@ static void port_release(struct device *dev)
         kill_traffic(port);
         cancel_work_sync(&port->work);
 
-        usb_free_urb(port->read_urb);
-        usb_free_urb(port->write_urb);
         usb_free_urb(port->interrupt_in_urb);
         usb_free_urb(port->interrupt_out_urb);
+        for (i = 0; i < ARRAY_SIZE(port->read_urbs); ++i) {
+                usb_free_urb(port->read_urbs[i]);
+                kfree(port->bulk_in_buffers[i]);
+        }
         for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i) {
                 usb_free_urb(port->write_urbs[i]);
                 kfree(port->bulk_out_buffers[i]);
         }
         kfifo_free(&port->write_fifo);
-        kfree(port->bulk_in_buffer);
-        kfree(port->bulk_out_buffer);
         kfree(port->interrupt_in_buffer);
         kfree(port->interrupt_out_buffer);
         kfree(port);
@@ -686,16 +691,18 @@ static int serial_carrier_raised(struct tty_port *port)
 {
         struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);
         struct usb_serial_driver *drv = p->serial->type;
+
         if (drv->carrier_raised)
                 return drv->carrier_raised(p);
         /* No carrier control - don't block */
-        return 1;       
+        return 1;
 }
 
 static void serial_dtr_rts(struct tty_port *port, int on)
 {
         struct usb_serial_port *p = container_of(port, struct usb_serial_port, port);
         struct usb_serial_driver *drv = p->serial->type;
+
         if (drv->dtr_rts)
                 drv->dtr_rts(p, on);
 }
@@ -724,6 +731,7 @@ int usb_serial_probe(struct usb_interface *interface,
         unsigned int minor;
         int buffer_size;
         int i;
+        int j;
         int num_interrupt_in = 0;
         int num_interrupt_out = 0;
         int num_bulk_in = 0;
@@ -906,38 +914,41 @@ int usb_serial_probe(struct usb_interface *interface,
         for (i = 0; i < num_bulk_in; ++i) {
                 endpoint = bulk_in_endpoint[i];
                 port = serial->port[i];
-                port->read_urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!port->read_urb) {
-                        dev_err(&interface->dev, "No free urbs available\n");
-                        goto probe_error;
-                }
                 buffer_size = max_t(int, serial->type->bulk_in_size,
                                 usb_endpoint_maxp(endpoint));
                 port->bulk_in_size = buffer_size;
                 port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
-                port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
-                if (!port->bulk_in_buffer) {
-                        dev_err(&interface->dev,
+
+                for (j = 0; j < ARRAY_SIZE(port->read_urbs); ++j) {
+                        set_bit(j, &port->read_urbs_free);
+                        port->read_urbs[j] = usb_alloc_urb(0, GFP_KERNEL);
+                        if (!port->read_urbs[j]) {
+                                dev_err(&interface->dev,
+                                                "No free urbs available\n");
+                                goto probe_error;
+                        }
+                        port->bulk_in_buffers[j] = kmalloc(buffer_size,
+                                                                GFP_KERNEL);
+                        if (!port->bulk_in_buffers[j]) {
+                                dev_err(&interface->dev,
                                         "Couldn't allocate bulk_in_buffer\n");
-                        goto probe_error;
-                }
-                usb_fill_bulk_urb(port->read_urb, dev,
-                                usb_rcvbulkpipe(dev,
+                                goto probe_error;
+                        }
+                        usb_fill_bulk_urb(port->read_urbs[j], dev,
+                                        usb_rcvbulkpipe(dev,
                                                 endpoint->bEndpointAddress),
-                                port->bulk_in_buffer, buffer_size,
-                                serial->type->read_bulk_callback, port);
+                                        port->bulk_in_buffers[j], buffer_size,
+                                        serial->type->read_bulk_callback,
+                                        port);
+                }
+
+                port->read_urb = port->read_urbs[0];
+                port->bulk_in_buffer = port->bulk_in_buffers[0];
         }
 
         for (i = 0; i < num_bulk_out; ++i) {
-                int j;
-
                 endpoint = bulk_out_endpoint[i];
                 port = serial->port[i];
-                port->write_urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!port->write_urb) {
-                        dev_err(&interface->dev, "No free urbs available\n");
-                        goto probe_error;
-                }
                 if (kfifo_alloc(&port->write_fifo, PAGE_SIZE, GFP_KERNEL))
                         goto probe_error;
                 buffer_size = serial->type->bulk_out_size;
@@ -945,17 +956,7 @@ int usb_serial_probe(struct usb_interface *interface,
                         buffer_size = usb_endpoint_maxp(endpoint);
                 port->bulk_out_size = buffer_size;
                 port->bulk_out_endpointAddress = endpoint->bEndpointAddress;
-                port->bulk_out_buffer = kmalloc(buffer_size, GFP_KERNEL);
-                if (!port->bulk_out_buffer) {
-                        dev_err(&interface->dev,
-                                        "Couldn't allocate bulk_out_buffer\n");
-                        goto probe_error;
-                }
-                usb_fill_bulk_urb(port->write_urb, dev,
-                                usb_sndbulkpipe(dev,
-                                        endpoint->bEndpointAddress),
-                                port->bulk_out_buffer, buffer_size,
-                                serial->type->write_bulk_callback, port);
+
                 for (j = 0; j < ARRAY_SIZE(port->write_urbs); ++j) {
                         set_bit(j, &port->write_urbs_free);
                         port->write_urbs[j] = usb_alloc_urb(0, GFP_KERNEL);
@@ -978,6 +979,9 @@ int usb_serial_probe(struct usb_interface *interface,
                                         serial->type->write_bulk_callback,
                                         port);
                 }
+
+                port->write_urb = port->write_urbs[0];
+                port->bulk_out_buffer = port->bulk_out_buffers[0];
         }
 
         if (serial->type->read_int_callback) {
@@ -1196,7 +1200,7 @@ static const struct tty_operations serial_ops = {
         .open =                 serial_open,
         .close =                serial_close,
         .write =                serial_write,
-        .hangup =               serial_hangup,
+        .hangup =               serial_hangup,
         .write_room =           serial_write_room,
         .ioctl =                serial_ioctl,
         .set_termios =          serial_set_termios,
@@ -1206,9 +1210,9 @@ static const struct tty_operations serial_ops = {
         .chars_in_buffer =      serial_chars_in_buffer,
         .tiocmget =             serial_tiocmget,
         .tiocmset =             serial_tiocmset,
-        .get_icount =           serial_get_icount,
-        .cleanup =              serial_cleanup,
-        .install =              serial_install,
+        .get_icount =           serial_get_icount,
+        .cleanup =              serial_cleanup,
+        .install =              serial_install,
         .proc_fops =            &serial_proc_fops,
 };
 
@@ -1237,7 +1241,7 @@ static int __init usb_serial_init(void)
 
         usb_serial_tty_driver->owner = THIS_MODULE;
         usb_serial_tty_driver->driver_name = "usbserial";
-        usb_serial_tty_driver->name =   "ttyUSB";
+        usb_serial_tty_driver->name = "ttyUSB";
         usb_serial_tty_driver->major = SERIAL_TTY_MAJOR;
         usb_serial_tty_driver->minor_start = 0;
         usb_serial_tty_driver->type = TTY_DRIVER_TYPE_SERIAL;
@@ -1336,7 +1340,6 @@ static void fixup_generic(struct usb_serial_driver *device)
 
 int usb_serial_register(struct usb_serial_driver *driver)
 {
-        /* must be called with BKL held */
         int retval;
 
         if (usb_disabled())
@@ -1374,7 +1377,6 @@ EXPORT_SYMBOL_GPL(usb_serial_register);
 
 void usb_serial_deregister(struct usb_serial_driver *device)
 {
-        /* must be called with BKL held */
         printk(KERN_INFO "USB Serial deregistering driver %s\n",
                device->description);
         mutex_lock(&table_lock);
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
index 95a82148ee81..9b632e753210 100644
--- a/drivers/usb/serial/usb_debug.c
+++ b/drivers/usb/serial/usb_debug.c
@@ -40,7 +40,7 @@ static struct usb_driver debug_driver = {
         .probe =        usb_serial_probe,
         .disconnect =   usb_serial_disconnect,
         .id_table =     id_table,
-        .no_dynamic_id =        1,
+        .no_dynamic_id =        1,
 };
 
 /* This HW really does not support a serial break, so one will be
@@ -54,19 +54,18 @@ static void usb_debug_break_ctl(struct tty_struct *tty, int break_state)
         usb_serial_generic_write(tty, port, USB_DEBUG_BRK, USB_DEBUG_BRK_SIZE);
 }
 
-static void usb_debug_read_bulk_callback(struct urb *urb)
+static void usb_debug_process_read_urb(struct urb *urb)
 {
         struct usb_serial_port *port = urb->context;
 
         if (urb->actual_length == USB_DEBUG_BRK_SIZE &&
-            memcmp(urb->transfer_buffer, USB_DEBUG_BRK,
-                   USB_DEBUG_BRK_SIZE) == 0) {
+                memcmp(urb->transfer_buffer, USB_DEBUG_BRK,
+                                                USB_DEBUG_BRK_SIZE) == 0) {
                 usb_serial_handle_break(port);
-                usb_serial_generic_submit_read_urb(port, GFP_ATOMIC);
                 return;
         }
 
-        usb_serial_generic_read_bulk_callback(urb);
+        usb_serial_generic_process_read_urb(urb);
 }
 
 static struct usb_serial_driver debug_device = {
@@ -79,7 +78,7 @@ static struct usb_serial_driver debug_device = {
         .num_ports =            1,
         .bulk_out_size =        USB_DEBUG_MAX_PACKET_SIZE,
         .break_ctl =            usb_debug_break_ctl,
-        .read_bulk_callback =   usb_debug_read_bulk_callback,
+        .process_read_urb =     usb_debug_process_read_urb,
 };
 
 static int __init debug_init(void)
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index 5b073bcc807b..11af903cb09f 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -14,57 +14,6 @@
  *
  * See Documentation/usb/usb-serial.txt for more information on using this
  * driver
- *
- * (10/09/2002) Stuart MacDonald (stuartm@connecttech.com)
- *      Upgrade to full working driver
- *
- * (05/30/2001) gkh
- *      switched from using spinlock to a semaphore, which fixes lots of
- *      problems.
- *
- * (04/08/2001) gb
- *      Identify version on module load.
- *
- * 2001_Mar_19 gkh
- *      Fixed MOD_INC and MOD_DEC logic, the ability to open a port more
- *      than once, and the got the proper usb_device_id table entries so
- *      the driver works again.
- *
- * (11/01/2000) Adam J. Richter
- *      usb_device_id table support
- *
- * (10/05/2000) gkh
- *      Fixed bug with urb->dev not being set properly, now that the usb
- *      core needs it.
- *
- * (10/03/2000) smd
- *      firmware is improved to guard against crap sent to device
- *      firmware now replies CMD_FAILURE on bad things
- *      read_callback fix you provided for private info struct
- *      command_finished now indicates success or fail
- *      setup_port struct now packed to avoid gcc padding
- *      firmware uses 1 based port numbering, driver now handles that
- *
- * (09/11/2000) gkh
- *      Removed DEBUG #ifdefs with call to usb_serial_debug_data
- *
- * (07/19/2000) gkh
- *      Added module_init and module_exit functions to handle the fact that this
- *      driver is a loadable module now.
- *      Fixed bug with port->minor that was found by Al Borchers
- *
- * (07/04/2000) gkh
- *      Added support for port settings. Baud rate can now be changed. Line
- *      signals are not transferred to and from the tty layer yet, but things
- *      seem to be working well now.
- *
- * (05/04/2000) gkh
- *      First cut at open and close commands. Data can flow through the ports at
- *      default speeds now.
- *
- * (03/26/2000) gkh
- *      Split driver up into device specific pieces.
- *
  */
 
 #include <linux/kernel.h>
@@ -753,7 +702,6 @@ static void whiteheat_close(struct usb_serial_port *port)
 static int whiteheat_write(struct tty_struct *tty,
         struct usb_serial_port *port, const unsigned char *buf, int count)
 {
-        struct usb_serial *serial = port->serial;
         struct whiteheat_private *info = usb_get_serial_port_data(port);
         struct whiteheat_urb_wrap *wrap;
         struct urb *urb;
@@ -789,7 +737,6 @@ static int whiteheat_write(struct tty_struct *tty,
                 usb_serial_debug_data(debug, &port->dev,
                                 __func__, bytes, urb->transfer_buffer);
 
-                urb->dev = serial->dev;
                 urb->transfer_buffer_length = bytes;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result) {
@@ -1035,7 +982,6 @@ static void command_port_read_callback(struct urb *urb)
                 dbg("%s - bad reply from firmware", __func__);
 
         /* Continue trying to always read */
-        command_port->read_urb->dev = command_port->serial->dev;
         result = usb_submit_urb(command_port->read_urb, GFP_ATOMIC);
         if (result)
                 dbg("%s - failed resubmitting read urb, error %d",
@@ -1141,7 +1087,6 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command,
         transfer_buffer[0] = command;
         memcpy(&transfer_buffer[1], data, datasize);
         command_port->write_urb->transfer_buffer_length = datasize + 1;
-        command_port->write_urb->dev = port->serial->dev;
         retval = usb_submit_urb(command_port->write_urb, GFP_NOIO);
         if (retval) {
                 dbg("%s - submit urb failed", __func__);
@@ -1362,7 +1307,6 @@ static int start_command_port(struct usb_serial *serial)
                 /* Work around HCD bugs */
                 usb_clear_halt(serial->dev, command_port->read_urb->pipe);
 
-                command_port->read_urb->dev = serial->dev;
                 retval = usb_submit_urb(command_port->read_urb, GFP_KERNEL);
                 if (retval) {
                         dev_err(&serial->dev->dev,
@@ -1410,7 +1354,6 @@ static int start_port_read(struct usb_serial_port *port)
                 list_del(tmp);
                 wrap = list_entry(tmp, struct whiteheat_urb_wrap, list);
                 urb = wrap->urb;
-                urb->dev = port->serial->dev;
                 spin_unlock_irqrestore(&info->lock, flags);
                 retval = usb_submit_urb(urb, GFP_KERNEL);
                 if (retval) {
@@ -1490,7 +1433,6 @@ static void rx_data_softint(struct work_struct *work)
                         sent += tty_insert_flip_string(tty,
                                 urb->transfer_buffer, urb->actual_length);
 
-                urb->dev = port->serial->dev;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result) {
                         dev_err(&port->dev,
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c
index 3ca87a823342..51af2fee2efd 100644
--- a/drivers/usb/storage/alauda.c
+++ b/drivers/usb/storage/alauda.c
@@ -139,7 +139,7 @@ static int init_alauda(struct us_data *us);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id alauda_usb_ids[] = {
+static struct usb_device_id alauda_usb_ids[] = {
 #       include "unusual_alauda.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/cypress_atacb.c b/drivers/usb/storage/cypress_atacb.c
index c7909dfa2434..387cbd47acc9 100644
--- a/drivers/usb/storage/cypress_atacb.c
+++ b/drivers/usb/storage/cypress_atacb.c
@@ -43,7 +43,7 @@ MODULE_LICENSE("GPL");
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id cypress_usb_ids[] = {
+static struct usb_device_id cypress_usb_ids[] = {
 #       include "unusual_cypress.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/datafab.c b/drivers/usb/storage/datafab.c
index a99be857b794..15d41f2b3d6f 100644
--- a/drivers/usb/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
@@ -88,7 +88,7 @@ static int datafab_determine_lun(struct us_data *us,
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id datafab_usb_ids[] = {
+static struct usb_device_id datafab_usb_ids[] = {
 #       include "unusual_datafab.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c
index b0a1687ca942..a6ade4071a9a 100644
--- a/drivers/usb/storage/ene_ub6250.c
+++ b/drivers/usb/storage/ene_ub6250.c
@@ -42,7 +42,7 @@ MODULE_LICENSE("GPL");
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
         .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id ene_ub6250_usb_ids[] = {
+static struct usb_device_id ene_ub6250_usb_ids[] = {
 #       include "unusual_ene_ub6250.h"
         { }             /* Terminating entry */
 };
@@ -607,8 +607,8 @@ static int sd_scsi_mode_sense(struct us_data *us, struct scsi_cmnd *srb)
 
 static int sd_scsi_read_capacity(struct us_data *us, struct scsi_cmnd *srb)
 {
-        u32   bl_num;
-        u16    bl_len;
+        u32     bl_num;
+        u32     bl_len;
         unsigned int offset = 0;
         unsigned char    buf[8];
         struct scatterlist *sg = NULL;
@@ -622,7 +622,7 @@ static int sd_scsi_read_capacity(struct us_data *us, struct scsi_cmnd *srb)
                 else
                         bl_num = (info->HC_C_SIZE + 1) * 1024 - 1;
         } else {
-                bl_len = 1<<(info->SD_READ_BL_LEN);
+                bl_len = 1 << (info->SD_READ_BL_LEN);
                 bl_num = info->SD_Block_Mult * (info->SD_C_SIZE + 1)
                                 * (1 << (info->SD_C_SIZE_MULT + 2)) - 1;
         }
@@ -777,7 +777,7 @@ static int ms_lib_free_logicalmap(struct us_data *us)
         return 0;
 }
 
-int ms_lib_alloc_logicalmap(struct us_data *us)
+static int ms_lib_alloc_logicalmap(struct us_data *us)
 {
         u32  i;
         struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra;
@@ -2248,7 +2248,7 @@ static int sd_scsi_irp(struct us_data *us, struct scsi_cmnd *srb)
 /*
  * ms_scsi_irp()
  */
-int ms_scsi_irp(struct us_data *us, struct scsi_cmnd *srb)
+static int ms_scsi_irp(struct us_data *us, struct scsi_cmnd *srb)
 {
         int result;
         struct ene_ub6250_info *info = (struct ene_ub6250_info *)us->extra;
diff --git a/drivers/usb/storage/freecom.c b/drivers/usb/storage/freecom.c
index 03d4a873748c..fa1615748475 100644
--- a/drivers/usb/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
@@ -119,7 +119,7 @@ static int init_freecom(struct us_data *us);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id freecom_usb_ids[] = {
+static struct usb_device_id freecom_usb_ids[] = {
 #       include "unusual_freecom.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 93d359f4d6a7..bd5502700831 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -76,7 +76,7 @@ static int isd200_Initialization(struct us_data *us);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id isd200_usb_ids[] = {
+static struct usb_device_id isd200_usb_ids[] = {
 #       include "unusual_isd200.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index 54b71650b69c..a19211b5c265 100644
--- a/drivers/usb/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
@@ -71,7 +71,7 @@ MODULE_LICENSE("GPL");
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id jumpshot_usb_ids[] = {
+static struct usb_device_id jumpshot_usb_ids[] = {
 #       include "unusual_jumpshot.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c
index 35181e29124d..e720f8ebdf9f 100644
--- a/drivers/usb/storage/karma.c
+++ b/drivers/usb/storage/karma.c
@@ -59,7 +59,7 @@ static int rio_karma_init(struct us_data *us);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id karma_usb_ids[] = {
+static struct usb_device_id karma_usb_ids[] = {
 #       include "unusual_karma.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 721c8c587305..d75155c38200 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -69,7 +69,7 @@ struct usb_onetouch {
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id onetouch_usb_ids[] = {
+static struct usb_device_id onetouch_usb_ids[] = {
 #       include "unusual_onetouch.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index c41cd30d2c01..1f62723ef1a8 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -398,10 +398,9 @@ static int rts51x_write_mem(struct us_data *us, u16 addr, u8 *data, u16 len)
         u8 cmnd[12] = { 0 };
         u8 *buf;
 
-        buf = kmalloc(len, GFP_NOIO);
+        buf = kmemdup(data, len, GFP_NOIO);
         if (buf == NULL)
                 return USB_STOR_TRANSPORT_ERROR;
-        memcpy(buf, data, len);
 
         US_DEBUGP("%s, addr = 0x%x, len = %d\n", __func__, addr, len);
 
@@ -507,15 +506,14 @@ static int enable_oscillator(struct us_data *us)
 static int __do_config_autodelink(struct us_data *us, u8 *data, u16 len)
 {
         int retval;
-        u16 addr = 0xFE47;
         u8 cmnd[12] = {0};
 
-        US_DEBUGP("%s, addr = 0x%x, len = %d\n", __FUNCTION__, addr, len);
+        US_DEBUGP("%s, addr = 0xfe47, len = %d\n", __FUNCTION__, len);
 
         cmnd[0] = 0xF0;
         cmnd[1] = 0x0E;
-        cmnd[2] = (u8)(addr >> 8);
-        cmnd[3] = (u8)addr;
+        cmnd[2] = 0xfe;
+        cmnd[3] = 0x47;
         cmnd[4] = (u8)(len >> 8);
         cmnd[5] = (u8)len;
 
@@ -818,7 +816,7 @@ static inline int working_scsi(struct scsi_cmnd *srb)
         return 1;
 }
 
-void rts51x_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
+static void rts51x_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
 {
         struct rts51x_chip *chip = (struct rts51x_chip *)(us->extra);
         static int card_first_show = 1;
@@ -977,7 +975,7 @@ static void realtek_cr_destructor(void *extra)
 }
 
 #ifdef CONFIG_PM
-int realtek_cr_suspend(struct usb_interface *iface, pm_message_t message)
+static int realtek_cr_suspend(struct usb_interface *iface, pm_message_t message)
 {
         struct us_data *us = usb_get_intfdata(iface);
 
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index 83ee49e737bd..425df7df2e56 100644
--- a/drivers/usb/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
@@ -71,7 +71,7 @@ static int usb_stor_sddr09_init(struct us_data *us);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id sddr09_usb_ids[] = {
+static struct usb_device_id sddr09_usb_ids[] = {
 #       include "unusual_sddr09.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index 8983ec2ffb5a..e4ca5fcb7cc3 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -48,7 +48,7 @@ MODULE_LICENSE("GPL");
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id sddr55_usb_ids[] = {
+static struct usb_device_id sddr55_usb_ids[] = {
 #       include "unusual_sddr55.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index a4c02751af4e..1369d2590616 100644
--- a/drivers/usb/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
@@ -170,7 +170,7 @@ static int init_usbat_flash(struct us_data *us);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
-struct usb_device_id usbat_usb_ids[] = {
+static struct usb_device_id usbat_usb_ids[] = {
 #       include "unusual_usbat.h"
         { }             /* Terminating entry */
 };
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index aa84b3d77274..3dd7da9fd504 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -1074,6 +1074,7 @@ static struct usb_driver usb_storage_driver = {
         .id_table =     usb_storage_usb_ids,
         .supports_autosuspend = 1,
         .soft_unbind =  1,
+        .no_dynamic_id = 1,
 };
 
 static int __init usb_stor_init(void)
diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 5c6c1bdbd455..8efeae24764f 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -27,6 +27,8 @@
 #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) },
@@ -60,7 +62,6 @@ struct usb_skel {
         __u8                    bulk_in_endpointAddr;   /* the address of the bulk in endpoint */
         __u8                    bulk_out_endpointAddr;  /* the address of the bulk out endpoint */
         int                     errors;                 /* the last request tanked */
-        int                     open_count;             /* count the number of openers */
         bool                    ongoing_read;           /* a read is going on */
         bool                    processed_urb;          /* indicates we haven't processed the urb */
         spinlock_t              err_lock;               /* lock for errors */
@@ -100,39 +101,37 @@ 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;
+        }
 
-        if (!dev->open_count++) {
-                retval = usb_autopm_get_interface(interface);
-                        if (retval) {
-                                dev->open_count--;
-                                mutex_unlock(&dev->io_mutex);
-                                kref_put(&dev->kref, skel_delete);
-                                goto exit;
-                        }
-        } /* else { //uncomment this block if you want exclusive open
-                retval = -EBUSY;
-                dev->open_count--;
-                mutex_unlock(&dev->io_mutex);
-                kref_put(&dev->kref, skel_delete);
-                goto exit;
-        } */
-        /* prevent the device from being autosuspended */
+        retval = usb_autopm_get_interface(interface);
+        if (retval)
+                goto out_err;
 
         /* 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;
@@ -148,7 +147,7 @@ static int skel_release(struct inode *inode, struct file *file)
 
         /* allow the device to be autosuspended */
         mutex_lock(&dev->io_mutex);
-        if (!--dev->open_count && dev->interface)
+        if (dev->interface)
                 usb_autopm_put_interface(dev->interface);
         mutex_unlock(&dev->io_mutex);
 
@@ -612,7 +611,6 @@ 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);
@@ -624,8 +622,12 @@ 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 eb09a0a14a80..0ead8826ec79 100644
--- a/drivers/usb/wusbcore/Kconfig
+++ b/drivers/usb/wusbcore/Kconfig
@@ -5,6 +5,7 @@ config USB_WUSB
         tristate "Enable Wireless USB extensions (EXPERIMENTAL)"
         depends on EXPERIMENTAL
         depends on USB
+        depends on PCI
         select UWB
         select CRYPTO
         select CRYPTO_BLKCIPHER
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 371f61733f05..fa810a83e830 100644
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -354,7 +354,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
         struct wusb_keydvt_in keydvt_in;
         struct wusb_keydvt_out keydvt_out;
 
-        hs = kzalloc(3*sizeof(hs[0]), GFP_KERNEL);
+        hs = kcalloc(3, sizeof(hs[0]), GFP_KERNEL);
         if (hs == NULL) {
                 dev_err(dev, "can't allocate handshake data\n");
                 goto error_kzalloc;
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c
index de81ebf51784..86ed7e61e597 100644
--- a/drivers/uwb/est.c
+++ b/drivers/uwb/est.c
@@ -184,7 +184,7 @@ int uwb_est_create(void)
 
         uwb_est_size = 2;
         uwb_est_used = 0;
-        uwb_est = kzalloc(uwb_est_size * sizeof(uwb_est[0]), GFP_KERNEL);
+        uwb_est = kcalloc(uwb_est_size, sizeof(uwb_est[0]), GFP_KERNEL);
         if (uwb_est == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index d837d63c456f..eb3c5eea1a0f 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -328,7 +328,7 @@ static void mxsfb_enable_controller(struct fb_info *fb_info)
 
         dev_dbg(&host->pdev->dev, "%s\n", __func__);
 
-        clk_enable(host->clk);
+        clk_prepare_enable(host->clk);
         clk_set_rate(host->clk, PICOS2KHZ(fb_info->var.pixclock) * 1000U);
 
         /* if it was disabled, re-enable the mode again */
@@ -368,7 +368,7 @@ static void mxsfb_disable_controller(struct fb_info *fb_info)
 
         writel(VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4 + REG_CLR);
 
-        clk_disable(host->clk);
+        clk_disable_unprepare(host->clk);
 
         host->enabled = 0;
 }
@@ -668,7 +668,7 @@ static int __devinit mxsfb_restore_mode(struct mxsfb_info *host)
         line_count = fb_info->fix.smem_len / fb_info->fix.line_length;
         fb_info->fix.ypanstep = 1;
 
-        clk_enable(host->clk);
+        clk_prepare_enable(host->clk);
         host->enabled = 1;
 
         return 0;
@@ -841,7 +841,7 @@ static int __devinit mxsfb_probe(struct platform_device *pdev)
 
 error_register:
         if (host->enabled)
-                clk_disable(host->clk);
+                clk_disable_unprepare(host->clk);
         fb_destroy_modelist(&fb_info->modelist);
 error_init_fb:
         kfree(fb_info->pseudo_palette);
diff --git a/drivers/video/omap2/omapfb/Kconfig b/drivers/video/omap2/omapfb/Kconfig
index 83d3fe7ec9ae..4ea17dc3258c 100644
--- a/drivers/video/omap2/omapfb/Kconfig
+++ b/drivers/video/omap2/omapfb/Kconfig
@@ -1,6 +1,6 @@
 menuconfig FB_OMAP2
         tristate "OMAP2+ frame buffer support"
-        depends on FB && OMAP2_DSS
+        depends on FB && OMAP2_DSS && !DRM_OMAP
 
         select OMAP2_VRAM
         select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 87445b2d72a7..00562566ef5f 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -35,6 +35,11 @@
 
 #define DRV_NAME "AT91SAM9 Watchdog"
 
+#define wdt_read(field) \
+        __raw_readl(at91wdt_private.base + field)
+#define wdt_write(field, val) \
+        __raw_writel((val), at91wdt_private.base + field)
+
 /* AT91SAM9 watchdog runs a 12bit counter @ 256Hz,
  * use this to convert a watchdog
  * value from/to milliseconds.
@@ -63,6 +68,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
 static void at91_ping(unsigned long data);
 
 static struct {
+        void __iomem *base;
         unsigned long next_heartbeat;   /* the next_heartbeat for the timer */
         unsigned long open;
         char expect_close;
@@ -77,7 +83,7 @@ static struct {
  */
 static inline void at91_wdt_reset(void)
 {
-        at91_sys_write(AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
+        wdt_write(AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
 }
 
 /*
@@ -132,7 +138,7 @@ static int at91_wdt_settimeout(unsigned int timeout)
         unsigned int mr;
 
         /* Check if disabled */
-        mr = at91_sys_read(AT91_WDT_MR);
+        mr = wdt_read(AT91_WDT_MR);
         if (mr & AT91_WDT_WDDIS) {
                 printk(KERN_ERR DRV_NAME": sorry, watchdog is disabled\n");
                 return -EIO;
@@ -149,7 +155,7 @@ static int at91_wdt_settimeout(unsigned int timeout)
                 | AT91_WDT_WDDBGHLT     /* disabled in debug mode */
                 | AT91_WDT_WDD          /* restart at any time */
                 | (timeout & AT91_WDT_WDV);  /* timer value */
-        at91_sys_write(AT91_WDT_MR, reg);
+        wdt_write(AT91_WDT_MR, reg);
 
         return 0;
 }
@@ -248,12 +254,22 @@ static struct miscdevice at91wdt_miscdev = {
 
 static int __init at91wdt_probe(struct platform_device *pdev)
 {
+        struct resource *r;
         int res;
 
         if (at91wdt_miscdev.parent)
                 return -EBUSY;
         at91wdt_miscdev.parent = &pdev->dev;
 
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!r)
+                return -ENODEV;
+        at91wdt_private.base = ioremap(r->start, resource_size(r));
+        if (!at91wdt_private.base) {
+                dev_err(&pdev->dev, "failed to map registers, aborting.\n");
+                return -ENOMEM;
+        }
+
         /* Set watchdog */
         res = at91_wdt_settimeout(ms_to_ticks(WDT_HW_TIMEOUT * 1000));
         if (res)
diff --git a/drivers/watchdog/at91sam9_wdt.h b/drivers/watchdog/at91sam9_wdt.h
index 757f9cab5c82..c6fbb2e6c41b 100644
--- a/drivers/watchdog/at91sam9_wdt.h
+++ b/drivers/watchdog/at91sam9_wdt.h
@@ -16,11 +16,11 @@
 #ifndef AT91_WDT_H
 #define AT91_WDT_H
 
-#define AT91_WDT_CR             (AT91_WDT + 0x00)       /* Watchdog Control Register */
+#define AT91_WDT_CR             0x00                    /* Watchdog Control Register */
 #define         AT91_WDT_WDRSTT         (1    << 0)             /* Restart */
 #define         AT91_WDT_KEY            (0xa5 << 24)            /* KEY Password */
 
-#define AT91_WDT_MR             (AT91_WDT + 0x04)       /* Watchdog Mode Register */
+#define AT91_WDT_MR             0x04                    /* Watchdog Mode Register */
 #define         AT91_WDT_WDV            (0xfff << 0)            /* Counter Value */
 #define         AT91_WDT_WDFIEN         (1     << 12)           /* Fault Interrupt Enable */
 #define         AT91_WDT_WDRSTEN        (1     << 13)           /* Reset Processor */
@@ -30,7 +30,7 @@
 #define         AT91_WDT_WDDBGHLT       (1     << 28)           /* Debug Halt */
 #define         AT91_WDT_WDIDLEHLT      (1     << 29)           /* Idle Halt */
 
-#define AT91_WDT_SR             (AT91_WDT + 0x08)       /* Watchdog Status Register */
+#define AT91_WDT_SR             0x08                    /* Watchdog Status Register */
 #define         AT91_WDT_WDUNF          (1 << 0)                /* Watchdog Underflow */
 #define         AT91_WDT_WDERR          (1 << 1)                /* Watchdog Error */
 
diff --git a/fs/Kconfig b/fs/Kconfig
index 30145d886bc2..d621f02a3f9e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -218,6 +218,8 @@ source "fs/exofs/Kconfig"
 
 endif # MISC_FILESYSTEMS
 
+source "fs/exofs/Kconfig.ore"
+
 menuconfig NETWORK_FILESYSTEMS
         bool "Network File Systems"
         default y
diff --git a/fs/char_dev.c b/fs/char_dev.c
index dca9e5e0f73b..3f152b92a94a 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -272,7 +272,7 @@ int __register_chrdev(unsigned int major, unsigned int baseminor,
         cd = __register_chrdev_region(major, baseminor, count, name);
         if (IS_ERR(cd))
                 return PTR_ERR(cd);
-        
+
         cdev = cdev_alloc();
         if (!cdev)
                 goto out2;
@@ -280,7 +280,7 @@ int __register_chrdev(unsigned int major, unsigned int baseminor,
         cdev->owner = fops->owner;
         cdev->ops = fops;
         kobject_set_name(&cdev->kobj, "%s", name);
-                
+
         err = cdev_add(cdev, MKDEV(cd->major, baseminor), count);
         if (err)
                 goto out;
@@ -405,7 +405,7 @@ static int chrdev_open(struct inode *inode, struct file *filp)
                 goto out_cdev_put;
 
         if (filp->f_op->open) {
-                ret = filp->f_op->open(inode,filp);
+                ret = filp->f_op->open(inode, filp);
                 if (ret)
                         goto out_cdev_put;
         }
diff --git a/fs/exofs/Kconfig b/fs/exofs/Kconfig
index da42f32c49be..86194b2f799d 100644
--- a/fs/exofs/Kconfig
+++ b/fs/exofs/Kconfig
@@ -1,14 +1,3 @@
-# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
-# for every ORE user we do it like this. Any user should add itself here
-# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
-# selected here, and we default to "ON". So in effect it is like been
-# selected by any of the users.
-config ORE
-        tristate
-        depends on EXOFS_FS || PNFS_OBJLAYOUT
-        select ASYNC_XOR
-        default SCSI_OSD_ULD
-
 config EXOFS_FS
         tristate "exofs: OSD based file system support"
         depends on SCSI_OSD_ULD
diff --git a/fs/exofs/Kconfig.ore b/fs/exofs/Kconfig.ore
new file mode 100644
index 000000000000..1ca7fb7b6ba8
--- /dev/null
+++ b/fs/exofs/Kconfig.ore
@@ -0,0 +1,12 @@
+# ORE - Objects Raid Engine (libore.ko)
+#
+# Note ORE needs to "select ASYNC_XOR". So Not to force multiple selects
+# for every ORE user we do it like this. Any user should add itself here
+# at the "depends on EXOFS_FS || ..." with an ||. The dependencies are
+# selected here, and we default to "ON". So in effect it is like been
+# selected by any of the users.
+config ORE
+        tristate
+        depends on EXOFS_FS || PNFS_OBJLAYOUT
+        select ASYNC_XOR
+        default SCSI_OSD_ULD
diff --git a/fs/exofs/ore.c b/fs/exofs/ore.c
index d271ad837202..49cf230554a2 100644
--- a/fs/exofs/ore.c
+++ b/fs/exofs/ore.c
@@ -266,7 +266,7 @@ int  ore_get_rw_state(struct ore_layout *layout, struct ore_components *oc,
 
                         /* first/last seg is split */
                         num_raid_units += layout->group_width;
-                        sgs_per_dev = div_u64(num_raid_units, data_devs);
+                        sgs_per_dev = div_u64(num_raid_units, data_devs) + 2;
                 } else {
                         /* For Writes add parity pages array. */
                         max_par_pages = num_raid_units * pages_in_unit *
@@ -445,10 +445,10 @@ int ore_check_io(struct ore_io_state *ios, ore_on_dev_error on_dev_error)
                         u64 residual = ios->reading ?
                                         or->in.residual : or->out.residual;
                         u64 offset = (ios->offset + ios->length) - residual;
-                        struct ore_dev *od = ios->oc->ods[
-                                        per_dev->dev - ios->oc->first_dev];
+                        unsigned dev = per_dev->dev - ios->oc->first_dev;
+                        struct ore_dev *od = ios->oc->ods[dev];
 
-                        on_dev_error(ios, od, per_dev->dev, osi.osd_err_pri,
+                        on_dev_error(ios, od, dev, osi.osd_err_pri,
                                      offset, residual);
                 }
                 if (osi.osd_err_pri >= acumulated_osd_err) {
diff --git a/fs/exofs/ore_raid.c b/fs/exofs/ore_raid.c
index 29c47e5c4a86..d222c77cfa1b 100644
--- a/fs/exofs/ore_raid.c
+++ b/fs/exofs/ore_raid.c
@@ -328,8 +328,8 @@ static int _alloc_read_4_write(struct ore_io_state *ios)
 /* @si contains info of the to-be-inserted page. Update of @si should be
  * maintained by caller. Specificaly si->dev, si->obj_offset, ...
  */
-static int _add_to_read_4_write(struct ore_io_state *ios,
-                                struct ore_striping_info *si, struct page *page)
+static int _add_to_r4w(struct ore_io_state *ios, struct ore_striping_info *si,
+                       struct page *page, unsigned pg_len)
 {
         struct request_queue *q;
         struct ore_per_dev_state *per_dev;
@@ -366,17 +366,60 @@ static int _add_to_read_4_write(struct ore_io_state *ios,
                 _ore_add_sg_seg(per_dev, gap, true);
         }
         q = osd_request_queue(ore_comp_dev(read_ios->oc, per_dev->dev));
-        added_len = bio_add_pc_page(q, per_dev->bio, page, PAGE_SIZE, 0);
-        if (unlikely(added_len != PAGE_SIZE)) {
+        added_len = bio_add_pc_page(q, per_dev->bio, page, pg_len,
+                                    si->obj_offset % PAGE_SIZE);
+        if (unlikely(added_len != pg_len)) {
                 ORE_DBGMSG("Failed to bio_add_pc_page bi_vcnt=%d\n",
                               per_dev->bio->bi_vcnt);
                 return -ENOMEM;
         }
 
-        per_dev->length += PAGE_SIZE;
+        per_dev->length += pg_len;
         return 0;
 }
 
+/* read the beginning of an unaligned first page */
+static int _add_to_r4w_first_page(struct ore_io_state *ios, struct page *page)
+{
+        struct ore_striping_info si;
+        unsigned pg_len;
+
+        ore_calc_stripe_info(ios->layout, ios->offset, 0, &si);
+
+        pg_len = si.obj_offset % PAGE_SIZE;
+        si.obj_offset -= pg_len;
+
+        ORE_DBGMSG("offset=0x%llx len=0x%x index=0x%lx dev=%x\n",
+                   _LLU(si.obj_offset), pg_len, page->index, si.dev);
+
+        return _add_to_r4w(ios, &si, page, pg_len);
+}
+
+/* read the end of an incomplete last page */
+static int _add_to_r4w_last_page(struct ore_io_state *ios, u64 *offset)
+{
+        struct ore_striping_info si;
+        struct page *page;
+        unsigned pg_len, p, c;
+
+        ore_calc_stripe_info(ios->layout, *offset, 0, &si);
+
+        p = si.unit_off / PAGE_SIZE;
+        c = _dev_order(ios->layout->group_width * ios->layout->mirrors_p1,
+                       ios->layout->mirrors_p1, si.par_dev, si.dev);
+        page = ios->sp2d->_1p_stripes[p].pages[c];
+
+        pg_len = PAGE_SIZE - (si.unit_off % PAGE_SIZE);
+        *offset += pg_len;
+
+        ORE_DBGMSG("p=%d, c=%d next-offset=0x%llx len=0x%x dev=%x par_dev=%d\n",
+                   p, c, _LLU(*offset), pg_len, si.dev, si.par_dev);
+
+        BUG_ON(!page);
+
+        return _add_to_r4w(ios, &si, page, pg_len);
+}
+
 static void _mark_read4write_pages_uptodate(struct ore_io_state *ios, int ret)
 {
         struct bio_vec *bv;
@@ -444,9 +487,13 @@ static int _read_4_write(struct ore_io_state *ios)
                         struct page **pp = &_1ps->pages[c];
                         bool uptodate;
 
-                        if (*pp)
+                        if (*pp) {
+                                if (ios->offset % PAGE_SIZE)
+                                        /* Read the remainder of the page */
+                                        _add_to_r4w_first_page(ios, *pp);
                                 /* to-be-written pages start here */
                                 goto read_last_stripe;
+                        }
 
                         *pp = ios->r4w->get_page(ios->private, offset,
                                                  &uptodate);
@@ -454,7 +501,7 @@ static int _read_4_write(struct ore_io_state *ios)
                                 return -ENOMEM;
 
                         if (!uptodate)
-                                _add_to_read_4_write(ios, &read_si, *pp);
+                                _add_to_r4w(ios, &read_si, *pp, PAGE_SIZE);
 
                         /* Mark read-pages to be cache_released */
                         _1ps->page_is_read[c] = true;
@@ -465,8 +512,11 @@ static int _read_4_write(struct ore_io_state *ios)
         }
 
 read_last_stripe:
-        offset = ios->offset + (ios->length + PAGE_SIZE - 1) /
-                                PAGE_SIZE * PAGE_SIZE;
+        offset = ios->offset + ios->length;
+        if (offset % PAGE_SIZE)
+                _add_to_r4w_last_page(ios, &offset);
+                /* offset will be aligned to next page */
+
         last_stripe_end = div_u64(offset + bytes_in_stripe - 1, bytes_in_stripe)
                                  * bytes_in_stripe;
         if (offset == last_stripe_end) /* Optimize for the aligned case */
@@ -503,7 +553,7 @@ read_last_stripe:
                         /* Mark read-pages to be cache_released */
                         _1ps->page_is_read[c] = true;
                         if (!uptodate)
-                                _add_to_read_4_write(ios, &read_si, page);
+                                _add_to_r4w(ios, &read_si, page, PAGE_SIZE);
                 }
 
                 offset += PAGE_SIZE;
@@ -551,7 +601,11 @@ int _ore_add_parity_unit(struct ore_io_state *ios,
                             unsigned cur_len)
 {
         if (ios->reading) {
-                BUG_ON(per_dev->cur_sg >= ios->sgs_per_dev);
+                if (per_dev->cur_sg >= ios->sgs_per_dev) {
+                        ORE_DBGMSG("cur_sg(%d) >= sgs_per_dev(%d)\n" ,
+                                per_dev->cur_sg, ios->sgs_per_dev);
+                        return -ENOMEM;
+                }
                 _ore_add_sg_seg(per_dev, cur_len, true);
         } else {
                 struct __stripe_pages_2d *sp2d = ios->sp2d;
@@ -612,8 +666,6 @@ int _ore_post_alloc_raid_stuff(struct ore_io_state *ios)
                         return -ENOMEM;
                 }
 
-                BUG_ON(ios->offset % PAGE_SIZE);
-
                 /* Round io down to last full strip */
                 first_stripe = div_u64(ios->offset, stripe_size);
                 last_stripe = div_u64(ios->offset + ios->length, stripe_size);
diff --git a/fs/ext2/ialloc.c b/fs/ext2/ialloc.c
index cd7f5f424a75..8b15cf8cef37 100644
--- a/fs/ext2/ialloc.c
+++ b/fs/ext2/ialloc.c
@@ -573,8 +573,11 @@ got:
         inode->i_generation = sbi->s_next_generation++;
         spin_unlock(&sbi->s_next_gen_lock);
         if (insert_inode_locked(inode) < 0) {
-                err = -EINVAL;
-                goto fail_drop;
+                ext2_error(sb, "ext2_new_inode",
+                           "inode number already in use - inode=%lu",
+                           (unsigned long) ino);
+                err = -EIO;
+                goto fail;
         }
 
         dquot_initialize(inode);
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 91a6945af6d8..740cad8dcd8d 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -26,7 +26,6 @@
 #include <linux/highuid.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
-#include <linux/module.h>
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>
 #include <linux/mpage.h>
@@ -36,10 +35,6 @@
 #include "acl.h"
 #include "xip.h"
 
-MODULE_AUTHOR("Remy Card and others");
-MODULE_DESCRIPTION("Second Extended Filesystem");
-MODULE_LICENSE("GPL");
-
 static int __ext2_write_inode(struct inode *inode, int do_sync);
 
 /*
diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 9b403f064ce0..0090595beb28 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -1520,5 +1520,8 @@ static void __exit exit_ext2_fs(void)
         exit_ext2_xattr();
 }
 
+MODULE_AUTHOR("Remy Card and others");
+MODULE_DESCRIPTION("Second Extended Filesystem");
+MODULE_LICENSE("GPL");
 module_init(init_ext2_fs)
 module_exit(exit_ext2_fs)
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index d27b71f1d183..6dcafc7efdfd 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -54,7 +54,6 @@
  */
 
 #include <linux/buffer_head.h>
-#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/mbcache.h>
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index c922adc8ef41..be7a8d02c9a7 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -3,7 +3,6 @@
  * Handler for storing security labels as extended attributes.
  */
 
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fs.h>
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
index 667e46a8d62d..2989467d3595 100644
--- a/fs/ext2/xattr_trusted.c
+++ b/fs/ext2/xattr_trusted.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c
index 099d20f47163..f470e44c4b8d 100644
--- a/fs/ext2/xattr_user.c
+++ b/fs/ext2/xattr_user.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/string.h>
 #include "ext2.h"
 #include "xattr.h"
diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index 92cc86dfa23d..1cde28438014 100644
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -525,8 +525,12 @@ got:
         if (IS_DIRSYNC(inode))
                 handle->h_sync = 1;
         if (insert_inode_locked(inode) < 0) {
-                err = -EINVAL;
-                goto fail_drop;
+                /*
+                 * Likely a bitmap corruption causing inode to be allocated
+                 * twice.
+                 */
+                err = -EIO;
+                goto fail;
         }
         spin_lock(&sbi->s_next_gen_lock);
         inode->i_generation = sbi->s_next_generation++;
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 15cb47088aac..2d0afeca0b47 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -22,7 +22,6 @@
  *  Assorted race fixes, rewrite of ext3_get_block() by Al Viro, 2000
  */
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/ext3_jbd.h>
@@ -223,8 +222,12 @@ void ext3_evict_inode (struct inode *inode)
          *
          * Note that directories do not have this problem because they don't
          * use page cache.
+         *
+         * The s_journal check handles the case when ext3_get_journal() fails
+         * and puts the journal inode.
          */
         if (inode->i_nlink && ext3_should_journal_data(inode) &&
+            EXT3_SB(inode->i_sb)->s_journal &&
             (S_ISLNK(inode->i_mode) || S_ISREG(inode->i_mode))) {
                 tid_t commit_tid = atomic_read(&ei->i_datasync_tid);
                 journal_t *journal = EXT3_SB(inode->i_sb)->s_journal;
@@ -1132,9 +1135,11 @@ struct buffer_head *ext3_bread(handle_t *handle, struct inode *inode,
         bh = ext3_getblk(handle, inode, block, create, err);
         if (!bh)
                 return bh;
-        if (buffer_uptodate(bh))
+        if (bh_uptodate_or_lock(bh))
                 return bh;
-        ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh);
+        get_bh(bh);
+        bh->b_end_io = end_buffer_read_sync;
+        submit_bh(READ | REQ_META | REQ_PRIO, bh);
         wait_on_buffer(bh);
         if (buffer_uptodate(bh))
                 return bh;
@@ -1617,7 +1622,13 @@ static int ext3_ordered_writepage(struct page *page,
         int err;
 
         J_ASSERT(PageLocked(page));
-        WARN_ON_ONCE(IS_RDONLY(inode));
+        /*
+         * We don't want to warn for emergency remount. The condition is
+         * ordered to avoid dereferencing inode->i_sb in non-error case to
+         * avoid slow-downs.
+         */
+        WARN_ON_ONCE(IS_RDONLY(inode) &&
+                     !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
         /*
          * We give up here if we're reentered, because it might be for a
@@ -1692,7 +1703,13 @@ static int ext3_writeback_writepage(struct page *page,
         int err;
 
         J_ASSERT(PageLocked(page));
-        WARN_ON_ONCE(IS_RDONLY(inode));
+        /*
+         * We don't want to warn for emergency remount. The condition is
+         * ordered to avoid dereferencing inode->i_sb in non-error case to
+         * avoid slow-downs.
+         */
+        WARN_ON_ONCE(IS_RDONLY(inode) &&
+                     !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
         if (ext3_journal_current_handle())
                 goto out_fail;
@@ -1735,7 +1752,13 @@ static int ext3_journalled_writepage(struct page *page,
         int err;
 
         J_ASSERT(PageLocked(page));
-        WARN_ON_ONCE(IS_RDONLY(inode));
+        /*
+         * We don't want to warn for emergency remount. The condition is
+         * ordered to avoid dereferencing inode->i_sb in non-error case to
+         * avoid slow-downs.
+         */
+        WARN_ON_ONCE(IS_RDONLY(inode) &&
+                     !(EXT3_SB(inode->i_sb)->s_mount_state & EXT3_ERROR_FS));
 
         if (ext3_journal_current_handle())
                 goto no_write;
@@ -2064,12 +2087,10 @@ static int ext3_block_truncate_page(struct inode *inode, loff_t from)
         if (PageUptodate(page))
                 set_buffer_uptodate(bh);
 
-        if (!buffer_uptodate(bh)) {
-                err = -EIO;
-                ll_rw_block(READ, 1, &bh);
-                wait_on_buffer(bh);
+        if (!bh_uptodate_or_lock(bh)) {
+                err = bh_submit_read(bh);
                 /* Uhhuh. Read error. Complain and punt. */
-                if (!buffer_uptodate(bh))
+                if (err)
                         goto unlock;
         }
 
diff --git a/fs/ext3/ioctl.c b/fs/ext3/ioctl.c
index 8e37c41a071b..4af574ce4a46 100644
--- a/fs/ext3/ioctl.c
+++ b/fs/ext3/ioctl.c
@@ -134,10 +134,11 @@ flags_out:
                         goto setversion_out;
                 }
 
+                mutex_lock(&inode->i_mutex);
                 handle = ext3_journal_start(inode, 1);
                 if (IS_ERR(handle)) {
                         err = PTR_ERR(handle);
-                        goto setversion_out;
+                        goto unlock_out;
                 }
                 err = ext3_reserve_inode_write(handle, inode, &iloc);
                 if (err == 0) {
@@ -146,6 +147,9 @@ flags_out:
                         err = ext3_mark_iloc_dirty(handle, inode, &iloc);
                 }
                 ext3_journal_stop(handle);
+
+unlock_out:
+                mutex_unlock(&inode->i_mutex);
 setversion_out:
                 mnt_drop_write_file(filp);
                 return err;
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index d269821203fd..e8e211795e9f 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -921,9 +921,12 @@ restart:
                                 num++;
                                 bh = ext3_getblk(NULL, dir, b++, 0, &err);
                                 bh_use[ra_max] = bh;
-                                if (bh)
-                                        ll_rw_block(READ | REQ_META | REQ_PRIO,
-                                                    1, &bh);
+                                if (bh && !bh_uptodate_or_lock(bh)) {
+                                        get_bh(bh);
+                                        bh->b_end_io = end_buffer_read_sync;
+                                        submit_bh(READ | REQ_META | REQ_PRIO,
+                                                  bh);
+                                }
                         }
                 }
                 if ((bh = bh_use[ra_ptr++]) == NULL)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 3a10b884e1be..726c7ef6cdf1 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2059,9 +2059,10 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
         EXT3_SB(sb)->s_mount_state |= EXT3_ORPHAN_FS;
         ext3_orphan_cleanup(sb, es);
         EXT3_SB(sb)->s_mount_state &= ~EXT3_ORPHAN_FS;
-        if (needs_recovery)
+        if (needs_recovery) {
+                ext3_mark_recovery_complete(sb, es);
                 ext3_msg(sb, KERN_INFO, "recovery complete");
-        ext3_mark_recovery_complete(sb, es);
+        }
         ext3_msg(sb, KERN_INFO, "mounted filesystem with %s data mode",
                 test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA ? "journal":
                 test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
@@ -2229,11 +2230,11 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,
                 goto out_bdev;
         }
         journal->j_private = sb;
-        ll_rw_block(READ, 1, &journal->j_sb_buffer);
-        wait_on_buffer(journal->j_sb_buffer);
-        if (!buffer_uptodate(journal->j_sb_buffer)) {
-                ext3_msg(sb, KERN_ERR, "I/O error on journal device");
-                goto out_journal;
+        if (!bh_uptodate_or_lock(journal->j_sb_buffer)) {
+                if (bh_submit_read(journal->j_sb_buffer)) {
+                        ext3_msg(sb, KERN_ERR, "I/O error on journal device");
+                        goto out_journal;
+                }
         }
         if (be32_to_cpu(journal->j_superblock->s_nr_users) != 1) {
                 ext3_msg(sb, KERN_ERR,
diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c
index 3c218b8a51d4..ea26f2acab94 100644
--- a/fs/ext3/xattr_security.c
+++ b/fs/ext3/xattr_security.c
@@ -3,7 +3,6 @@
  * Handler for storing security labels as extended attributes.
  */
 
-#include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/fs.h>
diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c
index dc8edda9ffe0..2526a8829de8 100644
--- a/fs/ext3/xattr_trusted.c
+++ b/fs/ext3/xattr_trusted.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c
index 7a321974d584..b32e473a1e33 100644
--- a/fs/ext3/xattr_user.c
+++ b/fs/ext3/xattr_user.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/ext3_jbd.h>
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 8efb2f0a3447..3f11656bd72e 100644
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -13,7 +13,6 @@
 #include <linux/namei.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
-#include <linux/module.h>
 #include <linux/swap.h>
 #include <linux/pagemap.h>
 #include <linux/blkdev.h>
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 607b1557d292..841faf5fb785 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -29,7 +29,6 @@
  *   - smart tree reduction
  */
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/jbd2.h>
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 3cfc73fbca8e..830e1b2bf145 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -20,7 +20,6 @@
  *      (sct@redhat.com), 1993, 1998
  */
 
-#include <linux/module.h>
 #include "ext4_jbd2.h"
 #include "truncate.h"
 
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 7dbcc3e84570..aa8efa6572d6 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -18,7 +18,6 @@
  *  Assorted race fixes, rewrite of ext4_get_block() by Al Viro, 2000
  */
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/jbd2.h>
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index d37b3bb2a3b8..e87a932b073b 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -158,10 +158,11 @@ flags_out:
                         goto setversion_out;
                 }
 
+                mutex_lock(&inode->i_mutex);
                 handle = ext4_journal_start(inode, 1);
                 if (IS_ERR(handle)) {
                         err = PTR_ERR(handle);
-                        goto setversion_out;
+                        goto unlock_out;
                 }
                 err = ext4_reserve_inode_write(handle, inode, &iloc);
                 if (err == 0) {
@@ -170,6 +171,9 @@ flags_out:
                         err = ext4_mark_iloc_dirty(handle, inode, &iloc);
                 }
                 ext4_journal_stop(handle);
+
+unlock_out:
+                mutex_unlock(&inode->i_mutex);
 setversion_out:
                 mnt_drop_write_file(filp);
                 return err;
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
index 16ac228dbec6..e7d6bb0acfa6 100644
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
@@ -12,7 +12,6 @@
  *
  */
 
-#include <linux/module.h>
 #include <linux/slab.h>
 #include "ext4_jbd2.h"
 
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 7e106c810c62..475851896518 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -6,7 +6,6 @@
  * Written by Theodore Ts'o, 2010.
  */
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/time.h>
 #include <linux/jbd2.h>
diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index 34e4350dd4d9..b60f9f81e33c 100644
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -3,7 +3,6 @@
  * Handler for storing security labels as extended attributes.
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <linux/security.h>
diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
index 37e6ebca2cc3..95f1f4ab59a4 100644
--- a/fs/ext4/xattr_trusted.c
+++ b/fs/ext4/xattr_trusted.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/capability.h>
 #include <linux/fs.h>
diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
index 98c375352d0e..0edb7611ffbe 100644
--- a/fs/ext4/xattr_user.c
+++ b/fs/ext4/xattr_user.c
@@ -5,7 +5,6 @@
  * Copyright (C) 2001 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
  */
 
-#include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include "ext4_jbd2.h"
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index 3a444b4e2368..a81eb2367d39 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -512,7 +512,8 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname,
         int charlen;
 
         if (utf8) {
-                *outlen = utf8s_to_utf16s(name, len, (wchar_t *)outname);
+                *outlen = utf8s_to_utf16s(name, len, UTF16_HOST_ENDIAN,
+                                (wchar_t *) outname, FAT_LFN_LEN + 2);
                 if (*outlen < 0)
                         return *outlen;
                 else if (*outlen > FAT_LFN_LEN)
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 8799207df058..f2b9a571f4cf 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -392,6 +392,12 @@ void journal_commit_transaction(journal_t *journal)
         jbd_debug (3, "JBD: commit phase 1\n");
 
         /*
+         * Clear revoked flag to reflect there is no revoked buffers
+         * in the next transaction which is going to be started.
+         */
+        journal_clear_buffer_revoked_flags(journal);
+
+        /*
          * Switch to a new revoke table.
          */
         journal_switch_revoke_table(journal);
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index a96cff0c5f1d..59c09f9541b5 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -721,7 +721,6 @@ static journal_t * journal_init_common (void)
         init_waitqueue_head(&journal->j_wait_checkpoint);
         init_waitqueue_head(&journal->j_wait_commit);
         init_waitqueue_head(&journal->j_wait_updates);
-        mutex_init(&journal->j_barrier);
         mutex_init(&journal->j_checkpoint_mutex);
         spin_lock_init(&journal->j_revoke_lock);
         spin_lock_init(&journal->j_list_lock);
diff --git a/fs/jbd/revoke.c b/fs/jbd/revoke.c
index 305a90763154..25c713e7071c 100644
--- a/fs/jbd/revoke.c
+++ b/fs/jbd/revoke.c
@@ -47,6 +47,10 @@
  *   overwriting the new data.  We don't even need to clear the revoke
  *   bit here.
  *
+ * We cache revoke status of a buffer in the current transaction in b_states
+ * bits.  As the name says, revokevalid flag indicates that the cached revoke
+ * status of a buffer is valid and we can rely on the cached status.
+ *
  * Revoke information on buffers is a tri-state value:
  *
  * RevokeValid clear:   no cached revoke status, need to look it up
@@ -479,6 +483,36 @@ int journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
         return did_revoke;
 }
 
+/*
+ * journal_clear_revoked_flags clears revoked flag of buffers in
+ * revoke table to reflect there is no revoked buffer in the next
+ * transaction which is going to be started.
+ */
+void journal_clear_buffer_revoked_flags(journal_t *journal)
+{
+        struct jbd_revoke_table_s *revoke = journal->j_revoke;
+        int i = 0;
+
+        for (i = 0; i < revoke->hash_size; i++) {
+                struct list_head *hash_list;
+                struct list_head *list_entry;
+                hash_list = &revoke->hash_table[i];
+
+                list_for_each(list_entry, hash_list) {
+                        struct jbd_revoke_record_s *record;
+                        struct buffer_head *bh;
+                        record = (struct jbd_revoke_record_s *)list_entry;
+                        bh = __find_get_block(journal->j_fs_dev,
+                                              record->blocknr,
+                                              journal->j_blocksize);
+                        if (bh) {
+                                clear_buffer_revoked(bh);
+                                __brelse(bh);
+                        }
+                }
+        }
+}
+
 /* journal_switch_revoke table select j_revoke for next transaction
  * we do not want to suspend any processing until all revokes are
  * written -bzzz
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c
index 7e59c6e66f9b..7fce94b04bc3 100644
--- a/fs/jbd/transaction.c
+++ b/fs/jbd/transaction.c
@@ -426,17 +426,34 @@ int journal_restart(handle_t *handle, int nblocks)
  * void journal_lock_updates () - establish a transaction barrier.
  * @journal:  Journal to establish a barrier on.
  *
- * This locks out any further updates from being started, and blocks
- * until all existing updates have completed, returning only once the
- * journal is in a quiescent state with no updates running.
- *
- * The journal lock should not be held on entry.
+ * This locks out any further updates from being started, and blocks until all
+ * existing updates have completed, returning only once the journal is in a
+ * quiescent state with no updates running.
+ *
+ * We do not use simple mutex for synchronization as there are syscalls which
+ * want to return with filesystem locked and that trips up lockdep. Also
+ * hibernate needs to lock filesystem but locked mutex then blocks hibernation.
+ * Since locking filesystem is rare operation, we use simple counter and
+ * waitqueue for locking.
  */
 void journal_lock_updates(journal_t *journal)
 {
         DEFINE_WAIT(wait);
 
+wait:
+        /* Wait for previous locked operation to finish */
+        wait_event(journal->j_wait_transaction_locked,
+                   journal->j_barrier_count == 0);
+
         spin_lock(&journal->j_state_lock);
+        /*
+         * Check reliably under the lock whether we are the ones winning the race
+         * and locking the journal
+         */
+        if (journal->j_barrier_count > 0) {
+                spin_unlock(&journal->j_state_lock);
+                goto wait;
+        }
         ++journal->j_barrier_count;
 
         /* Wait until there are no running updates */
@@ -460,14 +477,6 @@ void journal_lock_updates(journal_t *journal)
                 spin_lock(&journal->j_state_lock);
         }
         spin_unlock(&journal->j_state_lock);
-
-        /*
-         * We have now established a barrier against other normal updates, but
-         * we also need to barrier against other journal_lock_updates() calls
-         * to make sure that we serialise special journal-locked operations
-         * too.
-         */
-        mutex_lock(&journal->j_barrier);
 }
 
 /**
@@ -475,14 +484,11 @@ void journal_lock_updates(journal_t *journal)
  * @journal:  Journal to release the barrier on.
  *
  * Release a transaction barrier obtained with journal_lock_updates().
- *
- * Should be called without the journal lock held.
  */
 void journal_unlock_updates (journal_t *journal)
 {
         J_ASSERT(journal->j_barrier_count != 0);
 
-        mutex_unlock(&journal->j_barrier);
         spin_lock(&journal->j_state_lock);
         --journal->j_barrier_count;
         spin_unlock(&journal->j_state_lock);
diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
index 44a88a9fa2c8..fea6bd5831dc 100644
--- a/fs/nls/nls_base.c
+++ b/fs/nls/nls_base.c
@@ -52,7 +52,7 @@ static const struct utf8_table utf8_table[] =
 #define SURROGATE_LOW   0x00000400
 #define SURROGATE_BITS  0x000003ff
 
-int utf8_to_utf32(const u8 *s, int len, unicode_t *pu)
+int utf8_to_utf32(const u8 *s, int inlen, unicode_t *pu)
 {
         unsigned long l;
         int c0, c, nc;
@@ -71,7 +71,7 @@ int utf8_to_utf32(const u8 *s, int len, unicode_t *pu)
                         *pu = (unicode_t) l;
                         return nc;
                 }
-                if (len <= nc)
+                if (inlen <= nc)
                         return -1;
                 s++;
                 c = (*s ^ 0x80) & 0xFF;
@@ -83,7 +83,7 @@ int utf8_to_utf32(const u8 *s, int len, unicode_t *pu)
 }
 EXPORT_SYMBOL(utf8_to_utf32);
 
-int utf32_to_utf8(unicode_t u, u8 *s, int maxlen)
+int utf32_to_utf8(unicode_t u, u8 *s, int maxout)
 {
         unsigned long l;
         int c, nc;
@@ -97,7 +97,7 @@ int utf32_to_utf8(unicode_t u, u8 *s, int maxlen)
                 return -1;
 
         nc = 0;
-        for (t = utf8_table; t->cmask && maxlen; t++, maxlen--) {
+        for (t = utf8_table; t->cmask && maxout; t++, maxout--) {
                 nc++;
                 if (l <= t->lmask) {
                         c = t->shift;
@@ -114,34 +114,57 @@ int utf32_to_utf8(unicode_t u, u8 *s, int maxlen)
 }
 EXPORT_SYMBOL(utf32_to_utf8);
 
-int utf8s_to_utf16s(const u8 *s, int len, wchar_t *pwcs)
+static inline void put_utf16(wchar_t *s, unsigned c, enum utf16_endian endian)
+{
+        switch (endian) {
+        default:
+                *s = (wchar_t) c;
+                break;
+        case UTF16_LITTLE_ENDIAN:
+                *s = __cpu_to_le16(c);
+                break;
+        case UTF16_BIG_ENDIAN:
+                *s = __cpu_to_be16(c);
+                break;
+        }
+}
+
+int utf8s_to_utf16s(const u8 *s, int inlen, enum utf16_endian endian,
+                wchar_t *pwcs, int maxout)
 {
         u16 *op;
         int size;
         unicode_t u;
 
         op = pwcs;
-        while (*s && len > 0) {
+        while (inlen > 0 && maxout > 0 && *s) {
                 if (*s & 0x80) {
-                        size = utf8_to_utf32(s, len, &u);
+                        size = utf8_to_utf32(s, inlen, &u);
                         if (size < 0)
                                 return -EINVAL;
+                        s += size;
+                        inlen -= size;
 
                         if (u >= PLANE_SIZE) {
+                                if (maxout < 2)
+                                        break;
                                 u -= PLANE_SIZE;
-                                *op++ = (wchar_t) (SURROGATE_PAIR |
-                                                ((u >> 10) & SURROGATE_BITS));
-                                *op++ = (wchar_t) (SURROGATE_PAIR |
+                                put_utf16(op++, SURROGATE_PAIR |
+                                                ((u >> 10) & SURROGATE_BITS),
+                                                endian);
+                                put_utf16(op++, SURROGATE_PAIR |
                                                 SURROGATE_LOW |
-                                                (u & SURROGATE_BITS));
+                                                (u & SURROGATE_BITS),
+                                                endian);
+                                maxout -= 2;
                         } else {
-                                *op++ = (wchar_t) u;
+                                put_utf16(op++, u, endian);
+                                maxout--;
                         }
-                        s += size;
-                        len -= size;
                 } else {
-                        *op++ = *s++;
-                        len--;
+                        put_utf16(op++, *s++, endian);
+                        inlen--;
+                        maxout--;
                 }
         }
         return op - pwcs;
@@ -160,27 +183,27 @@ static inline unsigned long get_utf16(unsigned c, enum utf16_endian endian)
         }
 }
 
-int utf16s_to_utf8s(const wchar_t *pwcs, int len, enum utf16_endian endian,
-                u8 *s, int maxlen)
+int utf16s_to_utf8s(const wchar_t *pwcs, int inlen, enum utf16_endian endian,
+                u8 *s, int maxout)
 {
         u8 *op;
         int size;
         unsigned long u, v;
 
         op = s;
-        while (len > 0 && maxlen > 0) {
+        while (inlen > 0 && maxout > 0) {
                 u = get_utf16(*pwcs, endian);
                 if (!u)
                         break;
                 pwcs++;
-                len--;
+                inlen--;
                 if (u > 0x7f) {
                         if ((u & SURROGATE_MASK) == SURROGATE_PAIR) {
                                 if (u & SURROGATE_LOW) {
                                         /* Ignore character and move on */
                                         continue;
                                 }
-                                if (len <= 0)
+                                if (inlen <= 0)
                                         break;
                                 v = get_utf16(*pwcs, endian);
                                 if ((v & SURROGATE_MASK) != SURROGATE_PAIR ||
@@ -191,18 +214,18 @@ int utf16s_to_utf8s(const wchar_t *pwcs, int len, enum utf16_endian endian,
                                 u = PLANE_SIZE + ((u & SURROGATE_BITS) << 10)
                                                 + (v & SURROGATE_BITS);
                                 pwcs++;
-                                len--;
+                                inlen--;
                         }
-                        size = utf32_to_utf8(u, op, maxlen);
+                        size = utf32_to_utf8(u, op, maxout);
                         if (size == -1) {
                                 /* Ignore character and move on */
                         } else {
                                 op += size;
-                                maxlen -= size;
+                                maxout -= size;
                         }
                 } else {
                         *op++ = (u8) u;
-                        maxlen--;
+                        maxout--;
                 }
         }
         return op - s;
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 19c454e61b79..1d42e707d5fa 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -455,16 +455,20 @@ int remove_save_link(struct inode *inode, int truncate)
 static void reiserfs_kill_sb(struct super_block *s)
 {
         if (REISERFS_SB(s)) {
-                if (REISERFS_SB(s)->xattr_root) {
-                        d_invalidate(REISERFS_SB(s)->xattr_root);
-                        dput(REISERFS_SB(s)->xattr_root);
-                        REISERFS_SB(s)->xattr_root = NULL;
-                }
-                if (REISERFS_SB(s)->priv_root) {
-                        d_invalidate(REISERFS_SB(s)->priv_root);
-                        dput(REISERFS_SB(s)->priv_root);
-                        REISERFS_SB(s)->priv_root = NULL;
-                }
+                /*
+                 * Force any pending inode evictions to occur now. Any
+                 * inodes to be removed that have extended attributes
+                 * associated with them need to clean them up before
+                 * we can release the extended attribute root dentries.
+                 * shrink_dcache_for_umount will BUG if we don't release
+                 * those before it's called so ->put_super is too late.
+                 */
+                shrink_dcache_sb(s);
+
+                dput(REISERFS_SB(s)->xattr_root);
+                REISERFS_SB(s)->xattr_root = NULL;
+                dput(REISERFS_SB(s)->priv_root);
+                REISERFS_SB(s)->priv_root = NULL;
         }
 
         kill_block_super(s);
@@ -1249,7 +1253,8 @@ static void handle_quota_files(struct super_block *s, char **qf_names,
                         kfree(REISERFS_SB(s)->s_qf_names[i]);
                 REISERFS_SB(s)->s_qf_names[i] = qf_names[i];
         }
-        REISERFS_SB(s)->s_jquota_fmt = *qfmt;
+        if (*qfmt)
+                REISERFS_SB(s)->s_jquota_fmt = *qfmt;
 }
 #endif
 
diff --git a/fs/udf/file.c b/fs/udf/file.c
index d8ffa7cc661d..dca0c3881e82 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -125,7 +125,6 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                         err = udf_expand_file_adinicb(inode);
                         if (err) {
                                 udf_debug("udf_expand_adinicb: err=%d\n", err);
-                                up_write(&iinfo->i_data_sem);
                                 return err;
                         }
                 } else {
@@ -133,9 +132,10 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                                 iinfo->i_lenAlloc = pos + count;
                         else
                                 iinfo->i_lenAlloc = inode->i_size;
+                        up_write(&iinfo->i_data_sem);
                 }
-        }
-        up_write(&iinfo->i_data_sem);
+        } else
+                up_write(&iinfo->i_data_sem);
 
         retval = generic_file_aio_write(iocb, iov, nr_segs, ppos);
         if (retval > 0)
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 4598904be1bb..7699df7b3198 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -53,8 +53,7 @@ static int udf_update_inode(struct inode *, int);
 static void udf_fill_inode(struct inode *, struct buffer_head *);
 static int udf_sync_inode(struct inode *inode);
 static int udf_alloc_i_data(struct inode *inode, size_t size);
-static struct buffer_head *inode_getblk(struct inode *, sector_t, int *,
-                                        sector_t *, int *);
+static sector_t inode_getblk(struct inode *, sector_t, int *, int *);
 static int8_t udf_insert_aext(struct inode *, struct extent_position,
                               struct kernel_lb_addr, uint32_t);
 static void udf_split_extents(struct inode *, int *, int, int,
@@ -151,6 +150,12 @@ const struct address_space_operations udf_aops = {
         .bmap           = udf_bmap,
 };
 
+/*
+ * Expand file stored in ICB to a normal one-block-file
+ *
+ * This function requires i_data_sem for writing and releases it.
+ * This function requires i_mutex held
+ */
 int udf_expand_file_adinicb(struct inode *inode)
 {
         struct page *page;
@@ -169,9 +174,15 @@ int udf_expand_file_adinicb(struct inode *inode)
                         iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
                 /* from now on we have normal address_space methods */
                 inode->i_data.a_ops = &udf_aops;
+                up_write(&iinfo->i_data_sem);
                 mark_inode_dirty(inode);
                 return 0;
         }
+        /*
+         * Release i_data_sem so that we can lock a page - page lock ranks
+         * above i_data_sem. i_mutex still protects us against file changes.
+         */
+        up_write(&iinfo->i_data_sem);
 
         page = find_or_create_page(inode->i_mapping, 0, GFP_NOFS);
         if (!page)
@@ -187,6 +198,7 @@ int udf_expand_file_adinicb(struct inode *inode)
                 SetPageUptodate(page);
                 kunmap(page);
         }
+        down_write(&iinfo->i_data_sem);
         memset(iinfo->i_ext.i_data + iinfo->i_lenEAttr, 0x00,
                iinfo->i_lenAlloc);
         iinfo->i_lenAlloc = 0;
@@ -196,17 +208,20 @@ int udf_expand_file_adinicb(struct inode *inode)
                 iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
         /* from now on we have normal address_space methods */
         inode->i_data.a_ops = &udf_aops;
+        up_write(&iinfo->i_data_sem);
         err = inode->i_data.a_ops->writepage(page, &udf_wbc);
         if (err) {
                 /* Restore everything back so that we don't lose data... */
                 lock_page(page);
                 kaddr = kmap(page);
+                down_write(&iinfo->i_data_sem);
                 memcpy(iinfo->i_ext.i_data + iinfo->i_lenEAttr, kaddr,
                        inode->i_size);
                 kunmap(page);
                 unlock_page(page);
                 iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
                 inode->i_data.a_ops = &udf_adinicb_aops;
+                up_write(&iinfo->i_data_sem);
         }
         page_cache_release(page);
         mark_inode_dirty(inode);
@@ -310,7 +325,6 @@ static int udf_get_block(struct inode *inode, sector_t block,
                          struct buffer_head *bh_result, int create)
 {
         int err, new;
-        struct buffer_head *bh;
         sector_t phys = 0;
         struct udf_inode_info *iinfo;
 
@@ -323,7 +337,6 @@ static int udf_get_block(struct inode *inode, sector_t block,
 
         err = -EIO;
         new = 0;
-        bh = NULL;
         iinfo = UDF_I(inode);
 
         down_write(&iinfo->i_data_sem);
@@ -332,13 +345,10 @@ static int udf_get_block(struct inode *inode, sector_t block,
                 iinfo->i_next_alloc_goal++;
         }
 
-        err = 0;
 
-        bh = inode_getblk(inode, block, &err, &phys, &new);
-        BUG_ON(bh);
-        if (err)
+        phys = inode_getblk(inode, block, &err, &new);
+        if (!phys)
                 goto abort;
-        BUG_ON(!phys);
 
         if (new)
                 set_buffer_new(bh_result);
@@ -547,11 +557,10 @@ out:
         return err;
 }
 
-static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
-                                        int *err, sector_t *phys, int *new)
+static sector_t inode_getblk(struct inode *inode, sector_t block,
+                             int *err, int *new)
 {
         static sector_t last_block;
-        struct buffer_head *result = NULL;
         struct kernel_long_ad laarr[EXTENT_MERGE_SIZE];
         struct extent_position prev_epos, cur_epos, next_epos;
         int count = 0, startnum = 0, endnum = 0;
@@ -566,6 +575,8 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
         int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
         int lastblock = 0;
 
+        *err = 0;
+        *new = 0;
         prev_epos.offset = udf_file_entry_alloc_offset(inode);
         prev_epos.block = iinfo->i_location;
         prev_epos.bh = NULL;
@@ -635,8 +646,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
                 brelse(cur_epos.bh);
                 brelse(next_epos.bh);
                 newblock = udf_get_lb_pblock(inode->i_sb, &eloc, offset);
-                *phys = newblock;
-                return NULL;
+                return newblock;
         }
 
         last_block = block;
@@ -664,7 +674,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
                         brelse(cur_epos.bh);
                         brelse(next_epos.bh);
                         *err = ret;
-                        return NULL;
+                        return 0;
                 }
                 c = 0;
                 offset = 0;
@@ -729,7 +739,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
                 if (!newblocknum) {
                         brelse(prev_epos.bh);
                         *err = -ENOSPC;
-                        return NULL;
+                        return 0;
                 }
                 iinfo->i_lenExtents += inode->i_sb->s_blocksize;
         }
@@ -761,10 +771,10 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
 
         newblock = udf_get_pblock(inode->i_sb, newblocknum,
                                 iinfo->i_location.partitionReferenceNum, 0);
-        if (!newblock)
-                return NULL;
-        *phys = newblock;
-        *err = 0;
+        if (!newblock) {
+                *err = -EIO;
+                return 0;
+        }
         *new = 1;
         iinfo->i_next_alloc_block = block;
         iinfo->i_next_alloc_goal = newblocknum;
@@ -775,7 +785,7 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
         else
                 mark_inode_dirty(inode);
 
-        return result;
+        return newblock;
 }
 
 static void udf_split_extents(struct inode *inode, int *c, int offset,
@@ -1111,10 +1121,9 @@ int udf_setsize(struct inode *inode, loff_t newsize)
                         if (bsize <
                             (udf_file_entry_alloc_offset(inode) + newsize)) {
                                 err = udf_expand_file_adinicb(inode);
-                                if (err) {
-                                        up_write(&iinfo->i_data_sem);
+                                if (err)
                                         return err;
-                                }
+                                down_write(&iinfo->i_data_sem);
                         } else
                                 iinfo->i_lenAlloc = newsize;
                 }
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 0c33225647a0..c09a84daaf50 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1798,6 +1798,12 @@ static void udf_close_lvid(struct super_block *sb)
                                 le16_to_cpu(lvid->descTag.descCRCLength)));
 
         lvid->descTag.tagChecksum = udf_tag_checksum(&lvid->descTag);
+        /*
+         * We set buffer uptodate unconditionally here to avoid spurious
+         * warnings from mark_buffer_dirty() when previous EIO has marked
+         * the buffer as !uptodate
+         */
+        set_buffer_uptodate(bh);
         mark_buffer_dirty(bh);
         sbi->s_lvid_dirty = 0;
         mutex_unlock(&sbi->s_alloc_mutex);
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c
index b1d4488b0f14..d7c6dbe4194b 100644
--- a/fs/udf/symlink.c
+++ b/fs/udf/symlink.c
@@ -41,10 +41,16 @@ static void udf_pc_to_char(struct super_block *sb, unsigned char *from,
                 pc = (struct pathComponent *)(from + elen);
                 switch (pc->componentType) {
                 case 1:
-                        if (pc->lengthComponentIdent == 0) {
-                                p = to;
-                                *p++ = '/';
-                        }
+                        /*
+                         * Symlink points to some place which should be agreed
+                         * upon between originator and receiver of the media. Ignore.
+                         */
+                        if (pc->lengthComponentIdent > 0)
+                                break;
+                        /* Fall through */
+                case 2:
+                        p = to;
+                        *p++ = '/';
                         break;
                 case 3:
                         memcpy(p, "../", 3);
diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 8a24f0c6c860..286a051f12cf 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -68,7 +68,7 @@ xfs_trim_extents(
          * Look up the longest btree in the AGF and start with it.
          */
         error = xfs_alloc_lookup_le(cur, 0,
-                                    XFS_BUF_TO_AGF(agbp)->agf_longest, &i);
+                            be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest), &i);
         if (error)
                 goto out_del_cursor;
 
@@ -84,7 +84,7 @@ xfs_trim_extents(
                 if (error)
                         goto out_del_cursor;
                 XFS_WANT_CORRUPTED_GOTO(i == 1, out_del_cursor);
-                ASSERT(flen <= XFS_BUF_TO_AGF(agbp)->agf_longest);
+                ASSERT(flen <= be32_to_cpu(XFS_BUF_TO_AGF(agbp)->agf_longest));
 
                 /*
                  * Too small?  Give up.
diff --git a/include/linux/amba/pl330.h b/include/linux/amba/pl330.h
index d12f077a6daf..12e023c19ac1 100644
--- a/include/linux/amba/pl330.h
+++ b/include/linux/amba/pl330.h
@@ -12,17 +12,9 @@
 #ifndef __AMBA_PL330_H_
 #define __AMBA_PL330_H_
 
+#include <linux/dmaengine.h>
 #include <asm/hardware/pl330.h>
 
-struct dma_pl330_peri {
-        /*
-         * Peri_Req i/f of the DMAC that is
-         * peripheral could be reached from.
-         */
-        u8 peri_id; /* specific dma id */
-        enum pl330_reqtype rqtype;
-};
-
 struct dma_pl330_platdata {
         /*
          * Number of valid peripherals connected to DMAC.
@@ -33,9 +25,12 @@ struct dma_pl330_platdata {
          */
         u8 nr_valid_peri;
         /* Array of valid peripherals */
-        struct dma_pl330_peri *peri;
+        u8 *peri_id;
+        /* Operational capabilities */
+        dma_cap_mask_t cap_mask;
         /* Bytes to allocate for MC buffer */
         unsigned mcbuf_sz;
 };
 
+extern bool pl330_filter(struct dma_chan *chan, void *param);
 #endif  /* __AMBA_PL330_H_ */
diff --git a/include/linux/ata_platform.h b/include/linux/ata_platform.h
index 9a26c83a2c9e..b856a2a590d9 100644
--- a/include/linux/ata_platform.h
+++ b/include/linux/ata_platform.h
@@ -27,10 +27,7 @@ extern int __devexit __pata_platform_remove(struct device *dev);
 /*
  * Marvell SATA private data
  */
-struct mbus_dram_target_info;
-
 struct mv_sata_platform_data {
-        struct mbus_dram_target_info    *dram;
         int     n_ports; /* number of sata ports */
 };
 
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index a17becc36ca1..e9b602151caf 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -457,6 +457,28 @@ void cgroup_exclude_rmdir(struct cgroup_subsys_state *css);
 void cgroup_release_and_wakeup_rmdir(struct cgroup_subsys_state *css);
 
 /*
+ * Control Group taskset, used to pass around set of tasks to cgroup_subsys
+ * methods.
+ */
+struct cgroup_taskset;
+struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset);
+struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset);
+struct cgroup *cgroup_taskset_cur_cgroup(struct cgroup_taskset *tset);
+int cgroup_taskset_size(struct cgroup_taskset *tset);
+
+/**
+ * cgroup_taskset_for_each - iterate cgroup_taskset
+ * @task: the loop cursor
+ * @skip_cgrp: skip if task's cgroup matches this, %NULL to iterate through all
+ * @tset: taskset to iterate
+ */
+#define cgroup_taskset_for_each(task, skip_cgrp, tset)                  \
+        for ((task) = cgroup_taskset_first((tset)); (task);             \
+             (task) = cgroup_taskset_next((tset)))                      \
+                if (!(skip_cgrp) ||                                     \
+                    cgroup_taskset_cur_cgroup((tset)) != (skip_cgrp))
+
+/*
  * Control Group subsystem type.
  * See Documentation/cgroups/cgroups.txt for details
  */
@@ -467,14 +489,11 @@ struct cgroup_subsys {
         int (*pre_destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
         void (*destroy)(struct cgroup_subsys *ss, struct cgroup *cgrp);
         int (*can_attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
-                          struct task_struct *tsk);
-        int (*can_attach_task)(struct cgroup *cgrp, struct task_struct *tsk);
+                          struct cgroup_taskset *tset);
         void (*cancel_attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
-                              struct task_struct *tsk);
-        void (*pre_attach)(struct cgroup *cgrp);
-        void (*attach_task)(struct cgroup *cgrp, struct task_struct *tsk);
+                              struct cgroup_taskset *tset);
         void (*attach)(struct cgroup_subsys *ss, struct cgroup *cgrp,
-                       struct cgroup *old_cgrp, struct task_struct *tsk);
+                       struct cgroup_taskset *tset);
         void (*fork)(struct cgroup_subsys *ss, struct task_struct *task);
         void (*exit)(struct cgroup_subsys *ss, struct cgroup *cgrp,
                         struct cgroup *old_cgrp, struct task_struct *task);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 7213b52b2c0e..b9d46fa154b4 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -107,6 +107,28 @@ static inline void clk_unprepare(struct clk *clk)
 }
 #endif
 
+/* clk_prepare_enable helps cases using clk_enable in non-atomic context. */
+static inline int clk_prepare_enable(struct clk *clk)
+{
+        int ret;
+
+        ret = clk_prepare(clk);
+        if (ret)
+                return ret;
+        ret = clk_enable(clk);
+        if (ret)
+                clk_unprepare(clk);
+
+        return ret;
+}
+
+/* clk_disable_unprepare helps cases using clk_disable in non-atomic context. */
+static inline void clk_disable_unprepare(struct clk *clk)
+{
+        clk_disable(clk);
+        clk_unprepare(clk);
+}
+
 /**
  * clk_get_rate - obtain the current clock rate (in Hz) for a clock source.
  *                This is only valid once the clock source has been enabled.
diff --git a/include/linux/gpio-pxa.h b/include/linux/gpio-pxa.h
new file mode 100644
index 000000000000..05071ee34c3f
--- /dev/null
+++ b/include/linux/gpio-pxa.h
@@ -0,0 +1,16 @@
+#ifndef __GPIO_PXA_H
+#define __GPIO_PXA_H
+
+#define GPIO_bit(x)     (1 << ((x) & 0x1f))
+
+#define gpio_to_bank(gpio)      ((gpio) >> 5)
+
+/* NOTE: some PXAs have fewer on-chip GPIOs (like PXA255, with 85).
+ * Those cases currently cause holes in the GPIO number space, the
+ * actual number of the last GPIO is recorded by 'pxa_last_gpio'.
+ */
+extern int pxa_last_gpio;
+
+extern int pxa_irq_to_gpio(int irq);
+
+#endif /* __GPIO_PXA_H */
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 12ec328481de..62b908e0e591 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                           16
+#define MAX_PAGE_BUFFER_COUNT                           18
 #define MAX_MULTIPAGE_BUFFER_COUNT                      32 /* 128K */
 
 #pragma pack(push, 1)
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 32574eef9394..9c66b1ada9d7 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -23,11 +23,10 @@ extern struct files_struct init_files;
 extern struct fs_struct init_fs;
 
 #ifdef CONFIG_CGROUPS
-#define INIT_THREADGROUP_FORK_LOCK(sig)                                 \
-        .threadgroup_fork_lock =                                        \
-                __RWSEM_INITIALIZER(sig.threadgroup_fork_lock),
+#define INIT_GROUP_RWSEM(sig)                                           \
+        .group_rwsem = __RWSEM_INITIALIZER(sig.group_rwsem),
 #else
-#define INIT_THREADGROUP_FORK_LOCK(sig)
+#define INIT_GROUP_RWSEM(sig)
 #endif
 
 #define INIT_SIGNALS(sig) {                                             \
@@ -46,7 +45,7 @@ extern struct fs_struct init_fs;
         },                                                              \
         .cred_guard_mutex =                                             \
                  __MUTEX_INITIALIZER(sig.cred_guard_mutex),             \
-        INIT_THREADGROUP_FORK_LOCK(sig)                                 \
+        INIT_GROUP_RWSEM(sig)                                           \
 }
 
 extern struct nsproxy init_nsproxy;
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index c7acdde3243d..d211732b9e99 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -497,7 +497,6 @@ struct transaction_s
  * @j_format_version: Version of the superblock format
  * @j_state_lock: Protect the various scalars in the journal
  * @j_barrier_count:  Number of processes waiting to create a barrier lock
- * @j_barrier: The barrier lock itself
  * @j_running_transaction: The current running transaction..
  * @j_committing_transaction: the transaction we are pushing to disk
  * @j_checkpoint_transactions: a linked circular list of all transactions
@@ -580,9 +579,6 @@ struct journal_s
          */
         int                     j_barrier_count;
 
-        /* The barrier lock itself */
-        struct mutex            j_barrier;
-
         /*
          * Transactions: The current running transaction...
          * [j_state_lock] [caller holding open handle]
@@ -913,6 +909,7 @@ extern int	journal_set_revoke(journal_t *, unsigned int, tid_t);
 extern int      journal_test_revoke(journal_t *, unsigned int, tid_t);
 extern void     journal_clear_revoke(journal_t *);
 extern void     journal_switch_revoke_table(journal_t *journal);
+extern void     journal_clear_buffer_revoked_flags(journal_t *journal);
 
 /*
  * The log thread user interface:
diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index c11ff2932549..efa1a6d7aca8 100644
--- a/include/linux/mbus.h
+++ b/include/linux/mbus.h
@@ -32,5 +32,16 @@ struct mbus_dram_target_info
         } cs[4];
 };
 
-
+/*
+ * The Marvell mbus is to be found only on SOCs from the Orion family
+ * at the moment.  Provide a dummy stub for other architectures.
+ */
+#ifdef CONFIG_PLAT_ORION
+extern const struct mbus_dram_target_info *mv_mbus_dram_info(void);
+#else
+static inline const struct mbus_dram_target_info *mv_mbus_dram_info(void)
+{
+        return NULL;
+}
+#endif
 #endif
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 9b296ea41bb8..f944591765eb 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -390,7 +390,6 @@ enum {
         OVER_LIMIT,
 };
 
-#ifdef CONFIG_INET
 struct sock;
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
 void sock_update_memcg(struct sock *sk);
@@ -403,6 +402,5 @@ static inline void sock_release_memcg(struct sock *sk)
 {
 }
 #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */
-#endif /* CONFIG_INET */
 #endif /* _LINUX_MEMCONTROL_H */
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a1d109590da4..0eac07c95255 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2155,7 +2155,7 @@ extern void netdev_run_todo(void);
  */
 static inline void dev_put(struct net_device *dev)
 {
-        irqsafe_cpu_dec(*dev->pcpu_refcnt);
+        this_cpu_dec(*dev->pcpu_refcnt);
 }
 
 /**
@@ -2166,7 +2166,7 @@ static inline void dev_put(struct net_device *dev)
  */
 static inline void dev_hold(struct net_device *dev)
 {
-        irqsafe_cpu_inc(*dev->pcpu_refcnt);
+        this_cpu_inc(*dev->pcpu_refcnt);
 }
 
 /* Carrier loss detection, dial on demand. The functions netif_carrier_on
@@ -2450,6 +2450,11 @@ static inline void netif_addr_lock(struct net_device *dev)
         spin_lock(&dev->addr_list_lock);
 }
 
+static inline void netif_addr_lock_nested(struct net_device *dev)
+{
+        spin_lock_nested(&dev->addr_list_lock, SINGLE_DEPTH_NESTING);
+}
+
 static inline void netif_addr_lock_bh(struct net_device *dev)
 {
         spin_lock_bh(&dev->addr_list_lock);
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index 32cddf78b13e..8d674a786744 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -471,7 +471,7 @@ DECLARE_PER_CPU(seqcount_t, xt_recseq);
  *
  * Begin packet processing : all readers must wait the end
  * 1) Must be called with preemption disabled
- * 2) softirqs must be disabled too (or we should use irqsafe_cpu_add())
+ * 2) softirqs must be disabled too (or we should use this_cpu_add())
  * Returns :
  *  1 if no recursion on this cpu
  *  0 if recursion detected
@@ -503,7 +503,7 @@ static inline unsigned int xt_write_recseq_begin(void)
  *
  * End packet processing : all readers can proceed
  * 1) Must be called with preemption disabled
- * 2) softirqs must be disabled too (or we should use irqsafe_cpu_add())
+ * 2) softirqs must be disabled too (or we should use this_cpu_add())
  */
 static inline void xt_write_recseq_end(unsigned int addend)
 {
diff --git a/include/linux/nls.h b/include/linux/nls.h
index d47beef08dfd..5dc635f8d79e 100644
--- a/include/linux/nls.h
+++ b/include/linux/nls.h
@@ -43,7 +43,7 @@ enum utf16_endian {
         UTF16_BIG_ENDIAN
 };
 
-/* nls.c */
+/* nls_base.c */
 extern int register_nls(struct nls_table *);
 extern int unregister_nls(struct nls_table *);
 extern struct nls_table *load_nls(char *);
@@ -52,7 +52,8 @@ extern struct nls_table *load_nls_default(void);
 
 extern int utf8_to_utf32(const u8 *s, int len, unicode_t *pu);
 extern int utf32_to_utf8(unicode_t u, u8 *s, int maxlen);
-extern int utf8s_to_utf16s(const u8 *s, int len, wchar_t *pwcs);
+extern int utf8s_to_utf16s(const u8 *s, int len,
+                enum utf16_endian endian, wchar_t *pwcs, int maxlen);
 extern int utf16s_to_utf8s(const wchar_t *pwcs, int len,
                 enum utf16_endian endian, u8 *s, int maxlen);
 
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 9ca008f0c542..32cd1f67462e 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -172,10 +172,10 @@ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
  * equal char, int or long.  percpu_read() evaluates to a lvalue and
  * all others to void.
  *
- * These operations are guaranteed to be atomic w.r.t. preemption.
- * The generic versions use plain get/put_cpu_var().  Archs are
+ * These operations are guaranteed to be atomic.
+ * The generic versions disable interrupts.  Archs are
  * encouraged to implement single-instruction alternatives which don't
- * require preemption protection.
+ * require protection.
  */
 #ifndef percpu_read
 # define percpu_read(var)                                               \
@@ -347,9 +347,10 @@ do {									\
 
 #define _this_cpu_generic_to_op(pcp, val, op)                           \
 do {                                                                    \
-        preempt_disable();                                              \
+        unsigned long flags;                                            \
+        local_irq_save(flags);                                          \
         *__this_cpu_ptr(&(pcp)) op val;                                 \
-        preempt_enable();                                               \
+        local_irq_restore(flags);                                       \
 } while (0)
 
 #ifndef this_cpu_write
@@ -447,10 +448,11 @@ do {									\
 #define _this_cpu_generic_add_return(pcp, val)                          \
 ({                                                                      \
         typeof(pcp) ret__;                                              \
-        preempt_disable();                                              \
+        unsigned long flags;                                            \
+        local_irq_save(flags);                                          \
         __this_cpu_add(pcp, val);                                       \
         ret__ = __this_cpu_read(pcp);                                   \
-        preempt_enable();                                               \
+        local_irq_restore(flags);                                       \
         ret__;                                                          \
 })
 
@@ -476,10 +478,11 @@ do {									\
 
 #define _this_cpu_generic_xchg(pcp, nval)                               \
 ({      typeof(pcp) ret__;                                              \
-        preempt_disable();                                              \
+        unsigned long flags;                                            \
+        local_irq_save(flags);                                          \
         ret__ = __this_cpu_read(pcp);                                   \
         __this_cpu_write(pcp, nval);                                    \
-        preempt_enable();                                               \
+        local_irq_restore(flags);                                       \
         ret__;                                                          \
 })
 
@@ -501,12 +504,14 @@ do {									\
 #endif
 
 #define _this_cpu_generic_cmpxchg(pcp, oval, nval)                      \
-({      typeof(pcp) ret__;                                              \
-        preempt_disable();                                              \
+({                                                                      \
+        typeof(pcp) ret__;                                              \
+        unsigned long flags;                                            \
+        local_irq_save(flags);                                          \
         ret__ = __this_cpu_read(pcp);                                   \
         if (ret__ == (oval))                                            \
                 __this_cpu_write(pcp, nval);                            \
-        preempt_enable();                                               \
+        local_irq_restore(flags);                                       \
         ret__;                                                          \
 })
 
@@ -538,10 +543,11 @@ do {									\
 #define _this_cpu_generic_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)        \
 ({                                                                      \
         int ret__;                                                      \
-        preempt_disable();                                              \
+        unsigned long flags;                                            \
+        local_irq_save(flags);                                          \
         ret__ = __this_cpu_generic_cmpxchg_double(pcp1, pcp2,           \
                         oval1, oval2, nval1, nval2);                    \
-        preempt_enable();                                               \
+        local_irq_restore(flags);                                       \
         ret__;                                                          \
 })
 
@@ -567,9 +573,9 @@ do {									\
 #endif
 
 /*
- * Generic percpu operations that do not require preemption handling.
+ * Generic percpu operations for context that are safe from preemption/interrupts.
  * Either we do not care about races or the caller has the
- * responsibility of handling preemptions issues. Arch code can still
+ * responsibility of handling preemption/interrupt issues. Arch code can still
  * override these instructions since the arch per cpu code may be more
  * efficient and may actually get race freeness for free (that is the
  * case for x86 for example).
@@ -802,156 +808,4 @@ do {									\
         __pcpu_double_call_return_bool(__this_cpu_cmpxchg_double_, (pcp1), (pcp2), (oval1), (oval2), (nval1), (nval2))
 #endif
 
-/*
- * IRQ safe versions of the per cpu RMW operations. Note that these operations
- * are *not* safe against modification of the same variable from another
- * processors (which one gets when using regular atomic operations)
- * They are guaranteed to be atomic vs. local interrupts and
- * preemption only.
- */
-#define irqsafe_cpu_generic_to_op(pcp, val, op)                         \
-do {                                                                    \
-        unsigned long flags;                                            \
-        local_irq_save(flags);                                          \
-        *__this_cpu_ptr(&(pcp)) op val;                                 \
-        local_irq_restore(flags);                                       \
-} while (0)
-
-#ifndef irqsafe_cpu_add
-# ifndef irqsafe_cpu_add_1
-#  define irqsafe_cpu_add_1(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef irqsafe_cpu_add_2
-#  define irqsafe_cpu_add_2(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef irqsafe_cpu_add_4
-#  define irqsafe_cpu_add_4(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# ifndef irqsafe_cpu_add_8
-#  define irqsafe_cpu_add_8(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), +=)
-# endif
-# define irqsafe_cpu_add(pcp, val) __pcpu_size_call(irqsafe_cpu_add_, (pcp), (val))
-#endif
-
-#ifndef irqsafe_cpu_sub
-# define irqsafe_cpu_sub(pcp, val)      irqsafe_cpu_add((pcp), -(val))
-#endif
-
-#ifndef irqsafe_cpu_inc
-# define irqsafe_cpu_inc(pcp)   irqsafe_cpu_add((pcp), 1)
-#endif
-
-#ifndef irqsafe_cpu_dec
-# define irqsafe_cpu_dec(pcp)   irqsafe_cpu_sub((pcp), 1)
-#endif
-
-#ifndef irqsafe_cpu_and
-# ifndef irqsafe_cpu_and_1
-#  define irqsafe_cpu_and_1(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef irqsafe_cpu_and_2
-#  define irqsafe_cpu_and_2(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef irqsafe_cpu_and_4
-#  define irqsafe_cpu_and_4(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# ifndef irqsafe_cpu_and_8
-#  define irqsafe_cpu_and_8(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), &=)
-# endif
-# define irqsafe_cpu_and(pcp, val) __pcpu_size_call(irqsafe_cpu_and_, (val))
-#endif
-
-#ifndef irqsafe_cpu_or
-# ifndef irqsafe_cpu_or_1
-#  define irqsafe_cpu_or_1(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef irqsafe_cpu_or_2
-#  define irqsafe_cpu_or_2(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef irqsafe_cpu_or_4
-#  define irqsafe_cpu_or_4(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# ifndef irqsafe_cpu_or_8
-#  define irqsafe_cpu_or_8(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), |=)
-# endif
-# define irqsafe_cpu_or(pcp, val) __pcpu_size_call(irqsafe_cpu_or_, (val))
-#endif
-
-#ifndef irqsafe_cpu_xor
-# ifndef irqsafe_cpu_xor_1
-#  define irqsafe_cpu_xor_1(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), ^=)
-# endif
-# ifndef irqsafe_cpu_xor_2
-#  define irqsafe_cpu_xor_2(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), ^=)
-# endif
-# ifndef irqsafe_cpu_xor_4
-#  define irqsafe_cpu_xor_4(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), ^=)
-# endif
-# ifndef irqsafe_cpu_xor_8
-#  define irqsafe_cpu_xor_8(pcp, val) irqsafe_cpu_generic_to_op((pcp), (val), ^=)
-# endif
-# define irqsafe_cpu_xor(pcp, val) __pcpu_size_call(irqsafe_cpu_xor_, (val))
-#endif
-
-#define irqsafe_cpu_generic_cmpxchg(pcp, oval, nval)                    \
-({                                                                      \
-        typeof(pcp) ret__;                                              \
-        unsigned long flags;                                            \
-        local_irq_save(flags);                                          \
-        ret__ = __this_cpu_read(pcp);                                   \
-        if (ret__ == (oval))                                            \
-                __this_cpu_write(pcp, nval);                            \
-        local_irq_restore(flags);                                       \
-        ret__;                                                          \
-})
-
-#ifndef irqsafe_cpu_cmpxchg
-# ifndef irqsafe_cpu_cmpxchg_1
-#  define irqsafe_cpu_cmpxchg_1(pcp, oval, nval)        irqsafe_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef irqsafe_cpu_cmpxchg_2
-#  define irqsafe_cpu_cmpxchg_2(pcp, oval, nval)        irqsafe_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef irqsafe_cpu_cmpxchg_4
-#  define irqsafe_cpu_cmpxchg_4(pcp, oval, nval)        irqsafe_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# ifndef irqsafe_cpu_cmpxchg_8
-#  define irqsafe_cpu_cmpxchg_8(pcp, oval, nval)        irqsafe_cpu_generic_cmpxchg(pcp, oval, nval)
-# endif
-# define irqsafe_cpu_cmpxchg(pcp, oval, nval)           \
-        __pcpu_size_call_return2(irqsafe_cpu_cmpxchg_, (pcp), oval, nval)
-#endif
-
-#define irqsafe_generic_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)      \
-({                                                                      \
-        int ret__;                                                      \
-        unsigned long flags;                                            \
-        local_irq_save(flags);                                          \
-        ret__ = __this_cpu_generic_cmpxchg_double(pcp1, pcp2,           \
-                        oval1, oval2, nval1, nval2);                    \
-        local_irq_restore(flags);                                       \
-        ret__;                                                          \
-})
-
-#ifndef irqsafe_cpu_cmpxchg_double
-# ifndef irqsafe_cpu_cmpxchg_double_1
-#  define irqsafe_cpu_cmpxchg_double_1(pcp1, pcp2, oval1, oval2, nval1, nval2)  \
-        irqsafe_generic_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef irqsafe_cpu_cmpxchg_double_2
-#  define irqsafe_cpu_cmpxchg_double_2(pcp1, pcp2, oval1, oval2, nval1, nval2)  \
-        irqsafe_generic_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef irqsafe_cpu_cmpxchg_double_4
-#  define irqsafe_cpu_cmpxchg_double_4(pcp1, pcp2, oval1, oval2, nval1, nval2)  \
-        irqsafe_generic_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# ifndef irqsafe_cpu_cmpxchg_double_8
-#  define irqsafe_cpu_cmpxchg_double_8(pcp1, pcp2, oval1, oval2, nval1, nval2)  \
-        irqsafe_generic_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)
-# endif
-# define irqsafe_cpu_cmpxchg_double(pcp1, pcp2, oval1, oval2, nval1, nval2)     \
-        __pcpu_double_call_return_bool(irqsafe_cpu_cmpxchg_double_, (pcp1), (pcp2), (oval1), (oval2), (nval1), (nval2))
-#endif
-
 #endif /* __LINUX_PERCPU_H */
diff --git a/include/linux/platform_data/macb.h b/include/linux/platform_data/macb.h
new file mode 100644
index 000000000000..b081c7245ec8
--- /dev/null
+++ b/include/linux/platform_data/macb.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * 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.
+ */
+#ifndef __MACB_PDATA_H__
+#define __MACB_PDATA_H__
+
+struct macb_platform_data {
+        u32             phy_mask;
+        int             phy_irq_pin;    /* PHY IRQ */
+        u8              is_rmii;        /* using RMII interface? */
+};
+
+#endif /* __MACB_PDATA_H__ */
diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h
index e9d9149ddf38..d94804aca764 100644
--- a/include/linux/platform_data/mv_usb.h
+++ b/include/linux/platform_data/mv_usb.h
@@ -42,9 +42,23 @@ struct mv_usb_platform_data {
         /* only valid for HCD. OTG or Host only*/
         unsigned int            mode;
 
-        int     (*phy_init)(unsigned int regbase);
-        void    (*phy_deinit)(unsigned int regbase);
+        /* This flag is used for that needs id pin checked by otg */
+        unsigned int    disable_otg_clock_gating:1;
+        /* Force a_bus_req to be asserted */
+         unsigned int    otg_force_a_bus_req:1;
+
+        int     (*phy_init)(void __iomem *regbase);
+        void    (*phy_deinit)(void __iomem *regbase);
         int     (*set_vbus)(unsigned int vbus);
+        int     (*private_init)(void __iomem *opregs, void __iomem *phyregs);
 };
 
+#ifndef CONFIG_HAVE_CLK
+/* Dummy stub for clk framework */
+#define clk_get(dev, id)       NULL
+#define clk_put(clock)         do {} while (0)
+#define clk_enable(clock)      do {} while (0)
+#define clk_disable(clock)     do {} while (0)
+#endif
+
 #endif
diff --git a/include/linux/platform_data/s3c-hsudc.h b/include/linux/platform_data/s3c-hsudc.h
new file mode 100644
index 000000000000..6fa109339bf9
--- /dev/null
+++ b/include/linux/platform_data/s3c-hsudc.h
@@ -0,0 +1,34 @@
+/*
+ * S3C24XX USB 2.0 High-speed USB controller gadget driver
+ *
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com/
+ *
+ * The S3C24XX USB 2.0 high-speed USB controller supports upto 9 endpoints.
+ * Each endpoint can be configured as either in or out endpoint. Endpoints
+ * can be configured for Bulk or Interrupt transfer mode.
+ *
+ * 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.
+*/
+
+#ifndef __LINUX_USB_S3C_HSUDC_H
+#define __LINUX_USB_S3C_HSUDC_H
+
+/**
+ * s3c24xx_hsudc_platdata - Platform data for USB High-Speed gadget controller.
+ * @epnum: Number of endpoints to be instantiated by the controller driver.
+ * @gpio_init: Platform specific USB related GPIO initialization.
+ * @gpio_uninit: Platform specific USB releted GPIO uninitialzation.
+ *
+ * Representation of platform data for the S3C24XX USB 2.0 High Speed gadget
+ * controllers.
+ */
+struct s3c24xx_hsudc_platdata {
+        unsigned int    epnum;
+        void            (*gpio_init)(void);
+        void            (*gpio_uninit)(void);
+};
+
+#endif  /* __LINUX_USB_S3C_HSUDC_H */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index ad93e1ec8c65..f044f66018f2 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -637,13 +637,15 @@ struct signal_struct {
 #endif
 #ifdef CONFIG_CGROUPS
         /*
-         * The threadgroup_fork_lock prevents threads from forking with
-         * CLONE_THREAD while held for writing. Use this for fork-sensitive
-         * threadgroup-wide operations. It's taken for reading in fork.c in
-         * copy_process().
-         * Currently only needed write-side by cgroups.
+         * group_rwsem prevents new tasks from entering the threadgroup and
+         * member tasks from exiting,a more specifically, setting of
+         * PF_EXITING.  fork and exit paths are protected with this rwsem
+         * using threadgroup_change_begin/end().  Users which require
+         * threadgroup to remain stable should use threadgroup_[un]lock()
+         * which also takes care of exec path.  Currently, cgroup is the
+         * only user.
          */
-        struct rw_semaphore threadgroup_fork_lock;
+        struct rw_semaphore group_rwsem;
 #endif
 
         int oom_adj;            /* OOM kill score adjustment (bit shift) */
@@ -2394,29 +2396,62 @@ static inline void unlock_task_sighand(struct task_struct *tsk,
         spin_unlock_irqrestore(&tsk->sighand->siglock, *flags);
 }
 
-/* See the declaration of threadgroup_fork_lock in signal_struct. */
 #ifdef CONFIG_CGROUPS
-static inline void threadgroup_fork_read_lock(struct task_struct *tsk)
+static inline void threadgroup_change_begin(struct task_struct *tsk)
 {
-        down_read(&tsk->signal->threadgroup_fork_lock);
+        down_read(&tsk->signal->group_rwsem);
 }
-static inline void threadgroup_fork_read_unlock(struct task_struct *tsk)
+static inline void threadgroup_change_end(struct task_struct *tsk)
 {
-        up_read(&tsk->signal->threadgroup_fork_lock);
+        up_read(&tsk->signal->group_rwsem);
 }
-static inline void threadgroup_fork_write_lock(struct task_struct *tsk)
+
+/**
+ * threadgroup_lock - lock threadgroup
+ * @tsk: member task of the threadgroup to lock
+ *
+ * Lock the threadgroup @tsk belongs to.  No new task is allowed to enter
+ * and member tasks aren't allowed to exit (as indicated by PF_EXITING) or
+ * perform exec.  This is useful for cases where the threadgroup needs to
+ * stay stable across blockable operations.
+ *
+ * fork and exit paths explicitly call threadgroup_change_{begin|end}() for
+ * synchronization.  While held, no new task will be added to threadgroup
+ * and no existing live task will have its PF_EXITING set.
+ *
+ * During exec, a task goes and puts its thread group through unusual
+ * changes.  After de-threading, exclusive access is assumed to resources
+ * which are usually shared by tasks in the same group - e.g. sighand may
+ * be replaced with a new one.  Also, the exec'ing task takes over group
+ * leader role including its pid.  Exclude these changes while locked by
+ * grabbing cred_guard_mutex which is used to synchronize exec path.
+ */
+static inline void threadgroup_lock(struct task_struct *tsk)
 {
-        down_write(&tsk->signal->threadgroup_fork_lock);
+        /*
+         * exec uses exit for de-threading nesting group_rwsem inside
+         * cred_guard_mutex. Grab cred_guard_mutex first.
+         */
+        mutex_lock(&tsk->signal->cred_guard_mutex);
+        down_write(&tsk->signal->group_rwsem);
 }
-static inline void threadgroup_fork_write_unlock(struct task_struct *tsk)
+
+/**
+ * threadgroup_unlock - unlock threadgroup
+ * @tsk: member task of the threadgroup to unlock
+ *
+ * Reverse threadgroup_lock().
+ */
+static inline void threadgroup_unlock(struct task_struct *tsk)
 {
-        up_write(&tsk->signal->threadgroup_fork_lock);
+        up_write(&tsk->signal->group_rwsem);
+        mutex_unlock(&tsk->signal->cred_guard_mutex);
 }
 #else
-static inline void threadgroup_fork_read_lock(struct task_struct *tsk) {}
-static inline void threadgroup_fork_read_unlock(struct task_struct *tsk) {}
-static inline void threadgroup_fork_write_lock(struct task_struct *tsk) {}
-static inline void threadgroup_fork_write_unlock(struct task_struct *tsk) {}
+static inline void threadgroup_change_begin(struct task_struct *tsk) {}
+static inline void threadgroup_change_end(struct task_struct *tsk) {}
+static inline void threadgroup_lock(struct task_struct *tsk) {}
+static inline void threadgroup_unlock(struct task_struct *tsk) {}
 #endif
 
 #ifndef __HAVE_THREAD_FUNCTIONS
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 1f05bbeac01e..8f012f8ac8e9 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -66,6 +66,7 @@ enum {
  * dependent on the 8250 driver.
  */
 struct uart_port;
+struct uart_8250_port;
 
 int serial8250_register_port(struct uart_port *);
 void serial8250_unregister_port(int line);
@@ -81,7 +82,11 @@ extern void serial8250_do_set_termios(struct uart_port *port,
                 struct ktermios *termios, struct ktermios *old);
 extern void serial8250_do_pm(struct uart_port *port, unsigned int state,
                              unsigned int oldstate);
+extern int fsl8250_handle_irq(struct uart_port *port);
 int serial8250_handle_irq(struct uart_port *port, unsigned int iir);
+unsigned char serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr);
+void serial8250_tx_chars(struct uart_8250_port *up);
+unsigned int serial8250_modem_status(struct uart_8250_port *up);
 
 extern void serial8250_set_isa_configurator(void (*v)
                                         (int port, struct uart_port *up,
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index eadf33d0abba..b67305e3ad57 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -351,6 +351,7 @@ struct uart_port {
 #define UPF_CONS_FLOW           ((__force upf_t) (1 << 23))
 #define UPF_SHARE_IRQ           ((__force upf_t) (1 << 24))
 #define UPF_EXAR_EFR            ((__force upf_t) (1 << 25))
+#define UPF_IIR_ONCE            ((__force upf_t) (1 << 26))
 /* The exact UART type is known and should not be probed.  */
 #define UPF_FIXED_TYPE          ((__force upf_t) (1 << 27))
 #define UPF_BOOT_AUTOCONF       ((__force upf_t) (1 << 28))
@@ -483,10 +484,19 @@ static inline int uart_tx_stopped(struct uart_port *port)
 /*
  * The following are helper functions for the low level drivers.
  */
+
+extern void uart_handle_dcd_change(struct uart_port *uport,
+                unsigned int status);
+extern void uart_handle_cts_change(struct uart_port *uport,
+                unsigned int status);
+
+extern void uart_insert_char(struct uart_port *port, unsigned int status,
+                 unsigned int overrun, unsigned int ch, unsigned int flag);
+
+#ifdef SUPPORT_SYSRQ
 static inline int
 uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
 {
-#ifdef SUPPORT_SYSRQ
         if (port->sysrq) {
                 if (ch && time_before(jiffies, port->sysrq)) {
                         handle_sysrq(ch);
@@ -495,11 +505,10 @@ uart_handle_sysrq_char(struct uart_port *port, unsigned int ch)
                 }
                 port->sysrq = 0;
         }
-#endif
         return 0;
 }
-#ifndef SUPPORT_SYSRQ
-#define uart_handle_sysrq_char(port,ch) uart_handle_sysrq_char(port, 0)
+#else
+#define uart_handle_sysrq_char(port,ch) ({ (void)port; 0; })
 #endif
 
 /*
@@ -522,89 +531,6 @@ static inline int uart_handle_break(struct uart_port *port)
         return 0;
 }
 
-/**
- *      uart_handle_dcd_change - handle a change of carrier detect state
- *      @uport: uart_port structure for the open port
- *      @status: new carrier detect status, nonzero if active
- */
-static inline void
-uart_handle_dcd_change(struct uart_port *uport, unsigned int status)
-{
-        struct uart_state *state = uport->state;
-        struct tty_port *port = &state->port;
-        struct tty_ldisc *ld = tty_ldisc_ref(port->tty);
-        struct pps_event_time ts;
-
-        if (ld && ld->ops->dcd_change)
-                pps_get_ts(&ts);
-
-        uport->icount.dcd++;
-#ifdef CONFIG_HARD_PPS
-        if ((uport->flags & UPF_HARDPPS_CD) && status)
-                hardpps();
-#endif
-
-        if (port->flags & ASYNC_CHECK_CD) {
-                if (status)
-                        wake_up_interruptible(&port->open_wait);
-                else if (port->tty)
-                        tty_hangup(port->tty);
-        }
-
-        if (ld && ld->ops->dcd_change)
-                ld->ops->dcd_change(port->tty, status, &ts);
-        if (ld)
-                tty_ldisc_deref(ld);
-}
-
-/**
- *      uart_handle_cts_change - handle a change of clear-to-send state
- *      @uport: uart_port structure for the open port
- *      @status: new clear to send status, nonzero if active
- */
-static inline void
-uart_handle_cts_change(struct uart_port *uport, unsigned int status)
-{
-        struct tty_port *port = &uport->state->port;
-        struct tty_struct *tty = port->tty;
-
-        uport->icount.cts++;
-
-        if (port->flags & ASYNC_CTS_FLOW) {
-                if (tty->hw_stopped) {
-                        if (status) {
-                                tty->hw_stopped = 0;
-                                uport->ops->start_tx(uport);
-                                uart_write_wakeup(uport);
-                        }
-                } else {
-                        if (!status) {
-                                tty->hw_stopped = 1;
-                                uport->ops->stop_tx(uport);
-                        }
-                }
-        }
-}
-
-#include <linux/tty_flip.h>
-
-static inline void
-uart_insert_char(struct uart_port *port, unsigned int status,
-                 unsigned int overrun, unsigned int ch, unsigned int flag)
-{
-        struct tty_struct *tty = port->state->port.tty;
-
-        if ((status & port->ignore_status_mask & ~overrun) == 0)
-                tty_insert_flip_char(tty, ch, flag);
-
-        /*
-         * Overrun is special.  Since it's reported immediately,
-         * it doesn't affect the current character.
-         */
-        if (status & ~port->ignore_status_mask & overrun)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-}
-
 /*
  *      UART_ENABLE_MS - determine if port should enable modem status irqs
  */
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index d00e0bacda93..fbd1117fdfde 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -15,8 +15,6 @@
 #include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
 
-#include <trace/events/kmem.h>
-
 /*
  * struct kmem_cache
  *
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 7f8d4d61ca47..27a4e16d2bf1 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1233,6 +1233,7 @@ struct urb {
         void *transfer_buffer;          /* (in) associated data buffer */
         dma_addr_t transfer_dma;        /* (in) dma addr for transfer_buffer */
         struct scatterlist *sg;         /* (in) scatter gather buffer list */
+        int num_mapped_sgs;             /* (internal) mapped sg entries */
         int num_sgs;                    /* (in) number of entries in the sg list */
         u32 transfer_buffer_length;     /* (in) data buffer length */
         u32 actual_length;              /* (return) actual transfer length */
@@ -1610,6 +1611,19 @@ usb_maxpacket(struct usb_device *udev, int pipe, int is_out)
 
 /* ----------------------------------------------------------------------- */
 
+/* translate USB error codes to codes user space understands */
+static inline int usb_translate_errors(int error_code)
+{
+        switch (error_code) {
+        case 0:
+        case -ENOMEM:
+        case -ENODEV:
+                return error_code;
+        default:
+                return -EIO;
+        }
+}
+
 /* Events from the usb core */
 #define USB_DEVICE_ADD          0x0001
 #define USB_DEVICE_REMOVE       0x0002
diff --git a/include/linux/usb/ch11.h b/include/linux/usb/ch11.h
index 4ebaf0824179..31fdb4c6ee3d 100644
--- a/include/linux/usb/ch11.h
+++ b/include/linux/usb/ch11.h
@@ -26,7 +26,6 @@
 #define HUB_RESET_TT            9
 #define HUB_GET_TT_STATE        10
 #define HUB_STOP_TT             11
-#define HUB_SET_DEPTH           12
 
 /*
  * Hub class additional requests defined by USB 3.0 spec
@@ -165,11 +164,20 @@ struct usb_port_status {
  * wHubCharacteristics (masks)
  * See USB 2.0 spec Table 11-13, offset 3
  */
-#define HUB_CHAR_LPSM           0x0003 /* D1 .. D0 */
-#define HUB_CHAR_COMPOUND       0x0004 /* D2       */
-#define HUB_CHAR_OCPM           0x0018 /* D4 .. D3 */
-#define HUB_CHAR_TTTT           0x0060 /* D6 .. D5 */
-#define HUB_CHAR_PORTIND        0x0080 /* D7       */
+#define HUB_CHAR_LPSM           0x0003 /* Logical Power Switching Mode mask */
+#define HUB_CHAR_COMMON_LPSM    0x0000 /* All ports power control at once */
+#define HUB_CHAR_INDV_PORT_LPSM 0x0001 /* per-port power control */
+#define HUB_CHAR_NO_LPSM        0x0002 /* no power switching */
+
+#define HUB_CHAR_COMPOUND       0x0004 /* hub is part of a compound device */
+
+#define HUB_CHAR_OCPM           0x0018 /* Over-Current Protection Mode mask */
+#define HUB_CHAR_COMMON_OCPM    0x0000 /* All ports Over-Current reporting */
+#define HUB_CHAR_INDV_PORT_OCPM 0x0008 /* per-port Over-current reporting */
+#define HUB_CHAR_NO_OCPM        0x0010 /* No Over-current Protection support */
+
+#define HUB_CHAR_TTTT           0x0060 /* TT Think Time mask */
+#define HUB_CHAR_PORTIND        0x0080 /* per-port indicators (LEDs) */
 
 struct usb_hub_status {
         __le16 wHubStatus;
@@ -198,6 +206,17 @@ struct usb_hub_status {
 #define USB_DT_HUB_NONVAR_SIZE          7
 #define USB_DT_SS_HUB_SIZE              12
 
+/*
+ * Hub Device descriptor
+ * USB Hub class device protocols
+ */
+
+#define USB_HUB_PR_FS           0 /* Full speed hub */
+#define USB_HUB_PR_HS_NO_TT     0 /* Hi-speed hub without TT */
+#define USB_HUB_PR_HS_SINGLE_TT 1 /* Hi-speed hub with single TT */
+#define USB_HUB_PR_HS_MULTI_TT  2 /* Hi-speed hub with multiple TT */
+#define USB_HUB_PR_SS           3 /* Super speed hub */
+
 struct usb_hub_descriptor {
         __u8  bDescLength;
         __u8  bDescriptorType;
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index d5da6c68c250..61b29057b054 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -605,8 +605,26 @@ struct usb_ss_ep_comp_descriptor {
 } __attribute__ ((packed));
 
 #define USB_DT_SS_EP_COMP_SIZE          6
+
 /* Bits 4:0 of bmAttributes if this is a bulk endpoint */
-#define USB_SS_MAX_STREAMS(p)           (1 << ((p) & 0x1f))
+static inline int
+usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp)
+{
+        int             max_streams;
+
+        if (!comp)
+                return 0;
+
+        max_streams = comp->bmAttributes & 0x1f;
+
+        if (!max_streams)
+                return 0;
+
+        max_streams = 1 << max_streams;
+
+        return max_streams;
+}
+
 /* Bits 1:0 of bmAttributes if this is an isoc endpoint */
 #define USB_SS_MULT(p)                  (1 + ((p) & 0x3))
 
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 1d3a67523ffc..da653b5c7134 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/slab.h>
+#include <linux/scatterlist.h>
 #include <linux/types.h>
 #include <linux/usb/ch9.h>
 
@@ -32,6 +33,9 @@ struct usb_ep;
  * @dma: DMA address corresponding to 'buf'.  If you don't set this
  *      field, and the usb controller needs one, it is responsible
  *      for mapping and unmapping the buffer.
+ * @sg: a scatterlist for SG-capable controllers.
+ * @num_sgs: number of SG entries
+ * @num_mapped_sgs: number of SG entries mapped to DMA (internal)
  * @length: Length of that data
  * @stream_id: The stream id, when USB3.0 bulk streams are being used
  * @no_interrupt: If true, hints that no completion irq is needed.
@@ -88,6 +92,10 @@ struct usb_request {
         unsigned                length;
         dma_addr_t              dma;
 
+        struct scatterlist      *sg;
+        unsigned                num_sgs;
+        unsigned                num_mapped_sgs;
+
         unsigned                stream_id:16;
         unsigned                no_interrupt:1;
         unsigned                zero:1;
@@ -164,7 +172,7 @@ struct usb_ep {
         unsigned                maxpacket:16;
         unsigned                max_streams:16;
         unsigned                mult:2;
-        unsigned                maxburst:4;
+        unsigned                maxburst:5;
         u8                      address;
         const struct usb_endpoint_descriptor    *desc;
         const struct usb_ss_ep_comp_descriptor  *comp_desc;
@@ -477,8 +485,9 @@ struct usb_gadget_ops {
  *      driver setup() requests
  * @ep_list: List of other endpoints supported by the device.
  * @speed: Speed of current connection to USB host.
- * @is_dualspeed: True if the controller supports both high and full speed
- *      operation.  If it does, the gadget driver must also support both.
+ * @max_speed: Maximal speed the UDC can handle.  UDC must support this
+ *      and all slower speeds.
+ * @sg_supported: true if we can handle scatter-gather
  * @is_otg: True if the USB device port uses a Mini-AB jack, so that the
  *      gadget driver must provide a USB OTG descriptor.
  * @is_a_peripheral: False unless is_otg, the "A" end of a USB cable
@@ -518,7 +527,8 @@ struct usb_gadget {
         struct usb_ep                   *ep0;
         struct list_head                ep_list;        /* of usb_ep */
         enum usb_device_speed           speed;
-        unsigned                        is_dualspeed:1;
+        enum usb_device_speed           max_speed;
+        unsigned                        sg_supported:1;
         unsigned                        is_otg:1;
         unsigned                        is_a_peripheral:1;
         unsigned                        b_hnp_enable:1;
@@ -549,7 +559,7 @@ static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
 static inline int gadget_is_dualspeed(struct usb_gadget *g)
 {
 #ifdef CONFIG_USB_GADGET_DUALSPEED
-        /* runtime test would check "g->is_dualspeed" ... that might be
+        /* runtime test would check "g->max_speed" ... that might be
          * useful to work around hardware bugs, but is mostly pointless
          */
         return 1;
@@ -567,7 +577,7 @@ static inline int gadget_is_superspeed(struct usb_gadget *g)
 {
 #ifdef CONFIG_USB_GADGET_SUPERSPEED
         /*
-         * runtime test would check "g->is_superspeed" ... that might be
+         * runtime test would check "g->max_speed" ... that might be
          * useful to work around hardware bugs, but is mostly pointless
          */
         return 1;
@@ -760,7 +770,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
 /**
  * struct usb_gadget_driver - driver for usb 'slave' devices
  * @function: String describing the gadget's function
- * @speed: Highest speed the driver handles.
+ * @max_speed: Highest speed the driver handles.
  * @setup: Invoked for ep0 control requests that aren't handled by
  *      the hardware level driver. Most calls must be handled by
  *      the gadget driver, including descriptor and configuration
@@ -824,7 +834,7 @@ static inline int usb_gadget_disconnect(struct usb_gadget *gadget)
  */
 struct usb_gadget_driver {
         char                    *function;
-        enum usb_device_speed   speed;
+        enum usb_device_speed   max_speed;
         void                    (*unbind)(struct usb_gadget *);
         int                     (*setup)(struct usb_gadget *,
                                         const struct usb_ctrlrequest *);
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 03354d557b79..b2f62f3a32af 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -99,7 +99,6 @@ struct usb_hcd {
          */
         unsigned long           flags;
 #define HCD_FLAG_HW_ACCESSIBLE          0       /* at full power */
-#define HCD_FLAG_SAW_IRQ                1
 #define HCD_FLAG_POLL_RH                2       /* poll for rh status? */
 #define HCD_FLAG_POLL_PENDING           3       /* status has changed? */
 #define HCD_FLAG_WAKEUP_PENDING         4       /* root hub is resuming? */
@@ -110,7 +109,6 @@ struct usb_hcd {
          * be slightly faster than test_bit().
          */
 #define HCD_HW_ACCESSIBLE(hcd)  ((hcd)->flags & (1U << HCD_FLAG_HW_ACCESSIBLE))
-#define HCD_SAW_IRQ(hcd)        ((hcd)->flags & (1U << HCD_FLAG_SAW_IRQ))
 #define HCD_POLL_RH(hcd)        ((hcd)->flags & (1U << HCD_FLAG_POLL_RH))
 #define HCD_POLL_PENDING(hcd)   ((hcd)->flags & (1U << HCD_FLAG_POLL_PENDING))
 #define HCD_WAKEUP_PENDING(hcd) ((hcd)->flags & (1U << HCD_FLAG_WAKEUP_PENDING))
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index e5a40c318548..0d3f98879256 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -67,6 +67,14 @@ struct renesas_usbhs_platform_callback {
         /*
          * option:
          *
+         * for board specific clock control
+         */
+        void (*power_ctrl)(struct platform_device *pdev,
+                           void __iomem *base, int enable);
+
+        /*
+         * option:
+         *
          * Phy reset for platform
          */
         void (*phy_reset)(struct platform_device *pdev);
@@ -118,7 +126,7 @@ struct renesas_usbhs_driver_param {
          *
          * delay time from notify_hotplug callback
          */
-        int detection_delay;
+        int detection_delay; /* msec */
 
         /*
          * option:
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h
index b29f70b2ecae..4267a9c717ba 100644
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@ -58,11 +58,13 @@ enum port_dev_state {
  * @read_urb: pointer to the bulk in struct urb for this port.
  * @bulk_in_endpointAddress: endpoint address for the bulk in pipe for this
  *      port.
+ * @bulk_in_buffers: pointers to the bulk in buffers for this port
+ * @read_urbs: pointers to the bulk in urbs for this port
+ * @read_urbs_free: status bitmap the for bulk in urbs
  * @bulk_out_buffer: pointer to the bulk out buffer for this port.
  * @bulk_out_size: the size of the bulk_out_buffer, in bytes.
  * @write_urb: pointer to the bulk out struct urb for this port.
  * @write_fifo: kfifo used to buffer outgoing data
- * @write_urb_busy: port`s writing status
  * @bulk_out_buffers: pointers to the bulk out buffers for this port
  * @write_urbs: pointers to the bulk out urbs for this port
  * @write_urbs_free: status bitmap the for bulk out urbs
@@ -99,11 +101,14 @@ struct usb_serial_port {
         struct urb              *read_urb;
         __u8                    bulk_in_endpointAddress;
 
+        unsigned char           *bulk_in_buffers[2];
+        struct urb              *read_urbs[2];
+        unsigned long           read_urbs_free;
+
         unsigned char           *bulk_out_buffer;
         int                     bulk_out_size;
         struct urb              *write_urb;
         struct kfifo            write_fifo;
-        int                     write_urb_busy;
 
         unsigned char           *bulk_out_buffers[2];
         struct urb              *write_urbs[2];
@@ -340,7 +345,7 @@ extern void usb_serial_generic_disconnect(struct usb_serial *serial);
 extern void usb_serial_generic_release(struct usb_serial *serial);
 extern int usb_serial_generic_register(int debug);
 extern void usb_serial_generic_deregister(void);
-extern int usb_serial_generic_submit_read_urb(struct usb_serial_port *port,
+extern int usb_serial_generic_submit_read_urbs(struct usb_serial_port *port,
                                                  gfp_t mem_flags);
 extern void usb_serial_generic_process_read_urb(struct urb *urb);
 extern int usb_serial_generic_prepare_write_buffer(struct usb_serial_port *port,
diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
new file mode 100644
index 000000000000..9929b05cff3a
--- /dev/null
+++ b/include/media/davinci/vpif_types.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2011 Texas Instruments 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 Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef _VPIF_TYPES_H
+#define _VPIF_TYPES_H
+
+#define VPIF_CAPTURE_MAX_CHANNELS       2
+
+enum vpif_if_type {
+        VPIF_IF_BT656,
+        VPIF_IF_BT1120,
+        VPIF_IF_RAW_BAYER
+};
+
+struct vpif_interface {
+        enum vpif_if_type if_type;
+        unsigned hd_pol:1;
+        unsigned vd_pol:1;
+        unsigned fid_pol:1;
+};
+
+struct vpif_subdev_info {
+        const char *name;
+        struct i2c_board_info board_info;
+        u32 input;
+        u32 output;
+        unsigned can_route:1;
+        struct vpif_interface vpif_if;
+};
+
+struct vpif_display_config {
+        int (*set_clock)(int, int);
+        struct vpif_subdev_info *subdevinfo;
+        int subdev_count;
+        const char **output;
+        int output_count;
+        const char *card_name;
+};
+
+struct vpif_input {
+        struct v4l2_input input;
+        const char *subdev_name;
+};
+
+struct vpif_capture_chan_config {
+        const struct vpif_input *inputs;
+        int input_count;
+};
+
+struct vpif_capture_config {
+        int (*setup_input_channel_mode)(int);
+        int (*setup_input_path)(int, const char *);
+        struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
+        struct vpif_subdev_info *subdev_info;
+        int subdev_count;
+        const char *card_name;
+};
+#endif /* _VPIF_TYPES_H */
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 2f65e1686fc8..0147b901e79c 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -129,33 +129,33 @@ struct linux_xfrm_mib {
                         __this_cpu_inc(mib[0]->mibs[field])
 
 #define SNMP_INC_STATS_USER(mib, field) \
-                        irqsafe_cpu_inc(mib[0]->mibs[field])
+                        this_cpu_inc(mib[0]->mibs[field])
 
 #define SNMP_INC_STATS_ATOMIC_LONG(mib, field)  \
                         atomic_long_inc(&mib->mibs[field])
 
 #define SNMP_INC_STATS(mib, field)      \
-                        irqsafe_cpu_inc(mib[0]->mibs[field])
+                        this_cpu_inc(mib[0]->mibs[field])
 
 #define SNMP_DEC_STATS(mib, field)      \
-                        irqsafe_cpu_dec(mib[0]->mibs[field])
+                        this_cpu_dec(mib[0]->mibs[field])
 
 #define SNMP_ADD_STATS_BH(mib, field, addend)   \
                         __this_cpu_add(mib[0]->mibs[field], addend)
 
 #define SNMP_ADD_STATS_USER(mib, field, addend) \
-                        irqsafe_cpu_add(mib[0]->mibs[field], addend)
+                        this_cpu_add(mib[0]->mibs[field], addend)
 
 #define SNMP_ADD_STATS(mib, field, addend)      \
-                        irqsafe_cpu_add(mib[0]->mibs[field], addend)
+                        this_cpu_add(mib[0]->mibs[field], addend)
 /*
  * Use "__typeof__(*mib[0]) *ptr" instead of "__typeof__(mib[0]) ptr"
  * to make @ptr a non-percpu pointer.
  */
 #define SNMP_UPD_PO_STATS(mib, basefield, addend)       \
         do { \
-                irqsafe_cpu_inc(mib[0]->mibs[basefield##PKTS]);         \
-                irqsafe_cpu_add(mib[0]->mibs[basefield##OCTETS], addend);       \
+                this_cpu_inc(mib[0]->mibs[basefield##PKTS]);            \
+                this_cpu_add(mib[0]->mibs[basefield##OCTETS], addend);  \
         } while (0)
 #define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)    \
         do { \
diff --git a/include/sound/saif.h b/include/sound/saif.h
index d0e0de7984ec..f22f3e16edf4 100644
--- a/include/sound/saif.h
+++ b/include/sound/saif.h
@@ -10,7 +10,7 @@
 #define __SOUND_SAIF_H__
 
 struct mxs_saif_platform_data {
-        int (*init) (void);
-        int (*get_master_id) (unsigned int saif_id);
+        bool master_mode;       /* if true use master mode */
+        int master_id;          /* id of the master if in slave mode */
 };
 #endif
diff --git a/kernel/audit.c b/kernel/audit.c
index 09fae2677a45..2c1d6ab7106e 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
                 avail = audit_expand(ab,
                         max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
                 if (!avail)
-                        goto out;
+                        goto out_va_end;
                 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
         }
-        va_end(args2);
         if (len > 0)
                 skb_put(skb, len);
+out_va_end:
+        va_end(args2);
 out:
         return;
 }
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 7cab65f83f1d..a5d3b5325f77 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -63,7 +63,24 @@
 
 #include <linux/atomic.h>
 
+/*
+ * cgroup_mutex is the master lock.  Any modification to cgroup or its
+ * hierarchy must be performed while holding it.
+ *
+ * cgroup_root_mutex nests inside cgroup_mutex and should be held to modify
+ * cgroupfs_root of any cgroup hierarchy - subsys list, flags,
+ * release_agent_path and so on.  Modifying requires both cgroup_mutex and
+ * cgroup_root_mutex.  Readers can acquire either of the two.  This is to
+ * break the following locking order cycle.
+ *
+ *  A. cgroup_mutex -> cred_guard_mutex -> s_type->i_mutex_key -> namespace_sem
+ *  B. namespace_sem -> cgroup_mutex
+ *
+ * B happens only through cgroup_show_options() and using cgroup_root_mutex
+ * breaks it.
+ */
 static DEFINE_MUTEX(cgroup_mutex);
+static DEFINE_MUTEX(cgroup_root_mutex);
 
 /*
  * Generate an array of cgroup subsystem pointers. At boot time, this is
@@ -921,7 +938,7 @@ static void cgroup_d_remove_dir(struct dentry *dentry)
  *
  * CGRP_WAIT_ON_RMDIR flag is set under cgroup's inode->i_mutex;
  */
-DECLARE_WAIT_QUEUE_HEAD(cgroup_rmdir_waitq);
+static DECLARE_WAIT_QUEUE_HEAD(cgroup_rmdir_waitq);
 
 static void cgroup_wakeup_rmdir_waiter(struct cgroup *cgrp)
 {
@@ -953,6 +970,7 @@ static int rebind_subsystems(struct cgroupfs_root *root,
         int i;
 
         BUG_ON(!mutex_is_locked(&cgroup_mutex));
+        BUG_ON(!mutex_is_locked(&cgroup_root_mutex));
 
         removed_bits = root->actual_subsys_bits & ~final_bits;
         added_bits = final_bits & ~root->actual_subsys_bits;
@@ -1043,7 +1061,7 @@ static int cgroup_show_options(struct seq_file *seq, struct dentry *dentry)
         struct cgroupfs_root *root = dentry->d_sb->s_fs_info;
         struct cgroup_subsys *ss;
 
-        mutex_lock(&cgroup_mutex);
+        mutex_lock(&cgroup_root_mutex);
         for_each_subsys(root, ss)
                 seq_printf(seq, ",%s", ss->name);
         if (test_bit(ROOT_NOPREFIX, &root->flags))
@@ -1054,7 +1072,7 @@ static int cgroup_show_options(struct seq_file *seq, struct dentry *dentry)
                 seq_puts(seq, ",clone_children");
         if (strlen(root->name))
                 seq_printf(seq, ",name=%s", root->name);
-        mutex_unlock(&cgroup_mutex);
+        mutex_unlock(&cgroup_root_mutex);
         return 0;
 }
 
@@ -1175,10 +1193,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
 
         /*
          * If the 'all' option was specified select all the subsystems,
-         * otherwise 'all, 'none' and a subsystem name options were not
-         * specified, let's default to 'all'
+         * otherwise if 'none', 'name=' and a subsystem name options
+         * were not specified, let's default to 'all'
          */
-        if (all_ss || (!all_ss && !one_ss && !opts->none)) {
+        if (all_ss || (!one_ss && !opts->none && !opts->name)) {
                 for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
                         struct cgroup_subsys *ss = subsys[i];
                         if (ss == NULL)
@@ -1269,6 +1287,7 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
 
         mutex_lock(&cgrp->dentry->d_inode->i_mutex);
         mutex_lock(&cgroup_mutex);
+        mutex_lock(&cgroup_root_mutex);
 
         /* See what subsystems are wanted */
         ret = parse_cgroupfs_options(data, &opts);
@@ -1297,6 +1316,7 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
  out_unlock:
         kfree(opts.release_agent);
         kfree(opts.name);
+        mutex_unlock(&cgroup_root_mutex);
         mutex_unlock(&cgroup_mutex);
         mutex_unlock(&cgrp->dentry->d_inode->i_mutex);
         return ret;
@@ -1481,6 +1501,7 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
         int ret = 0;
         struct super_block *sb;
         struct cgroupfs_root *new_root;
+        struct inode *inode;
 
         /* First find the desired set of subsystems */
         mutex_lock(&cgroup_mutex);
@@ -1514,7 +1535,6 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
                 /* We used the new root structure, so this is a new hierarchy */
                 struct list_head tmp_cg_links;
                 struct cgroup *root_cgrp = &root->top_cgroup;
-                struct inode *inode;
                 struct cgroupfs_root *existing_root;
                 const struct cred *cred;
                 int i;
@@ -1528,18 +1548,14 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
 
                 mutex_lock(&inode->i_mutex);
                 mutex_lock(&cgroup_mutex);
+                mutex_lock(&cgroup_root_mutex);
 
-                if (strlen(root->name)) {
-                        /* Check for name clashes with existing mounts */
-                        for_each_active_root(existing_root) {
-                                if (!strcmp(existing_root->name, root->name)) {
-                                        ret = -EBUSY;
-                                        mutex_unlock(&cgroup_mutex);
-                                        mutex_unlock(&inode->i_mutex);
-                                        goto drop_new_super;
-                                }
-                        }
-                }
+                /* Check for name clashes with existing mounts */
+                ret = -EBUSY;
+                if (strlen(root->name))
+                        for_each_active_root(existing_root)
+                                if (!strcmp(existing_root->name, root->name))
+                                        goto unlock_drop;
 
                 /*
                  * We're accessing css_set_count without locking
@@ -1549,18 +1565,13 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
                  * have some link structures left over
                  */
                 ret = allocate_cg_links(css_set_count, &tmp_cg_links);
-                if (ret) {
-                        mutex_unlock(&cgroup_mutex);
-                        mutex_unlock(&inode->i_mutex);
-                        goto drop_new_super;
-                }
+                if (ret)
+                        goto unlock_drop;
 
                 ret = rebind_subsystems(root, root->subsys_bits);
                 if (ret == -EBUSY) {
-                        mutex_unlock(&cgroup_mutex);
-                        mutex_unlock(&inode->i_mutex);
                         free_cg_links(&tmp_cg_links);
-                        goto drop_new_super;
+                        goto unlock_drop;
                 }
                 /*
                  * There must be no failure case after here, since rebinding
@@ -1599,6 +1610,7 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
                 cred = override_creds(&init_cred);
                 cgroup_populate_dir(root_cgrp);
                 revert_creds(cred);
+                mutex_unlock(&cgroup_root_mutex);
                 mutex_unlock(&cgroup_mutex);
                 mutex_unlock(&inode->i_mutex);
         } else {
@@ -1615,6 +1627,10 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
         kfree(opts.name);
         return dget(sb->s_root);
 
+ unlock_drop:
+        mutex_unlock(&cgroup_root_mutex);
+        mutex_unlock(&cgroup_mutex);
+        mutex_unlock(&inode->i_mutex);
  drop_new_super:
         deactivate_locked_super(sb);
  drop_modules:
@@ -1639,6 +1655,7 @@ static void cgroup_kill_sb(struct super_block *sb) {
         BUG_ON(!list_empty(&cgrp->sibling));
 
         mutex_lock(&cgroup_mutex);
+        mutex_lock(&cgroup_root_mutex);
 
         /* Rebind all subsystems back to the default hierarchy */
         ret = rebind_subsystems(root, 0);
@@ -1664,6 +1681,7 @@ static void cgroup_kill_sb(struct super_block *sb) {
                 root_count--;
         }
 
+        mutex_unlock(&cgroup_root_mutex);
         mutex_unlock(&cgroup_mutex);
 
         kill_litter_super(sb);
@@ -1740,11 +1758,90 @@ int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen)
 EXPORT_SYMBOL_GPL(cgroup_path);
 
 /*
+ * Control Group taskset
+ */
+struct task_and_cgroup {
+        struct task_struct      *task;
+        struct cgroup           *cgrp;
+};
+
+struct cgroup_taskset {
+        struct task_and_cgroup  single;
+        struct flex_array       *tc_array;
+        int                     tc_array_len;
+        int                     idx;
+        struct cgroup           *cur_cgrp;
+};
+
+/**
+ * cgroup_taskset_first - reset taskset and return the first task
+ * @tset: taskset of interest
+ *
+ * @tset iteration is initialized and the first task is returned.
+ */
+struct task_struct *cgroup_taskset_first(struct cgroup_taskset *tset)
+{
+        if (tset->tc_array) {
+                tset->idx = 0;
+                return cgroup_taskset_next(tset);
+        } else {
+                tset->cur_cgrp = tset->single.cgrp;
+                return tset->single.task;
+        }
+}
+EXPORT_SYMBOL_GPL(cgroup_taskset_first);
+
+/**
+ * cgroup_taskset_next - iterate to the next task in taskset
+ * @tset: taskset of interest
+ *
+ * Return the next task in @tset.  Iteration must have been initialized
+ * with cgroup_taskset_first().
+ */
+struct task_struct *cgroup_taskset_next(struct cgroup_taskset *tset)
+{
+        struct task_and_cgroup *tc;
+
+        if (!tset->tc_array || tset->idx >= tset->tc_array_len)
+                return NULL;
+
+        tc = flex_array_get(tset->tc_array, tset->idx++);
+        tset->cur_cgrp = tc->cgrp;
+        return tc->task;
+}
+EXPORT_SYMBOL_GPL(cgroup_taskset_next);
+
+/**
+ * cgroup_taskset_cur_cgroup - return the matching cgroup for the current task
+ * @tset: taskset of interest
+ *
+ * Return the cgroup for the current (last returned) task of @tset.  This
+ * function must be preceded by either cgroup_taskset_first() or
+ * cgroup_taskset_next().
+ */
+struct cgroup *cgroup_taskset_cur_cgroup(struct cgroup_taskset *tset)
+{
+        return tset->cur_cgrp;
+}
+EXPORT_SYMBOL_GPL(cgroup_taskset_cur_cgroup);
+
+/**
+ * cgroup_taskset_size - return the number of tasks in taskset
+ * @tset: taskset of interest
+ */
+int cgroup_taskset_size(struct cgroup_taskset *tset)
+{
+        return tset->tc_array ? tset->tc_array_len : 1;
+}
+EXPORT_SYMBOL_GPL(cgroup_taskset_size);
+
+
+/*
  * cgroup_task_migrate - move a task from one cgroup to another.
  *
  * 'guarantee' is set if the caller promises that a new css_set for the task
  * will already exist. If not set, this function might sleep, and can fail with
- * -ENOMEM. Otherwise, it can only fail with -ESRCH.
+ * -ENOMEM. Must be called with cgroup_mutex and threadgroup locked.
  */
 static int cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,
                                struct task_struct *tsk, bool guarantee)
@@ -1753,14 +1850,12 @@ static int cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,
         struct css_set *newcg;
 
         /*
-         * get old css_set. we need to take task_lock and refcount it, because
-         * an exiting task can change its css_set to init_css_set and drop its
-         * old one without taking cgroup_mutex.
+         * We are synchronized through threadgroup_lock() against PF_EXITING
+         * setting such that we can't race against cgroup_exit() changing the
+         * css_set to init_css_set and dropping the old one.
          */
-        task_lock(tsk);
+        WARN_ON_ONCE(tsk->flags & PF_EXITING);
         oldcg = tsk->cgroups;
-        get_css_set(oldcg);
-        task_unlock(tsk);
 
         /* locate or allocate a new css_set for this task. */
         if (guarantee) {
@@ -1775,20 +1870,11 @@ static int cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,
                 might_sleep();
                 /* find_css_set will give us newcg already referenced. */
                 newcg = find_css_set(oldcg, cgrp);
-                if (!newcg) {
-                        put_css_set(oldcg);
+                if (!newcg)
                         return -ENOMEM;
-                }
         }
-        put_css_set(oldcg);
 
-        /* if PF_EXITING is set, the tsk->cgroups pointer is no longer safe. */
         task_lock(tsk);
-        if (tsk->flags & PF_EXITING) {
-                task_unlock(tsk);
-                put_css_set(newcg);
-                return -ESRCH;
-        }
         rcu_assign_pointer(tsk->cgroups, newcg);
         task_unlock(tsk);
 
@@ -1814,8 +1900,8 @@ static int cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,
  * @cgrp: the cgroup the task is attaching to
  * @tsk: the task to be attached
  *
- * Call holding cgroup_mutex. May take task_lock of
- * the task 'tsk' during call.
+ * Call with cgroup_mutex and threadgroup locked. May take task_lock of
+ * @tsk during call.
  */
 int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
 {
@@ -1823,15 +1909,23 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
         struct cgroup_subsys *ss, *failed_ss = NULL;
         struct cgroup *oldcgrp;
         struct cgroupfs_root *root = cgrp->root;
+        struct cgroup_taskset tset = { };
+
+        /* @tsk either already exited or can't exit until the end */
+        if (tsk->flags & PF_EXITING)
+                return -ESRCH;
 
         /* Nothing to do if the task is already in that cgroup */
         oldcgrp = task_cgroup_from_root(tsk, root);
         if (cgrp == oldcgrp)
                 return 0;
 
+        tset.single.task = tsk;
+        tset.single.cgrp = oldcgrp;
+
         for_each_subsys(root, ss) {
                 if (ss->can_attach) {
-                        retval = ss->can_attach(ss, cgrp, tsk);
+                        retval = ss->can_attach(ss, cgrp, &tset);
                         if (retval) {
                                 /*
                                  * Remember on which subsystem the can_attach()
@@ -1843,13 +1937,6 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
                                 goto out;
                         }
                 }
-                if (ss->can_attach_task) {
-                        retval = ss->can_attach_task(cgrp, tsk);
-                        if (retval) {
-                                failed_ss = ss;
-                                goto out;
-                        }
-                }
         }
 
         retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, false);
@@ -1857,12 +1944,8 @@ int cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
                 goto out;
 
         for_each_subsys(root, ss) {
-                if (ss->pre_attach)
-                        ss->pre_attach(cgrp);
-                if (ss->attach_task)
-                        ss->attach_task(cgrp, tsk);
                 if (ss->attach)
-                        ss->attach(ss, cgrp, oldcgrp, tsk);
+                        ss->attach(ss, cgrp, &tset);
         }
 
         synchronize_rcu();
@@ -1884,7 +1967,7 @@ out:
                                  */
                                 break;
                         if (ss->cancel_attach)
-                                ss->cancel_attach(ss, cgrp, tsk);
+                                ss->cancel_attach(ss, cgrp, &tset);
                 }
         }
         return retval;
@@ -1935,23 +2018,17 @@ static bool css_set_check_fetched(struct cgroup *cgrp,
 
         read_lock(&css_set_lock);
         newcg = find_existing_css_set(cg, cgrp, template);
-        if (newcg)
-                get_css_set(newcg);
         read_unlock(&css_set_lock);
 
         /* doesn't exist at all? */
         if (!newcg)
                 return false;
         /* see if it's already in the list */
-        list_for_each_entry(cg_entry, newcg_list, links) {
-                if (cg_entry->cg == newcg) {
-                        put_css_set(newcg);
+        list_for_each_entry(cg_entry, newcg_list, links)
+                if (cg_entry->cg == newcg)
                         return true;
-                }
-        }
 
         /* not found */
-        put_css_set(newcg);
         return false;
 }
 
@@ -1985,21 +2062,21 @@ static int css_set_prefetch(struct cgroup *cgrp, struct css_set *cg,
  * @cgrp: the cgroup to attach to
  * @leader: the threadgroup leader task_struct of the group to be attached
  *
- * Call holding cgroup_mutex and the threadgroup_fork_lock of the leader. Will
- * take task_lock of each thread in leader's threadgroup individually in turn.
+ * Call holding cgroup_mutex and the group_rwsem of the leader. Will take
+ * task_lock of each thread in leader's threadgroup individually in turn.
  */
-int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
+static int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 {
         int retval, i, group_size;
         struct cgroup_subsys *ss, *failed_ss = NULL;
-        bool cancel_failed_ss = false;
         /* guaranteed to be initialized later, but the compiler needs this */
-        struct cgroup *oldcgrp = NULL;
         struct css_set *oldcg;
         struct cgroupfs_root *root = cgrp->root;
         /* threadgroup list cursor and array */
         struct task_struct *tsk;
+        struct task_and_cgroup *tc;
         struct flex_array *group;
+        struct cgroup_taskset tset = { };
         /*
          * we need to make sure we have css_sets for all the tasks we're
          * going to move -before- we actually start moving them, so that in
@@ -2012,13 +2089,12 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
          * step 0: in order to do expensive, possibly blocking operations for
          * every thread, we cannot iterate the thread group list, since it needs
          * rcu or tasklist locked. instead, build an array of all threads in the
-         * group - threadgroup_fork_lock prevents new threads from appearing,
-         * and if threads exit, this will just be an over-estimate.
+         * group - group_rwsem prevents new threads from appearing, and if
+         * threads exit, this will just be an over-estimate.
          */
         group_size = get_nr_threads(leader);
         /* flex_array supports very large thread-groups better than kmalloc. */
-        group = flex_array_alloc(sizeof(struct task_struct *), group_size,
-                                 GFP_KERNEL);
+        group = flex_array_alloc(sizeof(*tc), group_size, GFP_KERNEL);
         if (!group)
                 return -ENOMEM;
         /* pre-allocate to guarantee space while iterating in rcu read-side. */
@@ -2040,49 +2116,53 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
                 retval = -EAGAIN;
                 goto out_free_group_list;
         }
-        /* take a reference on each task in the group to go in the array. */
+
         tsk = leader;
         i = 0;
         do {
+                struct task_and_cgroup ent;
+
+                /* @tsk either already exited or can't exit until the end */
+                if (tsk->flags & PF_EXITING)
+                        continue;
+
                 /* as per above, nr_threads may decrease, but not increase. */
                 BUG_ON(i >= group_size);
-                get_task_struct(tsk);
                 /*
                  * saying GFP_ATOMIC has no effect here because we did prealloc
                  * earlier, but it's good form to communicate our expectations.
                  */
-                retval = flex_array_put_ptr(group, i, tsk, GFP_ATOMIC);
+                ent.task = tsk;
+                ent.cgrp = task_cgroup_from_root(tsk, root);
+                /* nothing to do if this task is already in the cgroup */
+                if (ent.cgrp == cgrp)
+                        continue;
+                retval = flex_array_put(group, i, &ent, GFP_ATOMIC);
                 BUG_ON(retval != 0);
                 i++;
         } while_each_thread(leader, tsk);
         /* remember the number of threads in the array for later. */
         group_size = i;
+        tset.tc_array = group;
+        tset.tc_array_len = group_size;
         read_unlock(&tasklist_lock);
 
+        /* methods shouldn't be called if no task is actually migrating */
+        retval = 0;
+        if (!group_size)
+                goto out_free_group_list;
+
         /*
          * step 1: check that we can legitimately attach to the cgroup.
          */
         for_each_subsys(root, ss) {
                 if (ss->can_attach) {
-                        retval = ss->can_attach(ss, cgrp, leader);
+                        retval = ss->can_attach(ss, cgrp, &tset);
                         if (retval) {
                                 failed_ss = ss;
                                 goto out_cancel_attach;
                         }
                 }
-                /* a callback to be run on every thread in the threadgroup. */
-                if (ss->can_attach_task) {
-                        /* run on each task in the threadgroup. */
-                        for (i = 0; i < group_size; i++) {
-                                tsk = flex_array_get_ptr(group, i);
-                                retval = ss->can_attach_task(cgrp, tsk);
-                                if (retval) {
-                                        failed_ss = ss;
-                                        cancel_failed_ss = true;
-                                        goto out_cancel_attach;
-                                }
-                        }
-                }
         }
 
         /*
@@ -2091,67 +2171,36 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
          */
         INIT_LIST_HEAD(&newcg_list);
         for (i = 0; i < group_size; i++) {
-                tsk = flex_array_get_ptr(group, i);
-                /* nothing to do if this task is already in the cgroup */
-                oldcgrp = task_cgroup_from_root(tsk, root);
-                if (cgrp == oldcgrp)
-                        continue;
-                /* get old css_set pointer */
-                task_lock(tsk);
-                oldcg = tsk->cgroups;
-                get_css_set(oldcg);
-                task_unlock(tsk);
-                /* see if the new one for us is already in the list? */
-                if (css_set_check_fetched(cgrp, tsk, oldcg, &newcg_list)) {
-                        /* was already there, nothing to do. */
-                        put_css_set(oldcg);
-                } else {
-                        /* we don't already have it. get new one. */
+                tc = flex_array_get(group, i);
+                oldcg = tc->task->cgroups;
+
+                /* if we don't already have it in the list get a new one */
+                if (!css_set_check_fetched(cgrp, tc->task, oldcg,
+                                           &newcg_list)) {
                         retval = css_set_prefetch(cgrp, oldcg, &newcg_list);
-                        put_css_set(oldcg);
                         if (retval)
                                 goto out_list_teardown;
                 }
         }
 
         /*
-         * step 3: now that we're guaranteed success wrt the css_sets, proceed
-         * to move all tasks to the new cgroup, calling ss->attach_task for each
-         * one along the way. there are no failure cases after here, so this is
-         * the commit point.
+         * step 3: now that we're guaranteed success wrt the css_sets,
+         * proceed to move all tasks to the new cgroup.  There are no
+         * failure cases after here, so this is the commit point.
          */
-        for_each_subsys(root, ss) {
-                if (ss->pre_attach)
-                        ss->pre_attach(cgrp);
-        }
         for (i = 0; i < group_size; i++) {
-                tsk = flex_array_get_ptr(group, i);
-                /* leave current thread as it is if it's already there */
-                oldcgrp = task_cgroup_from_root(tsk, root);
-                if (cgrp == oldcgrp)
-                        continue;
-                /* if the thread is PF_EXITING, it can just get skipped. */
-                retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, true);
-                if (retval == 0) {
-                        /* attach each task to each subsystem */
-                        for_each_subsys(root, ss) {
-                                if (ss->attach_task)
-                                        ss->attach_task(cgrp, tsk);
-                        }
-                } else {
-                        BUG_ON(retval != -ESRCH);
-                }
+                tc = flex_array_get(group, i);
+                retval = cgroup_task_migrate(cgrp, tc->cgrp, tc->task, true);
+                BUG_ON(retval);
         }
         /* nothing is sensitive to fork() after this point. */
 
         /*
-         * step 4: do expensive, non-thread-specific subsystem callbacks.
-         * TODO: if ever a subsystem needs to know the oldcgrp for each task
-         * being moved, this call will need to be reworked to communicate that.
+         * step 4: do subsystem attach callbacks.
          */
         for_each_subsys(root, ss) {
                 if (ss->attach)
-                        ss->attach(ss, cgrp, oldcgrp, leader);
+                        ss->attach(ss, cgrp, &tset);
         }
 
         /*
@@ -2171,20 +2220,12 @@ out_cancel_attach:
         /* same deal as in cgroup_attach_task */
         if (retval) {
                 for_each_subsys(root, ss) {
-                        if (ss == failed_ss) {
-                                if (cancel_failed_ss && ss->cancel_attach)
-                                        ss->cancel_attach(ss, cgrp, leader);
+                        if (ss == failed_ss)
                                 break;
-                        }
                         if (ss->cancel_attach)
-                                ss->cancel_attach(ss, cgrp, leader);
+                                ss->cancel_attach(ss, cgrp, &tset);
                 }
         }
-        /* clean up the array of referenced threads in the group. */
-        for (i = 0; i < group_size; i++) {
-                tsk = flex_array_get_ptr(group, i);
-                put_task_struct(tsk);
-        }
 out_free_group_list:
         flex_array_free(group);
         return retval;
@@ -2192,8 +2233,8 @@ out_free_group_list:
 
 /*
  * Find the task_struct of the task to attach by vpid and pass it along to the
- * function to attach either it or all tasks in its threadgroup. Will take
- * cgroup_mutex; may take task_lock of task.
+ * function to attach either it or all tasks in its threadgroup. Will lock
+ * cgroup_mutex and threadgroup; may take task_lock of task.
  */
 static int attach_task_by_pid(struct cgroup *cgrp, u64 pid, bool threadgroup)
 {
@@ -2220,13 +2261,7 @@ static int attach_task_by_pid(struct cgroup *cgrp, u64 pid, bool threadgroup)
                          * detect it later.
                          */
                         tsk = tsk->group_leader;
-                } else if (tsk->flags & PF_EXITING) {
-                        /* optimization for the single-task-only case */
-                        rcu_read_unlock();
-                        cgroup_unlock();
-                        return -ESRCH;
                 }
-
                 /*
                  * even if we're attaching all tasks in the thread group, we
                  * only need to check permissions on one of them.
@@ -2249,13 +2284,15 @@ static int attach_task_by_pid(struct cgroup *cgrp, u64 pid, bool threadgroup)
                 get_task_struct(tsk);
         }
 
-        if (threadgroup) {
-                threadgroup_fork_write_lock(tsk);
+        threadgroup_lock(tsk);
+
+        if (threadgroup)
                 ret = cgroup_attach_proc(cgrp, tsk);
-                threadgroup_fork_write_unlock(tsk);
-        } else {
+        else
                 ret = cgroup_attach_task(cgrp, tsk);
-        }
+
+        threadgroup_unlock(tsk);
+
         put_task_struct(tsk);
         cgroup_unlock();
         return ret;
@@ -2306,7 +2343,9 @@ static int cgroup_release_agent_write(struct cgroup *cgrp, struct cftype *cft,
                 return -EINVAL;
         if (!cgroup_lock_live_group(cgrp))
                 return -ENODEV;
+        mutex_lock(&cgroup_root_mutex);
         strcpy(cgrp->root->release_agent_path, buffer);
+        mutex_unlock(&cgroup_root_mutex);
         cgroup_unlock();
         return 0;
 }
@@ -2789,6 +2828,7 @@ static void cgroup_enable_task_cg_lists(void)
 }
 
 void cgroup_iter_start(struct cgroup *cgrp, struct cgroup_iter *it)
+        __acquires(css_set_lock)
 {
         /*
          * The first time anyone tries to iterate across a cgroup,
@@ -2828,6 +2868,7 @@ struct task_struct *cgroup_iter_next(struct cgroup *cgrp,
 }
 
 void cgroup_iter_end(struct cgroup *cgrp, struct cgroup_iter *it)
+        __releases(css_set_lock)
 {
         read_unlock(&css_set_lock);
 }
@@ -4491,20 +4532,31 @@ static const struct file_operations proc_cgroupstats_operations = {
  *
  * A pointer to the shared css_set was automatically copied in
  * fork.c by dup_task_struct().  However, we ignore that copy, since
- * it was not made under the protection of RCU or cgroup_mutex, so
- * might no longer be a valid cgroup pointer.  cgroup_attach_task() might
- * have already changed current->cgroups, allowing the previously
- * referenced cgroup group to be removed and freed.
+ * it was not made under the protection of RCU, cgroup_mutex or
+ * threadgroup_change_begin(), so it might no longer be a valid
+ * cgroup pointer.  cgroup_attach_task() might have already changed
+ * current->cgroups, allowing the previously referenced cgroup
+ * group to be removed and freed.
+ *
+ * Outside the pointer validity we also need to process the css_set
+ * inheritance between threadgoup_change_begin() and
+ * threadgoup_change_end(), this way there is no leak in any process
+ * wide migration performed by cgroup_attach_proc() that could otherwise
+ * miss a thread because it is too early or too late in the fork stage.
  *
  * At the point that cgroup_fork() is called, 'current' is the parent
  * task, and the passed argument 'child' points to the child task.
  */
 void cgroup_fork(struct task_struct *child)
 {
-        task_lock(current);
+        /*
+         * We don't need to task_lock() current because current->cgroups
+         * can't be changed concurrently here. The parent obviously hasn't
+         * exited and called cgroup_exit(), and we are synchronized against
+         * cgroup migration through threadgroup_change_begin().
+         */
         child->cgroups = current->cgroups;
         get_css_set(child->cgroups);
-        task_unlock(current);
         INIT_LIST_HEAD(&child->cg_list);
 }
 
@@ -4546,10 +4598,19 @@ void cgroup_post_fork(struct task_struct *child)
 {
         if (use_task_css_set_links) {
                 write_lock(&css_set_lock);
-                task_lock(child);
-                if (list_empty(&child->cg_list))
+                if (list_empty(&child->cg_list)) {
+                        /*
+                         * It's safe to use child->cgroups without task_lock()
+                         * here because we are protected through
+                         * threadgroup_change_begin() against concurrent
+                         * css_set change in cgroup_task_migrate(). Also
+                         * the task can't exit at that point until
+                         * wake_up_new_task() is called, so we are protected
+                         * against cgroup_exit() setting child->cgroup to
+                         * init_css_set.
+                         */
                         list_add(&child->cg_list, &child->cgroups->tasks);
-                task_unlock(child);
+                }
                 write_unlock(&css_set_lock);
         }
 }
diff --git a/kernel/cgroup_freezer.c b/kernel/cgroup_freezer.c
index fcb93fca782d..fc0646b78a64 100644
--- a/kernel/cgroup_freezer.c
+++ b/kernel/cgroup_freezer.c
@@ -166,13 +166,17 @@ static bool is_task_frozen_enough(struct task_struct *task)
  */
 static int freezer_can_attach(struct cgroup_subsys *ss,
                               struct cgroup *new_cgroup,
-                              struct task_struct *task)
+                              struct cgroup_taskset *tset)
 {
         struct freezer *freezer;
+        struct task_struct *task;
 
         /*
          * Anything frozen can't move or be moved to/from.
          */
+        cgroup_taskset_for_each(task, new_cgroup, tset)
+                if (cgroup_freezing(task))
+                        return -EBUSY;
 
         freezer = cgroup_freezer(new_cgroup);
         if (freezer->state != CGROUP_THAWED)
@@ -181,11 +185,6 @@ static int freezer_can_attach(struct cgroup_subsys *ss,
         return 0;
 }
 
-static int freezer_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
-{
-        return cgroup_freezing(tsk) ? -EBUSY : 0;
-}
-
 static void freezer_fork(struct cgroup_subsys *ss, struct task_struct *task)
 {
         struct freezer *freezer;
@@ -381,10 +380,5 @@ struct cgroup_subsys freezer_subsys = {
         .populate       = freezer_populate,
         .subsys_id      = freezer_subsys_id,
         .can_attach     = freezer_can_attach,
-        .can_attach_task = freezer_can_attach_task,
-        .pre_attach     = NULL,
-        .attach_task    = NULL,
-        .attach         = NULL,
         .fork           = freezer_fork,
-        .exit           = NULL,
 };
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 0b1712dba587..a09ac2b9a661 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1389,79 +1389,73 @@ static int fmeter_getrate(struct fmeter *fmp)
         return val;
 }
 
-/* Called by cgroups to determine if a cpuset is usable; cgroup_mutex held */
-static int cpuset_can_attach(struct cgroup_subsys *ss, struct cgroup *cont,
-                             struct task_struct *tsk)
-{
-        struct cpuset *cs = cgroup_cs(cont);
-
-        if (cpumask_empty(cs->cpus_allowed) || nodes_empty(cs->mems_allowed))
-                return -ENOSPC;
-
-        /*
-         * Kthreads bound to specific cpus cannot be moved to a new cpuset; we
-         * cannot change their cpu affinity and isolating such threads by their
-         * set of allowed nodes is unnecessary.  Thus, cpusets are not
-         * applicable for such threads.  This prevents checking for success of
-         * set_cpus_allowed_ptr() on all attached tasks before cpus_allowed may
-         * be changed.
-         */
-        if (tsk->flags & PF_THREAD_BOUND)
-                return -EINVAL;
-
-        return 0;
-}
-
-static int cpuset_can_attach_task(struct cgroup *cgrp, struct task_struct *task)
-{
-        return security_task_setscheduler(task);
-}
-
 /*
  * Protected by cgroup_lock. The nodemasks must be stored globally because
- * dynamically allocating them is not allowed in pre_attach, and they must
- * persist among pre_attach, attach_task, and attach.
+ * dynamically allocating them is not allowed in can_attach, and they must
+ * persist until attach.
  */
 static cpumask_var_t cpus_attach;
 static nodemask_t cpuset_attach_nodemask_from;
 static nodemask_t cpuset_attach_nodemask_to;
 
-/* Set-up work for before attaching each task. */
-static void cpuset_pre_attach(struct cgroup *cont)
+/* Called by cgroups to determine if a cpuset is usable; cgroup_mutex held */
+static int cpuset_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                             struct cgroup_taskset *tset)
 {
-        struct cpuset *cs = cgroup_cs(cont);
+        struct cpuset *cs = cgroup_cs(cgrp);
+        struct task_struct *task;
+        int ret;
+
+        if (cpumask_empty(cs->cpus_allowed) || nodes_empty(cs->mems_allowed))
+                return -ENOSPC;
+
+        cgroup_taskset_for_each(task, cgrp, tset) {
+                /*
+                 * Kthreads bound to specific cpus cannot be moved to a new
+                 * cpuset; we cannot change their cpu affinity and
+                 * isolating such threads by their set of allowed nodes is
+                 * unnecessary.  Thus, cpusets are not applicable for such
+                 * threads.  This prevents checking for success of
+                 * set_cpus_allowed_ptr() on all attached tasks before
+                 * cpus_allowed may be changed.
+                 */
+                if (task->flags & PF_THREAD_BOUND)
+                        return -EINVAL;
+                if ((ret = security_task_setscheduler(task)))
+                        return ret;
+        }
 
+        /* prepare for attach */
         if (cs == &top_cpuset)
                 cpumask_copy(cpus_attach, cpu_possible_mask);
         else
                 guarantee_online_cpus(cs, cpus_attach);
 
         guarantee_online_mems(cs, &cpuset_attach_nodemask_to);
-}
-
-/* Per-thread attachment work. */
-static void cpuset_attach_task(struct cgroup *cont, struct task_struct *tsk)
-{
-        int err;
-        struct cpuset *cs = cgroup_cs(cont);
 
-        /*
-         * can_attach beforehand should guarantee that this doesn't fail.
-         * TODO: have a better way to handle failure here
-         */
-        err = set_cpus_allowed_ptr(tsk, cpus_attach);
-        WARN_ON_ONCE(err);
-
-        cpuset_change_task_nodemask(tsk, &cpuset_attach_nodemask_to);
-        cpuset_update_task_spread_flag(cs, tsk);
+        return 0;
 }
 
-static void cpuset_attach(struct cgroup_subsys *ss, struct cgroup *cont,
-                          struct cgroup *oldcont, struct task_struct *tsk)
+static void cpuset_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                          struct cgroup_taskset *tset)
 {
         struct mm_struct *mm;
-        struct cpuset *cs = cgroup_cs(cont);
-        struct cpuset *oldcs = cgroup_cs(oldcont);
+        struct task_struct *task;
+        struct task_struct *leader = cgroup_taskset_first(tset);
+        struct cgroup *oldcgrp = cgroup_taskset_cur_cgroup(tset);
+        struct cpuset *cs = cgroup_cs(cgrp);
+        struct cpuset *oldcs = cgroup_cs(oldcgrp);
+
+        cgroup_taskset_for_each(task, cgrp, tset) {
+                /*
+                 * can_attach beforehand should guarantee that this doesn't
+                 * fail.  TODO: have a better way to handle failure here
+                 */
+                WARN_ON_ONCE(set_cpus_allowed_ptr(task, cpus_attach));
+
+                cpuset_change_task_nodemask(task, &cpuset_attach_nodemask_to);
+                cpuset_update_task_spread_flag(cs, task);
+        }
 
         /*
          * Change mm, possibly for multiple threads in a threadgroup. This is
@@ -1469,7 +1463,7 @@ static void cpuset_attach(struct cgroup_subsys *ss, struct cgroup *cont,
          */
         cpuset_attach_nodemask_from = oldcs->mems_allowed;
         cpuset_attach_nodemask_to = cs->mems_allowed;
-        mm = get_task_mm(tsk);
+        mm = get_task_mm(leader);
         if (mm) {
                 mpol_rebind_mm(mm, &cpuset_attach_nodemask_to);
                 if (is_memory_migrate(cs))
@@ -1925,9 +1919,6 @@ struct cgroup_subsys cpuset_subsys = {
         .create = cpuset_create,
         .destroy = cpuset_destroy,
         .can_attach = cpuset_can_attach,
-        .can_attach_task = cpuset_can_attach_task,
-        .pre_attach = cpuset_pre_attach,
-        .attach_task = cpuset_attach_task,
         .attach = cpuset_attach,
         .populate = cpuset_populate,
         .post_clone = cpuset_post_clone,
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 3afc68c08433..a8f4ac001a00 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6941,10 +6941,13 @@ static int __perf_cgroup_move(void *info)
         return 0;
 }
 
-static void
-perf_cgroup_attach_task(struct cgroup *cgrp, struct task_struct *task)
+static void perf_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                               struct cgroup_taskset *tset)
 {
-        task_function_call(task, __perf_cgroup_move, task);
+        struct task_struct *task;
+
+        cgroup_taskset_for_each(task, cgrp, tset)
+                task_function_call(task, __perf_cgroup_move, task);
 }
 
 static void perf_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp,
@@ -6958,7 +6961,7 @@ static void perf_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp,
         if (!(task->flags & PF_EXITING))
                 return;
 
-        perf_cgroup_attach_task(cgrp, task);
+        task_function_call(task, __perf_cgroup_move, task);
 }
 
 struct cgroup_subsys perf_subsys = {
@@ -6967,6 +6970,6 @@ struct cgroup_subsys perf_subsys = {
         .create         = perf_cgroup_create,
         .destroy        = perf_cgroup_destroy,
         .exit           = perf_cgroup_exit,
-        .attach_task    = perf_cgroup_attach_task,
+        .attach         = perf_cgroup_attach,
 };
 #endif /* CONFIG_CGROUP_PERF */
diff --git a/kernel/fork.c b/kernel/fork.c
index f34f894c4b98..b00711ce7c13 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -972,7 +972,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
         sched_autogroup_fork(sig);
 
 #ifdef CONFIG_CGROUPS
-        init_rwsem(&sig->threadgroup_fork_lock);
+        init_rwsem(&sig->group_rwsem);
 #endif
 
         sig->oom_adj = current->signal->oom_adj;
@@ -1153,7 +1153,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         p->io_context = NULL;
         p->audit_context = NULL;
         if (clone_flags & CLONE_THREAD)
-                threadgroup_fork_read_lock(current);
+                threadgroup_change_begin(current);
         cgroup_fork(p);
 #ifdef CONFIG_NUMA
         p->mempolicy = mpol_dup(p->mempolicy);
@@ -1368,7 +1368,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
         proc_fork_connector(p);
         cgroup_post_fork(p);
         if (clone_flags & CLONE_THREAD)
-                threadgroup_fork_read_unlock(current);
+                threadgroup_change_end(current);
         perf_event_fork(p);
         return p;
 
@@ -1403,7 +1403,7 @@ bad_fork_cleanup_policy:
 bad_fork_cleanup_cgroup:
 #endif
         if (clone_flags & CLONE_THREAD)
-                threadgroup_fork_read_unlock(current);
+                threadgroup_change_end(current);
         cgroup_exit(p, cgroup_callbacks_done);
         delayacct_tsk_free(p);
         module_put(task_thread_info(p)->exec_domain->module);
diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index 34683efa2cce..6d269cce7aa1 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -159,8 +159,7 @@ int res_counter_memparse_write_strategy(const char *buf,
                 return 0;
         }
 
-        /* FIXME - make memparse() take const char* args */
-        *res = memparse((char *)buf, &end);
+        *res = memparse(buf, &end);
         if (*end != '\0')
                 return -EINVAL;
 
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 0ac0f811d623..cecbb64be05f 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7563,24 +7563,31 @@ cpu_cgroup_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)
         sched_destroy_group(tg);
 }
 
-static int
-cpu_cgroup_can_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+static int cpu_cgroup_can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                                 struct cgroup_taskset *tset)
 {
+        struct task_struct *task;
+
+        cgroup_taskset_for_each(task, cgrp, tset) {
 #ifdef CONFIG_RT_GROUP_SCHED
-        if (!sched_rt_can_attach(cgroup_tg(cgrp), tsk))
-                return -EINVAL;
+                if (!sched_rt_can_attach(cgroup_tg(cgrp), task))
+                        return -EINVAL;
 #else
-        /* We don't support RT-tasks being in separate groups */
-        if (tsk->sched_class != &fair_sched_class)
-                return -EINVAL;
+                /* We don't support RT-tasks being in separate groups */
+                if (task->sched_class != &fair_sched_class)
+                        return -EINVAL;
 #endif
+        }
         return 0;
 }
 
-static void
-cpu_cgroup_attach_task(struct cgroup *cgrp, struct task_struct *tsk)
+static void cpu_cgroup_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
+                              struct cgroup_taskset *tset)
 {
-        sched_move_task(tsk);
+        struct task_struct *task;
+
+        cgroup_taskset_for_each(task, cgrp, tset)
+                sched_move_task(task);
 }
 
 static void
@@ -7915,8 +7922,8 @@ struct cgroup_subsys cpu_cgroup_subsys = {
         .name           = "cpu",
         .create         = cpu_cgroup_create,
         .destroy        = cpu_cgroup_destroy,
-        .can_attach_task = cpu_cgroup_can_attach_task,
-        .attach_task    = cpu_cgroup_attach_task,
+        .can_attach     = cpu_cgroup_can_attach,
+        .attach         = cpu_cgroup_attach,
         .exit           = cpu_cgroup_exit,
         .populate       = cpu_cgroup_populate,
         .subsys_id      = cpu_cgroup_subsys_id,
diff --git a/kernel/signal.c b/kernel/signal.c
index 56ce3a618b28..bb0efa5705ed 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2355,8 +2355,15 @@ void exit_signals(struct task_struct *tsk)
         int group_stop = 0;
         sigset_t unblocked;
 
+        /*
+         * @tsk is about to have PF_EXITING set - lock out users which
+         * expect stable threadgroup.
+         */
+        threadgroup_change_begin(tsk);
+
         if (thread_group_empty(tsk) || signal_group_exit(tsk->signal)) {
                 tsk->flags |= PF_EXITING;
+                threadgroup_change_end(tsk);
                 return;
         }
 
@@ -2366,6 +2373,9 @@ void exit_signals(struct task_struct *tsk)
          * see wants_signal(), do_signal_stop().
          */
         tsk->flags |= PF_EXITING;
+
+        threadgroup_change_end(tsk);
+
         if (!signal_pending(tsk))
                 goto out;
 
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 94da8ee9e2c2..d87aa3510c5e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -381,16 +381,25 @@ 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)
 {
-        /* A socket spends its whole life in the same cgroup */
-        if (sk->sk_cgrp) {
-                WARN_ON(1);
-                return;
-        }
         if (static_branch(&memcg_socket_limit_enabled)) {
                 struct mem_cgroup *memcg;
 
                 BUG_ON(!sk->sk_prot->proto_cgroup);
 
+                /* Socket cloning can throw us here with sk_cgrp already
+                 * filled. It won't however, necessarily happen from
+                 * process context. So the test for root memcg given
+                 * the current task's memcg won't help us in this case.
+                 *
+                 * Respecting the original socket's memcg is a better
+                 * decision in this case.
+                 */
+                if (sk->sk_cgrp) {
+                        BUG_ON(mem_cgroup_is_root(sk->sk_cgrp->memcg));
+                        mem_cgroup_get(sk->sk_cgrp->memcg);
+                        return;
+                }
+
                 rcu_read_lock();
                 memcg = mem_cgroup_from_task(current);
                 if (!mem_cgroup_is_root(memcg)) {
@@ -5391,8 +5400,9 @@ static void mem_cgroup_clear_mc(void)
 
 static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
+        struct task_struct *p = cgroup_taskset_first(tset);
         int ret = 0;
         struct mem_cgroup *memcg = mem_cgroup_from_cont(cgroup);
 
@@ -5430,7 +5440,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
 
 static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
         mem_cgroup_clear_mc();
 }
@@ -5547,9 +5557,9 @@ retry:
 
 static void mem_cgroup_move_task(struct cgroup_subsys *ss,
                                 struct cgroup *cont,
-                                struct cgroup *old_cont,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
+        struct task_struct *p = cgroup_taskset_first(tset);
         struct mm_struct *mm = get_task_mm(p);
 
         if (mm) {
@@ -5564,19 +5574,18 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,
 #else   /* !CONFIG_MMU */
 static int mem_cgroup_can_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
         return 0;
 }
 static void mem_cgroup_cancel_attach(struct cgroup_subsys *ss,
                                 struct cgroup *cgroup,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
 }
 static void mem_cgroup_move_task(struct cgroup_subsys *ss,
                                 struct cgroup *cont,
-                                struct cgroup *old_cont,
-                                struct task_struct *p)
+                                struct cgroup_taskset *tset)
 {
 }
 #endif
diff --git a/mm/slab.c b/mm/slab.c
index 83311c9aaf9d..2acfa0d90943 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -121,6 +121,8 @@
 #include        <asm/tlbflush.h>
 #include        <asm/page.h>
 
+#include <trace/events/kmem.h>
+
 /*
  * DEBUG        - 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON.
  *                0 for faster, smaller code (especially in the critical paths).
diff --git a/mm/slub.c b/mm/slub.c
index 09ccee8fb58e..025f6ac51569 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1978,7 +1978,7 @@ int put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
                 page->pobjects = pobjects;
                 page->next = oldpage;
 
-        } while (irqsafe_cpu_cmpxchg(s->cpu_slab->partial, oldpage, page) != oldpage);
+        } while (this_cpu_cmpxchg(s->cpu_slab->partial, oldpage, page) != oldpage);
         stat(s, CPU_PARTIAL_FREE);
         return pobjects;
 }
@@ -2304,7 +2304,7 @@ redo:
                  * Since this is without lock semantics the protection is only against
                  * code executing on this cpu *not* from access by other cpus.
                  */
-                if (unlikely(!irqsafe_cpu_cmpxchg_double(
+                if (unlikely(!this_cpu_cmpxchg_double(
                                 s->cpu_slab->freelist, s->cpu_slab->tid,
                                 object, tid,
                                 get_freepointer_safe(s, object), next_tid(tid)))) {
@@ -2534,7 +2534,7 @@ redo:
         if (likely(page == c->page)) {
                 set_freepointer(s, object, c->freelist);
 
-                if (unlikely(!irqsafe_cpu_cmpxchg_double(
+                if (unlikely(!this_cpu_cmpxchg_double(
                                 s->cpu_slab->freelist, s->cpu_slab->tid,
                                 c->freelist, tid,
                                 object, next_tid(tid)))) {
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index b0ce14fbf6ef..61570ee76fe6 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -76,12 +76,12 @@ static struct caif_device_entry_list *caif_device_list(struct net *net)
 
 static void caifd_put(struct caif_device_entry *e)
 {
-        irqsafe_cpu_dec(*e->pcpu_refcnt);
+        this_cpu_dec(*e->pcpu_refcnt);
 }
 
 static void caifd_hold(struct caif_device_entry *e)
 {
-        irqsafe_cpu_inc(*e->pcpu_refcnt);
+        this_cpu_inc(*e->pcpu_refcnt);
 }
 
 static int caifd_refcnt_read(struct caif_device_entry *e)
diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c
index d3ca87bf23b7..0a7df7ef062d 100644
--- a/net/caif/cffrml.c
+++ b/net/caif/cffrml.c
@@ -177,14 +177,14 @@ void cffrml_put(struct cflayer *layr)
 {
         struct cffrml *this = container_obj(layr);
         if (layr != NULL && this->pcpu_refcnt != NULL)
-                irqsafe_cpu_dec(*this->pcpu_refcnt);
+                this_cpu_dec(*this->pcpu_refcnt);
 }
 
 void cffrml_hold(struct cflayer *layr)
 {
         struct cffrml *this = container_obj(layr);
         if (layr != NULL && this->pcpu_refcnt != NULL)
-                irqsafe_cpu_inc(*this->pcpu_refcnt);
+                this_cpu_inc(*this->pcpu_refcnt);
 }
 
 int cffrml_refcnt_read(struct cflayer *layr)
diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c
index febba516db62..29c07fef9228 100644
--- a/net/core/dev_addr_lists.c
+++ b/net/core/dev_addr_lists.c
@@ -427,7 +427,7 @@ EXPORT_SYMBOL(dev_uc_del);
  *
  *      Add newly added addresses to the destination device and release
  *      addresses that have no users left. The source device must be
- *      locked by netif_tx_lock_bh.
+ *      locked by netif_addr_lock_bh.
  *
  *      This function is intended to be called from the dev->set_rx_mode
  *      function of layered software devices.
@@ -439,11 +439,11 @@ int dev_uc_sync(struct net_device *to, struct net_device *from)
         if (to->addr_len != from->addr_len)
                 return -EINVAL;
 
-        netif_addr_lock_bh(to);
+        netif_addr_lock_nested(to);
         err = __hw_addr_sync(&to->uc, &from->uc, to->addr_len);
         if (!err)
                 __dev_set_rx_mode(to);
-        netif_addr_unlock_bh(to);
+        netif_addr_unlock(to);
         return err;
 }
 EXPORT_SYMBOL(dev_uc_sync);
@@ -463,7 +463,7 @@ void dev_uc_unsync(struct net_device *to, struct net_device *from)
                 return;
 
         netif_addr_lock_bh(from);
-        netif_addr_lock(to);
+        netif_addr_lock_nested(to);
         __hw_addr_unsync(&to->uc, &from->uc, to->addr_len);
         __dev_set_rx_mode(to);
         netif_addr_unlock(to);
@@ -590,7 +590,7 @@ EXPORT_SYMBOL(dev_mc_del_global);
  *
  *      Add newly added addresses to the destination device and release
  *      addresses that have no users left. The source device must be
- *      locked by netif_tx_lock_bh.
+ *      locked by netif_addr_lock_bh.
  *
  *      This function is intended to be called from the ndo_set_rx_mode
  *      function of layered software devices.
@@ -602,11 +602,11 @@ int dev_mc_sync(struct net_device *to, struct net_device *from)
         if (to->addr_len != from->addr_len)
                 return -EINVAL;
 
-        netif_addr_lock_bh(to);
+        netif_addr_lock_nested(to);
         err = __hw_addr_sync(&to->mc, &from->mc, to->addr_len);
         if (!err)
                 __dev_set_rx_mode(to);
-        netif_addr_unlock_bh(to);
+        netif_addr_unlock(to);
         return err;
 }
 EXPORT_SYMBOL(dev_mc_sync);
@@ -626,7 +626,7 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
                 return;
 
         netif_addr_lock_bh(from);
-        netif_addr_lock(to);
+        netif_addr_lock_nested(to);
         __hw_addr_unsync(&to->mc, &from->mc, to->addr_len);
         __dev_set_rx_mode(to);
         netif_addr_unlock(to);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 449fe0f068f8..65f80c7b1656 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2024,13 +2024,13 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
                 pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
                            pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq,
                            pkt_dev->odevname);
-                pkt_dev->queue_map_min = ntxq - 1;
+                pkt_dev->queue_map_min = (ntxq ?: 1) - 1;
         }
         if (pkt_dev->queue_map_max >= ntxq) {
                 pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
                            pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq,
                            pkt_dev->odevname);
-                pkt_dev->queue_map_max = ntxq - 1;
+                pkt_dev->queue_map_max = (ntxq ?: 1) - 1;
         }
 
         /* Default to the interface's mac if not explicitly set. */
diff --git a/net/core/sock.c b/net/core/sock.c
index 002939cfc069..5c5af9988f94 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -112,6 +112,7 @@
 #include <linux/highmem.h>
 #include <linux/user_namespace.h>
 #include <linux/jump_label.h>
+#include <linux/memcontrol.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -1272,6 +1273,12 @@ void sk_release_kernel(struct sock *sk)
 }
 EXPORT_SYMBOL(sk_release_kernel);
 
+static void sk_update_clone(const struct sock *sk, struct sock *newsk)
+{
+        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
+                sock_update_memcg(newsk);
+}
+
 /**
  *      sk_clone_lock - clone a socket, and lock its clone
  *      @sk: the socket to clone
@@ -1362,6 +1369,8 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
                 sk_set_socket(newsk, NULL);
                 newsk->sk_wq = NULL;
 
+                sk_update_clone(sk, newsk);
+
                 if (newsk->sk_prot->sockets_allocated)
                         sk_sockets_allocated_inc(newsk);
 
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 335ca7abbd46..aa2a2c79776f 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -408,8 +408,12 @@ config INET_TCP_DIAG
         def_tristate INET_DIAG
 
 config INET_UDP_DIAG
+        tristate "UDP: socket monitoring interface"
         depends on INET_DIAG
-        def_tristate INET_DIAG && IPV6
+        default n
+        ---help---
+          Support for UDP socket monitoring interface used by the ss tool.
+          If unsure, say Y.
 
 menuconfig TCP_CONG_ADVANCED
         bool "TCP: advanced congestion control"
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index fa057d105bef..5104bc0bbdbe 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -880,6 +880,8 @@ static void igmp_heard_query(struct in_device *in_dev, struct sk_buff *skb,
                  * to be intended in a v3 query.
                  */
                 max_delay = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE);
+                if (!max_delay)
+                        max_delay = 1;  /* can't mod w/ 0 */
         } else { /* v3 */
                 if (!pskb_may_pull(skb, sizeof(struct igmpv3_query)))
                         return;
diff --git a/net/unix/Kconfig b/net/unix/Kconfig
index c2128b10e5f9..8b31ab85d050 100644
--- a/net/unix/Kconfig
+++ b/net/unix/Kconfig
@@ -22,7 +22,7 @@ config UNIX
 config UNIX_DIAG
         tristate "UNIX: socket monitoring interface"
         depends on UNIX
-        default UNIX
+        default n
         ---help---
           Support for UNIX socket monitoring interface used by the ss tool.
           If unsure, say Y.
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 4450fbeec411..8b5b5d8612c6 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -62,11 +62,12 @@ static inline struct dev_cgroup *task_devcgroup(struct task_struct *task)
 struct cgroup_subsys devices_subsys;
 
 static int devcgroup_can_attach(struct cgroup_subsys *ss,
-                struct cgroup *new_cgroup, struct task_struct *task)
+                        struct cgroup *new_cgrp, struct cgroup_taskset *set)
 {
-        if (current != task && !capable(CAP_SYS_ADMIN))
-                        return -EPERM;
+        struct task_struct *task = cgroup_taskset_first(set);
 
+        if (current != task && !capable(CAP_SYS_ADMIN))
+                return -EPERM;
         return 0;
 }
 
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c
index cd33de1c5b7a..df12e0993f5a 100644
--- a/sound/soc/kirkwood/kirkwood-dma.c
+++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -94,9 +94,10 @@ static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static void kirkwood_dma_conf_mbus_windows(void __iomem *base, int win,
-                                        unsigned long dma,
-                                        struct mbus_dram_target_info *dram)
+static void
+kirkwood_dma_conf_mbus_windows(void __iomem *base, int win,
+                               unsigned long dma,
+                               const struct mbus_dram_target_info *dram)
 {
         int i;
 
@@ -106,7 +107,7 @@ static void kirkwood_dma_conf_mbus_windows(void __iomem *base, int win,
 
         /* try to find matching cs for current dma address */
         for (i = 0; i < dram->num_cs; i++) {
-                struct mbus_dram_window *cs = dram->cs + i;
+                const struct mbus_dram_window *cs = dram->cs + i;
                 if ((cs->base & 0xffff0000) < (dma & 0xffff0000)) {
                         writel(cs->base & 0xffff0000,
                                 base + KIRKWOOD_AUDIO_WIN_BASE_REG(win));
@@ -127,6 +128,7 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
         struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai;
         struct kirkwood_dma_data *priv;
         struct kirkwood_dma_priv *prdata = snd_soc_platform_get_drvdata(platform);
+        const struct mbus_dram_target_info *dram;
         unsigned long addr;
 
         priv = snd_soc_dai_get_dma_data(cpu_dai, substream);
@@ -175,15 +177,16 @@ static int kirkwood_dma_open(struct snd_pcm_substream *substream)
                 writel((unsigned long)-1, priv->io + KIRKWOOD_ERR_MASK);
         }
 
+        dram = mv_mbus_dram_info();
         addr = virt_to_phys(substream->dma_buffer.area);
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 prdata->play_stream = substream;
                 kirkwood_dma_conf_mbus_windows(priv->io,
-                        KIRKWOOD_PLAYBACK_WIN, addr, priv->dram);
+                        KIRKWOOD_PLAYBACK_WIN, addr, dram);
         } else {
                 prdata->rec_stream = substream;
                 kirkwood_dma_conf_mbus_windows(priv->io,
-                        KIRKWOOD_RECORD_WIN, addr, priv->dram);
+                        KIRKWOOD_RECORD_WIN, addr, dram);
         }
 
         return 0;
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 76dc74d24fc2..d775b0761e0a 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -210,7 +210,7 @@ int mxs_saif_put_mclk(unsigned int saif_id)
                 return -EBUSY;
         }
 
-        clk_disable(saif->clk);
+        clk_disable_unprepare(saif->clk);
 
         /* disable MCLK output */
         __raw_writel(BM_SAIF_CTRL_CLKGATE,
@@ -264,7 +264,7 @@ int mxs_saif_get_mclk(unsigned int saif_id, unsigned int mclk,
         if (ret)
                 return ret;
 
-        ret = clk_enable(saif->clk);
+        ret = clk_prepare_enable(saif->clk);
         if (ret)
                 return ret;
 
@@ -625,13 +625,6 @@ static int mxs_saif_probe(struct platform_device *pdev)
         if (pdev->id >= ARRAY_SIZE(mxs_saif))
                 return -EINVAL;
 
-        pdata = pdev->dev.platform_data;
-        if (pdata && pdata->init) {
-                ret = pdata->init();
-                if (ret)
-                        return ret;
-        }
-
         saif = kzalloc(sizeof(*saif), GFP_KERNEL);
         if (!saif)
                 return -ENOMEM;
@@ -639,12 +632,17 @@ static int mxs_saif_probe(struct platform_device *pdev)
         mxs_saif[pdev->id] = saif;
         saif->id = pdev->id;
 
-        saif->master_id = saif->id;
-        if (pdata && pdata->get_master_id) {
-                saif->master_id = pdata->get_master_id(saif->id);
+        pdata = pdev->dev.platform_data;
+        if (pdata && !pdata->master_mode) {
+                saif->master_id = pdata->master_id;
                 if (saif->master_id < 0 ||
-                        saif->master_id >= ARRAY_SIZE(mxs_saif))
+                        saif->master_id >= ARRAY_SIZE(mxs_saif) ||
+                        saif->master_id == saif->id) {
+                        dev_err(&pdev->dev, "get wrong master id\n");
                         return -EINVAL;
+                }
+        } else {
+                saif->master_id = saif->id;
         }
 
         saif->clk = clk_get(&pdev->dev, NULL);