633 files changed, 20493 insertions, 6144 deletions

diff --git a/Documentation/ABI/stable/sysfs-driver-ib_srp b/Documentation/ABI/stable/sysfs-driver-ib_srp
index 5c53d28f775c..b9688de8455b 100644
--- a/Documentation/ABI/stable/sysfs-driver-ib_srp
+++ b/Documentation/ABI/stable/sysfs-driver-ib_srp
@@ -61,6 +61,12 @@ Description:	Interface for making ib_srp connect to a new target.
                   interrupt is handled by a different CPU then the comp_vector
                   parameter can be used to spread the SRP completion workload
                   over multiple CPU's.
+                * tl_retry_count, a number in the range 2..7 specifying the
+                  IB RC retry count.
+                * queue_size, the maximum number of commands that the
+                  initiator is allowed to queue per SCSI host. The default
+                  value for this parameter is 62. The lowest supported value
+                  is 2.
 
 What:           /sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
 Date:           January 2, 2006
@@ -153,6 +159,13 @@ Contact:	linux-rdma@vger.kernel.org
 Description:    InfiniBand service ID used for establishing communication with
                 the SRP target.
 
+What:           /sys/class/scsi_host/host<n>/sgid
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-rdma@vger.kernel.org
+Description:    InfiniBand GID of the source port used for communication with
+                the SRP target.
+
 What:           /sys/class/scsi_host/host<n>/zero_req_lim
 Date:           September 20, 2006
 KernelVersion:  2.6.18
diff --git a/Documentation/ABI/stable/sysfs-transport-srp b/Documentation/ABI/stable/sysfs-transport-srp
index b36fb0dc13c8..ec7af69fea0a 100644
--- a/Documentation/ABI/stable/sysfs-transport-srp
+++ b/Documentation/ABI/stable/sysfs-transport-srp
@@ -5,6 +5,24 @@ Contact:	linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
 Description:    Instructs an SRP initiator to disconnect from a target and to
                 remove all LUNs imported from that target.
 
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/dev_loss_tmo
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    Number of seconds the SCSI layer will wait after a transport
+                layer error has been observed before removing a target port.
+                Zero means immediate removal. Setting this attribute to "off"
+                will disable the dev_loss timer.
+
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/fast_io_fail_tmo
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    Number of seconds the SCSI layer will wait after a transport
+                layer error has been observed before failing I/O. Zero means
+                failing I/O immediately. Setting this attribute to "off" will
+                disable the fast_io_fail timer.
+
 What:           /sys/class/srp_remote_ports/port-<h>:<n>/port_id
 Date:           June 27, 2007
 KernelVersion:  2.6.24
@@ -12,8 +30,29 @@ Contact:	linux-scsi@vger.kernel.org
 Description:    16-byte local SRP port identifier in hexadecimal format. An
                 example: 4c:49:4e:55:58:20:56:49:4f:00:00:00:00:00:00:00.
 
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/reconnect_delay
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    Number of seconds the SCSI layer will wait after a reconnect
+                attempt failed before retrying. Setting this attribute to
+                "off" will disable time-based reconnecting.
+
 What:           /sys/class/srp_remote_ports/port-<h>:<n>/roles
 Date:           June 27, 2007
 KernelVersion:  2.6.24
 Contact:        linux-scsi@vger.kernel.org
 Description:    Role of the remote port. Either "SRP Initiator" or "SRP Target".
+
+What:           /sys/class/srp_remote_ports/port-<h>:<n>/state
+Date:           February 1, 2014
+KernelVersion:  3.13
+Contact:        linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org
+Description:    State of the transport layer used for communication with the
+                remote port. "running" if the transport layer is operational;
+                "blocked" if a transport layer error has been encountered but
+                the fast_io_fail_tmo timer has not yet fired; "fail-fast"
+                after the fast_io_fail_tmo timer has fired and before the
+                "dev_loss_tmo" timer has fired; "lost" after the
+                "dev_loss_tmo" timer has fired and before the port is finally
+                removed.
diff --git a/Documentation/devicetree/bindings/arc/pmu.txt b/Documentation/devicetree/bindings/arc/pmu.txt
new file mode 100644
index 000000000000..49d517340de3
--- /dev/null
+++ b/Documentation/devicetree/bindings/arc/pmu.txt
@@ -0,0 +1,24 @@
+* ARC Performance Monitor Unit
+
+The ARC 700 can be configured with a pipeline performance monitor for counting
+CPU and cache events like cache misses and hits.
+
+Note that:
+ * ARC 700 refers to a family of ARC processor cores;
+   - There is only one type of PMU available for the whole family;
+   - The PMU may support different sets of events; supported events are probed
+     at boot time, as required by the reference manual.
+
+ * The ARC 700 PMU does not support interrupts; although HW events may be
+   counted, the HW events themselves cannot serve as a trigger for a sample.
+
+Required properties:
+
+- compatible : should contain
+        "snps,arc700-pmu"
+
+Example:
+
+pmu {
+        compatible = "snps,arc700-pmu";
+};
diff --git a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
index f770ac0893d4..049675944b78 100644
--- a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
+++ b/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt
@@ -1,7 +1,9 @@
 Calxeda DDR memory controller
 
 Properties:
-- compatible : Should be "calxeda,hb-ddr-ctrl"
+- compatible : Should be:
+  - "calxeda,hb-ddr-ctrl" for ECX-1000
+  - "calxeda,ecx-2000-ddr-ctrl" for ECX-2000
 - reg : Address and size for DDR controller registers.
 - interrupts : Interrupt for DDR controller.
 
diff --git a/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt b/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt
new file mode 100644
index 000000000000..1b87b741fa8e
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt
@@ -0,0 +1,35 @@
+Broadcom Kona Family I2C
+=========================
+
+This I2C controller is used in the following Broadcom SoCs:
+
+  BCM11130
+  BCM11140
+  BCM11351
+  BCM28145
+  BCM28155
+
+Required Properties
+-------------------
+- compatible: "brcm,bcm11351-i2c", "brcm,kona-i2c"
+- reg: Physical base address and length of controller registers
+- interrupts: The interrupt number used by the controller
+- clocks: clock specifier for the kona i2c external clock
+- clock-frequency: The I2C bus frequency in Hz
+- #address-cells: Should be <1>
+- #size-cells: Should be <0>
+
+Refer to clocks/clock-bindings.txt for generic clock consumer
+properties.
+
+Example:
+
+i2c@3e016000 {
+        compatible = "brcm,bcm11351-i2c","brcm,kona-i2c";
+        reg = <0x3e016000 0x80>;
+        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+        clocks = <&bsc1_clk>;
+        clock-frequency = <400000>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-exynos5.txt b/Documentation/devicetree/bindings/i2c/i2c-exynos5.txt
new file mode 100644
index 000000000000..056732cfdcee
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-exynos5.txt
@@ -0,0 +1,44 @@
+* Samsung's High Speed I2C controller
+
+The Samsung's High Speed I2C controller is used to interface with I2C devices
+at various speeds ranging from 100khz to 3.4Mhz.
+
+Required properties:
+  - compatible: value should be.
+      -> "samsung,exynos5-hsi2c", for i2c compatible with exynos5 hsi2c.
+  - reg: physical base address of the controller and length of memory mapped
+    region.
+  - interrupts: interrupt number to the cpu.
+  - #address-cells: always 1 (for i2c addresses)
+  - #size-cells: always 0
+
+  - Pinctrl:
+    - pinctrl-0: Pin control group to be used for this controller.
+    - pinctrl-names: Should contain only one value - "default".
+
+Optional properties:
+  - clock-frequency: Desired operating frequency in Hz of the bus.
+    -> If not specified, the bus operates in fast-speed mode at
+       at 100khz.
+    -> If specified, the bus operates in high-speed mode only if the
+       clock-frequency is >= 1Mhz.
+
+Example:
+
+hsi2c@12ca0000 {
+        compatible = "samsung,exynos5-hsi2c";
+        reg = <0x12ca0000 0x100>;
+        interrupts = <56>;
+        clock-frequency = <100000>;
+
+        pinctrl-0 = <&i2c4_bus>;
+        pinctrl-names = "default";
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        s2mps11_pmic@66 {
+                compatible = "samsung,s2mps11-pmic";
+                reg = <0x66>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-rcar.txt b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt
new file mode 100644
index 000000000000..897cfcd5ce92
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-rcar.txt
@@ -0,0 +1,23 @@
+I2C for R-Car platforms
+
+Required properties:
+- compatible: Must be one of
+        "renesas,i2c-rcar"
+        "renesas,i2c-r8a7778"
+        "renesas,i2c-r8a7779"
+        "renesas,i2c-r8a7790"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: interrupt specifier.
+
+Optional properties:
+- clock-frequency: desired I2C bus clock frequency in Hz. The absence of this
+  propoerty indicates the default frequency 100 kHz.
+
+Examples :
+
+i2c0: i2c@e6500000 {
+        compatible = "renesas,i2c-rcar-h2";
+        reg = <0 0xe6500000 0 0x428>;
+        interrupts = <0 174 0x4>;
+};
diff --git a/Documentation/devicetree/bindings/i2c/i2c-st.txt b/Documentation/devicetree/bindings/i2c/i2c-st.txt
new file mode 100644
index 000000000000..437e0db3823c
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/i2c-st.txt
@@ -0,0 +1,41 @@
+ST SSC binding, for I2C mode operation
+
+Required properties :
+- compatible : Must be "st,comms-ssc-i2c" or "st,comms-ssc4-i2c"
+- reg : Offset and length of the register set for the device
+- interrupts : the interrupt specifier
+- clock-names: Must contain "ssc".
+- clocks: Must contain an entry for each name in clock-names. See the common
+  clock bindings.
+- A pinctrl state named "default" must be defined to set pins in mode of
+  operation for I2C transfer.
+
+Optional properties :
+- clock-frequency : Desired I2C bus clock frequency in Hz. If not specified,
+  the default 100 kHz frequency will be used. As only Normal and Fast modes
+  are supported, possible values are 100000 and 400000.
+- st,i2c-min-scl-pulse-width-us : The minimum valid SCL pulse width that is
+  allowed through the deglitch circuit. In units of us.
+- st,i2c-min-sda-pulse-width-us : The minimum valid SDA pulse width that is
+  allowed through the deglitch circuit. In units of us.
+- A pinctrl state named "idle" could be defined to set pins in idle state
+  when I2C instance is not performing a transfer.
+- A pinctrl state named "sleep" could be defined to set pins in sleep state
+  when driver enters in suspend.
+
+
+
+Example :
+
+i2c0: i2c@fed40000 {
+        compatible      = "st,comms-ssc4-i2c";
+        reg             = <0xfed40000 0x110>;
+        interrupts      =  <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
+        clocks          = <&CLK_S_ICN_REG_0>;
+        clock-names     = "ssc";
+        clock-frequency = <400000>;
+        pinctrl-names   = "default";
+        pinctrl-0       = <&pinctrl_i2c0_default>;
+        st,i2c-min-scl-pulse-width-us = <0>;
+        st,i2c-min-sda-pulse-width-us = <5>;
+};
diff --git a/Documentation/devicetree/bindings/media/st-rc.txt b/Documentation/devicetree/bindings/media/st-rc.txt
new file mode 100644
index 000000000000..05c432d08bca
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/st-rc.txt
@@ -0,0 +1,29 @@
+Device-Tree bindings for ST IRB IP
+
+Required properties:
+        - compatible: Should contain "st,comms-irb".
+        - reg: Base physical address of the controller and length of memory
+          mapped region.
+        - interrupts: interrupt-specifier for the sole interrupt generated by
+          the device. The interrupt specifier format depends on the interrupt
+          controller parent.
+        - rx-mode: can be "infrared" or "uhf". This property specifies the L1
+          protocol used for receiving remote control signals. rx-mode should
+          be present iff the rx pins are wired up.
+        - tx-mode: should be "infrared". This property specifies the L1
+          protocol used for transmitting remote control signals. tx-mode should
+          be present iff the tx pins are wired up.
+
+Optional properties:
+        - pinctrl-names, pinctrl-0: the pincontrol settings to configure muxing
+          properly for IRB pins.
+        - clocks : phandle with clock-specifier pair for IRB.
+
+Example node:
+
+        rc: rc@fe518000 {
+                compatible      = "st,comms-irb";
+                reg             = <0xfe518000 0x234>;
+                interrupts      = <0 203 0>;
+                rx-mode         = "infrared";
+        };
diff --git a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
index 1dd622546d06..9046ba06c47a 100644
--- a/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+++ b/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
@@ -12,6 +12,11 @@ Required properties:
 Optional properties:
 - fsl,cd-controller : Indicate to use controller internal card detection
 - fsl,wp-controller : Indicate to use controller internal write protection
+- fsl,delay-line : Specify the number of delay cells for override mode.
+  This is used to set the clock delay for DLL(Delay Line) on override mode
+  to select a proper data sampling window in case the clock quality is not good
+  due to signal path is too long on the board. Please refer to eSDHC/uSDHC
+  chapter, DLL (Delay Line) section in RM for details.
 
 Examples:
 
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index 066a78b034ca..8f3f13315358 100644
--- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@ -52,6 +52,9 @@ Optional properties:
   is specified and the ciu clock is specified then we'll try to set the ciu
   clock to this at probe time.
 
+* clock-freq-min-max: Minimum and Maximum clock frequency for card output
+  clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.
+
 * num-slots: specifies the number of slots supported by the controller.
   The number of physical slots actually used could be equal or less than the
   value specified by num-slots. If this property is not specified, the value
@@ -66,6 +69,10 @@ Optional properties:
 
 * supports-highspeed: Enables support for high speed cards (up to 50MHz)
 
+* caps2-mmc-hs200-1_8v: Supports mmc HS200 SDR 1.8V mode
+
+* caps2-mmc-hs200-1_2v: Supports mmc HS200 SDR 1.2V mode
+
 * broken-cd: as documented in mmc core bindings.
 
 * vmmc-supply: The phandle to the regulator to use for vmmc.  If this is
@@ -93,8 +100,10 @@ board specific portions as listed below.
 
         dwmmc0@12200000 {
                 clock-frequency = <400000000>;
+                clock-freq-min-max = <400000 200000000>;
                 num-slots = <1>;
                 supports-highspeed;
+                caps2-mmc-hs200-1_8v;
                 broken-cd;
                 fifo-depth = <0x80>;
                 card-detect-delay = <200>;
diff --git a/Documentation/devicetree/bindings/power/twl-charger.txt b/Documentation/devicetree/bindings/power/twl-charger.txt
new file mode 100644
index 000000000000..d5c706216df5
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/twl-charger.txt
@@ -0,0 +1,20 @@
+TWL BCI (Battery Charger Interface)
+
+Required properties:
+- compatible:
+  - "ti,twl4030-bci"
+- interrupts: two interrupt lines from the TWL SIH (secondary
+  interrupt handler) - interrupts 9 and 2.
+
+Optional properties:
+- ti,bb-uvolt: microvolts for charging the backup battery.
+- ti,bb-uamp: microamps for charging the backup battery.
+
+Examples:
+
+bci {
+   compatible = "ti,twl4030-bci";
+   interrupts = <9>, <2>;
+   ti,bb-uvolt = <3200000>;
+   ti,bb-uamp = <150>;
+};
diff --git a/Documentation/devicetree/bindings/power_supply/ti,bq24735.txt b/Documentation/devicetree/bindings/power_supply/ti,bq24735.txt
new file mode 100644
index 000000000000..4f6a550184d0
--- /dev/null
+++ b/Documentation/devicetree/bindings/power_supply/ti,bq24735.txt
@@ -0,0 +1,32 @@
+TI BQ24735 Charge Controller
+~~~~~~~~~~
+
+Required properties :
+ - compatible : "ti,bq24735"
+
+Optional properties :
+ - interrupts : Specify the interrupt to be used to trigger when the AC
+   adapter is either plugged in or removed.
+ - ti,ac-detect-gpios : This GPIO is optionally used to read the AC adapter
+   presence. This is a Host GPIO that is configured as an input and
+   connected to the bq24735.
+ - ti,charge-current : Used to control and set the charging current. This value
+   must be between 128mA and 8.128A with a 64mA step resolution. The POR value
+   is 0x0000h. This number is in mA (e.g. 8192), see spec for more information
+   about the ChargeCurrent (0x14h) register.
+ - ti,charge-voltage : Used to control and set the charging voltage. This value
+   must be between 1.024V and 19.2V with a 16mV step resolution. The POR value
+   is 0x0000h. This number is in mV (e.g. 19200), see spec for more information
+   about the ChargeVoltage (0x15h) register.
+ - ti,input-current : Used to control and set the charger input current. This
+   value must be between 128mA and 8.064A with a 128mA step resolution. The
+   POR value is 0x1000h. This number is in mA (e.g. 8064), see the spec for
+   more information about the InputCurrent (0x3fh) register.
+
+Example:
+
+        bq24735@9 {
+                compatible = "ti,bq24735";
+                reg = <0x9>;
+                ti,ac-detect-gpios = <&gpio 72 0x1>;
+        }
diff --git a/Documentation/devicetree/bindings/watchdog/dw_wdt.txt b/Documentation/devicetree/bindings/watchdog/dw_wdt.txt
new file mode 100644
index 000000000000..08e16f684f2d
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/dw_wdt.txt
@@ -0,0 +1,21 @@
+Synopsys Designware Watchdog Timer
+
+Required Properties:
+
+- compatible    : Should contain "snps,dw-wdt"
+- reg           : Base address and size of the watchdog timer registers.
+- clocks        : phandle + clock-specifier for the clock that drives the
+                watchdog timer.
+
+Optional Properties:
+
+- interrupts    : The interrupt used for the watchdog timeout warning.
+
+Example:
+
+        watchdog0: wd@ffd02000 {
+                compatible = "snps,dw-wdt";
+                reg = <0xffd02000 0x1000>;
+                interrupts = <0 171 4>;
+                clocks = <&per_base_clk>;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/men-a021-wdt.txt b/Documentation/devicetree/bindings/watchdog/men-a021-wdt.txt
index 370dee3226d9..370dee3226d9 100644
--- a/Documentation/devicetree/bindings/gpio/men-a021-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/men-a021-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt b/Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt
new file mode 100644
index 000000000000..1169857d1d12
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt
@@ -0,0 +1,15 @@
+MOXA ART Watchdog timer
+
+Required properties:
+
+- compatible : Must be "moxa,moxart-watchdog"
+- reg : Should contain registers location and length
+- clocks : Should contain phandle for the clock that drives the counter
+
+Example:
+
+        watchdog: watchdog@98500000 {
+                compatible = "moxa,moxart-watchdog";
+                reg = <0x98500000 0x10>;
+                clocks = <&coreclk>;
+        };
diff --git a/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt b/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt
new file mode 100644
index 000000000000..d7bab3db9d1f
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt
@@ -0,0 +1,19 @@
+Ralink Watchdog Timers
+
+Required properties:
+- compatible: must be "ralink,rt2880-wdt"
+- reg: physical base address of the controller and length of the register range
+
+Optional properties:
+- interrupt-parent: phandle to the INTC device node
+- interrupts: Specify the INTC interrupt number
+
+Example:
+
+        watchdog@120 {
+                compatible = "ralink,rt2880-wdt";
+                reg = <0x120 0x10>;
+
+                interrupt-parent = <&intc>;
+                interrupts = <1>;
+        };
diff --git a/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
new file mode 100644
index 000000000000..9cbc76c89b2b
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
@@ -0,0 +1,14 @@
+SiRFSoC Timer and Watchdog Timer(WDT) Controller
+
+Required properties:
+- compatible: "sirf,prima2-tick"
+- reg: Address range of tick timer/WDT register set
+- interrupts: interrupt number to the cpu
+
+Example:
+
+timer@b0020000 {
+        compatible = "sirf,prima2-tick";
+        reg = <0xb0020000 0x1000>;
+        interrupts = <0>;
+};
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index d29dea0f3232..7b0dcdb57173 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -25,6 +25,7 @@ Supported adapters:
   * Intel Avoton (SOC)
   * Intel Wellsburg (PCH)
   * Intel Coleto Creek (PCH)
+  * Intel Wildcat Point-LP (PCH)
    Datasheets: Publicly available at the Intel website
 
 On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/Documentation/power/power_supply_class.txt b/Documentation/power/power_supply_class.txt
index 3f10b39b0346..89a8816990ff 100644
--- a/Documentation/power/power_supply_class.txt
+++ b/Documentation/power/power_supply_class.txt
@@ -135,11 +135,11 @@ CAPACITY_LEVEL - capacity level. This corresponds to
 POWER_SUPPLY_CAPACITY_LEVEL_*.
 
 TEMP - temperature of the power supply.
-TEMP_ALERT_MIN - minimum battery temperature alert value in milli centigrade.
-TEMP_ALERT_MAX - maximum battery temperature alert value in milli centigrade.
+TEMP_ALERT_MIN - minimum battery temperature alert.
+TEMP_ALERT_MAX - maximum battery temperature alert.
 TEMP_AMBIENT - ambient temperature.
-TEMP_AMBIENT_ALERT_MIN - minimum ambient temperature alert value in milli centigrade.
-TEMP_AMBIENT_ALERT_MAX - maximum ambient temperature alert value in milli centigrade.
+TEMP_AMBIENT_ALERT_MIN - minimum ambient temperature alert.
+TEMP_AMBIENT_ALERT_MAX - maximum ambient temperature alert.
 
 TIME_TO_EMPTY - seconds left for battery to be considered empty (i.e.
 while battery powers a load)
diff --git a/MAINTAINERS b/MAINTAINERS
index 678f07430393..0e598aeed539 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1425,7 +1425,7 @@ M:	Wolfram Sang <wsa@the-dreams.de>
 L:      linux-i2c@vger.kernel.org
 S:      Maintained
 F:      drivers/misc/eeprom/at24.c
-F:      include/linux/i2c/at24.h
+F:      include/linux/platform_data/at24.h
 
 ATA OVER ETHERNET (AOE) DRIVER
 M:      "Ed L. Cashin" <ecashin@coraid.com>
@@ -3063,6 +3063,14 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/amd64_edac*
 
+EDAC-CALXEDA
+M:      Doug Thompson <dougthompson@xmission.com>
+M:      Robert Richter <rric@kernel.org>
+L:      linux-edac@vger.kernel.org
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+F:      drivers/edac/highbank*
+
 EDAC-CAVIUM
 M:      Ralf Baechle <ralf@linux-mips.org>
 M:      David Daney <david.daney@cavium.com>
@@ -3144,6 +3152,13 @@ W:	bluesmoke.sourceforge.net
 S:      Maintained
 F:      drivers/edac/i82975x_edac.c
 
+EDAC-MPC85XX
+M:      Johannes Thumshirn <johannes.thumshirn@men.de>
+L:      linux-edac@vger.kernel.org
+W:      bluesmoke.sourceforge.net
+S:      Maintained
+F:      drivers/edac/mpc85xx_edac.[ch]
+
 EDAC-PASEMI
 M:      Egor Martovetsky <egor@pasemi.com>
 L:      linux-edac@vger.kernel.org
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index 52cd2a4a3ff4..453597b91f3a 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -58,8 +58,6 @@ register struct thread_info *__current_thread_info __asm__("$8");
 #define THREAD_SIZE_ORDER 1
 #define THREAD_SIZE (2*PAGE_SIZE)
 
-#define PREEMPT_ACTIVE          0x40000000
-
 /*
  * Thread information flags:
  * - these are process state flags and used from assembly
diff --git a/arch/arc/boot/dts/abilis_tb100.dtsi b/arch/arc/boot/dts/abilis_tb100.dtsi
index d9f8249aa66e..3942634f805a 100644
--- a/arch/arc/boot/dts/abilis_tb100.dtsi
+++ b/arch/arc/boot/dts/abilis_tb100.dtsi
@@ -43,124 +43,124 @@
                 iomux: iomux@FF10601c {
                         /* Port 1 */
                         pctl_tsin_s0: pctl-tsin-s0 {   /* Serial TS-in 0 */
-                                pingrp = "mis0_pins";
+                                abilis,function = "mis0";
                         };
                         pctl_tsin_s1: pctl-tsin-s1 {   /* Serial TS-in 1 */
-                                pingrp = "mis1_pins";
+                                abilis,function = "mis1";
                         };
                         pctl_gpio_a: pctl-gpio-a {     /* GPIO bank A */
-                                pingrp = "gpioa_pins";
+                                abilis,function = "gpioa";
                         };
                         pctl_tsin_p1: pctl-tsin-p1 {   /* Parallel TS-in 1 */
-                                pingrp = "mip1_pins";
+                                abilis,function = "mip1";
                         };
                         /* Port 2 */
                         pctl_tsin_s2: pctl-tsin-s2 {   /* Serial TS-in 2 */
-                                pingrp = "mis2_pins";
+                                abilis,function = "mis2";
                         };
                         pctl_tsin_s3: pctl-tsin-s3 {   /* Serial TS-in 3 */
-                                pingrp = "mis3_pins";
+                                abilis,function = "mis3";
                         };
                         pctl_gpio_c: pctl-gpio-c {     /* GPIO bank C */
-                                pingrp = "gpioc_pins";
+                                abilis,function = "gpioc";
                         };
                         pctl_tsin_p3: pctl-tsin-p3 {   /* Parallel TS-in 3 */
-                                pingrp = "mip3_pins";
+                                abilis,function = "mip3";
                         };
                         /* Port 3 */
                         pctl_tsin_s4: pctl-tsin-s4 {   /* Serial TS-in 4 */
-                                pingrp = "mis4_pins";
+                                abilis,function = "mis4";
                         };
                         pctl_tsin_s5: pctl-tsin-s5 {   /* Serial TS-in 5 */
-                                pingrp = "mis5_pins";
+                                abilis,function = "mis5";
                         };
                         pctl_gpio_e: pctl-gpio-e {     /* GPIO bank E */
-                                pingrp = "gpioe_pins";
+                                abilis,function = "gpioe";
                         };
                         pctl_tsin_p5: pctl-tsin-p5 {   /* Parallel TS-in 5 */
-                                pingrp = "mip5_pins";
+                                abilis,function = "mip5";
                         };
                         /* Port 4 */
                         pctl_tsin_s6: pctl-tsin-s6 {   /* Serial TS-in 6 */
-                                pingrp = "mis6_pins";
+                                abilis,function = "mis6";
                         };
                         pctl_tsin_s7: pctl-tsin-s7 {   /* Serial TS-in 7 */
-                                pingrp = "mis7_pins";
+                                abilis,function = "mis7";
                         };
                         pctl_gpio_g: pctl-gpio-g {     /* GPIO bank G */
-                                pingrp = "gpiog_pins";
+                                abilis,function = "gpiog";
                         };
                         pctl_tsin_p7: pctl-tsin-p7 {   /* Parallel TS-in 7 */
-                                pingrp = "mip7_pins";
+                                abilis,function = "mip7";
                         };
                         /* Port 5 */
                         pctl_gpio_j: pctl-gpio-j {     /* GPIO bank J */
-                                pingrp = "gpioj_pins";
+                                abilis,function = "gpioj";
                         };
                         pctl_gpio_k: pctl-gpio-k {     /* GPIO bank K */
-                                pingrp = "gpiok_pins";
+                                abilis,function = "gpiok";
                         };
                         pctl_ciplus: pctl-ciplus {     /* CI+ interface */
-                                pingrp = "ciplus_pins";
+                                abilis,function = "ciplus";
                         };
                         pctl_mcard: pctl-mcard {       /* M-Card interface */
-                                pingrp = "mcard_pins";
+                                abilis,function = "mcard";
                         };
                         /* Port 6 */
                         pctl_tsout_p: pctl-tsout-p {   /* Parallel TS-out */
-                                pingrp = "mop_pins";
+                                abilis,function = "mop";
                         };
                         pctl_tsout_s0: pctl-tsout-s0 { /* Serial TS-out 0 */
-                                pingrp = "mos0_pins";
+                                abilis,function = "mos0";
                         };
                         pctl_tsout_s1: pctl-tsout-s1 { /* Serial TS-out 1 */
-                                pingrp = "mos1_pins";
+                                abilis,function = "mos1";
                         };
                         pctl_tsout_s2: pctl-tsout-s2 { /* Serial TS-out 2 */
-                                pingrp = "mos2_pins";
+                                abilis,function = "mos2";
                         };
                         pctl_tsout_s3: pctl-tsout-s3 { /* Serial TS-out 3 */
-                                pingrp = "mos3_pins";
+                                abilis,function = "mos3";
                         };
                         /* Port 7 */
                         pctl_uart0: pctl-uart0 {       /* UART 0 */
-                                pingrp = "uart0_pins";
+                                abilis,function = "uart0";
                         };
                         pctl_uart1: pctl-uart1 {       /* UART 1 */
-                                pingrp = "uart1_pins";
+                                abilis,function = "uart1";
                         };
                         pctl_gpio_l: pctl-gpio-l {     /* GPIO bank L */
-                                pingrp = "gpiol_pins";
+                                abilis,function = "gpiol";
                         };
                         pctl_gpio_m: pctl-gpio-m {     /* GPIO bank M */
-                                pingrp = "gpiom_pins";
+                                abilis,function = "gpiom";
                         };
                         /* Port 8 */
                         pctl_spi3: pctl-spi3 {
-                                pingrp = "spi3_pins";
+                                abilis,function = "spi3";
                         };
                         /* Port 9 */
                         pctl_spi1: pctl-spi1 {
-                                pingrp = "spi1_pins";
+                                abilis,function = "spi1";
                         };
                         pctl_gpio_n: pctl-gpio-n {
-                                pingrp = "gpion_pins";
+                                abilis,function = "gpion";
                         };
                         /* Unmuxed GPIOs */
                         pctl_gpio_b: pctl-gpio-b {
-                                pingrp = "gpiob_pins";
+                                abilis,function = "gpiob";
                         };
                         pctl_gpio_d: pctl-gpio-d {
-                                pingrp = "gpiod_pins";
+                                abilis,function = "gpiod";
                         };
                         pctl_gpio_f: pctl-gpio-f {
-                                pingrp = "gpiof_pins";
+                                abilis,function = "gpiof";
                         };
                         pctl_gpio_h: pctl-gpio-h {
-                                pingrp = "gpioh_pins";
+                                abilis,function = "gpioh";
                         };
                         pctl_gpio_i: pctl-gpio-i {
-                                pingrp = "gpioi_pins";
+                                abilis,function = "gpioi";
                         };
                 };
 
@@ -172,9 +172,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF140000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <0>;
-                        gpio-pins = <&pctl_gpio_a>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioa";
                 };
                 gpiob: gpio@FF141000 {
                         compatible = "abilis,tb10x-gpio";
@@ -184,9 +185,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF141000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <3>;
-                        gpio-pins = <&pctl_gpio_b>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiob";
                 };
                 gpioc: gpio@FF142000 {
                         compatible = "abilis,tb10x-gpio";
@@ -196,9 +198,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF142000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <5>;
-                        gpio-pins = <&pctl_gpio_c>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioc";
                 };
                 gpiod: gpio@FF143000 {
                         compatible = "abilis,tb10x-gpio";
@@ -208,9 +211,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF143000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <8>;
-                        gpio-pins = <&pctl_gpio_d>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiod";
                 };
                 gpioe: gpio@FF144000 {
                         compatible = "abilis,tb10x-gpio";
@@ -220,9 +224,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF144000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <10>;
-                        gpio-pins = <&pctl_gpio_e>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioe";
                 };
                 gpiof: gpio@FF145000 {
                         compatible = "abilis,tb10x-gpio";
@@ -232,9 +237,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF145000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <13>;
-                        gpio-pins = <&pctl_gpio_f>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiof";
                 };
                 gpiog: gpio@FF146000 {
                         compatible = "abilis,tb10x-gpio";
@@ -244,9 +250,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF146000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <15>;
-                        gpio-pins = <&pctl_gpio_g>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiog";
                 };
                 gpioh: gpio@FF147000 {
                         compatible = "abilis,tb10x-gpio";
@@ -256,9 +263,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF147000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <18>;
-                        gpio-pins = <&pctl_gpio_h>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioh";
                 };
                 gpioi: gpio@FF148000 {
                         compatible = "abilis,tb10x-gpio";
@@ -268,9 +276,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF148000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <20>;
-                        gpio-pins = <&pctl_gpio_i>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <12>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioi";
                 };
                 gpioj: gpio@FF149000 {
                         compatible = "abilis,tb10x-gpio";
@@ -280,9 +289,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF149000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <32>;
-                        gpio-pins = <&pctl_gpio_j>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <32>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioj";
                 };
                 gpiok: gpio@FF14a000 {
                         compatible = "abilis,tb10x-gpio";
@@ -292,9 +302,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14A000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <64>;
-                        gpio-pins = <&pctl_gpio_k>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <22>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiok";
                 };
                 gpiol: gpio@FF14b000 {
                         compatible = "abilis,tb10x-gpio";
@@ -304,9 +315,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14B000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <86>;
-                        gpio-pins = <&pctl_gpio_l>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <4>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiol";
                 };
                 gpiom: gpio@FF14c000 {
                         compatible = "abilis,tb10x-gpio";
@@ -316,9 +328,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14C000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <90>;
-                        gpio-pins = <&pctl_gpio_m>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <4>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiom";
                 };
                 gpion: gpio@FF14d000 {
                         compatible = "abilis,tb10x-gpio";
@@ -328,9 +341,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14D000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <94>;
-                        gpio-pins = <&pctl_gpio_n>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <5>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpion";
                 };
         };
 };
diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts
index ebc313a9f5b2..3dd6ed941464 100644
--- a/arch/arc/boot/dts/abilis_tb100_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts
@@ -64,62 +64,62 @@
                         compatible = "gpio-leds";
                         power {
                                 label = "Power";
-                                gpios = <&gpioi 0>;
+                                gpios = <&gpioi 0 0>;
                                 linux,default-trigger = "default-on";
                         };
                         heartbeat {
                                 label = "Heartbeat";
-                                gpios = <&gpioi 1>;
+                                gpios = <&gpioi 1 0>;
                                 linux,default-trigger = "heartbeat";
                         };
                         led2 {
                                 label = "LED2";
-                                gpios = <&gpioi 2>;
+                                gpios = <&gpioi 2 0>;
                                 default-state = "off";
                         };
                         led3 {
                                 label = "LED3";
-                                gpios = <&gpioi 3>;
+                                gpios = <&gpioi 3 0>;
                                 default-state = "off";
                         };
                         led4 {
                                 label = "LED4";
-                                gpios = <&gpioi 4>;
+                                gpios = <&gpioi 4 0>;
                                 default-state = "off";
                         };
                         led5 {
                                 label = "LED5";
-                                gpios = <&gpioi 5>;
+                                gpios = <&gpioi 5 0>;
                                 default-state = "off";
                         };
                         led6 {
                                 label = "LED6";
-                                gpios = <&gpioi 6>;
+                                gpios = <&gpioi 6 0>;
                                 default-state = "off";
                         };
                         led7 {
                                 label = "LED7";
-                                gpios = <&gpioi 7>;
+                                gpios = <&gpioi 7 0>;
                                 default-state = "off";
                         };
                         led8 {
                                 label = "LED8";
-                                gpios = <&gpioi 8>;
+                                gpios = <&gpioi 8 0>;
                                 default-state = "off";
                         };
                         led9 {
                                 label = "LED9";
-                                gpios = <&gpioi 9>;
+                                gpios = <&gpioi 9 0>;
                                 default-state = "off";
                         };
                         led10 {
                                 label = "LED10";
-                                gpios = <&gpioi 10>;
+                                gpios = <&gpioi 10 0>;
                                 default-state = "off";
                         };
                         led11 {
                                 label = "LED11";
-                                gpios = <&gpioi 11>;
+                                gpios = <&gpioi 11 0>;
                                 default-state = "off";
                         };
                 };
diff --git a/arch/arc/boot/dts/abilis_tb101.dtsi b/arch/arc/boot/dts/abilis_tb101.dtsi
index da8ca7941e67..b0467229a5c4 100644
--- a/arch/arc/boot/dts/abilis_tb101.dtsi
+++ b/arch/arc/boot/dts/abilis_tb101.dtsi
@@ -43,133 +43,133 @@
                 iomux: iomux@FF10601c {
                         /* Port 1 */
                         pctl_tsin_s0: pctl-tsin-s0 {   /* Serial TS-in 0 */
-                                pingrp = "mis0_pins";
+                                abilis,function = "mis0";
                         };
                         pctl_tsin_s1: pctl-tsin-s1 {   /* Serial TS-in 1 */
-                                pingrp = "mis1_pins";
+                                abilis,function = "mis1";
                         };
                         pctl_gpio_a: pctl-gpio-a {     /* GPIO bank A */
-                                pingrp = "gpioa_pins";
+                                abilis,function = "gpioa";
                         };
                         pctl_tsin_p1: pctl-tsin-p1 {   /* Parallel TS-in 1 */
-                                pingrp = "mip1_pins";
+                                abilis,function = "mip1";
                         };
                         /* Port 2 */
                         pctl_tsin_s2: pctl-tsin-s2 {   /* Serial TS-in 2 */
-                                pingrp = "mis2_pins";
+                                abilis,function = "mis2";
                         };
                         pctl_tsin_s3: pctl-tsin-s3 {   /* Serial TS-in 3 */
-                                pingrp = "mis3_pins";
+                                abilis,function = "mis3";
                         };
                         pctl_gpio_c: pctl-gpio-c {     /* GPIO bank C */
-                                pingrp = "gpioc_pins";
+                                abilis,function = "gpioc";
                         };
                         pctl_tsin_p3: pctl-tsin-p3 {   /* Parallel TS-in 3 */
-                                pingrp = "mip3_pins";
+                                abilis,function = "mip3";
                         };
                         /* Port 3 */
                         pctl_tsin_s4: pctl-tsin-s4 {   /* Serial TS-in 4 */
-                                pingrp = "mis4_pins";
+                                abilis,function = "mis4";
                         };
                         pctl_tsin_s5: pctl-tsin-s5 {   /* Serial TS-in 5 */
-                                pingrp = "mis5_pins";
+                                abilis,function = "mis5";
                         };
                         pctl_gpio_e: pctl-gpio-e {     /* GPIO bank E */
-                                pingrp = "gpioe_pins";
+                                abilis,function = "gpioe";
                         };
                         pctl_tsin_p5: pctl-tsin-p5 {   /* Parallel TS-in 5 */
-                                pingrp = "mip5_pins";
+                                abilis,function = "mip5";
                         };
                         /* Port 4 */
                         pctl_tsin_s6: pctl-tsin-s6 {   /* Serial TS-in 6 */
-                                pingrp = "mis6_pins";
+                                abilis,function = "mis6";
                         };
                         pctl_tsin_s7: pctl-tsin-s7 {   /* Serial TS-in 7 */
-                                pingrp = "mis7_pins";
+                                abilis,function = "mis7";
                         };
                         pctl_gpio_g: pctl-gpio-g {     /* GPIO bank G */
-                                pingrp = "gpiog_pins";
+                                abilis,function = "gpiog";
                         };
                         pctl_tsin_p7: pctl-tsin-p7 {   /* Parallel TS-in 7 */
-                                pingrp = "mip7_pins";
+                                abilis,function = "mip7";
                         };
                         /* Port 5 */
                         pctl_gpio_j: pctl-gpio-j {     /* GPIO bank J */
-                                pingrp = "gpioj_pins";
+                                abilis,function = "gpioj";
                         };
                         pctl_gpio_k: pctl-gpio-k {     /* GPIO bank K */
-                                pingrp = "gpiok_pins";
+                                abilis,function = "gpiok";
                         };
                         pctl_ciplus: pctl-ciplus {     /* CI+ interface */
-                                pingrp = "ciplus_pins";
+                                abilis,function = "ciplus";
                         };
                         pctl_mcard: pctl-mcard {       /* M-Card interface */
-                                pingrp = "mcard_pins";
+                                abilis,function = "mcard";
                         };
                         pctl_stc0: pctl-stc0 {         /* Smart card I/F 0 */
-                                pingrp = "stc0_pins";
+                                abilis,function = "stc0";
                         };
                         pctl_stc1: pctl-stc1 {         /* Smart card I/F 1 */
-                                pingrp = "stc1_pins";
+                                abilis,function = "stc1";
                         };
                         /* Port 6 */
                         pctl_tsout_p: pctl-tsout-p {   /* Parallel TS-out */
-                                pingrp = "mop_pins";
+                                abilis,function = "mop";
                         };
                         pctl_tsout_s0: pctl-tsout-s0 { /* Serial TS-out 0 */
-                                pingrp = "mos0_pins";
+                                abilis,function = "mos0";
                         };
                         pctl_tsout_s1: pctl-tsout-s1 { /* Serial TS-out 1 */
-                                pingrp = "mos1_pins";
+                                abilis,function = "mos1";
                         };
                         pctl_tsout_s2: pctl-tsout-s2 { /* Serial TS-out 2 */
-                                pingrp = "mos2_pins";
+                                abilis,function = "mos2";
                         };
                         pctl_tsout_s3: pctl-tsout-s3 { /* Serial TS-out 3 */
-                                pingrp = "mos3_pins";
+                                abilis,function = "mos3";
                         };
                         /* Port 7 */
                         pctl_uart0: pctl-uart0 {       /* UART 0 */
-                                pingrp = "uart0_pins";
+                                abilis,function = "uart0";
                         };
                         pctl_uart1: pctl-uart1 {       /* UART 1 */
-                                pingrp = "uart1_pins";
+                                abilis,function = "uart1";
                         };
                         pctl_gpio_l: pctl-gpio-l {     /* GPIO bank L */
-                                pingrp = "gpiol_pins";
+                                abilis,function = "gpiol";
                         };
                         pctl_gpio_m: pctl-gpio-m {     /* GPIO bank M */
-                                pingrp = "gpiom_pins";
+                                abilis,function = "gpiom";
                         };
                         /* Port 8 */
                         pctl_spi3: pctl-spi3 {
-                                pingrp = "spi3_pins";
+                                abilis,function = "spi3";
                         };
                         pctl_jtag: pctl-jtag {
-                                pingrp = "jtag_pins";
+                                abilis,function = "jtag";
                         };
                         /* Port 9 */
                         pctl_spi1: pctl-spi1 {
-                                pingrp = "spi1_pins";
+                                abilis,function = "spi1";
                         };
                         pctl_gpio_n: pctl-gpio-n {
-                                pingrp = "gpion_pins";
+                                abilis,function = "gpion";
                         };
                         /* Unmuxed GPIOs */
                         pctl_gpio_b: pctl-gpio-b {
-                                pingrp = "gpiob_pins";
+                                abilis,function = "gpiob";
                         };
                         pctl_gpio_d: pctl-gpio-d {
-                                pingrp = "gpiod_pins";
+                                abilis,function = "gpiod";
                         };
                         pctl_gpio_f: pctl-gpio-f {
-                                pingrp = "gpiof_pins";
+                                abilis,function = "gpiof";
                         };
                         pctl_gpio_h: pctl-gpio-h {
-                                pingrp = "gpioh_pins";
+                                abilis,function = "gpioh";
                         };
                         pctl_gpio_i: pctl-gpio-i {
-                                pingrp = "gpioi_pins";
+                                abilis,function = "gpioi";
                         };
                 };
 
@@ -181,9 +181,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF140000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <0>;
-                        gpio-pins = <&pctl_gpio_a>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioa";
                 };
                 gpiob: gpio@FF141000 {
                         compatible = "abilis,tb10x-gpio";
@@ -193,9 +194,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF141000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <3>;
-                        gpio-pins = <&pctl_gpio_b>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiob";
                 };
                 gpioc: gpio@FF142000 {
                         compatible = "abilis,tb10x-gpio";
@@ -205,9 +207,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF142000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <5>;
-                        gpio-pins = <&pctl_gpio_c>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioc";
                 };
                 gpiod: gpio@FF143000 {
                         compatible = "abilis,tb10x-gpio";
@@ -217,9 +220,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF143000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <8>;
-                        gpio-pins = <&pctl_gpio_d>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiod";
                 };
                 gpioe: gpio@FF144000 {
                         compatible = "abilis,tb10x-gpio";
@@ -229,9 +233,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF144000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <10>;
-                        gpio-pins = <&pctl_gpio_e>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioe";
                 };
                 gpiof: gpio@FF145000 {
                         compatible = "abilis,tb10x-gpio";
@@ -241,9 +246,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF145000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <13>;
-                        gpio-pins = <&pctl_gpio_f>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiof";
                 };
                 gpiog: gpio@FF146000 {
                         compatible = "abilis,tb10x-gpio";
@@ -253,9 +259,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF146000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <15>;
-                        gpio-pins = <&pctl_gpio_g>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <3>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiog";
                 };
                 gpioh: gpio@FF147000 {
                         compatible = "abilis,tb10x-gpio";
@@ -265,9 +272,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF147000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <18>;
-                        gpio-pins = <&pctl_gpio_h>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <2>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioh";
                 };
                 gpioi: gpio@FF148000 {
                         compatible = "abilis,tb10x-gpio";
@@ -277,9 +285,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF148000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <20>;
-                        gpio-pins = <&pctl_gpio_i>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <12>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioi";
                 };
                 gpioj: gpio@FF149000 {
                         compatible = "abilis,tb10x-gpio";
@@ -289,9 +298,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF149000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <32>;
-                        gpio-pins = <&pctl_gpio_j>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <32>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpioj";
                 };
                 gpiok: gpio@FF14a000 {
                         compatible = "abilis,tb10x-gpio";
@@ -301,9 +311,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14A000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <64>;
-                        gpio-pins = <&pctl_gpio_k>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <22>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiok";
                 };
                 gpiol: gpio@FF14b000 {
                         compatible = "abilis,tb10x-gpio";
@@ -313,9 +324,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14B000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <86>;
-                        gpio-pins = <&pctl_gpio_l>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <4>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiol";
                 };
                 gpiom: gpio@FF14c000 {
                         compatible = "abilis,tb10x-gpio";
@@ -325,9 +337,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14C000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <90>;
-                        gpio-pins = <&pctl_gpio_m>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <4>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpiom";
                 };
                 gpion: gpio@FF14d000 {
                         compatible = "abilis,tb10x-gpio";
@@ -337,9 +350,10 @@
                         interrupts = <27 2>;
                         reg = <0xFF14D000 0x1000>;
                         gpio-controller;
-                        #gpio-cells = <1>;
-                        gpio-base  = <94>;
-                        gpio-pins = <&pctl_gpio_n>;
+                        #gpio-cells = <2>;
+                        abilis,ngpio = <5>;
+                        gpio-ranges = <&iomux 0 0 0>;
+                        gpio-ranges-group-names = "gpion";
                 };
         };
 };
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts
index b204657993aa..1cf51c280f28 100644
--- a/arch/arc/boot/dts/abilis_tb101_dvk.dts
+++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts
@@ -64,62 +64,62 @@
                         compatible = "gpio-leds";
                         power {
                                 label = "Power";
-                                gpios = <&gpioi 0>;
+                                gpios = <&gpioi 0 0>;
                                 linux,default-trigger = "default-on";
                         };
                         heartbeat {
                                 label = "Heartbeat";
-                                gpios = <&gpioi 1>;
+                                gpios = <&gpioi 1 0>;
                                 linux,default-trigger = "heartbeat";
                         };
                         led2 {
                                 label = "LED2";
-                                gpios = <&gpioi 2>;
+                                gpios = <&gpioi 2 0>;
                                 default-state = "off";
                         };
                         led3 {
                                 label = "LED3";
-                                gpios = <&gpioi 3>;
+                                gpios = <&gpioi 3 0>;
                                 default-state = "off";
                         };
                         led4 {
                                 label = "LED4";
-                                gpios = <&gpioi 4>;
+                                gpios = <&gpioi 4 0>;
                                 default-state = "off";
                         };
                         led5 {
                                 label = "LED5";
-                                gpios = <&gpioi 5>;
+                                gpios = <&gpioi 5 0>;
                                 default-state = "off";
                         };
                         led6 {
                                 label = "LED6";
-                                gpios = <&gpioi 6>;
+                                gpios = <&gpioi 6 0>;
                                 default-state = "off";
                         };
                         led7 {
                                 label = "LED7";
-                                gpios = <&gpioi 7>;
+                                gpios = <&gpioi 7 0>;
                                 default-state = "off";
                         };
                         led8 {
                                 label = "LED8";
-                                gpios = <&gpioi 8>;
+                                gpios = <&gpioi 8 0>;
                                 default-state = "off";
                         };
                         led9 {
                                 label = "LED9";
-                                gpios = <&gpioi 9>;
+                                gpios = <&gpioi 9 0>;
                                 default-state = "off";
                         };
                         led10 {
                                 label = "LED10";
-                                gpios = <&gpioi 10>;
+                                gpios = <&gpioi 10 0>;
                                 default-state = "off";
                         };
                         led11 {
                                 label = "LED11";
-                                gpios = <&gpioi 11>;
+                                gpios = <&gpioi 11 0>;
                                 default-state = "off";
                         };
                 };
diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi
index edf56f4749e1..a098d7c05e96 100644
--- a/arch/arc/boot/dts/abilis_tb10x.dtsi
+++ b/arch/arc/boot/dts/abilis_tb10x.dtsi
@@ -62,9 +62,8 @@
                 };
 
                 iomux: iomux@FF10601c {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
                         compatible = "abilis,tb10x-iomux";
+                        #gpio-range-cells = <3>;
                         reg = <0xFF10601c 0x4>;
                 };
 
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index 4fb2d6f655bd..bcf662d21a57 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -67,5 +67,9 @@
                                 reg = <1>;
                         };
                 };
+
+                arcpmu0: pmu {
+                        compatible = "snps,arc700-pmu";
+                };
         };
 };
diff --git a/arch/arc/configs/fpga_noramfs_defconfig b/arch/arc/configs/fpga_noramfs_defconfig
new file mode 100644
index 000000000000..5276a52f6a2f
--- /dev/null
+++ b/arch/arc/configs/fpga_noramfs_defconfig
@@ -0,0 +1,64 @@
+CONFIG_CROSS_COMPILE="arc-linux-uclibc-"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DEFAULT_HOSTNAME="ARCLinux"
+# CONFIG_SWAP is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_PID_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KPROBES=y
+CONFIG_MODULES=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARC_PLAT_FPGA_LEGACY=y
+CONFIG_ARC_BOARD_ML509=y
+# CONFIG_ARC_HAS_RTSC is not set
+CONFIG_ARC_BUILTIN_DTB_NAME="angel4"
+CONFIG_PREEMPT=y
+# CONFIG_COMPACTION is not set
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+# CONFIG_IPV6 is not set
+# CONFIG_STANDALONE is not set
+# CONFIG_PREVENT_FIRMWARE_BUILD is not set
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_BLK_DEV is not set
+CONFIG_NETDEVICES=y
+CONFIG_ARC_EMAC=y
+CONFIG_LXT_PHY=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_ARC=y
+CONFIG_SERIAL_ARC_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_HID is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_TMPFS=y
+# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NFS_FS=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_XZ_DEC=y
diff --git a/arch/arc/include/asm/perf_event.h b/arch/arc/include/asm/perf_event.h
index 115ad96480e6..cbf755e32a03 100644
--- a/arch/arc/include/asm/perf_event.h
+++ b/arch/arc/include/asm/perf_event.h
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2011-2012 Synopsys, Inc. (www.synopsys.com)
+ * Linux performance counter support for ARC
+ *
+ * Copyright (C) 2011-2013 Synopsys, Inc. (www.synopsys.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
@@ -10,4 +12,204 @@
 #ifndef __ASM_PERF_EVENT_H
 #define __ASM_PERF_EVENT_H
 
+/* real maximum varies per CPU, this is the maximum supported by the driver */
+#define ARC_PMU_MAX_HWEVENTS    64
+
+#define ARC_REG_CC_BUILD        0xF6
+#define ARC_REG_CC_INDEX        0x240
+#define ARC_REG_CC_NAME0        0x241
+#define ARC_REG_CC_NAME1        0x242
+
+#define ARC_REG_PCT_BUILD       0xF5
+#define ARC_REG_PCT_COUNTL      0x250
+#define ARC_REG_PCT_COUNTH      0x251
+#define ARC_REG_PCT_SNAPL       0x252
+#define ARC_REG_PCT_SNAPH       0x253
+#define ARC_REG_PCT_CONFIG      0x254
+#define ARC_REG_PCT_CONTROL     0x255
+#define ARC_REG_PCT_INDEX       0x256
+
+#define ARC_REG_PCT_CONTROL_CC  (1 << 16)       /* clear counts */
+#define ARC_REG_PCT_CONTROL_SN  (1 << 17)       /* snapshot */
+
+struct arc_reg_pct_build {
+#ifdef CONFIG_CPU_BIG_ENDIAN
+        unsigned int m:8, c:8, r:6, s:2, v:8;
+#else
+        unsigned int v:8, s:2, r:6, c:8, m:8;
+#endif
+};
+
+struct arc_reg_cc_build {
+#ifdef CONFIG_CPU_BIG_ENDIAN
+        unsigned int c:16, r:8, v:8;
+#else
+        unsigned int v:8, r:8, c:16;
+#endif
+};
+
+#define PERF_COUNT_ARC_DCLM     (PERF_COUNT_HW_MAX + 0)
+#define PERF_COUNT_ARC_DCSM     (PERF_COUNT_HW_MAX + 1)
+#define PERF_COUNT_ARC_ICM      (PERF_COUNT_HW_MAX + 2)
+#define PERF_COUNT_ARC_BPOK     (PERF_COUNT_HW_MAX + 3)
+#define PERF_COUNT_ARC_EDTLB    (PERF_COUNT_HW_MAX + 4)
+#define PERF_COUNT_ARC_EITLB    (PERF_COUNT_HW_MAX + 5)
+#define PERF_COUNT_ARC_HW_MAX   (PERF_COUNT_HW_MAX + 6)
+
+/*
+ * The "generalized" performance events seem to really be a copy
+ * of the available events on x86 processors; the mapping to ARC
+ * events is not always possible 1-to-1. Fortunately, there doesn't
+ * seem to be an exact definition for these events, so we can cheat
+ * a bit where necessary.
+ *
+ * In particular, the following PERF events may behave a bit differently
+ * compared to other architectures:
+ *
+ * PERF_COUNT_HW_CPU_CYCLES
+ *      Cycles not in halted state
+ *
+ * PERF_COUNT_HW_REF_CPU_CYCLES
+ *      Reference cycles not in halted state, same as PERF_COUNT_HW_CPU_CYCLES
+ *      for now as we don't do Dynamic Voltage/Frequency Scaling (yet)
+ *
+ * PERF_COUNT_HW_BUS_CYCLES
+ *      Unclear what this means, Intel uses 0x013c, which according to
+ *      their datasheet means "unhalted reference cycles". It sounds similar
+ *      to PERF_COUNT_HW_REF_CPU_CYCLES, and we use the same counter for it.
+ *
+ * PERF_COUNT_HW_STALLED_CYCLES_BACKEND
+ * PERF_COUNT_HW_STALLED_CYCLES_FRONTEND
+ *      The ARC 700 can either measure stalls per pipeline stage, or all stalls
+ *      combined; for now we assign all stalls to STALLED_CYCLES_BACKEND
+ *      and all pipeline flushes (e.g. caused by mispredicts, etc.) to
+ *      STALLED_CYCLES_FRONTEND.
+ *
+ *      We could start multiple performance counters and combine everything
+ *      afterwards, but that makes it complicated.
+ *
+ *      Note that I$ cache misses aren't counted by either of the two!
+ */
+
+static const char * const arc_pmu_ev_hw_map[] = {
+        [PERF_COUNT_HW_CPU_CYCLES] = "crun",
+        [PERF_COUNT_HW_REF_CPU_CYCLES] = "crun",
+        [PERF_COUNT_HW_BUS_CYCLES] = "crun",
+        [PERF_COUNT_HW_INSTRUCTIONS] = "iall",
+        [PERF_COUNT_HW_BRANCH_MISSES] = "bpfail",
+        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = "ijmp",
+        [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = "bflush",
+        [PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = "bstall",
+        [PERF_COUNT_ARC_DCLM] = "dclm",
+        [PERF_COUNT_ARC_DCSM] = "dcsm",
+        [PERF_COUNT_ARC_ICM] = "icm",
+        [PERF_COUNT_ARC_BPOK] = "bpok",
+        [PERF_COUNT_ARC_EDTLB] = "edtlb",
+        [PERF_COUNT_ARC_EITLB] = "eitlb",
+};
+
+#define C(_x)                   PERF_COUNT_HW_CACHE_##_x
+#define CACHE_OP_UNSUPPORTED    0xffff
+
+static const unsigned arc_pmu_cache_map[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
+        [C(L1D)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = PERF_COUNT_ARC_DCLM,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = PERF_COUNT_ARC_DCSM,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+        [C(L1I)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = PERF_COUNT_ARC_ICM,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+        [C(LL)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+        [C(DTLB)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = PERF_COUNT_ARC_EDTLB,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+        [C(ITLB)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = PERF_COUNT_ARC_EITLB,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+        [C(BPU)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = PERF_COUNT_HW_BRANCH_INSTRUCTIONS,
+                        [C(RESULT_MISS)]        = PERF_COUNT_HW_BRANCH_MISSES,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+        [C(NODE)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)]      = CACHE_OP_UNSUPPORTED,
+                        [C(RESULT_MISS)]        = CACHE_OP_UNSUPPORTED,
+                },
+        },
+};
+
 #endif /* __ASM_PERF_EVENT_H */
diff --git a/arch/arc/include/asm/thread_info.h b/arch/arc/include/asm/thread_info.h
index 2d50a4cdd7f3..45be21672011 100644
--- a/arch/arc/include/asm/thread_info.h
+++ b/arch/arc/include/asm/thread_info.h
@@ -80,8 +80,6 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)
 
 #endif /* !__ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE      0x10000000
-
 /*
  * thread information flags
  * - these are process state flags that various assembly files may need to
diff --git a/arch/arc/kernel/Makefile b/arch/arc/kernel/Makefile
index c242ef07ba70..8004b4fa6461 100644
--- a/arch/arc/kernel/Makefile
+++ b/arch/arc/kernel/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_KPROBES)      		+= kprobes.o
 obj-$(CONFIG_ARC_MISALIGN_ACCESS)       += unaligned.o
 obj-$(CONFIG_KGDB)                      += kgdb.o
 obj-$(CONFIG_ARC_METAWARE_HLINK)        += arc_hostlink.o
+obj-$(CONFIG_PERF_EVENTS)               += perf_event.o
 
 obj-$(CONFIG_ARC_FPU_SAVE_RESTORE)      += fpu.o
 CFLAGS_fpu.o   += -mdpfp
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
new file mode 100644
index 000000000000..e46d81f70979
--- /dev/null
+++ b/arch/arc/kernel/perf_event.c
@@ -0,0 +1,326 @@
+/*
+ * Linux performance counter support for ARC700 series
+ *
+ * Copyright (C) 2013 Synopsys, Inc. (www.synopsys.com)
+ *
+ * This code is inspired by the perf support of various other architectures.
+ *
+ * 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/errno.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/perf_event.h>
+#include <linux/platform_device.h>
+#include <asm/arcregs.h>
+
+struct arc_pmu {
+        struct pmu      pmu;
+        int             counter_size;   /* in bits */
+        int             n_counters;
+        unsigned long   used_mask[BITS_TO_LONGS(ARC_PMU_MAX_HWEVENTS)];
+        int             ev_hw_idx[PERF_COUNT_ARC_HW_MAX];
+};
+
+/* read counter #idx; note that counter# != event# on ARC! */
+static uint64_t arc_pmu_read_counter(int idx)
+{
+        uint32_t tmp;
+        uint64_t result;
+
+        /*
+         * ARC supports making 'snapshots' of the counters, so we don't
+         * need to care about counters wrapping to 0 underneath our feet
+         */
+        write_aux_reg(ARC_REG_PCT_INDEX, idx);
+        tmp = read_aux_reg(ARC_REG_PCT_CONTROL);
+        write_aux_reg(ARC_REG_PCT_CONTROL, tmp | ARC_REG_PCT_CONTROL_SN);
+        result = (uint64_t) (read_aux_reg(ARC_REG_PCT_SNAPH)) << 32;
+        result |= read_aux_reg(ARC_REG_PCT_SNAPL);
+
+        return result;
+}
+
+static void arc_perf_event_update(struct perf_event *event,
+                                  struct hw_perf_event *hwc, int idx)
+{
+        struct arc_pmu *arc_pmu = container_of(event->pmu, struct arc_pmu, pmu);
+        uint64_t prev_raw_count, new_raw_count;
+        int64_t delta;
+
+        do {
+                prev_raw_count = local64_read(&hwc->prev_count);
+                new_raw_count = arc_pmu_read_counter(idx);
+        } while (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
+                                 new_raw_count) != prev_raw_count);
+
+        delta = (new_raw_count - prev_raw_count) &
+                ((1ULL << arc_pmu->counter_size) - 1ULL);
+
+        local64_add(delta, &event->count);
+        local64_sub(delta, &hwc->period_left);
+}
+
+static void arc_pmu_read(struct perf_event *event)
+{
+        arc_perf_event_update(event, &event->hw, event->hw.idx);
+}
+
+static int arc_pmu_cache_event(u64 config)
+{
+        unsigned int cache_type, cache_op, cache_result;
+        int ret;
+
+        cache_type      = (config >>  0) & 0xff;
+        cache_op        = (config >>  8) & 0xff;
+        cache_result    = (config >> 16) & 0xff;
+        if (cache_type >= PERF_COUNT_HW_CACHE_MAX)
+                return -EINVAL;
+        if (cache_type >= PERF_COUNT_HW_CACHE_OP_MAX)
+                return -EINVAL;
+        if (cache_type >= PERF_COUNT_HW_CACHE_RESULT_MAX)
+                return -EINVAL;
+
+        ret = arc_pmu_cache_map[cache_type][cache_op][cache_result];
+
+        if (ret == CACHE_OP_UNSUPPORTED)
+                return -ENOENT;
+
+        return ret;
+}
+
+/* initializes hw_perf_event structure if event is supported */
+static int arc_pmu_event_init(struct perf_event *event)
+{
+        struct arc_pmu *arc_pmu = container_of(event->pmu, struct arc_pmu, pmu);
+        struct hw_perf_event *hwc = &event->hw;
+        int ret;
+
+        /* ARC 700 PMU does not support sampling events */
+        if (is_sampling_event(event))
+                return -ENOENT;
+
+        switch (event->attr.type) {
+        case PERF_TYPE_HARDWARE:
+                if (event->attr.config >= PERF_COUNT_HW_MAX)
+                        return -ENOENT;
+                if (arc_pmu->ev_hw_idx[event->attr.config] < 0)
+                        return -ENOENT;
+                hwc->config = arc_pmu->ev_hw_idx[event->attr.config];
+                pr_debug("initializing event %d with cfg %d\n",
+                         (int) event->attr.config, (int) hwc->config);
+                return 0;
+        case PERF_TYPE_HW_CACHE:
+                ret = arc_pmu_cache_event(event->attr.config);
+                if (ret < 0)
+                        return ret;
+                hwc->config = arc_pmu->ev_hw_idx[ret];
+                return 0;
+        default:
+                return -ENOENT;
+        }
+}
+
+/* starts all counters */
+static void arc_pmu_enable(struct pmu *pmu)
+{
+        uint32_t tmp;
+        tmp = read_aux_reg(ARC_REG_PCT_CONTROL);
+        write_aux_reg(ARC_REG_PCT_CONTROL, (tmp & 0xffff0000) | 0x1);
+}
+
+/* stops all counters */
+static void arc_pmu_disable(struct pmu *pmu)
+{
+        uint32_t tmp;
+        tmp = read_aux_reg(ARC_REG_PCT_CONTROL);
+        write_aux_reg(ARC_REG_PCT_CONTROL, (tmp & 0xffff0000) | 0x0);
+}
+
+/*
+ * Assigns hardware counter to hardware condition.
+ * Note that there is no separate start/stop mechanism;
+ * stopping is achieved by assigning the 'never' condition
+ */
+static void arc_pmu_start(struct perf_event *event, int flags)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        int idx = hwc->idx;
+
+        if (WARN_ON_ONCE(idx == -1))
+                return;
+
+        if (flags & PERF_EF_RELOAD)
+                WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
+
+        event->hw.state = 0;
+
+        /* enable ARC pmu here */
+        write_aux_reg(ARC_REG_PCT_INDEX, idx);
+        write_aux_reg(ARC_REG_PCT_CONFIG, hwc->config);
+}
+
+static void arc_pmu_stop(struct perf_event *event, int flags)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        int idx = hwc->idx;
+
+        if (!(event->hw.state & PERF_HES_STOPPED)) {
+                /* stop ARC pmu here */
+                write_aux_reg(ARC_REG_PCT_INDEX, idx);
+
+                /* condition code #0 is always "never" */
+                write_aux_reg(ARC_REG_PCT_CONFIG, 0);
+
+                event->hw.state |= PERF_HES_STOPPED;
+        }
+
+        if ((flags & PERF_EF_UPDATE) &&
+            !(event->hw.state & PERF_HES_UPTODATE)) {
+                arc_perf_event_update(event, &event->hw, idx);
+                event->hw.state |= PERF_HES_UPTODATE;
+        }
+}
+
+static void arc_pmu_del(struct perf_event *event, int flags)
+{
+        struct arc_pmu *arc_pmu = container_of(event->pmu, struct arc_pmu, pmu);
+
+        arc_pmu_stop(event, PERF_EF_UPDATE);
+        __clear_bit(event->hw.idx, arc_pmu->used_mask);
+
+        perf_event_update_userpage(event);
+}
+
+/* allocate hardware counter and optionally start counting */
+static int arc_pmu_add(struct perf_event *event, int flags)
+{
+        struct arc_pmu *arc_pmu = container_of(event->pmu, struct arc_pmu, pmu);
+        struct hw_perf_event *hwc = &event->hw;
+        int idx = hwc->idx;
+
+        if (__test_and_set_bit(idx, arc_pmu->used_mask)) {
+                idx = find_first_zero_bit(arc_pmu->used_mask,
+                                          arc_pmu->n_counters);
+                if (idx == arc_pmu->n_counters)
+                        return -EAGAIN;
+
+                __set_bit(idx, arc_pmu->used_mask);
+                hwc->idx = idx;
+        }
+
+        write_aux_reg(ARC_REG_PCT_INDEX, idx);
+        write_aux_reg(ARC_REG_PCT_CONFIG, 0);
+        write_aux_reg(ARC_REG_PCT_COUNTL, 0);
+        write_aux_reg(ARC_REG_PCT_COUNTH, 0);
+        local64_set(&hwc->prev_count, 0);
+
+        hwc->state = PERF_HES_UPTODATE | PERF_HES_STOPPED;
+        if (flags & PERF_EF_START)
+                arc_pmu_start(event, PERF_EF_RELOAD);
+
+        perf_event_update_userpage(event);
+
+        return 0;
+}
+
+static int arc_pmu_device_probe(struct platform_device *pdev)
+{
+        struct arc_pmu *arc_pmu;
+        struct arc_reg_pct_build pct_bcr;
+        struct arc_reg_cc_build cc_bcr;
+        int i, j, ret;
+
+        union cc_name {
+                struct {
+                        uint32_t word0, word1;
+                        char sentinel;
+                } indiv;
+                char str[9];
+        } cc_name;
+
+
+        READ_BCR(ARC_REG_PCT_BUILD, pct_bcr);
+        if (!pct_bcr.v) {
+                pr_err("This core does not have performance counters!\n");
+                return -ENODEV;
+        }
+
+        arc_pmu = devm_kzalloc(&pdev->dev, sizeof(struct arc_pmu),
+                               GFP_KERNEL);
+        if (!arc_pmu)
+                return -ENOMEM;
+
+        arc_pmu->n_counters = pct_bcr.c;
+        BUG_ON(arc_pmu->n_counters > ARC_PMU_MAX_HWEVENTS);
+
+        arc_pmu->counter_size = 32 + (pct_bcr.s << 4);
+        pr_info("ARC PMU found with %d counters of size %d bits\n",
+                arc_pmu->n_counters, arc_pmu->counter_size);
+
+        READ_BCR(ARC_REG_CC_BUILD, cc_bcr);
+
+        if (!cc_bcr.v)
+                pr_err("Strange! Performance counters exist, but no countable conditions?\n");
+
+        pr_info("ARC PMU has %d countable conditions\n", cc_bcr.c);
+
+        cc_name.str[8] = 0;
+        for (i = 0; i < PERF_COUNT_HW_MAX; i++)
+                arc_pmu->ev_hw_idx[i] = -1;
+
+        for (j = 0; j < cc_bcr.c; j++) {
+                write_aux_reg(ARC_REG_CC_INDEX, j);
+                cc_name.indiv.word0 = read_aux_reg(ARC_REG_CC_NAME0);
+                cc_name.indiv.word1 = read_aux_reg(ARC_REG_CC_NAME1);
+                for (i = 0; i < ARRAY_SIZE(arc_pmu_ev_hw_map); i++) {
+                        if (arc_pmu_ev_hw_map[i] &&
+                            !strcmp(arc_pmu_ev_hw_map[i], cc_name.str) &&
+                            strlen(arc_pmu_ev_hw_map[i])) {
+                                pr_debug("mapping %d to idx %d with name %s\n",
+                                         i, j, cc_name.str);
+                                arc_pmu->ev_hw_idx[i] = j;
+                        }
+                }
+        }
+
+        arc_pmu->pmu = (struct pmu) {
+                .pmu_enable     = arc_pmu_enable,
+                .pmu_disable    = arc_pmu_disable,
+                .event_init     = arc_pmu_event_init,
+                .add            = arc_pmu_add,
+                .del            = arc_pmu_del,
+                .start          = arc_pmu_start,
+                .stop           = arc_pmu_stop,
+                .read           = arc_pmu_read,
+        };
+
+        ret = perf_pmu_register(&arc_pmu->pmu, pdev->name, PERF_TYPE_RAW);
+
+        return ret;
+}
+
+#ifdef CONFIG_OF
+static const struct of_device_id arc_pmu_match[] = {
+        { .compatible = "snps,arc700-pmu" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, arc_pmu_match);
+#endif
+
+static struct platform_driver arc_pmu_driver = {
+        .driver = {
+                .name           = "arc700-pmu",
+                .of_match_table = of_match_ptr(arc_pmu_match),
+        },
+        .probe          = arc_pmu_device_probe,
+};
+
+module_platform_driver(arc_pmu_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mischa Jonker <mjonker@synopsys.com>");
+MODULE_DESCRIPTION("ARC PMU driver");
diff --git a/arch/arc/plat-tb10x/Kconfig b/arch/arc/plat-tb10x/Kconfig
index 1ab386bb5da8..6994c188dc88 100644
--- a/arch/arc/plat-tb10x/Kconfig
+++ b/arch/arc/plat-tb10x/Kconfig
@@ -20,8 +20,10 @@ menuconfig ARC_PLAT_TB10X
         bool "Abilis TB10x"
         select COMMON_CLK
         select PINCTRL
+        select PINCTRL_TB10X
         select PINMUX
         select ARCH_REQUIRE_GPIOLIB
+        select GPIO_TB10X
         select TB10X_IRQC
         help
           Support for platforms based on the TB10x home media gateway SOC by
diff --git a/arch/arm/boot/dts/ecx-2000.dts b/arch/arm/boot/dts/ecx-2000.dts
index 139b40cc3a23..2ccbb57fbfa8 100644
--- a/arch/arm/boot/dts/ecx-2000.dts
+++ b/arch/arm/boot/dts/ecx-2000.dts
@@ -85,6 +85,12 @@
                                 <1 10 0xf08>;
                 };
 
+                memory-controller@fff00000 {
+                        compatible = "calxeda,ecx-2000-ddr-ctrl";
+                        reg = <0xfff00000 0x1000>;
+                        interrupts = <0 91 4>;
+                };
+
                 intc: interrupt-controller@fff11000 {
                         compatible = "arm,cortex-a15-gic";
                         #interrupt-cells = <3>;
diff --git a/arch/arm/boot/dts/ecx-common.dtsi b/arch/arm/boot/dts/ecx-common.dtsi
index bc22557d7a6a..b90045a8f8e3 100644
--- a/arch/arm/boot/dts/ecx-common.dtsi
+++ b/arch/arm/boot/dts/ecx-common.dtsi
@@ -53,12 +53,6 @@
                         status = "disabled";
                 };
 
-                memory-controller@fff00000 {
-                        compatible = "calxeda,hb-ddr-ctrl";
-                        reg = <0xfff00000 0x1000>;
-                        interrupts = <0 91 4>;
-                };
-
                 ipc@fff20000 {
                         compatible = "arm,pl320", "arm,primecell";
                         reg = <0xfff20000 0x1000>;
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index 6aad34ad9517..ed14aeac0566 100644
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -86,6 +86,12 @@
         soc {
                 ranges = <0x00000000 0x00000000 0xffffffff>;
 
+                memory-controller@fff00000 {
+                        compatible = "calxeda,hb-ddr-ctrl";
+                        reg = <0xfff00000 0x1000>;
+                        interrupts = <0 91 4>;
+                };
+
                 timer@fff10600 {
                         compatible = "arm,cortex-a9-twd-timer";
                         reg = <0xfff10600 0x20>;
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index fb1b2ec8eaa9..4217096ee677 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -19,6 +19,12 @@
                 interrupts = <11>;
         };
 
+        charger: bci {
+                compatible = "ti,twl4030-bci";
+                interrupts = <9>, <2>;
+                bci3v1-supply = <&vusb3v1>;
+        };
+
         watchdog {
                 compatible = "ti,twl4030-wdt";
         };
diff --git a/arch/arm/configs/prima2_defconfig b/arch/arm/configs/prima2_defconfig
index 002a1ceadceb..23591dba47a0 100644
--- a/arch/arm/configs/prima2_defconfig
+++ b/arch/arm/configs/prima2_defconfig
@@ -39,6 +39,7 @@ CONFIG_SPI=y
 CONFIG_SPI_SIRF=y
 CONFIG_SPI_SPIDEV=y
 # CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_MMC=y
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index df5e13d64f2c..71a06b293489 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -141,12 +141,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
 #endif
 
 /*
- * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See <asm/hardirq.h>.
- */
-#define PREEMPT_ACTIVE  0x40000000
-
-/*
  * thread information flags:
  *  TIF_SYSCALL_TRACE   - syscall trace active
  *  TIF_SYSCAL_AUDIT    - syscall auditing active
diff --git a/arch/arm/mach-at91/board-sam9260ek.c b/arch/arm/mach-at91/board-sam9260ek.c
index 0b153c87521d..f4f8735315da 100644
--- a/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@ -28,7 +28,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/at73c213.h>
 #include <linux/clk.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index 8b4942cbb6d9..2f931915c80c 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -27,7 +27,7 @@
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/fb.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 40f15f133c55..d1f45af7a530 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pcf857x.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index df16cb88a26b..e0af0eccde8f 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/input.h>
 #include <linux/input/tps6507x-ts.h>
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index f4a6c18912ea..e08a8684ead2 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -18,7 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/leds.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 9cc32c283b8b..987605b78556 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -15,7 +15,7 @@
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pcf857x.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 44b20191a9fe..13d0801fd6b1 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -22,7 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/i2c/pcf857x.h>
 
 #include <media/tvp514x.h>
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index cd0f58730c2b..7aa105b1fd0f 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -15,7 +15,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/regulator/machine.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/etherdevice.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index d84360148100..41c7c9615791 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -26,7 +26,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 19bb6441a7d4..c5f95674e9b7 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/dma-mapping.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index 45303bd62902..639a3dfb0092 100644
--- a/arch/arm/mach-imx/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -23,7 +23,7 @@
 #include <linux/smsc911x.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/delay.h>
 #include <linux/spi/spi.h>
 #include <linux/irq.h>
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index e805ac273e9c..592ddbe031ac 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -18,7 +18,7 @@
  */
 
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/io.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c
index b726cb1c5fdd..ac504b67326b 100644
--- a/arch/arm/mach-imx/mach-pcm043.c
+++ b/arch/arm/mach-imx/mach-pcm043.c
@@ -24,7 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
 
diff --git a/arch/arm/mach-imx/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index 0910761e8280..8825d1217d18 100644
--- a/arch/arm/mach-imx/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -29,7 +29,7 @@
 #include <asm/mach/time.h>
 
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/mfd/mc13xxx.h>
 
 #include "common.h"
diff --git a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
index 489495976fcd..8e3e4331c380 100644
--- a/arch/arm/mach-kirkwood/lacie_v2-common.c
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c
@@ -12,7 +12,7 @@
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/gpio.h>
 #include <asm/mach/time.h>
 #include <mach/kirkwood.h>
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index a7ce69286688..d68909b095f1 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -300,7 +300,7 @@ static struct omap_lcd_config osk_lcd_config __initdata = {
 #ifdef  CONFIG_OMAP_OSK_MISTRAL
 
 #include <linux/input.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 33d159e2386e..8dd0ec858cf1 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -25,7 +25,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
 
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/i2c/twl.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 87e41a8b8d46..f7808349a734 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -20,7 +20,7 @@
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/input.h>
 #include <linux/err.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index ba8342fef799..119efaf5808a 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -32,7 +32,7 @@
 #include <linux/spi/spi.h>
 #include <linux/interrupt.h>
 #include <linux/smsc911x.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/usb/phy.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c
index 62aea3e835f3..01de542432a6 100644
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@ -27,7 +27,7 @@
 
 #include <linux/i2c/pxa-i2c.h>
 #include <linux/i2c/pcf857x.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/smc91x.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index a83db46320bc..4a18d49a63e0 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -24,7 +24,7 @@
 #include <linux/io.h>
 #include <linux/serial_core.h>
 #include <linux/dm9000.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 #include <linux/platform_device.h>
 #include <linux/gpio_keys.h>
 #include <linux/i2c.h>
diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
index 23a3c4791d86..720e70b66ffd 100644
--- a/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@@ -89,12 +89,6 @@ static inline struct thread_info *current_thread_info(void)
 #endif
 
 /*
- * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See <asm/hardirq.h>.
- */
-#define PREEMPT_ACTIVE  0x40000000
-
-/*
  * thread information flags:
  *  TIF_SYSCALL_TRACE   - syscall trace active
  *  TIF_SIGPENDING      - signal pending
diff --git a/arch/avr32/include/asm/thread_info.h b/arch/avr32/include/asm/thread_info.h
index 6dc62e1f94c7..a978f3fe7c25 100644
--- a/arch/avr32/include/asm/thread_info.h
+++ b/arch/avr32/include/asm/thread_info.h
@@ -66,8 +66,6 @@ static inline struct thread_info *current_thread_info(void)
 
 #endif /* !__ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE          0x40000000
-
 /*
  * Thread information flags
  * - these are process state flags that various assembly files may need to access
diff --git a/arch/blackfin/include/asm/hardirq.h b/arch/blackfin/include/asm/hardirq.h
index c078dd78d998..58b54a6d5a16 100644
--- a/arch/blackfin/include/asm/hardirq.h
+++ b/arch/blackfin/include/asm/hardirq.h
@@ -12,9 +12,6 @@
 extern void ack_bad_irq(unsigned int irq);
 #define ack_bad_irq ack_bad_irq
 
-/* Define until common code gets sane defaults */
-#define HARDIRQ_BITS 9
-
 #include <asm-generic/hardirq.h>
 
 #endif
diff --git a/arch/blackfin/include/asm/thread_info.h b/arch/blackfin/include/asm/thread_info.h
index 3894005337ba..55f473bdad36 100644
--- a/arch/blackfin/include/asm/thread_info.h
+++ b/arch/blackfin/include/asm/thread_info.h
@@ -88,8 +88,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TI_CPU          12
 #define TI_PREEMPT      16
 
-#define PREEMPT_ACTIVE  0x4000000
-
 /*
  * thread information flag bit numbers
  */
diff --git a/arch/c6x/include/asm/thread_info.h b/arch/c6x/include/asm/thread_info.h
index 4c8dc562bd90..d4e9ef87076d 100644
--- a/arch/c6x/include/asm/thread_info.h
+++ b/arch/c6x/include/asm/thread_info.h
@@ -84,8 +84,6 @@ struct thread_info *current_thread_info(void)
 #define put_thread_info(ti)     put_task_struct((ti)->task)
 #endif /* __ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE  0x10000000
-
 /*
  * thread information flag bit numbers
  * - pending work-to-be-done flags are in LSW
diff --git a/arch/cris/include/asm/hardirq.h b/arch/cris/include/asm/hardirq.h
index 17bb12d760b2..04126f7bfab2 100644
--- a/arch/cris/include/asm/hardirq.h
+++ b/arch/cris/include/asm/hardirq.h
@@ -2,18 +2,6 @@
 #define __ASM_HARDIRQ_H
 
 #include <asm/irq.h>
-
-#define HARDIRQ_BITS    8
-
-/*
- * The hardirq mask has to be large enough to have
- * space for potentially all IRQ sources in the system
- * nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 #include <asm-generic/hardirq.h>
 
 #endif /* __ASM_HARDIRQ_H */
diff --git a/arch/cris/include/asm/thread_info.h b/arch/cris/include/asm/thread_info.h
index 07c8c40c52b3..55dede18c032 100644
--- a/arch/cris/include/asm/thread_info.h
+++ b/arch/cris/include/asm/thread_info.h
@@ -44,8 +44,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * macros/functions for gaining access to the thread information structure
  */
diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h
index bebd7eadc772..af29e17c0181 100644
--- a/arch/frv/include/asm/thread_info.h
+++ b/arch/frv/include/asm/thread_info.h
@@ -52,8 +52,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * macros/functions for gaining access to the thread information structure
  */
diff --git a/arch/hexagon/include/asm/thread_info.h b/arch/hexagon/include/asm/thread_info.h
index f7c32406a711..a59dad3b3695 100644
--- a/arch/hexagon/include/asm/thread_info.h
+++ b/arch/hexagon/include/asm/thread_info.h
@@ -73,10 +73,6 @@ struct thread_info {
 
 #endif  /* __ASSEMBLY__  */
 
-/*  looks like "linux/hardirq.h" uses this.  */
-
-#define PREEMPT_ACTIVE          0x10000000
-
 #ifndef __ASSEMBLY__
 
 #define INIT_THREAD_INFO(tsk)                   \
diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h
index cade13dd0299..5957cf61f898 100644
--- a/arch/ia64/include/asm/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
@@ -11,9 +11,6 @@
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 
-#define PREEMPT_ACTIVE_BIT 30
-#define PREEMPT_ACTIVE  (1 << PREEMPT_ACTIVE_BIT)
-
 #ifndef __ASSEMBLY__
 
 /*
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 7a53530f22c2..ddea607f948a 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1169,21 +1169,8 @@ skip_rbs_switch:
 .work_pending:
         tbit.z p6,p0=r31,TIF_NEED_RESCHED       // is resched not needed?
 (p6)    br.cond.sptk.few .notify
-#ifdef CONFIG_PREEMPT
-(pKStk) dep r21=-1,r0,PREEMPT_ACTIVE_BIT,1
-        ;;
-(pKStk) st4 [r20]=r21
-#endif
-        SSM_PSR_I(p0, p6, r2)   // enable interrupts
-        br.call.spnt.many rp=schedule
+        br.call.spnt.many rp=preempt_schedule_irq
 .ret9:  cmp.eq p6,p0=r0,r0      // p6 <- 1 (re-check)
-        RSM_PSR_I(p0, r2, r20)  // disable interrupts
-        ;;
-#ifdef CONFIG_PREEMPT
-(pKStk) adds r20=TI_PRE_COUNT+IA64_TASK_SIZE,r13
-        ;;
-(pKStk) st4 [r20]=r0            // preempt_count() <- 0
-#endif
 (pLvSys)br.cond.sptk.few  __paravirt_pending_syscall_end
         br.cond.sptk.many .work_processed_kernel
 
diff --git a/arch/m32r/include/asm/hardirq.h b/arch/m32r/include/asm/hardirq.h
index 4c31c0ae215e..5f2ac4f64ddf 100644
--- a/arch/m32r/include/asm/hardirq.h
+++ b/arch/m32r/include/asm/hardirq.h
@@ -3,22 +3,6 @@
 #define __ASM_HARDIRQ_H
 
 #include <asm/irq.h>
-
-#if NR_IRQS > 256
-#define HARDIRQ_BITS    9
-#else
-#define HARDIRQ_BITS    8
-#endif
-
-/*
- * The hardirq mask has to be large enough to have
- * space for potentially all IRQ sources in the system
- * nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 #include <asm-generic/hardirq.h>
 
 #endif /* __ASM_HARDIRQ_H */
diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h
index c074f4c2e858..00171703402f 100644
--- a/arch/m32r/include/asm/thread_info.h
+++ b/arch/m32r/include/asm/thread_info.h
@@ -53,8 +53,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #define THREAD_SIZE             (PAGE_SIZE << 1)
 #define THREAD_SIZE_ORDER       1
 /*
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 0c01543f10cd..7c3db9940ce1 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -182,13 +182,7 @@ need_resched:
         ld      r4, PSW(sp)             ; interrupts off (exception path) ?
         and3    r4, r4, #0x4000
         beqz    r4, restore_all
-        LDIMM   (r4, PREEMPT_ACTIVE)
-        st      r4, @(TI_PRE_COUNT, r8)
-        ENABLE_INTERRUPTS(r4)
-        bl      schedule
-        ldi     r4, #0
-        st      r4, @(TI_PRE_COUNT, r8)
-        DISABLE_INTERRUPTS(r4)
+        bl      preempt_schedule_irq
         bra     need_resched
 #endif
 
diff --git a/arch/m68k/include/asm/hardirq.h b/arch/m68k/include/asm/hardirq.h
index db30ed276878..6c618529d9b9 100644
--- a/arch/m68k/include/asm/hardirq.h
+++ b/arch/m68k/include/asm/hardirq.h
@@ -5,17 +5,6 @@
 #include <linux/cache.h>
 #include <asm/irq.h>
 
-#define HARDIRQ_BITS    8
-
-/*
- * The hardirq mask has to be large enough to have
- * space for potentially all IRQ sources in the system
- * nesting on a single CPU:
- */
-#if (1 << HARDIRQ_BITS) < NR_IRQS
-# error HARDIRQ_BITS is too low!
-#endif
-
 #ifdef CONFIG_MMU
 
 static inline void ack_bad_irq(unsigned int irq)
diff --git a/arch/m68k/include/asm/thread_info.h b/arch/m68k/include/asm/thread_info.h
index 126131f94a2c..21a4784ca5a1 100644
--- a/arch/m68k/include/asm/thread_info.h
+++ b/arch/m68k/include/asm/thread_info.h
@@ -35,8 +35,6 @@ struct thread_info {
 };
 #endif /* __ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE          0x4000000
-
 #define INIT_THREAD_INFO(tsk)                   \
 {                                               \
         .task           = &tsk,                 \
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index a78f5649e8de..b54ac7aba850 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -45,7 +45,7 @@
 .globl system_call, buserr, trap, resume
 .globl sys_call_table
 .globl __sys_fork, __sys_clone, __sys_vfork
-.globl ret_from_interrupt, bad_interrupt
+.globl bad_interrupt
 .globl auto_irqhandler_fixup
 .globl user_irqvec_fixup
 
@@ -275,8 +275,6 @@ do_delayed_trace:
 ENTRY(auto_inthandler)
         SAVE_ALL_INT
         GET_CURRENT(%d0)
-        movel   %d0,%a1
-        addqb   #1,%a1@(TINFO_PREEMPT+1)
                                         |  put exception # in d0
         bfextu  %sp@(PT_OFF_FORMATVEC){#4,#10},%d0
         subw    #VEC_SPUR,%d0
@@ -286,32 +284,13 @@ ENTRY(auto_inthandler)
 auto_irqhandler_fixup = . + 2
         jsr     do_IRQ                  |  process the IRQ
         addql   #8,%sp                  |  pop parameters off stack
-
-ret_from_interrupt:
-        movel   %curptr@(TASK_STACK),%a1
-        subqb   #1,%a1@(TINFO_PREEMPT+1)
-        jeq     ret_from_last_interrupt
-2:      RESTORE_ALL
-
-        ALIGN
-ret_from_last_interrupt:
-        moveq   #(~ALLOWINT>>8)&0xff,%d0
-        andb    %sp@(PT_OFF_SR),%d0
-        jne     2b
-
-        /* check if we need to do software interrupts */
-        tstl    irq_stat+CPUSTAT_SOFTIRQ_PENDING
-        jeq     .Lret_from_exception
-        pea     ret_from_exception
-        jra     do_softirq
+        jra     ret_from_exception
 
 /* Handler for user defined interrupt vectors */
 
 ENTRY(user_inthandler)
         SAVE_ALL_INT
         GET_CURRENT(%d0)
-        movel   %d0,%a1
-        addqb   #1,%a1@(TINFO_PREEMPT+1)
                                         |  put exception # in d0
         bfextu  %sp@(PT_OFF_FORMATVEC){#4,#10},%d0
 user_irqvec_fixup = . + 2
@@ -321,29 +300,18 @@ user_irqvec_fixup = . + 2
         movel   %d0,%sp@-               |  put vector # on stack
         jsr     do_IRQ                  |  process the IRQ
         addql   #8,%sp                  |  pop parameters off stack
-
-        movel   %curptr@(TASK_STACK),%a1
-        subqb   #1,%a1@(TINFO_PREEMPT+1)
-        jeq     ret_from_last_interrupt
-        RESTORE_ALL
+        jra     ret_from_exception
 
 /* Handler for uninitialized and spurious interrupts */
 
 ENTRY(bad_inthandler)
         SAVE_ALL_INT
         GET_CURRENT(%d0)
-        movel   %d0,%a1
-        addqb   #1,%a1@(TINFO_PREEMPT+1)
 
         movel   %sp,%sp@-
         jsr     handle_badint
         addql   #4,%sp
-
-        movel   %curptr@(TASK_STACK),%a1
-        subqb   #1,%a1@(TINFO_PREEMPT+1)
-        jeq     ret_from_last_interrupt
-        RESTORE_ALL
-
+        jra     ret_from_exception
 
 resume:
         /*
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 4d7da384eea0..077d3a70fed1 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -58,12 +58,6 @@ void __init init_IRQ(void)
 {
         int i;
 
-        /* assembly irq entry code relies on this... */
-        if (HARDIRQ_MASK != 0x00ff0000) {
-                extern void hardirq_mask_is_broken(void);
-                hardirq_mask_is_broken();
-        }
-
         for (i = IRQ_AUTO_1; i <= IRQ_AUTO_7; i++)
                 irq_set_chip_and_handler(i, &auto_irq_chip, handle_simple_irq);
 
diff --git a/arch/m68k/platform/68000/entry.S b/arch/m68k/platform/68000/entry.S
index 7f91c2fde509..23ac054c6e1a 100644
--- a/arch/m68k/platform/68000/entry.S
+++ b/arch/m68k/platform/68000/entry.S
@@ -27,7 +27,6 @@
 .globl ret_from_exception
 .globl ret_from_signal
 .globl sys_call_table
-.globl ret_from_interrupt
 .globl bad_interrupt
 .globl inthandler1
 .globl inthandler2
@@ -137,7 +136,7 @@ inthandler1:
         movel   #65,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler2:
         SAVE_ALL_INT
@@ -148,7 +147,7 @@ inthandler2:
         movel   #66,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler3:
         SAVE_ALL_INT
@@ -159,7 +158,7 @@ inthandler3:
         movel   #67,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler4:
         SAVE_ALL_INT
@@ -170,7 +169,7 @@ inthandler4:
         movel   #68,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler5:
         SAVE_ALL_INT
@@ -181,7 +180,7 @@ inthandler5:
         movel   #69,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler6:
         SAVE_ALL_INT
@@ -192,7 +191,7 @@ inthandler6:
         movel   #70,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler7:
         SAVE_ALL_INT
@@ -203,7 +202,7 @@ inthandler7:
         movel   #71,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
+        bra     ret_from_exception
 
 inthandler:
         SAVE_ALL_INT
@@ -214,23 +213,7 @@ inthandler:
         movel   %d0,%sp@-               /*  put vector # on stack*/
         jbsr    process_int             /*  process the IRQ*/
 3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
-
-ret_from_interrupt:
-        jeq     1f
-2:
-        RESTORE_ALL
-1:
-        moveb   %sp@(PT_OFF_SR), %d0
-        and     #7, %d0
-        jhi     2b
-
-        /* check if we need to do software interrupts */
-        jeq     ret_from_exception
-
-        pea     ret_from_exception
-        jra     do_softirq
-
+        bra     ret_from_exception
 
 /*
  * Handler for uninitialized and spurious interrupts.
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S
index 904fd9a4af4e..447c33ef37fd 100644
--- a/arch/m68k/platform/68360/entry.S
+++ b/arch/m68k/platform/68360/entry.S
@@ -29,7 +29,6 @@
 .globl ret_from_exception
 .globl ret_from_signal
 .globl sys_call_table
-.globl ret_from_interrupt
 .globl bad_interrupt
 .globl inthandler
 
@@ -132,26 +131,9 @@ inthandler:
 
         movel   %sp,%sp@-
         movel   %d0,%sp@-               /*  put vector # on stack*/
-        jbsr    do_IRQ                  /*  process the IRQ*/
-3:      addql   #8,%sp                  /*  pop parameters off stack*/
-        bra     ret_from_interrupt
-
-ret_from_interrupt:
-        jeq     1f
-2:
-        RESTORE_ALL
-1:
-        moveb   %sp@(PT_OFF_SR), %d0
-        and     #7, %d0
-        jhi     2b
-        /* check if we need to do software interrupts */
-
-        movel   irq_stat+CPUSTAT_SOFTIRQ_PENDING,%d0
-        jeq     ret_from_exception
-
-        pea     ret_from_exception
-        jra     do_softirq
-
+        jbsr    do_IRQ                  /*  process the IRQ */
+        addql   #8,%sp                  /*  pop parameters off stack*/
+        jra     ret_from_exception
 
 /*
  * Handler for uninitialized and spurious interrupts.
diff --git a/arch/metag/include/asm/thread_info.h b/arch/metag/include/asm/thread_info.h
index 7c4a33006142..b19e9c588a16 100644
--- a/arch/metag/include/asm/thread_info.h
+++ b/arch/metag/include/asm/thread_info.h
@@ -46,8 +46,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SHIFT            12
 #else
diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h
index de26ea6373de..8c9d36591a03 100644
--- a/arch/microblaze/include/asm/thread_info.h
+++ b/arch/microblaze/include/asm/thread_info.h
@@ -106,8 +106,6 @@ static inline struct thread_info *current_thread_info(void)
 /* thread information allocation */
 #endif /* __ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * thread information flags
  * - these are process state flags that various assembly files may
diff --git a/arch/mips/configs/db1235_defconfig b/arch/mips/configs/db1235_defconfig
index e2b4ad55462f..28e49f226dc0 100644
--- a/arch/mips/configs/db1235_defconfig
+++ b/arch/mips/configs/db1235_defconfig
@@ -351,7 +351,6 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
-CONFIG_MMC_CLKGATE=y
 CONFIG_MMC_AU1X=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index f9b24bfbdbae..4f58ef6d0eed 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -92,8 +92,6 @@ static inline struct thread_info *current_thread_info(void)
 
 #define STACK_WARN      (THREAD_SIZE / 8)
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * thread information flags
  * - these are process state flags that various assembly files may need to
diff --git a/arch/mn10300/include/asm/thread_info.h b/arch/mn10300/include/asm/thread_info.h
index 224b4262486d..bf280eaccd36 100644
--- a/arch/mn10300/include/asm/thread_info.h
+++ b/arch/mn10300/include/asm/thread_info.h
@@ -16,8 +16,6 @@
 
 #include <asm/page.h>
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SIZE             (4096)
 #define THREAD_SIZE_ORDER       (0)
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h
index bc7cf120106b..d5f97ea3a4e1 100644
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@@ -46,9 +46,6 @@ struct thread_info {
 #define THREAD_SIZE             (PAGE_SIZE << THREAD_SIZE_ORDER)
 #define THREAD_SHIFT            (PAGE_SHIFT + THREAD_SIZE_ORDER)
 
-#define PREEMPT_ACTIVE_BIT      28
-#define PREEMPT_ACTIVE          (1 << PREEMPT_ACTIVE_BIT)
-
 /*
  * thread information flags
  */
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index ba7b1973866e..8fd6cf6dcee8 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -82,8 +82,6 @@ static inline struct thread_info *current_thread_info(void)
 
 #endif /* __ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * thread information flag bit numbers
  */
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index f2737a005afc..9a42ecec5647 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -21,6 +21,6 @@ $(obj)/bzImage: $(obj)/compressed/vmlinux FORCE
 $(obj)/compressed/vmlinux: FORCE
         $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
-install: $(CONFIGURE) $(obj)/image
-        sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
+install: $(CONFIGURE) $(obj)/bzImage
+        sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
               System.map "$(INSTALL_PATH)"
diff --git a/arch/s390/include/asm/ctl_reg.h b/arch/s390/include/asm/ctl_reg.h
index 9b69c0befdca..4e63f1a13600 100644
--- a/arch/s390/include/asm/ctl_reg.h
+++ b/arch/s390/include/asm/ctl_reg.h
@@ -7,6 +7,8 @@
 #ifndef __ASM_CTL_REG_H
 #define __ASM_CTL_REG_H
 
+#include <linux/bug.h>
+
 #ifdef CONFIG_64BIT
 # define __CTL_LOAD     "lctlg"
 # define __CTL_STORE    "stctg"
diff --git a/arch/s390/include/asm/eadm.h b/arch/s390/include/asm/eadm.h
index dc9200ca32ed..67026300c88e 100644
--- a/arch/s390/include/asm/eadm.h
+++ b/arch/s390/include/asm/eadm.h
@@ -111,18 +111,7 @@ struct scm_driver {
 int scm_driver_register(struct scm_driver *scmdrv);
 void scm_driver_unregister(struct scm_driver *scmdrv);
 
-int scm_start_aob(struct aob *aob);
+int eadm_start_aob(struct aob *aob);
 void scm_irq_handler(struct aob *aob, int error);
 
-struct eadm_ops {
-        int (*eadm_start) (struct aob *aob);
-        struct module *owner;
-};
-
-int scm_get_ref(void);
-void scm_put_ref(void);
-
-void register_eadm_ops(struct eadm_ops *ops);
-void unregister_eadm_ops(struct eadm_ops *ops);
-
 #endif /* _ASM_S390_EADM_H */
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index a908d2941c5d..b7eabaaeffbd 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -18,8 +18,6 @@
 #define __ARCH_HAS_DO_SOFTIRQ
 #define __ARCH_IRQ_EXIT_IRQS_DISABLED
 
-#define HARDIRQ_BITS    8
-
 static inline void ack_bad_irq(unsigned int irq)
 {
         printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 1cc185da9d38..c129ab2ac731 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -63,9 +63,10 @@ enum zpci_state {
 };
 
 struct zpci_bar_struct {
+        struct resource *res;           /* bus resource */
         u32             val;            /* bar start & 3 flag bits */
-        u8              size;           /* order 2 exponent */
         u16             map_idx;        /* index into bar mapping array */
+        u8              size;           /* order 2 exponent */
 };
 
 /* Private data per function */
@@ -97,6 +98,7 @@ struct zpci_dev {
         unsigned long   iommu_pages;
         unsigned int    next_bit;
 
+        char res_name[16];
         struct zpci_bar_struct bars[PCI_BAR_COUNT];
 
         u64             start_dma;      /* Start of available DMA addresses */
@@ -122,12 +124,10 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)
   Prototypes
 ----------------------------------------------------------------------------- */
 /* Base stuff */
-struct zpci_dev *zpci_alloc_device(void);
 int zpci_create_device(struct zpci_dev *);
 int zpci_enable_device(struct zpci_dev *);
 int zpci_disable_device(struct zpci_dev *);
 void zpci_stop_device(struct zpci_dev *);
-void zpci_free_device(struct zpci_dev *);
 int zpci_register_ioat(struct zpci_dev *, u8, u64, u64, u64);
 int zpci_unregister_ioat(struct zpci_dev *, u8);
 
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index 7dc7f9c63b65..30ef748bc161 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -43,7 +43,6 @@ struct sclp_cpu_info {
 int sclp_get_cpu_info(struct sclp_cpu_info *info);
 int sclp_cpu_configure(u8 cpu);
 int sclp_cpu_deconfigure(u8 cpu);
-void sclp_facilities_detect(void);
 unsigned long long sclp_get_rnmax(void);
 unsigned long long sclp_get_rzm(void);
 int sclp_sdias_blk_count(void);
@@ -57,5 +56,7 @@ bool sclp_has_vt220(void);
 int sclp_pci_configure(u32 fid);
 int sclp_pci_deconfigure(u32 fid);
 int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode);
+unsigned long sclp_get_hsa_size(void);
+void sclp_early_detect(void);
 
 #endif /* _ASM_S390_SCLP_H */
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index df802ee14af6..94cfbe442f12 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -107,9 +107,6 @@ void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr,
 #define MACHINE_HAS_RRBM        (S390_lowcore.machine_flags & MACHINE_FLAG_RRBM)
 #endif /* CONFIG_64BIT */
 
-#define ZFCPDUMP_HSA_SIZE       (32UL<<20)
-#define ZFCPDUMP_HSA_SIZE_MAX   (64UL<<20)
-
 /*
  * Console mode. Override with conmode=
  */
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index eb5f64d26d06..10e0fcd3633d 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -111,6 +111,4 @@ static inline struct thread_info *current_thread_info(void)
 #define is_32bit_task()         (1)
 #endif
 
-#define PREEMPT_ACTIVE          0x4000000
-
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index f45b2ab0cb81..d7658c4b2ed5 100644
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -95,7 +95,7 @@ static void *elfcorehdr_newmem;
 /*
  * Copy one page from zfcpdump "oldmem"
  *
- * For pages below ZFCPDUMP_HSA_SIZE memory from the HSA is copied. Otherwise
+ * For pages below HSA size memory from the HSA is copied. Otherwise
  * real memory copy is used.
  */
 static ssize_t copy_oldmem_page_zfcpdump(char *buf, size_t csize,
@@ -103,7 +103,7 @@ static ssize_t copy_oldmem_page_zfcpdump(char *buf, size_t csize,
 {
         int rc;
 
-        if (src < ZFCPDUMP_HSA_SIZE) {
+        if (src < sclp_get_hsa_size()) {
                 rc = memcpy_hsa(buf, src, csize, userbuf);
         } else {
                 if (userbuf)
@@ -188,18 +188,19 @@ static int remap_oldmem_pfn_range_kdump(struct vm_area_struct *vma,
 /*
  * Remap "oldmem" for zfcpdump
  *
- * We only map available memory above ZFCPDUMP_HSA_SIZE. Memory below
- * ZFCPDUMP_HSA_SIZE is read on demand using the copy_oldmem_page() function.
+ * We only map available memory above HSA size. Memory below HSA size
+ * is read on demand using the copy_oldmem_page() function.
  */
 static int remap_oldmem_pfn_range_zfcpdump(struct vm_area_struct *vma,
                                            unsigned long from,
                                            unsigned long pfn,
                                            unsigned long size, pgprot_t prot)
 {
+        unsigned long hsa_end = sclp_get_hsa_size();
         unsigned long size_hsa;
 
-        if (pfn < ZFCPDUMP_HSA_SIZE >> PAGE_SHIFT) {
-                size_hsa = min(size, ZFCPDUMP_HSA_SIZE - (pfn << PAGE_SHIFT));
+        if (pfn < hsa_end >> PAGE_SHIFT) {
+                size_hsa = min(size, hsa_end - (pfn << PAGE_SHIFT));
                 if (size == size_hsa)
                         return 0;
                 size -= size_hsa;
@@ -238,9 +239,9 @@ int copy_from_oldmem(void *dest, void *src, size_t count)
                                 return rc;
                 }
         } else {
-                if ((unsigned long) src < ZFCPDUMP_HSA_SIZE) {
-                        copied = min(count,
-                                     ZFCPDUMP_HSA_SIZE - (unsigned long) src);
+                unsigned long hsa_end = sclp_get_hsa_size();
+                if ((unsigned long) src < hsa_end) {
+                        copied = min(count, hsa_end - (unsigned long) src);
                         rc = memcpy_hsa(dest, (unsigned long) src, copied, 0);
                         if (rc)
                                 return rc;
@@ -580,6 +581,9 @@ int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size)
         /* If elfcorehdr= has been passed via cmdline, we use that one */
         if (elfcorehdr_addr != ELFCORE_ADDR_MAX)
                 return 0;
+        /* If we cannot get HSA size for zfcpdump return error */
+        if (ipl_info.type == IPL_TYPE_FCP_DUMP && !sclp_get_hsa_size())
+                return -ENODEV;
         mem_chunk_cnt = get_mem_chunk_cnt();
 
         alloc_size = 0x1000 + get_cpu_cnt() * 0x300 +
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 96543ac400a7..fca20b5fe79e 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -483,7 +483,7 @@ void __init startup_init(void)
         detect_diag44();
         detect_machine_facilities();
         setup_topology();
-        sclp_facilities_detect();
+        sclp_early_detect();
 #ifdef CONFIG_DYNAMIC_FTRACE
         S390_lowcore.ftrace_func = (unsigned long)ftrace_caller;
 #endif
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index ffe1c53264a7..4444875266ee 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -471,8 +471,9 @@ static void __init setup_memory_end(void)
 
 
 #ifdef CONFIG_ZFCPDUMP
-        if (ipl_info.type == IPL_TYPE_FCP_DUMP && !OLDMEM_BASE) {
-                memory_end = ZFCPDUMP_HSA_SIZE;
+        if (ipl_info.type == IPL_TYPE_FCP_DUMP &&
+            !OLDMEM_BASE && sclp_get_hsa_size()) {
+                memory_end = sclp_get_hsa_size();
                 memory_end_set = 1;
         }
 #endif
@@ -586,7 +587,7 @@ static unsigned long __init find_crash_base(unsigned long crash_size,
                 crash_base = (chunk->addr + chunk->size) - crash_size;
                 if (crash_base < crash_size)
                         continue;
-                if (crash_base < ZFCPDUMP_HSA_SIZE_MAX)
+                if (crash_base < sclp_get_hsa_size())
                         continue;
                 if (crash_base < (unsigned long) INITRD_START + INITRD_SIZE)
                         continue;
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 0c9a17780e4b..bf7c73d71eef 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -530,20 +530,6 @@ static void zpci_unmap_resources(struct zpci_dev *zdev)
         }
 }
 
-struct zpci_dev *zpci_alloc_device(void)
-{
-        struct zpci_dev *zdev;
-
-        /* Alloc memory for our private pci device data */
-        zdev = kzalloc(sizeof(*zdev), GFP_KERNEL);
-        return zdev ? : ERR_PTR(-ENOMEM);
-}
-
-void zpci_free_device(struct zpci_dev *zdev)
-{
-        kfree(zdev);
-}
-
 int pcibios_add_platform_entries(struct pci_dev *pdev)
 {
         return zpci_sysfs_add_device(&pdev->dev);
@@ -579,37 +565,6 @@ static void zpci_irq_exit(void)
         unregister_adapter_interrupt(&zpci_airq);
 }
 
-static struct resource *zpci_alloc_bus_resource(unsigned long start, unsigned long size,
-                                                unsigned long flags, int domain)
-{
-        struct resource *r;
-        char *name;
-        int rc;
-
-        r = kzalloc(sizeof(*r), GFP_KERNEL);
-        if (!r)
-                return ERR_PTR(-ENOMEM);
-        r->start = start;
-        r->end = r->start + size - 1;
-        r->flags = flags;
-        r->parent = &iomem_resource;
-        name = kmalloc(18, GFP_KERNEL);
-        if (!name) {
-                kfree(r);
-                return ERR_PTR(-ENOMEM);
-        }
-        sprintf(name, "PCI Bus: %04x:%02x", domain, ZPCI_BUS_NR);
-        r->name = name;
-
-        rc = request_resource(&iomem_resource, r);
-        if (rc) {
-                kfree(r->name);
-                kfree(r);
-                return ERR_PTR(-ENOMEM);
-        }
-        return r;
-}
-
 static int zpci_alloc_iomap(struct zpci_dev *zdev)
 {
         int entry;
@@ -633,6 +588,82 @@ static void zpci_free_iomap(struct zpci_dev *zdev, int entry)
         spin_unlock(&zpci_iomap_lock);
 }
 
+static struct resource *__alloc_res(struct zpci_dev *zdev, unsigned long start,
+                                    unsigned long size, unsigned long flags)
+{
+        struct resource *r;
+
+        r = kzalloc(sizeof(*r), GFP_KERNEL);
+        if (!r)
+                return NULL;
+
+        r->start = start;
+        r->end = r->start + size - 1;
+        r->flags = flags;
+        r->name = zdev->res_name;
+
+        if (request_resource(&iomem_resource, r)) {
+                kfree(r);
+                return NULL;
+        }
+        return r;
+}
+
+static int zpci_setup_bus_resources(struct zpci_dev *zdev,
+                                    struct list_head *resources)
+{
+        unsigned long addr, size, flags;
+        struct resource *res;
+        int i, entry;
+
+        snprintf(zdev->res_name, sizeof(zdev->res_name),
+                 "PCI Bus %04x:%02x", zdev->domain, ZPCI_BUS_NR);
+
+        for (i = 0; i < PCI_BAR_COUNT; i++) {
+                if (!zdev->bars[i].size)
+                        continue;
+                entry = zpci_alloc_iomap(zdev);
+                if (entry < 0)
+                        return entry;
+                zdev->bars[i].map_idx = entry;
+
+                /* only MMIO is supported */
+                flags = IORESOURCE_MEM;
+                if (zdev->bars[i].val & 8)
+                        flags |= IORESOURCE_PREFETCH;
+                if (zdev->bars[i].val & 4)
+                        flags |= IORESOURCE_MEM_64;
+
+                addr = ZPCI_IOMAP_ADDR_BASE + ((u64) entry << 48);
+
+                size = 1UL << zdev->bars[i].size;
+
+                res = __alloc_res(zdev, addr, size, flags);
+                if (!res) {
+                        zpci_free_iomap(zdev, entry);
+                        return -ENOMEM;
+                }
+                zdev->bars[i].res = res;
+                pci_add_resource(resources, res);
+        }
+
+        return 0;
+}
+
+static void zpci_cleanup_bus_resources(struct zpci_dev *zdev)
+{
+        int i;
+
+        for (i = 0; i < PCI_BAR_COUNT; i++) {
+                if (!zdev->bars[i].size)
+                        continue;
+
+                zpci_free_iomap(zdev, zdev->bars[i].map_idx);
+                release_resource(zdev->bars[i].res);
+                kfree(zdev->bars[i].res);
+        }
+}
+
 int pcibios_add_device(struct pci_dev *pdev)
 {
         struct zpci_dev *zdev = get_zdev(pdev);
@@ -729,52 +760,6 @@ struct dev_pm_ops pcibios_pm_ops = {
 };
 #endif /* CONFIG_HIBERNATE_CALLBACKS */
 
-static int zpci_scan_bus(struct zpci_dev *zdev)
-{
-        struct resource *res;
-        LIST_HEAD(resources);
-        int i;
-
-        /* allocate mapping entry for each used bar */
-        for (i = 0; i < PCI_BAR_COUNT; i++) {
-                unsigned long addr, size, flags;
-                int entry;
-
-                if (!zdev->bars[i].size)
-                        continue;
-                entry = zpci_alloc_iomap(zdev);
-                if (entry < 0)
-                        return entry;
-                zdev->bars[i].map_idx = entry;
-
-                /* only MMIO is supported */
-                flags = IORESOURCE_MEM;
-                if (zdev->bars[i].val & 8)
-                        flags |= IORESOURCE_PREFETCH;
-                if (zdev->bars[i].val & 4)
-                        flags |= IORESOURCE_MEM_64;
-
-                addr = ZPCI_IOMAP_ADDR_BASE + ((u64) entry << 48);
-
-                size = 1UL << zdev->bars[i].size;
-
-                res = zpci_alloc_bus_resource(addr, size, flags, zdev->domain);
-                if (IS_ERR(res)) {
-                        zpci_free_iomap(zdev, entry);
-                        return PTR_ERR(res);
-                }
-                pci_add_resource(&resources, res);
-        }
-
-        zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops,
-                                      zdev, &resources);
-        if (!zdev->bus)
-                return -EIO;
-
-        zdev->bus->max_bus_speed = zdev->max_bus_speed;
-        return 0;
-}
-
 static int zpci_alloc_domain(struct zpci_dev *zdev)
 {
         spin_lock(&zpci_domain_lock);
@@ -795,6 +780,41 @@ static void zpci_free_domain(struct zpci_dev *zdev)
         spin_unlock(&zpci_domain_lock);
 }
 
+void pcibios_remove_bus(struct pci_bus *bus)
+{
+        struct zpci_dev *zdev = get_zdev_by_bus(bus);
+
+        zpci_exit_slot(zdev);
+        zpci_cleanup_bus_resources(zdev);
+        zpci_free_domain(zdev);
+
+        spin_lock(&zpci_list_lock);
+        list_del(&zdev->entry);
+        spin_unlock(&zpci_list_lock);
+
+        kfree(zdev);
+}
+
+static int zpci_scan_bus(struct zpci_dev *zdev)
+{
+        LIST_HEAD(resources);
+        int ret;
+
+        ret = zpci_setup_bus_resources(zdev, &resources);
+        if (ret)
+                return ret;
+
+        zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops,
+                                      zdev, &resources);
+        if (!zdev->bus) {
+                zpci_cleanup_bus_resources(zdev);
+                return -EIO;
+        }
+
+        zdev->bus->max_bus_speed = zdev->max_bus_speed;
+        return 0;
+}
+
 int zpci_enable_device(struct zpci_dev *zdev)
 {
         int rc;
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 84147984224a..c747394029ee 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -155,9 +155,9 @@ int clp_add_pci_device(u32 fid, u32 fh, int configured)
         int rc;
 
         zpci_dbg(3, "add fid:%x, fh:%x, c:%d\n", fid, fh, configured);
-        zdev = zpci_alloc_device();
-        if (IS_ERR(zdev))
-                return PTR_ERR(zdev);
+        zdev = kzalloc(sizeof(*zdev), GFP_KERNEL);
+        if (!zdev)
+                return -ENOMEM;
 
         zdev->fh = fh;
         zdev->fid = fid;
@@ -178,7 +178,7 @@ int clp_add_pci_device(u32 fid, u32 fh, int configured)
         return 0;
 
 error:
-        zpci_free_device(zdev);
+        kfree(zdev);
         return rc;
 }
 
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index 278e671ec9ac..800f064b0da7 100644
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <asm/pci_debug.h>
+#include <asm/sclp.h>
 
 /* Content Code Description for PCI Function Error */
 struct zpci_ccdf_err {
@@ -42,10 +43,27 @@ struct zpci_ccdf_avail {
         u16 pec;                        /* PCI event code */
 } __packed;
 
-static void zpci_event_log_avail(struct zpci_ccdf_avail *ccdf)
+void zpci_event_error(void *data)
 {
+        struct zpci_ccdf_err *ccdf = data;
+        struct zpci_dev *zdev = get_zdev_by_fid(ccdf->fid);
+
+        zpci_err("error CCDF:\n");
+        zpci_err_hex(ccdf, sizeof(*ccdf));
+
+        if (!zdev)
+                return;
+
+        pr_err("%s: Event 0x%x reports an error for PCI function 0x%x\n",
+               pci_name(zdev->pdev), ccdf->pec, ccdf->fid);
+}
+
+void zpci_event_availability(void *data)
+{
+        struct zpci_ccdf_avail *ccdf = data;
         struct zpci_dev *zdev = get_zdev_by_fid(ccdf->fid);
         struct pci_dev *pdev = zdev ? zdev->pdev : NULL;
+        int ret;
 
         pr_info("%s: Event 0x%x reconfigured PCI function 0x%x\n",
                 pdev ? pci_name(pdev) : "n/a", ccdf->pec, ccdf->fid);
@@ -53,36 +71,47 @@ static void zpci_event_log_avail(struct zpci_ccdf_avail *ccdf)
         zpci_err_hex(ccdf, sizeof(*ccdf));
 
         switch (ccdf->pec) {
-        case 0x0301:
-                zpci_enable_device(zdev);
+        case 0x0301: /* Standby -> Configured */
+                if (!zdev || zdev->state == ZPCI_FN_STATE_CONFIGURED)
+                        break;
+                zdev->state = ZPCI_FN_STATE_CONFIGURED;
+                ret = zpci_enable_device(zdev);
+                if (ret)
+                        break;
+                pci_rescan_bus(zdev->bus);
                 break;
-        case 0x0302:
+        case 0x0302: /* Reserved -> Standby */
                 clp_add_pci_device(ccdf->fid, ccdf->fh, 0);
                 break;
-        case 0x0306:
+        case 0x0303: /* Deconfiguration requested */
+                if (pdev)
+                        pci_stop_and_remove_bus_device(pdev);
+
+                ret = zpci_disable_device(zdev);
+                if (ret)
+                        break;
+
+                ret = sclp_pci_deconfigure(zdev->fid);
+                zpci_dbg(3, "deconf fid:%x, rc:%d\n", zdev->fid, ret);
+                if (!ret)
+                        zdev->state = ZPCI_FN_STATE_STANDBY;
+
+                break;
+        case 0x0304: /* Configured -> Standby */
+                if (pdev)
+                        pci_stop_and_remove_bus_device(pdev);
+
+                zpci_disable_device(zdev);
+                zdev->state = ZPCI_FN_STATE_STANDBY;
+                break;
+        case 0x0306: /* 0x308 or 0x302 for multiple devices */
                 clp_rescan_pci_devices();
                 break;
+        case 0x0308: /* Standby -> Reserved */
+                pci_stop_root_bus(zdev->bus);
+                pci_remove_root_bus(zdev->bus);
+                break;
         default:
                 break;
         }
 }
-
-void zpci_event_error(void *data)
-{
-        struct zpci_ccdf_err *ccdf = data;
-        struct zpci_dev *zdev = get_zdev_by_fid(ccdf->fid);
-
-        zpci_err("error CCDF:\n");
-        zpci_err_hex(ccdf, sizeof(*ccdf));
-
-        if (!zdev)
-                return;
-
-        pr_err("%s: Event 0x%x reports an error for PCI function 0x%x\n",
-               pci_name(zdev->pdev), ccdf->pec, ccdf->fid);
-}
-
-void zpci_event_availability(void *data)
-{
-        zpci_event_log_avail(data);
-}
diff --git a/arch/score/include/asm/thread_info.h b/arch/score/include/asm/thread_info.h
index 1425cc034872..656b7ada9326 100644
--- a/arch/score/include/asm/thread_info.h
+++ b/arch/score/include/asm/thread_info.h
@@ -72,8 +72,6 @@ register struct thread_info *__current_thread_info __asm__("r28");
 
 #endif /* !__ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * thread information flags
  * - these are process state flags that various assembly files may need to
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 1fa8be409771..122f737a901f 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -15,6 +15,7 @@
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
+#include <linux/mfd/tmio.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h
index 45a93669289d..ad27ffa65e2e 100644
--- a/arch/sh/include/asm/thread_info.h
+++ b/arch/sh/include/asm/thread_info.h
@@ -41,8 +41,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #if defined(CONFIG_4KSTACKS)
 #define THREAD_SHIFT    12
 #else
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index 9b6e4beeb296..ca46834294b7 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -108,7 +108,7 @@ need_resched:
         and     #(0xf0>>1), r0          ! interrupts off (exception path)?
         cmp/eq  #(0xf0>>1), r0
         bt      noresched
-        mov.l   3f, r0
+        mov.l   1f, r0
         jsr     @r0                     ! call preempt_schedule_irq
          nop
         bra     need_resched
@@ -119,9 +119,7 @@ noresched:
          nop
 
         .align 2
-1:      .long   PREEMPT_ACTIVE
-2:      .long   schedule
-3:      .long   preempt_schedule_irq
+1:      .long   preempt_schedule_irq
 #endif
 
 ENTRY(resume_userspace)
diff --git a/arch/sparc/include/asm/hardirq_32.h b/arch/sparc/include/asm/hardirq_32.h
index 162007643cdc..ee93923b7f82 100644
--- a/arch/sparc/include/asm/hardirq_32.h
+++ b/arch/sparc/include/asm/hardirq_32.h
@@ -7,7 +7,6 @@
 #ifndef __SPARC_HARDIRQ_H
 #define __SPARC_HARDIRQ_H
 
-#define HARDIRQ_BITS    8
 #include <asm-generic/hardirq.h>
 
 #endif /* __SPARC_HARDIRQ_H */
diff --git a/arch/sparc/include/asm/hardirq_64.h b/arch/sparc/include/asm/hardirq_64.h
index 7c29fd1a87aa..f478ff1ddd02 100644
--- a/arch/sparc/include/asm/hardirq_64.h
+++ b/arch/sparc/include/asm/hardirq_64.h
@@ -14,6 +14,4 @@
 
 void ack_bad_irq(unsigned int irq);
 
-#define HARDIRQ_BITS    8
-
 #endif /* !(__SPARC64_HARDIRQ_H) */
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index dd3807599bb9..96efa7adc223 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -105,8 +105,6 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define TI_W_SAVED      0x250
 /* #define TI_RESTART_BLOCK 0x25n */ /* Nobody cares */
 
-#define PREEMPT_ACTIVE          0x4000000
-
 /*
  * thread information flag bit numbers
  */
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 5d9292ab1077..a5f01ac6d0f1 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -111,8 +111,6 @@ struct thread_info {
 #define THREAD_SHIFT PAGE_SHIFT
 #endif /* PAGE_SHIFT == 13 */
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * macros/functions for gaining access to the thread information structure
  */
diff --git a/arch/sparc/kernel/rtrap_64.S b/arch/sparc/kernel/rtrap_64.S
index a954eb81881b..39f0c662f4c8 100644
--- a/arch/sparc/kernel/rtrap_64.S
+++ b/arch/sparc/kernel/rtrap_64.S
@@ -312,12 +312,10 @@ to_kernel:
                  nop
                 cmp                     %l4, 0
                 bne,pn                  %xcc, kern_fpucheck
-                 sethi                  %hi(PREEMPT_ACTIVE), %l6
-                stw                     %l6, [%g6 + TI_PRE_COUNT]
-                call                    schedule
+                 nop
+                call                    preempt_schedule_irq
                  nop
                 ba,pt                   %xcc, rtrap
-                 stw                    %g0, [%g6 + TI_PRE_COUNT]
 #endif
 kern_fpucheck:  ldub                    [%g6 + TI_FPDEPTH], %l5
                 brz,pt                  %l5, rt_continue
diff --git a/arch/tile/include/asm/hardirq.h b/arch/tile/include/asm/hardirq.h
index 822390f9a154..54110af23985 100644
--- a/arch/tile/include/asm/hardirq.h
+++ b/arch/tile/include/asm/hardirq.h
@@ -42,6 +42,4 @@ DECLARE_PER_CPU(irq_cpustat_t, irq_stat);
 
 #include <linux/irq_cpustat.h>  /* Standard mappings for irq_cpustat_t above */
 
-#define HARDIRQ_BITS    8
-
 #endif /* _ASM_TILE_HARDIRQ_H */
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index b8aa6df3e102..729aa107f64e 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -113,8 +113,6 @@ extern void _cpu_idle(void);
 
 #endif /* !__ASSEMBLY__ */
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * Thread information flags that various assembly files may need to access.
  * Keep flags accessed frequently in low bits, particular since it makes
diff --git a/arch/um/Kconfig.char b/arch/um/Kconfig.char
index b9d7c4276682..f10738d68b2d 100644
--- a/arch/um/Kconfig.char
+++ b/arch/um/Kconfig.char
@@ -6,10 +6,6 @@ config STDERR_CONSOLE
         help
           console driver which dumps all printk messages to stderr.
 
-config STDIO_CONSOLE
-        bool
-        default y
-
 config SSL
         bool "Virtual serial line"
         help
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 8ddea1f8006a..21ca44c4f6d5 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -1,8 +1,3 @@
-config DEFCONFIG_LIST
-        string
-        option defconfig_list
-        default "arch/$ARCH/defconfig"
-
 config UML
         bool
         default y
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 133f7de2a13d..48d92bbe62e9 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -6,6 +6,17 @@
 # Licensed under the GPL
 #
 
+# select defconfig based on actual architecture
+ifeq ($(SUBARCH),x86)
+  ifeq ($(shell uname -m),x86_64)
+        KBUILD_DEFCONFIG := x86_64_defconfig
+  else
+        KBUILD_DEFCONFIG := i386_defconfig
+  endif
+else
+        KBUILD_DEFCONFIG := $(SUBARCH)_defconfig
+endif
+
 ARCH_DIR := arch/um
 OS := $(shell uname -s)
 # We require bash because the vmlinux link and loader script cpp use bash
diff --git a/arch/um/configs/i386_defconfig b/arch/um/configs/i386_defconfig
new file mode 100644
index 000000000000..a12bf68c9f3a
--- /dev/null
+++ b/arch/um/configs/i386_defconfig
@@ -0,0 +1,76 @@
+CONFIG_3_LEVEL_PGTABLES=y
+# CONFIG_COMPACTION is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_HOSTFS=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_KERNEL_STACK_ORDER=1
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_PID_NS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_IOSCHED_CFQ=m
+CONFIG_SSL=y
+CONFIG_NULL_CHAN=y
+CONFIG_PORT_CHAN=y
+CONFIG_PTY_CHAN=y
+CONFIG_TTY_CHAN=y
+CONFIG_XTERM_CHAN=y
+CONFIG_CON_CHAN="pts"
+CONFIG_SSL_CHAN="pts"
+CONFIG_UML_SOUND=m
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_BLK_DEV_UBD=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_DUMMY=m
+CONFIG_TUN=m
+CONFIG_PPP=m
+CONFIG_SLIP=m
+CONFIG_LEGACY_PTY_COUNT=32
+# CONFIG_HW_RANDOM is not set
+CONFIG_UML_RANDOM=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_UML_NET=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_TUNTAP=y
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+CONFIG_UML_NET_SLIRP=y
+CONFIG_EXT4_FS=y
+CONFIG_REISERFS_FS=y
+CONFIG_QUOTA=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NLS=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_KERNEL=y
diff --git a/arch/um/configs/x86_64_defconfig b/arch/um/configs/x86_64_defconfig
new file mode 100644
index 000000000000..3aab117bd553
--- /dev/null
+++ b/arch/um/configs/x86_64_defconfig
@@ -0,0 +1,75 @@
+# CONFIG_COMPACTION is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_HOSTFS=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_PID_NS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_IOSCHED_CFQ=m
+CONFIG_SSL=y
+CONFIG_NULL_CHAN=y
+CONFIG_PORT_CHAN=y
+CONFIG_PTY_CHAN=y
+CONFIG_TTY_CHAN=y
+CONFIG_XTERM_CHAN=y
+CONFIG_CON_CHAN="pts"
+CONFIG_SSL_CHAN="pts"
+CONFIG_UML_SOUND=m
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_BLK_DEV_UBD=y
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_DUMMY=m
+CONFIG_TUN=m
+CONFIG_PPP=m
+CONFIG_SLIP=m
+CONFIG_LEGACY_PTY_COUNT=32
+# CONFIG_HW_RANDOM is not set
+CONFIG_UML_RANDOM=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+CONFIG_UML_NET=y
+CONFIG_UML_NET_ETHERTAP=y
+CONFIG_UML_NET_TUNTAP=y
+CONFIG_UML_NET_SLIP=y
+CONFIG_UML_NET_DAEMON=y
+CONFIG_UML_NET_MCAST=y
+CONFIG_UML_NET_SLIRP=y
+CONFIG_EXT4_FS=y
+CONFIG_REISERFS_FS=y
+CONFIG_QUOTA=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_NLS=y
+CONFIG_DEBUG_INFO=y
+CONFIG_FRAME_WARN=1024
+CONFIG_DEBUG_KERNEL=y
diff --git a/arch/um/defconfig b/arch/um/defconfig
deleted file mode 100644
index 2665e6b683f5..000000000000
--- a/arch/um/defconfig
+++ /dev/null
@@ -1,899 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# User Mode Linux/i386 3.3.0 Kernel Configuration
-#
-CONFIG_DEFCONFIG_LIST="arch/$ARCH/defconfig"
-CONFIG_UML=y
-CONFIG_MMU=y
-CONFIG_NO_IOMEM=y
-# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
-CONFIG_LOCKDEP_SUPPORT=y
-# CONFIG_STACKTRACE_SUPPORT is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_HZ=100
-
-#
-# UML-specific options
-#
-
-#
-# Host processor type and features
-#
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MELAN is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-# CONFIG_X86_GENERIC is not set
-CONFIG_X86_INTERNODE_CACHE_SHIFT=5
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_XADD=y
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-CONFIG_UML_X86=y
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_3_LEVEL_PGTABLES is not set
-CONFIG_ARCH_HAS_SC_SIGNALS=y
-CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
-CONFIG_GENERIC_HWEIGHT=y
-# CONFIG_STATIC_LINK is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-# CONFIG_KSM is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_CLEANCACHE is not set
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_LD_SCRIPT_DYN=y
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_HOSTFS=y
-# CONFIG_HPPFS is not set
-CONFIG_MCONSOLE=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_KERNEL_STACK_ORDER=0
-# CONFIG_MMAPPER is not set
-CONFIG_NO_DMA=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=128
-CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-# CONFIG_FHANDLE is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_IRQ_SHOW=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TINY_RCU=y
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEMCG=y
-CONFIG_CGROUP_MEMCG_SWAP=y
-# CONFIG_CGROUP_MEMCG_SWAP_ENABLED is not set
-# CONFIG_CGROUP_MEMCG_KMEM is not set
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-# CONFIG_CFS_BANDWIDTH is not set
-# CONFIG_RT_GROUP_SCHED is not set
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-CONFIG_NET_NS=y
-# CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_MM_OWNER=y
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EXPERT is not set
-CONFIG_UID16=y
-# CONFIG_SYSCTL_SYSCALL is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-# CONFIG_EMBEDDED is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_COMPAT_BRK=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_PROFILING is not set
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=m
-# CONFIG_CFQ_GROUP_IOSCHED is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-# CONFIG_INLINE_SPIN_TRYLOCK is not set
-# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK is not set
-# CONFIG_INLINE_SPIN_LOCK_BH is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
-# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-CONFIG_INLINE_SPIN_UNLOCK=y
-# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_READ_TRYLOCK is not set
-# CONFIG_INLINE_READ_LOCK is not set
-# CONFIG_INLINE_READ_LOCK_BH is not set
-# CONFIG_INLINE_READ_LOCK_IRQ is not set
-# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-CONFIG_INLINE_READ_UNLOCK=y
-# CONFIG_INLINE_READ_UNLOCK_BH is not set
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
-# CONFIG_INLINE_WRITE_TRYLOCK is not set
-# CONFIG_INLINE_WRITE_LOCK is not set
-# CONFIG_INLINE_WRITE_LOCK_BH is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
-# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-CONFIG_INLINE_WRITE_UNLOCK=y
-# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
-# CONFIG_MUTEX_SPIN_ON_OWNER is not set
-CONFIG_FREEZER=y
-
-#
-# UML Character Devices
-#
-CONFIG_STDERR_CONSOLE=y
-CONFIG_STDIO_CONSOLE=y
-CONFIG_SSL=y
-CONFIG_NULL_CHAN=y
-CONFIG_PORT_CHAN=y
-CONFIG_PTY_CHAN=y
-CONFIG_TTY_CHAN=y
-CONFIG_XTERM_CHAN=y
-# CONFIG_NOCONFIG_CHAN is not set
-CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
-CONFIG_CON_CHAN="xterm"
-CONFIG_SSL_CHAN="pts"
-CONFIG_UML_SOUND=m
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_HOSTAUDIO=m
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_GENERIC_CPU_DEVICES=y
-# CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_UBD=y
-# CONFIG_BLK_DEV_UBD_SYNC is not set
-CONFIG_BLK_DEV_COW_COMMON=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-
-#
-# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-#
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_ATA_OVER_ETH is not set
-# CONFIG_BLK_DEV_RBD is not set
-
-#
-# Misc devices
-#
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-# CONFIG_EEPROM_93CX6 is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-
-#
-# Altera FPGA firmware download module
-#
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-# CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_NETLINK is not set
-# CONFIG_MD is not set
-CONFIG_NETDEVICES=y
-CONFIG_NET_CORE=y
-# CONFIG_BONDING is not set
-CONFIG_DUMMY=m
-# CONFIG_EQUALIZER is not set
-# CONFIG_MII is not set
-# CONFIG_NET_TEAM is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_TUN=m
-# CONFIG_VETH is not set
-
-#
-# CAIF transport drivers
-#
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_8390=y
-# CONFIG_PHYLIB is not set
-CONFIG_PPP=m
-# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPP_DEFLATE is not set
-# CONFIG_PPP_FILTER is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPP_ASYNC is not set
-# CONFIG_PPP_SYNC_TTY is not set
-CONFIG_SLIP=m
-CONFIG_SLHC=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_WLAN=y
-# CONFIG_HOSTAP is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
-# CONFIG_WAN is not set
-
-#
-# Character devices
-#
-CONFIG_UNIX98_PTYS=y
-# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-# CONFIG_N_GSM is not set
-# CONFIG_TRACE_SINK is not set
-CONFIG_DEVKMEM=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_UML_RANDOM=y
-# CONFIG_R3964 is not set
-# CONFIG_NSC_GPIO is not set
-# CONFIG_RAW_DRIVER is not set
-
-#
-# PPS support
-#
-# CONFIG_PPS is not set
-
-#
-# PPS generators support
-#
-
-#
-# PTP clock support
-#
-
-#
-# Enable Device Drivers -> PPS to see the PTP clock options.
-#
-# CONFIG_POWER_SUPPLY is not set
-# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_REGULATOR is not set
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-# CONFIG_MEMSTICK is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_ACCESSIBILITY is not set
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
-
-#
-# Virtio drivers
-#
-# CONFIG_VIRTIO_BALLOON is not set
-
-#
-# Microsoft Hyper-V guest support
-#
-# CONFIG_STAGING is not set
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_IOMMU_SUPPORT=y
-# CONFIG_VIRT_DRIVERS is not set
-# CONFIG_PM_DEVFREQ is not set
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-# CONFIG_UNIX_DIAG is not set
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-# CONFIG_INET_LRO is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_INET_UDP_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_L2TP is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_PHONET is not set
-# CONFIG_IEEE802154 is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-# CONFIG_BATMAN_ADV is not set
-# CONFIG_OPENVSWITCH is not set
-# CONFIG_NETPRIO_CGROUP is not set
-CONFIG_BQL=y
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-CONFIG_WIRELESS=y
-# CONFIG_CFG80211 is not set
-# CONFIG_LIB80211 is not set
-
-#
-# CFG80211 needs to be enabled for MAC80211
-#
-# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-# CONFIG_CAIF is not set
-# CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
-
-#
-# UML Network Devices
-#
-CONFIG_UML_NET=y
-CONFIG_UML_NET_ETHERTAP=y
-CONFIG_UML_NET_TUNTAP=y
-CONFIG_UML_NET_SLIP=y
-CONFIG_UML_NET_DAEMON=y
-# CONFIG_UML_NET_VDE is not set
-CONFIG_UML_NET_MCAST=y
-# CONFIG_UML_NET_PCAP is not set
-CONFIG_UML_NET_SLIRP=y
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_XATTR=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_NILFS2_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_FANOTIFY is not set
-CONFIG_QUOTA=y
-# CONFIG_QUOTA_NETLINK_INTERFACE is not set
-CONFIG_PRINT_QUOTA_WARNING=y
-# CONFIG_QUOTA_DEBUG is not set
-# CONFIG_QFMT_V1 is not set
-# CONFIG_QFMT_V2 is not set
-CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
-# CONFIG_FUSE_FS is not set
-
-#
-# Caches
-#
-# CONFIG_FSCACHE is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_TMPFS_XATTR is not set
-# CONFIG_HUGETLB_PAGE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_LOGFS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_PSTORE is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
-# CONFIG_SECURITY is not set
-# CONFIG_SECURITYFS is not set
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-# CONFIG_CRYPTO_FIPS is not set
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=m
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
-# CONFIG_CRYPTO_USER is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_SEQIV is not set
-
-#
-# Block modes
-#
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_CTS is not set
-# CONFIG_CRYPTO_ECB is not set
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
-
-#
-# Hash modes
-#
-# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_VMAC is not set
-
-#
-# Digest
-#
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_GHASH is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_RMD128 is not set
-# CONFIG_CRYPTO_RMD160 is not set
-# CONFIG_CRYPTO_RMD256 is not set
-# CONFIG_CRYPTO_RMD320 is not set
-# CONFIG_CRYPTO_SHA1 is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SALSA20 is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_SEED is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-
-#
-# Compression
-#
-# CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_ZLIB is not set
-# CONFIG_CRYPTO_LZO is not set
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
-CONFIG_CRYPTO_HW=y
-# CONFIG_BINARY_PRINTF is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_IO=y
-# CONFIG_CRC_CCITT is not set
-CONFIG_CRC16=y
-# CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-# CONFIG_CRC8 is not set
-# CONFIG_XZ_DEC is not set
-# CONFIG_XZ_DEC_BCJ is not set
-CONFIG_DQL=y
-CONFIG_NLATTR=y
-# CONFIG_AVERAGE is not set
-# CONFIG_CORDIC is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-# CONFIG_STRIP_ASM_SYMS is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_LOCKUP_DETECTOR is not set
-# CONFIG_HARDLOCKUP_DETECTOR is not set
-# CONFIG_DETECT_HUNG_TASK is not set
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
-# CONFIG_DEBUG_ATOMIC_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_KOBJECT is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
-# CONFIG_ATOMIC64_SELFTEST is not set
-# CONFIG_SAMPLES is not set
-# CONFIG_TEST_KSTRTOX is not set
-# CONFIG_GPROF is not set
-# CONFIG_GCOV is not set
-CONFIG_EARLY_PRINTK=y
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 3df3bd544492..29880c9b324e 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -645,11 +645,9 @@ void mconsole_sysrq(struct mc_request *req)
 
 static void stack_proc(void *arg)
 {
-        struct task_struct *from = current, *to = arg;
+        struct task_struct *task = arg;
 
-        to->thread.saved_task = from;
-        rcu_user_hooks_switch(from, to);
-        switch_to(from, to, from);
+        show_stack(task, NULL);
 }
 
 /*
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index c03cd5a02364..d89b02bb6262 100644
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -19,8 +19,8 @@ struct task_struct;
 struct mm_struct;
 
 struct thread_struct {
-        struct task_struct *saved_task;
         struct pt_regs regs;
+        struct pt_regs *segv_regs;
         int singlestep_syscall;
         void *fault_addr;
         jmp_buf *fault_catcher;
diff --git a/arch/um/include/asm/thread_info.h b/arch/um/include/asm/thread_info.h
index 2c8eeb2df8b4..1c5b2a83046a 100644
--- a/arch/um/include/asm/thread_info.h
+++ b/arch/um/include/asm/thread_info.h
@@ -60,8 +60,6 @@ static inline struct thread_info *current_thread_info(void)
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #define TIF_SYSCALL_TRACE       0       /* syscall trace active */
 #define TIF_SIGPENDING          1       /* signal pending */
 #define TIF_NEED_RESCHED        2       /* rescheduling necessary */
diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h
index 694c792bab4e..41c8c774ec10 100644
--- a/arch/um/include/shared/as-layout.h
+++ b/arch/um/include/shared/as-layout.h
@@ -44,7 +44,6 @@ struct cpu_task {
 
 extern struct cpu_task cpu_tasks[];
 
-extern unsigned long low_physmem;
 extern unsigned long high_physmem;
 extern unsigned long uml_physmem;
 extern unsigned long uml_reserved;
@@ -52,8 +51,6 @@ extern unsigned long end_vm;
 extern unsigned long start_vm;
 extern unsigned long long highmem;
 
-extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
-extern unsigned long _unprotected_end;
 extern unsigned long brk_start;
 
 extern unsigned long host_task_size;
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index 021104d98cb3..75298d3358e7 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -227,6 +227,7 @@ extern void block_signals(void);
 extern void unblock_signals(void);
 extern int get_signals(void);
 extern int set_signals(int enable);
+extern int os_is_signal_stack(void);
 
 /* util.c */
 extern void stack_protections(unsigned long address);
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index bbcef522bcb1..eecc4142764c 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -82,19 +82,8 @@ void *__switch_to(struct task_struct *from, struct task_struct *to)
         to->thread.prev_sched = from;
         set_current(to);
 
-        do {
-                current->thread.saved_task = NULL;
-
-                switch_threads(&from->thread.switch_buf,
-                               &to->thread.switch_buf);
-
-                arch_switch_to(current);
-
-                if (current->thread.saved_task)
-                        show_regs(&(current->thread.regs));
-                to = current->thread.saved_task;
-                from = current;
-        } while (current->thread.saved_task);
+        switch_threads(&from->thread.switch_buf, &to->thread.switch_buf);
+        arch_switch_to(current);
 
         return current->thread.prev_sched;
 }
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index 0dc4d1c6f98a..4d6fdf68edf3 100644
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -1,6 +1,10 @@
 /*
  * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- * Licensed under the GPL
+ * Copyright (C) 2013 Richard Weinberger <richrd@nod.at>
+ *
+ * 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/kallsyms.h>
@@ -8,59 +12,87 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/sysrq.h>
+#include <os.h>
 
-/* Catch non-i386 SUBARCH's. */
-#if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT)
-void show_trace(struct task_struct *task, unsigned long * stack)
+struct stack_frame {
+        struct stack_frame *next_frame;
+        unsigned long return_address;
+};
+
+static void print_stack_trace(unsigned long *sp, unsigned long bp)
 {
+        int reliable;
         unsigned long addr;
+        struct stack_frame *frame = (struct stack_frame *)bp;
 
-        if (!stack) {
-                stack = (unsigned long*) &stack;
-                WARN_ON(1);
-        }
-
-        printk(KERN_INFO "Call Trace: \n");
-        while (((long) stack & (THREAD_SIZE-1)) != 0) {
-                addr = *stack;
+        printk(KERN_INFO "Call Trace:\n");
+        while (((long) sp & (THREAD_SIZE-1)) != 0) {
+                addr = *sp;
                 if (__kernel_text_address(addr)) {
-                        printk(KERN_INFO "%08lx:  [<%08lx>]",
-                               (unsigned long) stack, addr);
-                        print_symbol(KERN_CONT " %s", addr);
+                        reliable = 0;
+                        if ((unsigned long) sp == bp + sizeof(long)) {
+                                frame = frame ? frame->next_frame : NULL;
+                                bp = (unsigned long)frame;
+                                reliable = 1;
+                        }
+
+                        printk(KERN_INFO " [<%08lx>]", addr);
+                        printk(KERN_CONT " %s", reliable ? "" : "? ");
+                        print_symbol(KERN_CONT "%s", addr);
                         printk(KERN_CONT "\n");
                 }
-                stack++;
+                sp++;
         }
         printk(KERN_INFO "\n");
 }
-#endif
 
-/*Stolen from arch/i386/kernel/traps.c */
-static const int kstack_depth_to_print = 24;
+static unsigned long get_frame_pointer(struct task_struct *task,
+                                       struct pt_regs *segv_regs)
+{
+        if (!task || task == current)
+                return segv_regs ? PT_REGS_BP(segv_regs) : current_bp();
+        else
+                return KSTK_EBP(task);
+}
 
-/* This recently started being used in arch-independent code too, as in
- * kernel/sched/core.c.*/
-void show_stack(struct task_struct *task, unsigned long *esp)
+static unsigned long *get_stack_pointer(struct task_struct *task,
+                                        struct pt_regs *segv_regs)
 {
-        unsigned long *stack;
+        if (!task || task == current)
+                return segv_regs ? (unsigned long *)PT_REGS_SP(segv_regs) : current_sp();
+        else
+                return (unsigned long *)KSTK_ESP(task);
+}
+
+void show_stack(struct task_struct *task, unsigned long *stack)
+{
+        unsigned long *sp = stack, bp = 0;
+        struct pt_regs *segv_regs = current->thread.segv_regs;
         int i;
 
-        if (esp == NULL) {
-                if (task != current && task != NULL) {
-                        esp = (unsigned long *) KSTK_ESP(task);
-                } else {
-                        esp = (unsigned long *) &esp;
-                }
+        if (!segv_regs && os_is_signal_stack()) {
+                printk(KERN_ERR "Received SIGSEGV in SIGSEGV handler,"
+                                " aborting stack trace!\n");
+                return;
         }
 
-        stack = esp;
-        for (i = 0; i < kstack_depth_to_print; i++) {
+#ifdef CONFIG_FRAME_POINTER
+        bp = get_frame_pointer(task, segv_regs);
+#endif
+
+        if (!stack)
+                sp = get_stack_pointer(task, segv_regs);
+
+        printk(KERN_INFO "Stack:\n");
+        stack = sp;
+        for (i = 0; i < 3 * STACKSLOTS_PER_LINE; i++) {
                 if (kstack_end(stack))
                         break;
-                if (i && ((i % 8) == 0))
-                        printk(KERN_INFO "       ");
-                printk(KERN_CONT "%08lx ", *stack++);
+                if (i && ((i % STACKSLOTS_PER_LINE) == 0))
+                        printk(KERN_CONT "\n");
+                printk(KERN_CONT " %08lx", *stack++);
         }
+        printk(KERN_CONT "\n");
 
-        show_trace(task, esp);
+        print_stack_trace(sp, bp);
 }
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 5c3aef74237f..974b87474a99 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -206,9 +206,12 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
         int is_write = FAULT_WRITE(fi);
         unsigned long address = FAULT_ADDRESS(fi);
 
+        if (regs)
+                current->thread.segv_regs = container_of(regs, struct pt_regs, regs);
+
         if (!is_user && (address >= start_vm) && (address < end_vm)) {
                 flush_tlb_kernel_vm();
-                return 0;
+                goto out;
         }
         else if (current->mm == NULL) {
                 show_regs(container_of(regs, struct pt_regs, regs));
@@ -230,7 +233,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
 
         catcher = current->thread.fault_catcher;
         if (!err)
-                return 0;
+                goto out;
         else if (catcher != NULL) {
                 current->thread.fault_addr = (void *) address;
                 UML_LONGJMP(catcher, 1);
@@ -238,7 +241,7 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
         else if (current->thread.fault_addr != NULL)
                 panic("fault_addr set but no fault catcher");
         else if (!is_user && arch_fixup(ip, regs))
-                return 0;
+                goto out;
 
         if (!is_user) {
                 show_regs(container_of(regs, struct pt_regs, regs));
@@ -262,6 +265,11 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
                 current->thread.arch.faultinfo = fi;
                 force_sig_info(SIGSEGV, &si, current);
         }
+
+out:
+        if (regs)
+                current->thread.segv_regs = NULL;
+
         return 0;
 }
 
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 87df5e3acc26..016adf0985d5 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
+#include <asm/sections.h>
 #include <asm/setup.h>
 #include <as-layout.h>
 #include <arch.h>
@@ -234,7 +235,6 @@ static int panic_exit(struct notifier_block *self, unsigned long unused1,
                       void *unused2)
 {
         bust_spinlocks(1);
-        show_regs(&(current->thread.regs));
         bust_spinlocks(0);
         uml_exitcode = 1;
         os_dump_core();
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 905924b773d3..7b605e4dfffa 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -304,3 +304,11 @@ int set_signals(int enable)
 
         return ret;
 }
+
+int os_is_signal_stack(void)
+{
+        stack_t ss;
+        sigaltstack(NULL, &ss);
+
+        return ss.ss_flags & SS_ONSTACK;
+}
diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h
index 818b4a1edb5b..af36d8eabdf1 100644
--- a/arch/unicore32/include/asm/thread_info.h
+++ b/arch/unicore32/include/asm/thread_info.h
@@ -118,12 +118,6 @@ static inline struct thread_info *current_thread_info(void)
 #endif
 
 /*
- * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See <asm/hardirq.h>.
- */
-#define PREEMPT_ACTIVE  0x40000000
-
-/*
  * thread information flags:
  *  TIF_SYSCALL_TRACE   - syscall trace active
  *  TIF_SIGPENDING      - signal pending
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index c46a46be1ec6..3ba3de457d05 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -153,8 +153,6 @@ struct thread_info {
 #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
 
-#define PREEMPT_ACTIVE          0x10000000
-
 #ifdef CONFIG_X86_32
 
 #define STACK_WARN      (THREAD_SIZE/8)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index ed165d657380..d278736bf774 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -62,6 +62,7 @@ unsigned disabled_cpus;
 
 /* Processor that is doing the boot up */
 unsigned int boot_cpu_physical_apicid = -1U;
+EXPORT_SYMBOL_GPL(boot_cpu_physical_apicid);
 
 /*
  * The highest APIC ID seen during enumeration.
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index 14ef8d1dbc33..ed56a1c4ae73 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -31,6 +31,11 @@ config X86_64
         def_bool 64BIT
         select MODULES_USE_ELF_RELA
 
+config ARCH_DEFCONFIG
+        string
+        default "arch/um/configs/i386_defconfig" if X86_32
+        default "arch/um/configs/x86_64_defconfig" if X86_64
+
 config RWSEM_XCHGADD_ALGORITHM
         def_bool 64BIT
 
diff --git a/arch/x86/um/asm/processor_32.h b/arch/x86/um/asm/processor_32.h
index 6c6689e574ce..c112de81c9e1 100644
--- a/arch/x86/um/asm/processor_32.h
+++ b/arch/x86/um/asm/processor_32.h
@@ -33,6 +33,8 @@ struct arch_thread {
         .faultinfo              = { 0, 0, 0 } \
 }
 
+#define STACKSLOTS_PER_LINE 8
+
 static inline void arch_flush_thread(struct arch_thread *thread)
 {
         /* Clear any TLS still hanging */
@@ -53,4 +55,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
 #define current_text_addr() \
         ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; })
 
+#define current_sp() ({ void *sp; __asm__("movl %%esp, %0" : "=r" (sp) : ); sp; })
+#define current_bp() ({ unsigned long bp; __asm__("movl %%ebp, %0" : "=r" (bp) : ); bp; })
+
 #endif
diff --git a/arch/x86/um/asm/processor_64.h b/arch/x86/um/asm/processor_64.h
index 4b02a8455bd1..c3be85205a65 100644
--- a/arch/x86/um/asm/processor_64.h
+++ b/arch/x86/um/asm/processor_64.h
@@ -19,6 +19,8 @@ struct arch_thread {
                            .fs                  = 0, \
                            .faultinfo           = { 0, 0, 0 } }
 
+#define STACKSLOTS_PER_LINE 4
+
 static inline void arch_flush_thread(struct arch_thread *thread)
 {
 }
@@ -32,4 +34,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
 #define current_text_addr() \
         ({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })
 
+#define current_sp() ({ void *sp; __asm__("movq %%rsp, %0" : "=r" (sp) : ); sp; })
+#define current_bp() ({ unsigned long bp; __asm__("movq %%rbp, %0" : "=r" (bp) : ); bp; })
+
 #endif
diff --git a/arch/x86/um/sysrq_32.c b/arch/x86/um/sysrq_32.c
index c9bee5b8c0d3..16ee0e450e3e 100644
--- a/arch/x86/um/sysrq_32.c
+++ b/arch/x86/um/sysrq_32.c
@@ -30,70 +30,4 @@ void show_regs(struct pt_regs *regs)
         printk(" DS: %04lx ES: %04lx\n",
                0xffff & PT_REGS_DS(regs), 
                0xffff & PT_REGS_ES(regs));
-
-        show_trace(NULL, (unsigned long *) &regs);
 }
-
-/* Copied from i386. */
-static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
-{
-        return  p > (void *)tinfo &&
-                p < (void *)tinfo + THREAD_SIZE - 3;
-}
-
-/* Adapted from i386 (we also print the address we read from). */
-static inline unsigned long print_context_stack(struct thread_info *tinfo,
-                                unsigned long *stack, unsigned long ebp)
-{
-        unsigned long addr;
-
-#ifdef CONFIG_FRAME_POINTER
-        while (valid_stack_ptr(tinfo, (void *)ebp)) {
-                addr = *(unsigned long *)(ebp + 4);
-                printk("%08lx:  [<%08lx>]", ebp + 4, addr);
-                print_symbol(" %s", addr);
-                printk("\n");
-                ebp = *(unsigned long *)ebp;
-        }
-#else
-        while (valid_stack_ptr(tinfo, stack)) {
-                addr = *stack;
-                if (__kernel_text_address(addr)) {
-                        printk("%08lx:  [<%08lx>]", (unsigned long) stack, addr);
-                        print_symbol(" %s", addr);
-                        printk("\n");
-                }
-                stack++;
-        }
-#endif
-        return ebp;
-}
-
-void show_trace(struct task_struct* task, unsigned long * stack)
-{
-        unsigned long ebp;
-        struct thread_info *context;
-
-        /* Turn this into BUG_ON if possible. */
-        if (!stack) {
-                stack = (unsigned long*) &stack;
-                printk("show_trace: got NULL stack, implicit assumption task == current");
-                WARN_ON(1);
-        }
-
-        if (!task)
-                task = current;
-
-        if (task != current) {
-                ebp = (unsigned long) KSTK_EBP(task);
-        } else {
-                asm ("movl %%ebp, %0" : "=r" (ebp) : );
-        }
-
-        context = (struct thread_info *)
-                ((unsigned long)stack & (~(THREAD_SIZE - 1)));
-        print_context_stack(context, stack, ebp);
-
-        printk("\n");
-}
-
diff --git a/arch/x86/um/sysrq_64.c b/arch/x86/um/sysrq_64.c
index a0e7fb1134a0..38b4e4abd0f8 100644
--- a/arch/x86/um/sysrq_64.c
+++ b/arch/x86/um/sysrq_64.c
@@ -12,7 +12,7 @@
 #include <asm/ptrace.h>
 #include <asm/sysrq.h>
 
-void __show_regs(struct pt_regs *regs)
+void show_regs(struct pt_regs *regs)
 {
         printk("\n");
         print_modules();
@@ -33,9 +33,3 @@ void __show_regs(struct pt_regs *regs)
         printk(KERN_INFO "R13: %016lx R14: %016lx R15: %016lx\n",
                PT_REGS_R13(regs), PT_REGS_R14(regs), PT_REGS_R15(regs));
 }
-
-void show_regs(struct pt_regs *regs)
-{
-        __show_regs(regs);
-        show_trace(current, (unsigned long *) &regs);
-}
diff --git a/arch/x86/um/vdso/.gitignore b/arch/x86/um/vdso/.gitignore
new file mode 100644
index 000000000000..9cac6d072199
--- /dev/null
+++ b/arch/x86/um/vdso/.gitignore
@@ -0,0 +1,2 @@
+vdso-syms.lds
+vdso.lds
diff --git a/arch/xtensa/include/asm/thread_info.h b/arch/xtensa/include/asm/thread_info.h
index 9481004ac119..470153e8547c 100644
--- a/arch/xtensa/include/asm/thread_info.h
+++ b/arch/xtensa/include/asm/thread_info.h
@@ -76,8 +76,6 @@ struct thread_info {
 
 #endif
 
-#define PREEMPT_ACTIVE          0x10000000
-
 /*
  * macros/functions for gaining access to the thread information structure
  */
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 9ee1c76da7b9..374b57fc596d 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -163,6 +163,7 @@ static void cell_edac_init_csrows(struct mem_ctl_info *mci)
                         csrow->first_page, nr_pages);
                 break;
         }
+        of_node_put(np);
 }
 
 static int cell_edac_probe(struct platform_device *pdev)
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 211021dfec73..102674346035 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -530,12 +530,9 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev)
 
         /* Report action taken */
         edac_device_printk(edac_dev, KERN_INFO,
-                                "Giving out device to module '%s' controller "
-                                "'%s': DEV '%s' (%s)\n",
-                                edac_dev->mod_name,
-                                edac_dev->ctl_name,
-                                edac_dev_name(edac_dev),
-                                edac_op_state_to_string(edac_dev->op_state));
+                "Giving out device to module %s controller %s: DEV %s (%s)\n",
+                edac_dev->mod_name, edac_dev->ctl_name, edac_dev->dev_name,
+                edac_op_state_to_string(edac_dev->op_state));
 
         mutex_unlock(&device_ctls_mutex);
         return 0;
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 89e109022d78..e8c9ef03495b 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -788,8 +788,10 @@ int edac_mc_add_mc(struct mem_ctl_info *mci)
         }
 
         /* Report action taken */
-        edac_mc_printk(mci, KERN_INFO, "Giving out device to '%s' '%s':"
-                " DEV %s\n", mci->mod_name, mci->ctl_name, edac_dev_name(mci));
+        edac_mc_printk(mci, KERN_INFO,
+                "Giving out device to module %s controller %s: DEV %s (%s)\n",
+                mci->mod_name, mci->ctl_name, mci->dev_name,
+                edac_op_state_to_string(mci->op_state));
 
         edac_mc_owner = mci->mod_name;
 
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index dd370f92ace3..2cf44b4db80c 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -358,11 +358,9 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx)
         }
 
         edac_pci_printk(pci, KERN_INFO,
-                        "Giving out device to module '%s' controller '%s':"
-                        " DEV '%s' (%s)\n",
-                        pci->mod_name,
-                        pci->ctl_name,
-                        edac_dev_name(pci), edac_op_state_to_string(pci->op_state));
+                "Giving out device to module %s controller %s: DEV %s (%s)\n",
+                pci->mod_name, pci->ctl_name, pci->dev_name,
+                edac_op_state_to_string(pci->op_state));
 
         mutex_unlock(&edac_pci_ctls_mutex);
         return 0;
diff --git a/drivers/edac/highbank_l2_edac.c b/drivers/edac/highbank_l2_edac.c
index c2bd8c6a4349..2f193668ebc7 100644
--- a/drivers/edac/highbank_l2_edac.c
+++ b/drivers/edac/highbank_l2_edac.c
@@ -50,8 +50,15 @@ static irqreturn_t highbank_l2_err_handler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
+static const struct of_device_id hb_l2_err_of_match[] = {
+        { .compatible = "calxeda,hb-sregs-l2-ecc", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, hb_l2_err_of_match);
+
 static int highbank_l2_err_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *id;
         struct edac_device_ctl_info *dci;
         struct hb_l2_drvdata *drvdata;
         struct resource *r;
@@ -90,28 +97,32 @@ static int highbank_l2_err_probe(struct platform_device *pdev)
                 goto err;
         }
 
+        id = of_match_device(hb_l2_err_of_match, &pdev->dev);
+        dci->mod_name = pdev->dev.driver->name;
+        dci->ctl_name = id ? id->compatible : "unknown";
+        dci->dev_name = dev_name(&pdev->dev);
+
+        if (edac_device_add_device(dci))
+                goto err;
+
         drvdata->db_irq = platform_get_irq(pdev, 0);
         res = devm_request_irq(&pdev->dev, drvdata->db_irq,
                                highbank_l2_err_handler,
                                0, dev_name(&pdev->dev), dci);
         if (res < 0)
-                goto err;
+                goto err2;
 
         drvdata->sb_irq = platform_get_irq(pdev, 1);
         res = devm_request_irq(&pdev->dev, drvdata->sb_irq,
                                highbank_l2_err_handler,
                                0, dev_name(&pdev->dev), dci);
         if (res < 0)
-                goto err;
-
-        dci->mod_name = dev_name(&pdev->dev);
-        dci->dev_name = dev_name(&pdev->dev);
-
-        if (edac_device_add_device(dci))
-                goto err;
+                goto err2;
 
         devres_close_group(&pdev->dev, NULL);
         return 0;
+err2:
+        edac_device_del_device(&pdev->dev);
 err:
         devres_release_group(&pdev->dev, NULL);
         edac_device_free_ctl_info(dci);
@@ -127,12 +138,6 @@ static int highbank_l2_err_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id hb_l2_err_of_match[] = {
-        { .compatible = "calxeda,hb-sregs-l2-ecc", },
-        {},
-};
-MODULE_DEVICE_TABLE(of, hb_l2_err_of_match);
-
 static struct platform_driver highbank_l2_edac_driver = {
         .probe = highbank_l2_err_probe,
         .remove = highbank_l2_err_remove,
diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c
index 4695dd2d71fd..f784de1dc793 100644
--- a/drivers/edac/highbank_mc_edac.c
+++ b/drivers/edac/highbank_mc_edac.c
@@ -26,31 +26,40 @@
 #include "edac_module.h"
 
 /* DDR Ctrlr Error Registers */
-#define HB_DDR_ECC_OPT                  0x128
-#define HB_DDR_ECC_U_ERR_ADDR           0x130
-#define HB_DDR_ECC_U_ERR_STAT           0x134
-#define HB_DDR_ECC_U_ERR_DATAL          0x138
-#define HB_DDR_ECC_U_ERR_DATAH          0x13c
-#define HB_DDR_ECC_C_ERR_ADDR           0x140
-#define HB_DDR_ECC_C_ERR_STAT           0x144
-#define HB_DDR_ECC_C_ERR_DATAL          0x148
-#define HB_DDR_ECC_C_ERR_DATAH          0x14c
-#define HB_DDR_ECC_INT_STATUS           0x180
-#define HB_DDR_ECC_INT_ACK              0x184
-#define HB_DDR_ECC_U_ERR_ID             0x424
-#define HB_DDR_ECC_C_ERR_ID             0x428
 
-#define HB_DDR_ECC_INT_STAT_CE          0x8
-#define HB_DDR_ECC_INT_STAT_DOUBLE_CE   0x10
-#define HB_DDR_ECC_INT_STAT_UE          0x20
-#define HB_DDR_ECC_INT_STAT_DOUBLE_UE   0x40
+#define HB_DDR_ECC_ERR_BASE             0x128
+#define MW_DDR_ECC_ERR_BASE             0x1b4
+
+#define HB_DDR_ECC_OPT                  0x00
+#define HB_DDR_ECC_U_ERR_ADDR           0x08
+#define HB_DDR_ECC_U_ERR_STAT           0x0c
+#define HB_DDR_ECC_U_ERR_DATAL          0x10
+#define HB_DDR_ECC_U_ERR_DATAH          0x14
+#define HB_DDR_ECC_C_ERR_ADDR           0x18
+#define HB_DDR_ECC_C_ERR_STAT           0x1c
+#define HB_DDR_ECC_C_ERR_DATAL          0x20
+#define HB_DDR_ECC_C_ERR_DATAH          0x24
 
 #define HB_DDR_ECC_OPT_MODE_MASK        0x3
 #define HB_DDR_ECC_OPT_FWC              0x100
 #define HB_DDR_ECC_OPT_XOR_SHIFT        16
 
+/* DDR Ctrlr Interrupt Registers */
+
+#define HB_DDR_ECC_INT_BASE             0x180
+#define MW_DDR_ECC_INT_BASE             0x218
+
+#define HB_DDR_ECC_INT_STATUS           0x00
+#define HB_DDR_ECC_INT_ACK              0x04
+
+#define HB_DDR_ECC_INT_STAT_CE          0x8
+#define HB_DDR_ECC_INT_STAT_DOUBLE_CE   0x10
+#define HB_DDR_ECC_INT_STAT_UE          0x20
+#define HB_DDR_ECC_INT_STAT_DOUBLE_UE   0x40
+
 struct hb_mc_drvdata {
-        void __iomem *mc_vbase;
+        void __iomem *mc_err_base;
+        void __iomem *mc_int_base;
 };
 
 static irqreturn_t highbank_mc_err_handler(int irq, void *dev_id)
@@ -60,10 +69,10 @@ static irqreturn_t highbank_mc_err_handler(int irq, void *dev_id)
         u32 status, err_addr;
 
         /* Read the interrupt status register */
-        status = readl(drvdata->mc_vbase + HB_DDR_ECC_INT_STATUS);
+        status = readl(drvdata->mc_int_base + HB_DDR_ECC_INT_STATUS);
 
         if (status & HB_DDR_ECC_INT_STAT_UE) {
-                err_addr = readl(drvdata->mc_vbase + HB_DDR_ECC_U_ERR_ADDR);
+                err_addr = readl(drvdata->mc_err_base + HB_DDR_ECC_U_ERR_ADDR);
                 edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
                                      err_addr >> PAGE_SHIFT,
                                      err_addr & ~PAGE_MASK, 0,
@@ -71,9 +80,9 @@ static irqreturn_t highbank_mc_err_handler(int irq, void *dev_id)
                                      mci->ctl_name, "");
         }
         if (status & HB_DDR_ECC_INT_STAT_CE) {
-                u32 syndrome = readl(drvdata->mc_vbase + HB_DDR_ECC_C_ERR_STAT);
+                u32 syndrome = readl(drvdata->mc_err_base + HB_DDR_ECC_C_ERR_STAT);
                 syndrome = (syndrome >> 8) & 0xff;
-                err_addr = readl(drvdata->mc_vbase + HB_DDR_ECC_C_ERR_ADDR);
+                err_addr = readl(drvdata->mc_err_base + HB_DDR_ECC_C_ERR_ADDR);
                 edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
                                      err_addr >> PAGE_SHIFT,
                                      err_addr & ~PAGE_MASK, syndrome,
@@ -82,66 +91,79 @@ static irqreturn_t highbank_mc_err_handler(int irq, void *dev_id)
         }
 
         /* clear the error, clears the interrupt */
-        writel(status, drvdata->mc_vbase + HB_DDR_ECC_INT_ACK);
+        writel(status, drvdata->mc_int_base + HB_DDR_ECC_INT_ACK);
         return IRQ_HANDLED;
 }
 
-#ifdef CONFIG_EDAC_DEBUG
-static ssize_t highbank_mc_err_inject_write(struct file *file,
-                                      const char __user *data,
-                                      size_t count, loff_t *ppos)
+static void highbank_mc_err_inject(struct mem_ctl_info *mci, u8 synd)
 {
-        struct mem_ctl_info *mci = file->private_data;
         struct hb_mc_drvdata *pdata = mci->pvt_info;
-        char buf[32];
-        size_t buf_size;
         u32 reg;
+
+        reg = readl(pdata->mc_err_base + HB_DDR_ECC_OPT);
+        reg &= HB_DDR_ECC_OPT_MODE_MASK;
+        reg |= (synd << HB_DDR_ECC_OPT_XOR_SHIFT) | HB_DDR_ECC_OPT_FWC;
+        writel(reg, pdata->mc_err_base + HB_DDR_ECC_OPT);
+}
+
+#define to_mci(k) container_of(k, struct mem_ctl_info, dev)
+
+static ssize_t highbank_mc_inject_ctrl(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct mem_ctl_info *mci = to_mci(dev);
         u8 synd;
 
-        buf_size = min(count, (sizeof(buf)-1));
-        if (copy_from_user(buf, data, buf_size))
-                return -EFAULT;
-        buf[buf_size] = 0;
+        if (kstrtou8(buf, 16, &synd))
+                return -EINVAL;
 
-        if (!kstrtou8(buf, 16, &synd)) {
-                reg = readl(pdata->mc_vbase + HB_DDR_ECC_OPT);
-                reg &= HB_DDR_ECC_OPT_MODE_MASK;
-                reg |= (synd << HB_DDR_ECC_OPT_XOR_SHIFT) | HB_DDR_ECC_OPT_FWC;
-                writel(reg, pdata->mc_vbase + HB_DDR_ECC_OPT);
-        }
+        highbank_mc_err_inject(mci, synd);
 
         return count;
 }
 
-static const struct file_operations highbank_mc_debug_inject_fops = {
-        .open = simple_open,
-        .write = highbank_mc_err_inject_write,
-        .llseek = generic_file_llseek,
+static DEVICE_ATTR(inject_ctrl, S_IWUSR, NULL, highbank_mc_inject_ctrl);
+
+struct hb_mc_settings {
+        int     err_offset;
+        int     int_offset;
 };
 
-static void highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci)
-{
-        if (mci->debugfs)
-                debugfs_create_file("inject_ctrl", S_IWUSR, mci->debugfs, mci,
-                                    &highbank_mc_debug_inject_fops);
-;
-}
-#else
-static void highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci)
-{}
-#endif
+static struct hb_mc_settings hb_settings = {
+        .err_offset = HB_DDR_ECC_ERR_BASE,
+        .int_offset = HB_DDR_ECC_INT_BASE,
+};
+
+static struct hb_mc_settings mw_settings = {
+        .err_offset = MW_DDR_ECC_ERR_BASE,
+        .int_offset = MW_DDR_ECC_INT_BASE,
+};
+
+static struct of_device_id hb_ddr_ctrl_of_match[] = {
+        { .compatible = "calxeda,hb-ddr-ctrl",          .data = &hb_settings },
+        { .compatible = "calxeda,ecx-2000-ddr-ctrl",    .data = &mw_settings },
+        {},
+};
+MODULE_DEVICE_TABLE(of, hb_ddr_ctrl_of_match);
 
 static int highbank_mc_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *id;
+        const struct hb_mc_settings *settings;
         struct edac_mc_layer layers[2];
         struct mem_ctl_info *mci;
         struct hb_mc_drvdata *drvdata;
         struct dimm_info *dimm;
         struct resource *r;
+        void __iomem *base;
         u32 control;
         int irq;
         int res = 0;
 
+        id = of_match_device(hb_ddr_ctrl_of_match, &pdev->dev);
+        if (!id)
+                return -ENODEV;
+
         layers[0].type = EDAC_MC_LAYER_CHIP_SELECT;
         layers[0].size = 1;
         layers[0].is_virt_csrow = true;
@@ -174,35 +196,31 @@ static int highbank_mc_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        drvdata->mc_vbase = devm_ioremap(&pdev->dev,
-                                          r->start, resource_size(r));
-        if (!drvdata->mc_vbase) {
+        base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
+        if (!base) {
                 dev_err(&pdev->dev, "Unable to map regs\n");
                 res = -ENOMEM;
                 goto err;
         }
 
-        control = readl(drvdata->mc_vbase + HB_DDR_ECC_OPT) & 0x3;
+        settings = id->data;
+        drvdata->mc_err_base = base + settings->err_offset;
+        drvdata->mc_int_base = base + settings->int_offset;
+
+        control = readl(drvdata->mc_err_base + HB_DDR_ECC_OPT) & 0x3;
         if (!control || (control == 0x2)) {
                 dev_err(&pdev->dev, "No ECC present, or ECC disabled\n");
                 res = -ENODEV;
                 goto err;
         }
 
-        irq = platform_get_irq(pdev, 0);
-        res = devm_request_irq(&pdev->dev, irq, highbank_mc_err_handler,
-                               0, dev_name(&pdev->dev), mci);
-        if (res < 0) {
-                dev_err(&pdev->dev, "Unable to request irq %d\n", irq);
-                goto err;
-        }
-
         mci->mtype_cap = MEM_FLAG_DDR3;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED;
         mci->edac_cap = EDAC_FLAG_SECDED;
-        mci->mod_name = dev_name(&pdev->dev);
+        mci->mod_name = pdev->dev.driver->name;
         mci->mod_ver = "1";
-        mci->ctl_name = dev_name(&pdev->dev);
+        mci->ctl_name = id->compatible;
+        mci->dev_name = dev_name(&pdev->dev);
         mci->scrub_mode = SCRUB_SW_SRC;
 
         /* Only a single 4GB DIMM is supported */
@@ -217,10 +235,20 @@ static int highbank_mc_probe(struct platform_device *pdev)
         if (res < 0)
                 goto err;
 
-        highbank_mc_create_debugfs_nodes(mci);
+        irq = platform_get_irq(pdev, 0);
+        res = devm_request_irq(&pdev->dev, irq, highbank_mc_err_handler,
+                               0, dev_name(&pdev->dev), mci);
+        if (res < 0) {
+                dev_err(&pdev->dev, "Unable to request irq %d\n", irq);
+                goto err2;
+        }
+
+        device_create_file(&mci->dev, &dev_attr_inject_ctrl);
 
         devres_close_group(&pdev->dev, NULL);
         return 0;
+err2:
+        edac_mc_del_mc(&pdev->dev);
 err:
         devres_release_group(&pdev->dev, NULL);
         edac_mc_free(mci);
@@ -231,17 +259,12 @@ static int highbank_mc_remove(struct platform_device *pdev)
 {
         struct mem_ctl_info *mci = platform_get_drvdata(pdev);
 
+        device_remove_file(&mci->dev, &dev_attr_inject_ctrl);
         edac_mc_del_mc(&pdev->dev);
         edac_mc_free(mci);
         return 0;
 }
 
-static const struct of_device_id hb_ddr_ctrl_of_match[] = {
-        { .compatible = "calxeda,hb-ddr-ctrl", },
-        {},
-};
-MODULE_DEVICE_TABLE(of, hb_ddr_ctrl_of_match);
-
 static struct platform_driver highbank_mc_edac_driver = {
         .probe = highbank_mc_probe,
         .remove = highbank_mc_remove,
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 3eb32f62d72a..fd46b0bd5f2a 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -327,28 +327,6 @@ err:
 }
 EXPORT_SYMBOL(mpc85xx_pci_err_probe);
 
-static int mpc85xx_pci_err_remove(struct platform_device *op)
-{
-        struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
-        struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
-
-        edac_dbg(0, "\n");
-
-        out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_CAP_DR,
-                 orig_pci_err_cap_dr);
-
-        out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en);
-
-        edac_pci_del_device(pci->dev);
-
-        if (edac_op_state == EDAC_OPSTATE_INT)
-                irq_dispose_mapping(pdata->irq);
-
-        edac_pci_free_ctl_info(pci);
-
-        return 0;
-}
-
 #endif                          /* CONFIG_PCI */
 
 /**************************** L2 Err device ***************************/
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 88f60c5fecbc..8472405c5586 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -34,7 +34,7 @@ static int probed;
 /*
  * Alter this version for the module when modifications are made
  */
-#define SBRIDGE_REVISION    " Ver: 1.0.0 "
+#define SBRIDGE_REVISION    " Ver: 1.1.0 "
 #define EDAC_MOD_STR      "sbridge_edac"
 
 /*
@@ -83,11 +83,17 @@ static int probed;
 #define PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_ERR3    0x3c77  /* 16.7 */
 
 /* Devices 12 Function 6, Offsets 0x80 to 0xcc */
-static const u32 dram_rule[] = {
+static const u32 sbridge_dram_rule[] = {
         0x80, 0x88, 0x90, 0x98, 0xa0,
         0xa8, 0xb0, 0xb8, 0xc0, 0xc8,
 };
-#define MAX_SAD         ARRAY_SIZE(dram_rule)
+
+static const u32 ibridge_dram_rule[] = {
+        0x60, 0x68, 0x70, 0x78, 0x80,
+        0x88, 0x90, 0x98, 0xa0, 0xa8,
+        0xb0, 0xb8, 0xc0, 0xc8, 0xd0,
+        0xd8, 0xe0, 0xe8, 0xf0, 0xf8,
+};
 
 #define SAD_LIMIT(reg)          ((GET_BITFIELD(reg, 6, 25) << 26) | 0x3ffffff)
 #define DRAM_ATTR(reg)          GET_BITFIELD(reg, 2,  3)
@@ -108,43 +114,50 @@ static char *get_dram_attr(u32 reg)
         }
 }
 
-static const u32 interleave_list[] = {
+static const u32 sbridge_interleave_list[] = {
         0x84, 0x8c, 0x94, 0x9c, 0xa4,
         0xac, 0xb4, 0xbc, 0xc4, 0xcc,
 };
-#define MAX_INTERLEAVE  ARRAY_SIZE(interleave_list)
-
-#define SAD_PKG0(reg)           GET_BITFIELD(reg, 0, 2)
-#define SAD_PKG1(reg)           GET_BITFIELD(reg, 3, 5)
-#define SAD_PKG2(reg)           GET_BITFIELD(reg, 8, 10)
-#define SAD_PKG3(reg)           GET_BITFIELD(reg, 11, 13)
-#define SAD_PKG4(reg)           GET_BITFIELD(reg, 16, 18)
-#define SAD_PKG5(reg)           GET_BITFIELD(reg, 19, 21)
-#define SAD_PKG6(reg)           GET_BITFIELD(reg, 24, 26)
-#define SAD_PKG7(reg)           GET_BITFIELD(reg, 27, 29)
-
-static inline int sad_pkg(u32 reg, int interleave)
+
+static const u32 ibridge_interleave_list[] = {
+        0x64, 0x6c, 0x74, 0x7c, 0x84,
+        0x8c, 0x94, 0x9c, 0xa4, 0xac,
+        0xb4, 0xbc, 0xc4, 0xcc, 0xd4,
+        0xdc, 0xe4, 0xec, 0xf4, 0xfc,
+};
+
+struct interleave_pkg {
+        unsigned char start;
+        unsigned char end;
+};
+
+static const struct interleave_pkg sbridge_interleave_pkg[] = {
+        { 0, 2 },
+        { 3, 5 },
+        { 8, 10 },
+        { 11, 13 },
+        { 16, 18 },
+        { 19, 21 },
+        { 24, 26 },
+        { 27, 29 },
+};
+
+static const struct interleave_pkg ibridge_interleave_pkg[] = {
+        { 0, 3 },
+        { 4, 7 },
+        { 8, 11 },
+        { 12, 15 },
+        { 16, 19 },
+        { 20, 23 },
+        { 24, 27 },
+        { 28, 31 },
+};
+
+static inline int sad_pkg(const struct interleave_pkg *table, u32 reg,
+                          int interleave)
 {
-        switch (interleave) {
-        case 0:
-                return SAD_PKG0(reg);
-        case 1:
-                return SAD_PKG1(reg);
-        case 2:
-                return SAD_PKG2(reg);
-        case 3:
-                return SAD_PKG3(reg);
-        case 4:
-                return SAD_PKG4(reg);
-        case 5:
-                return SAD_PKG5(reg);
-        case 6:
-                return SAD_PKG6(reg);
-        case 7:
-                return SAD_PKG7(reg);
-        default:
-                return -EINVAL;
-        }
+        return GET_BITFIELD(reg, table[interleave].start,
+                            table[interleave].end);
 }
 
 /* Devices 12 Function 7 */
@@ -262,7 +275,9 @@ static const u32 correrrthrsld[] = {
 
 /* Device 17, function 0 */
 
-#define RANK_CFG_A              0x0328
+#define SB_RANK_CFG_A           0x0328
+
+#define IB_RANK_CFG_A           0x0320
 
 #define IS_RDIMM_ENABLED(reg)           GET_BITFIELD(reg, 11, 11)
 
@@ -273,8 +288,23 @@ static const u32 correrrthrsld[] = {
 #define NUM_CHANNELS    4
 #define MAX_DIMMS       3               /* Max DIMMS per channel */
 
+enum type {
+        SANDY_BRIDGE,
+        IVY_BRIDGE,
+};
+
+struct sbridge_pvt;
 struct sbridge_info {
-        u32     mcmtr;
+        enum type       type;
+        u32             mcmtr;
+        u32             rankcfgr;
+        u64             (*get_tolm)(struct sbridge_pvt *pvt);
+        u64             (*get_tohm)(struct sbridge_pvt *pvt);
+        const u32       *dram_rule;
+        const u32       *interleave_list;
+        const struct interleave_pkg *interleave_pkg;
+        u8              max_sad;
+        u8              max_interleave;
 };
 
 struct sbridge_channel {
@@ -305,8 +335,9 @@ struct sbridge_dev {
 
 struct sbridge_pvt {
         struct pci_dev          *pci_ta, *pci_ddrio, *pci_ras;
-        struct pci_dev          *pci_sad0, *pci_sad1, *pci_ha0;
-        struct pci_dev          *pci_br;
+        struct pci_dev          *pci_sad0, *pci_sad1;
+        struct pci_dev          *pci_ha0, *pci_ha1;
+        struct pci_dev          *pci_br0, *pci_br1;
         struct pci_dev          *pci_tad[NUM_CHANNELS];
 
         struct sbridge_dev      *sbridge_dev;
@@ -364,11 +395,75 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
         {0,}                    /* 0 terminated list. */
 };
 
+/* This changes depending if 1HA or 2HA:
+ * 1HA:
+ *      0x0eb8 (17.0) is DDRIO0
+ * 2HA:
+ *      0x0ebc (17.4) is DDRIO0
+ */
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_1HA_DDRIO0      0x0eb8
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_2HA_DDRIO0      0x0ebc
+
+/* pci ids */
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0             0x0ea0
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA          0x0ea8
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_RAS         0x0e71
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD0        0x0eaa
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD1        0x0eab
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD2        0x0eac
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD3        0x0ead
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_SAD                 0x0ec8
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_BR0                 0x0ec9
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_BR1                 0x0eca
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1             0x0e60
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_TA          0x0e68
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_RAS         0x0e79
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_TAD0        0x0e6a
+#define PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_TAD1        0x0e6b
+
+static const struct pci_id_descr pci_dev_descr_ibridge[] = {
+                /* Processor Home Agent */
+        { PCI_DESCR(14, 0, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0, 0)      },
+
+                /* Memory controller */
+        { PCI_DESCR(15, 0, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA, 0)   },
+        { PCI_DESCR(15, 1, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_RAS, 0)  },
+        { PCI_DESCR(15, 2, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD0, 0) },
+        { PCI_DESCR(15, 3, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD1, 0) },
+        { PCI_DESCR(15, 4, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD2, 0) },
+        { PCI_DESCR(15, 5, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TAD3, 0) },
+
+                /* System Address Decoder */
+        { PCI_DESCR(22, 0, PCI_DEVICE_ID_INTEL_IBRIDGE_SAD, 0)          },
+
+                /* Broadcast Registers */
+        { PCI_DESCR(22, 1, PCI_DEVICE_ID_INTEL_IBRIDGE_BR0, 1)          },
+        { PCI_DESCR(22, 2, PCI_DEVICE_ID_INTEL_IBRIDGE_BR1, 0)          },
+
+                /* Optional, mode 2HA */
+        { PCI_DESCR(28, 0, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1, 1)      },
+#if 0
+        { PCI_DESCR(29, 0, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_TA, 1)   },
+        { PCI_DESCR(29, 1, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_RAS, 1)  },
+#endif
+        { PCI_DESCR(29, 2, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_TAD0, 1) },
+        { PCI_DESCR(29, 3, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1_TAD1, 1) },
+
+        { PCI_DESCR(17, 0, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_1HA_DDRIO0, 1) },
+        { PCI_DESCR(17, 4, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_2HA_DDRIO0, 1) },
+};
+
+static const struct pci_id_table pci_dev_descr_ibridge_table[] = {
+        PCI_ID_TABLE_ENTRY(pci_dev_descr_ibridge),
+        {0,}                    /* 0 terminated list. */
+};
+
 /*
  *      pci_device_id   table for which devices we are looking for
  */
 static DEFINE_PCI_DEVICE_TABLE(sbridge_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
+        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA)},
         {0,}                    /* 0 terminated list. */
 };
 
@@ -458,6 +553,52 @@ static void free_sbridge_dev(struct sbridge_dev *sbridge_dev)
         kfree(sbridge_dev);
 }
 
+static u64 sbridge_get_tolm(struct sbridge_pvt *pvt)
+{
+        u32 reg;
+
+        /* Address range is 32:28 */
+        pci_read_config_dword(pvt->pci_sad1, TOLM, &reg);
+        return GET_TOLM(reg);
+}
+
+static u64 sbridge_get_tohm(struct sbridge_pvt *pvt)
+{
+        u32 reg;
+
+        pci_read_config_dword(pvt->pci_sad1, TOHM, &reg);
+        return GET_TOHM(reg);
+}
+
+static u64 ibridge_get_tolm(struct sbridge_pvt *pvt)
+{
+        u32 reg;
+
+        pci_read_config_dword(pvt->pci_br1, TOLM, &reg);
+
+        return GET_TOLM(reg);
+}
+
+static u64 ibridge_get_tohm(struct sbridge_pvt *pvt)
+{
+        u32 reg;
+
+        pci_read_config_dword(pvt->pci_br1, TOHM, &reg);
+
+        return GET_TOHM(reg);
+}
+
+static inline u8 sad_pkg_socket(u8 pkg)
+{
+        /* on Ivy Bridge, nodeID is SASS, where A is HA and S is node id */
+        return (pkg >> 3) | (pkg & 0x3);
+}
+
+static inline u8 sad_pkg_ha(u8 pkg)
+{
+        return (pkg >> 2) & 0x1;
+}
+
 /****************************************************************************
                         Memory check routines
  ****************************************************************************/
@@ -520,10 +661,10 @@ static int get_dimm_config(struct mem_ctl_info *mci)
         enum edac_type mode;
         enum mem_type mtype;
 
-        pci_read_config_dword(pvt->pci_br, SAD_TARGET, &reg);
+        pci_read_config_dword(pvt->pci_br0, SAD_TARGET, &reg);
         pvt->sbridge_dev->source_id = SOURCE_ID(reg);
 
-        pci_read_config_dword(pvt->pci_br, SAD_CONTROL, &reg);
+        pci_read_config_dword(pvt->pci_br0, SAD_CONTROL, &reg);
         pvt->sbridge_dev->node_id = NODE_ID(reg);
         edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n",
                  pvt->sbridge_dev->mc,
@@ -558,7 +699,8 @@ static int get_dimm_config(struct mem_ctl_info *mci)
         }
 
         if (pvt->pci_ddrio) {
-                pci_read_config_dword(pvt->pci_ddrio, RANK_CFG_A, &reg);
+                pci_read_config_dword(pvt->pci_ddrio, pvt->info.rankcfgr,
+                                      &reg);
                 if (IS_RDIMM_ENABLED(reg)) {
                         /* FIXME: Can also be LRDIMM */
                         edac_dbg(0, "Memory is registered\n");
@@ -629,19 +771,14 @@ static void get_memory_layout(const struct mem_ctl_info *mci)
          * Step 1) Get TOLM/TOHM ranges
          */
 
-        /* Address range is 32:28 */
-        pci_read_config_dword(pvt->pci_sad1, TOLM,
-                              &reg);
-        pvt->tolm = GET_TOLM(reg);
+        pvt->tolm = pvt->info.get_tolm(pvt);
         tmp_mb = (1 + pvt->tolm) >> 20;
 
         mb = div_u64_rem(tmp_mb, 1000, &kb);
         edac_dbg(0, "TOLM: %u.%03u GB (0x%016Lx)\n", mb, kb, (u64)pvt->tolm);
 
         /* Address range is already 45:25 */
-        pci_read_config_dword(pvt->pci_sad1, TOHM,
-                              &reg);
-        pvt->tohm = GET_TOHM(reg);
+        pvt->tohm = pvt->info.get_tohm(pvt);
         tmp_mb = (1 + pvt->tohm) >> 20;
 
         mb = div_u64_rem(tmp_mb, 1000, &kb);
@@ -654,9 +791,9 @@ static void get_memory_layout(const struct mem_ctl_info *mci)
          * algorithm bellow.
          */
         prv = 0;
-        for (n_sads = 0; n_sads < MAX_SAD; n_sads++) {
+        for (n_sads = 0; n_sads < pvt->info.max_sad; n_sads++) {
                 /* SAD_LIMIT Address range is 45:26 */
-                pci_read_config_dword(pvt->pci_sad0, dram_rule[n_sads],
+                pci_read_config_dword(pvt->pci_sad0, pvt->info.dram_rule[n_sads],
                                       &reg);
                 limit = SAD_LIMIT(reg);
 
@@ -677,15 +814,16 @@ static void get_memory_layout(const struct mem_ctl_info *mci)
                          reg);
                 prv = limit;
 
-                pci_read_config_dword(pvt->pci_sad0, interleave_list[n_sads],
+                pci_read_config_dword(pvt->pci_sad0, pvt->info.interleave_list[n_sads],
                                       &reg);
-                sad_interl = sad_pkg(reg, 0);
+                sad_interl = sad_pkg(pvt->info.interleave_pkg, reg, 0);
                 for (j = 0; j < 8; j++) {
-                        if (j > 0 && sad_interl == sad_pkg(reg, j))
+                        u32 pkg = sad_pkg(pvt->info.interleave_pkg, reg, j);
+                        if (j > 0 && sad_interl == pkg)
                                 break;
 
                         edac_dbg(0, "SAD#%d, interleave #%d: %d\n",
-                                 n_sads, j, sad_pkg(reg, j));
+                                 n_sads, j, pkg);
                 }
         }
 
@@ -797,12 +935,13 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
 {
         struct mem_ctl_info     *new_mci;
         struct sbridge_pvt *pvt = mci->pvt_info;
+        struct pci_dev          *pci_ha;
         int                     n_rir, n_sads, n_tads, sad_way, sck_xch;
         int                     sad_interl, idx, base_ch;
         int                     interleave_mode;
-        unsigned                sad_interleave[MAX_INTERLEAVE];
+        unsigned                sad_interleave[pvt->info.max_interleave];
         u32                     reg;
-        u8                      ch_way,sck_way;
+        u8                      ch_way, sck_way, pkg, sad_ha = 0;
         u32                     tad_offset;
         u32                     rir_way;
         u32                     mb, kb;
@@ -828,8 +967,8 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
         /*
          * Step 1) Get socket
          */
-        for (n_sads = 0; n_sads < MAX_SAD; n_sads++) {
-                pci_read_config_dword(pvt->pci_sad0, dram_rule[n_sads],
+        for (n_sads = 0; n_sads < pvt->info.max_sad; n_sads++) {
+                pci_read_config_dword(pvt->pci_sad0, pvt->info.dram_rule[n_sads],
                                       &reg);
 
                 if (!DRAM_RULE_ENABLE(reg))
@@ -844,53 +983,65 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
                         break;
                 prv = limit;
         }
-        if (n_sads == MAX_SAD) {
+        if (n_sads == pvt->info.max_sad) {
                 sprintf(msg, "Can't discover the memory socket");
                 return -EINVAL;
         }
         *area_type = get_dram_attr(reg);
         interleave_mode = INTERLEAVE_MODE(reg);
 
-        pci_read_config_dword(pvt->pci_sad0, interleave_list[n_sads],
+        pci_read_config_dword(pvt->pci_sad0, pvt->info.interleave_list[n_sads],
                               &reg);
-        sad_interl = sad_pkg(reg, 0);
-        for (sad_way = 0; sad_way < 8; sad_way++) {
-                if (sad_way > 0 && sad_interl == sad_pkg(reg, sad_way))
+
+        if (pvt->info.type == SANDY_BRIDGE) {
+                sad_interl = sad_pkg(pvt->info.interleave_pkg, reg, 0);
+                for (sad_way = 0; sad_way < 8; sad_way++) {
+                        u32 pkg = sad_pkg(pvt->info.interleave_pkg, reg, sad_way);
+                        if (sad_way > 0 && sad_interl == pkg)
+                                break;
+                        sad_interleave[sad_way] = pkg;
+                        edac_dbg(0, "SAD interleave #%d: %d\n",
+                                 sad_way, sad_interleave[sad_way]);
+                }
+                edac_dbg(0, "mc#%d: Error detected on SAD#%d: address 0x%016Lx < 0x%016Lx, Interleave [%d:6]%s\n",
+                         pvt->sbridge_dev->mc,
+                         n_sads,
+                         addr,
+                         limit,
+                         sad_way + 7,
+                         !interleave_mode ? "" : "XOR[18:16]");
+                if (interleave_mode)
+                        idx = ((addr >> 6) ^ (addr >> 16)) & 7;
+                else
+                        idx = (addr >> 6) & 7;
+                switch (sad_way) {
+                case 1:
+                        idx = 0;
                         break;
-                sad_interleave[sad_way] = sad_pkg(reg, sad_way);
-                edac_dbg(0, "SAD interleave #%d: %d\n",
-                         sad_way, sad_interleave[sad_way]);
-        }
-        edac_dbg(0, "mc#%d: Error detected on SAD#%d: address 0x%016Lx < 0x%016Lx, Interleave [%d:6]%s\n",
-                 pvt->sbridge_dev->mc,
-                 n_sads,
-                 addr,
-                 limit,
-                 sad_way + 7,
-                 interleave_mode ? "" : "XOR[18:16]");
-        if (interleave_mode)
-                idx = ((addr >> 6) ^ (addr >> 16)) & 7;
-        else
+                case 2:
+                        idx = idx & 1;
+                        break;
+                case 4:
+                        idx = idx & 3;
+                        break;
+                case 8:
+                        break;
+                default:
+                        sprintf(msg, "Can't discover socket interleave");
+                        return -EINVAL;
+                }
+                *socket = sad_interleave[idx];
+                edac_dbg(0, "SAD interleave index: %d (wayness %d) = CPU socket %d\n",
+                         idx, sad_way, *socket);
+        } else {
+                /* Ivy Bridge's SAD mode doesn't support XOR interleave mode */
                 idx = (addr >> 6) & 7;
-        switch (sad_way) {
-        case 1:
-                idx = 0;
-                break;
-        case 2:
-                idx = idx & 1;
-                break;
-        case 4:
-                idx = idx & 3;
-                break;
-        case 8:
-                break;
-        default:
-                sprintf(msg, "Can't discover socket interleave");
-                return -EINVAL;
+                pkg = sad_pkg(pvt->info.interleave_pkg, reg, idx);
+                *socket = sad_pkg_socket(pkg);
+                sad_ha = sad_pkg_ha(pkg);
+                edac_dbg(0, "SAD interleave package: %d = CPU socket %d, HA %d\n",
+                         idx, *socket, sad_ha);
         }
-        *socket = sad_interleave[idx];
-        edac_dbg(0, "SAD interleave index: %d (wayness %d) = CPU socket %d\n",
-                 idx, sad_way, *socket);
 
         /*
          * Move to the proper node structure, in order to access the
@@ -909,9 +1060,16 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
          * Step 2) Get memory channel
          */
         prv = 0;
+        if (pvt->info.type == SANDY_BRIDGE)
+                pci_ha = pvt->pci_ha0;
+        else {
+                if (sad_ha)
+                        pci_ha = pvt->pci_ha1;
+                else
+                        pci_ha = pvt->pci_ha0;
+        }
         for (n_tads = 0; n_tads < MAX_TAD; n_tads++) {
-                pci_read_config_dword(pvt->pci_ha0, tad_dram_rule[n_tads],
-                                      &reg);
+                pci_read_config_dword(pci_ha, tad_dram_rule[n_tads], &reg);
                 limit = TAD_LIMIT(reg);
                 if (limit <= prv) {
                         sprintf(msg, "Can't discover the memory channel");
@@ -921,14 +1079,13 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
                         break;
                 prv = limit;
         }
+        if (n_tads == MAX_TAD) {
+                sprintf(msg, "Can't discover the memory channel");
+                return -EINVAL;
+        }
+
         ch_way = TAD_CH(reg) + 1;
         sck_way = TAD_SOCK(reg) + 1;
-        /*
-         * FIXME: Is it right to always use channel 0 for offsets?
-         */
-        pci_read_config_dword(pvt->pci_tad[0],
-                                tad_ch_nilv_offset[n_tads],
-                                &tad_offset);
 
         if (ch_way == 3)
                 idx = addr >> 6;
@@ -958,6 +1115,10 @@ static int get_memory_error_data(struct mem_ctl_info *mci,
         }
         *channel_mask = 1 << base_ch;
 
+        pci_read_config_dword(pvt->pci_tad[base_ch],
+                                tad_ch_nilv_offset[n_tads],
+                                &tad_offset);
+
         if (pvt->is_mirrored) {
                 *channel_mask |= 1 << ((base_ch + 2) % 4);
                 switch(ch_way) {
@@ -1091,12 +1252,6 @@ static void sbridge_put_all_devices(void)
         }
 }
 
-/*
- *      sbridge_get_all_devices Find and perform 'get' operation on the MCH's
- *                      device/functions we want to reference for this driver
- *
- *                      Need to 'get' device 16 func 1 and func 2
- */
 static int sbridge_get_onedevice(struct pci_dev **prev,
                                  u8 *num_mc,
                                  const struct pci_id_table *table,
@@ -1198,11 +1353,21 @@ static int sbridge_get_onedevice(struct pci_dev **prev,
         return 0;
 }
 
-static int sbridge_get_all_devices(u8 *num_mc)
+/*
+ * sbridge_get_all_devices - Find and perform 'get' operation on the MCH's
+ *                           device/functions we want to reference for this driver.
+ *                           Need to 'get' device 16 func 1 and func 2.
+ * @num_mc: pointer to the memory controllers count, to be incremented in case
+ *          of success.
+ * @table: model specific table
+ *
+ * returns 0 in case of success or error code
+ */
+static int sbridge_get_all_devices(u8 *num_mc,
+                                   const struct pci_id_table *table)
 {
         int i, rc;
         struct pci_dev *pdev = NULL;
-        const struct pci_id_table *table = pci_dev_descr_sbridge_table;
 
         while (table && table->descr) {
                 for (i = 0; i < table->n_devs; i++) {
@@ -1226,8 +1391,8 @@ static int sbridge_get_all_devices(u8 *num_mc)
         return 0;
 }
 
-static int mci_bind_devs(struct mem_ctl_info *mci,
-                         struct sbridge_dev *sbridge_dev)
+static int sbridge_mci_bind_devs(struct mem_ctl_info *mci,
+                                 struct sbridge_dev *sbridge_dev)
 {
         struct sbridge_pvt *pvt = mci->pvt_info;
         struct pci_dev *pdev;
@@ -1255,7 +1420,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
                 case 13:
                         switch (func) {
                         case 6:
-                                pvt->pci_br = pdev;
+                                pvt->pci_br0 = pdev;
                                 break;
                         default:
                                 goto error;
@@ -1329,6 +1494,131 @@ error:
         return -EINVAL;
 }
 
+static int ibridge_mci_bind_devs(struct mem_ctl_info *mci,
+                                 struct sbridge_dev *sbridge_dev)
+{
+        struct sbridge_pvt *pvt = mci->pvt_info;
+        struct pci_dev *pdev, *tmp;
+        int i, func, slot;
+        bool mode_2ha = false;
+
+        tmp = pci_get_device(PCI_VENDOR_ID_INTEL,
+                             PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA1, NULL);
+        if (tmp) {
+                mode_2ha = true;
+                pci_dev_put(tmp);
+        }
+
+        for (i = 0; i < sbridge_dev->n_devs; i++) {
+                pdev = sbridge_dev->pdev[i];
+                if (!pdev)
+                        continue;
+                slot = PCI_SLOT(pdev->devfn);
+                func = PCI_FUNC(pdev->devfn);
+
+                switch (slot) {
+                case 14:
+                        if (func == 0) {
+                                pvt->pci_ha0 = pdev;
+                                break;
+                        }
+                        goto error;
+                case 15:
+                        switch (func) {
+                        case 0:
+                                pvt->pci_ta = pdev;
+                                break;
+                        case 1:
+                                pvt->pci_ras = pdev;
+                                break;
+                        case 4:
+                        case 5:
+                                /* if we have 2 HAs active, channels 2 and 3
+                                 * are in other device */
+                                if (mode_2ha)
+                                        break;
+                                /* fall through */
+                        case 2:
+                        case 3:
+                                pvt->pci_tad[func - 2] = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                case 17:
+                        if (func == 4) {
+                                pvt->pci_ddrio = pdev;
+                                break;
+                        } else if (func == 0) {
+                                if (!mode_2ha)
+                                        pvt->pci_ddrio = pdev;
+                                break;
+                        }
+                        goto error;
+                case 22:
+                        switch (func) {
+                        case 0:
+                                pvt->pci_sad0 = pdev;
+                                break;
+                        case 1:
+                                pvt->pci_br0 = pdev;
+                                break;
+                        case 2:
+                                pvt->pci_br1 = pdev;
+                                break;
+                        default:
+                                goto error;
+                        }
+                        break;
+                case 28:
+                        if (func == 0) {
+                                pvt->pci_ha1 = pdev;
+                                break;
+                        }
+                        goto error;
+                case 29:
+                        /* we shouldn't have this device if we have just one
+                         * HA present */
+                        WARN_ON(!mode_2ha);
+                        if (func == 2 || func == 3) {
+                                pvt->pci_tad[func] = pdev;
+                                break;
+                        }
+                        goto error;
+                default:
+                        goto error;
+                }
+
+                edac_dbg(0, "Associated PCI %02x.%02d.%d with dev = %p\n",
+                         sbridge_dev->bus,
+                         PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                         pdev);
+        }
+
+        /* Check if everything were registered */
+        if (!pvt->pci_sad0 || !pvt->pci_ha0 || !pvt->pci_br0 ||
+            !pvt->pci_br1 || !pvt->pci_tad || !pvt->pci_ras  ||
+            !pvt->pci_ta)
+                goto enodev;
+
+        for (i = 0; i < NUM_CHANNELS; i++) {
+                if (!pvt->pci_tad[i])
+                        goto enodev;
+        }
+        return 0;
+
+enodev:
+        sbridge_printk(KERN_ERR, "Some needed devices are missing\n");
+        return -ENODEV;
+
+error:
+        sbridge_printk(KERN_ERR,
+                       "Device %d, function %d is out of the expected range\n",
+                       slot, func);
+        return -EINVAL;
+}
+
 /****************************************************************************
                         Error check routines
  ****************************************************************************/
@@ -1349,7 +1639,7 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,
         bool ripv = GET_BITFIELD(m->mcgstatus, 0, 0);
         bool overflow = GET_BITFIELD(m->status, 62, 62);
         bool uncorrected_error = GET_BITFIELD(m->status, 61, 61);
-        bool recoverable = GET_BITFIELD(m->status, 56, 56);
+        bool recoverable;
         u32 core_err_cnt = GET_BITFIELD(m->status, 38, 52);
         u32 mscod = GET_BITFIELD(m->status, 16, 31);
         u32 errcode = GET_BITFIELD(m->status, 0, 15);
@@ -1360,6 +1650,11 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,
         int rc, dimm;
         char *area_type = NULL;
 
+        if (pvt->info.type == IVY_BRIDGE)
+                recoverable = true;
+        else
+                recoverable = GET_BITFIELD(m->status, 56, 56);
+
         if (uncorrected_error) {
                 if (ripv) {
                         type = "FATAL";
@@ -1409,6 +1704,10 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci,
                 }
         }
 
+        /* Only decode errors with an valid address (ADDRV) */
+        if (!GET_BITFIELD(m->status, 58, 58))
+                return;
+
         rc = get_memory_error_data(mci, m->addr, &socket,
                                    &channel_mask, &rank, &area_type, msg);
         if (rc < 0)
@@ -1614,11 +1913,12 @@ static void sbridge_unregister_mci(struct sbridge_dev *sbridge_dev)
         sbridge_dev->mci = NULL;
 }
 
-static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
+static int sbridge_register_mci(struct sbridge_dev *sbridge_dev, enum type type)
 {
         struct mem_ctl_info *mci;
         struct edac_mc_layer layers[2];
         struct sbridge_pvt *pvt;
+        struct pci_dev *pdev = sbridge_dev->pdev[0];
         int rc;
 
         /* Check the number of active and not disabled channels */
@@ -1640,7 +1940,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
                 return -ENOMEM;
 
         edac_dbg(0, "MC: mci = %p, dev = %p\n",
-                 mci, &sbridge_dev->pdev[0]->dev);
+                 mci, &pdev->dev);
 
         pvt = mci->pvt_info;
         memset(pvt, 0, sizeof(*pvt));
@@ -1654,24 +1954,52 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
         mci->edac_cap = EDAC_FLAG_NONE;
         mci->mod_name = "sbridge_edac.c";
         mci->mod_ver = SBRIDGE_REVISION;
-        mci->ctl_name = kasprintf(GFP_KERNEL, "Sandy Bridge Socket#%d", mci->mc_idx);
-        mci->dev_name = pci_name(sbridge_dev->pdev[0]);
+        mci->dev_name = pci_name(pdev);
         mci->ctl_page_to_phys = NULL;
 
         /* Set the function pointer to an actual operation function */
         mci->edac_check = sbridge_check_error;
 
-        /* Store pci devices at mci for faster access */
-        rc = mci_bind_devs(mci, sbridge_dev);
-        if (unlikely(rc < 0))
-                goto fail0;
+        pvt->info.type = type;
+        if (type == IVY_BRIDGE) {
+                pvt->info.rankcfgr = IB_RANK_CFG_A;
+                pvt->info.get_tolm = ibridge_get_tolm;
+                pvt->info.get_tohm = ibridge_get_tohm;
+                pvt->info.dram_rule = ibridge_dram_rule;
+                pvt->info.max_sad = ARRAY_SIZE(ibridge_dram_rule);
+                pvt->info.interleave_list = ibridge_interleave_list;
+                pvt->info.max_interleave = ARRAY_SIZE(ibridge_interleave_list);
+                pvt->info.interleave_pkg = ibridge_interleave_pkg;
+                mci->ctl_name = kasprintf(GFP_KERNEL, "Ivy Bridge Socket#%d", mci->mc_idx);
+
+                /* Store pci devices at mci for faster access */
+                rc = ibridge_mci_bind_devs(mci, sbridge_dev);
+                if (unlikely(rc < 0))
+                        goto fail0;
+        } else {
+                pvt->info.rankcfgr = SB_RANK_CFG_A;
+                pvt->info.get_tolm = sbridge_get_tolm;
+                pvt->info.get_tohm = sbridge_get_tohm;
+                pvt->info.dram_rule = sbridge_dram_rule;
+                pvt->info.max_sad = ARRAY_SIZE(sbridge_dram_rule);
+                pvt->info.interleave_list = sbridge_interleave_list;
+                pvt->info.max_interleave = ARRAY_SIZE(sbridge_interleave_list);
+                pvt->info.interleave_pkg = sbridge_interleave_pkg;
+                mci->ctl_name = kasprintf(GFP_KERNEL, "Sandy Bridge Socket#%d", mci->mc_idx);
+
+                /* Store pci devices at mci for faster access */
+                rc = sbridge_mci_bind_devs(mci, sbridge_dev);
+                if (unlikely(rc < 0))
+                        goto fail0;
+        }
+
 
         /* Get dimm basic config and the memory layout */
         get_dimm_config(mci);
         get_memory_layout(mci);
 
         /* record ptr to the generic device */
-        mci->pdev = &sbridge_dev->pdev[0]->dev;
+        mci->pdev = &pdev->dev;
 
         /* add this new MC control structure to EDAC's list of MCs */
         if (unlikely(edac_mc_add_mc(mci))) {
@@ -1702,6 +2030,7 @@ static int sbridge_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         int rc;
         u8 mc, num_mc = 0;
         struct sbridge_dev *sbridge_dev;
+        enum type type;
 
         /* get the pci devices we want to reserve for our use */
         mutex_lock(&sbridge_edac_lock);
@@ -1715,7 +2044,13 @@ static int sbridge_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
         probed++;
 
-        rc = sbridge_get_all_devices(&num_mc);
+        if (pdev->device == PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA) {
+                rc = sbridge_get_all_devices(&num_mc, pci_dev_descr_ibridge_table);
+                type = IVY_BRIDGE;
+        } else {
+                rc = sbridge_get_all_devices(&num_mc, pci_dev_descr_sbridge_table);
+                type = SANDY_BRIDGE;
+        }
         if (unlikely(rc < 0))
                 goto fail0;
         mc = 0;
@@ -1724,7 +2059,7 @@ static int sbridge_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 edac_dbg(0, "Registering MC#%d (%d of %d)\n",
                          mc, mc + 1, num_mc);
                 sbridge_dev->mc = mc++;
-                rc = sbridge_register_mci(sbridge_dev);
+                rc = sbridge_register_mci(sbridge_dev, type);
                 if (unlikely(rc < 0))
                         goto fail1;
         }
@@ -1839,5 +2174,5 @@ MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
 MODULE_AUTHOR("Red Hat Inc. (http://www.redhat.com)");
-MODULE_DESCRIPTION("MC Driver for Intel Sandy Bridge memory controllers - "
+MODULE_DESCRIPTION("MC Driver for Intel Sandy Bridge and Ivy Bridge memory controllers - "
                    SBRIDGE_REVISION);
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c
index 0cfb60f54766..d18b88b755c3 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -67,12 +67,12 @@ int drm_i2c_encoder_init(struct drm_device *dev,
                 goto fail;
         }
 
-        if (!client->driver) {
+        if (!client->dev.driver) {
                 err = -ENODEV;
                 goto fail_unregister;
         }
 
-        module = client->driver->driver.owner;
+        module = client->dev.driver->owner;
         if (!try_module_get(module)) {
                 err = -ENODEV;
                 goto fail_unregister;
@@ -80,7 +80,7 @@ int drm_i2c_encoder_init(struct drm_device *dev,
 
         encoder->bus_priv = client;
 
-        encoder_drv = to_drm_i2c_encoder_driver(client->driver);
+        encoder_drv = to_drm_i2c_encoder_driver(to_i2c_driver(client->dev.driver));
 
         err = encoder_drv->encoder_init(client, dev, encoder);
         if (err)
@@ -111,7 +111,7 @@ void drm_i2c_encoder_destroy(struct drm_encoder *drm_encoder)
 {
         struct drm_encoder_slave *encoder = to_encoder_slave(drm_encoder);
         struct i2c_client *client = drm_i2c_encoder_get_client(drm_encoder);
-        struct module *module = client->driver->driver.owner;
+        struct module *module = client->dev.driver->owner;
 
         i2c_unregister_device(client);
         encoder->bus_priv = NULL;
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c b/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
index 13b850076443..e44ed7b93c6d 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c
@@ -41,7 +41,8 @@ probe_monitoring_device(struct nouveau_i2c_port *i2c,
         if (!client)
                 return false;
 
-        if (!client->driver || client->driver->detect(client, info)) {
+        if (!client->dev.driver ||
+            to_i2c_driver(client->dev.driver)->detect(client, info)) {
                 i2c_unregister_device(client);
                 return false;
         }
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index cdcbd8368ed3..3b26129f6055 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -109,6 +109,7 @@ config I2C_I801
             Avoton (SOC)
             Wellsburg (PCH)
             Coleto Creek (PCH)
+            Wildcat Point-LP (PCH)
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-i801.
@@ -345,6 +346,16 @@ config I2C_BCM2835
           This support is also available as a module.  If so, the module
           will be called i2c-bcm2835.
 
+config I2C_BCM_KONA
+        tristate "BCM Kona I2C adapter"
+        depends on ARCH_BCM_MOBILE
+        default y
+        help
+          If you say yes to this option, support will be included for the
+          I2C interface on the Broadcom Kona family of processors.
+
+          If you do not need KONA I2C inteface, say N.
+
 config I2C_BLACKFIN_TWI
         tristate "Blackfin TWI I2C support"
         depends on BLACKFIN
@@ -436,6 +447,13 @@ config I2C_EG20T
           ML7213/ML7223/ML7831 is companion chip for Intel Atom E6xx series.
           ML7213/ML7223/ML7831 is completely compatible for Intel EG20T PCH.
 
+config I2C_EXYNOS5
+        tristate "Exynos5 high-speed I2C driver"
+        depends on ARCH_EXYNOS5 && OF
+        help
+          Say Y here to include support for high-speed I2C controller in the
+          Exynos5 based Samsung SoCs.
+
 config I2C_GPIO
         tristate "GPIO-based bitbanging I2C"
         depends on GPIOLIB
@@ -665,7 +683,7 @@ config I2C_SH7760
 
 config I2C_SH_MOBILE
         tristate "SuperH Mobile I2C Controller"
-        depends on SUPERH || ARCH_SHMOBILE
+        depends on SUPERH || ARM || COMPILE_TEST
         help
           If you say yes to this option, support will be included for the
           built-in I2C interface on the Renesas SH-Mobile processor.
@@ -695,6 +713,16 @@ config I2C_SIRF
           This driver can also be built as a module.  If so, the module
           will be called i2c-sirf.
 
+config I2C_ST
+        tristate "STMicroelectronics SSC I2C support"
+        depends on ARCH_STI
+        help
+          Enable this option to add support for STMicroelectronics SoCs
+          hardware SSC (Synchronous Serial Controller) as an I2C controller.
+
+          This driver can also be built as module. If so, the module
+          will be called i2c-st.
+
 config I2C_STU300
         tristate "ST Microelectronics DDC I2C interface"
         depends on MACH_U300
@@ -768,7 +796,7 @@ config I2C_XLR
 
 config I2C_RCAR
         tristate "Renesas R-Car I2C Controller"
-        depends on ARCH_SHMOBILE && I2C
+        depends on ARM || COMPILE_TEST
         help
           If you say yes to this option, support will be included for the
           R-Car I2C controller.
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index d00997f3eb3b..c73eb0ea788e 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -42,6 +42,7 @@ i2c-designware-platform-objs := i2c-designware-platdrv.o
 obj-$(CONFIG_I2C_DESIGNWARE_PCI)        += i2c-designware-pci.o
 i2c-designware-pci-objs := i2c-designware-pcidrv.o
 obj-$(CONFIG_I2C_EG20T)         += i2c-eg20t.o
+obj-$(CONFIG_I2C_EXYNOS5)       += i2c-exynos5.o
 obj-$(CONFIG_I2C_GPIO)          += i2c-gpio.o
 obj-$(CONFIG_I2C_HIGHLANDER)    += i2c-highlander.o
 obj-$(CONFIG_I2C_IBM_IIC)       += i2c-ibm_iic.o
@@ -68,6 +69,7 @@ obj-$(CONFIG_I2C_SH7760)	+= i2c-sh7760.o
 obj-$(CONFIG_I2C_SH_MOBILE)     += i2c-sh_mobile.o
 obj-$(CONFIG_I2C_SIMTEC)        += i2c-simtec.o
 obj-$(CONFIG_I2C_SIRF)          += i2c-sirf.o
+obj-$(CONFIG_I2C_ST)            += i2c-st.o
 obj-$(CONFIG_I2C_STU300)        += i2c-stu300.o
 obj-$(CONFIG_I2C_TEGRA)         += i2c-tegra.o
 obj-$(CONFIG_I2C_VERSATILE)     += i2c-versatile.o
@@ -87,6 +89,7 @@ obj-$(CONFIG_I2C_VIPERBOARD)	+= i2c-viperboard.o
 
 # Other I2C/SMBus bus drivers
 obj-$(CONFIG_I2C_ACORN)         += i2c-acorn.o
+obj-$(CONFIG_I2C_BCM_KONA)      += i2c-bcm-kona.o
 obj-$(CONFIG_I2C_ELEKTOR)       += i2c-elektor.o
 obj-$(CONFIG_I2C_PCA_ISA)       += i2c-pca-isa.o
 obj-$(CONFIG_I2C_SIBYTE)        += i2c-sibyte.o
diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c
new file mode 100644
index 000000000000..036cf03aeb61
--- /dev/null
+++ b/drivers/i2c/busses/i2c-bcm-kona.c
@@ -0,0 +1,909 @@
+/*
+ * Copyright (C) 2013 Broadcom 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 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/device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/clk.h>
+#include <linux/slab.h>
+
+/* Hardware register offsets and field defintions */
+#define CS_OFFSET                               0x00000020
+#define CS_ACK_SHIFT                            3
+#define CS_ACK_MASK                             0x00000008
+#define CS_ACK_CMD_GEN_START                    0x00000000
+#define CS_ACK_CMD_GEN_RESTART                  0x00000001
+#define CS_CMD_SHIFT                            1
+#define CS_CMD_CMD_NO_ACTION                    0x00000000
+#define CS_CMD_CMD_START_RESTART                0x00000001
+#define CS_CMD_CMD_STOP                         0x00000002
+#define CS_EN_SHIFT                             0
+#define CS_EN_CMD_ENABLE_BSC                    0x00000001
+
+#define TIM_OFFSET                              0x00000024
+#define TIM_PRESCALE_SHIFT                      6
+#define TIM_P_SHIFT                             3
+#define TIM_NO_DIV_SHIFT                        2
+#define TIM_DIV_SHIFT                           0
+
+#define DAT_OFFSET                              0x00000028
+
+#define TOUT_OFFSET                             0x0000002c
+
+#define TXFCR_OFFSET                            0x0000003c
+#define TXFCR_FIFO_FLUSH_MASK                   0x00000080
+#define TXFCR_FIFO_EN_MASK                      0x00000040
+
+#define IER_OFFSET                              0x00000044
+#define IER_READ_COMPLETE_INT_MASK              0x00000010
+#define IER_I2C_INT_EN_MASK                     0x00000008
+#define IER_FIFO_INT_EN_MASK                    0x00000002
+#define IER_NOACK_EN_MASK                       0x00000001
+
+#define ISR_OFFSET                              0x00000048
+#define ISR_RESERVED_MASK                       0xffffff60
+#define ISR_CMDBUSY_MASK                        0x00000080
+#define ISR_READ_COMPLETE_MASK                  0x00000010
+#define ISR_SES_DONE_MASK                       0x00000008
+#define ISR_ERR_MASK                            0x00000004
+#define ISR_TXFIFOEMPTY_MASK                    0x00000002
+#define ISR_NOACK_MASK                          0x00000001
+
+#define CLKEN_OFFSET                            0x0000004C
+#define CLKEN_AUTOSENSE_OFF_MASK                0x00000080
+#define CLKEN_M_SHIFT                           4
+#define CLKEN_N_SHIFT                           1
+#define CLKEN_CLKEN_MASK                        0x00000001
+
+#define FIFO_STATUS_OFFSET                      0x00000054
+#define FIFO_STATUS_RXFIFO_EMPTY_MASK           0x00000004
+#define FIFO_STATUS_TXFIFO_EMPTY_MASK           0x00000010
+
+#define HSTIM_OFFSET                            0x00000058
+#define HSTIM_HS_MODE_MASK                      0x00008000
+#define HSTIM_HS_HOLD_SHIFT                     10
+#define HSTIM_HS_HIGH_PHASE_SHIFT               5
+#define HSTIM_HS_SETUP_SHIFT                    0
+
+#define PADCTL_OFFSET                           0x0000005c
+#define PADCTL_PAD_OUT_EN_MASK                  0x00000004
+
+#define RXFCR_OFFSET                            0x00000068
+#define RXFCR_NACK_EN_SHIFT                     7
+#define RXFCR_READ_COUNT_SHIFT                  0
+#define RXFIFORDOUT_OFFSET                      0x0000006c
+
+/* Locally used constants */
+#define MAX_RX_FIFO_SIZE                64U /* bytes */
+#define MAX_TX_FIFO_SIZE                64U /* bytes */
+
+#define STD_EXT_CLK_FREQ                13000000UL
+#define HS_EXT_CLK_FREQ                 104000000UL
+
+#define MASTERCODE                      0x08 /* Mastercodes are 0000_1xxxb */
+
+#define I2C_TIMEOUT                     100 /* msecs */
+
+/* Operations that can be commanded to the controller */
+enum bcm_kona_cmd_t {
+        BCM_CMD_NOACTION = 0,
+        BCM_CMD_START,
+        BCM_CMD_RESTART,
+        BCM_CMD_STOP,
+};
+
+enum bus_speed_index {
+        BCM_SPD_100K = 0,
+        BCM_SPD_400K,
+        BCM_SPD_1MHZ,
+};
+
+enum hs_bus_speed_index {
+        BCM_SPD_3P4MHZ = 0,
+};
+
+/* Internal divider settings for standard mode, fast mode and fast mode plus */
+struct bus_speed_cfg {
+        uint8_t time_m;         /* Number of cycles for setup time */
+        uint8_t time_n;         /* Number of cycles for hold time */
+        uint8_t prescale;       /* Prescale divider */
+        uint8_t time_p;         /* Timing coefficient */
+        uint8_t no_div;         /* Disable clock divider */
+        uint8_t time_div;       /* Post-prescale divider */
+};
+
+/* Internal divider settings for high-speed mode */
+struct hs_bus_speed_cfg {
+        uint8_t hs_hold;        /* Number of clock cycles SCL stays low until
+                                   the end of bit period */
+        uint8_t hs_high_phase;  /* Number of clock cycles SCL stays high
+                                   before it falls */
+        uint8_t hs_setup;       /* Number of clock cycles SCL stays low
+                                   before it rises  */
+        uint8_t prescale;       /* Prescale divider */
+        uint8_t time_p;         /* Timing coefficient */
+        uint8_t no_div;         /* Disable clock divider */
+        uint8_t time_div;       /* Post-prescale divider */
+};
+
+static const struct bus_speed_cfg std_cfg_table[] = {
+        [BCM_SPD_100K] = {0x01, 0x01, 0x03, 0x06, 0x00, 0x02},
+        [BCM_SPD_400K] = {0x05, 0x01, 0x03, 0x05, 0x01, 0x02},
+        [BCM_SPD_1MHZ] = {0x01, 0x01, 0x03, 0x01, 0x01, 0x03},
+};
+
+static const struct hs_bus_speed_cfg hs_cfg_table[] = {
+        [BCM_SPD_3P4MHZ] = {0x01, 0x08, 0x14, 0x00, 0x06, 0x01, 0x00},
+};
+
+struct bcm_kona_i2c_dev {
+        struct device *device;
+
+        void __iomem *base;
+        int irq;
+        struct clk *external_clk;
+
+        struct i2c_adapter adapter;
+
+        struct completion done;
+
+        const struct bus_speed_cfg *std_cfg;
+        const struct hs_bus_speed_cfg *hs_cfg;
+};
+
+static void bcm_kona_i2c_send_cmd_to_ctrl(struct bcm_kona_i2c_dev *dev,
+                                          enum bcm_kona_cmd_t cmd)
+{
+        dev_dbg(dev->device, "%s, %d\n", __func__, cmd);
+
+        switch (cmd) {
+        case BCM_CMD_NOACTION:
+                writel((CS_CMD_CMD_NO_ACTION << CS_CMD_SHIFT) |
+                       (CS_EN_CMD_ENABLE_BSC << CS_EN_SHIFT),
+                       dev->base + CS_OFFSET);
+                break;
+
+        case BCM_CMD_START:
+                writel((CS_ACK_CMD_GEN_START << CS_ACK_SHIFT) |
+                       (CS_CMD_CMD_START_RESTART << CS_CMD_SHIFT) |
+                       (CS_EN_CMD_ENABLE_BSC << CS_EN_SHIFT),
+                       dev->base + CS_OFFSET);
+                break;
+
+        case BCM_CMD_RESTART:
+                writel((CS_ACK_CMD_GEN_RESTART << CS_ACK_SHIFT) |
+                       (CS_CMD_CMD_START_RESTART << CS_CMD_SHIFT) |
+                       (CS_EN_CMD_ENABLE_BSC << CS_EN_SHIFT),
+                       dev->base + CS_OFFSET);
+                break;
+
+        case BCM_CMD_STOP:
+                writel((CS_CMD_CMD_STOP << CS_CMD_SHIFT) |
+                       (CS_EN_CMD_ENABLE_BSC << CS_EN_SHIFT),
+                       dev->base + CS_OFFSET);
+                break;
+
+        default:
+                dev_err(dev->device, "Unknown command %d\n", cmd);
+        }
+}
+
+static void bcm_kona_i2c_enable_clock(struct bcm_kona_i2c_dev *dev)
+{
+        writel(readl(dev->base + CLKEN_OFFSET) | CLKEN_CLKEN_MASK,
+               dev->base + CLKEN_OFFSET);
+}
+
+static void bcm_kona_i2c_disable_clock(struct bcm_kona_i2c_dev *dev)
+{
+        writel(readl(dev->base + CLKEN_OFFSET) & ~CLKEN_CLKEN_MASK,
+               dev->base + CLKEN_OFFSET);
+}
+
+static irqreturn_t bcm_kona_i2c_isr(int irq, void *devid)
+{
+        struct bcm_kona_i2c_dev *dev = devid;
+        uint32_t status = readl(dev->base + ISR_OFFSET);
+
+        if ((status & ~ISR_RESERVED_MASK) == 0)
+                return IRQ_NONE;
+
+        /* Must flush the TX FIFO when NAK detected */
+        if (status & ISR_NOACK_MASK)
+                writel(TXFCR_FIFO_FLUSH_MASK | TXFCR_FIFO_EN_MASK,
+                       dev->base + TXFCR_OFFSET);
+
+        writel(status & ~ISR_RESERVED_MASK, dev->base + ISR_OFFSET);
+        complete_all(&dev->done);
+
+        return IRQ_HANDLED;
+}
+
+/* Wait for ISR_CMDBUSY_MASK to go low before writing to CS, DAT, or RCD */
+static int bcm_kona_i2c_wait_if_busy(struct bcm_kona_i2c_dev *dev)
+{
+        unsigned long timeout = jiffies + msecs_to_jiffies(I2C_TIMEOUT);
+
+        while (readl(dev->base + ISR_OFFSET) & ISR_CMDBUSY_MASK)
+                if (time_after(jiffies, timeout)) {
+                        dev_err(dev->device, "CMDBUSY timeout\n");
+                        return -ETIMEDOUT;
+                }
+
+        return 0;
+}
+
+/* Send command to I2C bus */
+static int bcm_kona_send_i2c_cmd(struct bcm_kona_i2c_dev *dev,
+                                 enum bcm_kona_cmd_t cmd)
+{
+        int rc;
+        unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT);
+
+        /* Make sure the hardware is ready */
+        rc = bcm_kona_i2c_wait_if_busy(dev);
+        if (rc < 0)
+                return rc;
+
+        /* Unmask the session done interrupt */
+        writel(IER_I2C_INT_EN_MASK, dev->base + IER_OFFSET);
+
+        /* Mark as incomplete before sending the command */
+        reinit_completion(&dev->done);
+
+        /* Send the command */
+        bcm_kona_i2c_send_cmd_to_ctrl(dev, cmd);
+
+        /* Wait for transaction to finish or timeout */
+        time_left = wait_for_completion_timeout(&dev->done, time_left);
+
+        /* Mask all interrupts */
+        writel(0, dev->base + IER_OFFSET);
+
+        if (!time_left) {
+                dev_err(dev->device, "controller timed out\n");
+                rc = -ETIMEDOUT;
+        }
+
+        /* Clear command */
+        bcm_kona_i2c_send_cmd_to_ctrl(dev, BCM_CMD_NOACTION);
+
+        return rc;
+}
+
+/* Read a single RX FIFO worth of data from the i2c bus */
+static int bcm_kona_i2c_read_fifo_single(struct bcm_kona_i2c_dev *dev,
+                                         uint8_t *buf, unsigned int len,
+                                         unsigned int last_byte_nak)
+{
+        unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT);
+
+        /* Mark as incomplete before starting the RX FIFO */
+        reinit_completion(&dev->done);
+
+        /* Unmask the read complete interrupt */
+        writel(IER_READ_COMPLETE_INT_MASK, dev->base + IER_OFFSET);
+
+        /* Start the RX FIFO */
+        writel((last_byte_nak << RXFCR_NACK_EN_SHIFT) |
+               (len << RXFCR_READ_COUNT_SHIFT),
+                dev->base + RXFCR_OFFSET);
+
+        /* Wait for FIFO read to complete */
+        time_left = wait_for_completion_timeout(&dev->done, time_left);
+
+        /* Mask all interrupts */
+        writel(0, dev->base + IER_OFFSET);
+
+        if (!time_left) {
+                dev_err(dev->device, "RX FIFO time out\n");
+                return -EREMOTEIO;
+        }
+
+        /* Read data from FIFO */
+        for (; len > 0; len--, buf++)
+                *buf = readl(dev->base + RXFIFORDOUT_OFFSET);
+
+        return 0;
+}
+
+/* Read any amount of data using the RX FIFO from the i2c bus */
+static int bcm_kona_i2c_read_fifo(struct bcm_kona_i2c_dev *dev,
+                                  struct i2c_msg *msg)
+{
+        unsigned int bytes_to_read = MAX_RX_FIFO_SIZE;
+        unsigned int last_byte_nak = 0;
+        unsigned int bytes_read = 0;
+        int rc;
+
+        uint8_t *tmp_buf = msg->buf;
+
+        while (bytes_read < msg->len) {
+                if (msg->len - bytes_read <= MAX_RX_FIFO_SIZE) {
+                        last_byte_nak = 1; /* NAK last byte of transfer */
+                        bytes_to_read = msg->len - bytes_read;
+                }
+
+                rc = bcm_kona_i2c_read_fifo_single(dev, tmp_buf, bytes_to_read,
+                                                   last_byte_nak);
+                if (rc < 0)
+                        return -EREMOTEIO;
+
+                bytes_read += bytes_to_read;
+                tmp_buf += bytes_to_read;
+        }
+
+        return 0;
+}
+
+/* Write a single byte of data to the i2c bus */
+static int bcm_kona_i2c_write_byte(struct bcm_kona_i2c_dev *dev, uint8_t data,
+                                   unsigned int nak_expected)
+{
+        int rc;
+        unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT);
+        unsigned int nak_received;
+
+        /* Make sure the hardware is ready */
+        rc = bcm_kona_i2c_wait_if_busy(dev);
+        if (rc < 0)
+                return rc;
+
+        /* Clear pending session done interrupt */
+        writel(ISR_SES_DONE_MASK, dev->base + ISR_OFFSET);
+
+        /* Unmask the session done interrupt */
+        writel(IER_I2C_INT_EN_MASK, dev->base + IER_OFFSET);
+
+        /* Mark as incomplete before sending the data */
+        reinit_completion(&dev->done);
+
+        /* Send one byte of data */
+        writel(data, dev->base + DAT_OFFSET);
+
+        /* Wait for byte to be written */
+        time_left = wait_for_completion_timeout(&dev->done, time_left);
+
+        /* Mask all interrupts */
+        writel(0, dev->base + IER_OFFSET);
+
+        if (!time_left) {
+                dev_dbg(dev->device, "controller timed out\n");
+                return -ETIMEDOUT;
+        }
+
+        nak_received = readl(dev->base + CS_OFFSET) & CS_ACK_MASK ? 1 : 0;
+
+        if (nak_received ^ nak_expected) {
+                dev_dbg(dev->device, "unexpected NAK/ACK\n");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+/* Write a single TX FIFO worth of data to the i2c bus */
+static int bcm_kona_i2c_write_fifo_single(struct bcm_kona_i2c_dev *dev,
+                                          uint8_t *buf, unsigned int len)
+{
+        int k;
+        unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT);
+        unsigned int fifo_status;
+
+        /* Mark as incomplete before sending data to the TX FIFO */
+        reinit_completion(&dev->done);
+
+        /* Unmask the fifo empty and nak interrupt */
+        writel(IER_FIFO_INT_EN_MASK | IER_NOACK_EN_MASK,
+               dev->base + IER_OFFSET);
+
+        /* Disable IRQ to load a FIFO worth of data without interruption */
+        disable_irq(dev->irq);
+
+        /* Write data into FIFO */
+        for (k = 0; k < len; k++)
+                writel(buf[k], (dev->base + DAT_OFFSET));
+
+        /* Enable IRQ now that data has been loaded */
+        enable_irq(dev->irq);
+
+        /* Wait for FIFO to empty */
+        do {
+                time_left = wait_for_completion_timeout(&dev->done, time_left);
+                fifo_status = readl(dev->base + FIFO_STATUS_OFFSET);
+        } while (time_left && !(fifo_status & FIFO_STATUS_TXFIFO_EMPTY_MASK));
+
+        /* Mask all interrupts */
+        writel(0, dev->base + IER_OFFSET);
+
+        /* Check if there was a NAK */
+        if (readl(dev->base + CS_OFFSET) & CS_ACK_MASK) {
+                dev_err(dev->device, "unexpected NAK\n");
+                return -EREMOTEIO;
+        }
+
+        /* Check if a timeout occured */
+        if (!time_left) {
+                dev_err(dev->device, "completion timed out\n");
+                return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+
+/* Write any amount of data using TX FIFO to the i2c bus */
+static int bcm_kona_i2c_write_fifo(struct bcm_kona_i2c_dev *dev,
+                                   struct i2c_msg *msg)
+{
+        unsigned int bytes_to_write = MAX_TX_FIFO_SIZE;
+        unsigned int bytes_written = 0;
+        int rc;
+
+        uint8_t *tmp_buf = msg->buf;
+
+        while (bytes_written < msg->len) {
+                if (msg->len - bytes_written <= MAX_TX_FIFO_SIZE)
+                        bytes_to_write = msg->len - bytes_written;
+
+                rc = bcm_kona_i2c_write_fifo_single(dev, tmp_buf,
+                                                    bytes_to_write);
+                if (rc < 0)
+                        return -EREMOTEIO;
+
+                bytes_written += bytes_to_write;
+                tmp_buf += bytes_to_write;
+        }
+
+        return 0;
+}
+
+/* Send i2c address */
+static int bcm_kona_i2c_do_addr(struct bcm_kona_i2c_dev *dev,
+                                     struct i2c_msg *msg)
+{
+        unsigned char addr;
+
+        if (msg->flags & I2C_M_TEN) {
+                /* First byte is 11110XX0 where XX is upper 2 bits */
+                addr = 0xF0 | ((msg->addr & 0x300) >> 7);
+                if (bcm_kona_i2c_write_byte(dev, addr, 0) < 0)
+                        return -EREMOTEIO;
+
+                /* Second byte is the remaining 8 bits */
+                addr = msg->addr & 0xFF;
+                if (bcm_kona_i2c_write_byte(dev, addr, 0) < 0)
+                        return -EREMOTEIO;
+
+                if (msg->flags & I2C_M_RD) {
+                        /* For read, send restart command */
+                        if (bcm_kona_send_i2c_cmd(dev, BCM_CMD_RESTART) < 0)
+                                return -EREMOTEIO;
+
+                        /* Then re-send the first byte with the read bit set */
+                        addr = 0xF0 | ((msg->addr & 0x300) >> 7) | 0x01;
+                        if (bcm_kona_i2c_write_byte(dev, addr, 0) < 0)
+                                return -EREMOTEIO;
+                }
+        } else {
+                addr = msg->addr << 1;
+
+                if (msg->flags & I2C_M_RD)
+                        addr |= 1;
+
+                if (bcm_kona_i2c_write_byte(dev, addr, 0) < 0)
+                        return -EREMOTEIO;
+        }
+
+        return 0;
+}
+
+static void bcm_kona_i2c_enable_autosense(struct bcm_kona_i2c_dev *dev)
+{
+        writel(readl(dev->base + CLKEN_OFFSET) & ~CLKEN_AUTOSENSE_OFF_MASK,
+               dev->base + CLKEN_OFFSET);
+}
+
+static void bcm_kona_i2c_config_timing(struct bcm_kona_i2c_dev *dev)
+{
+        writel(readl(dev->base + HSTIM_OFFSET) & ~HSTIM_HS_MODE_MASK,
+               dev->base + HSTIM_OFFSET);
+
+        writel((dev->std_cfg->prescale << TIM_PRESCALE_SHIFT) |
+               (dev->std_cfg->time_p << TIM_P_SHIFT) |
+               (dev->std_cfg->no_div << TIM_NO_DIV_SHIFT) |
+               (dev->std_cfg->time_div  << TIM_DIV_SHIFT),
+               dev->base + TIM_OFFSET);
+
+        writel((dev->std_cfg->time_m << CLKEN_M_SHIFT) |
+               (dev->std_cfg->time_n << CLKEN_N_SHIFT) |
+               CLKEN_CLKEN_MASK,
+               dev->base + CLKEN_OFFSET);
+}
+
+static void bcm_kona_i2c_config_timing_hs(struct bcm_kona_i2c_dev *dev)
+{
+        writel((dev->hs_cfg->prescale << TIM_PRESCALE_SHIFT) |
+               (dev->hs_cfg->time_p << TIM_P_SHIFT) |
+               (dev->hs_cfg->no_div << TIM_NO_DIV_SHIFT) |
+               (dev->hs_cfg->time_div << TIM_DIV_SHIFT),
+               dev->base + TIM_OFFSET);
+
+        writel((dev->hs_cfg->hs_hold << HSTIM_HS_HOLD_SHIFT) |
+               (dev->hs_cfg->hs_high_phase << HSTIM_HS_HIGH_PHASE_SHIFT) |
+               (dev->hs_cfg->hs_setup << HSTIM_HS_SETUP_SHIFT),
+               dev->base + HSTIM_OFFSET);
+
+        writel(readl(dev->base + HSTIM_OFFSET) | HSTIM_HS_MODE_MASK,
+               dev->base + HSTIM_OFFSET);
+}
+
+static int bcm_kona_i2c_switch_to_hs(struct bcm_kona_i2c_dev *dev)
+{
+        int rc;
+
+        /* Send mastercode at standard speed */
+        rc = bcm_kona_i2c_write_byte(dev, MASTERCODE, 1);
+        if (rc < 0) {
+                pr_err("High speed handshake failed\n");
+                return rc;
+        }
+
+        /* Configure external clock to higher frequency */
+        rc = clk_set_rate(dev->external_clk, HS_EXT_CLK_FREQ);
+        if (rc) {
+                dev_err(dev->device, "%s: clk_set_rate returned %d\n",
+                        __func__, rc);
+                return rc;
+        }
+
+        /* Reconfigure internal dividers */
+        bcm_kona_i2c_config_timing_hs(dev);
+
+        /* Send a restart command */
+        rc = bcm_kona_send_i2c_cmd(dev, BCM_CMD_RESTART);
+        if (rc < 0)
+                dev_err(dev->device, "High speed restart command failed\n");
+
+        return rc;
+}
+
+static int bcm_kona_i2c_switch_to_std(struct bcm_kona_i2c_dev *dev)
+{
+        int rc;
+
+        /* Reconfigure internal dividers */
+        bcm_kona_i2c_config_timing(dev);
+
+        /* Configure external clock to lower frequency */
+        rc = clk_set_rate(dev->external_clk, STD_EXT_CLK_FREQ);
+        if (rc) {
+                dev_err(dev->device, "%s: clk_set_rate returned %d\n",
+                        __func__, rc);
+        }
+
+        return rc;
+}
+
+/* Master transfer function */
+static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter,
+                             struct i2c_msg msgs[], int num)
+{
+        struct bcm_kona_i2c_dev *dev = i2c_get_adapdata(adapter);
+        struct i2c_msg *pmsg;
+        int rc = 0;
+        int i;
+
+        rc = clk_prepare_enable(dev->external_clk);
+        if (rc) {
+                dev_err(dev->device, "%s: peri clock enable failed. err %d\n",
+                        __func__, rc);
+                return rc;
+        }
+
+        /* Enable pad output */
+        writel(0, dev->base + PADCTL_OFFSET);
+
+        /* Enable internal clocks */
+        bcm_kona_i2c_enable_clock(dev);
+
+        /* Send start command */
+        rc = bcm_kona_send_i2c_cmd(dev, BCM_CMD_START);
+        if (rc < 0) {
+                dev_err(dev->device, "Start command failed rc = %d\n", rc);
+                goto xfer_disable_pad;
+        }
+
+        /* Switch to high speed if applicable */
+        if (dev->hs_cfg) {
+                rc = bcm_kona_i2c_switch_to_hs(dev);
+                if (rc < 0)
+                        goto xfer_send_stop;
+        }
+
+        /* Loop through all messages */
+        for (i = 0; i < num; i++) {
+                pmsg = &msgs[i];
+
+                /* Send restart for subsequent messages */
+                if ((i != 0) && ((pmsg->flags & I2C_M_NOSTART) == 0)) {
+                        rc = bcm_kona_send_i2c_cmd(dev, BCM_CMD_RESTART);
+                        if (rc < 0) {
+                                dev_err(dev->device,
+                                        "restart cmd failed rc = %d\n", rc);
+                                        goto xfer_send_stop;
+                        }
+                }
+
+                /* Send slave address */
+                if (!(pmsg->flags & I2C_M_NOSTART)) {
+                        rc = bcm_kona_i2c_do_addr(dev, pmsg);
+                        if (rc < 0) {
+                                dev_err(dev->device,
+                                        "NAK from addr %2.2x msg#%d rc = %d\n",
+                                        pmsg->addr, i, rc);
+                                goto xfer_send_stop;
+                        }
+                }
+
+                /* Perform data transfer */
+                if (pmsg->flags & I2C_M_RD) {
+                        rc = bcm_kona_i2c_read_fifo(dev, pmsg);
+                        if (rc < 0) {
+                                dev_err(dev->device, "read failure\n");
+                                goto xfer_send_stop;
+                        }
+                } else {
+                        rc = bcm_kona_i2c_write_fifo(dev, pmsg);
+                        if (rc < 0) {
+                                dev_err(dev->device, "write failure");
+                                goto xfer_send_stop;
+                        }
+                }
+        }
+
+        rc = num;
+
+xfer_send_stop:
+        /* Send a STOP command */
+        bcm_kona_send_i2c_cmd(dev, BCM_CMD_STOP);
+
+        /* Return from high speed if applicable */
+        if (dev->hs_cfg) {
+                int hs_rc = bcm_kona_i2c_switch_to_std(dev);
+
+                if (hs_rc)
+                        rc = hs_rc;
+        }
+
+xfer_disable_pad:
+        /* Disable pad output */
+        writel(PADCTL_PAD_OUT_EN_MASK, dev->base + PADCTL_OFFSET);
+
+        /* Stop internal clock */
+        bcm_kona_i2c_disable_clock(dev);
+
+        clk_disable_unprepare(dev->external_clk);
+
+        return rc;
+}
+
+static uint32_t bcm_kona_i2c_functionality(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR |
+            I2C_FUNC_NOSTART;
+}
+
+static const struct i2c_algorithm bcm_algo = {
+        .master_xfer = bcm_kona_i2c_xfer,
+        .functionality = bcm_kona_i2c_functionality,
+};
+
+static int bcm_kona_i2c_assign_bus_speed(struct bcm_kona_i2c_dev *dev)
+{
+        unsigned int bus_speed;
+        int ret = of_property_read_u32(dev->device->of_node, "clock-frequency",
+                                       &bus_speed);
+        if (ret < 0) {
+                dev_err(dev->device, "missing clock-frequency property\n");
+                return -ENODEV;
+        }
+
+        switch (bus_speed) {
+        case 100000:
+                dev->std_cfg = &std_cfg_table[BCM_SPD_100K];
+                break;
+        case 400000:
+                dev->std_cfg = &std_cfg_table[BCM_SPD_400K];
+                break;
+        case 1000000:
+                dev->std_cfg = &std_cfg_table[BCM_SPD_1MHZ];
+                break;
+        case 3400000:
+                /* Send mastercode at 100k */
+                dev->std_cfg = &std_cfg_table[BCM_SPD_100K];
+                dev->hs_cfg = &hs_cfg_table[BCM_SPD_3P4MHZ];
+                break;
+        default:
+                pr_err("%d hz bus speed not supported\n", bus_speed);
+                pr_err("Valid speeds are 100khz, 400khz, 1mhz, and 3.4mhz\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int bcm_kona_i2c_probe(struct platform_device *pdev)
+{
+        int rc = 0;
+        struct bcm_kona_i2c_dev *dev;
+        struct i2c_adapter *adap;
+        struct resource *iomem;
+
+        /* Allocate memory for private data structure */
+        dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, dev);
+        dev->device = &pdev->dev;
+        init_completion(&dev->done);
+
+        /* Map hardware registers */
+        iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        dev->base = devm_ioremap_resource(dev->device, iomem);
+        if (IS_ERR(dev->base))
+                return -ENOMEM;
+
+        /* Get and enable external clock */
+        dev->external_clk = devm_clk_get(dev->device, NULL);
+        if (IS_ERR(dev->external_clk)) {
+                dev_err(dev->device, "couldn't get clock\n");
+                return -ENODEV;
+        }
+
+        rc = clk_set_rate(dev->external_clk, STD_EXT_CLK_FREQ);
+        if (rc) {
+                dev_err(dev->device, "%s: clk_set_rate returned %d\n",
+                        __func__, rc);
+                return rc;
+        }
+
+        rc = clk_prepare_enable(dev->external_clk);
+        if (rc) {
+                dev_err(dev->device, "couldn't enable clock\n");
+                return rc;
+        }
+
+        /* Parse bus speed */
+        rc = bcm_kona_i2c_assign_bus_speed(dev);
+        if (rc)
+                goto probe_disable_clk;
+
+        /* Enable internal clocks */
+        bcm_kona_i2c_enable_clock(dev);
+
+        /* Configure internal dividers */
+        bcm_kona_i2c_config_timing(dev);
+
+        /* Disable timeout */
+        writel(0, dev->base + TOUT_OFFSET);
+
+        /* Enable autosense */
+        bcm_kona_i2c_enable_autosense(dev);
+
+        /* Enable TX FIFO */
+        writel(TXFCR_FIFO_FLUSH_MASK | TXFCR_FIFO_EN_MASK,
+               dev->base + TXFCR_OFFSET);
+
+        /* Mask all interrupts */
+        writel(0, dev->base + IER_OFFSET);
+
+        /* Clear all pending interrupts */
+        writel(ISR_CMDBUSY_MASK |
+               ISR_READ_COMPLETE_MASK |
+               ISR_SES_DONE_MASK |
+               ISR_ERR_MASK |
+               ISR_TXFIFOEMPTY_MASK |
+               ISR_NOACK_MASK,
+               dev->base + ISR_OFFSET);
+
+        /* Get the interrupt number */
+        dev->irq = platform_get_irq(pdev, 0);
+        if (dev->irq < 0) {
+                dev_err(dev->device, "no irq resource\n");
+                rc = -ENODEV;
+                goto probe_disable_clk;
+        }
+
+        /* register the ISR handler */
+        rc = devm_request_irq(&pdev->dev, dev->irq, bcm_kona_i2c_isr,
+                              IRQF_SHARED, pdev->name, dev);
+        if (rc) {
+                dev_err(dev->device, "failed to request irq %i\n", dev->irq);
+                goto probe_disable_clk;
+        }
+
+        /* Enable the controller but leave it idle */
+        bcm_kona_i2c_send_cmd_to_ctrl(dev, BCM_CMD_NOACTION);
+
+        /* Disable pad output */
+        writel(PADCTL_PAD_OUT_EN_MASK, dev->base + PADCTL_OFFSET);
+
+        /* Disable internal clock */
+        bcm_kona_i2c_disable_clock(dev);
+
+        /* Disable external clock */
+        clk_disable_unprepare(dev->external_clk);
+
+        /* Add the i2c adapter */
+        adap = &dev->adapter;
+        i2c_set_adapdata(adap, dev);
+        adap->owner = THIS_MODULE;
+        strlcpy(adap->name, "Broadcom I2C adapter", sizeof(adap->name));
+        adap->algo = &bcm_algo;
+        adap->dev.parent = &pdev->dev;
+        adap->dev.of_node = pdev->dev.of_node;
+
+        rc = i2c_add_adapter(adap);
+        if (rc) {
+                dev_err(dev->device, "failed to add adapter\n");
+                return rc;
+        }
+
+        dev_info(dev->device, "device registered successfully\n");
+
+        return 0;
+
+probe_disable_clk:
+        bcm_kona_i2c_disable_clock(dev);
+        clk_disable_unprepare(dev->external_clk);
+
+        return rc;
+}
+
+static int bcm_kona_i2c_remove(struct platform_device *pdev)
+{
+        struct bcm_kona_i2c_dev *dev = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&dev->adapter);
+
+        return 0;
+}
+
+static const struct of_device_id bcm_kona_i2c_of_match[] = {
+        {.compatible = "brcm,kona-i2c",},
+        {},
+};
+MODULE_DEVICE_TABLE(of, kona_i2c_of_match);
+
+static struct platform_driver bcm_kona_i2c_driver = {
+        .driver = {
+                   .name = "bcm-kona-i2c",
+                   .owner = THIS_MODULE,
+                   .of_match_table = bcm_kona_i2c_of_match,
+                   },
+        .probe = bcm_kona_i2c_probe,
+        .remove = bcm_kona_i2c_remove,
+};
+module_platform_driver(bcm_kona_i2c_driver);
+
+MODULE_AUTHOR("Tim Kryger <tkryger@broadcom.com>");
+MODULE_DESCRIPTION("Broadcom Kona I2C Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
index 35a473ba3d81..3b9bd9a3f2b0 100644
--- a/drivers/i2c/busses/i2c-bfin-twi.c
+++ b/drivers/i2c/busses/i2c-bfin-twi.c
@@ -675,7 +675,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
         p_adap->retries = 3;
 
         rc = peripheral_request_list(
-                        (unsigned short *)dev_get_platdata(&pdev->dev),
+                        dev_get_platdata(&pdev->dev),
                         "i2c-bfin-twi");
         if (rc) {
                 dev_err(&pdev->dev, "Can't setup pin mux!\n");
@@ -723,7 +723,7 @@ out_error_add_adapter:
         free_irq(iface->irq, iface);
 out_error_req_irq:
 out_error_no_irq:
-        peripheral_free_list((unsigned short *)dev_get_platdata(&pdev->dev));
+        peripheral_free_list(dev_get_platdata(&pdev->dev));
 out_error_pin_mux:
         iounmap(iface->regs_base);
 out_error_ioremap:
@@ -739,7 +739,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
 
         i2c_del_adapter(&(iface->adap));
         free_irq(iface->irq, iface);
-        peripheral_free_list((unsigned short *)dev_get_platdata(&pdev->dev));
+        peripheral_free_list(dev_get_platdata(&pdev->dev));
         iounmap(iface->regs_base);
         kfree(iface);
 
diff --git a/drivers/i2c/busses/i2c-cbus-gpio.c b/drivers/i2c/busses/i2c-cbus-gpio.c
index 2d46f13adfdf..ce7ffba2b020 100644
--- a/drivers/i2c/busses/i2c-cbus-gpio.c
+++ b/drivers/i2c/busses/i2c-cbus-gpio.c
@@ -246,6 +246,7 @@ static int cbus_i2c_probe(struct platform_device *pdev)
         adapter->owner          = THIS_MODULE;
         adapter->class          = I2C_CLASS_HWMON;
         adapter->dev.parent     = &pdev->dev;
+        adapter->dev.of_node    = pdev->dev.of_node;
         adapter->nr             = pdev->id;
         adapter->timeout        = HZ;
         adapter->algo           = &cbus_i2c_algo;
@@ -289,6 +290,7 @@ static struct platform_driver cbus_i2c_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "i2c-cbus-gpio",
+                .of_match_table = of_match_ptr(i2c_cbus_dt_ids),
         },
 };
 module_platform_driver(cbus_i2c_driver);
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 960dec61c64e..ff05d9fef4a8 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -795,7 +795,7 @@ static struct platform_driver davinci_i2c_driver = {
                 .name   = "i2c_davinci",
                 .owner  = THIS_MODULE,
                 .pm     = davinci_i2c_pm_ops,
-                .of_match_table = of_match_ptr(davinci_i2c_of_match),
+                .of_match_table = davinci_i2c_of_match,
         },
 };
 
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 0aa01136f8d9..d0bdac0498ce 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -103,6 +103,8 @@ static int dw_i2c_acpi_configure(struct platform_device *pdev)
 static const struct acpi_device_id dw_i2c_acpi_match[] = {
         { "INT33C2", 0 },
         { "INT33C3", 0 },
+        { "INT3432", 0 },
+        { "INT3433", 0 },
         { "80860F41", 0 },
         { }
 };
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index 0f3752967c4b..ff15ae90aaf5 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -312,24 +312,6 @@ static void pch_i2c_start(struct i2c_algo_pch_data *adap)
 }
 
 /**
- * pch_i2c_getack() - to confirm ACK/NACK
- * @adap:       Pointer to struct i2c_algo_pch_data.
- */
-static s32 pch_i2c_getack(struct i2c_algo_pch_data *adap)
-{
-        u32 reg_val;
-        void __iomem *p = adap->pch_base_address;
-        reg_val = ioread32(p + PCH_I2CSR) & PCH_GETACK;
-
-        if (reg_val != 0) {
-                pch_err(adap, "return%d\n", -EPROTO);
-                return -EPROTO;
-        }
-
-        return 0;
-}
-
-/**
  * pch_i2c_stop() - generate stop condition in normal mode.
  * @adap:       Pointer to struct i2c_algo_pch_data.
  */
@@ -344,6 +326,7 @@ static void pch_i2c_stop(struct i2c_algo_pch_data *adap)
 static int pch_i2c_wait_for_check_xfer(struct i2c_algo_pch_data *adap)
 {
         long ret;
+        void __iomem *p = adap->pch_base_address;
 
         ret = wait_event_timeout(pch_event,
                         (adap->pch_event_flag != 0), msecs_to_jiffies(1000));
@@ -366,10 +349,9 @@ static int pch_i2c_wait_for_check_xfer(struct i2c_algo_pch_data *adap)
 
         adap->pch_event_flag = 0;
 
-        if (pch_i2c_getack(adap)) {
-                pch_dbg(adap, "Receive NACK for slave address"
-                        "setting\n");
-                return -EIO;
+        if (ioread32(p + PCH_I2CSR) & PCH_GETACK) {
+                pch_dbg(adap, "Receive NACK for slave address setting\n");
+                return -ENXIO;
         }
 
         return 0;
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
new file mode 100644
index 000000000000..c1ef228095b5
--- /dev/null
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -0,0 +1,769 @@
+/**
+ * i2c-exynos5.c - Samsung Exynos5 I2C Controller Driver
+ *
+ * Copyright (C) 2013 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.
+*/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/spinlock.h>
+
+/*
+ * HSI2C controller from Samsung supports 2 modes of operation
+ * 1. Auto mode: Where in master automatically controls the whole transaction
+ * 2. Manual mode: Software controls the transaction by issuing commands
+ *    START, READ, WRITE, STOP, RESTART in I2C_MANUAL_CMD register.
+ *
+ * Operation mode can be selected by setting AUTO_MODE bit in I2C_CONF register
+ *
+ * Special bits are available for both modes of operation to set commands
+ * and for checking transfer status
+ */
+
+/* Register Map */
+#define HSI2C_CTL               0x00
+#define HSI2C_FIFO_CTL          0x04
+#define HSI2C_TRAILIG_CTL       0x08
+#define HSI2C_CLK_CTL           0x0C
+#define HSI2C_CLK_SLOT          0x10
+#define HSI2C_INT_ENABLE        0x20
+#define HSI2C_INT_STATUS        0x24
+#define HSI2C_ERR_STATUS        0x2C
+#define HSI2C_FIFO_STATUS       0x30
+#define HSI2C_TX_DATA           0x34
+#define HSI2C_RX_DATA           0x38
+#define HSI2C_CONF              0x40
+#define HSI2C_AUTO_CONF         0x44
+#define HSI2C_TIMEOUT           0x48
+#define HSI2C_MANUAL_CMD        0x4C
+#define HSI2C_TRANS_STATUS      0x50
+#define HSI2C_TIMING_HS1        0x54
+#define HSI2C_TIMING_HS2        0x58
+#define HSI2C_TIMING_HS3        0x5C
+#define HSI2C_TIMING_FS1        0x60
+#define HSI2C_TIMING_FS2        0x64
+#define HSI2C_TIMING_FS3        0x68
+#define HSI2C_TIMING_SLA        0x6C
+#define HSI2C_ADDR              0x70
+
+/* I2C_CTL Register bits */
+#define HSI2C_FUNC_MODE_I2C                     (1u << 0)
+#define HSI2C_MASTER                            (1u << 3)
+#define HSI2C_RXCHON                            (1u << 6)
+#define HSI2C_TXCHON                            (1u << 7)
+#define HSI2C_SW_RST                            (1u << 31)
+
+/* I2C_FIFO_CTL Register bits */
+#define HSI2C_RXFIFO_EN                         (1u << 0)
+#define HSI2C_TXFIFO_EN                         (1u << 1)
+#define HSI2C_RXFIFO_TRIGGER_LEVEL(x)           ((x) << 4)
+#define HSI2C_TXFIFO_TRIGGER_LEVEL(x)           ((x) << 16)
+
+/* As per user manual FIFO max depth is 64bytes */
+#define HSI2C_FIFO_MAX                          0x40
+/* default trigger levels for Tx and Rx FIFOs */
+#define HSI2C_DEF_TXFIFO_LVL                    (HSI2C_FIFO_MAX - 0x30)
+#define HSI2C_DEF_RXFIFO_LVL                    (HSI2C_FIFO_MAX - 0x10)
+
+/* I2C_TRAILING_CTL Register bits */
+#define HSI2C_TRAILING_COUNT                    (0xf)
+
+/* I2C_INT_EN Register bits */
+#define HSI2C_INT_TX_ALMOSTEMPTY_EN             (1u << 0)
+#define HSI2C_INT_RX_ALMOSTFULL_EN              (1u << 1)
+#define HSI2C_INT_TRAILING_EN                   (1u << 6)
+#define HSI2C_INT_I2C_EN                        (1u << 9)
+
+/* I2C_INT_STAT Register bits */
+#define HSI2C_INT_TX_ALMOSTEMPTY                (1u << 0)
+#define HSI2C_INT_RX_ALMOSTFULL                 (1u << 1)
+#define HSI2C_INT_TX_UNDERRUN                   (1u << 2)
+#define HSI2C_INT_TX_OVERRUN                    (1u << 3)
+#define HSI2C_INT_RX_UNDERRUN                   (1u << 4)
+#define HSI2C_INT_RX_OVERRUN                    (1u << 5)
+#define HSI2C_INT_TRAILING                      (1u << 6)
+#define HSI2C_INT_I2C                           (1u << 9)
+
+/* I2C_FIFO_STAT Register bits */
+#define HSI2C_RX_FIFO_EMPTY                     (1u << 24)
+#define HSI2C_RX_FIFO_FULL                      (1u << 23)
+#define HSI2C_RX_FIFO_LVL(x)                    ((x >> 16) & 0x7f)
+#define HSI2C_TX_FIFO_EMPTY                     (1u << 8)
+#define HSI2C_TX_FIFO_FULL                      (1u << 7)
+#define HSI2C_TX_FIFO_LVL(x)                    ((x >> 0) & 0x7f)
+
+/* I2C_CONF Register bits */
+#define HSI2C_AUTO_MODE                         (1u << 31)
+#define HSI2C_10BIT_ADDR_MODE                   (1u << 30)
+#define HSI2C_HS_MODE                           (1u << 29)
+
+/* I2C_AUTO_CONF Register bits */
+#define HSI2C_READ_WRITE                        (1u << 16)
+#define HSI2C_STOP_AFTER_TRANS                  (1u << 17)
+#define HSI2C_MASTER_RUN                        (1u << 31)
+
+/* I2C_TIMEOUT Register bits */
+#define HSI2C_TIMEOUT_EN                        (1u << 31)
+#define HSI2C_TIMEOUT_MASK                      0xff
+
+/* I2C_TRANS_STATUS register bits */
+#define HSI2C_MASTER_BUSY                       (1u << 17)
+#define HSI2C_SLAVE_BUSY                        (1u << 16)
+#define HSI2C_TIMEOUT_AUTO                      (1u << 4)
+#define HSI2C_NO_DEV                            (1u << 3)
+#define HSI2C_NO_DEV_ACK                        (1u << 2)
+#define HSI2C_TRANS_ABORT                       (1u << 1)
+#define HSI2C_TRANS_DONE                        (1u << 0)
+
+/* I2C_ADDR register bits */
+#define HSI2C_SLV_ADDR_SLV(x)                   ((x & 0x3ff) << 0)
+#define HSI2C_SLV_ADDR_MAS(x)                   ((x & 0x3ff) << 10)
+#define HSI2C_MASTER_ID(x)                      ((x & 0xff) << 24)
+#define MASTER_ID(x)                            ((x & 0x7) + 0x08)
+
+/*
+ * Controller operating frequency, timing values for operation
+ * are calculated against this frequency
+ */
+#define HSI2C_HS_TX_CLOCK       1000000
+#define HSI2C_FS_TX_CLOCK       100000
+#define HSI2C_HIGH_SPD          1
+#define HSI2C_FAST_SPD          0
+
+#define EXYNOS5_I2C_TIMEOUT (msecs_to_jiffies(1000))
+
+struct exynos5_i2c {
+        struct i2c_adapter      adap;
+        unsigned int            suspended:1;
+
+        struct i2c_msg          *msg;
+        struct completion       msg_complete;
+        unsigned int            msg_ptr;
+
+        unsigned int            irq;
+
+        void __iomem            *regs;
+        struct clk              *clk;
+        struct device           *dev;
+        int                     state;
+
+        spinlock_t              lock;           /* IRQ synchronization */
+
+        /*
+         * Since the TRANS_DONE bit is cleared on read, and we may read it
+         * either during an IRQ or after a transaction, keep track of its
+         * state here.
+         */
+        int                     trans_done;
+
+        /* Controller operating frequency */
+        unsigned int            fs_clock;
+        unsigned int            hs_clock;
+
+        /*
+         * HSI2C Controller can operate in
+         * 1. High speed upto 3.4Mbps
+         * 2. Fast speed upto 1Mbps
+         */
+        int                     speed_mode;
+};
+
+static const struct of_device_id exynos5_i2c_match[] = {
+        { .compatible = "samsung,exynos5-hsi2c" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, exynos5_i2c_match);
+
+static void exynos5_i2c_clr_pend_irq(struct exynos5_i2c *i2c)
+{
+        writel(readl(i2c->regs + HSI2C_INT_STATUS),
+                                i2c->regs + HSI2C_INT_STATUS);
+}
+
+/*
+ * exynos5_i2c_set_timing: updates the registers with appropriate
+ * timing values calculated
+ *
+ * Returns 0 on success, -EINVAL if the cycle length cannot
+ * be calculated.
+ */
+static int exynos5_i2c_set_timing(struct exynos5_i2c *i2c, int mode)
+{
+        u32 i2c_timing_s1;
+        u32 i2c_timing_s2;
+        u32 i2c_timing_s3;
+        u32 i2c_timing_sla;
+        unsigned int t_start_su, t_start_hd;
+        unsigned int t_stop_su;
+        unsigned int t_data_su, t_data_hd;
+        unsigned int t_scl_l, t_scl_h;
+        unsigned int t_sr_release;
+        unsigned int t_ftl_cycle;
+        unsigned int clkin = clk_get_rate(i2c->clk);
+        unsigned int div, utemp0 = 0, utemp1 = 0, clk_cycle;
+        unsigned int op_clk = (mode == HSI2C_HIGH_SPD) ?
+                                i2c->hs_clock : i2c->fs_clock;
+
+        /*
+         * FPCLK / FI2C =
+         * (CLK_DIV + 1) * (TSCLK_L + TSCLK_H + 2) + 8 + 2 * FLT_CYCLE
+         * utemp0 = (CLK_DIV + 1) * (TSCLK_L + TSCLK_H + 2)
+         * utemp1 = (TSCLK_L + TSCLK_H + 2)
+         */
+        t_ftl_cycle = (readl(i2c->regs + HSI2C_CONF) >> 16) & 0x7;
+        utemp0 = (clkin / op_clk) - 8 - 2 * t_ftl_cycle;
+
+        /* CLK_DIV max is 256 */
+        for (div = 0; div < 256; div++) {
+                utemp1 = utemp0 / (div + 1);
+
+                /*
+                 * SCL_L and SCL_H each has max value of 255
+                 * Hence, For the clk_cycle to the have right value
+                 * utemp1 has to be less then 512 and more than 4.
+                 */
+                if ((utemp1 < 512) && (utemp1 > 4)) {
+                        clk_cycle = utemp1 - 2;
+                        break;
+                } else if (div == 255) {
+                        dev_warn(i2c->dev, "Failed to calculate divisor");
+                        return -EINVAL;
+                }
+        }
+
+        t_scl_l = clk_cycle / 2;
+        t_scl_h = clk_cycle / 2;
+        t_start_su = t_scl_l;
+        t_start_hd = t_scl_l;
+        t_stop_su = t_scl_l;
+        t_data_su = t_scl_l / 2;
+        t_data_hd = t_scl_l / 2;
+        t_sr_release = clk_cycle;
+
+        i2c_timing_s1 = t_start_su << 24 | t_start_hd << 16 | t_stop_su << 8;
+        i2c_timing_s2 = t_data_su << 24 | t_scl_l << 8 | t_scl_h << 0;
+        i2c_timing_s3 = div << 16 | t_sr_release << 0;
+        i2c_timing_sla = t_data_hd << 0;
+
+        dev_dbg(i2c->dev, "tSTART_SU: %X, tSTART_HD: %X, tSTOP_SU: %X\n",
+                t_start_su, t_start_hd, t_stop_su);
+        dev_dbg(i2c->dev, "tDATA_SU: %X, tSCL_L: %X, tSCL_H: %X\n",
+                t_data_su, t_scl_l, t_scl_h);
+        dev_dbg(i2c->dev, "nClkDiv: %X, tSR_RELEASE: %X\n",
+                div, t_sr_release);
+        dev_dbg(i2c->dev, "tDATA_HD: %X\n", t_data_hd);
+
+        if (mode == HSI2C_HIGH_SPD) {
+                writel(i2c_timing_s1, i2c->regs + HSI2C_TIMING_HS1);
+                writel(i2c_timing_s2, i2c->regs + HSI2C_TIMING_HS2);
+                writel(i2c_timing_s3, i2c->regs + HSI2C_TIMING_HS3);
+        } else {
+                writel(i2c_timing_s1, i2c->regs + HSI2C_TIMING_FS1);
+                writel(i2c_timing_s2, i2c->regs + HSI2C_TIMING_FS2);
+                writel(i2c_timing_s3, i2c->regs + HSI2C_TIMING_FS3);
+        }
+        writel(i2c_timing_sla, i2c->regs + HSI2C_TIMING_SLA);
+
+        return 0;
+}
+
+static int exynos5_hsi2c_clock_setup(struct exynos5_i2c *i2c)
+{
+        /*
+         * Configure the Fast speed timing values
+         * Even the High Speed mode initially starts with Fast mode
+         */
+        if (exynos5_i2c_set_timing(i2c, HSI2C_FAST_SPD)) {
+                dev_err(i2c->dev, "HSI2C FS Clock set up failed\n");
+                return -EINVAL;
+        }
+
+        /* configure the High speed timing values */
+        if (i2c->speed_mode == HSI2C_HIGH_SPD) {
+                if (exynos5_i2c_set_timing(i2c, HSI2C_HIGH_SPD)) {
+                        dev_err(i2c->dev, "HSI2C HS Clock set up failed\n");
+                        return -EINVAL;
+                }
+        }
+
+        return 0;
+}
+
+/*
+ * exynos5_i2c_init: configures the controller for I2C functionality
+ * Programs I2C controller for Master mode operation
+ */
+static void exynos5_i2c_init(struct exynos5_i2c *i2c)
+{
+        u32 i2c_conf = readl(i2c->regs + HSI2C_CONF);
+        u32 i2c_timeout = readl(i2c->regs + HSI2C_TIMEOUT);
+
+        /* Clear to disable Timeout */
+        i2c_timeout &= ~HSI2C_TIMEOUT_EN;
+        writel(i2c_timeout, i2c->regs + HSI2C_TIMEOUT);
+
+        writel((HSI2C_FUNC_MODE_I2C | HSI2C_MASTER),
+                                        i2c->regs + HSI2C_CTL);
+        writel(HSI2C_TRAILING_COUNT, i2c->regs + HSI2C_TRAILIG_CTL);
+
+        if (i2c->speed_mode == HSI2C_HIGH_SPD) {
+                writel(HSI2C_MASTER_ID(MASTER_ID(i2c->adap.nr)),
+                                        i2c->regs + HSI2C_ADDR);
+                i2c_conf |= HSI2C_HS_MODE;
+        }
+
+        writel(i2c_conf | HSI2C_AUTO_MODE, i2c->regs + HSI2C_CONF);
+}
+
+static void exynos5_i2c_reset(struct exynos5_i2c *i2c)
+{
+        u32 i2c_ctl;
+
+        /* Set and clear the bit for reset */
+        i2c_ctl = readl(i2c->regs + HSI2C_CTL);
+        i2c_ctl |= HSI2C_SW_RST;
+        writel(i2c_ctl, i2c->regs + HSI2C_CTL);
+
+        i2c_ctl = readl(i2c->regs + HSI2C_CTL);
+        i2c_ctl &= ~HSI2C_SW_RST;
+        writel(i2c_ctl, i2c->regs + HSI2C_CTL);
+
+        /* We don't expect calculations to fail during the run */
+        exynos5_hsi2c_clock_setup(i2c);
+        /* Initialize the configure registers */
+        exynos5_i2c_init(i2c);
+}
+
+/*
+ * exynos5_i2c_irq: top level IRQ servicing routine
+ *
+ * INT_STATUS registers gives the interrupt details. Further,
+ * FIFO_STATUS or TRANS_STATUS registers are to be check for detailed
+ * state of the bus.
+ */
+static irqreturn_t exynos5_i2c_irq(int irqno, void *dev_id)
+{
+        struct exynos5_i2c *i2c = dev_id;
+        u32 fifo_level, int_status, fifo_status, trans_status;
+        unsigned char byte;
+        int len = 0;
+
+        i2c->state = -EINVAL;
+
+        spin_lock(&i2c->lock);
+
+        int_status = readl(i2c->regs + HSI2C_INT_STATUS);
+        writel(int_status, i2c->regs + HSI2C_INT_STATUS);
+        fifo_status = readl(i2c->regs + HSI2C_FIFO_STATUS);
+
+        /* handle interrupt related to the transfer status */
+        if (int_status & HSI2C_INT_I2C) {
+                trans_status = readl(i2c->regs + HSI2C_TRANS_STATUS);
+                if (trans_status & HSI2C_NO_DEV_ACK) {
+                        dev_dbg(i2c->dev, "No ACK from device\n");
+                        i2c->state = -ENXIO;
+                        goto stop;
+                } else if (trans_status & HSI2C_NO_DEV) {
+                        dev_dbg(i2c->dev, "No device\n");
+                        i2c->state = -ENXIO;
+                        goto stop;
+                } else if (trans_status & HSI2C_TRANS_ABORT) {
+                        dev_dbg(i2c->dev, "Deal with arbitration lose\n");
+                        i2c->state = -EAGAIN;
+                        goto stop;
+                } else if (trans_status & HSI2C_TIMEOUT_AUTO) {
+                        dev_dbg(i2c->dev, "Accessing device timed out\n");
+                        i2c->state = -EAGAIN;
+                        goto stop;
+                } else if (trans_status & HSI2C_TRANS_DONE) {
+                        i2c->trans_done = 1;
+                        i2c->state = 0;
+                }
+        }
+
+        if ((i2c->msg->flags & I2C_M_RD) && (int_status &
+                        (HSI2C_INT_TRAILING | HSI2C_INT_RX_ALMOSTFULL))) {
+                fifo_status = readl(i2c->regs + HSI2C_FIFO_STATUS);
+                fifo_level = HSI2C_RX_FIFO_LVL(fifo_status);
+                len = min(fifo_level, i2c->msg->len - i2c->msg_ptr);
+
+                while (len > 0) {
+                        byte = (unsigned char)
+                                readl(i2c->regs + HSI2C_RX_DATA);
+                        i2c->msg->buf[i2c->msg_ptr++] = byte;
+                        len--;
+                }
+                i2c->state = 0;
+        } else if (int_status & HSI2C_INT_TX_ALMOSTEMPTY) {
+                fifo_status = readl(i2c->regs + HSI2C_FIFO_STATUS);
+                fifo_level = HSI2C_TX_FIFO_LVL(fifo_status);
+
+                len = HSI2C_FIFO_MAX - fifo_level;
+                if (len > (i2c->msg->len - i2c->msg_ptr))
+                        len = i2c->msg->len - i2c->msg_ptr;
+
+                while (len > 0) {
+                        byte = i2c->msg->buf[i2c->msg_ptr++];
+                        writel(byte, i2c->regs + HSI2C_TX_DATA);
+                        len--;
+                }
+                i2c->state = 0;
+        }
+
+ stop:
+        if ((i2c->trans_done && (i2c->msg->len == i2c->msg_ptr)) ||
+            (i2c->state < 0)) {
+                writel(0, i2c->regs + HSI2C_INT_ENABLE);
+                exynos5_i2c_clr_pend_irq(i2c);
+                complete(&i2c->msg_complete);
+        }
+
+        spin_unlock(&i2c->lock);
+
+        return IRQ_HANDLED;
+}
+
+/*
+ * exynos5_i2c_wait_bus_idle
+ *
+ * Wait for the bus to go idle, indicated by the MASTER_BUSY bit being
+ * cleared.
+ *
+ * Returns -EBUSY if the bus cannot be bought to idle
+ */
+static int exynos5_i2c_wait_bus_idle(struct exynos5_i2c *i2c)
+{
+        unsigned long stop_time;
+        u32 trans_status;
+
+        /* wait for 100 milli seconds for the bus to be idle */
+        stop_time = jiffies + msecs_to_jiffies(100) + 1;
+        do {
+                trans_status = readl(i2c->regs + HSI2C_TRANS_STATUS);
+                if (!(trans_status & HSI2C_MASTER_BUSY))
+                        return 0;
+
+                usleep_range(50, 200);
+        } while (time_before(jiffies, stop_time));
+
+        return -EBUSY;
+}
+
+/*
+ * exynos5_i2c_message_start: Configures the bus and starts the xfer
+ * i2c: struct exynos5_i2c pointer for the current bus
+ * stop: Enables stop after transfer if set. Set for last transfer of
+ *       in the list of messages.
+ *
+ * Configures the bus for read/write function
+ * Sets chip address to talk to, message length to be sent.
+ * Enables appropriate interrupts and sends start xfer command.
+ */
+static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop)
+{
+        u32 i2c_ctl;
+        u32 int_en = HSI2C_INT_I2C_EN;
+        u32 i2c_auto_conf = 0;
+        u32 fifo_ctl;
+        unsigned long flags;
+
+        i2c_ctl = readl(i2c->regs + HSI2C_CTL);
+        i2c_ctl &= ~(HSI2C_TXCHON | HSI2C_RXCHON);
+        fifo_ctl = HSI2C_RXFIFO_EN | HSI2C_TXFIFO_EN;
+
+        if (i2c->msg->flags & I2C_M_RD) {
+                i2c_ctl |= HSI2C_RXCHON;
+
+                i2c_auto_conf = HSI2C_READ_WRITE;
+
+                fifo_ctl |= HSI2C_RXFIFO_TRIGGER_LEVEL(HSI2C_DEF_TXFIFO_LVL);
+                int_en |= (HSI2C_INT_RX_ALMOSTFULL_EN |
+                        HSI2C_INT_TRAILING_EN);
+        } else {
+                i2c_ctl |= HSI2C_TXCHON;
+
+                fifo_ctl |= HSI2C_TXFIFO_TRIGGER_LEVEL(HSI2C_DEF_RXFIFO_LVL);
+                int_en |= HSI2C_INT_TX_ALMOSTEMPTY_EN;
+        }
+
+        writel(HSI2C_SLV_ADDR_MAS(i2c->msg->addr), i2c->regs + HSI2C_ADDR);
+
+        writel(fifo_ctl, i2c->regs + HSI2C_FIFO_CTL);
+        writel(i2c_ctl, i2c->regs + HSI2C_CTL);
+
+
+        /*
+         * Enable interrupts before starting the transfer so that we don't
+         * miss any INT_I2C interrupts.
+         */
+        spin_lock_irqsave(&i2c->lock, flags);
+        writel(int_en, i2c->regs + HSI2C_INT_ENABLE);
+
+        if (stop == 1)
+                i2c_auto_conf |= HSI2C_STOP_AFTER_TRANS;
+        i2c_auto_conf |= i2c->msg->len;
+        i2c_auto_conf |= HSI2C_MASTER_RUN;
+        writel(i2c_auto_conf, i2c->regs + HSI2C_AUTO_CONF);
+        spin_unlock_irqrestore(&i2c->lock, flags);
+}
+
+static int exynos5_i2c_xfer_msg(struct exynos5_i2c *i2c,
+                              struct i2c_msg *msgs, int stop)
+{
+        unsigned long timeout;
+        int ret;
+
+        i2c->msg = msgs;
+        i2c->msg_ptr = 0;
+        i2c->trans_done = 0;
+
+        reinit_completion(&i2c->msg_complete);
+
+        exynos5_i2c_message_start(i2c, stop);
+
+        timeout = wait_for_completion_timeout(&i2c->msg_complete,
+                                              EXYNOS5_I2C_TIMEOUT);
+        if (timeout == 0)
+                ret = -ETIMEDOUT;
+        else
+                ret = i2c->state;
+
+        /*
+         * If this is the last message to be transfered (stop == 1)
+         * Then check if the bus can be brought back to idle.
+         */
+        if (ret == 0 && stop)
+                ret = exynos5_i2c_wait_bus_idle(i2c);
+
+        if (ret < 0) {
+                exynos5_i2c_reset(i2c);
+                if (ret == -ETIMEDOUT)
+                        dev_warn(i2c->dev, "%s timeout\n",
+                                 (msgs->flags & I2C_M_RD) ? "rx" : "tx");
+        }
+
+        /* Return the state as in interrupt routine */
+        return ret;
+}
+
+static int exynos5_i2c_xfer(struct i2c_adapter *adap,
+                        struct i2c_msg *msgs, int num)
+{
+        struct exynos5_i2c *i2c = (struct exynos5_i2c *)adap->algo_data;
+        int i = 0, ret = 0, stop = 0;
+
+        if (i2c->suspended) {
+                dev_err(i2c->dev, "HS-I2C is not initialzed.\n");
+                return -EIO;
+        }
+
+        clk_prepare_enable(i2c->clk);
+
+        for (i = 0; i < num; i++, msgs++) {
+                stop = (i == num - 1);
+
+                ret = exynos5_i2c_xfer_msg(i2c, msgs, stop);
+
+                if (ret < 0)
+                        goto out;
+        }
+
+        if (i == num) {
+                ret = num;
+        } else {
+                /* Only one message, cannot access the device */
+                if (i == 1)
+                        ret = -EREMOTEIO;
+                else
+                        ret = i;
+
+                dev_warn(i2c->dev, "xfer message failed\n");
+        }
+
+ out:
+        clk_disable_unprepare(i2c->clk);
+        return ret;
+}
+
+static u32 exynos5_i2c_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK);
+}
+
+static const struct i2c_algorithm exynos5_i2c_algorithm = {
+        .master_xfer            = exynos5_i2c_xfer,
+        .functionality          = exynos5_i2c_func,
+};
+
+static int exynos5_i2c_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct exynos5_i2c *i2c;
+        struct resource *mem;
+        unsigned int op_clock;
+        int ret;
+
+        i2c = devm_kzalloc(&pdev->dev, sizeof(struct exynos5_i2c), GFP_KERNEL);
+        if (!i2c) {
+                dev_err(&pdev->dev, "no memory for state\n");
+                return -ENOMEM;
+        }
+
+        if (of_property_read_u32(np, "clock-frequency", &op_clock)) {
+                i2c->speed_mode = HSI2C_FAST_SPD;
+                i2c->fs_clock = HSI2C_FS_TX_CLOCK;
+        } else {
+                if (op_clock >= HSI2C_HS_TX_CLOCK) {
+                        i2c->speed_mode = HSI2C_HIGH_SPD;
+                        i2c->fs_clock = HSI2C_FS_TX_CLOCK;
+                        i2c->hs_clock = op_clock;
+                } else {
+                        i2c->speed_mode = HSI2C_FAST_SPD;
+                        i2c->fs_clock = op_clock;
+                }
+        }
+
+        strlcpy(i2c->adap.name, "exynos5-i2c", sizeof(i2c->adap.name));
+        i2c->adap.owner   = THIS_MODULE;
+        i2c->adap.algo    = &exynos5_i2c_algorithm;
+        i2c->adap.retries = 3;
+
+        i2c->dev = &pdev->dev;
+        i2c->clk = devm_clk_get(&pdev->dev, "hsi2c");
+        if (IS_ERR(i2c->clk)) {
+                dev_err(&pdev->dev, "cannot get clock\n");
+                return -ENOENT;
+        }
+
+        clk_prepare_enable(i2c->clk);
+
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        i2c->regs = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(i2c->regs)) {
+                ret = PTR_ERR(i2c->regs);
+                goto err_clk;
+        }
+
+        i2c->adap.dev.of_node = np;
+        i2c->adap.algo_data = i2c;
+        i2c->adap.dev.parent = &pdev->dev;
+
+        /* Clear pending interrupts from u-boot or misc causes */
+        exynos5_i2c_clr_pend_irq(i2c);
+
+        spin_lock_init(&i2c->lock);
+        init_completion(&i2c->msg_complete);
+
+        i2c->irq = ret = platform_get_irq(pdev, 0);
+        if (ret <= 0) {
+                dev_err(&pdev->dev, "cannot find HS-I2C IRQ\n");
+                ret = -EINVAL;
+                goto err_clk;
+        }
+
+        ret = devm_request_irq(&pdev->dev, i2c->irq, exynos5_i2c_irq,
+                                IRQF_NO_SUSPEND | IRQF_ONESHOT,
+                                dev_name(&pdev->dev), i2c);
+
+        if (ret != 0) {
+                dev_err(&pdev->dev, "cannot request HS-I2C IRQ %d\n", i2c->irq);
+                goto err_clk;
+        }
+
+        ret = exynos5_hsi2c_clock_setup(i2c);
+        if (ret)
+                goto err_clk;
+
+        exynos5_i2c_init(i2c);
+
+        ret = i2c_add_adapter(&i2c->adap);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "failed to add bus to i2c core\n");
+                goto err_clk;
+        }
+
+        platform_set_drvdata(pdev, i2c);
+
+ err_clk:
+        clk_disable_unprepare(i2c->clk);
+        return ret;
+}
+
+static int exynos5_i2c_remove(struct platform_device *pdev)
+{
+        struct exynos5_i2c *i2c = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&i2c->adap);
+
+        return 0;
+}
+
+static int exynos5_i2c_suspend_noirq(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct exynos5_i2c *i2c = platform_get_drvdata(pdev);
+
+        i2c->suspended = 1;
+
+        return 0;
+}
+
+static int exynos5_i2c_resume_noirq(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct exynos5_i2c *i2c = platform_get_drvdata(pdev);
+        int ret = 0;
+
+        clk_prepare_enable(i2c->clk);
+
+        ret = exynos5_hsi2c_clock_setup(i2c);
+        if (ret) {
+                clk_disable_unprepare(i2c->clk);
+                return ret;
+        }
+
+        exynos5_i2c_init(i2c);
+        clk_disable_unprepare(i2c->clk);
+        i2c->suspended = 0;
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, exynos5_i2c_suspend_noirq,
+                         exynos5_i2c_resume_noirq);
+
+static struct platform_driver exynos5_i2c_driver = {
+        .probe          = exynos5_i2c_probe,
+        .remove         = exynos5_i2c_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = "exynos5-hsi2c",
+                .pm     = &exynos5_i2c_dev_pm_ops,
+                .of_match_table = exynos5_i2c_match,
+        },
+};
+
+module_platform_driver(exynos5_i2c_driver);
+
+MODULE_DESCRIPTION("Exynos5 HS-I2C Bus driver");
+MODULE_AUTHOR("Naveen Krishna Chatradhi, <ch.naveen@samsung.com>");
+MODULE_AUTHOR("Taekgyun Ko, <taeggyun.ko@samsung.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
index bfa02c6c2dda..d9f7e186a4c7 100644
--- a/drivers/i2c/busses/i2c-gpio.c
+++ b/drivers/i2c/busses/i2c-gpio.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 
 struct i2c_gpio_private_data {
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 4296d1721272..737e29866887 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -59,6 +59,7 @@
   Wellsburg (PCH) MS    0x8d7e     32     hard     yes     yes     yes
   Wellsburg (PCH) MS    0x8d7f     32     hard     yes     yes     yes
   Coleto Creek (PCH)    0x23b0     32     hard     yes     yes     yes
+  Wildcat Point-LP (PCH)   0x9ca2     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no
@@ -177,6 +178,7 @@
 #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1 0x8d7e
 #define PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2 0x8d7f
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_SMBUS  0x9c22
+#define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS       0x9ca2
 
 struct i801_mux_config {
         char *gpio_chip;
@@ -819,6 +821,7 @@ static DEFINE_PCI_DEVICE_TABLE(i801_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS1) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WELLSBURG_SMBUS_MS2) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COLETOCREEK_SMBUS) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_SMBUS) },
         { 0, }
 };
 
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index d3e9cc3153a9..8be7e42aa4de 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -911,7 +911,7 @@ static struct platform_driver mv64xxx_i2c_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = MV64XXX_I2C_CTLR_NAME,
-                .of_match_table = of_match_ptr(mv64xxx_i2c_of_match_table),
+                .of_match_table = mv64xxx_i2c_of_match_table,
         },
 };
 
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index 3aedd86a6468..0cde4e6ab2b2 100644
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -1,6 +1,7 @@
 /*
  * Freescale MXS I2C bus driver
  *
+ * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de>
  * Copyright (C) 2011-2012 Wolfram Sang, Pengutronix e.K.
  *
  * based on a (non-working) driver which was:
@@ -34,10 +35,12 @@
 
 #define MXS_I2C_CTRL0           (0x00)
 #define MXS_I2C_CTRL0_SET       (0x04)
+#define MXS_I2C_CTRL0_CLR       (0x08)
 
 #define MXS_I2C_CTRL0_SFTRST                    0x80000000
 #define MXS_I2C_CTRL0_RUN                       0x20000000
 #define MXS_I2C_CTRL0_SEND_NAK_ON_LAST          0x02000000
+#define MXS_I2C_CTRL0_PIO_MODE                  0x01000000
 #define MXS_I2C_CTRL0_RETAIN_CLOCK              0x00200000
 #define MXS_I2C_CTRL0_POST_SEND_STOP            0x00100000
 #define MXS_I2C_CTRL0_PRE_SEND_START            0x00080000
@@ -64,13 +67,13 @@
 #define MXS_I2C_CTRL1_SLAVE_IRQ                 0x01
 
 #define MXS_I2C_STAT            (0x50)
+#define MXS_I2C_STAT_GOT_A_NAK                  0x10000000
 #define MXS_I2C_STAT_BUS_BUSY                   0x00000800
 #define MXS_I2C_STAT_CLK_GEN_BUSY               0x00000400
 
-#define MXS_I2C_DATA            (0xa0)
+#define MXS_I2C_DATA(i2c)       ((i2c->dev_type == MXS_I2C_V1) ? 0x60 : 0xa0)
 
-#define MXS_I2C_DEBUG0          (0xb0)
-#define MXS_I2C_DEBUG0_CLR      (0xb8)
+#define MXS_I2C_DEBUG0_CLR(i2c) ((i2c->dev_type == MXS_I2C_V1) ? 0x78 : 0xb8)
 
 #define MXS_I2C_DEBUG0_DMAREQ   0x80000000
 
@@ -95,10 +98,17 @@
 #define MXS_CMD_I2C_READ        (MXS_I2C_CTRL0_SEND_NAK_ON_LAST | \
                                  MXS_I2C_CTRL0_MASTER_MODE)
 
+enum mxs_i2c_devtype {
+        MXS_I2C_UNKNOWN = 0,
+        MXS_I2C_V1,
+        MXS_I2C_V2,
+};
+
 /**
  * struct mxs_i2c_dev - per device, private MXS-I2C data
  *
  * @dev: driver model device node
+ * @dev_type: distinguish i.MX23/i.MX28 features
  * @regs: IO registers pointer
  * @cmd_complete: completion object for transaction wait
  * @cmd_err: error code for last transaction
@@ -106,6 +116,7 @@
  */
 struct mxs_i2c_dev {
         struct device *dev;
+        enum mxs_i2c_devtype dev_type;
         void __iomem *regs;
         struct completion cmd_complete;
         int cmd_err;
@@ -291,48 +302,11 @@ write_init_pio_fail:
         return -EINVAL;
 }
 
-static int mxs_i2c_pio_wait_dmareq(struct mxs_i2c_dev *i2c)
+static int mxs_i2c_pio_wait_xfer_end(struct mxs_i2c_dev *i2c)
 {
         unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 
-        while (!(readl(i2c->regs + MXS_I2C_DEBUG0) &
-                MXS_I2C_DEBUG0_DMAREQ)) {
-                if (time_after(jiffies, timeout))
-                        return -ETIMEDOUT;
-                cond_resched();
-        }
-
-        return 0;
-}
-
-static int mxs_i2c_pio_wait_cplt(struct mxs_i2c_dev *i2c, int last)
-{
-        unsigned long timeout = jiffies + msecs_to_jiffies(1000);
-
-        /*
-         * We do not use interrupts in the PIO mode. Due to the
-         * maximum transfer length being 8 bytes in PIO mode, the
-         * overhead of interrupt would be too large and this would
-         * neglect the gain from using the PIO mode.
-         */
-
-        while (!(readl(i2c->regs + MXS_I2C_CTRL1) &
-                MXS_I2C_CTRL1_DATA_ENGINE_CMPLT_IRQ)) {
-                if (time_after(jiffies, timeout))
-                        return -ETIMEDOUT;
-                cond_resched();
-        }
-
-        writel(MXS_I2C_CTRL1_DATA_ENGINE_CMPLT_IRQ,
-                i2c->regs + MXS_I2C_CTRL1_CLR);
-
-        /*
-         * When ending a transfer with a stop, we have to wait for the bus to
-         * go idle before we report the transfer as completed. Otherwise the
-         * start of the next transfer may race with the end of the current one.
-         */
-        while (last && (readl(i2c->regs + MXS_I2C_STAT) &
-                        (MXS_I2C_STAT_BUS_BUSY | MXS_I2C_STAT_CLK_GEN_BUSY))) {
+        while (readl(i2c->regs + MXS_I2C_CTRL0) & MXS_I2C_CTRL0_RUN) {
                 if (time_after(jiffies, timeout))
                         return -ETIMEDOUT;
                 cond_resched();
@@ -370,106 +344,215 @@ static void mxs_i2c_pio_trigger_cmd(struct mxs_i2c_dev *i2c, u32 cmd)
         writel(reg, i2c->regs + MXS_I2C_CTRL0);
 }
 
+/*
+ * Start WRITE transaction on the I2C bus. By studying i.MX23 datasheet,
+ * CTRL0::PIO_MODE bit description clarifies the order in which the registers
+ * must be written during PIO mode operation. First, the CTRL0 register has
+ * to be programmed with all the necessary bits but the RUN bit. Then the
+ * payload has to be written into the DATA register. Finally, the transmission
+ * is executed by setting the RUN bit in CTRL0.
+ */
+static void mxs_i2c_pio_trigger_write_cmd(struct mxs_i2c_dev *i2c, u32 cmd,
+                                          u32 data)
+{
+        writel(cmd, i2c->regs + MXS_I2C_CTRL0);
+
+        if (i2c->dev_type == MXS_I2C_V1)
+                writel(MXS_I2C_CTRL0_PIO_MODE, i2c->regs + MXS_I2C_CTRL0_SET);
+
+        writel(data, i2c->regs + MXS_I2C_DATA(i2c));
+        writel(MXS_I2C_CTRL0_RUN, i2c->regs + MXS_I2C_CTRL0_SET);
+}
+
 static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap,
                         struct i2c_msg *msg, uint32_t flags)
 {
         struct mxs_i2c_dev *i2c = i2c_get_adapdata(adap);
         uint32_t addr_data = msg->addr << 1;
         uint32_t data = 0;
-        int i, shifts_left, ret;
+        int i, ret, xlen = 0, xmit = 0;
+        uint32_t start;
 
         /* Mute IRQs coming from this block. */
         writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_CLR);
 
+        /*
+         * MX23 idea:
+         * - Enable CTRL0::PIO_MODE (1 << 24)
+         * - Enable CTRL1::ACK_MODE (1 << 27)
+         *
+         * WARNING! The MX23 is broken in some way, even if it claims
+         * to support PIO, when we try to transfer any amount of data
+         * that is not aligned to 4 bytes, the DMA engine will have
+         * bits in DEBUG1::DMA_BYTES_ENABLES still set even after the
+         * transfer. This in turn will mess up the next transfer as
+         * the block it emit one byte write onto the bus terminated
+         * with a NAK+STOP. A possible workaround is to reset the IP
+         * block after every PIO transmission, which might just work.
+         *
+         * NOTE: The CTRL0::PIO_MODE description is important, since
+         * it outlines how the PIO mode is really supposed to work.
+         */
         if (msg->flags & I2C_M_RD) {
+                /*
+                 * PIO READ transfer:
+                 *
+                 * This transfer MUST be limited to 4 bytes maximum. It is not
+                 * possible to transfer more than four bytes via PIO, since we
+                 * can not in any way make sure we can read the data from the
+                 * DATA register fast enough. Besides, the RX FIFO is only four
+                 * bytes deep, thus we can only really read up to four bytes at
+                 * time. Finally, there is no bit indicating us that new data
+                 * arrived at the FIFO and can thus be fetched from the DATA
+                 * register.
+                 */
+                BUG_ON(msg->len > 4);
+
                 addr_data |= I2C_SMBUS_READ;
 
                 /* SELECT command. */
-                mxs_i2c_pio_trigger_cmd(i2c, MXS_CMD_I2C_SELECT);
-
-                ret = mxs_i2c_pio_wait_dmareq(i2c);
-                if (ret)
-                        return ret;
-
-                writel(addr_data, i2c->regs + MXS_I2C_DATA);
-                writel(MXS_I2C_DEBUG0_DMAREQ, i2c->regs + MXS_I2C_DEBUG0_CLR);
+                mxs_i2c_pio_trigger_write_cmd(i2c, MXS_CMD_I2C_SELECT,
+                                              addr_data);
 
-                ret = mxs_i2c_pio_wait_cplt(i2c, 0);
-                if (ret)
-                        return ret;
-
-                if (mxs_i2c_pio_check_error_state(i2c))
+                ret = mxs_i2c_pio_wait_xfer_end(i2c);
+                if (ret) {
+                        dev_err(i2c->dev,
+                                "PIO: Failed to send SELECT command!\n");
                         goto cleanup;
+                }
 
                 /* READ command. */
                 mxs_i2c_pio_trigger_cmd(i2c,
                                         MXS_CMD_I2C_READ | flags |
                                         MXS_I2C_CTRL0_XFER_COUNT(msg->len));
 
+                ret = mxs_i2c_pio_wait_xfer_end(i2c);
+                if (ret) {
+                        dev_err(i2c->dev,
+                                "PIO: Failed to send SELECT command!\n");
+                        goto cleanup;
+                }
+
+                data = readl(i2c->regs + MXS_I2C_DATA(i2c));
                 for (i = 0; i < msg->len; i++) {
-                        if ((i & 3) == 0) {
-                                ret = mxs_i2c_pio_wait_dmareq(i2c);
-                                if (ret)
-                                        return ret;
-                                data = readl(i2c->regs + MXS_I2C_DATA);
-                                writel(MXS_I2C_DEBUG0_DMAREQ,
-                                       i2c->regs + MXS_I2C_DEBUG0_CLR);
-                        }
                         msg->buf[i] = data & 0xff;
                         data >>= 8;
                 }
         } else {
+                /*
+                 * PIO WRITE transfer:
+                 *
+                 * The code below implements clock stretching to circumvent
+                 * the possibility of kernel not being able to supply data
+                 * fast enough. It is possible to transfer arbitrary amount
+                 * of data using PIO write.
+                 */
                 addr_data |= I2C_SMBUS_WRITE;
 
-                /* WRITE command. */
-                mxs_i2c_pio_trigger_cmd(i2c,
-                                        MXS_CMD_I2C_WRITE | flags |
-                                        MXS_I2C_CTRL0_XFER_COUNT(msg->len + 1));
-
                 /*
                  * The LSB of data buffer is the first byte blasted across
                  * the bus. Higher order bytes follow. Thus the following
                  * filling schematic.
                  */
+
                 data = addr_data << 24;
+
+                /* Start the transfer with START condition. */
+                start = MXS_I2C_CTRL0_PRE_SEND_START;
+
+                /* If the transfer is long, use clock stretching. */
+                if (msg->len > 3)
+                        start |= MXS_I2C_CTRL0_RETAIN_CLOCK;
+
                 for (i = 0; i < msg->len; i++) {
                         data >>= 8;
                         data |= (msg->buf[i] << 24);
-                        if ((i & 3) == 2) {
-                                ret = mxs_i2c_pio_wait_dmareq(i2c);
-                                if (ret)
-                                        return ret;
-                                writel(data, i2c->regs + MXS_I2C_DATA);
-                                writel(MXS_I2C_DEBUG0_DMAREQ,
-                                       i2c->regs + MXS_I2C_DEBUG0_CLR);
+
+                        xmit = 0;
+
+                        /* This is the last transfer of the message. */
+                        if (i + 1 == msg->len) {
+                                /* Add optional STOP flag. */
+                                start |= flags;
+                                /* Remove RETAIN_CLOCK bit. */
+                                start &= ~MXS_I2C_CTRL0_RETAIN_CLOCK;
+                                xmit = 1;
                         }
-                }
 
-                shifts_left = 24 - (i & 3) * 8;
-                if (shifts_left) {
-                        data >>= shifts_left;
-                        ret = mxs_i2c_pio_wait_dmareq(i2c);
-                        if (ret)
-                                return ret;
-                        writel(data, i2c->regs + MXS_I2C_DATA);
+                        /* Four bytes are ready in the "data" variable. */
+                        if ((i & 3) == 2)
+                                xmit = 1;
+
+                        /* Nothing interesting happened, continue stuffing. */
+                        if (!xmit)
+                                continue;
+
+                        /*
+                         * Compute the size of the transfer and shift the
+                         * data accordingly.
+                         *
+                         * i = (4k + 0) .... xlen = 2
+                         * i = (4k + 1) .... xlen = 3
+                         * i = (4k + 2) .... xlen = 4
+                         * i = (4k + 3) .... xlen = 1
+                         */
+
+                        if ((i % 4) == 3)
+                                xlen = 1;
+                        else
+                                xlen = (i % 4) + 2;
+
+                        data >>= (4 - xlen) * 8;
+
+                        dev_dbg(i2c->dev,
+                                "PIO: len=%i pos=%i total=%i [W%s%s%s]\n",
+                                xlen, i, msg->len,
+                                start & MXS_I2C_CTRL0_PRE_SEND_START ? "S" : "",
+                                start & MXS_I2C_CTRL0_POST_SEND_STOP ? "E" : "",
+                                start & MXS_I2C_CTRL0_RETAIN_CLOCK ? "C" : "");
+
                         writel(MXS_I2C_DEBUG0_DMAREQ,
-                               i2c->regs + MXS_I2C_DEBUG0_CLR);
+                               i2c->regs + MXS_I2C_DEBUG0_CLR(i2c));
+
+                        mxs_i2c_pio_trigger_write_cmd(i2c,
+                                start | MXS_I2C_CTRL0_MASTER_MODE |
+                                MXS_I2C_CTRL0_DIRECTION |
+                                MXS_I2C_CTRL0_XFER_COUNT(xlen), data);
+
+                        /* The START condition is sent only once. */
+                        start &= ~MXS_I2C_CTRL0_PRE_SEND_START;
+
+                        /* Wait for the end of the transfer. */
+                        ret = mxs_i2c_pio_wait_xfer_end(i2c);
+                        if (ret) {
+                                dev_err(i2c->dev,
+                                        "PIO: Failed to finish WRITE cmd!\n");
+                                break;
+                        }
+
+                        /* Check NAK here. */
+                        ret = readl(i2c->regs + MXS_I2C_STAT) &
+                                    MXS_I2C_STAT_GOT_A_NAK;
+                        if (ret) {
+                                ret = -ENXIO;
+                                goto cleanup;
+                        }
                 }
         }
 
-        ret = mxs_i2c_pio_wait_cplt(i2c, flags & MXS_I2C_CTRL0_POST_SEND_STOP);
-        if (ret)
-                return ret;
-
         /* make sure we capture any occurred error into cmd_err */
-        mxs_i2c_pio_check_error_state(i2c);
+        ret = mxs_i2c_pio_check_error_state(i2c);
 
 cleanup:
         /* Clear any dangling IRQs and re-enable interrupts. */
         writel(MXS_I2C_IRQ_MASK, i2c->regs + MXS_I2C_CTRL1_CLR);
         writel(MXS_I2C_IRQ_MASK << 8, i2c->regs + MXS_I2C_CTRL1_SET);
 
-        return 0;
+        /* Clear the PIO_MODE on i.MX23 */
+        if (i2c->dev_type == MXS_I2C_V1)
+                writel(MXS_I2C_CTRL0_PIO_MODE, i2c->regs + MXS_I2C_CTRL0_CLR);
+
+        return ret;
 }
 
 /*
@@ -479,8 +562,9 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                                 int stop)
 {
         struct mxs_i2c_dev *i2c = i2c_get_adapdata(adap);
-        int ret, err;
+        int ret;
         int flags;
+        int use_pio = 0;
 
         flags = stop ? MXS_I2C_CTRL0_POST_SEND_STOP : 0;
 
@@ -491,19 +575,21 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                 return -EINVAL;
 
         /*
-         * The current boundary to select between PIO/DMA transfer method
-         * is set to 8 bytes, transfers shorter than 8 bytes are transfered
-         * using PIO mode while longer transfers use DMA. The 8 byte border is
-         * based on this empirical measurement and a lot of previous frobbing.
+         * The MX28 I2C IP block can only do PIO READ for transfer of to up
+         * 4 bytes of length. The write transfer is not limited as it can use
+         * clock stretching to avoid FIFO underruns.
          */
+        if ((msg->flags & I2C_M_RD) && (msg->len <= 4))
+                use_pio = 1;
+        if (!(msg->flags & I2C_M_RD) && (msg->len < 7))
+                use_pio = 1;
+
         i2c->cmd_err = 0;
-        if (0) {        /* disable PIO mode until a proper fix is made */
+        if (use_pio) {
                 ret = mxs_i2c_pio_setup_xfer(adap, msg, flags);
-                if (ret) {
-                        err = mxs_i2c_reset(i2c);
-                        if (err)
-                                return err;
-                }
+                /* No need to reset the block if NAK was received. */
+                if (ret && (ret != -ENXIO))
+                        mxs_i2c_reset(i2c);
         } else {
                 reinit_completion(&i2c->cmd_complete);
                 ret = mxs_i2c_dma_setup_xfer(adap, msg, flags);
@@ -514,9 +600,11 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                                                 msecs_to_jiffies(1000));
                 if (ret == 0)
                         goto timeout;
+
+                ret = i2c->cmd_err;
         }
 
-        if (i2c->cmd_err == -ENXIO) {
+        if (ret == -ENXIO) {
                 /*
                  * If the transfer fails with a NAK from the slave the
                  * controller halts until it gets told to return to idle state.
@@ -525,7 +613,19 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                        i2c->regs + MXS_I2C_CTRL1_SET);
         }
 
-        ret = i2c->cmd_err;
+        /*
+         * WARNING!
+         * The i.MX23 is strange. After each and every operation, it's I2C IP
+         * block must be reset, otherwise the IP block will misbehave. This can
+         * be observed on the bus by the block sending out one single byte onto
+         * the bus. In case such an error happens, bit 27 will be set in the
+         * DEBUG0 register. This bit is not documented in the i.MX23 datasheet
+         * and is marked as "TBD" instead. To reset this bit to a correct state,
+         * reset the whole block. Since the block reset does not take long, do
+         * reset the block after every transfer to play safe.
+         */
+        if (i2c->dev_type == MXS_I2C_V1)
+                mxs_i2c_reset(i2c);
 
         dev_dbg(i2c->dev, "Done with err=%d\n", ret);
 
@@ -680,8 +780,28 @@ static int mxs_i2c_get_ofdata(struct mxs_i2c_dev *i2c)
         return 0;
 }
 
+static struct platform_device_id mxs_i2c_devtype[] = {
+        {
+                .name = "imx23-i2c",
+                .driver_data = MXS_I2C_V1,
+        }, {
+                .name = "imx28-i2c",
+                .driver_data = MXS_I2C_V2,
+        }, { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, mxs_i2c_devtype);
+
+static const struct of_device_id mxs_i2c_dt_ids[] = {
+        { .compatible = "fsl,imx23-i2c", .data = &mxs_i2c_devtype[0], },
+        { .compatible = "fsl,imx28-i2c", .data = &mxs_i2c_devtype[1], },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, mxs_i2c_dt_ids);
+
 static int mxs_i2c_probe(struct platform_device *pdev)
 {
+        const struct of_device_id *of_id =
+                                of_match_device(mxs_i2c_dt_ids, &pdev->dev);
         struct device *dev = &pdev->dev;
         struct mxs_i2c_dev *i2c;
         struct i2c_adapter *adap;
@@ -693,6 +813,11 @@ static int mxs_i2c_probe(struct platform_device *pdev)
         if (!i2c)
                 return -ENOMEM;
 
+        if (of_id) {
+                const struct platform_device_id *device_id = of_id->data;
+                i2c->dev_type = device_id->driver_data;
+        }
+
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_irq(pdev, 0);
 
@@ -768,12 +893,6 @@ static int mxs_i2c_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id mxs_i2c_dt_ids[] = {
-        { .compatible = "fsl,imx28-i2c", },
-        { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, mxs_i2c_dt_ids);
-
 static struct platform_driver mxs_i2c_driver = {
         .driver = {
                    .name = DRIVER_NAME,
@@ -796,6 +915,7 @@ static void __exit mxs_i2c_exit(void)
 }
 module_exit(mxs_i2c_exit);
 
+MODULE_AUTHOR("Marek Vasut <marex@denx.de>");
 MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");
 MODULE_DESCRIPTION("MXS I2C Bus Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 1a9ea25f2314..c9a352f0a9a5 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -23,6 +23,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #define I2C_PNX_TIMEOUT_DEFAULT         10 /* msec */
 #define I2C_PNX_SPEED_KHZ_DEFAULT       100
diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index d2fe11da5e82..2c2fd7c2b116 100644
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -33,6 +33,7 @@
 #include <linux/i2c/i2c-rcar.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
@@ -102,8 +103,8 @@ enum {
 #define ID_NACK         (1 << 4)
 
 enum rcar_i2c_type {
-        I2C_RCAR_H1,
-        I2C_RCAR_H2,
+        I2C_RCAR_GEN1,
+        I2C_RCAR_GEN2,
 };
 
 struct rcar_i2c_priv {
@@ -226,22 +227,23 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
                                     u32 bus_speed,
                                     struct device *dev)
 {
-        struct clk *clkp = clk_get(NULL, "peripheral_clk");
+        struct clk *clkp = clk_get(dev, NULL);
         u32 scgd, cdf;
         u32 round, ick;
         u32 scl;
         u32 cdf_width;
+        unsigned long rate;
 
-        if (!clkp) {
-                dev_err(dev, "there is no peripheral_clk\n");
-                return -EIO;
+        if (IS_ERR(clkp)) {
+                dev_err(dev, "couldn't get clock\n");
+                return PTR_ERR(clkp);
         }
 
         switch (priv->devtype) {
-        case I2C_RCAR_H1:
+        case I2C_RCAR_GEN1:
                 cdf_width = 2;
                 break;
-        case I2C_RCAR_H2:
+        case I2C_RCAR_GEN2:
                 cdf_width = 3;
                 break;
         default:
@@ -264,15 +266,14 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv,
          * clkp : peripheral_clk
          * F[]  : integer up-valuation
          */
-        for (cdf = 0; cdf < (1 << cdf_width); cdf++) {
-                ick = clk_get_rate(clkp) / (1 + cdf);
-                if (ick < 20000000)
-                        goto ick_find;
+        rate = clk_get_rate(clkp);
+        cdf = rate / 20000000;
+        if (cdf >= 1 << cdf_width) {
+                dev_err(dev, "Input clock %lu too high\n", rate);
+                return -EIO;
         }
-        dev_err(dev, "there is no best CDF\n");
-        return -EIO;
+        ick = rate / (cdf + 1);
 
-ick_find:
         /*
          * it is impossible to calculate large scale
          * number on u32. separate it
@@ -290,6 +291,12 @@ ick_find:
          *
          * Calculation result (= SCL) should be less than
          * bus_speed for hardware safety
+         *
+         * We could use something along the lines of
+         *      div = ick / (bus_speed + 1) + 1;
+         *      scgd = (div - 20 - round + 7) / 8;
+         *      scl = ick / (20 + (scgd * 8) + round);
+         * (not fully verified) but that would get pretty involved
          */
         for (scgd = 0; scgd < 0x40; scgd++) {
                 scl = ick / (20 + (scgd * 8) + round);
@@ -306,7 +313,7 @@ scgd_find:
         /*
          * keep icccr value
          */
-        priv->icccr = (scgd << (cdf_width) | cdf);
+        priv->icccr = scgd << cdf_width | cdf;
 
         return 0;
 }
@@ -632,6 +639,15 @@ static const struct i2c_algorithm rcar_i2c_algo = {
         .functionality  = rcar_i2c_func,
 };
 
+static const struct of_device_id rcar_i2c_dt_ids[] = {
+        { .compatible = "renesas,i2c-rcar", .data = (void *)I2C_RCAR_GEN1 },
+        { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 },
+        { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 },
+        { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids);
+
 static int rcar_i2c_probe(struct platform_device *pdev)
 {
         struct i2c_rcar_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -649,10 +665,15 @@ static int rcar_i2c_probe(struct platform_device *pdev)
         }
 
         bus_speed = 100000; /* default 100 kHz */
-        if (pdata && pdata->bus_speed)
+        ret = of_property_read_u32(dev->of_node, "clock-frequency", &bus_speed);
+        if (ret < 0 && pdata && pdata->bus_speed)
                 bus_speed = pdata->bus_speed;
 
-        priv->devtype = platform_get_device_id(pdev)->driver_data;
+        if (pdev->dev.of_node)
+                priv->devtype = (long)of_match_device(rcar_i2c_dt_ids,
+                                                      dev)->data;
+        else
+                priv->devtype = platform_get_device_id(pdev)->driver_data;
 
         ret = rcar_i2c_clock_calculate(priv, bus_speed, dev);
         if (ret < 0)
@@ -673,6 +694,7 @@ static int rcar_i2c_probe(struct platform_device *pdev)
         adap->class             = I2C_CLASS_HWMON | I2C_CLASS_SPD;
         adap->retries           = 3;
         adap->dev.parent        = dev;
+        adap->dev.of_node       = dev->of_node;
         i2c_set_adapdata(adap, priv);
         strlcpy(adap->name, pdev->name, sizeof(adap->name));
 
@@ -709,9 +731,9 @@ static int rcar_i2c_remove(struct platform_device *pdev)
 }
 
 static struct platform_device_id rcar_i2c_id_table[] = {
-        { "i2c-rcar",           I2C_RCAR_H1 },
-        { "i2c-rcar_h1",        I2C_RCAR_H1 },
-        { "i2c-rcar_h2",        I2C_RCAR_H2 },
+        { "i2c-rcar",           I2C_RCAR_GEN1 },
+        { "i2c-rcar_gen1",      I2C_RCAR_GEN1 },
+        { "i2c-rcar_gen2",      I2C_RCAR_GEN2 },
         {},
 };
 MODULE_DEVICE_TABLE(platform, rcar_i2c_id_table);
@@ -720,6 +742,7 @@ static struct platform_driver rcar_i2c_driver = {
         .driver = {
                 .name   = "i2c-rcar",
                 .owner  = THIS_MODULE,
+                .of_match_table = rcar_i2c_dt_ids,
         },
         .probe          = rcar_i2c_probe,
         .remove         = rcar_i2c_remove,
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 3747b9bf67d6..bf8fb94ebc5d 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -36,6 +36,7 @@
 #include <linux/cpufreq.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/pinctrl/consumer.h>
 
diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index c447e8d40b78..599235514138 100644
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -223,7 +223,7 @@ acpi_smbus_cmi_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,
                 goto out;
 
         obj = pkg->package.elements + 1;
-        if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) {
+        if (obj->type != ACPI_TYPE_INTEGER) {
                 ACPI_ERROR((AE_INFO, "Invalid argument type"));
                 result = -EIO;
                 goto out;
@@ -235,7 +235,7 @@ acpi_smbus_cmi_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,
         case I2C_SMBUS_BYTE:
         case I2C_SMBUS_BYTE_DATA:
         case I2C_SMBUS_WORD_DATA:
-                if (obj == NULL || obj->type != ACPI_TYPE_INTEGER) {
+                if (obj->type != ACPI_TYPE_INTEGER) {
                         ACPI_ERROR((AE_INFO, "Invalid argument type"));
                         result = -EIO;
                         goto out;
@@ -246,7 +246,7 @@ acpi_smbus_cmi_access(struct i2c_adapter *adap, u16 addr, unsigned short flags,
                         data->byte = obj->integer.value;
                 break;
         case I2C_SMBUS_BLOCK_DATA:
-                if (obj == NULL || obj->type != ACPI_TYPE_BUFFER) {
+                if (obj->type != ACPI_TYPE_BUFFER) {
                         ACPI_ERROR((AE_INFO, "Invalid argument type"));
                         result = -EIO;
                         goto out;
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 55110ddbed1f..1d79585ba4b3 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -235,7 +235,7 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
         int offset;
 
         /* Get clock rate after clock is enabled */
-        clk_enable(pd->clk);
+        clk_prepare_enable(pd->clk);
         i2c_clk_khz = clk_get_rate(pd->clk) / 1000;
         i2c_clk_khz /= pd->clks_per_count;
 
@@ -270,14 +270,14 @@ static void sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
                 pd->icic &= ~ICIC_ICCHB8;
 
 out:
-        clk_disable(pd->clk);
+        clk_disable_unprepare(pd->clk);
 }
 
 static void activate_ch(struct sh_mobile_i2c_data *pd)
 {
         /* Wake up device and enable clock */
         pm_runtime_get_sync(pd->dev);
-        clk_enable(pd->clk);
+        clk_prepare_enable(pd->clk);
 
         /* Enable channel and configure rx ack */
         iic_set_clr(pd, ICCR, ICCR_ICE, 0);
@@ -300,7 +300,7 @@ static void deactivate_ch(struct sh_mobile_i2c_data *pd)
         iic_set_clr(pd, ICCR, 0, ICCR_ICE);
 
         /* Disable clock and mark device as idle */
-        clk_disable(pd->clk);
+        clk_disable_unprepare(pd->clk);
         pm_runtime_put_sync(pd->dev);
 }
 
diff --git a/drivers/i2c/busses/i2c-st.c b/drivers/i2c/busses/i2c-st.c
new file mode 100644
index 000000000000..9cf715d69551
--- /dev/null
+++ b/drivers/i2c/busses/i2c-st.c
@@ -0,0 +1,872 @@
+/*
+ * Copyright (C) 2013 STMicroelectronics
+ *
+ * I2C master mode controller driver, used in STMicroelectronics devices.
+ *
+ * Author: Maxime Coquelin <maxime.coquelin@st.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/module.h>
+#include <linux/platform_device.h>
+#include <linux/i2c.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+/* SSC registers */
+#define SSC_BRG                         0x000
+#define SSC_TBUF                        0x004
+#define SSC_RBUF                        0x008
+#define SSC_CTL                         0x00C
+#define SSC_IEN                         0x010
+#define SSC_STA                         0x014
+#define SSC_I2C                         0x018
+#define SSC_SLAD                        0x01C
+#define SSC_REP_START_HOLD              0x020
+#define SSC_START_HOLD                  0x024
+#define SSC_REP_START_SETUP             0x028
+#define SSC_DATA_SETUP                  0x02C
+#define SSC_STOP_SETUP                  0x030
+#define SSC_BUS_FREE                    0x034
+#define SSC_TX_FSTAT                    0x038
+#define SSC_RX_FSTAT                    0x03C
+#define SSC_PRE_SCALER_BRG              0x040
+#define SSC_CLR                         0x080
+#define SSC_NOISE_SUPP_WIDTH            0x100
+#define SSC_PRSCALER                    0x104
+#define SSC_NOISE_SUPP_WIDTH_DATAOUT    0x108
+#define SSC_PRSCALER_DATAOUT            0x10c
+
+/* SSC Control */
+#define SSC_CTL_DATA_WIDTH_9            0x8
+#define SSC_CTL_DATA_WIDTH_MSK          0xf
+#define SSC_CTL_BM                      0xf
+#define SSC_CTL_HB                      BIT(4)
+#define SSC_CTL_PH                      BIT(5)
+#define SSC_CTL_PO                      BIT(6)
+#define SSC_CTL_SR                      BIT(7)
+#define SSC_CTL_MS                      BIT(8)
+#define SSC_CTL_EN                      BIT(9)
+#define SSC_CTL_LPB                     BIT(10)
+#define SSC_CTL_EN_TX_FIFO              BIT(11)
+#define SSC_CTL_EN_RX_FIFO              BIT(12)
+#define SSC_CTL_EN_CLST_RX              BIT(13)
+
+/* SSC Interrupt Enable */
+#define SSC_IEN_RIEN                    BIT(0)
+#define SSC_IEN_TIEN                    BIT(1)
+#define SSC_IEN_TEEN                    BIT(2)
+#define SSC_IEN_REEN                    BIT(3)
+#define SSC_IEN_PEEN                    BIT(4)
+#define SSC_IEN_AASEN                   BIT(6)
+#define SSC_IEN_STOPEN                  BIT(7)
+#define SSC_IEN_ARBLEN                  BIT(8)
+#define SSC_IEN_NACKEN                  BIT(10)
+#define SSC_IEN_REPSTRTEN               BIT(11)
+#define SSC_IEN_TX_FIFO_HALF            BIT(12)
+#define SSC_IEN_RX_FIFO_HALF_FULL       BIT(14)
+
+/* SSC Status */
+#define SSC_STA_RIR                     BIT(0)
+#define SSC_STA_TIR                     BIT(1)
+#define SSC_STA_TE                      BIT(2)
+#define SSC_STA_RE                      BIT(3)
+#define SSC_STA_PE                      BIT(4)
+#define SSC_STA_CLST                    BIT(5)
+#define SSC_STA_AAS                     BIT(6)
+#define SSC_STA_STOP                    BIT(7)
+#define SSC_STA_ARBL                    BIT(8)
+#define SSC_STA_BUSY                    BIT(9)
+#define SSC_STA_NACK                    BIT(10)
+#define SSC_STA_REPSTRT                 BIT(11)
+#define SSC_STA_TX_FIFO_HALF            BIT(12)
+#define SSC_STA_TX_FIFO_FULL            BIT(13)
+#define SSC_STA_RX_FIFO_HALF            BIT(14)
+
+/* SSC I2C Control */
+#define SSC_I2C_I2CM                    BIT(0)
+#define SSC_I2C_STRTG                   BIT(1)
+#define SSC_I2C_STOPG                   BIT(2)
+#define SSC_I2C_ACKG                    BIT(3)
+#define SSC_I2C_AD10                    BIT(4)
+#define SSC_I2C_TXENB                   BIT(5)
+#define SSC_I2C_REPSTRTG                BIT(11)
+#define SSC_I2C_SLAVE_DISABLE           BIT(12)
+
+/* SSC Tx FIFO Status */
+#define SSC_TX_FSTAT_STATUS             0x07
+
+/* SSC Rx FIFO Status */
+#define SSC_RX_FSTAT_STATUS             0x07
+
+/* SSC Clear bit operation */
+#define SSC_CLR_SSCAAS                  BIT(6)
+#define SSC_CLR_SSCSTOP                 BIT(7)
+#define SSC_CLR_SSCARBL                 BIT(8)
+#define SSC_CLR_NACK                    BIT(10)
+#define SSC_CLR_REPSTRT                 BIT(11)
+
+/* SSC Clock Prescaler */
+#define SSC_PRSC_VALUE                  0x0f
+
+
+#define SSC_TXFIFO_SIZE                 0x8
+#define SSC_RXFIFO_SIZE                 0x8
+
+enum st_i2c_mode {
+        I2C_MODE_STANDARD,
+        I2C_MODE_FAST,
+        I2C_MODE_END,
+};
+
+/**
+ * struct st_i2c_timings - per-Mode tuning parameters
+ * @rate: I2C bus rate
+ * @rep_start_hold: I2C repeated start hold time requirement
+ * @rep_start_setup: I2C repeated start set up time requirement
+ * @start_hold: I2C start hold time requirement
+ * @data_setup_time: I2C data set up time requirement
+ * @stop_setup_time: I2C stop set up time requirement
+ * @bus_free_time: I2C bus free time requirement
+ * @sda_pulse_min_limit: I2C SDA pulse mini width limit
+ */
+struct st_i2c_timings {
+        u32 rate;
+        u32 rep_start_hold;
+        u32 rep_start_setup;
+        u32 start_hold;
+        u32 data_setup_time;
+        u32 stop_setup_time;
+        u32 bus_free_time;
+        u32 sda_pulse_min_limit;
+};
+
+/**
+ * struct st_i2c_client - client specific data
+ * @addr: 8-bit slave addr, including r/w bit
+ * @count: number of bytes to be transfered
+ * @xfered: number of bytes already transferred
+ * @buf: data buffer
+ * @result: result of the transfer
+ * @stop: last I2C msg to be sent, i.e. STOP to be generated
+ */
+struct st_i2c_client {
+        u8      addr;
+        u32     count;
+        u32     xfered;
+        u8      *buf;
+        int     result;
+        bool    stop;
+};
+
+/**
+ * struct st_i2c_dev - private data of the controller
+ * @adap: I2C adapter for this controller
+ * @dev: device for this controller
+ * @base: virtual memory area
+ * @complete: completion of I2C message
+ * @irq: interrupt line for th controller
+ * @clk: hw ssc block clock
+ * @mode: I2C mode of the controller. Standard or Fast only supported
+ * @scl_min_width_us: SCL line minimum pulse width in us
+ * @sda_min_width_us: SDA line minimum pulse width in us
+ * @client: I2C transfert information
+ * @busy: I2C transfer on-going
+ */
+struct st_i2c_dev {
+        struct i2c_adapter      adap;
+        struct device           *dev;
+        void __iomem            *base;
+        struct completion       complete;
+        int                     irq;
+        struct clk              *clk;
+        int                     mode;
+        u32                     scl_min_width_us;
+        u32                     sda_min_width_us;
+        struct st_i2c_client    client;
+        bool                    busy;
+};
+
+static inline void st_i2c_set_bits(void __iomem *reg, u32 mask)
+{
+        writel_relaxed(readl_relaxed(reg) | mask, reg);
+}
+
+static inline void st_i2c_clr_bits(void __iomem *reg, u32 mask)
+{
+        writel_relaxed(readl_relaxed(reg) & ~mask, reg);
+}
+
+/* From I2C Specifications v0.5 */
+static struct st_i2c_timings i2c_timings[] = {
+        [I2C_MODE_STANDARD] = {
+                .rate                   = 100000,
+                .rep_start_hold         = 4000,
+                .rep_start_setup        = 4700,
+                .start_hold             = 4000,
+                .data_setup_time        = 250,
+                .stop_setup_time        = 4000,
+                .bus_free_time          = 4700,
+        },
+        [I2C_MODE_FAST] = {
+                .rate                   = 400000,
+                .rep_start_hold         = 600,
+                .rep_start_setup        = 600,
+                .start_hold             = 600,
+                .data_setup_time        = 100,
+                .stop_setup_time        = 600,
+                .bus_free_time          = 1300,
+        },
+};
+
+static void st_i2c_flush_rx_fifo(struct st_i2c_dev *i2c_dev)
+{
+        int count, i;
+
+        /*
+         * Counter only counts up to 7 but fifo size is 8...
+         * When fifo is full, counter is 0 and RIR bit of status register is
+         * set
+         */
+        if (readl_relaxed(i2c_dev->base + SSC_STA) & SSC_STA_RIR)
+                count = SSC_RXFIFO_SIZE;
+        else
+                count = readl_relaxed(i2c_dev->base + SSC_RX_FSTAT) &
+                        SSC_RX_FSTAT_STATUS;
+
+        for (i = 0; i < count; i++)
+                readl_relaxed(i2c_dev->base + SSC_RBUF);
+}
+
+static void st_i2c_soft_reset(struct st_i2c_dev *i2c_dev)
+{
+        /*
+         * FIFO needs to be emptied before reseting the IP,
+         * else the controller raises a BUSY error.
+         */
+        st_i2c_flush_rx_fifo(i2c_dev);
+
+        st_i2c_set_bits(i2c_dev->base + SSC_CTL, SSC_CTL_SR);
+        st_i2c_clr_bits(i2c_dev->base + SSC_CTL, SSC_CTL_SR);
+}
+
+/**
+ * st_i2c_hw_config() - Prepare SSC block, calculate and apply tuning timings
+ * @i2c_dev: Controller's private data
+ */
+static void st_i2c_hw_config(struct st_i2c_dev *i2c_dev)
+{
+        unsigned long rate;
+        u32 val, ns_per_clk;
+        struct st_i2c_timings *t = &i2c_timings[i2c_dev->mode];
+
+        st_i2c_soft_reset(i2c_dev);
+
+        val = SSC_CLR_REPSTRT | SSC_CLR_NACK | SSC_CLR_SSCARBL |
+                SSC_CLR_SSCAAS | SSC_CLR_SSCSTOP;
+        writel_relaxed(val, i2c_dev->base + SSC_CLR);
+
+        /* SSC Control register setup */
+        val = SSC_CTL_PO | SSC_CTL_PH | SSC_CTL_HB | SSC_CTL_DATA_WIDTH_9;
+        writel_relaxed(val, i2c_dev->base + SSC_CTL);
+
+        rate = clk_get_rate(i2c_dev->clk);
+        ns_per_clk = 1000000000 / rate;
+
+        /* Baudrate */
+        val = rate / (2 * t->rate);
+        writel_relaxed(val, i2c_dev->base + SSC_BRG);
+
+        /* Pre-scaler baudrate */
+        writel_relaxed(1, i2c_dev->base + SSC_PRE_SCALER_BRG);
+
+        /* Enable I2C mode */
+        writel_relaxed(SSC_I2C_I2CM, i2c_dev->base + SSC_I2C);
+
+        /* Repeated start hold time */
+        val = t->rep_start_hold / ns_per_clk;
+        writel_relaxed(val, i2c_dev->base + SSC_REP_START_HOLD);
+
+        /* Repeated start set up time */
+        val = t->rep_start_setup / ns_per_clk;
+        writel_relaxed(val, i2c_dev->base + SSC_REP_START_SETUP);
+
+        /* Start hold time */
+        val = t->start_hold / ns_per_clk;
+        writel_relaxed(val, i2c_dev->base + SSC_START_HOLD);
+
+        /* Data set up time */
+        val = t->data_setup_time / ns_per_clk;
+        writel_relaxed(val, i2c_dev->base + SSC_DATA_SETUP);
+
+        /* Stop set up time */
+        val = t->stop_setup_time / ns_per_clk;
+        writel_relaxed(val, i2c_dev->base + SSC_STOP_SETUP);
+
+        /* Bus free time */
+        val = t->bus_free_time / ns_per_clk;
+        writel_relaxed(val, i2c_dev->base + SSC_BUS_FREE);
+
+        /* Prescalers set up */
+        val = rate / 10000000;
+        writel_relaxed(val, i2c_dev->base + SSC_PRSCALER);
+        writel_relaxed(val, i2c_dev->base + SSC_PRSCALER_DATAOUT);
+
+        /* Noise suppression witdh */
+        val = i2c_dev->scl_min_width_us * rate / 100000000;
+        writel_relaxed(val, i2c_dev->base + SSC_NOISE_SUPP_WIDTH);
+
+        /* Noise suppression max output data delay width */
+        val = i2c_dev->sda_min_width_us * rate / 100000000;
+        writel_relaxed(val, i2c_dev->base + SSC_NOISE_SUPP_WIDTH_DATAOUT);
+}
+
+static int st_i2c_wait_free_bus(struct st_i2c_dev *i2c_dev)
+{
+        u32 sta;
+        int i;
+
+        for (i = 0; i < 10; i++) {
+                sta = readl_relaxed(i2c_dev->base + SSC_STA);
+                if (!(sta & SSC_STA_BUSY))
+                        return 0;
+
+                usleep_range(2000, 4000);
+        }
+
+        dev_err(i2c_dev->dev, "bus not free (status = 0x%08x)\n", sta);
+
+        return -EBUSY;
+}
+
+/**
+ * st_i2c_write_tx_fifo() - Write a byte in the Tx FIFO
+ * @i2c_dev: Controller's private data
+ * @byte: Data to write in the Tx FIFO
+ */
+static inline void st_i2c_write_tx_fifo(struct st_i2c_dev *i2c_dev, u8 byte)
+{
+        u16 tbuf = byte << 1;
+
+        writel_relaxed(tbuf | 1, i2c_dev->base + SSC_TBUF);
+}
+
+/**
+ * st_i2c_wr_fill_tx_fifo() - Fill the Tx FIFO in write mode
+ * @i2c_dev: Controller's private data
+ *
+ * This functions fills the Tx FIFO with I2C transfert buffer when
+ * in write mode.
+ */
+static void st_i2c_wr_fill_tx_fifo(struct st_i2c_dev *i2c_dev)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+        u32 tx_fstat, sta;
+        int i;
+
+        sta = readl_relaxed(i2c_dev->base + SSC_STA);
+        if (sta & SSC_STA_TX_FIFO_FULL)
+                return;
+
+        tx_fstat = readl_relaxed(i2c_dev->base + SSC_TX_FSTAT);
+        tx_fstat &= SSC_TX_FSTAT_STATUS;
+
+        if (c->count < (SSC_TXFIFO_SIZE - tx_fstat))
+                i = c->count;
+        else
+                i = SSC_TXFIFO_SIZE - tx_fstat;
+
+        for (; i > 0; i--, c->count--, c->buf++)
+                st_i2c_write_tx_fifo(i2c_dev, *c->buf);
+}
+
+/**
+ * st_i2c_rd_fill_tx_fifo() - Fill the Tx FIFO in read mode
+ * @i2c_dev: Controller's private data
+ *
+ * This functions fills the Tx FIFO with fixed pattern when
+ * in read mode to trigger clock.
+ */
+static void st_i2c_rd_fill_tx_fifo(struct st_i2c_dev *i2c_dev, int max)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+        u32 tx_fstat, sta;
+        int i;
+
+        sta = readl_relaxed(i2c_dev->base + SSC_STA);
+        if (sta & SSC_STA_TX_FIFO_FULL)
+                return;
+
+        tx_fstat = readl_relaxed(i2c_dev->base + SSC_TX_FSTAT);
+        tx_fstat &= SSC_TX_FSTAT_STATUS;
+
+        if (max < (SSC_TXFIFO_SIZE - tx_fstat))
+                i = max;
+        else
+                i = SSC_TXFIFO_SIZE - tx_fstat;
+
+        for (; i > 0; i--, c->xfered++)
+                st_i2c_write_tx_fifo(i2c_dev, 0xff);
+}
+
+static void st_i2c_read_rx_fifo(struct st_i2c_dev *i2c_dev)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+        u32 i, sta;
+        u16 rbuf;
+
+        sta = readl_relaxed(i2c_dev->base + SSC_STA);
+        if (sta & SSC_STA_RIR) {
+                i = SSC_RXFIFO_SIZE;
+        } else {
+                i = readl_relaxed(i2c_dev->base + SSC_RX_FSTAT);
+                i &= SSC_RX_FSTAT_STATUS;
+        }
+
+        for (; (i > 0) && (c->count > 0); i--, c->count--) {
+                rbuf = readl_relaxed(i2c_dev->base + SSC_RBUF) >> 1;
+                *c->buf++ = (u8)rbuf & 0xff;
+        }
+
+        if (i) {
+                dev_err(i2c_dev->dev, "Unexpected %d bytes in rx fifo\n", i);
+                st_i2c_flush_rx_fifo(i2c_dev);
+        }
+}
+
+/**
+ * st_i2c_terminate_xfer() - Send either STOP or REPSTART condition
+ * @i2c_dev: Controller's private data
+ */
+static void st_i2c_terminate_xfer(struct st_i2c_dev *i2c_dev)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+
+        st_i2c_clr_bits(i2c_dev->base + SSC_IEN, SSC_IEN_TEEN);
+        st_i2c_clr_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STRTG);
+
+        if (c->stop) {
+                st_i2c_set_bits(i2c_dev->base + SSC_IEN, SSC_IEN_STOPEN);
+                st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STOPG);
+        } else {
+                st_i2c_set_bits(i2c_dev->base + SSC_IEN, SSC_IEN_REPSTRTEN);
+                st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_REPSTRTG);
+        }
+}
+
+/**
+ * st_i2c_handle_write() - Handle FIFO empty interrupt in case of write
+ * @i2c_dev: Controller's private data
+ */
+static void st_i2c_handle_write(struct st_i2c_dev *i2c_dev)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+
+        st_i2c_flush_rx_fifo(i2c_dev);
+
+        if (!c->count)
+                /* End of xfer, send stop or repstart */
+                st_i2c_terminate_xfer(i2c_dev);
+        else
+                st_i2c_wr_fill_tx_fifo(i2c_dev);
+}
+
+/**
+ * st_i2c_handle_write() - Handle FIFO enmpty interrupt in case of read
+ * @i2c_dev: Controller's private data
+ */
+static void st_i2c_handle_read(struct st_i2c_dev *i2c_dev)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+        u32 ien;
+
+        /* Trash the address read back */
+        if (!c->xfered) {
+                readl_relaxed(i2c_dev->base + SSC_RBUF);
+                st_i2c_clr_bits(i2c_dev->base + SSC_I2C, SSC_I2C_TXENB);
+        } else {
+                st_i2c_read_rx_fifo(i2c_dev);
+        }
+
+        if (!c->count) {
+                /* End of xfer, send stop or repstart */
+                st_i2c_terminate_xfer(i2c_dev);
+        } else if (c->count == 1) {
+                /* Penultimate byte to xfer, disable ACK gen. */
+                st_i2c_clr_bits(i2c_dev->base + SSC_I2C, SSC_I2C_ACKG);
+
+                /* Last received byte is to be handled by NACK interrupt */
+                ien = SSC_IEN_NACKEN | SSC_IEN_ARBLEN;
+                writel_relaxed(ien, i2c_dev->base + SSC_IEN);
+
+                st_i2c_rd_fill_tx_fifo(i2c_dev, c->count);
+        } else {
+                st_i2c_rd_fill_tx_fifo(i2c_dev, c->count - 1);
+        }
+}
+
+/**
+ * st_i2c_isr() - Interrupt routine
+ * @irq: interrupt number
+ * @data: Controller's private data
+ */
+static irqreturn_t st_i2c_isr_thread(int irq, void *data)
+{
+        struct st_i2c_dev *i2c_dev = data;
+        struct st_i2c_client *c = &i2c_dev->client;
+        u32 sta, ien;
+        int it;
+
+        ien = readl_relaxed(i2c_dev->base + SSC_IEN);
+        sta = readl_relaxed(i2c_dev->base + SSC_STA);
+
+        /* Use __fls() to check error bits first */
+        it = __fls(sta & ien);
+        if (it < 0) {
+                dev_dbg(i2c_dev->dev, "spurious it (sta=0x%04x, ien=0x%04x)\n",
+                                sta, ien);
+                return IRQ_NONE;
+        }
+
+        switch (1 << it) {
+        case SSC_STA_TE:
+                if (c->addr & I2C_M_RD)
+                        st_i2c_handle_read(i2c_dev);
+                else
+                        st_i2c_handle_write(i2c_dev);
+                break;
+
+        case SSC_STA_STOP:
+        case SSC_STA_REPSTRT:
+                writel_relaxed(0, i2c_dev->base + SSC_IEN);
+                complete(&i2c_dev->complete);
+                break;
+
+        case SSC_STA_NACK:
+                writel_relaxed(SSC_CLR_NACK, i2c_dev->base + SSC_CLR);
+
+                /* Last received byte handled by NACK interrupt */
+                if ((c->addr & I2C_M_RD) && (c->count == 1) && (c->xfered)) {
+                        st_i2c_handle_read(i2c_dev);
+                        break;
+                }
+
+                it = SSC_IEN_STOPEN | SSC_IEN_ARBLEN;
+                writel_relaxed(it, i2c_dev->base + SSC_IEN);
+
+                st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STOPG);
+                c->result = -EIO;
+                break;
+
+        case SSC_STA_ARBL:
+                writel_relaxed(SSC_CLR_SSCARBL, i2c_dev->base + SSC_CLR);
+
+                it = SSC_IEN_STOPEN | SSC_IEN_ARBLEN;
+                writel_relaxed(it, i2c_dev->base + SSC_IEN);
+
+                st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STOPG);
+                c->result = -EIO;
+                break;
+
+        default:
+                dev_err(i2c_dev->dev,
+                                "it %d unhandled (sta=0x%04x)\n", it, sta);
+        }
+
+        /*
+         * Read IEN register to ensure interrupt mask write is effective
+         * before re-enabling interrupt at GIC level, and thus avoid spurious
+         * interrupts.
+         */
+        readl(i2c_dev->base + SSC_IEN);
+
+        return IRQ_HANDLED;
+}
+
+/**
+ * st_i2c_xfer_msg() - Transfer a single I2C message
+ * @i2c_dev: Controller's private data
+ * @msg: I2C message to transfer
+ * @is_first: first message of the sequence
+ * @is_last: last message of the sequence
+ */
+static int st_i2c_xfer_msg(struct st_i2c_dev *i2c_dev, struct i2c_msg *msg,
+                            bool is_first, bool is_last)
+{
+        struct st_i2c_client *c = &i2c_dev->client;
+        u32 ctl, i2c, it;
+        unsigned long timeout;
+        int ret;
+
+        c->addr         = (u8)(msg->addr << 1);
+        c->addr         |= (msg->flags & I2C_M_RD);
+        c->buf          = msg->buf;
+        c->count        = msg->len;
+        c->xfered       = 0;
+        c->result       = 0;
+        c->stop         = is_last;
+
+        reinit_completion(&i2c_dev->complete);
+
+        ctl = SSC_CTL_EN | SSC_CTL_MS | SSC_CTL_EN_RX_FIFO | SSC_CTL_EN_TX_FIFO;
+        st_i2c_set_bits(i2c_dev->base + SSC_CTL, ctl);
+
+        i2c = SSC_I2C_TXENB;
+        if (c->addr & I2C_M_RD)
+                i2c |= SSC_I2C_ACKG;
+        st_i2c_set_bits(i2c_dev->base + SSC_I2C, i2c);
+
+        /* Write slave address */
+        st_i2c_write_tx_fifo(i2c_dev, c->addr);
+
+        /* Pre-fill Tx fifo with data in case of write */
+        if (!(c->addr & I2C_M_RD))
+                st_i2c_wr_fill_tx_fifo(i2c_dev);
+
+        it = SSC_IEN_NACKEN | SSC_IEN_TEEN | SSC_IEN_ARBLEN;
+        writel_relaxed(it, i2c_dev->base + SSC_IEN);
+
+        if (is_first) {
+                ret = st_i2c_wait_free_bus(i2c_dev);
+                if (ret)
+                        return ret;
+
+                st_i2c_set_bits(i2c_dev->base + SSC_I2C, SSC_I2C_STRTG);
+        }
+
+        timeout = wait_for_completion_timeout(&i2c_dev->complete,
+                        i2c_dev->adap.timeout);
+        ret = c->result;
+
+        if (!timeout) {
+                dev_err(i2c_dev->dev, "Write to slave 0x%x timed out\n",
+                                c->addr);
+                ret = -ETIMEDOUT;
+        }
+
+        i2c = SSC_I2C_STOPG | SSC_I2C_REPSTRTG;
+        st_i2c_clr_bits(i2c_dev->base + SSC_I2C, i2c);
+
+        writel_relaxed(SSC_CLR_SSCSTOP | SSC_CLR_REPSTRT,
+                        i2c_dev->base + SSC_CLR);
+
+        return ret;
+}
+
+/**
+ * st_i2c_xfer() - Transfer a single I2C message
+ * @i2c_adap: Adapter pointer to the controller
+ * @msgs: Pointer to data to be written.
+ * @num: Number of messages to be executed
+ */
+static int st_i2c_xfer(struct i2c_adapter *i2c_adap,
+                        struct i2c_msg msgs[], int num)
+{
+        struct st_i2c_dev *i2c_dev = i2c_get_adapdata(i2c_adap);
+        int ret, i;
+
+        i2c_dev->busy = true;
+
+        ret = clk_prepare_enable(i2c_dev->clk);
+        if (ret) {
+                dev_err(i2c_dev->dev, "Failed to prepare_enable clock\n");
+                return ret;
+        }
+
+        pinctrl_pm_select_default_state(i2c_dev->dev);
+
+        st_i2c_hw_config(i2c_dev);
+
+        for (i = 0; (i < num) && !ret; i++)
+                ret = st_i2c_xfer_msg(i2c_dev, &msgs[i], i == 0, i == num - 1);
+
+        pinctrl_pm_select_idle_state(i2c_dev->dev);
+
+        clk_disable_unprepare(i2c_dev->clk);
+
+        i2c_dev->busy = false;
+
+        return (ret < 0) ? ret : i;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int st_i2c_suspend(struct device *dev)
+{
+        struct platform_device *pdev =
+                container_of(dev, struct platform_device, dev);
+        struct st_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
+
+        if (i2c_dev->busy)
+                return -EBUSY;
+
+        pinctrl_pm_select_sleep_state(dev);
+
+        return 0;
+}
+
+static int st_i2c_resume(struct device *dev)
+{
+        pinctrl_pm_select_default_state(dev);
+        /* Go in idle state if available */
+        pinctrl_pm_select_idle_state(dev);
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(st_i2c_pm, st_i2c_suspend, st_i2c_resume);
+#define ST_I2C_PM       (&st_i2c_pm)
+#else
+#define ST_I2C_PM       NULL
+#endif
+
+static u32 st_i2c_func(struct i2c_adapter *adap)
+{
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+}
+
+static struct i2c_algorithm st_i2c_algo = {
+        .master_xfer = st_i2c_xfer,
+        .functionality = st_i2c_func,
+};
+
+static int st_i2c_of_get_deglitch(struct device_node *np,
+                struct st_i2c_dev *i2c_dev)
+{
+        int ret;
+
+        ret = of_property_read_u32(np, "st,i2c-min-scl-pulse-width-us",
+                        &i2c_dev->scl_min_width_us);
+        if ((ret == -ENODATA) || (ret == -EOVERFLOW)) {
+                dev_err(i2c_dev->dev, "st,i2c-min-scl-pulse-width-us invalid\n");
+                return ret;
+        }
+
+        ret = of_property_read_u32(np, "st,i2c-min-sda-pulse-width-us",
+                        &i2c_dev->sda_min_width_us);
+        if ((ret == -ENODATA) || (ret == -EOVERFLOW)) {
+                dev_err(i2c_dev->dev, "st,i2c-min-sda-pulse-width-us invalid\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int st_i2c_probe(struct platform_device *pdev)
+{
+        struct device_node *np = pdev->dev.of_node;
+        struct st_i2c_dev *i2c_dev;
+        struct resource *res;
+        u32 clk_rate;
+        struct i2c_adapter *adap;
+        int ret;
+
+        i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
+        if (!i2c_dev)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        i2c_dev->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(i2c_dev->base))
+                return PTR_ERR(i2c_dev->base);
+
+        i2c_dev->irq = irq_of_parse_and_map(np, 0);
+        if (!i2c_dev->irq) {
+                dev_err(&pdev->dev, "IRQ missing or invalid\n");
+                return -EINVAL;
+        }
+
+        i2c_dev->clk = of_clk_get_by_name(np, "ssc");
+        if (IS_ERR(i2c_dev->clk)) {
+                dev_err(&pdev->dev, "Unable to request clock\n");
+                return PTR_ERR(i2c_dev->clk);
+        }
+
+        i2c_dev->mode = I2C_MODE_STANDARD;
+        ret = of_property_read_u32(np, "clock-frequency", &clk_rate);
+        if ((!ret) && (clk_rate == 400000))
+                i2c_dev->mode = I2C_MODE_FAST;
+
+        i2c_dev->dev = &pdev->dev;
+
+        ret = devm_request_threaded_irq(&pdev->dev, i2c_dev->irq,
+                        NULL, st_i2c_isr_thread,
+                        IRQF_ONESHOT, pdev->name, i2c_dev);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to request irq %i\n", i2c_dev->irq);
+                return ret;
+        }
+
+        pinctrl_pm_select_default_state(i2c_dev->dev);
+        /* In case idle state available, select it */
+        pinctrl_pm_select_idle_state(i2c_dev->dev);
+
+        ret = st_i2c_of_get_deglitch(np, i2c_dev);
+        if (ret)
+                return ret;
+
+        adap = &i2c_dev->adap;
+        i2c_set_adapdata(adap, i2c_dev);
+        snprintf(adap->name, sizeof(adap->name), "ST I2C(0x%x)", res->start);
+        adap->owner = THIS_MODULE;
+        adap->timeout = 2 * HZ;
+        adap->retries = 0;
+        adap->algo = &st_i2c_algo;
+        adap->dev.parent = &pdev->dev;
+        adap->dev.of_node = pdev->dev.of_node;
+
+        init_completion(&i2c_dev->complete);
+
+        ret = i2c_add_adapter(adap);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to add adapter\n");
+                return ret;
+        }
+
+        platform_set_drvdata(pdev, i2c_dev);
+
+        dev_info(i2c_dev->dev, "%s initialized\n", adap->name);
+
+        return 0;
+}
+
+static int st_i2c_remove(struct platform_device *pdev)
+{
+        struct st_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
+
+        i2c_del_adapter(&i2c_dev->adap);
+
+        return 0;
+}
+
+static struct of_device_id st_i2c_match[] = {
+        { .compatible = "st,comms-ssc-i2c", },
+        { .compatible = "st,comms-ssc4-i2c", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, st_i2c_match);
+
+static struct platform_driver st_i2c_driver = {
+        .driver = {
+                .name = "st-i2c",
+                .owner = THIS_MODULE,
+                .of_match_table = st_i2c_match,
+                .pm = ST_I2C_PM,
+        },
+        .probe = st_i2c_probe,
+        .remove = st_i2c_remove,
+};
+
+module_platform_driver(st_i2c_driver);
+
+MODULE_AUTHOR("Maxime Coquelin <maxime.coquelin@st.com>");
+MODULE_DESCRIPTION("STMicroelectronics I2C driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
index 31395fa8121d..2c8a3e4f9008 100644
--- a/drivers/i2c/busses/i2c-wmt.c
+++ b/drivers/i2c/busses/i2c-wmt.c
@@ -349,6 +349,7 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)
         err = clk_set_rate(i2c_dev->clk, 20000000);
         if (err) {
                 dev_err(i2c_dev->dev, "failed to set clock = 20Mhz\n");
+                clk_disable_unprepare(i2c_dev->clk);
                 return err;
         }
 
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 4c8b368d463b..fc2716afdfd9 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -40,6 +40,7 @@
 #include <linux/i2c-xiic.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #define DRIVER_NAME "xiic-i2c"
 
@@ -702,7 +703,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
         if (irq < 0)
                 goto resource_missing;
 
-        pdata = (struct xiic_i2c_platform_data *)dev_get_platdata(&pdev->dev);
+        pdata = dev_get_platdata(&pdev->dev);
 
         i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);
         if (!i2c)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 75ba8608383e..5923cfa390c8 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -248,7 +248,7 @@ static int i2c_device_probe(struct device *dev)
         driver = to_i2c_driver(dev->driver);
         if (!driver->probe || !driver->id_table)
                 return -ENODEV;
-        client->driver = driver;
+
         if (!device_can_wakeup(&client->dev))
                 device_init_wakeup(&client->dev,
                                         client->flags & I2C_CLIENT_WAKE);
@@ -257,7 +257,6 @@ static int i2c_device_probe(struct device *dev)
         acpi_dev_pm_attach(&client->dev, true);
         status = driver->probe(client, i2c_match_id(driver->id_table, client));
         if (status) {
-                client->driver = NULL;
                 i2c_set_clientdata(client, NULL);
                 acpi_dev_pm_detach(&client->dev, true);
         }
@@ -281,10 +280,8 @@ static int i2c_device_remove(struct device *dev)
                 dev->driver = NULL;
                 status = 0;
         }
-        if (status == 0) {
-                client->driver = NULL;
+        if (status == 0)
                 i2c_set_clientdata(client, NULL);
-        }
         acpi_dev_pm_detach(&client->dev, true);
         return status;
 }
@@ -1614,9 +1611,14 @@ static int i2c_cmd(struct device *dev, void *_arg)
 {
         struct i2c_client       *client = i2c_verify_client(dev);
         struct i2c_cmd_arg      *arg = _arg;
+        struct i2c_driver       *driver;
+
+        if (!client || !client->dev.driver)
+                return 0;
 
-        if (client && client->driver && client->driver->command)
-                client->driver->command(client, arg->cmd, arg->arg);
+        driver = to_i2c_driver(client->dev.driver);
+        if (driver->command)
+                driver->command(client, arg->cmd, arg->arg);
         return 0;
 }
 
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index c3ccdea3d180..80b47e8ce030 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -102,8 +102,8 @@ static void return_i2c_dev(struct i2c_dev *i2c_dev)
         kfree(i2c_dev);
 }
 
-static ssize_t show_adapter_name(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
+static ssize_t name_show(struct device *dev,
+                         struct device_attribute *attr, char *buf)
 {
         struct i2c_dev *i2c_dev = i2c_dev_get_by_minor(MINOR(dev->devt));
 
@@ -111,7 +111,13 @@ static ssize_t show_adapter_name(struct device *dev,
                 return -ENODEV;
         return sprintf(buf, "%s\n", i2c_dev->adap->name);
 }
-static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
+static DEVICE_ATTR_RO(name);
+
+static struct attribute *i2c_attrs[] = {
+        &dev_attr_name.attr,
+        NULL,
+};
+ATTRIBUTE_GROUPS(i2c);
 
 /* ------------------------------------------------------------------------- */
 
@@ -562,15 +568,10 @@ static int i2cdev_attach_adapter(struct device *dev, void *dummy)
                 res = PTR_ERR(i2c_dev->dev);
                 goto error;
         }
-        res = device_create_file(i2c_dev->dev, &dev_attr_name);
-        if (res)
-                goto error_destroy;
 
         pr_debug("i2c-dev: adapter [%s] registered as minor %d\n",
                  adap->name, adap->nr);
         return 0;
-error_destroy:
-        device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
 error:
         return_i2c_dev(i2c_dev);
         return res;
@@ -589,7 +590,6 @@ static int i2cdev_detach_adapter(struct device *dev, void *dummy)
         if (!i2c_dev) /* attach_adapter must have failed */
                 return 0;
 
-        device_remove_file(i2c_dev->dev, &dev_attr_name);
         return_i2c_dev(i2c_dev);
         device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
 
@@ -637,6 +637,7 @@ static int __init i2c_dev_init(void)
                 res = PTR_ERR(i2c_dev_class);
                 goto out_unreg_chrdev;
         }
+        i2c_dev_class->dev_groups = i2c_groups;
 
         /* Keep track of adapters which will be added or removed later */
         res = bus_register_notifier(&i2c_bus_type, &i2cdev_notifier);
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c
index 44d4c6071c15..c99b22987366 100644
--- a/drivers/i2c/i2c-smbus.c
+++ b/drivers/i2c/i2c-smbus.c
@@ -46,6 +46,7 @@ static int smbus_do_alert(struct device *dev, void *addrp)
 {
         struct i2c_client *client = i2c_verify_client(dev);
         struct alert_data *data = addrp;
+        struct i2c_driver *driver;
 
         if (!client || client->addr != data->addr)
                 return 0;
@@ -54,12 +55,13 @@ static int smbus_do_alert(struct device *dev, void *addrp)
 
         /*
          * Drivers should either disable alerts, or provide at least
-         * a minimal handler.  Lock so client->driver won't change.
+         * a minimal handler.  Lock so the driver won't change.
          */
         device_lock(dev);
-        if (client->driver) {
-                if (client->driver->alert)
-                        client->driver->alert(client, data->flag);
+        if (client->dev.driver) {
+                driver = to_i2c_driver(client->dev.driver);
+                if (driver->alert)
+                        driver->alert(client, data->flag);
                 else
                         dev_warn(&client->dev, "no driver alert()!\n");
         } else
diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 928656e241dd..c58e093b6032 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -238,7 +238,7 @@ static struct platform_driver i2c_arbitrator_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "i2c-arb-gpio-challenge",
-                .of_match_table = of_match_ptr(i2c_arbitrator_of_match),
+                .of_match_table = i2c_arbitrator_of_match,
         },
 };
 
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index a764da777f08..8a8c56f4b026 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -30,15 +30,15 @@ static void i2c_mux_gpio_set(const struct gpiomux *mux, unsigned val)
         int i;
 
         for (i = 0; i < mux->data.n_gpios; i++)
-                gpio_set_value(mux->gpio_base + mux->data.gpios[i],
-                               val & (1 << i));
+                gpio_set_value_cansleep(mux->gpio_base + mux->data.gpios[i],
+                                        val & (1 << i));
 }
 
 static int i2c_mux_gpio_select(struct i2c_adapter *adap, void *data, u32 chan)
 {
         struct gpiomux *mux = data;
 
-        i2c_mux_gpio_set(mux, mux->data.values[chan]);
+        i2c_mux_gpio_set(mux, chan);
 
         return 0;
 }
@@ -228,7 +228,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
                 unsigned int class = mux->data.classes ? mux->data.classes[i] : 0;
 
                 mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, nr,
-                                                   i, class,
+                                                   mux->data.values[i], class,
                                                    i2c_mux_gpio_select, deselect);
                 if (!mux->adap[i]) {
                         ret = -ENODEV;
@@ -283,7 +283,7 @@ static struct platform_driver i2c_mux_gpio_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "i2c-mux-gpio",
-                .of_match_table = of_match_ptr(i2c_mux_gpio_of_match),
+                .of_match_table = i2c_mux_gpio_of_match,
         },
 };
 
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 68a37157377d..d7978dc4ad0b 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -24,6 +24,7 @@
 #include <linux/i2c-mux-pinctrl.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 struct i2c_mux_pinctrl {
         struct device *dev;
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index b84791f03a27..5ceda710f516 100644
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -31,17 +31,6 @@ config INFINIBAND_USER_ACCESS
           libibverbs, libibcm and a hardware driver library from
           <http://www.openfabrics.org/git/>.
 
-config INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-       bool "Experimental and unstable ABI for userspace access to flow steering verbs"
-       depends on INFINIBAND_USER_ACCESS
-       depends on STAGING
-        ---help---
-          The final ABI for userspace access to flow steering verbs
-          has not been defined.  To use the current ABI, *WHICH WILL
-          CHANGE IN THE FUTURE*, say Y here.
-
-          If unsure, say N.
-
 config INFINIBAND_USER_MEM
         bool
         depends on INFINIBAND_USER_ACCESS != n
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 784b97cb05b0..f2ef7ef0f36f 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -383,14 +383,11 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
 {
         unsigned long flags;
         int id;
-        static int next_id;
 
         idr_preload(GFP_KERNEL);
         spin_lock_irqsave(&cm.lock, flags);
 
-        id = idr_alloc(&cm.local_id_table, cm_id_priv, next_id, 0, GFP_NOWAIT);
-        if (id >= 0)
-                next_id = max(id + 1, 0);
+        id = idr_alloc_cyclic(&cm.local_id_table, cm_id_priv, 0, 0, GFP_NOWAIT);
 
         spin_unlock_irqrestore(&cm.lock, flags);
         idr_preload_end();
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index d2172e71f985..8e49db690f33 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -328,28 +328,6 @@ static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey)
         return ret;
 }
 
-static int find_gid_port(struct ib_device *device, union ib_gid *gid, u8 port_num)
-{
-        int i;
-        int err;
-        struct ib_port_attr props;
-        union ib_gid tmp;
-
-        err = ib_query_port(device, port_num, &props);
-        if (err)
-                return err;
-
-        for (i = 0; i < props.gid_tbl_len; ++i) {
-                err = ib_query_gid(device, port_num, i, &tmp);
-                if (err)
-                        return err;
-                if (!memcmp(&tmp, gid, sizeof tmp))
-                        return 0;
-        }
-
-        return -EADDRNOTAVAIL;
-}
-
 static void cma_translate_ib(struct sockaddr_ib *sib, struct rdma_dev_addr *dev_addr)
 {
         dev_addr->dev_type = ARPHRD_INFINIBAND;
@@ -371,13 +349,14 @@ static int cma_translate_addr(struct sockaddr *addr, struct rdma_dev_addr *dev_a
         return ret;
 }
 
-static int cma_acquire_dev(struct rdma_id_private *id_priv)
+static int cma_acquire_dev(struct rdma_id_private *id_priv,
+                           struct rdma_id_private *listen_id_priv)
 {
         struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;
         struct cma_device *cma_dev;
         union ib_gid gid, iboe_gid;
         int ret = -ENODEV;
-        u8 port;
+        u8 port, found_port;
         enum rdma_link_layer dev_ll = dev_addr->dev_type == ARPHRD_INFINIBAND ?
                 IB_LINK_LAYER_INFINIBAND : IB_LINK_LAYER_ETHERNET;
 
@@ -389,17 +368,39 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv)
         iboe_addr_get_sgid(dev_addr, &iboe_gid);
         memcpy(&gid, dev_addr->src_dev_addr +
                rdma_addr_gid_offset(dev_addr), sizeof gid);
+        if (listen_id_priv &&
+            rdma_port_get_link_layer(listen_id_priv->id.device,
+                                     listen_id_priv->id.port_num) == dev_ll) {
+                cma_dev = listen_id_priv->cma_dev;
+                port = listen_id_priv->id.port_num;
+                if (rdma_node_get_transport(cma_dev->device->node_type) == RDMA_TRANSPORT_IB &&
+                    rdma_port_get_link_layer(cma_dev->device, port) == IB_LINK_LAYER_ETHERNET)
+                        ret = ib_find_cached_gid(cma_dev->device, &iboe_gid,
+                                                 &found_port, NULL);
+                else
+                        ret = ib_find_cached_gid(cma_dev->device, &gid,
+                                                 &found_port, NULL);
+
+                if (!ret && (port  == found_port)) {
+                        id_priv->id.port_num = found_port;
+                        goto out;
+                }
+        }
         list_for_each_entry(cma_dev, &dev_list, list) {
                 for (port = 1; port <= cma_dev->device->phys_port_cnt; ++port) {
+                        if (listen_id_priv &&
+                            listen_id_priv->cma_dev == cma_dev &&
+                            listen_id_priv->id.port_num == port)
+                                continue;
                         if (rdma_port_get_link_layer(cma_dev->device, port) == dev_ll) {
                                 if (rdma_node_get_transport(cma_dev->device->node_type) == RDMA_TRANSPORT_IB &&
                                     rdma_port_get_link_layer(cma_dev->device, port) == IB_LINK_LAYER_ETHERNET)
-                                        ret = find_gid_port(cma_dev->device, &iboe_gid, port);
+                                        ret = ib_find_cached_gid(cma_dev->device, &iboe_gid, &found_port, NULL);
                                 else
-                                        ret = find_gid_port(cma_dev->device, &gid, port);
+                                        ret = ib_find_cached_gid(cma_dev->device, &gid, &found_port, NULL);
 
-                                if (!ret) {
-                                        id_priv->id.port_num = port;
+                                if (!ret && (port == found_port)) {
+                                        id_priv->id.port_num = found_port;
                                         goto out;
                                 }
                         }
@@ -1292,7 +1293,7 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
         }
 
         mutex_lock_nested(&conn_id->handler_mutex, SINGLE_DEPTH_NESTING);
-        ret = cma_acquire_dev(conn_id);
+        ret = cma_acquire_dev(conn_id, listen_id);
         if (ret)
                 goto err2;
 
@@ -1451,7 +1452,6 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
 {
         struct rdma_cm_id *new_cm_id;
         struct rdma_id_private *listen_id, *conn_id;
-        struct net_device *dev = NULL;
         struct rdma_cm_event event;
         int ret;
         struct ib_device_attr attr;
@@ -1481,7 +1481,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
                 goto out;
         }
 
-        ret = cma_acquire_dev(conn_id);
+        ret = cma_acquire_dev(conn_id, listen_id);
         if (ret) {
                 mutex_unlock(&conn_id->handler_mutex);
                 rdma_destroy_id(new_cm_id);
@@ -1529,8 +1529,6 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
         cma_deref_id(conn_id);
 
 out:
-        if (dev)
-                dev_put(dev);
         mutex_unlock(&listen_id->handler_mutex);
         return ret;
 }
@@ -2066,7 +2064,7 @@ static void addr_handler(int status, struct sockaddr *src_addr,
                 goto out;
 
         if (!status && !id_priv->cma_dev)
-                status = cma_acquire_dev(id_priv);
+                status = cma_acquire_dev(id_priv, NULL);
 
         if (status) {
                 if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_RESOLVED,
@@ -2563,7 +2561,7 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
                 if (ret)
                         goto err1;
 
-                ret = cma_acquire_dev(id_priv);
+                ret = cma_acquire_dev(id_priv, NULL);
                 if (ret)
                         goto err1;
         }
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index da06abde9e0d..a1e9cba84944 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -148,7 +148,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         list_for_each_entry(client, &client_list, list) {
                 if (client->index == index) {
                         if (op < 0 || op >= client->nops ||
-                            !client->cb_table[RDMA_NL_GET_OP(op)].dump)
+                            !client->cb_table[op].dump)
                                 return -EINVAL;
 
                         {
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index cde1e7b5b85d..faad2caf22b1 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -612,6 +612,7 @@ static ssize_t show_node_type(struct device *device,
         switch (dev->node_type) {
         case RDMA_NODE_IB_CA:     return sprintf(buf, "%d: CA\n", dev->node_type);
         case RDMA_NODE_RNIC:      return sprintf(buf, "%d: RNIC\n", dev->node_type);
+        case RDMA_NODE_USNIC:     return sprintf(buf, "%d: usNIC\n", dev->node_type);
         case RDMA_NODE_IB_SWITCH: return sprintf(buf, "%d: switch\n", dev->node_type);
         case RDMA_NODE_IB_ROUTER: return sprintf(buf, "%d: router\n", dev->node_type);
         default:                  return sprintf(buf, "%d: <unknown>\n", dev->node_type);
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index b0f189be543b..ab8b1c30b36b 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -57,7 +57,7 @@ MODULE_LICENSE("Dual BSD/GPL");
 static unsigned int max_backlog = 1024;
 
 static struct ctl_table_header *ucma_ctl_table_hdr;
-static ctl_table ucma_ctl_table[] = {
+static struct ctl_table ucma_ctl_table[] = {
         {
                 .procname       = "max_backlog",
                 .data           = &max_backlog,
@@ -271,7 +271,7 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id,
                         goto out;
                 }
                 ctx->backlog--;
-        } else if (!ctx->uid) {
+        } else if (!ctx->uid || ctx->cm_id != cm_id) {
                 /*
                  * We ignore events for new connections until userspace has set
                  * their context.  This can only happen if an error occurs on a
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index d8f9c6c272d7..bdc842e9faef 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -47,6 +47,14 @@
 #include <rdma/ib_umem.h>
 #include <rdma/ib_user_verbs.h>
 
+#define INIT_UDATA(udata, ibuf, obuf, ilen, olen)                       \
+        do {                                                            \
+                (udata)->inbuf  = (void __user *) (ibuf);               \
+                (udata)->outbuf = (void __user *) (obuf);               \
+                (udata)->inlen  = (ilen);                               \
+                (udata)->outlen = (olen);                               \
+        } while (0)
+
 /*
  * Our lifetime rules for these structs are the following:
  *
@@ -178,6 +186,22 @@ void ib_uverbs_event_handler(struct ib_event_handler *handler,
                              struct ib_event *event);
 void ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev, struct ib_xrcd *xrcd);
 
+struct ib_uverbs_flow_spec {
+        union {
+                union {
+                        struct ib_uverbs_flow_spec_hdr hdr;
+                        struct {
+                                __u32 type;
+                                __u16 size;
+                                __u16 reserved;
+                        };
+                };
+                struct ib_uverbs_flow_spec_eth     eth;
+                struct ib_uverbs_flow_spec_ipv4    ipv4;
+                struct ib_uverbs_flow_spec_tcp_udp tcp_udp;
+        };
+};
+
 #define IB_UVERBS_DECLARE_CMD(name)                                     \
         ssize_t ib_uverbs_##name(struct ib_uverbs_file *file,           \
                                  const char __user *buf, int in_len,    \
@@ -217,9 +241,13 @@ IB_UVERBS_DECLARE_CMD(destroy_srq);
 IB_UVERBS_DECLARE_CMD(create_xsrq);
 IB_UVERBS_DECLARE_CMD(open_xrcd);
 IB_UVERBS_DECLARE_CMD(close_xrcd);
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-IB_UVERBS_DECLARE_CMD(create_flow);
-IB_UVERBS_DECLARE_CMD(destroy_flow);
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
+
+#define IB_UVERBS_DECLARE_EX_CMD(name)                          \
+        int ib_uverbs_ex_##name(struct ib_uverbs_file *file,    \
+                                struct ib_udata *ucore,         \
+                                struct ib_udata *uhw)
+
+IB_UVERBS_DECLARE_EX_CMD(create_flow);
+IB_UVERBS_DECLARE_EX_CMD(destroy_flow);
 
 #endif /* UVERBS_H */
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index 2f0f01b70e3b..65f6e7dc380c 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -54,17 +54,7 @@ static struct uverbs_lock_class qp_lock_class	= { .name = "QP-uobj" };
 static struct uverbs_lock_class ah_lock_class   = { .name = "AH-uobj" };
 static struct uverbs_lock_class srq_lock_class  = { .name = "SRQ-uobj" };
 static struct uverbs_lock_class xrcd_lock_class = { .name = "XRCD-uobj" };
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
 static struct uverbs_lock_class rule_lock_class = { .name = "RULE-uobj" };
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
-
-#define INIT_UDATA(udata, ibuf, obuf, ilen, olen)                       \
-        do {                                                            \
-                (udata)->inbuf  = (void __user *) (ibuf);               \
-                (udata)->outbuf = (void __user *) (obuf);               \
-                (udata)->inlen  = (ilen);                               \
-                (udata)->outlen = (olen);                               \
-        } while (0)
 
 /*
  * The ib_uobject locking scheme is as follows:
@@ -939,13 +929,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
         if ((cmd.start & ~PAGE_MASK) != (cmd.hca_va & ~PAGE_MASK))
                 return -EINVAL;
 
-        /*
-         * Local write permission is required if remote write or
-         * remote atomic permission is also requested.
-         */
-        if (cmd.access_flags & (IB_ACCESS_REMOTE_ATOMIC | IB_ACCESS_REMOTE_WRITE) &&
-            !(cmd.access_flags & IB_ACCESS_LOCAL_WRITE))
-                return -EINVAL;
+        ret = ib_check_mr_access(cmd.access_flags);
+        if (ret)
+                return ret;
 
         uobj = kmalloc(sizeof *uobj, GFP_KERNEL);
         if (!uobj)
@@ -2128,6 +2114,9 @@ ssize_t ib_uverbs_post_send(struct ib_uverbs_file *file,
                         }
                         next->wr.ud.remote_qpn  = user_wr->wr.ud.remote_qpn;
                         next->wr.ud.remote_qkey = user_wr->wr.ud.remote_qkey;
+                        if (next->opcode == IB_WR_SEND_WITH_IMM)
+                                next->ex.imm_data =
+                                        (__be32 __force) user_wr->ex.imm_data;
                 } else {
                         switch (next->opcode) {
                         case IB_WR_RDMA_WRITE_WITH_IMM:
@@ -2601,8 +2590,7 @@ out_put:
         return ret ? ret : in_len;
 }
 
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,
+static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec,
                                 union ib_flow_spec *ib_spec)
 {
         ib_spec->type = kern_spec->type;
@@ -2642,28 +2630,31 @@ static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,
         return 0;
 }
 
-ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
-                              const char __user *buf, int in_len,
-                              int out_len)
+int ib_uverbs_ex_create_flow(struct ib_uverbs_file *file,
+                             struct ib_udata *ucore,
+                             struct ib_udata *uhw)
 {
         struct ib_uverbs_create_flow      cmd;
         struct ib_uverbs_create_flow_resp resp;
         struct ib_uobject                 *uobj;
         struct ib_flow                    *flow_id;
-        struct ib_kern_flow_attr          *kern_flow_attr;
+        struct ib_uverbs_flow_attr        *kern_flow_attr;
         struct ib_flow_attr               *flow_attr;
         struct ib_qp                      *qp;
         int err = 0;
         void *kern_spec;
         void *ib_spec;
         int i;
-        int kern_attr_size;
 
-        if (out_len < sizeof(resp))
+        if (ucore->outlen < sizeof(resp))
                 return -ENOSPC;
 
-        if (copy_from_user(&cmd, buf, sizeof(cmd)))
-                return -EFAULT;
+        err = ib_copy_from_udata(&cmd, ucore, sizeof(cmd));
+        if (err)
+                return err;
+
+        ucore->inbuf += sizeof(cmd);
+        ucore->inlen -= sizeof(cmd);
 
         if (cmd.comp_mask)
                 return -EINVAL;
@@ -2672,32 +2663,27 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
              !capable(CAP_NET_ADMIN)) || !capable(CAP_NET_RAW))
                 return -EPERM;
 
-        if (cmd.flow_attr.num_of_specs < 0 ||
-            cmd.flow_attr.num_of_specs > IB_FLOW_SPEC_SUPPORT_LAYERS)
+        if (cmd.flow_attr.num_of_specs > IB_FLOW_SPEC_SUPPORT_LAYERS)
                 return -EINVAL;
 
-        kern_attr_size = cmd.flow_attr.size - sizeof(cmd) -
-                         sizeof(struct ib_uverbs_cmd_hdr_ex);
-
-        if (cmd.flow_attr.size < 0 || cmd.flow_attr.size > in_len ||
-            kern_attr_size < 0 || kern_attr_size >
-            (cmd.flow_attr.num_of_specs * sizeof(struct ib_kern_spec)))
+        if (cmd.flow_attr.size > ucore->inlen ||
+            cmd.flow_attr.size >
+            (cmd.flow_attr.num_of_specs * sizeof(struct ib_uverbs_flow_spec)))
                 return -EINVAL;
 
         if (cmd.flow_attr.num_of_specs) {
-                kern_flow_attr = kmalloc(cmd.flow_attr.size, GFP_KERNEL);
+                kern_flow_attr = kmalloc(sizeof(*kern_flow_attr) + cmd.flow_attr.size,
+                                         GFP_KERNEL);
                 if (!kern_flow_attr)
                         return -ENOMEM;
 
                 memcpy(kern_flow_attr, &cmd.flow_attr, sizeof(*kern_flow_attr));
-                if (copy_from_user(kern_flow_attr + 1, buf + sizeof(cmd),
-                                   kern_attr_size)) {
-                        err = -EFAULT;
+                err = ib_copy_from_udata(kern_flow_attr + 1, ucore,
+                                         cmd.flow_attr.size);
+                if (err)
                         goto err_free_attr;
-                }
         } else {
                 kern_flow_attr = &cmd.flow_attr;
-                kern_attr_size = sizeof(cmd.flow_attr);
         }
 
         uobj = kmalloc(sizeof(*uobj), GFP_KERNEL);
@@ -2714,7 +2700,7 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
                 goto err_uobj;
         }
 
-        flow_attr = kmalloc(cmd.flow_attr.size, GFP_KERNEL);
+        flow_attr = kmalloc(sizeof(*flow_attr) + cmd.flow_attr.size, GFP_KERNEL);
         if (!flow_attr) {
                 err = -ENOMEM;
                 goto err_put;
@@ -2729,19 +2715,22 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
 
         kern_spec = kern_flow_attr + 1;
         ib_spec = flow_attr + 1;
-        for (i = 0; i < flow_attr->num_of_specs && kern_attr_size > 0; i++) {
+        for (i = 0; i < flow_attr->num_of_specs &&
+             cmd.flow_attr.size > offsetof(struct ib_uverbs_flow_spec, reserved) &&
+             cmd.flow_attr.size >=
+             ((struct ib_uverbs_flow_spec *)kern_spec)->size; i++) {
                 err = kern_spec_to_ib_spec(kern_spec, ib_spec);
                 if (err)
                         goto err_free;
                 flow_attr->size +=
                         ((union ib_flow_spec *) ib_spec)->size;
-                kern_attr_size -= ((struct ib_kern_spec *) kern_spec)->size;
-                kern_spec += ((struct ib_kern_spec *) kern_spec)->size;
+                cmd.flow_attr.size -= ((struct ib_uverbs_flow_spec *)kern_spec)->size;
+                kern_spec += ((struct ib_uverbs_flow_spec *) kern_spec)->size;
                 ib_spec += ((union ib_flow_spec *) ib_spec)->size;
         }
-        if (kern_attr_size) {
-                pr_warn("create flow failed, %d bytes left from uverb cmd\n",
-                        kern_attr_size);
+        if (cmd.flow_attr.size || (i != flow_attr->num_of_specs)) {
+                pr_warn("create flow failed, flow %d: %d bytes left from uverb cmd\n",
+                        i, cmd.flow_attr.size);
                 goto err_free;
         }
         flow_id = ib_create_flow(qp, flow_attr, IB_FLOW_DOMAIN_USER);
@@ -2760,11 +2749,10 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
         memset(&resp, 0, sizeof(resp));
         resp.flow_handle = uobj->id;
 
-        if (copy_to_user((void __user *)(unsigned long) cmd.response,
-                         &resp, sizeof(resp))) {
-                err = -EFAULT;
+        err = ib_copy_to_udata(ucore,
+                               &resp, sizeof(resp));
+        if (err)
                 goto err_copy;
-        }
 
         put_qp_read(qp);
         mutex_lock(&file->mutex);
@@ -2777,7 +2765,7 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
         kfree(flow_attr);
         if (cmd.flow_attr.num_of_specs)
                 kfree(kern_flow_attr);
-        return in_len;
+        return 0;
 err_copy:
         idr_remove_uobj(&ib_uverbs_rule_idr, uobj);
 destroy_flow:
@@ -2794,16 +2782,18 @@ err_free_attr:
         return err;
 }
 
-ssize_t ib_uverbs_destroy_flow(struct ib_uverbs_file *file,
-                               const char __user *buf, int in_len,
-                               int out_len) {
+int ib_uverbs_ex_destroy_flow(struct ib_uverbs_file *file,
+                              struct ib_udata *ucore,
+                              struct ib_udata *uhw)
+{
         struct ib_uverbs_destroy_flow   cmd;
         struct ib_flow                  *flow_id;
         struct ib_uobject               *uobj;
         int                             ret;
 
-        if (copy_from_user(&cmd, buf, sizeof(cmd)))
-                return -EFAULT;
+        ret = ib_copy_from_udata(&cmd, ucore, sizeof(cmd));
+        if (ret)
+                return ret;
 
         uobj = idr_write_uobj(&ib_uverbs_rule_idr, cmd.flow_handle,
                               file->ucontext);
@@ -2825,9 +2815,8 @@ ssize_t ib_uverbs_destroy_flow(struct ib_uverbs_file *file,
 
         put_uobj(uobj);
 
-        return ret ? ret : in_len;
+        return ret;
 }
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
                                 struct ib_uverbs_create_xsrq *cmd,
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 2df31f68ea09..34386943ebcf 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -115,10 +115,13 @@ static ssize_t (*uverbs_cmd_table[])(struct ib_uverbs_file *file,
         [IB_USER_VERBS_CMD_CLOSE_XRCD]          = ib_uverbs_close_xrcd,
         [IB_USER_VERBS_CMD_CREATE_XSRQ]         = ib_uverbs_create_xsrq,
         [IB_USER_VERBS_CMD_OPEN_QP]             = ib_uverbs_open_qp,
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-        [IB_USER_VERBS_CMD_CREATE_FLOW]         = ib_uverbs_create_flow,
-        [IB_USER_VERBS_CMD_DESTROY_FLOW]        = ib_uverbs_destroy_flow
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
+};
+
+static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file,
+                                    struct ib_udata *ucore,
+                                    struct ib_udata *uhw) = {
+        [IB_USER_VERBS_EX_CMD_CREATE_FLOW]      = ib_uverbs_ex_create_flow,
+        [IB_USER_VERBS_EX_CMD_DESTROY_FLOW]     = ib_uverbs_ex_destroy_flow
 };
 
 static void ib_uverbs_add_one(struct ib_device *device);
@@ -589,6 +592,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
 {
         struct ib_uverbs_file *file = filp->private_data;
         struct ib_uverbs_cmd_hdr hdr;
+        __u32 flags;
 
         if (count < sizeof hdr)
                 return -EINVAL;
@@ -596,45 +600,105 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
         if (copy_from_user(&hdr, buf, sizeof hdr))
                 return -EFAULT;
 
-        if (hdr.command >= ARRAY_SIZE(uverbs_cmd_table) ||
-            !uverbs_cmd_table[hdr.command])
-                return -EINVAL;
+        flags = (hdr.command &
+                 IB_USER_VERBS_CMD_FLAGS_MASK) >> IB_USER_VERBS_CMD_FLAGS_SHIFT;
 
-        if (!file->ucontext &&
-            hdr.command != IB_USER_VERBS_CMD_GET_CONTEXT)
-                return -EINVAL;
+        if (!flags) {
+                __u32 command;
 
-        if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << hdr.command)))
-                return -ENOSYS;
+                if (hdr.command & ~(__u32)(IB_USER_VERBS_CMD_FLAGS_MASK |
+                                           IB_USER_VERBS_CMD_COMMAND_MASK))
+                        return -EINVAL;
 
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-        if (hdr.command >= IB_USER_VERBS_CMD_THRESHOLD) {
-                struct ib_uverbs_cmd_hdr_ex hdr_ex;
+                command = hdr.command & IB_USER_VERBS_CMD_COMMAND_MASK;
 
-                if (copy_from_user(&hdr_ex, buf, sizeof(hdr_ex)))
-                        return -EFAULT;
+                if (command >= ARRAY_SIZE(uverbs_cmd_table) ||
+                    !uverbs_cmd_table[command])
+                        return -EINVAL;
 
-                if (((hdr_ex.in_words + hdr_ex.provider_in_words) * 4) != count)
+                if (!file->ucontext &&
+                    command != IB_USER_VERBS_CMD_GET_CONTEXT)
                         return -EINVAL;
 
-                return uverbs_cmd_table[hdr.command](file,
-                                                     buf + sizeof(hdr_ex),
-                                                     (hdr_ex.in_words +
-                                                      hdr_ex.provider_in_words) * 4,
-                                                     (hdr_ex.out_words +
-                                                      hdr_ex.provider_out_words) * 4);
-        } else {
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
+                if (!(file->device->ib_dev->uverbs_cmd_mask & (1ull << command)))
+                        return -ENOSYS;
+
                 if (hdr.in_words * 4 != count)
                         return -EINVAL;
 
-                return uverbs_cmd_table[hdr.command](file,
-                                                     buf + sizeof(hdr),
-                                                     hdr.in_words * 4,
-                                                     hdr.out_words * 4);
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
+                return uverbs_cmd_table[command](file,
+                                                 buf + sizeof(hdr),
+                                                 hdr.in_words * 4,
+                                                 hdr.out_words * 4);
+
+        } else if (flags == IB_USER_VERBS_CMD_FLAG_EXTENDED) {
+                __u32 command;
+
+                struct ib_uverbs_ex_cmd_hdr ex_hdr;
+                struct ib_udata ucore;
+                struct ib_udata uhw;
+                int err;
+                size_t written_count = count;
+
+                if (hdr.command & ~(__u32)(IB_USER_VERBS_CMD_FLAGS_MASK |
+                                           IB_USER_VERBS_CMD_COMMAND_MASK))
+                        return -EINVAL;
+
+                command = hdr.command & IB_USER_VERBS_CMD_COMMAND_MASK;
+
+                if (command >= ARRAY_SIZE(uverbs_ex_cmd_table) ||
+                    !uverbs_ex_cmd_table[command])
+                        return -ENOSYS;
+
+                if (!file->ucontext)
+                        return -EINVAL;
+
+                if (!(file->device->ib_dev->uverbs_ex_cmd_mask & (1ull << command)))
+                        return -ENOSYS;
+
+                if (count < (sizeof(hdr) + sizeof(ex_hdr)))
+                        return -EINVAL;
+
+                if (copy_from_user(&ex_hdr, buf + sizeof(hdr), sizeof(ex_hdr)))
+                        return -EFAULT;
+
+                count -= sizeof(hdr) + sizeof(ex_hdr);
+                buf += sizeof(hdr) + sizeof(ex_hdr);
+
+                if ((hdr.in_words + ex_hdr.provider_in_words) * 8 != count)
+                        return -EINVAL;
+
+                if (ex_hdr.response) {
+                        if (!hdr.out_words && !ex_hdr.provider_out_words)
+                                return -EINVAL;
+                } else {
+                        if (hdr.out_words || ex_hdr.provider_out_words)
+                                return -EINVAL;
+                }
+
+                INIT_UDATA(&ucore,
+                           (hdr.in_words) ? buf : 0,
+                           (unsigned long)ex_hdr.response,
+                           hdr.in_words * 8,
+                           hdr.out_words * 8);
+
+                INIT_UDATA(&uhw,
+                           (ex_hdr.provider_in_words) ? buf + ucore.inlen : 0,
+                           (ex_hdr.provider_out_words) ? (unsigned long)ex_hdr.response + ucore.outlen : 0,
+                           ex_hdr.provider_in_words * 8,
+                           ex_hdr.provider_out_words * 8);
+
+                err = uverbs_ex_cmd_table[command](file,
+                                                   &ucore,
+                                                   &uhw);
+
+                if (err)
+                        return err;
+
+                return written_count;
         }
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
+
+        return -ENOSYS;
 }
 
 static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index a321df28bab2..d4f6ddf72ffa 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -114,6 +114,8 @@ rdma_node_get_transport(enum rdma_node_type node_type)
                 return RDMA_TRANSPORT_IB;
         case RDMA_NODE_RNIC:
                 return RDMA_TRANSPORT_IWARP;
+        case RDMA_NODE_USNIC:
+                return RDMA_TRANSPORT_USNIC;
         default:
                 BUG();
                 return 0;
@@ -130,6 +132,7 @@ enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, u8 port_
         case RDMA_TRANSPORT_IB:
                 return IB_LINK_LAYER_INFINIBAND;
         case RDMA_TRANSPORT_IWARP:
+        case RDMA_TRANSPORT_USNIC:
                 return IB_LINK_LAYER_ETHERNET;
         default:
                 return IB_LINK_LAYER_UNSPECIFIED;
@@ -958,6 +961,11 @@ EXPORT_SYMBOL(ib_resize_cq);
 struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags)
 {
         struct ib_mr *mr;
+        int err;
+
+        err = ib_check_mr_access(mr_access_flags);
+        if (err)
+                return ERR_PTR(err);
 
         mr = pd->device->get_dma_mr(pd, mr_access_flags);
 
@@ -980,6 +988,11 @@ struct ib_mr *ib_reg_phys_mr(struct ib_pd *pd,
                              u64 *iova_start)
 {
         struct ib_mr *mr;
+        int err;
+
+        err = ib_check_mr_access(mr_access_flags);
+        if (err)
+                return ERR_PTR(err);
 
         if (!pd->device->reg_phys_mr)
                 return ERR_PTR(-ENOSYS);
@@ -1010,6 +1023,10 @@ int ib_rereg_phys_mr(struct ib_mr *mr,
         struct ib_pd *old_pd;
         int ret;
 
+        ret = ib_check_mr_access(mr_access_flags);
+        if (ret)
+                return ret;
+
         if (!mr->device->rereg_phys_mr)
                 return -ENOSYS;
 
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 33d2cc6ab562..4a033853312e 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -602,10 +602,10 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
              rdev->lldi.vr->qp.size,
              rdev->lldi.vr->cq.start,
              rdev->lldi.vr->cq.size);
-        PDBG("udb len 0x%x udb base %p db_reg %p gts_reg %p qpshift %lu "
+        PDBG("udb len 0x%x udb base %llx db_reg %p gts_reg %p qpshift %lu "
              "qpmask 0x%x cqshift %lu cqmask 0x%x\n",
              (unsigned)pci_resource_len(rdev->lldi.pdev, 2),
-             (void *)(unsigned long)pci_resource_start(rdev->lldi.pdev, 2),
+             (u64)pci_resource_start(rdev->lldi.pdev, 2),
              rdev->lldi.db_reg,
              rdev->lldi.gts_reg,
              rdev->qpshift, rdev->qpmask,
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
index f5cb13b21445..cc04b7ba3488 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
@@ -280,9 +280,7 @@ static int ipath_user_sdma_pin_pages(const struct ipath_devdata *dd,
         int j;
         int ret;
 
-        ret = get_user_pages(current, current->mm, addr,
-                             npages, 0, 1, pages, NULL);
-
+        ret = get_user_pages_fast(addr, npages, 0, pages);
         if (ret != npages) {
                 int i;
 
@@ -811,10 +809,7 @@ int ipath_user_sdma_writev(struct ipath_devdata *dd,
         while (dim) {
                 const int mxp = 8;
 
-                down_write(&current->mm->mmap_sem);
                 ret = ipath_user_sdma_queue_pkts(dd, pq, &list, iov, dim, mxp);
-                up_write(&current->mm->mmap_sem);
-
                 if (ret <= 0)
                         goto done_unlock;
                 else {
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index d5e60f44ba5a..66dbf8062374 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -324,7 +324,7 @@ static int mlx4_ib_get_outstanding_cqes(struct mlx4_ib_cq *cq)
         u32 i;
 
         i = cq->mcq.cons_index;
-        while (get_sw_cqe(cq, i & cq->ibcq.cqe))
+        while (get_sw_cqe(cq, i))
                 ++i;
 
         return i - cq->mcq.cons_index;
@@ -365,7 +365,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
 
         mutex_lock(&cq->resize_mutex);
 
-        if (entries < 1 || entries > dev->dev->caps.max_cqes) {
+        if (entries < 1) {
                 err = -EINVAL;
                 goto out;
         }
@@ -376,6 +376,11 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
                 goto out;
         }
 
+        if (entries > dev->dev->caps.max_cqes) {
+                err = -EINVAL;
+                goto out;
+        }
+
         if (ibcq->uobject) {
                 err = mlx4_alloc_resize_umem(dev, cq, entries, udata);
                 if (err)
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 6a0a0d29660d..1958c5ca792a 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1685,11 +1685,9 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                 ibdev->ib_dev.create_flow       = mlx4_ib_create_flow;
                 ibdev->ib_dev.destroy_flow      = mlx4_ib_destroy_flow;
 
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-                ibdev->ib_dev.uverbs_cmd_mask   |=
-                        (1ull << IB_USER_VERBS_CMD_CREATE_FLOW) |
-                        (1ull << IB_USER_VERBS_CMD_DESTROY_FLOW);
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
+                ibdev->ib_dev.uverbs_ex_cmd_mask        |=
+                        (1ull << IB_USER_VERBS_EX_CMD_CREATE_FLOW) |
+                        (1ull << IB_USER_VERBS_EX_CMD_DESTROY_FLOW);
         }
 
         mlx4_ib_alloc_eqs(dev, ibdev);
diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index 344ab03948a3..b72627429745 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -556,7 +556,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
                 goto err_db;
         }
         mlx5_ib_populate_pas(dev, cq->buf.umem, page_shift, (*cqb)->pas, 0);
-        (*cqb)->ctx.log_pg_sz = page_shift - PAGE_SHIFT;
+        (*cqb)->ctx.log_pg_sz = page_shift - MLX5_ADAPTER_PAGE_SHIFT;
 
         *index = to_mucontext(context)->uuari.uars[0].index;
 
@@ -620,7 +620,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
         }
         mlx5_fill_page_array(&cq->buf.buf, (*cqb)->pas);
 
-        (*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - PAGE_SHIFT;
+        (*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT;
         *index = dev->mdev.priv.uuari.uars[0].index;
 
         return 0;
@@ -653,8 +653,11 @@ struct ib_cq *mlx5_ib_create_cq(struct ib_device *ibdev, int entries,
         int eqn;
         int err;
 
+        if (entries < 0)
+                return ERR_PTR(-EINVAL);
+
         entries = roundup_pow_of_two(entries + 1);
-        if (entries < 1 || entries > dev->mdev.caps.max_cqes)
+        if (entries > dev->mdev.caps.max_cqes)
                 return ERR_PTR(-EINVAL);
 
         cq = kzalloc(sizeof(*cq), GFP_KERNEL);
@@ -747,17 +750,9 @@ int mlx5_ib_destroy_cq(struct ib_cq *cq)
         return 0;
 }
 
-static int is_equal_rsn(struct mlx5_cqe64 *cqe64, struct mlx5_ib_srq *srq,
-                        u32 rsn)
+static int is_equal_rsn(struct mlx5_cqe64 *cqe64, u32 rsn)
 {
-        u32 lrsn;
-
-        if (srq)
-                lrsn = be32_to_cpu(cqe64->srqn) & 0xffffff;
-        else
-                lrsn = be32_to_cpu(cqe64->sop_drop_qpn) & 0xffffff;
-
-        return rsn == lrsn;
+        return rsn == (ntohl(cqe64->sop_drop_qpn) & 0xffffff);
 }
 
 void __mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 rsn, struct mlx5_ib_srq *srq)
@@ -787,8 +782,8 @@ void __mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 rsn, struct mlx5_ib_srq *srq)
         while ((int) --prod_index - (int) cq->mcq.cons_index >= 0) {
                 cqe = get_cqe(cq, prod_index & cq->ibcq.cqe);
                 cqe64 = (cq->mcq.cqe_sz == 64) ? cqe : cqe + 64;
-                if (is_equal_rsn(cqe64, srq, rsn)) {
-                        if (srq)
+                if (is_equal_rsn(cqe64, rsn)) {
+                        if (srq && (ntohl(cqe64->srqn) & 0xffffff))
                                 mlx5_ib_free_srq_wqe(srq, be16_to_cpu(cqe64->wqe_counter));
                         ++nfreed;
                 } else if (nfreed) {
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index b1a6cb3a2809..306534109627 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -745,7 +745,8 @@ static int alloc_pa_mkey(struct mlx5_ib_dev *dev, u32 *key, u32 pdn)
         seg->qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
         seg->start_addr = 0;
 
-        err = mlx5_core_create_mkey(&dev->mdev, &mr, in, sizeof(*in));
+        err = mlx5_core_create_mkey(&dev->mdev, &mr, in, sizeof(*in),
+                                    NULL, NULL, NULL);
         if (err) {
                 mlx5_ib_warn(dev, "failed to create mkey, %d\n", err);
                 goto err_in;
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 836be9157242..4c134d93d4fc 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -262,6 +262,9 @@ struct mlx5_ib_mr {
         int                     npages;
         struct completion       done;
         enum ib_wc_status       status;
+        struct mlx5_ib_dev     *dev;
+        struct mlx5_create_mkey_mbox_out out;
+        unsigned long           start;
 };
 
 struct mlx5_ib_fast_reg_page_list {
@@ -323,6 +326,7 @@ struct mlx5_cache_ent {
         struct mlx5_ib_dev     *dev;
         struct work_struct      work;
         struct delayed_work     dwork;
+        int                     pending;
 };
 
 struct mlx5_mr_cache {
@@ -358,6 +362,8 @@ struct mlx5_ib_dev {
         spinlock_t                      mr_lock;
         struct mlx5_ib_resources        devr;
         struct mlx5_mr_cache            cache;
+        struct timer_list               delay_timer;
+        int                             fill_delay;
 };
 
 static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)
diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c
index 3453580b1eb2..039c3e40fcb4 100644
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@ -35,11 +35,12 @@
 #include <linux/random.h>
 #include <linux/debugfs.h>
 #include <linux/export.h>
+#include <linux/delay.h>
 #include <rdma/ib_umem.h>
 #include "mlx5_ib.h"
 
 enum {
-        DEF_CACHE_SIZE  = 10,
+        MAX_PENDING_REG_MR = 8,
 };
 
 enum {
@@ -63,6 +64,51 @@ static int order2idx(struct mlx5_ib_dev *dev, int order)
                 return order - cache->ent[0].order;
 }
 
+static void reg_mr_callback(int status, void *context)
+{
+        struct mlx5_ib_mr *mr = context;
+        struct mlx5_ib_dev *dev = mr->dev;
+        struct mlx5_mr_cache *cache = &dev->cache;
+        int c = order2idx(dev, mr->order);
+        struct mlx5_cache_ent *ent = &cache->ent[c];
+        u8 key;
+        unsigned long flags;
+
+        spin_lock_irqsave(&ent->lock, flags);
+        ent->pending--;
+        spin_unlock_irqrestore(&ent->lock, flags);
+        if (status) {
+                mlx5_ib_warn(dev, "async reg mr failed. status %d\n", status);
+                kfree(mr);
+                dev->fill_delay = 1;
+                mod_timer(&dev->delay_timer, jiffies + HZ);
+                return;
+        }
+
+        if (mr->out.hdr.status) {
+                mlx5_ib_warn(dev, "failed - status %d, syndorme 0x%x\n",
+                             mr->out.hdr.status,
+                             be32_to_cpu(mr->out.hdr.syndrome));
+                kfree(mr);
+                dev->fill_delay = 1;
+                mod_timer(&dev->delay_timer, jiffies + HZ);
+                return;
+        }
+
+        spin_lock_irqsave(&dev->mdev.priv.mkey_lock, flags);
+        key = dev->mdev.priv.mkey_key++;
+        spin_unlock_irqrestore(&dev->mdev.priv.mkey_lock, flags);
+        mr->mmr.key = mlx5_idx_to_mkey(be32_to_cpu(mr->out.mkey) & 0xffffff) | key;
+
+        cache->last_add = jiffies;
+
+        spin_lock_irqsave(&ent->lock, flags);
+        list_add_tail(&mr->list, &ent->head);
+        ent->cur++;
+        ent->size++;
+        spin_unlock_irqrestore(&ent->lock, flags);
+}
+
 static int add_keys(struct mlx5_ib_dev *dev, int c, int num)
 {
         struct mlx5_mr_cache *cache = &dev->cache;
@@ -78,36 +124,39 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num)
                 return -ENOMEM;
 
         for (i = 0; i < num; i++) {
+                if (ent->pending >= MAX_PENDING_REG_MR) {
+                        err = -EAGAIN;
+                        break;
+                }
+
                 mr = kzalloc(sizeof(*mr), GFP_KERNEL);
                 if (!mr) {
                         err = -ENOMEM;
-                        goto out;
+                        break;
                 }
                 mr->order = ent->order;
                 mr->umred = 1;
+                mr->dev = dev;
                 in->seg.status = 1 << 6;
                 in->seg.xlt_oct_size = cpu_to_be32((npages + 1) / 2);
                 in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
                 in->seg.flags = MLX5_ACCESS_MODE_MTT | MLX5_PERM_UMR_EN;
                 in->seg.log2_page_size = 12;
 
+                spin_lock_irq(&ent->lock);
+                ent->pending++;
+                spin_unlock_irq(&ent->lock);
+                mr->start = jiffies;
                 err = mlx5_core_create_mkey(&dev->mdev, &mr->mmr, in,
-                                            sizeof(*in));
+                                            sizeof(*in), reg_mr_callback,
+                                            mr, &mr->out);
                 if (err) {
                         mlx5_ib_warn(dev, "create mkey failed %d\n", err);
                         kfree(mr);
-                        goto out;
+                        break;
                 }
-                cache->last_add = jiffies;
-
-                spin_lock(&ent->lock);
-                list_add_tail(&mr->list, &ent->head);
-                ent->cur++;
-                ent->size++;
-                spin_unlock(&ent->lock);
         }
 
-out:
         kfree(in);
         return err;
 }
@@ -121,16 +170,16 @@ static void remove_keys(struct mlx5_ib_dev *dev, int c, int num)
         int i;
 
         for (i = 0; i < num; i++) {
-                spin_lock(&ent->lock);
+                spin_lock_irq(&ent->lock);
                 if (list_empty(&ent->head)) {
-                        spin_unlock(&ent->lock);
+                        spin_unlock_irq(&ent->lock);
                         return;
                 }
                 mr = list_first_entry(&ent->head, struct mlx5_ib_mr, list);
                 list_del(&mr->list);
                 ent->cur--;
                 ent->size--;
-                spin_unlock(&ent->lock);
+                spin_unlock_irq(&ent->lock);
                 err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr);
                 if (err)
                         mlx5_ib_warn(dev, "failed destroy mkey\n");
@@ -162,9 +211,13 @@ static ssize_t size_write(struct file *filp, const char __user *buf,
                 return -EINVAL;
 
         if (var > ent->size) {
-                err = add_keys(dev, c, var - ent->size);
-                if (err)
-                        return err;
+                do {
+                        err = add_keys(dev, c, var - ent->size);
+                        if (err && err != -EAGAIN)
+                                return err;
+
+                        usleep_range(3000, 5000);
+                } while (err);
         } else if (var < ent->size) {
                 remove_keys(dev, c, ent->size - var);
         }
@@ -280,23 +333,37 @@ static void __cache_work_func(struct mlx5_cache_ent *ent)
         struct mlx5_ib_dev *dev = ent->dev;
         struct mlx5_mr_cache *cache = &dev->cache;
         int i = order2idx(dev, ent->order);
+        int err;
 
         if (cache->stopped)
                 return;
 
         ent = &dev->cache.ent[i];
-        if (ent->cur < 2 * ent->limit) {
-                add_keys(dev, i, 1);
-                if (ent->cur < 2 * ent->limit)
-                        queue_work(cache->wq, &ent->work);
+        if (ent->cur < 2 * ent->limit && !dev->fill_delay) {
+                err = add_keys(dev, i, 1);
+                if (ent->cur < 2 * ent->limit) {
+                        if (err == -EAGAIN) {
+                                mlx5_ib_dbg(dev, "returned eagain, order %d\n",
+                                            i + 2);
+                                queue_delayed_work(cache->wq, &ent->dwork,
+                                                   msecs_to_jiffies(3));
+                        } else if (err) {
+                                mlx5_ib_warn(dev, "command failed order %d, err %d\n",
+                                             i + 2, err);
+                                queue_delayed_work(cache->wq, &ent->dwork,
+                                                   msecs_to_jiffies(1000));
+                        } else {
+                                queue_work(cache->wq, &ent->work);
+                        }
+                }
         } else if (ent->cur > 2 * ent->limit) {
                 if (!someone_adding(cache) &&
-                    time_after(jiffies, cache->last_add + 60 * HZ)) {
+                    time_after(jiffies, cache->last_add + 300 * HZ)) {
                         remove_keys(dev, i, 1);
                         if (ent->cur > ent->limit)
                                 queue_work(cache->wq, &ent->work);
                 } else {
-                        queue_delayed_work(cache->wq, &ent->dwork, 60 * HZ);
+                        queue_delayed_work(cache->wq, &ent->dwork, 300 * HZ);
                 }
         }
 }
@@ -336,18 +403,18 @@ static struct mlx5_ib_mr *alloc_cached_mr(struct mlx5_ib_dev *dev, int order)
 
                 mlx5_ib_dbg(dev, "order %d, cache index %d\n", ent->order, i);
 
-                spin_lock(&ent->lock);
+                spin_lock_irq(&ent->lock);
                 if (!list_empty(&ent->head)) {
                         mr = list_first_entry(&ent->head, struct mlx5_ib_mr,
                                               list);
                         list_del(&mr->list);
                         ent->cur--;
-                        spin_unlock(&ent->lock);
+                        spin_unlock_irq(&ent->lock);
                         if (ent->cur < ent->limit)
                                 queue_work(cache->wq, &ent->work);
                         break;
                 }
-                spin_unlock(&ent->lock);
+                spin_unlock_irq(&ent->lock);
 
                 queue_work(cache->wq, &ent->work);
 
@@ -374,12 +441,12 @@ static void free_cached_mr(struct mlx5_ib_dev *dev, struct mlx5_ib_mr *mr)
                 return;
         }
         ent = &cache->ent[c];
-        spin_lock(&ent->lock);
+        spin_lock_irq(&ent->lock);
         list_add_tail(&mr->list, &ent->head);
         ent->cur++;
         if (ent->cur > 2 * ent->limit)
                 shrink = 1;
-        spin_unlock(&ent->lock);
+        spin_unlock_irq(&ent->lock);
 
         if (shrink)
                 queue_work(cache->wq, &ent->work);
@@ -394,16 +461,16 @@ static void clean_keys(struct mlx5_ib_dev *dev, int c)
 
         cancel_delayed_work(&ent->dwork);
         while (1) {
-                spin_lock(&ent->lock);
+                spin_lock_irq(&ent->lock);
                 if (list_empty(&ent->head)) {
-                        spin_unlock(&ent->lock);
+                        spin_unlock_irq(&ent->lock);
                         return;
                 }
                 mr = list_first_entry(&ent->head, struct mlx5_ib_mr, list);
                 list_del(&mr->list);
                 ent->cur--;
                 ent->size--;
-                spin_unlock(&ent->lock);
+                spin_unlock_irq(&ent->lock);
                 err = mlx5_core_destroy_mkey(&dev->mdev, &mr->mmr);
                 if (err)
                         mlx5_ib_warn(dev, "failed destroy mkey\n");
@@ -464,12 +531,18 @@ static void mlx5_mr_cache_debugfs_cleanup(struct mlx5_ib_dev *dev)
         debugfs_remove_recursive(dev->cache.root);
 }
 
+static void delay_time_func(unsigned long ctx)
+{
+        struct mlx5_ib_dev *dev = (struct mlx5_ib_dev *)ctx;
+
+        dev->fill_delay = 0;
+}
+
 int mlx5_mr_cache_init(struct mlx5_ib_dev *dev)
 {
         struct mlx5_mr_cache *cache = &dev->cache;
         struct mlx5_cache_ent *ent;
         int limit;
-        int size;
         int err;
         int i;
 
@@ -479,6 +552,7 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev)
                 return -ENOMEM;
         }
 
+        setup_timer(&dev->delay_timer, delay_time_func, (unsigned long)dev);
         for (i = 0; i < MAX_MR_CACHE_ENTRIES; i++) {
                 INIT_LIST_HEAD(&cache->ent[i].head);
                 spin_lock_init(&cache->ent[i].lock);
@@ -489,13 +563,11 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev)
                 ent->order = i + 2;
                 ent->dev = dev;
 
-                if (dev->mdev.profile->mask & MLX5_PROF_MASK_MR_CACHE) {
-                        size = dev->mdev.profile->mr_cache[i].size;
+                if (dev->mdev.profile->mask & MLX5_PROF_MASK_MR_CACHE)
                         limit = dev->mdev.profile->mr_cache[i].limit;
-                } else {
-                        size = DEF_CACHE_SIZE;
+                else
                         limit = 0;
-                }
+
                 INIT_WORK(&ent->work, cache_work_func);
                 INIT_DELAYED_WORK(&ent->dwork, delayed_cache_work_func);
                 ent->limit = limit;
@@ -522,6 +594,7 @@ int mlx5_mr_cache_cleanup(struct mlx5_ib_dev *dev)
                 clean_keys(dev, i);
 
         destroy_workqueue(dev->cache.wq);
+        del_timer_sync(&dev->delay_timer);
 
         return 0;
 }
@@ -551,7 +624,8 @@ struct ib_mr *mlx5_ib_get_dma_mr(struct ib_pd *pd, int acc)
         seg->qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
         seg->start_addr = 0;
 
-        err = mlx5_core_create_mkey(mdev, &mr->mmr, in, sizeof(*in));
+        err = mlx5_core_create_mkey(mdev, &mr->mmr, in, sizeof(*in), NULL, NULL,
+                                    NULL);
         if (err)
                 goto err_in;
 
@@ -660,14 +734,14 @@ static struct mlx5_ib_mr *reg_umr(struct ib_pd *pd, struct ib_umem *umem,
         int err;
         int i;
 
-        for (i = 0; i < 10; i++) {
+        for (i = 0; i < 1; i++) {
                 mr = alloc_cached_mr(dev, order);
                 if (mr)
                         break;
 
                 err = add_keys(dev, order2idx(dev, order), 1);
-                if (err) {
-                        mlx5_ib_warn(dev, "add_keys failed\n");
+                if (err && err != -EAGAIN) {
+                        mlx5_ib_warn(dev, "add_keys failed, err %d\n", err);
                         break;
                 }
         }
@@ -759,8 +833,10 @@ static struct mlx5_ib_mr *reg_create(struct ib_pd *pd, u64 virt_addr,
         in->seg.xlt_oct_size = cpu_to_be32(get_octo_len(virt_addr, length, 1 << page_shift));
         in->seg.log2_page_size = page_shift;
         in->seg.qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
-        in->xlat_oct_act_size = cpu_to_be32(get_octo_len(virt_addr, length, 1 << page_shift));
-        err = mlx5_core_create_mkey(&dev->mdev, &mr->mmr, in, inlen);
+        in->xlat_oct_act_size = cpu_to_be32(get_octo_len(virt_addr, length,
+                                                         1 << page_shift));
+        err = mlx5_core_create_mkey(&dev->mdev, &mr->mmr, in, inlen, NULL,
+                                    NULL, NULL);
         if (err) {
                 mlx5_ib_warn(dev, "create mkey failed\n");
                 goto err_2;
@@ -944,7 +1020,8 @@ struct ib_mr *mlx5_ib_alloc_fast_reg_mr(struct ib_pd *pd,
          * TBD not needed - issue 197292 */
         in->seg.log2_page_size = PAGE_SHIFT;
 
-        err = mlx5_core_create_mkey(&dev->mdev, &mr->mmr, in, sizeof(*in));
+        err = mlx5_core_create_mkey(&dev->mdev, &mr->mmr, in, sizeof(*in), NULL,
+                                    NULL, NULL);
         kfree(in);
         if (err)
                 goto err_free;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 5659ea880741..7c6b4ba49bec 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -551,7 +551,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
         }
         mlx5_ib_populate_pas(dev, qp->umem, page_shift, (*in)->pas, 0);
         (*in)->ctx.log_pg_sz_remote_qpn =
-                cpu_to_be32((page_shift - PAGE_SHIFT) << 24);
+                cpu_to_be32((page_shift - MLX5_ADAPTER_PAGE_SHIFT) << 24);
         (*in)->ctx.params2 = cpu_to_be32(offset << 6);
 
         (*in)->ctx.qp_counter_set_usr_page = cpu_to_be32(uar_index);
@@ -648,7 +648,8 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
                 goto err_buf;
         }
         (*in)->ctx.qp_counter_set_usr_page = cpu_to_be32(uar_index);
-        (*in)->ctx.log_pg_sz_remote_qpn = cpu_to_be32((qp->buf.page_shift - PAGE_SHIFT) << 24);
+        (*in)->ctx.log_pg_sz_remote_qpn =
+                cpu_to_be32((qp->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT) << 24);
         /* Set "fast registration enabled" for all kernel QPs */
         (*in)->ctx.params1 |= cpu_to_be32(1 << 11);
         (*in)->ctx.sq_crq_size |= cpu_to_be16(1 << 4);
@@ -1317,9 +1318,11 @@ static enum mlx5_qp_optpar opt_mask[MLX5_QP_NUM_STATE][MLX5_QP_NUM_STATE][MLX5_Q
                                           MLX5_QP_OPTPAR_RAE            |
                                           MLX5_QP_OPTPAR_RWE            |
                                           MLX5_QP_OPTPAR_RNR_TIMEOUT    |
-                                          MLX5_QP_OPTPAR_PM_STATE,
+                                          MLX5_QP_OPTPAR_PM_STATE       |
+                                          MLX5_QP_OPTPAR_ALT_ADDR_PATH,
                         [MLX5_QP_ST_UC] = MLX5_QP_OPTPAR_RWE            |
-                                          MLX5_QP_OPTPAR_PM_STATE,
+                                          MLX5_QP_OPTPAR_PM_STATE       |
+                                          MLX5_QP_OPTPAR_ALT_ADDR_PATH,
                         [MLX5_QP_ST_UD] = MLX5_QP_OPTPAR_Q_KEY          |
                                           MLX5_QP_OPTPAR_SRQN           |
                                           MLX5_QP_OPTPAR_CQN_RCV,
@@ -1550,7 +1553,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         mlx5_cur = to_mlx5_state(cur_state);
         mlx5_new = to_mlx5_state(new_state);
         mlx5_st = to_mlx5_st(ibqp->qp_type);
-        if (mlx5_cur < 0 || mlx5_new < 0 || mlx5_st < 0)
+        if (mlx5_st < 0)
                 goto out;
 
         optpar = ib_mask_to_mlx5_opt(attr_mask);
@@ -1744,6 +1747,7 @@ static void set_reg_umr_segment(struct mlx5_wqe_umr_ctrl_seg *umr,
                         MLX5_MKEY_MASK_PD               |
                         MLX5_MKEY_MASK_LR               |
                         MLX5_MKEY_MASK_LW               |
+                        MLX5_MKEY_MASK_KEY              |
                         MLX5_MKEY_MASK_RR               |
                         MLX5_MKEY_MASK_RW               |
                         MLX5_MKEY_MASK_A                |
@@ -1800,7 +1804,8 @@ static void set_reg_mkey_segment(struct mlx5_mkey_seg *seg, struct ib_send_wr *w
         seg->start_addr = cpu_to_be64(wr->wr.fast_reg.iova_start);
         seg->len = cpu_to_be64(wr->wr.fast_reg.length);
         seg->log2_page_size = wr->wr.fast_reg.page_shift;
-        seg->qpn_mkey7_0 = cpu_to_be32(0xffffff << 8);
+        seg->qpn_mkey7_0 = cpu_to_be32(0xffffff00 |
+                                       mlx5_mkey_variant(wr->wr.fast_reg.rkey));
 }
 
 static void set_frwr_pages(struct mlx5_wqe_data_seg *dseg,
@@ -1913,6 +1918,10 @@ static int set_frwr_li_wr(void **seg, struct ib_send_wr *wr, int *size,
         if (unlikely((*seg == qp->sq.qend)))
                 *seg = mlx5_get_send_wqe(qp, 0);
         if (!li) {
+                if (unlikely(wr->wr.fast_reg.page_list_len >
+                             wr->wr.fast_reg.page_list->max_page_list_len))
+                        return  -ENOMEM;
+
                 set_frwr_pages(*seg, wr, mdev, pd, writ);
                 *seg += sizeof(struct mlx5_wqe_data_seg);
                 *size += (sizeof(struct mlx5_wqe_data_seg) / 16);
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 0aa478bc291a..210b3eaf188a 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -123,7 +123,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
                 goto err_in;
         }
 
-        (*in)->ctx.log_pg_sz = page_shift - PAGE_SHIFT;
+        (*in)->ctx.log_pg_sz = page_shift - MLX5_ADAPTER_PAGE_SHIFT;
         (*in)->ctx.pgoff_cqn = cpu_to_be32(offset << 26);
 
         return 0;
@@ -192,7 +192,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
         }
         srq->wq_sig = !!srq_signature;
 
-        (*in)->ctx.log_pg_sz = page_shift - PAGE_SHIFT;
+        (*in)->ctx.log_pg_sz = page_shift - MLX5_ADAPTER_PAGE_SHIFT;
 
         return 0;
 
@@ -390,9 +390,7 @@ int mlx5_ib_destroy_srq(struct ib_srq *srq)
                 mlx5_ib_db_unmap_user(to_mucontext(srq->uobject->context), &msrq->db);
                 ib_umem_release(msrq->umem);
         } else {
-                kfree(msrq->wrid);
-                mlx5_buf_free(&dev->mdev, &msrq->buf);
-                mlx5_db_free(&dev->mdev, &msrq->db);
+                destroy_srq_kernel(dev, msrq);
         }
 
         kfree(srq);
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 5b53ca5a2284..8308e3634767 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -2834,7 +2834,7 @@ static int nes_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         init_attr->qp_context = nesqp->ibqp.qp_context;
         init_attr->send_cq = nesqp->ibqp.send_cq;
         init_attr->recv_cq = nesqp->ibqp.recv_cq;
-        init_attr->srq = nesqp->ibqp.srq = nesqp->ibqp.srq;
+        init_attr->srq = nesqp->ibqp.srq;
         init_attr->cap = attr->cap;
 
         return 0;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h
index adc11d14f878..294dd27b601e 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma.h
@@ -122,6 +122,32 @@ struct mqe_ctx {
         bool cmd_done;
 };
 
+struct ocrdma_hw_mr {
+        u32 lkey;
+        u8 fr_mr;
+        u8 remote_atomic;
+        u8 remote_rd;
+        u8 remote_wr;
+        u8 local_rd;
+        u8 local_wr;
+        u8 mw_bind;
+        u8 rsvd;
+        u64 len;
+        struct ocrdma_pbl *pbl_table;
+        u32 num_pbls;
+        u32 num_pbes;
+        u32 pbl_size;
+        u32 pbe_size;
+        u64 fbo;
+        u64 va;
+};
+
+struct ocrdma_mr {
+        struct ib_mr ibmr;
+        struct ib_umem *umem;
+        struct ocrdma_hw_mr hwmr;
+};
+
 struct ocrdma_dev {
         struct ib_device ibdev;
         struct ocrdma_dev_attr attr;
@@ -169,7 +195,7 @@ struct ocrdma_dev {
         struct list_head entry;
         struct rcu_head rcu;
         int id;
-        u64 stag_arr[OCRDMA_MAX_STAG];
+        struct ocrdma_mr *stag_arr[OCRDMA_MAX_STAG];
         u16 pvid;
 };
 
@@ -294,31 +320,6 @@ struct ocrdma_qp {
         u16 db_cache;
 };
 
-struct ocrdma_hw_mr {
-        u32 lkey;
-        u8 fr_mr;
-        u8 remote_atomic;
-        u8 remote_rd;
-        u8 remote_wr;
-        u8 local_rd;
-        u8 local_wr;
-        u8 mw_bind;
-        u8 rsvd;
-        u64 len;
-        struct ocrdma_pbl *pbl_table;
-        u32 num_pbls;
-        u32 num_pbes;
-        u32 pbl_size;
-        u32 pbe_size;
-        u64 fbo;
-        u64 va;
-};
-
-struct ocrdma_mr {
-        struct ib_mr ibmr;
-        struct ib_umem *umem;
-        struct ocrdma_hw_mr hwmr;
-};
 
 struct ocrdma_ucontext {
         struct ib_ucontext ibucontext;
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 50219ab2279d..56bf32fcb62c 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -1783,7 +1783,7 @@ static int ocrdma_set_create_qp_sq_cmd(struct ocrdma_create_qp_req *cmd,
         u32 max_sges = attrs->cap.max_send_sge;
 
         /* QP1 may exceed 127 */
-        max_wqe_allocated = min_t(int, attrs->cap.max_send_wr + 1,
+        max_wqe_allocated = min_t(u32, attrs->cap.max_send_wr + 1,
                                 dev->attr.max_wqe);
 
         status = ocrdma_build_q_conf(&max_wqe_allocated,
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_main.c b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
index 0ce7674621ea..91443bcb9e0e 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@ -452,9 +452,6 @@ static void ocrdma_remove_free(struct rcu_head *rcu)
 {
         struct ocrdma_dev *dev = container_of(rcu, struct ocrdma_dev, rcu);
 
-        ocrdma_free_resources(dev);
-        ocrdma_cleanup_hw(dev);
-
         idr_remove(&ocrdma_dev_id, dev->id);
         kfree(dev->mbx_cmd);
         ib_dealloc_device(&dev->ibdev);
@@ -470,6 +467,10 @@ static void ocrdma_remove(struct ocrdma_dev *dev)
         spin_lock(&ocrdma_devlist_lock);
         list_del_rcu(&dev->entry);
         spin_unlock(&ocrdma_devlist_lock);
+
+        ocrdma_free_resources(dev);
+        ocrdma_cleanup_hw(dev);
+
         call_rcu(&dev->rcu, ocrdma_remove_free);
 }
 
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index 69f1d1221a6b..7686dceadd29 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1981,9 +1981,7 @@ static int ocrdma_build_fr(struct ocrdma_qp *qp, struct ocrdma_hdr_wqe *hdr,
 
         wqe_size = roundup(wqe_size, OCRDMA_WQE_ALIGN_BYTES);
 
-        if ((wr->wr.fast_reg.page_list_len >
-                qp->dev->attr.max_pages_per_frmr) ||
-                (wr->wr.fast_reg.length > 0xffffffffULL))
+        if (wr->wr.fast_reg.page_list_len > qp->dev->attr.max_pages_per_frmr)
                 return -EINVAL;
 
         hdr->cw |= (OCRDMA_FR_MR << OCRDMA_WQE_OPCODE_SHIFT);
@@ -2839,7 +2837,7 @@ struct ib_mr *ocrdma_alloc_frmr(struct ib_pd *ibpd, int max_page_list_len)
                 goto mbx_err;
         mr->ibmr.rkey = mr->hwmr.lkey;
         mr->ibmr.lkey = mr->hwmr.lkey;
-        dev->stag_arr[(mr->hwmr.lkey >> 8) & (OCRDMA_MAX_STAG - 1)] = (unsigned long) mr;
+        dev->stag_arr[(mr->hwmr.lkey >> 8) & (OCRDMA_MAX_STAG - 1)] = mr;
         return &mr->ibmr;
 mbx_err:
         ocrdma_free_mr_pbl_tbl(dev, &mr->hwmr);
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index 016e7429adf6..5bfc02f450e6 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -6190,21 +6190,20 @@ static int setup_txselect(const char *str, struct kernel_param *kp)
 {
         struct qib_devdata *dd;
         unsigned long val;
-        int ret;
-
+        char *n;
         if (strlen(str) >= MAX_ATTEN_LEN) {
                 pr_info("txselect_values string too long\n");
                 return -ENOSPC;
         }
-        ret = kstrtoul(str, 0, &val);
-        if (ret || val >= (TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ +
+        val = simple_strtoul(str, &n, 0);
+        if (n == str || val >= (TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ +
                                 TXDDS_MFG_SZ)) {
                 pr_info("txselect_values must start with a number < %d\n",
                         TXDDS_TABLE_SZ + TXDDS_EXTRA_SZ + TXDDS_MFG_SZ);
-                return ret ? ret : -EINVAL;
+                return -EINVAL;
         }
-
         strcpy(txselect_list, str);
+
         list_for_each_entry(dd, &qib_dev_list, list)
                 if (dd->deviceid == PCI_DEVICE_ID_QLOGIC_IB_7322)
                         set_no_qsfp_atten(dd, 1);
diff --git a/drivers/infiniband/hw/qib/qib_mad.h b/drivers/infiniband/hw/qib/qib_mad.h
index 28874f8606f8..941d4d50d8e7 100644
--- a/drivers/infiniband/hw/qib/qib_mad.h
+++ b/drivers/infiniband/hw/qib/qib_mad.h
@@ -54,7 +54,7 @@ struct ib_node_info {
         __be32 revision;
         u8 local_port_num;
         u8 vendor_id[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct ib_mad_notice_attr {
         u8 generic_type;
@@ -73,7 +73,7 @@ struct ib_mad_notice_attr {
                         __be16  reserved;
                         __be16  lid;            /* where violation happened */
                         u8      port_num;       /* where violation happened */
-                } __attribute__ ((packed)) ntc_129_131;
+                } __packed ntc_129_131;
 
                 struct {
                         __be16  reserved;
@@ -83,14 +83,14 @@ struct ib_mad_notice_attr {
                         __be32  new_cap_mask;   /* new capability mask */
                         u8      reserved3;
                         u8      change_flags;   /* low 3 bits only */
-                } __attribute__ ((packed)) ntc_144;
+                } __packed ntc_144;
 
                 struct {
                         __be16  reserved;
                         __be16  lid;            /* lid where sys guid changed */
                         __be16  reserved2;
                         __be64  new_sys_guid;
-                } __attribute__ ((packed)) ntc_145;
+                } __packed ntc_145;
 
                 struct {
                         __be16  reserved;
@@ -104,7 +104,7 @@ struct ib_mad_notice_attr {
                         u8      reserved3;
                         u8      dr_trunc_hop;
                         u8      dr_rtn_path[30];
-                } __attribute__ ((packed)) ntc_256;
+                } __packed ntc_256;
 
                 struct {
                         __be16          reserved;
@@ -115,7 +115,7 @@ struct ib_mad_notice_attr {
                         __be32          qp2;    /* high 8 bits reserved */
                         union ib_gid    gid1;
                         union ib_gid    gid2;
-                } __attribute__ ((packed)) ntc_257_258;
+                } __packed ntc_257_258;
 
         } details;
 };
@@ -209,7 +209,7 @@ struct ib_pma_portcounters_cong {
         __be64 port_rcv_packets;
         __be64 port_xmit_wait;
         __be64 port_adr_events;
-} __attribute__ ((packed));
+} __packed;
 
 #define IB_PMA_CONG_HW_CONTROL_TIMER            0x00
 #define IB_PMA_CONG_HW_CONTROL_SAMPLE           0x01
diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c
index d0a0ea0c14d6..165aee2ca8a0 100644
--- a/drivers/infiniband/hw/qib/qib_user_sdma.c
+++ b/drivers/infiniband/hw/qib/qib_user_sdma.c
@@ -594,8 +594,7 @@ static int qib_user_sdma_pin_pages(const struct qib_devdata *dd,
                 else
                         j = npages;
 
-                ret = get_user_pages(current, current->mm, addr,
-                             j, 0, 1, pages, NULL);
+                ret = get_user_pages_fast(addr, j, 0, pages);
                 if (ret != j) {
                         i = 0;
                         j = ret;
@@ -1294,11 +1293,8 @@ int qib_user_sdma_writev(struct qib_ctxtdata *rcd,
                 int mxp = 8;
                 int ndesc = 0;
 
-                down_write(&current->mm->mmap_sem);
                 ret = qib_user_sdma_queue_pkts(dd, ppd, pq,
                                 iov, dim, &list, &mxp, &ndesc);
-                up_write(&current->mm->mmap_sem);
-
                 if (ret < 0)
                         goto done_unlock;
                 else {
diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h
index 012e2c7575ad..a01c7d2cf541 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.h
+++ b/drivers/infiniband/hw/qib/qib_verbs.h
@@ -150,14 +150,14 @@ struct ib_reth {
         __be64 vaddr;
         __be32 rkey;
         __be32 length;
-} __attribute__ ((packed));
+} __packed;
 
 struct ib_atomic_eth {
         __be32 vaddr[2];        /* unaligned so access as 2 32-bit words */
         __be32 rkey;
         __be64 swap_data;
         __be64 compare_data;
-} __attribute__ ((packed));
+} __packed;
 
 struct qib_other_headers {
         __be32 bth[3];
@@ -178,7 +178,7 @@ struct qib_other_headers {
                 __be32 aeth;
                 struct ib_atomic_eth atomic_eth;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * Note that UD packets with a GRH header are 8+40+12+8 = 68 bytes
@@ -195,12 +195,12 @@ struct qib_ib_header {
                 } l;
                 struct qib_other_headers oth;
         } u;
-} __attribute__ ((packed));
+} __packed;
 
 struct qib_pio_header {
         __le32 pbc[2];
         struct qib_ib_header hdr;
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * There is one struct qib_mcast for each multicast GID.
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index eb71aaa26a9a..c639f90cfda4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -101,6 +101,7 @@ enum {
         IPOIB_MCAST_FLAG_SENDONLY = 1,
         IPOIB_MCAST_FLAG_BUSY     = 2,  /* joining or already joined */
         IPOIB_MCAST_FLAG_ATTACHED = 3,
+        IPOIB_MCAST_JOIN_STARTED  = 4,
 
         MAX_SEND_CQE              = 16,
         IPOIB_CM_COPYBREAK        = 256,
@@ -151,6 +152,7 @@ struct ipoib_mcast {
         struct sk_buff_head pkt_queue;
 
         struct net_device *dev;
+        struct completion done;
 };
 
 struct ipoib_rx_buf {
@@ -299,7 +301,7 @@ struct ipoib_dev_priv {
 
         unsigned long flags;
 
-        struct mutex vlan_mutex;
+        struct rw_semaphore vlan_rwsem;
 
         struct rb_root  path_tree;
         struct list_head path_list;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 7a3175400b2a..1377f85911c2 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -140,7 +140,8 @@ static int ipoib_cm_post_receive_nonsrq(struct net_device *dev,
 static struct sk_buff *ipoib_cm_alloc_rx_skb(struct net_device *dev,
                                              struct ipoib_cm_rx_buf *rx_ring,
                                              int id, int frags,
-                                             u64 mapping[IPOIB_CM_RX_SG])
+                                             u64 mapping[IPOIB_CM_RX_SG],
+                                             gfp_t gfp)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct sk_buff *skb;
@@ -164,7 +165,7 @@ static struct sk_buff *ipoib_cm_alloc_rx_skb(struct net_device *dev,
         }
 
         for (i = 0; i < frags; i++) {
-                struct page *page = alloc_page(GFP_ATOMIC);
+                struct page *page = alloc_page(gfp);
 
                 if (!page)
                         goto partial_error;
@@ -382,7 +383,8 @@ static int ipoib_cm_nonsrq_init_rx(struct net_device *dev, struct ib_cm_id *cm_i
 
         for (i = 0; i < ipoib_recvq_size; ++i) {
                 if (!ipoib_cm_alloc_rx_skb(dev, rx->rx_ring, i, IPOIB_CM_RX_SG - 1,
-                                           rx->rx_ring[i].mapping)) {
+                                           rx->rx_ring[i].mapping,
+                                           GFP_KERNEL)) {
                         ipoib_warn(priv, "failed to allocate receive buffer %d\n", i);
                                 ret = -ENOMEM;
                                 goto err_count;
@@ -639,7 +641,8 @@ void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         frags = PAGE_ALIGN(wc->byte_len - min(wc->byte_len,
                                               (unsigned)IPOIB_CM_HEAD_SIZE)) / PAGE_SIZE;
 
-        newskb = ipoib_cm_alloc_rx_skb(dev, rx_ring, wr_id, frags, mapping);
+        newskb = ipoib_cm_alloc_rx_skb(dev, rx_ring, wr_id, frags,
+                                       mapping, GFP_ATOMIC);
         if (unlikely(!newskb)) {
                 /*
                  * If we can't allocate a new RX buffer, dump
@@ -1556,7 +1559,8 @@ int ipoib_cm_dev_init(struct net_device *dev)
                 for (i = 0; i < ipoib_recvq_size; ++i) {
                         if (!ipoib_cm_alloc_rx_skb(dev, priv->cm.srq_ring, i,
                                                    priv->cm.num_frags - 1,
-                                                   priv->cm.srq_ring[i].mapping)) {
+                                                   priv->cm.srq_ring[i].mapping,
+                                                   GFP_KERNEL)) {
                                 ipoib_warn(priv, "failed to allocate "
                                            "receive buffer %d\n", i);
                                 ipoib_cm_dev_cleanup(dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 196b1d13cbcb..6a7003ddb0be 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -685,15 +685,13 @@ int ipoib_ib_dev_open(struct net_device *dev)
         ret = ipoib_ib_post_receives(dev);
         if (ret) {
                 ipoib_warn(priv, "ipoib_ib_post_receives returned %d\n", ret);
-                ipoib_ib_dev_stop(dev, 1);
-                return -1;
+                goto dev_stop;
         }
 
         ret = ipoib_cm_dev_open(dev);
         if (ret) {
                 ipoib_warn(priv, "ipoib_cm_dev_open returned %d\n", ret);
-                ipoib_ib_dev_stop(dev, 1);
-                return -1;
+                goto dev_stop;
         }
 
         clear_bit(IPOIB_STOP_REAPER, &priv->flags);
@@ -704,6 +702,11 @@ int ipoib_ib_dev_open(struct net_device *dev)
                 napi_enable(&priv->napi);
 
         return 0;
+dev_stop:
+        if (!test_and_set_bit(IPOIB_FLAG_INITIALIZED, &priv->flags))
+                napi_enable(&priv->napi);
+        ipoib_ib_dev_stop(dev, 1);
+        return -1;
 }
 
 static void ipoib_pkey_dev_check_presence(struct net_device *dev)
@@ -746,10 +749,8 @@ int ipoib_ib_dev_down(struct net_device *dev, int flush)
         if (!test_bit(IPOIB_PKEY_ASSIGNED, &priv->flags)) {
                 mutex_lock(&pkey_mutex);
                 set_bit(IPOIB_PKEY_STOP, &priv->flags);
-                cancel_delayed_work(&priv->pkey_poll_task);
+                cancel_delayed_work_sync(&priv->pkey_poll_task);
                 mutex_unlock(&pkey_mutex);
-                if (flush)
-                        flush_workqueue(ipoib_workqueue);
         }
 
         ipoib_mcast_stop_thread(dev, flush);
@@ -974,7 +975,7 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
         u16 new_index;
         int result;
 
-        mutex_lock(&priv->vlan_mutex);
+        down_read(&priv->vlan_rwsem);
 
         /*
          * Flush any child interfaces too -- they might be up even if
@@ -983,7 +984,7 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv,
         list_for_each_entry(cpriv, &priv->child_intfs, list)
                 __ipoib_ib_dev_flush(cpriv, level);
 
-        mutex_unlock(&priv->vlan_mutex);
+        up_read(&priv->vlan_rwsem);
 
         if (!test_bit(IPOIB_FLAG_INITIALIZED, &priv->flags)) {
                 /* for non-child devices must check/update the pkey value here */
@@ -1081,6 +1082,11 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
         ipoib_dbg(priv, "cleaning up ib_dev\n");
+        /*
+         * We must make sure there are no more (path) completions
+         * that may wish to touch priv fields that are no longer valid
+         */
+        ipoib_flush_paths(dev);
 
         ipoib_mcast_stop_thread(dev, 1);
         ipoib_mcast_dev_flush(dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 82cec1af902c..d64ed05fb082 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -119,7 +119,7 @@ int ipoib_open(struct net_device *dev)
                 struct ipoib_dev_priv *cpriv;
 
                 /* Bring up any child interfaces too */
-                mutex_lock(&priv->vlan_mutex);
+                down_read(&priv->vlan_rwsem);
                 list_for_each_entry(cpriv, &priv->child_intfs, list) {
                         int flags;
 
@@ -129,7 +129,7 @@ int ipoib_open(struct net_device *dev)
 
                         dev_change_flags(cpriv->dev, flags | IFF_UP);
                 }
-                mutex_unlock(&priv->vlan_mutex);
+                up_read(&priv->vlan_rwsem);
         }
 
         netif_start_queue(dev);
@@ -162,7 +162,7 @@ static int ipoib_stop(struct net_device *dev)
                 struct ipoib_dev_priv *cpriv;
 
                 /* Bring down any child interfaces too */
-                mutex_lock(&priv->vlan_mutex);
+                down_read(&priv->vlan_rwsem);
                 list_for_each_entry(cpriv, &priv->child_intfs, list) {
                         int flags;
 
@@ -172,7 +172,7 @@ static int ipoib_stop(struct net_device *dev)
 
                         dev_change_flags(cpriv->dev, flags & ~IFF_UP);
                 }
-                mutex_unlock(&priv->vlan_mutex);
+                up_read(&priv->vlan_rwsem);
         }
 
         return 0;
@@ -1350,7 +1350,7 @@ void ipoib_setup(struct net_device *dev)
 
         ipoib_set_ethtool_ops(dev);
 
-        netif_napi_add(dev, &priv->napi, ipoib_poll, 100);
+        netif_napi_add(dev, &priv->napi, ipoib_poll, NAPI_POLL_WEIGHT);
 
         dev->watchdog_timeo      = HZ;
 
@@ -1372,7 +1372,7 @@ void ipoib_setup(struct net_device *dev)
 
         spin_lock_init(&priv->lock);
 
-        mutex_init(&priv->vlan_mutex);
+        init_rwsem(&priv->vlan_rwsem);
 
         INIT_LIST_HEAD(&priv->path_list);
         INIT_LIST_HEAD(&priv->child_intfs);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index cecb98a4c662..d4e005720d01 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -386,8 +386,10 @@ static int ipoib_mcast_join_complete(int status,
                         mcast->mcmember.mgid.raw, status);
 
         /* We trap for port events ourselves. */
-        if (status == -ENETRESET)
-                return 0;
+        if (status == -ENETRESET) {
+                status = 0;
+                goto out;
+        }
 
         if (!status)
                 status = ipoib_mcast_join_finish(mcast, &multicast->rec);
@@ -407,7 +409,8 @@ static int ipoib_mcast_join_complete(int status,
                 if (mcast == priv->broadcast)
                         queue_work(ipoib_workqueue, &priv->carrier_on_task);
 
-                return 0;
+                status = 0;
+                goto out;
         }
 
         if (mcast->logcount++ < 20) {
@@ -434,7 +437,8 @@ static int ipoib_mcast_join_complete(int status,
                                    mcast->backoff * HZ);
         spin_unlock_irq(&priv->lock);
         mutex_unlock(&mcast_mutex);
-
+out:
+        complete(&mcast->done);
         return status;
 }
 
@@ -484,11 +488,15 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast,
         }
 
         set_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);
+        init_completion(&mcast->done);
+        set_bit(IPOIB_MCAST_JOIN_STARTED, &mcast->flags);
+
         mcast->mc = ib_sa_join_multicast(&ipoib_sa_client, priv->ca, priv->port,
                                          &rec, comp_mask, GFP_KERNEL,
                                          ipoib_mcast_join_complete, mcast);
         if (IS_ERR(mcast->mc)) {
                 clear_bit(IPOIB_MCAST_FLAG_BUSY, &mcast->flags);
+                complete(&mcast->done);
                 ret = PTR_ERR(mcast->mc);
                 ipoib_warn(priv, "ib_sa_join_multicast failed, status %d\n", ret);
 
@@ -510,10 +518,18 @@ void ipoib_mcast_join_task(struct work_struct *work)
         struct ipoib_dev_priv *priv =
                 container_of(work, struct ipoib_dev_priv, mcast_task.work);
         struct net_device *dev = priv->dev;
+        struct ib_port_attr port_attr;
 
         if (!test_bit(IPOIB_MCAST_RUN, &priv->flags))
                 return;
 
+        if (ib_query_port(priv->ca, priv->port, &port_attr) ||
+            port_attr.state != IB_PORT_ACTIVE) {
+                ipoib_dbg(priv, "port state is not ACTIVE (state = %d) suspending join task\n",
+                          port_attr.state);
+                return;
+        }
+
         if (ib_query_gid(priv->ca, priv->port, 0, &priv->local_gid))
                 ipoib_warn(priv, "ib_query_gid() failed\n");
         else
@@ -751,6 +767,11 @@ void ipoib_mcast_dev_flush(struct net_device *dev)
 
         spin_unlock_irqrestore(&priv->lock, flags);
 
+        /* seperate between the wait to the leave*/
+        list_for_each_entry_safe(mcast, tmcast, &remove_list, list)
+                if (test_bit(IPOIB_MCAST_JOIN_STARTED, &mcast->flags))
+                        wait_for_completion(&mcast->done);
+
         list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {
                 ipoib_mcast_leave(dev, mcast);
                 ipoib_mcast_free(mcast);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
index f81abe16cf09..c29b5c838833 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
@@ -142,10 +142,10 @@ static void ipoib_unregister_child_dev(struct net_device *dev, struct list_head
         priv = netdev_priv(dev);
         ppriv = netdev_priv(priv->parent);
 
-        mutex_lock(&ppriv->vlan_mutex);
+        down_write(&ppriv->vlan_rwsem);
         unregister_netdevice_queue(dev, head);
         list_del(&priv->list);
-        mutex_unlock(&ppriv->vlan_mutex);
+        up_write(&ppriv->vlan_rwsem);
 }
 
 static size_t ipoib_get_size(const struct net_device *dev)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 8292554bccb5..9fad7b5ac8b9 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -140,7 +140,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
         if (!rtnl_trylock())
                 return restart_syscall();
 
-        mutex_lock(&ppriv->vlan_mutex);
+        down_write(&ppriv->vlan_rwsem);
 
         /*
          * First ensure this isn't a duplicate. We check the parent device and
@@ -163,7 +163,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
         result = __ipoib_vlan_add(ppriv, priv, pkey, IPOIB_LEGACY_CHILD);
 
 out:
-        mutex_unlock(&ppriv->vlan_mutex);
+        up_write(&ppriv->vlan_rwsem);
 
         if (result)
                 free_netdev(priv->dev);
@@ -185,7 +185,8 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
 
         if (!rtnl_trylock())
                 return restart_syscall();
-        mutex_lock(&ppriv->vlan_mutex);
+
+        down_write(&ppriv->vlan_rwsem);
         list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
                 if (priv->pkey == pkey &&
                     priv->child_type == IPOIB_LEGACY_CHILD) {
@@ -195,7 +196,8 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
                         break;
                 }
         }
-        mutex_unlock(&ppriv->vlan_mutex);
+        up_write(&ppriv->vlan_rwsem);
+
         rtnl_unlock();
 
         if (dev) {
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index f93baf8254c4..a88631918e85 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -46,6 +46,7 @@
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_dbg.h>
+#include <scsi/scsi_tcq.h>
 #include <scsi/srp.h>
 #include <scsi/scsi_transport_srp.h>
 
@@ -86,6 +87,32 @@ module_param(topspin_workarounds, int, 0444);
 MODULE_PARM_DESC(topspin_workarounds,
                  "Enable workarounds for Topspin/Cisco SRP target bugs if != 0");
 
+static struct kernel_param_ops srp_tmo_ops;
+
+static int srp_reconnect_delay = 10;
+module_param_cb(reconnect_delay, &srp_tmo_ops, &srp_reconnect_delay,
+                S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(reconnect_delay, "Time between successive reconnect attempts");
+
+static int srp_fast_io_fail_tmo = 15;
+module_param_cb(fast_io_fail_tmo, &srp_tmo_ops, &srp_fast_io_fail_tmo,
+                S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(fast_io_fail_tmo,
+                 "Number of seconds between the observation of a transport"
+                 " layer error and failing all I/O. \"off\" means that this"
+                 " functionality is disabled.");
+
+static int srp_dev_loss_tmo = 600;
+module_param_cb(dev_loss_tmo, &srp_tmo_ops, &srp_dev_loss_tmo,
+                S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(dev_loss_tmo,
+                 "Maximum number of seconds that the SRP transport should"
+                 " insulate transport layer errors. After this time has been"
+                 " exceeded the SCSI host is removed. Should be"
+                 " between 1 and " __stringify(SCSI_DEVICE_BLOCK_MAX_TIMEOUT)
+                 " if fast_io_fail_tmo has not been set. \"off\" means that"
+                 " this functionality is disabled.");
+
 static void srp_add_one(struct ib_device *device);
 static void srp_remove_one(struct ib_device *device);
 static void srp_recv_completion(struct ib_cq *cq, void *target_ptr);
@@ -102,6 +129,48 @@ static struct ib_client srp_client = {
 
 static struct ib_sa_client srp_sa_client;
 
+static int srp_tmo_get(char *buffer, const struct kernel_param *kp)
+{
+        int tmo = *(int *)kp->arg;
+
+        if (tmo >= 0)
+                return sprintf(buffer, "%d", tmo);
+        else
+                return sprintf(buffer, "off");
+}
+
+static int srp_tmo_set(const char *val, const struct kernel_param *kp)
+{
+        int tmo, res;
+
+        if (strncmp(val, "off", 3) != 0) {
+                res = kstrtoint(val, 0, &tmo);
+                if (res)
+                        goto out;
+        } else {
+                tmo = -1;
+        }
+        if (kp->arg == &srp_reconnect_delay)
+                res = srp_tmo_valid(tmo, srp_fast_io_fail_tmo,
+                                    srp_dev_loss_tmo);
+        else if (kp->arg == &srp_fast_io_fail_tmo)
+                res = srp_tmo_valid(srp_reconnect_delay, tmo, srp_dev_loss_tmo);
+        else
+                res = srp_tmo_valid(srp_reconnect_delay, srp_fast_io_fail_tmo,
+                                    tmo);
+        if (res)
+                goto out;
+        *(int *)kp->arg = tmo;
+
+out:
+        return res;
+}
+
+static struct kernel_param_ops srp_tmo_ops = {
+        .get = srp_tmo_get,
+        .set = srp_tmo_set,
+};
+
 static inline struct srp_target_port *host_to_target(struct Scsi_Host *host)
 {
         return (struct srp_target_port *) host->hostdata;
@@ -231,16 +300,16 @@ static int srp_create_target_ib(struct srp_target_port *target)
                 return -ENOMEM;
 
         recv_cq = ib_create_cq(target->srp_host->srp_dev->dev,
-                               srp_recv_completion, NULL, target, SRP_RQ_SIZE,
-                               target->comp_vector);
+                               srp_recv_completion, NULL, target,
+                               target->queue_size, target->comp_vector);
         if (IS_ERR(recv_cq)) {
                 ret = PTR_ERR(recv_cq);
                 goto err;
         }
 
         send_cq = ib_create_cq(target->srp_host->srp_dev->dev,
-                               srp_send_completion, NULL, target, SRP_SQ_SIZE,
-                               target->comp_vector);
+                               srp_send_completion, NULL, target,
+                               target->queue_size, target->comp_vector);
         if (IS_ERR(send_cq)) {
                 ret = PTR_ERR(send_cq);
                 goto err_recv_cq;
@@ -249,8 +318,8 @@ static int srp_create_target_ib(struct srp_target_port *target)
         ib_req_notify_cq(recv_cq, IB_CQ_NEXT_COMP);
 
         init_attr->event_handler       = srp_qp_event;
-        init_attr->cap.max_send_wr     = SRP_SQ_SIZE;
-        init_attr->cap.max_recv_wr     = SRP_RQ_SIZE;
+        init_attr->cap.max_send_wr     = target->queue_size;
+        init_attr->cap.max_recv_wr     = target->queue_size;
         init_attr->cap.max_recv_sge    = 1;
         init_attr->cap.max_send_sge    = 1;
         init_attr->sq_sig_type         = IB_SIGNAL_ALL_WR;
@@ -296,6 +365,10 @@ err:
         return ret;
 }
 
+/*
+ * Note: this function may be called without srp_alloc_iu_bufs() having been
+ * invoked. Hence the target->[rt]x_ring checks.
+ */
 static void srp_free_target_ib(struct srp_target_port *target)
 {
         int i;
@@ -307,10 +380,18 @@ static void srp_free_target_ib(struct srp_target_port *target)
         target->qp = NULL;
         target->send_cq = target->recv_cq = NULL;
 
-        for (i = 0; i < SRP_RQ_SIZE; ++i)
-                srp_free_iu(target->srp_host, target->rx_ring[i]);
-        for (i = 0; i < SRP_SQ_SIZE; ++i)
-                srp_free_iu(target->srp_host, target->tx_ring[i]);
+        if (target->rx_ring) {
+                for (i = 0; i < target->queue_size; ++i)
+                        srp_free_iu(target->srp_host, target->rx_ring[i]);
+                kfree(target->rx_ring);
+                target->rx_ring = NULL;
+        }
+        if (target->tx_ring) {
+                for (i = 0; i < target->queue_size; ++i)
+                        srp_free_iu(target->srp_host, target->tx_ring[i]);
+                kfree(target->tx_ring);
+                target->tx_ring = NULL;
+        }
 }
 
 static void srp_path_rec_completion(int status,
@@ -390,7 +471,7 @@ static int srp_send_req(struct srp_target_port *target)
         req->param.responder_resources        = 4;
         req->param.remote_cm_response_timeout = 20;
         req->param.local_cm_response_timeout  = 20;
-        req->param.retry_count                = 7;
+        req->param.retry_count                = target->tl_retry_count;
         req->param.rnr_retry_count            = 7;
         req->param.max_cm_retries             = 15;
 
@@ -496,7 +577,11 @@ static void srp_free_req_data(struct srp_target_port *target)
         struct srp_request *req;
         int i;
 
-        for (i = 0, req = target->req_ring; i < SRP_CMD_SQ_SIZE; ++i, ++req) {
+        if (!target->req_ring)
+                return;
+
+        for (i = 0; i < target->req_ring_size; ++i) {
+                req = &target->req_ring[i];
                 kfree(req->fmr_list);
                 kfree(req->map_page);
                 if (req->indirect_dma_addr) {
@@ -506,6 +591,50 @@ static void srp_free_req_data(struct srp_target_port *target)
                 }
                 kfree(req->indirect_desc);
         }
+
+        kfree(target->req_ring);
+        target->req_ring = NULL;
+}
+
+static int srp_alloc_req_data(struct srp_target_port *target)
+{
+        struct srp_device *srp_dev = target->srp_host->srp_dev;
+        struct ib_device *ibdev = srp_dev->dev;
+        struct srp_request *req;
+        dma_addr_t dma_addr;
+        int i, ret = -ENOMEM;
+
+        INIT_LIST_HEAD(&target->free_reqs);
+
+        target->req_ring = kzalloc(target->req_ring_size *
+                                   sizeof(*target->req_ring), GFP_KERNEL);
+        if (!target->req_ring)
+                goto out;
+
+        for (i = 0; i < target->req_ring_size; ++i) {
+                req = &target->req_ring[i];
+                req->fmr_list = kmalloc(target->cmd_sg_cnt * sizeof(void *),
+                                        GFP_KERNEL);
+                req->map_page = kmalloc(SRP_FMR_SIZE * sizeof(void *),
+                                        GFP_KERNEL);
+                req->indirect_desc = kmalloc(target->indirect_size, GFP_KERNEL);
+                if (!req->fmr_list || !req->map_page || !req->indirect_desc)
+                        goto out;
+
+                dma_addr = ib_dma_map_single(ibdev, req->indirect_desc,
+                                             target->indirect_size,
+                                             DMA_TO_DEVICE);
+                if (ib_dma_mapping_error(ibdev, dma_addr))
+                        goto out;
+
+                req->indirect_dma_addr = dma_addr;
+                req->index = i;
+                list_add_tail(&req->list, &target->free_reqs);
+        }
+        ret = 0;
+
+out:
+        return ret;
 }
 
 /**
@@ -528,12 +657,20 @@ static void srp_remove_target(struct srp_target_port *target)
         WARN_ON_ONCE(target->state != SRP_TARGET_REMOVED);
 
         srp_del_scsi_host_attr(target->scsi_host);
+        srp_rport_get(target->rport);
         srp_remove_host(target->scsi_host);
         scsi_remove_host(target->scsi_host);
         srp_disconnect_target(target);
         ib_destroy_cm_id(target->cm_id);
         srp_free_target_ib(target);
+        cancel_work_sync(&target->tl_err_work);
+        srp_rport_put(target->rport);
         srp_free_req_data(target);
+
+        spin_lock(&target->srp_host->target_lock);
+        list_del(&target->list);
+        spin_unlock(&target->srp_host->target_lock);
+
         scsi_host_put(target->scsi_host);
 }
 
@@ -545,10 +682,6 @@ static void srp_remove_work(struct work_struct *work)
         WARN_ON_ONCE(target->state != SRP_TARGET_REMOVED);
 
         srp_remove_target(target);
-
-        spin_lock(&target->srp_host->target_lock);
-        list_del(&target->list);
-        spin_unlock(&target->srp_host->target_lock);
 }
 
 static void srp_rport_delete(struct srp_rport *rport)
@@ -686,23 +819,42 @@ static void srp_free_req(struct srp_target_port *target,
         spin_unlock_irqrestore(&target->lock, flags);
 }
 
-static void srp_reset_req(struct srp_target_port *target, struct srp_request *req)
+static void srp_finish_req(struct srp_target_port *target,
+                           struct srp_request *req, int result)
 {
         struct scsi_cmnd *scmnd = srp_claim_req(target, req, NULL);
 
         if (scmnd) {
                 srp_free_req(target, req, scmnd, 0);
-                scmnd->result = DID_RESET << 16;
+                scmnd->result = result;
                 scmnd->scsi_done(scmnd);
         }
 }
 
-static int srp_reconnect_target(struct srp_target_port *target)
+static void srp_terminate_io(struct srp_rport *rport)
 {
-        struct Scsi_Host *shost = target->scsi_host;
-        int i, ret;
+        struct srp_target_port *target = rport->lld_data;
+        int i;
 
-        scsi_target_block(&shost->shost_gendev);
+        for (i = 0; i < target->req_ring_size; ++i) {
+                struct srp_request *req = &target->req_ring[i];
+                srp_finish_req(target, req, DID_TRANSPORT_FAILFAST << 16);
+        }
+}
+
+/*
+ * It is up to the caller to ensure that srp_rport_reconnect() calls are
+ * serialized and that no concurrent srp_queuecommand(), srp_abort(),
+ * srp_reset_device() or srp_reset_host() calls will occur while this function
+ * is in progress. One way to realize that is not to call this function
+ * directly but to call srp_reconnect_rport() instead since that last function
+ * serializes calls of this function via rport->mutex and also blocks
+ * srp_queuecommand() calls before invoking this function.
+ */
+static int srp_rport_reconnect(struct srp_rport *rport)
+{
+        struct srp_target_port *target = rport->lld_data;
+        int i, ret;
 
         srp_disconnect_target(target);
         /*
@@ -721,41 +873,21 @@ static int srp_reconnect_target(struct srp_target_port *target)
         else
                 srp_create_target_ib(target);
 
-        for (i = 0; i < SRP_CMD_SQ_SIZE; ++i) {
+        for (i = 0; i < target->req_ring_size; ++i) {
                 struct srp_request *req = &target->req_ring[i];
-                if (req->scmnd)
-                        srp_reset_req(target, req);
+                srp_finish_req(target, req, DID_RESET << 16);
         }
 
         INIT_LIST_HEAD(&target->free_tx);
-        for (i = 0; i < SRP_SQ_SIZE; ++i)
+        for (i = 0; i < target->queue_size; ++i)
                 list_add(&target->tx_ring[i]->list, &target->free_tx);
 
         if (ret == 0)
                 ret = srp_connect_target(target);
 
-        scsi_target_unblock(&shost->shost_gendev, ret == 0 ? SDEV_RUNNING :
-                            SDEV_TRANSPORT_OFFLINE);
-        target->transport_offline = !!ret;
-
-        if (ret)
-                goto err;
-
-        shost_printk(KERN_INFO, target->scsi_host, PFX "reconnect succeeded\n");
-
-        return ret;
-
-err:
-        shost_printk(KERN_ERR, target->scsi_host,
-                     PFX "reconnect failed (%d), removing target port.\n", ret);
-
-        /*
-         * We couldn't reconnect, so kill our target port off.
-         * However, we have to defer the real removal because we
-         * are in the context of the SCSI error handler now, which
-         * will deadlock if we call scsi_remove_host().
-         */
-        srp_queue_remove_work(target);
+        if (ret == 0)
+                shost_printk(KERN_INFO, target->scsi_host,
+                             PFX "reconnect succeeded\n");
 
         return ret;
 }
@@ -1302,15 +1434,30 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
                              PFX "Recv failed with error code %d\n", res);
 }
 
-static void srp_handle_qp_err(enum ib_wc_status wc_status,
-                              enum ib_wc_opcode wc_opcode,
+/**
+ * srp_tl_err_work() - handle a transport layer error
+ *
+ * Note: This function may get invoked before the rport has been created,
+ * hence the target->rport test.
+ */
+static void srp_tl_err_work(struct work_struct *work)
+{
+        struct srp_target_port *target;
+
+        target = container_of(work, struct srp_target_port, tl_err_work);
+        if (target->rport)
+                srp_start_tl_fail_timers(target->rport);
+}
+
+static void srp_handle_qp_err(enum ib_wc_status wc_status, bool send_err,
                               struct srp_target_port *target)
 {
         if (target->connected && !target->qp_in_error) {
                 shost_printk(KERN_ERR, target->scsi_host,
                              PFX "failed %s status %d\n",
-                             wc_opcode & IB_WC_RECV ? "receive" : "send",
+                             send_err ? "send" : "receive",
                              wc_status);
+                queue_work(system_long_wq, &target->tl_err_work);
         }
         target->qp_in_error = true;
 }
@@ -1325,7 +1472,7 @@ static void srp_recv_completion(struct ib_cq *cq, void *target_ptr)
                 if (likely(wc.status == IB_WC_SUCCESS)) {
                         srp_handle_recv(target, &wc);
                 } else {
-                        srp_handle_qp_err(wc.status, wc.opcode, target);
+                        srp_handle_qp_err(wc.status, false, target);
                 }
         }
 }
@@ -1341,7 +1488,7 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr)
                         iu = (struct srp_iu *) (uintptr_t) wc.wr_id;
                         list_add(&iu->list, &target->free_tx);
                 } else {
-                        srp_handle_qp_err(wc.status, wc.opcode, target);
+                        srp_handle_qp_err(wc.status, true, target);
                 }
         }
 }
@@ -1349,17 +1496,29 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr)
 static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
 {
         struct srp_target_port *target = host_to_target(shost);
+        struct srp_rport *rport = target->rport;
         struct srp_request *req;
         struct srp_iu *iu;
         struct srp_cmd *cmd;
         struct ib_device *dev;
         unsigned long flags;
-        int len;
+        int len, result;
+        const bool in_scsi_eh = !in_interrupt() && current == shost->ehandler;
+
+        /*
+         * The SCSI EH thread is the only context from which srp_queuecommand()
+         * can get invoked for blocked devices (SDEV_BLOCK /
+         * SDEV_CREATED_BLOCK). Avoid racing with srp_reconnect_rport() by
+         * locking the rport mutex if invoked from inside the SCSI EH.
+         */
+        if (in_scsi_eh)
+                mutex_lock(&rport->mutex);
 
-        if (unlikely(target->transport_offline)) {
-                scmnd->result = DID_NO_CONNECT << 16;
+        result = srp_chkready(target->rport);
+        if (unlikely(result)) {
+                scmnd->result = result;
                 scmnd->scsi_done(scmnd);
-                return 0;
+                goto unlock_rport;
         }
 
         spin_lock_irqsave(&target->lock, flags);
@@ -1404,6 +1563,10 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
                 goto err_unmap;
         }
 
+unlock_rport:
+        if (in_scsi_eh)
+                mutex_unlock(&rport->mutex);
+
         return 0;
 
 err_unmap:
@@ -1418,14 +1581,30 @@ err_iu:
 err_unlock:
         spin_unlock_irqrestore(&target->lock, flags);
 
+        if (in_scsi_eh)
+                mutex_unlock(&rport->mutex);
+
         return SCSI_MLQUEUE_HOST_BUSY;
 }
 
+/*
+ * Note: the resources allocated in this function are freed in
+ * srp_free_target_ib().
+ */
 static int srp_alloc_iu_bufs(struct srp_target_port *target)
 {
         int i;
 
-        for (i = 0; i < SRP_RQ_SIZE; ++i) {
+        target->rx_ring = kzalloc(target->queue_size * sizeof(*target->rx_ring),
+                                  GFP_KERNEL);
+        if (!target->rx_ring)
+                goto err_no_ring;
+        target->tx_ring = kzalloc(target->queue_size * sizeof(*target->tx_ring),
+                                  GFP_KERNEL);
+        if (!target->tx_ring)
+                goto err_no_ring;
+
+        for (i = 0; i < target->queue_size; ++i) {
                 target->rx_ring[i] = srp_alloc_iu(target->srp_host,
                                                   target->max_ti_iu_len,
                                                   GFP_KERNEL, DMA_FROM_DEVICE);
@@ -1433,7 +1612,7 @@ static int srp_alloc_iu_bufs(struct srp_target_port *target)
                         goto err;
         }
 
-        for (i = 0; i < SRP_SQ_SIZE; ++i) {
+        for (i = 0; i < target->queue_size; ++i) {
                 target->tx_ring[i] = srp_alloc_iu(target->srp_host,
                                                   target->max_iu_len,
                                                   GFP_KERNEL, DMA_TO_DEVICE);
@@ -1446,16 +1625,18 @@ static int srp_alloc_iu_bufs(struct srp_target_port *target)
         return 0;
 
 err:
-        for (i = 0; i < SRP_RQ_SIZE; ++i) {
+        for (i = 0; i < target->queue_size; ++i) {
                 srp_free_iu(target->srp_host, target->rx_ring[i]);
-                target->rx_ring[i] = NULL;
-        }
-
-        for (i = 0; i < SRP_SQ_SIZE; ++i) {
                 srp_free_iu(target->srp_host, target->tx_ring[i]);
-                target->tx_ring[i] = NULL;
         }
 
+
+err_no_ring:
+        kfree(target->tx_ring);
+        target->tx_ring = NULL;
+        kfree(target->rx_ring);
+        target->rx_ring = NULL;
+
         return -ENOMEM;
 }
 
@@ -1506,6 +1687,9 @@ static void srp_cm_rep_handler(struct ib_cm_id *cm_id,
                 target->scsi_host->can_queue
                         = min(target->req_lim - SRP_TSK_MGMT_SQ_SIZE,
                               target->scsi_host->can_queue);
+                target->scsi_host->cmd_per_lun
+                        = min_t(int, target->scsi_host->can_queue,
+                                target->scsi_host->cmd_per_lun);
         } else {
                 shost_printk(KERN_WARNING, target->scsi_host,
                              PFX "Unhandled RSP opcode %#x\n", lrsp->opcode);
@@ -1513,7 +1697,7 @@ static void srp_cm_rep_handler(struct ib_cm_id *cm_id,
                 goto error;
         }
 
-        if (!target->rx_ring[0]) {
+        if (!target->rx_ring) {
                 ret = srp_alloc_iu_bufs(target);
                 if (ret)
                         goto error;
@@ -1533,7 +1717,7 @@ static void srp_cm_rep_handler(struct ib_cm_id *cm_id,
         if (ret)
                 goto error_free;
 
-        for (i = 0; i < SRP_RQ_SIZE; i++) {
+        for (i = 0; i < target->queue_size; i++) {
                 struct srp_iu *iu = target->rx_ring[i];
                 ret = srp_post_recv(target, iu);
                 if (ret)
@@ -1672,6 +1856,7 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
                 if (ib_send_cm_drep(cm_id, NULL, 0))
                         shost_printk(KERN_ERR, target->scsi_host,
                                      PFX "Sending CM DREP failed\n");
+                queue_work(system_long_wq, &target->tl_err_work);
                 break;
 
         case IB_CM_TIMEWAIT_EXIT:
@@ -1698,9 +1883,61 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
         return 0;
 }
 
+/**
+ * srp_change_queue_type - changing device queue tag type
+ * @sdev: scsi device struct
+ * @tag_type: requested tag type
+ *
+ * Returns queue tag type.
+ */
+static int
+srp_change_queue_type(struct scsi_device *sdev, int tag_type)
+{
+        if (sdev->tagged_supported) {
+                scsi_set_tag_type(sdev, tag_type);
+                if (tag_type)
+                        scsi_activate_tcq(sdev, sdev->queue_depth);
+                else
+                        scsi_deactivate_tcq(sdev, sdev->queue_depth);
+        } else
+                tag_type = 0;
+
+        return tag_type;
+}
+
+/**
+ * srp_change_queue_depth - setting device queue depth
+ * @sdev: scsi device struct
+ * @qdepth: requested queue depth
+ * @reason: SCSI_QDEPTH_DEFAULT/SCSI_QDEPTH_QFULL/SCSI_QDEPTH_RAMP_UP
+ * (see include/scsi/scsi_host.h for definition)
+ *
+ * Returns queue depth.
+ */
+static int
+srp_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
+{
+        struct Scsi_Host *shost = sdev->host;
+        int max_depth;
+        if (reason == SCSI_QDEPTH_DEFAULT || reason == SCSI_QDEPTH_RAMP_UP) {
+                max_depth = shost->can_queue;
+                if (!sdev->tagged_supported)
+                        max_depth = 1;
+                if (qdepth > max_depth)
+                        qdepth = max_depth;
+                scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
+        } else if (reason == SCSI_QDEPTH_QFULL)
+                scsi_track_queue_full(sdev, qdepth);
+        else
+                return -EOPNOTSUPP;
+
+        return sdev->queue_depth;
+}
+
 static int srp_send_tsk_mgmt(struct srp_target_port *target,
                              u64 req_tag, unsigned int lun, u8 func)
 {
+        struct srp_rport *rport = target->rport;
         struct ib_device *dev = target->srp_host->srp_dev->dev;
         struct srp_iu *iu;
         struct srp_tsk_mgmt *tsk_mgmt;
@@ -1710,12 +1947,20 @@ static int srp_send_tsk_mgmt(struct srp_target_port *target,
 
         init_completion(&target->tsk_mgmt_done);
 
+        /*
+         * Lock the rport mutex to avoid that srp_create_target_ib() is
+         * invoked while a task management function is being sent.
+         */
+        mutex_lock(&rport->mutex);
         spin_lock_irq(&target->lock);
         iu = __srp_get_tx_iu(target, SRP_IU_TSK_MGMT);
         spin_unlock_irq(&target->lock);
 
-        if (!iu)
+        if (!iu) {
+                mutex_unlock(&rport->mutex);
+
                 return -1;
+        }
 
         ib_dma_sync_single_for_cpu(dev, iu->dma, sizeof *tsk_mgmt,
                                    DMA_TO_DEVICE);
@@ -1732,8 +1977,11 @@ static int srp_send_tsk_mgmt(struct srp_target_port *target,
                                       DMA_TO_DEVICE);
         if (srp_post_send(target, iu, sizeof *tsk_mgmt)) {
                 srp_put_tx_iu(target, iu, SRP_IU_TSK_MGMT);
+                mutex_unlock(&rport->mutex);
+
                 return -1;
         }
+        mutex_unlock(&rport->mutex);
 
         if (!wait_for_completion_timeout(&target->tsk_mgmt_done,
                                          msecs_to_jiffies(SRP_ABORT_TIMEOUT_MS)))
@@ -1751,11 +1999,11 @@ static int srp_abort(struct scsi_cmnd *scmnd)
         shost_printk(KERN_ERR, target->scsi_host, "SRP abort called\n");
 
         if (!req || !srp_claim_req(target, req, scmnd))
-                return FAILED;
+                return SUCCESS;
         if (srp_send_tsk_mgmt(target, req->index, scmnd->device->lun,
                               SRP_TSK_ABORT_TASK) == 0)
                 ret = SUCCESS;
-        else if (target->transport_offline)
+        else if (target->rport->state == SRP_RPORT_LOST)
                 ret = FAST_IO_FAIL;
         else
                 ret = FAILED;
@@ -1779,10 +2027,10 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
         if (target->tsk_mgmt_status)
                 return FAILED;
 
-        for (i = 0; i < SRP_CMD_SQ_SIZE; ++i) {
+        for (i = 0; i < target->req_ring_size; ++i) {
                 struct srp_request *req = &target->req_ring[i];
                 if (req->scmnd && req->scmnd->device == scmnd->device)
-                        srp_reset_req(target, req);
+                        srp_finish_req(target, req, DID_RESET << 16);
         }
 
         return SUCCESS;
@@ -1791,14 +2039,10 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 static int srp_reset_host(struct scsi_cmnd *scmnd)
 {
         struct srp_target_port *target = host_to_target(scmnd->device->host);
-        int ret = FAILED;
 
         shost_printk(KERN_ERR, target->scsi_host, PFX "SRP reset_host called\n");
 
-        if (!srp_reconnect_target(target))
-                ret = SUCCESS;
-
-        return ret;
+        return srp_reconnect_rport(target->rport) == 0 ? SUCCESS : FAILED;
 }
 
 static int srp_slave_configure(struct scsi_device *sdev)
@@ -1851,6 +2095,14 @@ static ssize_t show_pkey(struct device *dev, struct device_attribute *attr,
         return sprintf(buf, "0x%04x\n", be16_to_cpu(target->path.pkey));
 }
 
+static ssize_t show_sgid(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+        struct srp_target_port *target = host_to_target(class_to_shost(dev));
+
+        return sprintf(buf, "%pI6\n", target->path.sgid.raw);
+}
+
 static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
                          char *buf)
 {
@@ -1907,6 +2159,14 @@ static ssize_t show_comp_vector(struct device *dev,
         return sprintf(buf, "%d\n", target->comp_vector);
 }
 
+static ssize_t show_tl_retry_count(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
+{
+        struct srp_target_port *target = host_to_target(class_to_shost(dev));
+
+        return sprintf(buf, "%d\n", target->tl_retry_count);
+}
+
 static ssize_t show_cmd_sg_entries(struct device *dev,
                                    struct device_attribute *attr, char *buf)
 {
@@ -1927,6 +2187,7 @@ static DEVICE_ATTR(id_ext,	    S_IRUGO, show_id_ext,	   NULL);
 static DEVICE_ATTR(ioc_guid,        S_IRUGO, show_ioc_guid,        NULL);
 static DEVICE_ATTR(service_id,      S_IRUGO, show_service_id,      NULL);
 static DEVICE_ATTR(pkey,            S_IRUGO, show_pkey,            NULL);
+static DEVICE_ATTR(sgid,            S_IRUGO, show_sgid,            NULL);
 static DEVICE_ATTR(dgid,            S_IRUGO, show_dgid,            NULL);
 static DEVICE_ATTR(orig_dgid,       S_IRUGO, show_orig_dgid,       NULL);
 static DEVICE_ATTR(req_lim,         S_IRUGO, show_req_lim,         NULL);
@@ -1934,6 +2195,7 @@ static DEVICE_ATTR(zero_req_lim,    S_IRUGO, show_zero_req_lim,	   NULL);
 static DEVICE_ATTR(local_ib_port,   S_IRUGO, show_local_ib_port,   NULL);
 static DEVICE_ATTR(local_ib_device, S_IRUGO, show_local_ib_device, NULL);
 static DEVICE_ATTR(comp_vector,     S_IRUGO, show_comp_vector,     NULL);
+static DEVICE_ATTR(tl_retry_count,  S_IRUGO, show_tl_retry_count,  NULL);
 static DEVICE_ATTR(cmd_sg_entries,  S_IRUGO, show_cmd_sg_entries,  NULL);
 static DEVICE_ATTR(allow_ext_sg,    S_IRUGO, show_allow_ext_sg,    NULL);
 
@@ -1942,6 +2204,7 @@ static struct device_attribute *srp_host_attrs[] = {
         &dev_attr_ioc_guid,
         &dev_attr_service_id,
         &dev_attr_pkey,
+        &dev_attr_sgid,
         &dev_attr_dgid,
         &dev_attr_orig_dgid,
         &dev_attr_req_lim,
@@ -1949,6 +2212,7 @@ static struct device_attribute *srp_host_attrs[] = {
         &dev_attr_local_ib_port,
         &dev_attr_local_ib_device,
         &dev_attr_comp_vector,
+        &dev_attr_tl_retry_count,
         &dev_attr_cmd_sg_entries,
         &dev_attr_allow_ext_sg,
         NULL
@@ -1961,14 +2225,16 @@ static struct scsi_host_template srp_template = {
         .slave_configure                = srp_slave_configure,
         .info                           = srp_target_info,
         .queuecommand                   = srp_queuecommand,
+        .change_queue_depth             = srp_change_queue_depth,
+        .change_queue_type              = srp_change_queue_type,
         .eh_abort_handler               = srp_abort,
         .eh_device_reset_handler        = srp_reset_device,
         .eh_host_reset_handler          = srp_reset_host,
         .skip_settle_delay              = true,
         .sg_tablesize                   = SRP_DEF_SG_TABLESIZE,
-        .can_queue                      = SRP_CMD_SQ_SIZE,
+        .can_queue                      = SRP_DEFAULT_CMD_SQ_SIZE,
         .this_id                        = -1,
-        .cmd_per_lun                    = SRP_CMD_SQ_SIZE,
+        .cmd_per_lun                    = SRP_DEFAULT_CMD_SQ_SIZE,
         .use_clustering                 = ENABLE_CLUSTERING,
         .shost_attrs                    = srp_host_attrs
 };
@@ -1994,6 +2260,7 @@ static int srp_add_target(struct srp_host *host, struct srp_target_port *target)
         }
 
         rport->lld_data = target;
+        target->rport = rport;
 
         spin_lock(&host->target_lock);
         list_add_tail(&target->list, &host->target_list);
@@ -2073,6 +2340,8 @@ enum {
         SRP_OPT_ALLOW_EXT_SG    = 1 << 10,
         SRP_OPT_SG_TABLESIZE    = 1 << 11,
         SRP_OPT_COMP_VECTOR     = 1 << 12,
+        SRP_OPT_TL_RETRY_COUNT  = 1 << 13,
+        SRP_OPT_QUEUE_SIZE      = 1 << 14,
         SRP_OPT_ALL             = (SRP_OPT_ID_EXT       |
                                    SRP_OPT_IOC_GUID     |
                                    SRP_OPT_DGID         |
@@ -2094,6 +2363,8 @@ static const match_table_t srp_opt_tokens = {
         { SRP_OPT_ALLOW_EXT_SG,         "allow_ext_sg=%u"       },
         { SRP_OPT_SG_TABLESIZE,         "sg_tablesize=%u"       },
         { SRP_OPT_COMP_VECTOR,          "comp_vector=%u"        },
+        { SRP_OPT_TL_RETRY_COUNT,       "tl_retry_count=%u"     },
+        { SRP_OPT_QUEUE_SIZE,           "queue_size=%d"         },
         { SRP_OPT_ERR,                  NULL                    }
 };
 
@@ -2188,13 +2459,25 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                         target->scsi_host->max_sectors = token;
                         break;
 
+                case SRP_OPT_QUEUE_SIZE:
+                        if (match_int(args, &token) || token < 1) {
+                                pr_warn("bad queue_size parameter '%s'\n", p);
+                                goto out;
+                        }
+                        target->scsi_host->can_queue = token;
+                        target->queue_size = token + SRP_RSP_SQ_SIZE +
+                                             SRP_TSK_MGMT_SQ_SIZE;
+                        if (!(opt_mask & SRP_OPT_MAX_CMD_PER_LUN))
+                                target->scsi_host->cmd_per_lun = token;
+                        break;
+
                 case SRP_OPT_MAX_CMD_PER_LUN:
-                        if (match_int(args, &token)) {
+                        if (match_int(args, &token) || token < 1) {
                                 pr_warn("bad max cmd_per_lun parameter '%s'\n",
                                         p);
                                 goto out;
                         }
-                        target->scsi_host->cmd_per_lun = min(token, SRP_CMD_SQ_SIZE);
+                        target->scsi_host->cmd_per_lun = token;
                         break;
 
                 case SRP_OPT_IO_CLASS:
@@ -2257,6 +2540,15 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                         target->comp_vector = token;
                         break;
 
+                case SRP_OPT_TL_RETRY_COUNT:
+                        if (match_int(args, &token) || token < 2 || token > 7) {
+                                pr_warn("bad tl_retry_count parameter '%s' (must be a number between 2 and 7)\n",
+                                        p);
+                                goto out;
+                        }
+                        target->tl_retry_count = token;
+                        break;
+
                 default:
                         pr_warn("unknown parameter or missing value '%s' in target creation request\n",
                                 p);
@@ -2273,6 +2565,12 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                                 pr_warn("target creation request is missing parameter '%s'\n",
                                         srp_opt_tokens[i].pattern);
 
+        if (target->scsi_host->cmd_per_lun > target->scsi_host->can_queue
+            && (opt_mask & SRP_OPT_MAX_CMD_PER_LUN))
+                pr_warn("cmd_per_lun = %d > queue_size = %d\n",
+                        target->scsi_host->cmd_per_lun,
+                        target->scsi_host->can_queue);
+
 out:
         kfree(options);
         return ret;
@@ -2287,8 +2585,7 @@ static ssize_t srp_create_target(struct device *dev,
         struct Scsi_Host *target_host;
         struct srp_target_port *target;
         struct ib_device *ibdev = host->srp_dev->dev;
-        dma_addr_t dma_addr;
-        int i, ret;
+        int ret;
 
         target_host = scsi_host_alloc(&srp_template,
                                       sizeof (struct srp_target_port));
@@ -2311,11 +2608,15 @@ static ssize_t srp_create_target(struct device *dev,
         target->cmd_sg_cnt      = cmd_sg_entries;
         target->sg_tablesize    = indirect_sg_entries ? : cmd_sg_entries;
         target->allow_ext_sg    = allow_ext_sg;
+        target->tl_retry_count  = 7;
+        target->queue_size      = SRP_DEFAULT_QUEUE_SIZE;
 
         ret = srp_parse_options(buf, target);
         if (ret)
                 goto err;
 
+        target->req_ring_size = target->queue_size - SRP_TSK_MGMT_SQ_SIZE;
+
         if (!srp_conn_unique(target->srp_host, target)) {
                 shost_printk(KERN_INFO, target->scsi_host,
                              PFX "Already connected to target port with id_ext=%016llx;ioc_guid=%016llx;initiator_ext=%016llx\n",
@@ -2339,31 +2640,13 @@ static ssize_t srp_create_target(struct device *dev,
                              sizeof (struct srp_indirect_buf) +
                              target->cmd_sg_cnt * sizeof (struct srp_direct_buf);
 
+        INIT_WORK(&target->tl_err_work, srp_tl_err_work);
         INIT_WORK(&target->remove_work, srp_remove_work);
         spin_lock_init(&target->lock);
         INIT_LIST_HEAD(&target->free_tx);
-        INIT_LIST_HEAD(&target->free_reqs);
-        for (i = 0; i < SRP_CMD_SQ_SIZE; ++i) {
-                struct srp_request *req = &target->req_ring[i];
-
-                req->fmr_list = kmalloc(target->cmd_sg_cnt * sizeof (void *),
-                                        GFP_KERNEL);
-                req->map_page = kmalloc(SRP_FMR_SIZE * sizeof (void *),
-                                        GFP_KERNEL);
-                req->indirect_desc = kmalloc(target->indirect_size, GFP_KERNEL);
-                if (!req->fmr_list || !req->map_page || !req->indirect_desc)
-                        goto err_free_mem;
-
-                dma_addr = ib_dma_map_single(ibdev, req->indirect_desc,
-                                             target->indirect_size,
-                                             DMA_TO_DEVICE);
-                if (ib_dma_mapping_error(ibdev, dma_addr))
-                        goto err_free_mem;
-
-                req->indirect_dma_addr = dma_addr;
-                req->index = i;
-                list_add_tail(&req->list, &target->free_reqs);
-        }
+        ret = srp_alloc_req_data(target);
+        if (ret)
+                goto err_free_mem;
 
         ib_query_gid(ibdev, host->port, 0, &target->path.sgid);
 
@@ -2612,7 +2895,14 @@ static void srp_remove_one(struct ib_device *device)
 }
 
 static struct srp_function_template ib_srp_transport_functions = {
+        .has_rport_state         = true,
+        .reset_timer_if_blocked  = true,
+        .reconnect_delay         = &srp_reconnect_delay,
+        .fast_io_fail_tmo        = &srp_fast_io_fail_tmo,
+        .dev_loss_tmo            = &srp_dev_loss_tmo,
+        .reconnect               = srp_rport_reconnect,
         .rport_delete            = srp_rport_delete,
+        .terminate_rport_io      = srp_terminate_io,
 };
 
 static int __init srp_init_module(void)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h
index e641088c14dc..575681063f38 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -57,14 +57,11 @@ enum {
         SRP_MAX_LUN             = 512,
         SRP_DEF_SG_TABLESIZE    = 12,
 
-        SRP_RQ_SHIFT            = 6,
-        SRP_RQ_SIZE             = 1 << SRP_RQ_SHIFT,
-
-        SRP_SQ_SIZE             = SRP_RQ_SIZE,
+        SRP_DEFAULT_QUEUE_SIZE  = 1 << 6,
         SRP_RSP_SQ_SIZE         = 1,
-        SRP_REQ_SQ_SIZE         = SRP_SQ_SIZE - SRP_RSP_SQ_SIZE,
         SRP_TSK_MGMT_SQ_SIZE    = 1,
-        SRP_CMD_SQ_SIZE         = SRP_REQ_SQ_SIZE - SRP_TSK_MGMT_SQ_SIZE,
+        SRP_DEFAULT_CMD_SQ_SIZE = SRP_DEFAULT_QUEUE_SIZE - SRP_RSP_SQ_SIZE -
+                                  SRP_TSK_MGMT_SQ_SIZE,
 
         SRP_TAG_NO_REQ          = ~0U,
         SRP_TAG_TSK_MGMT        = 1U << 31,
@@ -140,7 +137,6 @@ struct srp_target_port {
         unsigned int            cmd_sg_cnt;
         unsigned int            indirect_size;
         bool                    allow_ext_sg;
-        bool                    transport_offline;
 
         /* Everything above this point is used in the hot path of
          * command processing. Try to keep them packed into cachelines.
@@ -153,10 +149,14 @@ struct srp_target_port {
         u16                     io_class;
         struct srp_host        *srp_host;
         struct Scsi_Host       *scsi_host;
+        struct srp_rport       *rport;
         char                    target_name[32];
         unsigned int            scsi_id;
         unsigned int            sg_tablesize;
+        int                     queue_size;
+        int                     req_ring_size;
         int                     comp_vector;
+        int                     tl_retry_count;
 
         struct ib_sa_path_rec   path;
         __be16                  orig_dgid[8];
@@ -172,10 +172,11 @@ struct srp_target_port {
 
         int                     zero_req_lim;
 
-        struct srp_iu          *tx_ring[SRP_SQ_SIZE];
-        struct srp_iu          *rx_ring[SRP_RQ_SIZE];
-        struct srp_request      req_ring[SRP_CMD_SQ_SIZE];
+        struct srp_iu          **tx_ring;
+        struct srp_iu          **rx_ring;
+        struct srp_request      *req_ring;
 
+        struct work_struct      tl_err_work;
         struct work_struct      remove_work;
 
         struct list_head        list;
diff --git a/drivers/media/common/b2c2/flexcop-sram.c b/drivers/media/common/b2c2/flexcop-sram.c
index f2199e43e803..185c285f70fc 100644
--- a/drivers/media/common/b2c2/flexcop-sram.c
+++ b/drivers/media/common/b2c2/flexcop-sram.c
@@ -85,7 +85,7 @@ static void flexcop_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 *
                 while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
                         mdelay(1);
                         retries--;
-                };
+                }
 
                 if (retries == 0)
                         printk("%s: SRAM timeout\n", __func__);
@@ -110,7 +110,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf,
                 while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
                         mdelay(1);
                         retries--;
-                };
+                }
 
                 if (retries == 0)
                         printk("%s: SRAM timeout\n", __func__);
@@ -122,7 +122,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf,
                 while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
                         mdelay(1);
                         retries--;
-                };
+                }
 
                 if (retries == 0)
                         printk("%s: SRAM timeout\n", __func__);
diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index bb6ee5191eb1..34b0d0ddeef3 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -411,7 +411,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
         saa7146_write(dev, MC2, 0xf8000000);
 
         /* request an interrupt for the saa7146 */
-        err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,
+        err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED,
                           dev->name, dev);
         if (err < 0) {
                 ERR("request_irq() failed\n");
@@ -524,8 +524,6 @@ static void saa7146_remove_one(struct pci_dev *pdev)
         DEB_EE("dev:%p\n", dev);
 
         dev->ext->detach(dev);
-        /* Zero the PCI drvdata after use. */
-        pci_set_drvdata(pdev, NULL);
 
         /* shut down all video dma transfers */
         saa7146_write(dev, MC1, 0x00ff0000);
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index a142f7942a01..050984c5b1e3 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -922,8 +922,8 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev,
         u32 i, *ptr;
         u8 *payload = firmware->payload;
         int rc = 0;
-        firmware->start_address = le32_to_cpu(firmware->start_address);
-        firmware->length = le32_to_cpu(firmware->length);
+        firmware->start_address = le32_to_cpup((__le32 *)&firmware->start_address);
+        firmware->length = le32_to_cpup((__le32 *)&firmware->length);
 
         mem_address = firmware->start_address;
 
@@ -982,7 +982,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev,
         if (rc < 0)
                 goto exit_fw_download;
 
-        sms_err("sending MSG_SMS_DATA_VALIDITY_REQ expecting 0x%x",
+        sms_debug("sending MSG_SMS_DATA_VALIDITY_REQ expecting 0x%x",
                 calc_checksum);
         SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_VALIDITY_REQ,
                         sizeof(msg->x_msg_header) +
@@ -1562,7 +1562,7 @@ void smscore_onresponse(struct smscore_device_t *coredev,
                 {
                         struct sms_msg_data *validity = (struct sms_msg_data *) phdr;
 
-                        sms_err("MSG_SMS_DATA_VALIDITY_RES, checksum = 0x%x",
+                        sms_debug("MSG_SMS_DATA_VALIDITY_RES, checksum = 0x%x",
                                 validity->msg_data[0]);
                         complete(&coredev->data_validity_done);
                         break;
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index 63676a8b024c..85151efdd94c 100644
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -44,14 +44,14 @@ module_param_named(debug, sms_dbg, int, 0644);
 MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
 
 
-u32 sms_to_guard_interval_table[] = {
+static u32 sms_to_guard_interval_table[] = {
         [0] = GUARD_INTERVAL_1_32,
         [1] = GUARD_INTERVAL_1_16,
         [2] = GUARD_INTERVAL_1_8,
         [3] = GUARD_INTERVAL_1_4,
 };
 
-u32 sms_to_code_rate_table[] = {
+static u32 sms_to_code_rate_table[] = {
         [0] = FEC_1_2,
         [1] = FEC_2_3,
         [2] = FEC_3_4,
@@ -60,14 +60,14 @@ u32 sms_to_code_rate_table[] = {
 };
 
 
-u32 sms_to_hierarchy_table[] = {
+static u32 sms_to_hierarchy_table[] = {
         [0] = HIERARCHY_NONE,
         [1] = HIERARCHY_1,
         [2] = HIERARCHY_2,
         [3] = HIERARCHY_4,
 };
 
-u32 sms_to_modulation_table[] = {
+static u32 sms_to_modulation_table[] = {
         [0] = QPSK,
         [1] = QAM_16,
         [2] = QAM_64,
diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c
index 3485655fa082..58de4410c525 100644
--- a/drivers/media/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb-core/dvb_demux.c
@@ -476,7 +476,9 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
 void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
                               size_t count)
 {
-        spin_lock(&demux->lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&demux->lock, flags);
 
         while (count--) {
                 if (buf[0] == 0x47)
@@ -484,7 +486,7 @@ void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
                 buf += 188;
         }
 
-        spin_unlock(&demux->lock);
+        spin_unlock_irqrestore(&demux->lock, flags);
 }
 
 EXPORT_SYMBOL(dvb_dmx_swfilter_packets);
@@ -519,8 +521,9 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf,
 {
         int p = 0, i, j;
         const u8 *q;
+        unsigned long flags;
 
-        spin_lock(&demux->lock);
+        spin_lock_irqsave(&demux->lock, flags);
 
         if (demux->tsbufp) { /* tsbuf[0] is now 0x47. */
                 i = demux->tsbufp;
@@ -564,7 +567,7 @@ static inline void _dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf,
         }
 
 bailout:
-        spin_unlock(&demux->lock);
+        spin_unlock_irqrestore(&demux->lock, flags);
 }
 
 void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count)
@@ -581,11 +584,13 @@ EXPORT_SYMBOL(dvb_dmx_swfilter_204);
 
 void dvb_dmx_swfilter_raw(struct dvb_demux *demux, const u8 *buf, size_t count)
 {
-        spin_lock(&demux->lock);
+        unsigned long flags;
+
+        spin_lock_irqsave(&demux->lock, flags);
 
         demux->feed->cb.ts(buf, count, NULL, 0, &demux->feed->feed.ts, DMX_OK);
 
-        spin_unlock(&demux->lock);
+        spin_unlock_irqrestore(&demux->lock, flags);
 }
 EXPORT_SYMBOL(dvb_dmx_swfilter_raw);
 
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 0e2ec6f73b05..bddbab43a2df 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -200,6 +200,13 @@ config DVB_CX24116
         help
           A DVB-S/S2 tuner module. Say Y when you want to support this frontend.
 
+config DVB_CX24117
+        tristate "Conexant CX24117 based"
+        depends on DVB_CORE && I2C
+        default m if !MEDIA_SUBDRV_AUTOSELECT
+        help
+          A Dual DVB-S/S2 tuner module. Say Y when you want to support this frontend.
+
 config DVB_SI21XX
         tristate "Silicon Labs SI21XX based"
         depends on DVB_CORE && I2C
diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile
index cebc0faffab5..f9cb43d9aed9 100644
--- a/drivers/media/dvb-frontends/Makefile
+++ b/drivers/media/dvb-frontends/Makefile
@@ -76,6 +76,7 @@ obj-$(CONFIG_DVB_ATBM8830) += atbm8830.o
 obj-$(CONFIG_DVB_DUMMY_FE) += dvb_dummy_fe.o
 obj-$(CONFIG_DVB_AF9013) += af9013.o
 obj-$(CONFIG_DVB_CX24116) += cx24116.o
+obj-$(CONFIG_DVB_CX24117) += cx24117.o
 obj-$(CONFIG_DVB_SI21XX) += si21xx.o
 obj-$(CONFIG_DVB_STV0288) += stv0288.o
 obj-$(CONFIG_DVB_STB6000) += stb6000.o
diff --git a/drivers/media/dvb-frontends/af9013.c b/drivers/media/dvb-frontends/af9013.c
index a204f2828820..fb504f1e9125 100644
--- a/drivers/media/dvb-frontends/af9013.c
+++ b/drivers/media/dvb-frontends/af9013.c
@@ -24,6 +24,9 @@
 
 #include "af9013_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 struct af9013_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend fe;
@@ -50,16 +53,23 @@ static int af9013_wr_regs_i2c(struct af9013_state *priv, u8 mbox, u16 reg,
         const u8 *val, int len)
 {
         int ret;
-        u8 buf[3+len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->config.i2c_addr,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = 3 + len,
                         .buf = buf,
                 }
         };
 
+        if (3 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = (reg >> 8) & 0xff;
         buf[1] = (reg >> 0) & 0xff;
         buf[2] = mbox;
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index a777b4b944eb..30ee59052157 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -21,6 +21,9 @@
 
 #include "af9033_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 struct af9033_state {
         struct i2c_adapter *i2c;
         struct dvb_frontend fe;
@@ -40,16 +43,23 @@ static int af9033_wr_regs(struct af9033_state *state, u32 reg, const u8 *val,
                 int len)
 {
         int ret;
-        u8 buf[3 + len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = state->cfg.i2c_addr,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = 3 + len,
                         .buf = buf,
                 }
         };
 
+        if (3 + len > sizeof(buf)) {
+                dev_warn(&state->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = (reg >> 16) & 0xff;
         buf[1] = (reg >>  8) & 0xff;
         buf[2] = (reg >>  0) & 0xff;
@@ -161,7 +171,14 @@ static int af9033_wr_reg_val_tab(struct af9033_state *state,
                 const struct reg_val *tab, int tab_len)
 {
         int ret, i, j;
-        u8 buf[tab_len];
+        u8 buf[MAX_XFER_SIZE];
+
+        if (tab_len > sizeof(buf)) {
+                dev_warn(&state->i2c->dev,
+                         "%s: i2c wr len=%d is too big!\n",
+                         KBUILD_MODNAME, tab_len);
+                return -EINVAL;
+        }
 
         dev_dbg(&state->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);
 
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c
index 1b77909c0c71..39a29dd29519 100644
--- a/drivers/media/dvb-frontends/bcm3510.c
+++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -44,6 +44,9 @@
 #include "bcm3510.h"
 #include "bcm3510_priv.h"
 
+/* Max transfer size done by bcm3510_do_hab_cmd() function */
+#define MAX_XFER_SIZE   128
+
 struct bcm3510_state {
 
         struct i2c_adapter* i2c;
@@ -201,9 +204,19 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len)
 
 static int bcm3510_do_hab_cmd(struct bcm3510_state *st, u8 cmd, u8 msgid, u8 *obuf, u8 olen, u8 *ibuf, u8 ilen)
 {
-        u8 ob[olen+2],ib[ilen+2];
+        u8 ob[MAX_XFER_SIZE], ib[MAX_XFER_SIZE];
         int ret = 0;
 
+        if (ilen + 2 > sizeof(ib)) {
+                deb_hab("do_hab_cmd: ilen=%d is too big!\n", ilen);
+                return -EINVAL;
+        }
+
+        if (olen + 2 > sizeof(ob)) {
+                deb_hab("do_hab_cmd: olen=%d is too big!\n", olen);
+                return -EINVAL;
+        }
+
         ob[0] = cmd;
         ob[1] = msgid;
         memcpy(&ob[2],obuf,olen);
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index 0cd6927e654c..95b981cd7115 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -378,7 +378,7 @@ static int cx24110_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
                 return cx24110_writereg(state,0x76,(cx24110_readreg(state,0x76)&0x3b)|0x40);
         default:
                 return -EINVAL;
-        };
+        }
 }
 
 static int cx24110_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
new file mode 100644
index 000000000000..476b422ccf19
--- /dev/null
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -0,0 +1,1650 @@
+/*
+    Conexant cx24117/cx24132 - Dual DVBS/S2 Satellite demod/tuner driver
+
+    Copyright (C) 2013 Luis Alves <ljalvs@gmail.com>
+        July, 6th 2013
+            First release based on cx24116 driver by:
+            Steven Toth and Georg Acher, Darron Broad, Igor Liplianin
+            Cards currently supported:
+                TBS6980 - Dual DVBS/S2 PCIe card
+                TBS6981 - Dual DVBS/S2 PCIe card
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/slab.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/firmware.h>
+
+#include "tuner-i2c.h"
+#include "dvb_frontend.h"
+#include "cx24117.h"
+
+
+#define CX24117_DEFAULT_FIRMWARE "dvb-fe-cx24117.fw"
+#define CX24117_SEARCH_RANGE_KHZ 5000
+
+/* known registers */
+#define CX24117_REG_COMMAND      (0x00)      /* command buffer */
+#define CX24117_REG_EXECUTE      (0x1f)      /* execute command */
+
+#define CX24117_REG_FREQ3_0      (0x34)      /* frequency */
+#define CX24117_REG_FREQ2_0      (0x35)
+#define CX24117_REG_FREQ1_0      (0x36)
+#define CX24117_REG_STATE0       (0x39)
+#define CX24117_REG_SSTATUS0     (0x3a)      /* demod0 signal high / status */
+#define CX24117_REG_SIGNAL0      (0x3b)
+#define CX24117_REG_FREQ5_0      (0x3c)      /* +-freq */
+#define CX24117_REG_FREQ6_0      (0x3d)
+#define CX24117_REG_SRATE2_0     (0x3e)      /* +- 1000 * srate */
+#define CX24117_REG_SRATE1_0     (0x3f)
+#define CX24117_REG_QUALITY2_0   (0x40)
+#define CX24117_REG_QUALITY1_0   (0x41)
+
+#define CX24117_REG_BER4_0       (0x47)
+#define CX24117_REG_BER3_0       (0x48)
+#define CX24117_REG_BER2_0       (0x49)
+#define CX24117_REG_BER1_0       (0x4a)
+#define CX24117_REG_DVBS_UCB2_0  (0x4b)
+#define CX24117_REG_DVBS_UCB1_0  (0x4c)
+#define CX24117_REG_DVBS2_UCB2_0 (0x50)
+#define CX24117_REG_DVBS2_UCB1_0 (0x51)
+#define CX24117_REG_QSTATUS0     (0x93)
+#define CX24117_REG_CLKDIV0      (0xe6)
+#define CX24117_REG_RATEDIV0     (0xf0)
+
+
+#define CX24117_REG_FREQ3_1      (0x55)      /* frequency */
+#define CX24117_REG_FREQ2_1      (0x56)
+#define CX24117_REG_FREQ1_1      (0x57)
+#define CX24117_REG_STATE1       (0x5a)
+#define CX24117_REG_SSTATUS1     (0x5b)      /* demod1 signal high / status */
+#define CX24117_REG_SIGNAL1      (0x5c)
+#define CX24117_REG_FREQ5_1      (0x5d)      /* +- freq */
+#define CX24117_REG_FREQ4_1      (0x5e)
+#define CX24117_REG_SRATE2_1     (0x5f)
+#define CX24117_REG_SRATE1_1     (0x60)
+#define CX24117_REG_QUALITY2_1   (0x61)
+#define CX24117_REG_QUALITY1_1   (0x62)
+#define CX24117_REG_BER4_1       (0x68)
+#define CX24117_REG_BER3_1       (0x69)
+#define CX24117_REG_BER2_1       (0x6a)
+#define CX24117_REG_BER1_1       (0x6b)
+#define CX24117_REG_DVBS_UCB2_1  (0x6c)
+#define CX24117_REG_DVBS_UCB1_1  (0x6d)
+#define CX24117_REG_DVBS2_UCB2_1 (0x71)
+#define CX24117_REG_DVBS2_UCB1_1 (0x72)
+#define CX24117_REG_QSTATUS1     (0x9f)
+#define CX24117_REG_CLKDIV1      (0xe7)
+#define CX24117_REG_RATEDIV1     (0xf1)
+
+
+/* arg buffer size */
+#define CX24117_ARGLEN       (0x1e)
+
+/* rolloff */
+#define CX24117_ROLLOFF_020  (0x00)
+#define CX24117_ROLLOFF_025  (0x01)
+#define CX24117_ROLLOFF_035  (0x02)
+
+/* pilot bit */
+#define CX24117_PILOT_OFF    (0x00)
+#define CX24117_PILOT_ON     (0x40)
+#define CX24117_PILOT_AUTO   (0x80)
+
+/* signal status */
+#define CX24117_HAS_SIGNAL   (0x01)
+#define CX24117_HAS_CARRIER  (0x02)
+#define CX24117_HAS_VITERBI  (0x04)
+#define CX24117_HAS_SYNCLOCK (0x08)
+#define CX24117_STATUS_MASK  (0x0f)
+#define CX24117_SIGNAL_MASK  (0xc0)
+
+
+/* arg offset for DiSEqC */
+#define CX24117_DISEQC_DEMOD  (1)
+#define CX24117_DISEQC_BURST  (2)
+#define CX24117_DISEQC_ARG3_2 (3)   /* unknown value=2 */
+#define CX24117_DISEQC_ARG4_0 (4)   /* unknown value=0 */
+#define CX24117_DISEQC_ARG5_0 (5)   /* unknown value=0 */
+#define CX24117_DISEQC_MSGLEN (6)
+#define CX24117_DISEQC_MSGOFS (7)
+
+/* DiSEqC burst */
+#define CX24117_DISEQC_MINI_A (0)
+#define CX24117_DISEQC_MINI_B (1)
+
+
+#define CX24117_PNE     (0) /* 0 disabled / 2 enabled */
+#define CX24117_OCC     (1) /* 0 disabled / 1 enabled */
+
+
+enum cmds {
+        CMD_SET_VCO     = 0x10,
+        CMD_TUNEREQUEST = 0x11,
+        CMD_MPEGCONFIG  = 0x13,
+        CMD_TUNERINIT   = 0x14,
+        CMD_LNBSEND     = 0x21, /* Formerly CMD_SEND_DISEQC */
+        CMD_LNBDCLEVEL  = 0x22,
+        CMD_SET_TONE    = 0x23,
+        CMD_UPDFWVERS   = 0x35,
+        CMD_TUNERSLEEP  = 0x36,
+};
+
+static LIST_HEAD(hybrid_tuner_instance_list);
+static DEFINE_MUTEX(cx24117_list_mutex);
+
+/* The Demod/Tuner can't easily provide these, we cache them */
+struct cx24117_tuning {
+        u32 frequency;
+        u32 symbol_rate;
+        fe_spectral_inversion_t inversion;
+        fe_code_rate_t fec;
+
+        fe_delivery_system_t delsys;
+        fe_modulation_t modulation;
+        fe_pilot_t pilot;
+        fe_rolloff_t rolloff;
+
+        /* Demod values */
+        u8 fec_val;
+        u8 fec_mask;
+        u8 inversion_val;
+        u8 pilot_val;
+        u8 rolloff_val;
+};
+
+/* Basic commands that are sent to the firmware */
+struct cx24117_cmd {
+        u8 len;
+        u8 args[CX24117_ARGLEN];
+};
+
+/* common to both fe's */
+struct cx24117_priv {
+        u8 demod_address;
+        struct i2c_adapter *i2c;
+        u8 skip_fw_load;
+        struct mutex fe_lock;
+
+        /* Used for sharing this struct between demods */
+        struct tuner_i2c_props i2c_props;
+        struct list_head hybrid_tuner_instance_list;
+};
+
+/* one per each fe */
+struct cx24117_state {
+        struct cx24117_priv *priv;
+        struct dvb_frontend frontend;
+
+        struct cx24117_tuning dcur;
+        struct cx24117_tuning dnxt;
+        struct cx24117_cmd dsec_cmd;
+
+        int demod;
+};
+
+/* modfec (modulation and FEC) lookup table */
+/* Check cx24116.c for a detailed description of each field */
+static struct cx24117_modfec {
+        fe_delivery_system_t delivery_system;
+        fe_modulation_t modulation;
+        fe_code_rate_t fec;
+        u8 mask;        /* In DVBS mode this is used to autodetect */
+        u8 val;         /* Passed to the firmware to indicate mode selection */
+} cx24117_modfec_modes[] = {
+        /* QPSK. For unknown rates we set hardware to auto detect 0xfe 0x30 */
+
+        /*mod   fec       mask  val */
+        { SYS_DVBS, QPSK, FEC_NONE, 0xfe, 0x30 },
+        { SYS_DVBS, QPSK, FEC_1_2,  0x02, 0x2e }, /* 00000010 00101110 */
+        { SYS_DVBS, QPSK, FEC_2_3,  0x04, 0x2f }, /* 00000100 00101111 */
+        { SYS_DVBS, QPSK, FEC_3_4,  0x08, 0x30 }, /* 00001000 00110000 */
+        { SYS_DVBS, QPSK, FEC_4_5,  0xfe, 0x30 }, /* 000?0000 ?        */
+        { SYS_DVBS, QPSK, FEC_5_6,  0x20, 0x31 }, /* 00100000 00110001 */
+        { SYS_DVBS, QPSK, FEC_6_7,  0xfe, 0x30 }, /* 0?000000 ?        */
+        { SYS_DVBS, QPSK, FEC_7_8,  0x80, 0x32 }, /* 10000000 00110010 */
+        { SYS_DVBS, QPSK, FEC_8_9,  0xfe, 0x30 }, /* 0000000? ?        */
+        { SYS_DVBS, QPSK, FEC_AUTO, 0xfe, 0x30 },
+        /* NBC-QPSK */
+        { SYS_DVBS2, QPSK, FEC_NONE, 0x00, 0x00 },
+        { SYS_DVBS2, QPSK, FEC_1_2,  0x00, 0x04 },
+        { SYS_DVBS2, QPSK, FEC_3_5,  0x00, 0x05 },
+        { SYS_DVBS2, QPSK, FEC_2_3,  0x00, 0x06 },
+        { SYS_DVBS2, QPSK, FEC_3_4,  0x00, 0x07 },
+        { SYS_DVBS2, QPSK, FEC_4_5,  0x00, 0x08 },
+        { SYS_DVBS2, QPSK, FEC_5_6,  0x00, 0x09 },
+        { SYS_DVBS2, QPSK, FEC_8_9,  0x00, 0x0a },
+        { SYS_DVBS2, QPSK, FEC_9_10, 0x00, 0x0b },
+        { SYS_DVBS2, QPSK, FEC_AUTO, 0x00, 0x00 },
+        /* 8PSK */
+        { SYS_DVBS2, PSK_8, FEC_NONE, 0x00, 0x00 },
+        { SYS_DVBS2, PSK_8, FEC_3_5,  0x00, 0x0c },
+        { SYS_DVBS2, PSK_8, FEC_2_3,  0x00, 0x0d },
+        { SYS_DVBS2, PSK_8, FEC_3_4,  0x00, 0x0e },
+        { SYS_DVBS2, PSK_8, FEC_5_6,  0x00, 0x0f },
+        { SYS_DVBS2, PSK_8, FEC_8_9,  0x00, 0x10 },
+        { SYS_DVBS2, PSK_8, FEC_9_10, 0x00, 0x11 },
+        { SYS_DVBS2, PSK_8, FEC_AUTO, 0x00, 0x00 },
+        /*
+         * 'val' can be found in the FECSTATUS register when tuning.
+         * FECSTATUS will give the actual FEC in use if tuning was successful.
+         */
+};
+
+
+static int cx24117_writereg(struct cx24117_state *state, u8 reg, u8 data)
+{
+        u8 buf[] = { reg, data };
+        struct i2c_msg msg = { .addr = state->priv->demod_address,
+                .flags = 0, .buf = buf, .len = 2 };
+        int ret;
+
+        dev_dbg(&state->priv->i2c->dev,
+                        "%s() demod%d i2c wr @0x%02x=0x%02x\n",
+                        __func__, state->demod, reg, data);
+
+        ret = i2c_transfer(state->priv->i2c, &msg, 1);
+        if (ret < 0) {
+                dev_warn(&state->priv->i2c->dev,
+                        "%s: demod%d i2c wr err(%i) @0x%02x=0x%02x\n",
+                        KBUILD_MODNAME, state->demod, ret, reg, data);
+                return ret;
+        }
+        return 0;
+}
+
+static int cx24117_writecmd(struct cx24117_state *state,
+        struct cx24117_cmd *cmd)
+{
+        struct i2c_msg msg;
+        u8 buf[CX24117_ARGLEN+1];
+        int ret;
+
+        dev_dbg(&state->priv->i2c->dev,
+                        "%s() demod%d i2c wr cmd len=%d\n",
+                        __func__, state->demod, cmd->len);
+
+        buf[0] = CX24117_REG_COMMAND;
+        memcpy(&buf[1], cmd->args, cmd->len);
+
+        msg.addr = state->priv->demod_address;
+        msg.flags = 0;
+        msg.len = cmd->len+1;
+        msg.buf = buf;
+        ret = i2c_transfer(state->priv->i2c, &msg, 1);
+        if (ret < 0) {
+                dev_warn(&state->priv->i2c->dev,
+                        "%s: demod%d i2c wr cmd err(%i) len=%d\n",
+                        KBUILD_MODNAME, state->demod, ret, cmd->len);
+                return ret;
+        }
+        return 0;
+}
+
+static int cx24117_readreg(struct cx24117_state *state, u8 reg)
+{
+        int ret;
+        u8 recv = 0;
+        struct i2c_msg msg[] = {
+                { .addr = state->priv->demod_address, .flags = 0,
+                        .buf = &reg, .len = 1 },
+                { .addr = state->priv->demod_address, .flags = I2C_M_RD,
+                        .buf = &recv, .len = 1 }
+        };
+
+        ret = i2c_transfer(state->priv->i2c, msg, 2);
+        if (ret < 0) {
+                dev_warn(&state->priv->i2c->dev,
+                        "%s: demod%d i2c rd err(%d) @0x%x\n",
+                        KBUILD_MODNAME, state->demod, ret, reg);
+                return ret;
+        }
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d i2c rd @0x%02x=0x%02x\n",
+                __func__, state->demod, reg, recv);
+
+        return recv;
+}
+
+static int cx24117_readregN(struct cx24117_state *state,
+        u8 reg, u8 *buf, int len)
+{
+        int ret;
+        struct i2c_msg msg[] = {
+                { .addr = state->priv->demod_address, .flags = 0,
+                        .buf = &reg, .len = 1 },
+                { .addr = state->priv->demod_address, .flags = I2C_M_RD,
+                        .buf = buf, .len = len }
+        };
+
+        ret = i2c_transfer(state->priv->i2c, msg, 2);
+        if (ret < 0) {
+                dev_warn(&state->priv->i2c->dev,
+                        "%s: demod%d i2c rd err(%d) @0x%x\n",
+                        KBUILD_MODNAME, state->demod, ret, reg);
+                return ret;
+        }
+        return 0;
+}
+
+static int cx24117_set_inversion(struct cx24117_state *state,
+        fe_spectral_inversion_t inversion)
+{
+        dev_dbg(&state->priv->i2c->dev, "%s(%d) demod%d\n",
+                __func__, inversion, state->demod);
+
+        switch (inversion) {
+        case INVERSION_OFF:
+                state->dnxt.inversion_val = 0x00;
+                break;
+        case INVERSION_ON:
+                state->dnxt.inversion_val = 0x04;
+                break;
+        case INVERSION_AUTO:
+                state->dnxt.inversion_val = 0x0C;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        state->dnxt.inversion = inversion;
+
+        return 0;
+}
+
+static int cx24117_lookup_fecmod(struct cx24117_state *state,
+        fe_delivery_system_t d, fe_modulation_t m, fe_code_rate_t f)
+{
+        int i, ret = -EINVAL;
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s(demod(0x%02x,0x%02x) demod%d\n",
+                __func__, m, f, state->demod);
+
+        for (i = 0; i < ARRAY_SIZE(cx24117_modfec_modes); i++) {
+                if ((d == cx24117_modfec_modes[i].delivery_system) &&
+                        (m == cx24117_modfec_modes[i].modulation) &&
+                        (f == cx24117_modfec_modes[i].fec)) {
+                                ret = i;
+                                break;
+                        }
+        }
+
+        return ret;
+}
+
+static int cx24117_set_fec(struct cx24117_state *state,
+        fe_delivery_system_t delsys, fe_modulation_t mod, fe_code_rate_t fec)
+{
+        int ret;
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s(0x%02x,0x%02x) demod%d\n",
+                __func__, mod, fec, state->demod);
+
+        ret = cx24117_lookup_fecmod(state, delsys, mod, fec);
+        if (ret < 0)
+                return ret;
+
+        state->dnxt.fec = fec;
+        state->dnxt.fec_val = cx24117_modfec_modes[ret].val;
+        state->dnxt.fec_mask = cx24117_modfec_modes[ret].mask;
+        dev_dbg(&state->priv->i2c->dev,
+                "%s() demod%d mask/val = 0x%02x/0x%02x\n", __func__,
+                state->demod, state->dnxt.fec_mask, state->dnxt.fec_val);
+
+        return 0;
+}
+
+static int cx24117_set_symbolrate(struct cx24117_state *state, u32 rate)
+{
+        dev_dbg(&state->priv->i2c->dev, "%s(%d) demod%d\n",
+                __func__, rate, state->demod);
+
+        state->dnxt.symbol_rate = rate;
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s() demod%d symbol_rate = %d\n",
+                __func__, state->demod, rate);
+
+        return 0;
+}
+
+static int cx24117_load_firmware(struct dvb_frontend *fe,
+        const struct firmware *fw);
+
+static int cx24117_firmware_ondemand(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        const struct firmware *fw;
+        int ret = 0;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d skip_fw_load=%d\n",
+                __func__, state->demod, state->priv->skip_fw_load);
+
+        if (state->priv->skip_fw_load)
+                return 0;
+
+        /* check if firmware if already running */
+        if (cx24117_readreg(state, 0xeb) != 0xa) {
+                /* Load firmware */
+                /* request the firmware, this will block until loaded */
+                dev_dbg(&state->priv->i2c->dev,
+                        "%s: Waiting for firmware upload (%s)...\n",
+                        __func__, CX24117_DEFAULT_FIRMWARE);
+                ret = request_firmware(&fw, CX24117_DEFAULT_FIRMWARE,
+                        state->priv->i2c->dev.parent);
+                dev_dbg(&state->priv->i2c->dev,
+                        "%s: Waiting for firmware upload(2)...\n", __func__);
+                if (ret) {
+                        dev_err(&state->priv->i2c->dev,
+                                "%s: No firmware uploaded "
+                                "(timeout or file not found?)\n", __func__);
+                        return ret;
+                }
+
+                /* Make sure we don't recurse back through here
+                 * during loading */
+                state->priv->skip_fw_load = 1;
+
+                ret = cx24117_load_firmware(fe, fw);
+                if (ret)
+                        dev_err(&state->priv->i2c->dev,
+                                "%s: Writing firmware failed\n", __func__);
+                release_firmware(fw);
+
+                dev_info(&state->priv->i2c->dev,
+                        "%s: Firmware upload %s\n", __func__,
+                        ret == 0 ? "complete" : "failed");
+
+                /* Ensure firmware is always loaded if required */
+                state->priv->skip_fw_load = 0;
+        }
+
+        return ret;
+}
+
+/* Take a basic firmware command structure, format it
+ * and forward it for processing
+ */
+static int cx24117_cmd_execute_nolock(struct dvb_frontend *fe,
+        struct cx24117_cmd *cmd)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int i, ret;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d\n",
+                __func__, state->demod);
+
+        /* Load the firmware if required */
+        ret = cx24117_firmware_ondemand(fe);
+        if (ret != 0)
+                return ret;
+
+        /* Write the command */
+        cx24117_writecmd(state, cmd);
+
+        /* Start execution and wait for cmd to terminate */
+        cx24117_writereg(state, CX24117_REG_EXECUTE, 0x01);
+        i = 0;
+        while (cx24117_readreg(state, CX24117_REG_EXECUTE)) {
+                msleep(20);
+                if (i++ > 40) {
+                        /* Avoid looping forever if the firmware does
+                                not respond */
+                        dev_warn(&state->priv->i2c->dev,
+                                "%s() Firmware not responding\n", __func__);
+                        return -EIO;
+                }
+        }
+        return 0;
+}
+
+static int cx24117_cmd_execute(struct dvb_frontend *fe, struct cx24117_cmd *cmd)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int ret;
+
+        mutex_lock(&state->priv->fe_lock);
+        ret = cx24117_cmd_execute_nolock(fe, cmd);
+        mutex_unlock(&state->priv->fe_lock);
+
+        return ret;
+}
+
+static int cx24117_load_firmware(struct dvb_frontend *fe,
+        const struct firmware *fw)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct cx24117_cmd cmd;
+        int i, ret;
+        unsigned char vers[4];
+
+        struct i2c_msg msg;
+        u8 *buf;
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s() demod%d FW is %zu bytes (%02x %02x .. %02x %02x)\n",
+                __func__, state->demod, fw->size, fw->data[0], fw->data[1],
+                fw->data[fw->size - 2], fw->data[fw->size - 1]);
+
+        cx24117_writereg(state, 0xea, 0x00);
+        cx24117_writereg(state, 0xea, 0x01);
+        cx24117_writereg(state, 0xea, 0x00);
+
+        cx24117_writereg(state, 0xce, 0x92);
+
+        cx24117_writereg(state, 0xfb, 0x00);
+        cx24117_writereg(state, 0xfc, 0x00);
+
+        cx24117_writereg(state, 0xc3, 0x04);
+        cx24117_writereg(state, 0xc4, 0x04);
+
+        cx24117_writereg(state, 0xce, 0x00);
+        cx24117_writereg(state, 0xcf, 0x00);
+
+        cx24117_writereg(state, 0xea, 0x00);
+        cx24117_writereg(state, 0xeb, 0x0c);
+        cx24117_writereg(state, 0xec, 0x06);
+        cx24117_writereg(state, 0xed, 0x05);
+        cx24117_writereg(state, 0xee, 0x03);
+        cx24117_writereg(state, 0xef, 0x05);
+
+        cx24117_writereg(state, 0xf3, 0x03);
+        cx24117_writereg(state, 0xf4, 0x44);
+
+        cx24117_writereg(state, CX24117_REG_RATEDIV0, 0x04);
+        cx24117_writereg(state, CX24117_REG_CLKDIV0, 0x02);
+
+        cx24117_writereg(state, CX24117_REG_RATEDIV1, 0x04);
+        cx24117_writereg(state, CX24117_REG_CLKDIV1, 0x02);
+
+        cx24117_writereg(state, 0xf2, 0x04);
+        cx24117_writereg(state, 0xe8, 0x02);
+        cx24117_writereg(state, 0xea, 0x01);
+        cx24117_writereg(state, 0xc8, 0x00);
+        cx24117_writereg(state, 0xc9, 0x00);
+        cx24117_writereg(state, 0xca, 0x00);
+        cx24117_writereg(state, 0xcb, 0x00);
+        cx24117_writereg(state, 0xcc, 0x00);
+        cx24117_writereg(state, 0xcd, 0x00);
+        cx24117_writereg(state, 0xe4, 0x03);
+        cx24117_writereg(state, 0xeb, 0x0a);
+
+        cx24117_writereg(state, 0xfb, 0x00);
+        cx24117_writereg(state, 0xe0, 0x76);
+        cx24117_writereg(state, 0xf7, 0x81);
+        cx24117_writereg(state, 0xf8, 0x00);
+        cx24117_writereg(state, 0xf9, 0x00);
+
+        buf = kmalloc(fw->size + 1, GFP_KERNEL);
+        if (buf == NULL) {
+                state->priv->skip_fw_load = 0;
+                return -ENOMEM;
+        }
+
+        /* fw upload reg */
+        buf[0] = 0xfa;
+        memcpy(&buf[1], fw->data, fw->size);
+
+        /* prepare i2c message to send */
+        msg.addr = state->priv->demod_address;
+        msg.flags = 0;
+        msg.len = fw->size + 1;
+        msg.buf = buf;
+
+        /* send fw */
+        ret = i2c_transfer(state->priv->i2c, &msg, 1);
+        if (ret < 0)
+                return ret;
+
+        kfree(buf);
+
+        cx24117_writereg(state, 0xf7, 0x0c);
+        cx24117_writereg(state, 0xe0, 0x00);
+
+        /* CMD 1B */
+        cmd.args[0] = 0x1b;
+        cmd.args[1] = 0x00;
+        cmd.args[2] = 0x01;
+        cmd.args[3] = 0x00;
+        cmd.len = 4;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+        if (ret != 0)
+                goto error;
+
+        /* CMD 10 */
+        cmd.args[0] = CMD_SET_VCO;
+        cmd.args[1] = 0x06;
+        cmd.args[2] = 0x2b;
+        cmd.args[3] = 0xd8;
+        cmd.args[4] = 0xa5;
+        cmd.args[5] = 0xee;
+        cmd.args[6] = 0x03;
+        cmd.args[7] = 0x9d;
+        cmd.args[8] = 0xfc;
+        cmd.args[9] = 0x06;
+        cmd.args[10] = 0x02;
+        cmd.args[11] = 0x9d;
+        cmd.args[12] = 0xfc;
+        cmd.len = 13;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+        if (ret != 0)
+                goto error;
+
+        /* CMD 15 */
+        cmd.args[0] = 0x15;
+        cmd.args[1] = 0x00;
+        cmd.args[2] = 0x01;
+        cmd.args[3] = 0x00;
+        cmd.args[4] = 0x00;
+        cmd.args[5] = 0x01;
+        cmd.args[6] = 0x01;
+        cmd.args[7] = 0x01;
+        cmd.args[8] = 0x00;
+        cmd.args[9] = 0x05;
+        cmd.args[10] = 0x02;
+        cmd.args[11] = 0x02;
+        cmd.args[12] = 0x00;
+        cmd.len = 13;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+        if (ret != 0)
+                goto error;
+
+        /* CMD 13 */
+        cmd.args[0] = CMD_MPEGCONFIG;
+        cmd.args[1] = 0x00;
+        cmd.args[2] = 0x00;
+        cmd.args[3] = 0x00;
+        cmd.args[4] = 0x01;
+        cmd.args[5] = 0x00;
+        cmd.len = 6;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+        if (ret != 0)
+                goto error;
+
+        /* CMD 14 */
+        for (i = 0; i < 2; i++) {
+                cmd.args[0] = CMD_TUNERINIT;
+                cmd.args[1] = (u8) i;
+                cmd.args[2] = 0x00;
+                cmd.args[3] = 0x05;
+                cmd.args[4] = 0x00;
+                cmd.args[5] = 0x00;
+                cmd.args[6] = 0x55;
+                cmd.args[7] = 0x00;
+                cmd.len = 8;
+                ret = cx24117_cmd_execute_nolock(fe, &cmd);
+                if (ret != 0)
+                        goto error;
+        }
+
+        cx24117_writereg(state, 0xce, 0xc0);
+        cx24117_writereg(state, 0xcf, 0x00);
+        cx24117_writereg(state, 0xe5, 0x04);
+
+        /* Firmware CMD 35: Get firmware version */
+        cmd.args[0] = CMD_UPDFWVERS;
+        cmd.len = 2;
+        for (i = 0; i < 4; i++) {
+                cmd.args[1] = i;
+                ret = cx24117_cmd_execute_nolock(fe, &cmd);
+                if (ret != 0)
+                        goto error;
+                vers[i] = cx24117_readreg(state, 0x33);
+        }
+        dev_info(&state->priv->i2c->dev,
+                "%s: FW version %i.%i.%i.%i\n", __func__,
+                vers[0], vers[1], vers[2], vers[3]);
+        return 0;
+error:
+        state->priv->skip_fw_load = 0;
+        dev_err(&state->priv->i2c->dev, "%s() Error running FW.\n", __func__);
+        return ret;
+}
+
+static int cx24117_read_status(struct dvb_frontend *fe, fe_status_t *status)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int lock;
+
+        lock = cx24117_readreg(state,
+                (state->demod == 0) ? CX24117_REG_SSTATUS0 :
+                                      CX24117_REG_SSTATUS1) &
+                CX24117_STATUS_MASK;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d status = 0x%02x\n",
+                __func__, state->demod, lock);
+
+        *status = 0;
+
+        if (lock & CX24117_HAS_SIGNAL)
+                *status |= FE_HAS_SIGNAL;
+        if (lock & CX24117_HAS_CARRIER)
+                *status |= FE_HAS_CARRIER;
+        if (lock & CX24117_HAS_VITERBI)
+                *status |= FE_HAS_VITERBI;
+        if (lock & CX24117_HAS_SYNCLOCK)
+                *status |= FE_HAS_SYNC | FE_HAS_LOCK;
+
+        return 0;
+}
+
+static int cx24117_read_ber(struct dvb_frontend *fe, u32 *ber)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int ret;
+        u8 buf[4];
+        u8 base_reg = (state->demod == 0) ?
+                        CX24117_REG_BER4_0 :
+                        CX24117_REG_BER4_1;
+
+        ret = cx24117_readregN(state, base_reg, buf, 4);
+        if (ret != 0)
+                return ret;
+
+        *ber = (buf[0] << 24) | (buf[1] << 16) |
+                (buf[1] << 8) | buf[0];
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d ber=0x%04x\n",
+                __func__, state->demod, *ber);
+
+        return 0;
+}
+
+static int cx24117_read_signal_strength(struct dvb_frontend *fe,
+        u16 *signal_strength)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct cx24117_cmd cmd;
+        int ret;
+        u16 sig_reading;
+        u8 buf[2];
+        u8 reg = (state->demod == 0) ?
+                CX24117_REG_SSTATUS0 : CX24117_REG_SSTATUS1;
+
+        /* Firmware CMD 1A */
+        cmd.args[0] = 0x1a;
+        cmd.args[1] = (u8) state->demod;
+        cmd.len = 2;
+        ret = cx24117_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        ret = cx24117_readregN(state, reg, buf, 2);
+        if (ret != 0)
+                return ret;
+        sig_reading = ((buf[0] & CX24117_SIGNAL_MASK) << 2) | buf[1];
+
+        *signal_strength = -100 * sig_reading + 94324;
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s() demod%d raw / cooked = 0x%04x / 0x%04x\n",
+                __func__, state->demod, sig_reading, *signal_strength);
+
+        return 0;
+}
+
+static int cx24117_read_snr(struct dvb_frontend *fe, u16 *snr)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int ret;
+        u8 buf[2];
+        u8 reg = (state->demod == 0) ?
+                CX24117_REG_QUALITY2_0 : CX24117_REG_QUALITY2_1;
+
+        ret = cx24117_readregN(state, reg, buf, 2);
+        if (ret != 0)
+                return ret;
+
+        *snr = (buf[0] << 8) | buf[1];
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s() demod%d snr = 0x%04x\n",
+                __func__, state->demod, *snr);
+
+        return ret;
+}
+
+static int cx24117_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        fe_delivery_system_t delsys = fe->dtv_property_cache.delivery_system;
+        int ret;
+        u8 buf[2];
+        u8 reg = (state->demod == 0) ?
+                CX24117_REG_DVBS_UCB2_0 :
+                CX24117_REG_DVBS_UCB2_1;
+
+        switch (delsys) {
+        case SYS_DVBS:
+                break;
+        case SYS_DVBS2:
+                reg += (CX24117_REG_DVBS2_UCB2_0 - CX24117_REG_DVBS_UCB2_0);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        ret = cx24117_readregN(state, reg, buf, 2);
+        if (ret != 0)
+                return ret;
+        *ucblocks = (buf[0] << 8) | buf[1];
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d ucb=0x%04x\n",
+                __func__, state->demod, *ucblocks);
+
+        return 0;
+}
+
+/* Overwrite the current tuning params, we are about to tune */
+static void cx24117_clone_params(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        state->dcur = state->dnxt;
+}
+
+/* Wait for LNB */
+static int cx24117_wait_for_lnb(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int i;
+        u8 val, reg = (state->demod == 0) ? CX24117_REG_QSTATUS0 :
+                                            CX24117_REG_QSTATUS1;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d qstatus = 0x%02x\n",
+                __func__, state->demod, cx24117_readreg(state, reg));
+
+        /* Wait for up to 300 ms */
+        for (i = 0; i < 10; i++) {
+                val = cx24117_readreg(state, reg) & 0x01;
+                if (val != 0)
+                        return 0;
+                msleep(30);
+        }
+
+        dev_warn(&state->priv->i2c->dev, "%s: demod%d LNB not ready\n",
+                KBUILD_MODNAME, state->demod);
+
+        return -ETIMEDOUT; /* -EBUSY ? */
+}
+
+static int cx24117_set_voltage(struct dvb_frontend *fe,
+        fe_sec_voltage_t voltage)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct cx24117_cmd cmd;
+        int ret;
+        u8 reg = (state->demod == 0) ? 0x10 : 0x20;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d %s\n",
+                __func__, state->demod,
+                voltage == SEC_VOLTAGE_13 ? "SEC_VOLTAGE_13" :
+                voltage == SEC_VOLTAGE_18 ? "SEC_VOLTAGE_18" :
+                "SEC_VOLTAGE_OFF");
+
+        /* CMD 32 */
+        cmd.args[0] = 0x32;
+        cmd.args[1] = reg;
+        cmd.args[2] = reg;
+        cmd.len = 3;
+        ret = cx24117_cmd_execute(fe, &cmd);
+        if (ret)
+                return ret;
+
+        if ((voltage == SEC_VOLTAGE_13) ||
+            (voltage == SEC_VOLTAGE_18)) {
+                /* CMD 33 */
+                cmd.args[0] = 0x33;
+                cmd.args[1] = reg;
+                cmd.args[2] = reg;
+                cmd.len = 3;
+                ret = cx24117_cmd_execute(fe, &cmd);
+                if (ret != 0)
+                        return ret;
+
+                ret = cx24117_wait_for_lnb(fe);
+                if (ret != 0)
+                        return ret;
+
+                /* Wait for voltage/min repeat delay */
+                msleep(100);
+
+                /* CMD 22 - CMD_LNBDCLEVEL */
+                cmd.args[0] = CMD_LNBDCLEVEL;
+                cmd.args[1] = state->demod ? 0 : 1;
+                cmd.args[2] = (voltage == SEC_VOLTAGE_18 ? 0x01 : 0x00);
+                cmd.len = 3;
+
+                /* Min delay time before DiSEqC send */
+                msleep(20);
+        } else {
+                cmd.args[0] = 0x33;
+                cmd.args[1] = 0x00;
+                cmd.args[2] = reg;
+                cmd.len = 3;
+        }
+
+        return cx24117_cmd_execute(fe, &cmd);
+}
+
+static int cx24117_set_tone(struct dvb_frontend *fe,
+        fe_sec_tone_mode_t tone)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct cx24117_cmd cmd;
+        int ret;
+
+        dev_dbg(&state->priv->i2c->dev, "%s(%d) demod%d\n",
+                __func__, state->demod, tone);
+        if ((tone != SEC_TONE_ON) && (tone != SEC_TONE_OFF)) {
+                dev_warn(&state->priv->i2c->dev, "%s: demod%d invalid tone=%d\n",
+                        KBUILD_MODNAME, state->demod, tone);
+                return -EINVAL;
+        }
+
+        /* Wait for LNB ready */
+        ret = cx24117_wait_for_lnb(fe);
+        if (ret != 0)
+                return ret;
+
+        /* Min delay time after DiSEqC send */
+        msleep(20);
+
+        /* Set the tone */
+        /* CMD 23 - CMD_SET_TONE */
+        cmd.args[0] = CMD_SET_TONE;
+        cmd.args[1] = (state->demod ? 0 : 1);
+        cmd.args[2] = 0x00;
+        cmd.args[3] = 0x00;
+        cmd.len = 5;
+        switch (tone) {
+        case SEC_TONE_ON:
+                cmd.args[4] = 0x01;
+                break;
+        case SEC_TONE_OFF:
+                cmd.args[4] = 0x00;
+                break;
+        }
+
+        msleep(20);
+
+        return cx24117_cmd_execute(fe, &cmd);
+}
+
+/* Initialise DiSEqC */
+static int cx24117_diseqc_init(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+
+        /* Prepare a DiSEqC command */
+        state->dsec_cmd.args[0] = CMD_LNBSEND;
+
+        /* demod */
+        state->dsec_cmd.args[CX24117_DISEQC_DEMOD] = state->demod ? 0 : 1;
+
+        /* DiSEqC burst */
+        state->dsec_cmd.args[CX24117_DISEQC_BURST] = CX24117_DISEQC_MINI_A;
+
+        /* Unknown */
+        state->dsec_cmd.args[CX24117_DISEQC_ARG3_2] = 0x02;
+        state->dsec_cmd.args[CX24117_DISEQC_ARG4_0] = 0x00;
+
+        /* Continuation flag? */
+        state->dsec_cmd.args[CX24117_DISEQC_ARG5_0] = 0x00;
+
+        /* DiSEqC message length */
+        state->dsec_cmd.args[CX24117_DISEQC_MSGLEN] = 0x00;
+
+        /* Command length */
+        state->dsec_cmd.len = 7;
+
+        return 0;
+}
+
+/* Send DiSEqC message */
+static int cx24117_send_diseqc_msg(struct dvb_frontend *fe,
+        struct dvb_diseqc_master_cmd *d)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        int i, ret;
+
+        /* Dump DiSEqC message */
+        dev_dbg(&state->priv->i2c->dev, "%s: demod %d (",
+                __func__, state->demod);
+        for (i = 0; i < d->msg_len; i++)
+                dev_dbg(&state->priv->i2c->dev, "0x%02x ", d->msg[i]);
+        dev_dbg(&state->priv->i2c->dev, ")\n");
+
+        /* Validate length */
+        if (d->msg_len > 15)
+                return -EINVAL;
+
+        /* DiSEqC message */
+        for (i = 0; i < d->msg_len; i++)
+                state->dsec_cmd.args[CX24117_DISEQC_MSGOFS + i] = d->msg[i];
+
+        /* DiSEqC message length */
+        state->dsec_cmd.args[CX24117_DISEQC_MSGLEN] = d->msg_len;
+
+        /* Command length */
+        state->dsec_cmd.len = CX24117_DISEQC_MSGOFS +
+                state->dsec_cmd.args[CX24117_DISEQC_MSGLEN];
+
+        /*
+         * Message is sent with derived else cached burst
+         *
+         * WRITE PORT GROUP COMMAND 38
+         *
+         * 0/A/A: E0 10 38 F0..F3
+         * 1/B/B: E0 10 38 F4..F7
+         * 2/C/A: E0 10 38 F8..FB
+         * 3/D/B: E0 10 38 FC..FF
+         *
+         * databyte[3]= 8421:8421
+         *              ABCD:WXYZ
+         *              CLR :SET
+         *
+         *              WX= PORT SELECT 0..3    (X=TONEBURST)
+         *              Y = VOLTAGE             (0=13V, 1=18V)
+         *              Z = BAND                (0=LOW, 1=HIGH(22K))
+         */
+        if (d->msg_len >= 4 && d->msg[2] == 0x38)
+                state->dsec_cmd.args[CX24117_DISEQC_BURST] =
+                        ((d->msg[3] & 4) >> 2);
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d burst=%d\n",
+                __func__, state->demod,
+                state->dsec_cmd.args[CX24117_DISEQC_BURST]);
+
+        /* Wait for LNB ready */
+        ret = cx24117_wait_for_lnb(fe);
+        if (ret != 0)
+                return ret;
+
+        /* Wait for voltage/min repeat delay */
+        msleep(100);
+
+        /* Command */
+        ret = cx24117_cmd_execute(fe, &state->dsec_cmd);
+        if (ret != 0)
+                return ret;
+        /*
+         * Wait for send
+         *
+         * Eutelsat spec:
+         * >15ms delay          + (XXX determine if FW does this, see set_tone)
+         *  13.5ms per byte     +
+         * >15ms delay          +
+         *  12.5ms burst        +
+         * >15ms delay            (XXX determine if FW does this, see set_tone)
+         */
+        msleep((state->dsec_cmd.args[CX24117_DISEQC_MSGLEN] << 4) + 60);
+
+        return 0;
+}
+
+/* Send DiSEqC burst */
+static int cx24117_diseqc_send_burst(struct dvb_frontend *fe,
+        fe_sec_mini_cmd_t burst)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+
+        dev_dbg(&state->priv->i2c->dev, "%s(%d) demod=%d\n",
+                __func__, burst, state->demod);
+
+        /* DiSEqC burst */
+        if (burst == SEC_MINI_A)
+                state->dsec_cmd.args[CX24117_DISEQC_BURST] =
+                        CX24117_DISEQC_MINI_A;
+        else if (burst == SEC_MINI_B)
+                state->dsec_cmd.args[CX24117_DISEQC_BURST] =
+                        CX24117_DISEQC_MINI_B;
+        else
+                return -EINVAL;
+
+        return 0;
+}
+
+static int cx24117_get_priv(struct cx24117_priv **priv,
+        struct i2c_adapter *i2c, u8 client_address)
+{
+        int ret;
+
+        mutex_lock(&cx24117_list_mutex);
+        ret = hybrid_tuner_request_state(struct cx24117_priv, (*priv),
+                hybrid_tuner_instance_list, i2c, client_address, "cx24117");
+        mutex_unlock(&cx24117_list_mutex);
+
+        return ret;
+}
+
+static void cx24117_release_priv(struct cx24117_priv *priv)
+{
+        mutex_lock(&cx24117_list_mutex);
+        if (priv != NULL)
+                hybrid_tuner_release_state(priv);
+        mutex_unlock(&cx24117_list_mutex);
+}
+
+static void cx24117_release(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        dev_dbg(&state->priv->i2c->dev, "%s demod%d\n",
+                __func__, state->demod);
+        cx24117_release_priv(state->priv);
+        kfree(state);
+}
+
+static struct dvb_frontend_ops cx24117_ops;
+
+struct dvb_frontend *cx24117_attach(const struct cx24117_config *config,
+        struct i2c_adapter *i2c)
+{
+        struct cx24117_state *state = NULL;
+        struct cx24117_priv *priv = NULL;
+        int demod = 0;
+
+        /* get the common data struct for both demods */
+        demod = cx24117_get_priv(&priv, i2c, config->demod_address);
+
+        switch (demod) {
+        case 0:
+                dev_err(&state->priv->i2c->dev,
+                        "%s: Error attaching frontend %d\n",
+                        KBUILD_MODNAME, demod);
+                goto error1;
+                break;
+        case 1:
+                /* new priv instance */
+                priv->i2c = i2c;
+                priv->demod_address = config->demod_address;
+                mutex_init(&priv->fe_lock);
+                break;
+        default:
+                /* existing priv instance */
+                break;
+        }
+
+        /* allocate memory for the internal state */
+        state = kzalloc(sizeof(struct cx24117_state), GFP_KERNEL);
+        if (state == NULL)
+                goto error2;
+
+        state->demod = demod - 1;
+        state->priv = priv;
+
+        /* test i2c bus for ack */
+        if (demod == 0) {
+                if (cx24117_readreg(state, 0x00) < 0)
+                        goto error3;
+        }
+
+        dev_info(&state->priv->i2c->dev,
+                "%s: Attaching frontend %d\n",
+                KBUILD_MODNAME, state->demod);
+
+        /* create dvb_frontend */
+        memcpy(&state->frontend.ops, &cx24117_ops,
+                sizeof(struct dvb_frontend_ops));
+        state->frontend.demodulator_priv = state;
+        return &state->frontend;
+
+error3:
+        kfree(state);
+error2:
+        cx24117_release_priv(priv);
+error1:
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(cx24117_attach);
+
+/*
+ * Initialise or wake up device
+ *
+ * Power config will reset and load initial firmware if required
+ */
+static int cx24117_initfe(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct cx24117_cmd cmd;
+        int ret;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d\n",
+                __func__, state->demod);
+
+        mutex_lock(&state->priv->fe_lock);
+
+        /* Firmware CMD 36: Power config */
+        cmd.args[0] = CMD_TUNERSLEEP;
+        cmd.args[1] = (state->demod ? 1 : 0);
+        cmd.args[2] = 0;
+        cmd.len = 3;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+        if (ret != 0)
+                goto exit;
+
+        ret = cx24117_diseqc_init(fe);
+        if (ret != 0)
+                goto exit;
+
+        /* CMD 3C */
+        cmd.args[0] = 0x3c;
+        cmd.args[1] = (state->demod ? 1 : 0);
+        cmd.args[2] = 0x10;
+        cmd.args[3] = 0x10;
+        cmd.len = 4;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+        if (ret != 0)
+                goto exit;
+
+        /* CMD 34 */
+        cmd.args[0] = 0x34;
+        cmd.args[1] = (state->demod ? 1 : 0);
+        cmd.args[2] = CX24117_OCC;
+        cmd.len = 3;
+        ret = cx24117_cmd_execute_nolock(fe, &cmd);
+
+exit:
+        mutex_unlock(&state->priv->fe_lock);
+
+        return ret;
+}
+
+/*
+ * Put device to sleep
+ */
+static int cx24117_sleep(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct cx24117_cmd cmd;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d\n",
+                __func__, state->demod);
+
+        /* Firmware CMD 36: Power config */
+        cmd.args[0] = CMD_TUNERSLEEP;
+        cmd.args[1] = (state->demod ? 1 : 0);
+        cmd.args[2] = 1;
+        cmd.len = 3;
+        return cx24117_cmd_execute(fe, &cmd);
+}
+
+/* dvb-core told us to tune, the tv property cache will be complete,
+ * it's safe for is to pull values and use them for tuning purposes.
+ */
+static int cx24117_set_frontend(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        struct cx24117_cmd cmd;
+        fe_status_t tunerstat;
+        int i, status, ret, retune = 1;
+        u8 reg_clkdiv, reg_ratediv;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d\n",
+                __func__, state->demod);
+
+        switch (c->delivery_system) {
+        case SYS_DVBS:
+                dev_dbg(&state->priv->i2c->dev, "%s() demod%d DVB-S\n",
+                        __func__, state->demod);
+
+                /* Only QPSK is supported for DVB-S */
+                if (c->modulation != QPSK) {
+                        dev_dbg(&state->priv->i2c->dev,
+                                "%s() demod%d unsupported modulation (%d)\n",
+                                __func__, state->demod, c->modulation);
+                        return -EINVAL;
+                }
+
+                /* Pilot doesn't exist in DVB-S, turn bit off */
+                state->dnxt.pilot_val = CX24117_PILOT_OFF;
+
+                /* DVB-S only supports 0.35 */
+                state->dnxt.rolloff_val = CX24117_ROLLOFF_035;
+                break;
+
+        case SYS_DVBS2:
+                dev_dbg(&state->priv->i2c->dev, "%s() demod%d DVB-S2\n",
+                        __func__, state->demod);
+
+                /*
+                 * NBC 8PSK/QPSK with DVB-S is supported for DVB-S2,
+                 * but not hardware auto detection
+                 */
+                if (c->modulation != PSK_8 && c->modulation != QPSK) {
+                        dev_dbg(&state->priv->i2c->dev,
+                                "%s() demod%d unsupported modulation (%d)\n",
+                                __func__, state->demod, c->modulation);
+                        return -EOPNOTSUPP;
+                }
+
+                switch (c->pilot) {
+                case PILOT_AUTO:
+                        state->dnxt.pilot_val = CX24117_PILOT_AUTO;
+                        break;
+                case PILOT_OFF:
+                        state->dnxt.pilot_val = CX24117_PILOT_OFF;
+                        break;
+                case PILOT_ON:
+                        state->dnxt.pilot_val = CX24117_PILOT_ON;
+                        break;
+                default:
+                        dev_dbg(&state->priv->i2c->dev,
+                                "%s() demod%d unsupported pilot mode (%d)\n",
+                                __func__, state->demod, c->pilot);
+                        return -EOPNOTSUPP;
+                }
+
+                switch (c->rolloff) {
+                case ROLLOFF_20:
+                        state->dnxt.rolloff_val = CX24117_ROLLOFF_020;
+                        break;
+                case ROLLOFF_25:
+                        state->dnxt.rolloff_val = CX24117_ROLLOFF_025;
+                        break;
+                case ROLLOFF_35:
+                        state->dnxt.rolloff_val = CX24117_ROLLOFF_035;
+                        break;
+                case ROLLOFF_AUTO:
+                        state->dnxt.rolloff_val = CX24117_ROLLOFF_035;
+                        /* soft-auto rolloff */
+                        retune = 3;
+                        break;
+                default:
+                        dev_warn(&state->priv->i2c->dev,
+                                "%s: demod%d unsupported rolloff (%d)\n",
+                                KBUILD_MODNAME, state->demod, c->rolloff);
+                        return -EOPNOTSUPP;
+                }
+                break;
+
+        default:
+                dev_warn(&state->priv->i2c->dev,
+                        "%s: demod %d unsupported delivery system (%d)\n",
+                        KBUILD_MODNAME, state->demod, c->delivery_system);
+                return -EINVAL;
+        }
+
+        state->dnxt.delsys = c->delivery_system;
+        state->dnxt.modulation = c->modulation;
+        state->dnxt.frequency = c->frequency;
+        state->dnxt.pilot = c->pilot;
+        state->dnxt.rolloff = c->rolloff;
+
+        ret = cx24117_set_inversion(state, c->inversion);
+        if (ret !=  0)
+                return ret;
+
+        ret = cx24117_set_fec(state,
+                c->delivery_system, c->modulation, c->fec_inner);
+        if (ret !=  0)
+                return ret;
+
+        ret = cx24117_set_symbolrate(state, c->symbol_rate);
+        if (ret !=  0)
+                return ret;
+
+        /* discard the 'current' tuning parameters and prepare to tune */
+        cx24117_clone_params(fe);
+
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: delsys      = %d\n", __func__, state->dcur.delsys);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: modulation  = %d\n", __func__, state->dcur.modulation);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: frequency   = %d\n", __func__, state->dcur.frequency);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: pilot       = %d (val = 0x%02x)\n", __func__,
+                state->dcur.pilot, state->dcur.pilot_val);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: retune      = %d\n", __func__, retune);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: rolloff     = %d (val = 0x%02x)\n", __func__,
+                state->dcur.rolloff, state->dcur.rolloff_val);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: symbol_rate = %d\n", __func__, state->dcur.symbol_rate);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: FEC         = %d (mask/val = 0x%02x/0x%02x)\n", __func__,
+                state->dcur.fec, state->dcur.fec_mask, state->dcur.fec_val);
+        dev_dbg(&state->priv->i2c->dev,
+                "%s: Inversion   = %d (val = 0x%02x)\n", __func__,
+                state->dcur.inversion, state->dcur.inversion_val);
+
+        /* Prepare a tune request */
+        cmd.args[0] = CMD_TUNEREQUEST;
+
+        /* demod */
+        cmd.args[1] = state->demod;
+
+        /* Frequency */
+        cmd.args[2] = (state->dcur.frequency & 0xff0000) >> 16;
+        cmd.args[3] = (state->dcur.frequency & 0x00ff00) >> 8;
+        cmd.args[4] = (state->dcur.frequency & 0x0000ff);
+
+        /* Symbol Rate */
+        cmd.args[5] = ((state->dcur.symbol_rate / 1000) & 0xff00) >> 8;
+        cmd.args[6] = ((state->dcur.symbol_rate / 1000) & 0x00ff);
+
+        /* Automatic Inversion */
+        cmd.args[7] = state->dcur.inversion_val;
+
+        /* Modulation / FEC / Pilot */
+        cmd.args[8] = state->dcur.fec_val | state->dcur.pilot_val;
+
+        cmd.args[9] = CX24117_SEARCH_RANGE_KHZ >> 8;
+        cmd.args[10] = CX24117_SEARCH_RANGE_KHZ & 0xff;
+
+        cmd.args[11] = state->dcur.rolloff_val;
+        cmd.args[12] = state->dcur.fec_mask;
+
+        if (state->dcur.symbol_rate > 30000000) {
+                reg_ratediv = 0x04;
+                reg_clkdiv = 0x02;
+        } else if (state->dcur.symbol_rate > 10000000) {
+                reg_ratediv = 0x06;
+                reg_clkdiv = 0x03;
+        } else {
+                reg_ratediv = 0x0a;
+                reg_clkdiv = 0x05;
+        }
+
+        cmd.args[13] = reg_ratediv;
+        cmd.args[14] = reg_clkdiv;
+
+        cx24117_writereg(state, (state->demod == 0) ?
+                CX24117_REG_CLKDIV0 : CX24117_REG_CLKDIV1, reg_clkdiv);
+        cx24117_writereg(state, (state->demod == 0) ?
+                CX24117_REG_RATEDIV0 : CX24117_REG_RATEDIV1, reg_ratediv);
+
+        cmd.args[15] = CX24117_PNE;
+        cmd.len = 16;
+
+        do {
+                /* Reset status register */
+                status = cx24117_readreg(state, (state->demod == 0) ?
+                        CX24117_REG_SSTATUS0 : CX24117_REG_SSTATUS1) &
+                        CX24117_SIGNAL_MASK;
+
+                dev_dbg(&state->priv->i2c->dev,
+                        "%s() demod%d status_setfe = %02x\n",
+                        __func__, state->demod, status);
+
+                cx24117_writereg(state, (state->demod == 0) ?
+                        CX24117_REG_SSTATUS0 : CX24117_REG_SSTATUS1, status);
+
+                /* Tune */
+                ret = cx24117_cmd_execute(fe, &cmd);
+                if (ret != 0)
+                        break;
+
+                /*
+                 * Wait for up to 500 ms before retrying
+                 *
+                 * If we are able to tune then generally it occurs within 100ms.
+                 * If it takes longer, try a different rolloff setting.
+                 */
+                for (i = 0; i < 50; i++) {
+                        cx24117_read_status(fe, &tunerstat);
+                        status = tunerstat & (FE_HAS_SIGNAL | FE_HAS_SYNC);
+                        if (status == (FE_HAS_SIGNAL | FE_HAS_SYNC)) {
+                                dev_dbg(&state->priv->i2c->dev,
+                                        "%s() demod%d tuned\n",
+                                        __func__, state->demod);
+                                return 0;
+                        }
+                        msleep(20);
+                }
+
+                dev_dbg(&state->priv->i2c->dev, "%s() demod%d not tuned\n",
+                        __func__, state->demod);
+
+                /* try next rolloff value */
+                if (state->dcur.rolloff == 3)
+                        cmd.args[11]--;
+
+        } while (--retune);
+        return -EINVAL;
+}
+
+static int cx24117_tune(struct dvb_frontend *fe, bool re_tune,
+        unsigned int mode_flags, unsigned int *delay, fe_status_t *status)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+
+        dev_dbg(&state->priv->i2c->dev, "%s() demod%d\n",
+                __func__, state->demod);
+
+        *delay = HZ / 5;
+        if (re_tune) {
+                int ret = cx24117_set_frontend(fe);
+                if (ret)
+                        return ret;
+        }
+        return cx24117_read_status(fe, status);
+}
+
+static int cx24117_get_algo(struct dvb_frontend *fe)
+{
+        return DVBFE_ALGO_HW;
+}
+
+static int cx24117_get_frontend(struct dvb_frontend *fe)
+{
+        struct cx24117_state *state = fe->demodulator_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        struct cx24117_cmd cmd;
+        u8 reg, st, inv;
+        int ret, idx;
+        unsigned int freq;
+        short srate_os, freq_os;
+
+        u8 buf[0x1f-4];
+
+        cmd.args[0] = 0x1c;
+        cmd.args[1] = (u8) state->demod;
+        cmd.len = 2;
+        ret = cx24117_cmd_execute(fe, &cmd);
+        if (ret != 0)
+                return ret;
+
+        /* read all required regs at once */
+        reg = (state->demod == 0) ? CX24117_REG_FREQ3_0 : CX24117_REG_FREQ3_1;
+        ret = cx24117_readregN(state, reg, buf, 0x1f-4);
+        if (ret != 0)
+                return ret;
+
+        st = buf[5];
+
+        /* get spectral inversion */
+        inv = (((state->demod == 0) ? ~st : st) >> 6) & 1;
+        if (inv == 0)
+                c->inversion = INVERSION_OFF;
+        else
+                c->inversion = INVERSION_ON;
+
+        /* modulation and fec */
+        idx = st & 0x3f;
+        if (c->delivery_system == SYS_DVBS2) {
+                if (idx > 11)
+                        idx += 9;
+                else
+                        idx += 7;
+        }
+
+        c->modulation = cx24117_modfec_modes[idx].modulation;
+        c->fec_inner = cx24117_modfec_modes[idx].fec;
+
+        /* frequency */
+        freq = (buf[0] << 16) | (buf[1] << 8) | buf[2];
+        freq_os = (buf[8] << 8) | buf[9];
+        c->frequency = freq + freq_os;
+
+        /* symbol rate */
+        srate_os = (buf[10] << 8) | buf[11];
+        c->symbol_rate = -1000 * srate_os + state->dcur.symbol_rate;
+        return 0;
+}
+
+static struct dvb_frontend_ops cx24117_ops = {
+        .delsys = { SYS_DVBS, SYS_DVBS2 },
+        .info = {
+                .name = "Conexant CX24117/CX24132",
+                .frequency_min = 950000,
+                .frequency_max = 2150000,
+                .frequency_stepsize = 1011, /* kHz for QPSK frontends */
+                .frequency_tolerance = 5000,
+                .symbol_rate_min = 1000000,
+                .symbol_rate_max = 45000000,
+                .caps = FE_CAN_INVERSION_AUTO |
+                        FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+                        FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+                        FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+                        FE_CAN_2G_MODULATION |
+                        FE_CAN_QPSK | FE_CAN_RECOVER
+        },
+
+        .release = cx24117_release,
+
+        .init = cx24117_initfe,
+        .sleep = cx24117_sleep,
+        .read_status = cx24117_read_status,
+        .read_ber = cx24117_read_ber,
+        .read_signal_strength = cx24117_read_signal_strength,
+        .read_snr = cx24117_read_snr,
+        .read_ucblocks = cx24117_read_ucblocks,
+        .set_tone = cx24117_set_tone,
+        .set_voltage = cx24117_set_voltage,
+        .diseqc_send_master_cmd = cx24117_send_diseqc_msg,
+        .diseqc_send_burst = cx24117_diseqc_send_burst,
+        .get_frontend_algo = cx24117_get_algo,
+        .tune = cx24117_tune,
+
+        .set_frontend = cx24117_set_frontend,
+        .get_frontend = cx24117_get_frontend,
+};
+
+
+MODULE_DESCRIPTION("DVB Frontend module for Conexant cx24117/cx24132 hardware");
+MODULE_AUTHOR("Luis Alves (ljalvs@gmail.com)");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.1");
+MODULE_FIRMWARE(CX24117_DEFAULT_FIRMWARE);
+
diff --git a/drivers/media/dvb-frontends/cx24117.h b/drivers/media/dvb-frontends/cx24117.h
new file mode 100644
index 000000000000..4e59e9574fa7
--- /dev/null
+++ b/drivers/media/dvb-frontends/cx24117.h
@@ -0,0 +1,47 @@
+/*
+    Conexant cx24117/cx24132 - Dual DVBS/S2 Satellite demod/tuner driver
+
+    Copyright (C) 2013 Luis Alves <ljalvs@gmail.com>
+        (based on cx24116.h by Steven Toth)
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef CX24117_H
+#define CX24117_H
+
+#include <linux/kconfig.h>
+#include <linux/dvb/frontend.h>
+
+struct cx24117_config {
+        /* the demodulator's i2c address */
+        u8 demod_address;
+};
+
+#if IS_ENABLED(CONFIG_DVB_CX24117)
+extern struct dvb_frontend *cx24117_attach(
+        const struct cx24117_config *config,
+        struct i2c_adapter *i2c);
+#else
+static inline struct dvb_frontend *cx24117_attach(
+        const struct cx24117_config *config,
+        struct i2c_adapter *i2c)
+{
+        dev_warn(&i2c->dev, "%s: driver disabled by Kconfig\n", __func__);
+        return NULL;
+}
+#endif
+
+#endif /* CX24117_H */
diff --git a/drivers/media/dvb-frontends/cx24123.c b/drivers/media/dvb-frontends/cx24123.c
index a771da3e9f99..72fb5838cae0 100644
--- a/drivers/media/dvb-frontends/cx24123.c
+++ b/drivers/media/dvb-frontends/cx24123.c
@@ -739,7 +739,7 @@ static int cx24123_set_voltage(struct dvb_frontend *fe,
                 return 0;
         default:
                 return -EINVAL;
-        };
+        }
 
         return 0;
 }
diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 7ca5c69dd200..03930d5e9fea 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -21,21 +21,31 @@
 
 #include "cxd2820r_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /* write multiple registers */
 static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
         u8 *val, int len)
 {
         int ret;
-        u8 buf[len+1];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = i2c,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = len + 1,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
@@ -55,7 +65,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
         u8 *val, int len)
 {
         int ret;
-        u8 buf[len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[2] = {
                 {
                         .addr = i2c,
@@ -65,11 +75,18 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
                 }, {
                         .addr = i2c,
                         .flags = I2C_M_RD,
-                        .len = sizeof(buf),
+                        .len = len,
                         .buf = buf,
                 }
         };
 
+        if (len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         ret = i2c_transfer(priv->i2c, msg, 2);
         if (ret == 2) {
                 memcpy(val, buf, len);
diff --git a/drivers/media/dvb-frontends/dib9000.c b/drivers/media/dvb-frontends/dib9000.c
index 6201c59a78dd..e540cfb13bac 100644
--- a/drivers/media/dvb-frontends/dib9000.c
+++ b/drivers/media/dvb-frontends/dib9000.c
@@ -649,9 +649,9 @@ static int dib9000_risc_debug_buf(struct dib9000_state *state, u16 * data, u8 si
         b[2 * (size - 2) - 1] = '\0';   /* Bullet proof the buffer */
         if (*b == '~') {
                 b++;
-                dprintk(b);
+                dprintk("%s", b);
         } else
-                dprintk("RISC%d: %d.%04d %s", state->fe_id, ts / 10000, ts % 10000, *b ? b : "<emtpy>");
+                dprintk("RISC%d: %d.%04d %s", state->fe_id, ts / 10000, ts % 10000, *b ? b : "<empty>");
         return 1;
 }
 
diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index 9a2134792cfa..959ae36403b8 100644
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -46,10 +46,6 @@
 #define DRX_I2C_MODEFLAGS     0xC0
 #define DRX_I2C_FLAGS         0xF0
 
-#ifndef SIZEOF_ARRAY
-#define SIZEOF_ARRAY(array) (sizeof((array))/sizeof((array)[0]))
-#endif
-
 #define DEFAULT_LOCK_TIMEOUT    1100
 
 #define DRX_CHANNEL_AUTO 0
@@ -1018,7 +1014,7 @@ static int HI_CfgCommand(struct drxd_state *state)
                 status = Write16(state, HI_RA_RAM_SRV_CMD__A,
                                  HI_RA_RAM_SRV_CMD_CONFIG, 0);
         else
-                status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, 0);
+                status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, NULL);
         mutex_unlock(&state->mutex);
         return status;
 }
@@ -1039,7 +1035,7 @@ static int HI_ResetCommand(struct drxd_state *state)
         status = Write16(state, HI_RA_RAM_SRV_RST_KEY__A,
                          HI_RA_RAM_SRV_RST_KEY_ACT, 0);
         if (status == 0)
-                status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, 0);
+                status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, NULL);
         mutex_unlock(&state->mutex);
         msleep(1);
         return status;
@@ -2837,7 +2833,7 @@ static int drxd_init(struct dvb_frontend *fe)
         int err = 0;
 
 /*      if (request_firmware(&state->fw, "drxd.fw", state->dev)<0) */
-        return DRXD_init(state, 0, 0);
+        return DRXD_init(state, NULL, 0);
 
         err = DRXD_init(state, state->fw->data, state->fw->size);
         release_firmware(state->fw);
@@ -2973,7 +2969,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config,
 
         mutex_init(&state->mutex);
 
-        if (Read16(state, 0, 0, 0) < 0)
+        if (Read16(state, 0, NULL, 0) < 0)
                 goto error;
 
         state->frontend.ops = drxd_ops;
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 082014de6875..d416c15691da 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -1083,7 +1083,7 @@ static int hi_cfg_command(struct drxk_state *state)
                          SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY);
         if (status < 0)
                 goto error;
-        status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, 0);
+        status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, NULL);
         if (status < 0)
                 goto error;
 
@@ -2781,7 +2781,7 @@ static int ConfigureI2CBridge(struct drxk_state *state, bool b_enable_bridge)
                         goto error;
         }
 
-        status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, 0);
+        status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, NULL);
 
 error:
         if (status < 0)
diff --git a/drivers/media/dvb-frontends/itd1000.c b/drivers/media/dvb-frontends/itd1000.c
index c1c3400b2173..cadcae4cff89 100644
--- a/drivers/media/dvb-frontends/itd1000.c
+++ b/drivers/media/dvb-frontends/itd1000.c
@@ -31,6 +31,9 @@
 #include "itd1000.h"
 #include "itd1000_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
@@ -52,10 +55,18 @@ MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
 /* don't write more than one byte with flexcop behind */
 static int itd1000_write_regs(struct itd1000_state *state, u8 reg, u8 v[], u8 len)
 {
-        u8 buf[1+len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg = {
                 .addr = state->cfg->i2c_address, .flags = 0, .buf = buf, .len = len+1
         };
+
+        if (1 + len > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "itd1000: i2c wr reg=%04x: len=%d is too big!\n",
+                       reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], v, len);
 
diff --git a/drivers/media/dvb-frontends/mt312.c b/drivers/media/dvb-frontends/mt312.c
index ec388c1d6913..a74ac0ddb833 100644
--- a/drivers/media/dvb-frontends/mt312.c
+++ b/drivers/media/dvb-frontends/mt312.c
@@ -36,6 +36,8 @@
 #include "mt312_priv.h"
 #include "mt312.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
 
 struct mt312_state {
         struct i2c_adapter *i2c;
@@ -96,9 +98,15 @@ static int mt312_write(struct mt312_state *state, const enum mt312_reg_addr reg,
                        const u8 *src, const size_t count)
 {
         int ret;
-        u8 buf[count + 1];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg;
 
+        if (1 + count > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "mt312: write: len=%zd is too big!\n", count);
+                return -EINVAL;
+        }
+
         if (debug) {
                 int i;
                 dprintk("W(%d):", reg & 0x7f);
diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c
index 8e288940a61f..fbca9856313a 100644
--- a/drivers/media/dvb-frontends/nxt200x.c
+++ b/drivers/media/dvb-frontends/nxt200x.c
@@ -39,6 +39,9 @@
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 #define NXT2002_DEFAULT_FIRMWARE "dvb-fe-nxt2002.fw"
 #define NXT2004_DEFAULT_FIRMWARE "dvb-fe-nxt2004.fw"
 #define CRC_CCIT_MASK 0x1021
@@ -95,10 +98,16 @@ static int i2c_readbytes(struct nxt200x_state *state, u8 addr, u8 *buf, u8 len)
 static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg,
                                const u8 *buf, u8 len)
 {
-        u8 buf2 [len+1];
+        u8 buf2[MAX_XFER_SIZE];
         int err;
         struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf2, .len = len + 1 };
 
+        if (1 + len > sizeof(buf2)) {
+                pr_warn("%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         __func__, reg, len);
+                return -EINVAL;
+        }
+
         buf2[0] = reg;
         memcpy(&buf2[1], buf, len);
 
diff --git a/drivers/media/dvb-frontends/rtl2830.c b/drivers/media/dvb-frontends/rtl2830.c
index 362d26d11e82..7efb796c472c 100644
--- a/drivers/media/dvb-frontends/rtl2830.c
+++ b/drivers/media/dvb-frontends/rtl2830.c
@@ -27,20 +27,30 @@
 
 #include "rtl2830_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /* write multiple hardware registers */
 static int rtl2830_wr(struct rtl2830_priv *priv, u8 reg, const u8 *val, int len)
 {
         int ret;
-        u8 buf[1+len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg.i2c_addr,
                         .flags = 0,
-                        .len = 1+len,
+                        .len = 1 + len,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index facb84841518..ff73da9365e3 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -22,6 +22,9 @@
 #include "dvb_math.h"
 #include <linux/bitops.h>
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 int rtl2832_debug;
 module_param_named(debug, rtl2832_debug, int, 0644);
 MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
@@ -162,16 +165,23 @@ static const struct rtl2832_reg_entry registers[] = {
 static int rtl2832_wr(struct rtl2832_priv *priv, u8 reg, u8 *val, int len)
 {
         int ret;
-        u8 buf[1+len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg.i2c_addr,
                         .flags = 0,
-                        .len = 1+len,
+                        .len = 1 + len,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
@@ -489,6 +499,7 @@ static int rtl2832_init(struct dvb_frontend *fe)
                 init = rtl2832_tuner_init_e4000;
                 break;
         case RTL2832_TUNER_R820T:
+        case RTL2832_TUNER_R828D:
                 len = ARRAY_SIZE(rtl2832_tuner_init_r820t);
                 init = rtl2832_tuner_init_r820t;
                 break;
diff --git a/drivers/media/dvb-frontends/rtl2832.h b/drivers/media/dvb-frontends/rtl2832.h
index 91b2dcf5a6ea..2cfbb6a97061 100644
--- a/drivers/media/dvb-frontends/rtl2832.h
+++ b/drivers/media/dvb-frontends/rtl2832.h
@@ -53,6 +53,7 @@ struct rtl2832_config {
 #define RTL2832_TUNER_E4000     0x27
 #define RTL2832_TUNER_FC0013    0x29
 #define RTL2832_TUNER_R820T     0x2a
+#define RTL2832_TUNER_R828D     0x2b
         u8 tuner;
 };
 
diff --git a/drivers/media/dvb-frontends/s5h1420.c b/drivers/media/dvb-frontends/s5h1420.c
index e2fec9ebf947..93eeaf7118fd 100644
--- a/drivers/media/dvb-frontends/s5h1420.c
+++ b/drivers/media/dvb-frontends/s5h1420.c
@@ -836,9 +836,16 @@ static u32 s5h1420_tuner_i2c_func(struct i2c_adapter *adapter)
 static int s5h1420_tuner_i2c_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msg[], int num)
 {
         struct s5h1420_state *state = i2c_get_adapdata(i2c_adap);
-        struct i2c_msg m[1 + num];
+        struct i2c_msg m[3];
         u8 tx_open[2] = { CON_1, state->CON_1_val | 1 }; /* repeater stops once there was a stop condition */
 
+        if (1 + num > ARRAY_SIZE(m)) {
+                printk(KERN_WARNING
+                       "%s: i2c xfer: num=%d is too big!\n",
+                       KBUILD_MODNAME, num);
+                return  -EOPNOTSUPP;
+        }
+
         memset(m, 0, sizeof(struct i2c_msg) * (1 + num));
 
         m[0].addr = state->config->demod_address;
@@ -847,7 +854,7 @@ static int s5h1420_tuner_i2c_tuner_xfer(struct i2c_adapter *i2c_adap, struct i2c
 
         memcpy(&m[1], msg, sizeof(struct i2c_msg) * num);
 
-        return i2c_transfer(state->i2c, m, 1+num) == 1 + num ? num : -EIO;
+        return i2c_transfer(state->i2c, m, 1 + num) == 1 + num ? num : -EIO;
 }
 
 static struct i2c_algorithm s5h1420_tuner_i2c_algo = {
diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
index 3dd5714eadba..07cd5ea7a038 100644
--- a/drivers/media/dvb-frontends/stb0899_drv.c
+++ b/drivers/media/dvb-frontends/stb0899_drv.c
@@ -32,6 +32,9 @@
 #include "stb0899_priv.h"
 #include "stb0899_reg.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static unsigned int verbose = 0;//1;
 module_param(verbose, int, 0644);
 
@@ -499,7 +502,7 @@ err:
 int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data, u32 count)
 {
         int ret;
-        u8 buf[2 + count];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg i2c_msg = {
                 .addr   = state->config->demod_address,
                 .flags  = 0,
@@ -507,6 +510,13 @@ int stb0899_write_regs(struct stb0899_state *state, unsigned int reg, u8 *data,
                 .len    = 2 + count
         };
 
+        if (2 + count > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                       KBUILD_MODNAME, reg, count);
+                return -EINVAL;
+        }
+
         buf[0] = reg >> 8;
         buf[1] = reg & 0xff;
         memcpy(&buf[2], data, count);
diff --git a/drivers/media/dvb-frontends/stb6100.c b/drivers/media/dvb-frontends/stb6100.c
index 45f9523f968f..cea175d19890 100644
--- a/drivers/media/dvb-frontends/stb6100.c
+++ b/drivers/media/dvb-frontends/stb6100.c
@@ -31,6 +31,8 @@
 static unsigned int verbose;
 module_param(verbose, int, 0644);
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
 
 #define FE_ERROR                0
 #define FE_NOTICE               1
@@ -183,7 +185,7 @@ static int stb6100_read_reg(struct stb6100_state *state, u8 reg)
 static int stb6100_write_reg_range(struct stb6100_state *state, u8 buf[], int start, int len)
 {
         int rc;
-        u8 cmdbuf[len + 1];
+        u8 cmdbuf[MAX_XFER_SIZE];
         struct i2c_msg msg = {
                 .addr   = state->config->tuner_address,
                 .flags  = 0,
@@ -191,6 +193,13 @@ static int stb6100_write_reg_range(struct stb6100_state *state, u8 buf[], int st
                 .len    = len + 1
         };
 
+        if (1 + len > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr: len=%d is too big!\n",
+                       KBUILD_MODNAME, len);
+                return -EINVAL;
+        }
+
         if (unlikely(start < 1 || start + len > STB6100_NUMREGS)) {
                 dprintk(verbose, FE_ERROR, 1, "Invalid register range %d:%d",
                         start, len);
diff --git a/drivers/media/dvb-frontends/stv0367.c b/drivers/media/dvb-frontends/stv0367.c
index 7b6dba3ce55e..458772739423 100644
--- a/drivers/media/dvb-frontends/stv0367.c
+++ b/drivers/media/dvb-frontends/stv0367.c
@@ -33,6 +33,9 @@
 #include "stv0367_regs.h"
 #include "stv0367_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static int stvdebug;
 module_param_named(debug, stvdebug, int, 0644);
 
@@ -767,7 +770,7 @@ static struct st_register def0367cab[STV0367CAB_NBREGS] = {
 static
 int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len)
 {
-        u8 buf[len + 2];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg = {
                 .addr = state->config->demod_address,
                 .flags = 0,
@@ -776,6 +779,14 @@ int stv0367_writeregs(struct stv0367_state *state, u16 reg, u8 *data, int len)
         };
         int ret;
 
+        if (2 + len > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                       KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
+
         buf[0] = MSB(reg);
         buf[1] = LSB(reg);
         memcpy(buf + 2, data, len);
diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 56d470ad5a82..23e872f84742 100644
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -35,6 +35,9 @@
 #include "stv090x.h"
 #include "stv090x_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static unsigned int verbose;
 module_param(verbose, int, 0644);
 
@@ -722,9 +725,16 @@ static int stv090x_write_regs(struct stv090x_state *state, unsigned int reg, u8
 {
         const struct stv090x_config *config = state->config;
         int ret;
-        u8 buf[2 + count];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg i2c_msg = { .addr = config->address, .flags = 0, .buf = buf, .len = 2 + count };
 
+        if (2 + count > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                       KBUILD_MODNAME, reg, count);
+                return -EINVAL;
+        }
+
         buf[0] = reg >> 8;
         buf[1] = reg & 0xff;
         memcpy(&buf[2], data, count);
diff --git a/drivers/media/dvb-frontends/stv6110.c b/drivers/media/dvb-frontends/stv6110.c
index 20b5fa92c53e..b1425830a24e 100644
--- a/drivers/media/dvb-frontends/stv6110.c
+++ b/drivers/media/dvb-frontends/stv6110.c
@@ -30,6 +30,9 @@
 
 #include "stv6110.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static int debug;
 
 struct stv6110_priv {
@@ -68,7 +71,7 @@ static int stv6110_write_regs(struct dvb_frontend *fe, u8 buf[],
 {
         struct stv6110_priv *priv = fe->tuner_priv;
         int rc;
-        u8 cmdbuf[len + 1];
+        u8 cmdbuf[MAX_XFER_SIZE];
         struct i2c_msg msg = {
                 .addr   = priv->i2c_address,
                 .flags  = 0,
@@ -78,6 +81,13 @@ static int stv6110_write_regs(struct dvb_frontend *fe, u8 buf[],
 
         dprintk("%s\n", __func__);
 
+        if (1 + len > sizeof(cmdbuf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr: len=%d is too big!\n",
+                       KBUILD_MODNAME, len);
+                return -EINVAL;
+        }
+
         if (start + len > 8)
                 return -EINVAL;
 
diff --git a/drivers/media/dvb-frontends/stv6110x.c b/drivers/media/dvb-frontends/stv6110x.c
index f36cab12bdc7..e66154e5c1d7 100644
--- a/drivers/media/dvb-frontends/stv6110x.c
+++ b/drivers/media/dvb-frontends/stv6110x.c
@@ -32,6 +32,9 @@
 #include "stv6110x.h"
 #include "stv6110x_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static unsigned int verbose;
 module_param(verbose, int, 0644);
 MODULE_PARM_DESC(verbose, "Set Verbosity level");
@@ -61,7 +64,8 @@ static int stv6110x_write_regs(struct stv6110x_state *stv6110x, int start, u8 da
 {
         int ret;
         const struct stv6110x_config *config = stv6110x->config;
-        u8 buf[len + 1];
+        u8 buf[MAX_XFER_SIZE];
+
         struct i2c_msg msg = {
                 .addr = config->addr,
                 .flags = 0,
@@ -69,6 +73,13 @@ static int stv6110x_write_regs(struct stv6110x_state *stv6110x, int start, u8 da
                 .len = len + 1
         };
 
+        if (1 + len > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr: len=%d is too big!\n",
+                       KBUILD_MODNAME, len);
+                return -EINVAL;
+        }
+
         if (start + len > 8)
                 return -EINVAL;
 
diff --git a/drivers/media/dvb-frontends/tda10071.c b/drivers/media/dvb-frontends/tda10071.c
index e79749cfec81..8ad3a57cf640 100644
--- a/drivers/media/dvb-frontends/tda10071.c
+++ b/drivers/media/dvb-frontends/tda10071.c
@@ -20,6 +20,9 @@
 
 #include "tda10071_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static struct dvb_frontend_ops tda10071_ops;
 
 /* write multiple registers */
@@ -27,16 +30,23 @@ static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
         int len)
 {
         int ret;
-        u8 buf[len+1];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg.demod_i2c_addr,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = 1 + len,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
@@ -56,7 +66,7 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
         int len)
 {
         int ret;
-        u8 buf[len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[2] = {
                 {
                         .addr = priv->cfg.demod_i2c_addr,
@@ -66,11 +76,18 @@ static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
                 }, {
                         .addr = priv->cfg.demod_i2c_addr,
                         .flags = I2C_M_RD,
-                        .len = sizeof(buf),
+                        .len = len,
                         .buf = buf,
                 }
         };
 
+        if (len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         ret = i2c_transfer(priv->i2c, msg, 2);
         if (ret == 2) {
                 memcpy(val, buf, len);
diff --git a/drivers/media/dvb-frontends/tda18271c2dd.c b/drivers/media/dvb-frontends/tda18271c2dd.c
index d281f77d5c28..2c54586ac07f 100644
--- a/drivers/media/dvb-frontends/tda18271c2dd.c
+++ b/drivers/media/dvb-frontends/tda18271c2dd.c
@@ -34,6 +34,9 @@
 #include "dvb_frontend.h"
 #include "tda18271c2dd.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 struct SStandardParam {
         s32   m_IFFrequency;
         u32   m_BandWidth;
@@ -139,11 +142,18 @@ static int i2c_write(struct i2c_adapter *adap, u8 adr, u8 *data, int len)
 static int WriteRegs(struct tda_state *state,
                      u8 SubAddr, u8 *Regs, u16 nRegs)
 {
-        u8 data[nRegs+1];
+        u8 data[MAX_XFER_SIZE];
+
+        if (1 + nRegs > sizeof(data)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr: len=%d is too big!\n",
+                       KBUILD_MODNAME, nRegs);
+                return -EINVAL;
+        }
 
         data[0] = SubAddr;
         memcpy(data + 1, Regs, nRegs);
-        return i2c_write(state->i2c, state->adr, data, nRegs+1);
+        return i2c_write(state->i2c, state->adr, data, nRegs + 1);
 }
 
 static int WriteReg(struct tda_state *state, u8 SubAddr, u8 Reg)
diff --git a/drivers/media/dvb-frontends/tda8083.c b/drivers/media/dvb-frontends/tda8083.c
index 9d08350fe4b0..69e62f42e2e1 100644
--- a/drivers/media/dvb-frontends/tda8083.c
+++ b/drivers/media/dvb-frontends/tda8083.c
@@ -189,7 +189,7 @@ static int tda8083_set_tone (struct tda8083_state* state, fe_sec_tone_mode_t ton
                 return tda8083_writereg (state, 0x29, 0x80);
         default:
                 return -EINVAL;
-        };
+        }
 }
 
 static int tda8083_set_voltage (struct tda8083_state* state, fe_sec_voltage_t voltage)
@@ -201,7 +201,7 @@ static int tda8083_set_voltage (struct tda8083_state* state, fe_sec_voltage_t vo
                 return tda8083_writereg (state, 0x20, 0x11);
         default:
                 return -EINVAL;
-        };
+        }
 }
 
 static int tda8083_send_diseqc_burst (struct tda8083_state* state, fe_sec_mini_cmd_t burst)
diff --git a/drivers/media/dvb-frontends/ts2020.c b/drivers/media/dvb-frontends/ts2020.c
index ad7ad857ab2a..9aba044dabed 100644
--- a/drivers/media/dvb-frontends/ts2020.c
+++ b/drivers/media/dvb-frontends/ts2020.c
@@ -31,6 +31,7 @@ struct ts2020_priv {
         struct i2c_adapter *i2c;
         u8 clk_out_div;
         u32 frequency;
+        u32 frequency_div;
 };
 
 static int ts2020_release(struct dvb_frontend *fe)
@@ -193,7 +194,7 @@ static int ts2020_set_params(struct dvb_frontend *fe)
         u8 lo = 0x01, div4 = 0x0;
 
         /* Calculate frequency divider */
-        if (frequency < 1060000) {
+        if (frequency < priv->frequency_div) {
                 lo |= 0x10;
                 div4 = 0x1;
                 ndiv = (frequency * 14 * 4) / TS2020_XTAL_FREQ;
@@ -340,8 +341,12 @@ struct dvb_frontend *ts2020_attach(struct dvb_frontend *fe,
         priv->i2c_address = config->tuner_address;
         priv->i2c = i2c;
         priv->clk_out_div = config->clk_out_div;
+        priv->frequency_div = config->frequency_div;
         fe->tuner_priv = priv;
 
+        if (!priv->frequency_div)
+                priv->frequency_div = 1060000;
+
         /* Wake Up the tuner */
         if ((0x03 & ts2020_readreg(fe, 0x00)) == 0x00) {
                 ts2020_writereg(fe, 0x00, 0x01);
diff --git a/drivers/media/dvb-frontends/ts2020.h b/drivers/media/dvb-frontends/ts2020.h
index 5bcb9a71ca80..b2fe6bb3a38b 100644
--- a/drivers/media/dvb-frontends/ts2020.h
+++ b/drivers/media/dvb-frontends/ts2020.h
@@ -28,6 +28,7 @@
 struct ts2020_config {
         u8 tuner_address;
         u8 clk_out_div;
+        u32 frequency_div;
 };
 
 #if IS_ENABLED(CONFIG_DVB_TS2020)
diff --git a/drivers/media/dvb-frontends/zl10039.c b/drivers/media/dvb-frontends/zl10039.c
index eff9c5fde50a..91b6b2e9b792 100644
--- a/drivers/media/dvb-frontends/zl10039.c
+++ b/drivers/media/dvb-frontends/zl10039.c
@@ -30,6 +30,9 @@
 
 static int debug;
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 #define dprintk(args...) \
         do { \
                 if (debug) \
@@ -98,7 +101,7 @@ static int zl10039_write(struct zl10039_state *state,
                         const enum zl10039_reg_addr reg, const u8 *src,
                         const size_t count)
 {
-        u8 buf[count + 1];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg = {
                 .addr = state->i2c_addr,
                 .flags = 0,
@@ -106,6 +109,13 @@ static int zl10039_write(struct zl10039_state *state,
                 .len = count + 1,
         };
 
+        if (1 + count > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr reg=%04x: len=%zd is too big!\n",
+                       KBUILD_MODNAME, reg, count);
+                return -EINVAL;
+        }
+
         dprintk("%s\n", __func__);
         /* Write register address and data in one go */
         buf[0] = reg;
diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index cbc9ee9bec2b..842654d33317 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -621,6 +621,15 @@ config VIDEO_AS3645A
           This is a driver for the AS3645A and LM3555 flash controllers. It has
           build in control for flash, torch and indicator LEDs.
 
+config VIDEO_LM3560
+        tristate "LM3560 dual flash driver support"
+        depends on I2C && VIDEO_V4L2 && MEDIA_CONTROLLER
+        depends on MEDIA_CAMERA_SUPPORT
+        select REGMAP_I2C
+        ---help---
+          This is a driver for the lm3560 dual flash controllers. It controls
+          flash, torch LEDs.
+
 comment "Video improvement chips"
 
 config VIDEO_UPD64031A
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 9f462df77b4a..e03f1776f4f4 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -70,6 +70,7 @@ obj-$(CONFIG_VIDEO_S5K4ECGX)	+= s5k4ecgx.o
 obj-$(CONFIG_VIDEO_S5C73M3)     += s5c73m3/
 obj-$(CONFIG_VIDEO_ADP1653)     += adp1653.o
 obj-$(CONFIG_VIDEO_AS3645A)     += as3645a.o
+obj-$(CONFIG_VIDEO_LM3560)      += lm3560.o
 obj-$(CONFIG_VIDEO_SMIAPP_PLL)  += smiapp-pll.o
 obj-$(CONFIG_VIDEO_AK881X)              += ak881x.o
 obj-$(CONFIG_VIDEO_IR_I2C)  += ir-kbd-i2c.o
diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
index aeb56c53e39f..d4e15a617c3b 100644
--- a/drivers/media/i2c/adv7343.c
+++ b/drivers/media/i2c/adv7343.c
@@ -25,6 +25,7 @@
 #include <linux/module.h>
 #include <linux/videodev2.h>
 #include <linux/uaccess.h>
+#include <linux/of.h>
 
 #include <media/adv7343.h>
 #include <media/v4l2-async.h>
diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c
new file mode 100644
index 000000000000..3317a9ae3961
--- /dev/null
+++ b/drivers/media/i2c/lm3560.c
@@ -0,0 +1,488 @@
+/*
+ * drivers/media/i2c/lm3560.c
+ * General device driver for TI lm3560, FLASH LED Driver
+ *
+ * Copyright (C) 2013 Texas Instruments
+ *
+ * Contact: Daniel Jeong <gshark.jeong@gmail.com>
+ *                      Ldd-Mlp <ldd-mlp@list.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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+#include <linux/mutex.h>
+#include <linux/regmap.h>
+#include <linux/videodev2.h>
+#include <media/lm3560.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+
+/* registers definitions */
+#define REG_ENABLE              0x10
+#define REG_TORCH_BR    0xa0
+#define REG_FLASH_BR    0xb0
+#define REG_FLASH_TOUT  0xc0
+#define REG_FLAG                0xd0
+#define REG_CONFIG1             0xe0
+
+/* Fault Mask */
+#define FAULT_TIMEOUT   (1<<0)
+#define FAULT_OVERTEMP  (1<<1)
+#define FAULT_SHORT_CIRCUIT     (1<<2)
+
+enum led_enable {
+        MODE_SHDN = 0x0,
+        MODE_TORCH = 0x2,
+        MODE_FLASH = 0x3,
+};
+
+/* struct lm3560_flash
+ *
+ * @pdata: platform data
+ * @regmap: reg. map for i2c
+ * @lock: muxtex for serial access.
+ * @led_mode: V4L2 LED mode
+ * @ctrls_led: V4L2 contols
+ * @subdev_led: V4L2 subdev
+ */
+struct lm3560_flash {
+        struct device *dev;
+        struct lm3560_platform_data *pdata;
+        struct regmap *regmap;
+        struct mutex lock;
+
+        enum v4l2_flash_led_mode led_mode;
+        struct v4l2_ctrl_handler ctrls_led[LM3560_LED_MAX];
+        struct v4l2_subdev subdev_led[LM3560_LED_MAX];
+};
+
+#define to_lm3560_flash(_ctrl, _no)     \
+        container_of(_ctrl->handler, struct lm3560_flash, ctrls_led[_no])
+
+/* enable mode control */
+static int lm3560_mode_ctrl(struct lm3560_flash *flash)
+{
+        int rval = -EINVAL;
+
+        switch (flash->led_mode) {
+        case V4L2_FLASH_LED_MODE_NONE:
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_ENABLE, 0x03, MODE_SHDN);
+                break;
+        case V4L2_FLASH_LED_MODE_TORCH:
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_ENABLE, 0x03, MODE_TORCH);
+                break;
+        case V4L2_FLASH_LED_MODE_FLASH:
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_ENABLE, 0x03, MODE_FLASH);
+                break;
+        }
+        return rval;
+}
+
+/* led1/2  enable/disable */
+static int lm3560_enable_ctrl(struct lm3560_flash *flash,
+                              enum lm3560_led_id led_no, bool on)
+{
+        int rval;
+
+        if (led_no == LM3560_LED0) {
+                if (on == true)
+                        rval = regmap_update_bits(flash->regmap,
+                                                  REG_ENABLE, 0x08, 0x08);
+                else
+                        rval = regmap_update_bits(flash->regmap,
+                                                  REG_ENABLE, 0x08, 0x00);
+        } else {
+                if (on == true)
+                        rval = regmap_update_bits(flash->regmap,
+                                                  REG_ENABLE, 0x10, 0x10);
+                else
+                        rval = regmap_update_bits(flash->regmap,
+                                                  REG_ENABLE, 0x10, 0x00);
+        }
+        return rval;
+}
+
+/* torch1/2 brightness control */
+static int lm3560_torch_brt_ctrl(struct lm3560_flash *flash,
+                                 enum lm3560_led_id led_no, unsigned int brt)
+{
+        int rval;
+        u8 br_bits;
+
+        if (brt < LM3560_TORCH_BRT_MIN)
+                return lm3560_enable_ctrl(flash, led_no, false);
+        else
+                rval = lm3560_enable_ctrl(flash, led_no, true);
+
+        br_bits = LM3560_TORCH_BRT_uA_TO_REG(brt);
+        if (led_no == LM3560_LED0)
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_TORCH_BR, 0x07, br_bits);
+        else
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_TORCH_BR, 0x38, br_bits << 3);
+
+        return rval;
+}
+
+/* flash1/2 brightness control */
+static int lm3560_flash_brt_ctrl(struct lm3560_flash *flash,
+                                 enum lm3560_led_id led_no, unsigned int brt)
+{
+        int rval;
+        u8 br_bits;
+
+        if (brt < LM3560_FLASH_BRT_MIN)
+                return lm3560_enable_ctrl(flash, led_no, false);
+        else
+                rval = lm3560_enable_ctrl(flash, led_no, true);
+
+        br_bits = LM3560_FLASH_BRT_uA_TO_REG(brt);
+        if (led_no == LM3560_LED0)
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_FLASH_BR, 0x0f, br_bits);
+        else
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_FLASH_BR, 0xf0, br_bits << 4);
+
+        return rval;
+}
+
+/* V4L2 controls  */
+static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)
+{
+        struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no);
+
+        mutex_lock(&flash->lock);
+
+        if (ctrl->id == V4L2_CID_FLASH_FAULT) {
+                int rval;
+                s32 fault = 0;
+                unsigned int reg_val;
+                rval = regmap_read(flash->regmap, REG_FLAG, &reg_val);
+                if (rval < 0)
+                        return rval;
+                if (rval & FAULT_SHORT_CIRCUIT)
+                        fault |= V4L2_FLASH_FAULT_SHORT_CIRCUIT;
+                if (rval & FAULT_OVERTEMP)
+                        fault |= V4L2_FLASH_FAULT_OVER_TEMPERATURE;
+                if (rval & FAULT_TIMEOUT)
+                        fault |= V4L2_FLASH_FAULT_TIMEOUT;
+                ctrl->cur.val = fault;
+                return 0;
+        }
+
+        mutex_unlock(&flash->lock);
+        return -EINVAL;
+}
+
+static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no)
+{
+        struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no);
+        u8 tout_bits;
+        int rval = -EINVAL;
+
+        mutex_lock(&flash->lock);
+
+        switch (ctrl->id) {
+        case V4L2_CID_FLASH_LED_MODE:
+                flash->led_mode = ctrl->val;
+                if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH)
+                        rval = lm3560_mode_ctrl(flash);
+                break;
+
+        case V4L2_CID_FLASH_STROBE_SOURCE:
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_CONFIG1, 0x04, (ctrl->val) << 2);
+                if (rval < 0)
+                        goto err_out;
+                break;
+
+        case V4L2_CID_FLASH_STROBE:
+                if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH)
+                        return -EBUSY;
+                flash->led_mode = V4L2_FLASH_LED_MODE_FLASH;
+                rval = lm3560_mode_ctrl(flash);
+                break;
+
+        case V4L2_CID_FLASH_STROBE_STOP:
+                if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH)
+                        return -EBUSY;
+                flash->led_mode = V4L2_FLASH_LED_MODE_NONE;
+                rval = lm3560_mode_ctrl(flash);
+                break;
+
+        case V4L2_CID_FLASH_TIMEOUT:
+                tout_bits = LM3560_FLASH_TOUT_ms_TO_REG(ctrl->val);
+                rval = regmap_update_bits(flash->regmap,
+                                          REG_FLASH_TOUT, 0x1f, tout_bits);
+                break;
+
+        case V4L2_CID_FLASH_INTENSITY:
+                rval = lm3560_flash_brt_ctrl(flash, led_no, ctrl->val);
+                break;
+
+        case V4L2_CID_FLASH_TORCH_INTENSITY:
+                rval = lm3560_torch_brt_ctrl(flash, led_no, ctrl->val);
+                break;
+        }
+
+        mutex_unlock(&flash->lock);
+err_out:
+        return rval;
+}
+
+static int lm3560_led1_get_ctrl(struct v4l2_ctrl *ctrl)
+{
+        return lm3560_get_ctrl(ctrl, LM3560_LED1);
+}
+
+static int lm3560_led1_set_ctrl(struct v4l2_ctrl *ctrl)
+{
+        return lm3560_set_ctrl(ctrl, LM3560_LED1);
+}
+
+static int lm3560_led0_get_ctrl(struct v4l2_ctrl *ctrl)
+{
+        return lm3560_get_ctrl(ctrl, LM3560_LED0);
+}
+
+static int lm3560_led0_set_ctrl(struct v4l2_ctrl *ctrl)
+{
+        return lm3560_set_ctrl(ctrl, LM3560_LED0);
+}
+
+static const struct v4l2_ctrl_ops lm3560_led_ctrl_ops[LM3560_LED_MAX] = {
+        [LM3560_LED0] = {
+                         .g_volatile_ctrl = lm3560_led0_get_ctrl,
+                         .s_ctrl = lm3560_led0_set_ctrl,
+                         },
+        [LM3560_LED1] = {
+                         .g_volatile_ctrl = lm3560_led1_get_ctrl,
+                         .s_ctrl = lm3560_led1_set_ctrl,
+                         }
+};
+
+static int lm3560_init_controls(struct lm3560_flash *flash,
+                                enum lm3560_led_id led_no)
+{
+        struct v4l2_ctrl *fault;
+        u32 max_flash_brt = flash->pdata->max_flash_brt[led_no];
+        u32 max_torch_brt = flash->pdata->max_torch_brt[led_no];
+        struct v4l2_ctrl_handler *hdl = &flash->ctrls_led[led_no];
+        const struct v4l2_ctrl_ops *ops = &lm3560_led_ctrl_ops[led_no];
+
+        v4l2_ctrl_handler_init(hdl, 8);
+        /* flash mode */
+        v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_FLASH_LED_MODE,
+                               V4L2_FLASH_LED_MODE_TORCH, ~0x7,
+                               V4L2_FLASH_LED_MODE_NONE);
+        flash->led_mode = V4L2_FLASH_LED_MODE_NONE;
+
+        /* flash source */
+        v4l2_ctrl_new_std_menu(hdl, ops, V4L2_CID_FLASH_STROBE_SOURCE,
+                               0x1, ~0x3, V4L2_FLASH_STROBE_SOURCE_SOFTWARE);
+
+        /* flash strobe */
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_STROBE, 0, 0, 0, 0);
+        /* flash strobe stop */
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_STROBE_STOP, 0, 0, 0, 0);
+
+        /* flash strobe timeout */
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_TIMEOUT,
+                          LM3560_FLASH_TOUT_MIN,
+                          flash->pdata->max_flash_timeout,
+                          LM3560_FLASH_TOUT_STEP,
+                          flash->pdata->max_flash_timeout);
+
+        /* flash brt */
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_INTENSITY,
+                          LM3560_FLASH_BRT_MIN, max_flash_brt,
+                          LM3560_FLASH_BRT_STEP, max_flash_brt);
+
+        /* torch brt */
+        v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_TORCH_INTENSITY,
+                          LM3560_TORCH_BRT_MIN, max_torch_brt,
+                          LM3560_TORCH_BRT_STEP, max_torch_brt);
+
+        /* fault */
+        fault = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_FLASH_FAULT, 0,
+                                  V4L2_FLASH_FAULT_OVER_VOLTAGE
+                                  | V4L2_FLASH_FAULT_OVER_TEMPERATURE
+                                  | V4L2_FLASH_FAULT_SHORT_CIRCUIT
+                                  | V4L2_FLASH_FAULT_TIMEOUT, 0, 0);
+        if (fault != NULL)
+                fault->flags |= V4L2_CTRL_FLAG_VOLATILE;
+
+        if (hdl->error)
+                return hdl->error;
+
+        flash->subdev_led[led_no].ctrl_handler = hdl;
+        return 0;
+}
+
+/* initialize device */
+static const struct v4l2_subdev_ops lm3560_ops = {
+        .core = NULL,
+};
+
+static const struct regmap_config lm3560_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+        .max_register = 0xFF,
+};
+
+static int lm3560_subdev_init(struct lm3560_flash *flash,
+                              enum lm3560_led_id led_no, char *led_name)
+{
+        struct i2c_client *client = to_i2c_client(flash->dev);
+        int rval;
+
+        v4l2_i2c_subdev_init(&flash->subdev_led[led_no], client, &lm3560_ops);
+        flash->subdev_led[led_no].flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
+        strcpy(flash->subdev_led[led_no].name, led_name);
+        rval = lm3560_init_controls(flash, led_no);
+        if (rval)
+                goto err_out;
+        rval = media_entity_init(&flash->subdev_led[led_no].entity, 0, NULL, 0);
+        if (rval < 0)
+                goto err_out;
+        flash->subdev_led[led_no].entity.type = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;
+
+        return rval;
+
+err_out:
+        v4l2_ctrl_handler_free(&flash->ctrls_led[led_no]);
+        return rval;
+}
+
+static int lm3560_init_device(struct lm3560_flash *flash)
+{
+        int rval;
+        unsigned int reg_val;
+
+        /* set peak current */
+        rval = regmap_update_bits(flash->regmap,
+                                  REG_FLASH_TOUT, 0x60, flash->pdata->peak);
+        if (rval < 0)
+                return rval;
+        /* output disable */
+        flash->led_mode = V4L2_FLASH_LED_MODE_NONE;
+        rval = lm3560_mode_ctrl(flash);
+        if (rval < 0)
+                return rval;
+        /* Reset faults */
+        rval = regmap_read(flash->regmap, REG_FLAG, &reg_val);
+        return rval;
+}
+
+static int lm3560_probe(struct i2c_client *client,
+                        const struct i2c_device_id *devid)
+{
+        struct lm3560_flash *flash;
+        struct lm3560_platform_data *pdata = dev_get_platdata(&client->dev);
+        int rval;
+
+        flash = devm_kzalloc(&client->dev, sizeof(*flash), GFP_KERNEL);
+        if (flash == NULL)
+                return -ENOMEM;
+
+        flash->regmap = devm_regmap_init_i2c(client, &lm3560_regmap);
+        if (IS_ERR(flash->regmap)) {
+                rval = PTR_ERR(flash->regmap);
+                return rval;
+        }
+
+        /* if there is no platform data, use chip default value */
+        if (pdata == NULL) {
+                pdata =
+                    kzalloc(sizeof(struct lm3560_platform_data), GFP_KERNEL);
+                if (pdata == NULL)
+                        return -ENODEV;
+                pdata->peak = LM3560_PEAK_3600mA;
+                pdata->max_flash_timeout = LM3560_FLASH_TOUT_MAX;
+                /* led 1 */
+                pdata->max_flash_brt[LM3560_LED0] = LM3560_FLASH_BRT_MAX;
+                pdata->max_torch_brt[LM3560_LED0] = LM3560_TORCH_BRT_MAX;
+                /* led 2 */
+                pdata->max_flash_brt[LM3560_LED1] = LM3560_FLASH_BRT_MAX;
+                pdata->max_torch_brt[LM3560_LED1] = LM3560_TORCH_BRT_MAX;
+        }
+        flash->pdata = pdata;
+        flash->dev = &client->dev;
+        mutex_init(&flash->lock);
+
+        rval = lm3560_subdev_init(flash, LM3560_LED0, "lm3560-led0");
+        if (rval < 0)
+                return rval;
+
+        rval = lm3560_subdev_init(flash, LM3560_LED1, "lm3560-led1");
+        if (rval < 0)
+                return rval;
+
+        rval = lm3560_init_device(flash);
+        if (rval < 0)
+                return rval;
+
+        return 0;
+}
+
+static int lm3560_remove(struct i2c_client *client)
+{
+        struct v4l2_subdev *subdev = i2c_get_clientdata(client);
+        struct lm3560_flash *flash = container_of(subdev, struct lm3560_flash,
+                                                  subdev_led[LM3560_LED_MAX]);
+        unsigned int i;
+
+        for (i = LM3560_LED0; i < LM3560_LED_MAX; i++) {
+                v4l2_device_unregister_subdev(&flash->subdev_led[i]);
+                v4l2_ctrl_handler_free(&flash->ctrls_led[i]);
+                media_entity_cleanup(&flash->subdev_led[i].entity);
+        }
+
+        return 0;
+}
+
+static const struct i2c_device_id lm3560_id_table[] = {
+        {LM3560_NAME, 0},
+        {}
+};
+
+MODULE_DEVICE_TABLE(i2c, lm3560_id_table);
+
+static struct i2c_driver lm3560_i2c_driver = {
+        .driver = {
+                   .name = LM3560_NAME,
+                   .pm = NULL,
+                   },
+        .probe = lm3560_probe,
+        .remove = lm3560_remove,
+        .id_table = lm3560_id_table,
+};
+
+module_i2c_driver(lm3560_i2c_driver);
+
+MODULE_AUTHOR("Daniel Jeong <gshark.jeong@gmail.com>");
+MODULE_AUTHOR("Ldd Mlp <ldd-mlp@list.ti.com>");
+MODULE_DESCRIPTION("Texas Instruments LM3560 LED flash driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
index 31f40b342049..6fec9384d86e 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c
+++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c
@@ -1581,7 +1581,7 @@ static int s5c73m3_probe(struct i2c_client *client,
         oif_sd = &state->oif_sd;
 
         v4l2_subdev_init(sd, &s5c73m3_subdev_ops);
-        sd->owner = client->driver->driver.owner;
+        sd->owner = client->dev.driver->owner;
         v4l2_set_subdevdata(sd, state);
         strlcpy(sd->name, "S5C73M3", sizeof(sd->name));
 
diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c
index 1d384a371b41..5b915936c3f3 100644
--- a/drivers/media/i2c/soc_camera/imx074.c
+++ b/drivers/media/i2c/soc_camera/imx074.c
@@ -451,7 +451,9 @@ static int imx074_probe(struct i2c_client *client,
         if (ret < 0)
                 goto eprobe;
 
-        return v4l2_async_register_subdev(&priv->subdev);
+        ret = v4l2_async_register_subdev(&priv->subdev);
+        if (!ret)
+                return 0;
 
 epwrinit:
 eprobe:
diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
index e968c3fdbd9e..bc74224503e7 100644
--- a/drivers/media/i2c/soc_camera/ov9640.c
+++ b/drivers/media/i2c/soc_camera/ov9640.c
@@ -371,7 +371,7 @@ static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code,
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_565;
                 break;
-        };
+        }
 }
 
 /* Setup registers according to resolution and color encoding */
diff --git a/drivers/media/i2c/ths8200.c b/drivers/media/i2c/ths8200.c
index d9f65d7e3e58..04139eec8c4e 100644
--- a/drivers/media/i2c/ths8200.c
+++ b/drivers/media/i2c/ths8200.c
@@ -19,6 +19,7 @@
 
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/v4l2-dv-timings.h>
 
 #include <media/v4l2-dv-timings.h>
diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index 91f3dd4cda1b..83d85df4853a 100644
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -35,6 +35,7 @@
 #include <linux/videodev2.h>
 #include <linux/module.h>
 #include <linux/v4l2-mediabus.h>
+#include <linux/of.h>
 
 #include <media/v4l2-async.h>
 #include <media/v4l2-device.h>
diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index 24a08fa7e328..912e1cccdd1c 100644
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/videodev2.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/v4l2-dv-timings.h>
 #include <media/tvp7002.h>
 #include <media/v4l2-async.h>
diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c
index 447afbd904a4..8b5e0b3a92a0 100644
--- a/drivers/media/pci/b2c2/flexcop-pci.c
+++ b/drivers/media/pci/b2c2/flexcop-pci.c
@@ -319,7 +319,6 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
 
 err_pci_iounmap:
         pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
-        pci_set_drvdata(fc_pci->pdev, NULL);
 err_pci_release_regions:
         pci_release_regions(fc_pci->pdev);
 err_pci_disable_device:
@@ -332,7 +331,6 @@ static void flexcop_pci_exit(struct flexcop_pci *fc_pci)
         if (fc_pci->init_state & FC_PCI_INIT) {
                 free_irq(fc_pci->pdev->irq, fc_pci);
                 pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
-                pci_set_drvdata(fc_pci->pdev, NULL);
                 pci_release_regions(fc_pci->pdev);
                 pci_disable_device(fc_pci->pdev);
         }
diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c
index 66eb0baab0e9..d0c281f41a0a 100644
--- a/drivers/media/pci/bt8xx/bt878.c
+++ b/drivers/media/pci/bt8xx/bt878.c
@@ -488,8 +488,7 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
         btwrite(0, BT848_INT_MASK);
 
         result = request_irq(bt->irq, bt878_irq,
-                             IRQF_SHARED | IRQF_DISABLED, "bt878",
-                             (void *) bt);
+                             IRQF_SHARED, "bt878", (void *) bt);
         if (result == -EINVAL) {
                 printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
                        bt878_num);
@@ -563,7 +562,6 @@ static void bt878_remove(struct pci_dev *pci_dev)
         bt->shutdown = 1;
         bt878_mem_free(bt);
 
-        pci_set_drvdata(pci_dev, NULL);
         pci_disable_device(pci_dev);
         return;
 }
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index c6532de0eac7..a3b1ee9c00d7 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4086,7 +4086,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
         /* disable irqs, register irq handler */
         btwrite(0, BT848_INT_MASK);
         result = request_irq(btv->c.pci->irq, bttv_irq,
-            IRQF_SHARED | IRQF_DISABLED, btv->c.v4l2_dev.name, (void *)btv);
+            IRQF_SHARED, btv->c.v4l2_dev.name, (void *)btv);
         if (result < 0) {
                 pr_err("%d: can't get IRQ %d\n",
                        bttv_num, btv->c.pci->irq);
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 004d8ace5019..c1f8cc6f14b2 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -324,23 +324,24 @@ static void cx18_eeprom_dump(struct cx18 *cx, unsigned char *eedata, int len)
 /* Hauppauge card? get values from tveeprom */
 void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
 {
-        struct i2c_client c;
+        struct i2c_client *c;
         u8 eedata[256];
 
-        memset(&c, 0, sizeof(c));
-        strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
-        c.adapter = &cx->i2c_adap[0];
-        c.addr = 0xA0 >> 1;
+        c = kzalloc(sizeof(*c), GFP_KERNEL);
+
+        strlcpy(c->name, "cx18 tveeprom tmp", sizeof(c->name));
+        c->adapter = &cx->i2c_adap[0];
+        c->addr = 0xa0 >> 1;
 
         memset(tv, 0, sizeof(*tv));
-        if (tveeprom_read(&c, eedata, sizeof(eedata)))
-                return;
+        if (tveeprom_read(c, eedata, sizeof(eedata)))
+                goto ret;
 
         switch (cx->card->type) {
         case CX18_CARD_HVR_1600_ESMT:
         case CX18_CARD_HVR_1600_SAMSUNG:
         case CX18_CARD_HVR_1600_S5H1411:
-                tveeprom_hauppauge_analog(&c, tv, eedata);
+                tveeprom_hauppauge_analog(c, tv, eedata);
                 break;
         case CX18_CARD_YUAN_MPC718:
         case CX18_CARD_GOTVIEW_PCI_DVD3:
@@ -354,6 +355,9 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
                 cx18_eeprom_dump(cx, eedata, sizeof(eedata));
                 break;
         }
+
+ret:
+        kfree(c);
 }
 
 static void cx18_process_eeprom(struct cx18 *cx)
@@ -1031,8 +1035,7 @@ static int cx18_probe(struct pci_dev *pci_dev,
 
         /* Register IRQ */
         retval = request_irq(cx->pci_dev->irq, cx18_irq_handler,
-                             IRQF_SHARED | IRQF_DISABLED,
-                             cx->v4l2_dev.name, (void *)cx);
+                             IRQF_SHARED, cx->v4l2_dev.name, (void *)cx);
         if (retval) {
                 CX18_ERR("Failed to register irq %d\n", retval);
                 goto free_i2c;
diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
index 5104c802f72f..d1dcb1d2e087 100644
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@@ -23,6 +23,7 @@ config VIDEO_CX23885
         select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
index 7344849183a7..16fa7ea4d4aa 100644
--- a/drivers/media/pci/cx23885/cimax2.c
+++ b/drivers/media/pci/cx23885/cimax2.c
@@ -26,6 +26,10 @@
 #include "cx23885.h"
 #include "cimax2.h"
 #include "dvb_ca_en50221.h"
+
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /**** Bit definitions for MC417_RWD and MC417_OEN registers  ***
   bits 31-16
 +-----------+
@@ -125,7 +129,7 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
                                                 u8 *buf, int len)
 {
         int ret;
-        u8 buffer[len + 1];
+        u8 buffer[MAX_XFER_SIZE];
 
         struct i2c_msg msg = {
                 .addr   = addr,
@@ -134,6 +138,13 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
                 .len    = len + 1
         };
 
+        if (1 + len > sizeof(buffer)) {
+                printk(KERN_WARNING
+                       "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                       KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buffer[0] = reg;
         memcpy(&buffer[1], buf, len);
 
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 6a71a965e757..79f20c8c842e 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -223,6 +223,39 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Leadtek Winfast PxDVR3200 H",
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
+                .name           = "Leadtek Winfast PxPVR2200",
+                .porta          = CX23885_ANALOG_VIDEO,
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
+                .tuner_bus      = 1,
+                .input          = {{
+                        .type   = CX23885_VMUX_TELEVISION,
+                        .vmux   = CX25840_VIN2_CH1 |
+                                  CX25840_VIN5_CH2,
+                        .amux   = CX25840_AUDIO8,
+                        .gpio0  = 0x704040,
+                }, {
+                        .type   = CX23885_VMUX_COMPOSITE1,
+                        .vmux   = CX25840_COMPOSITE1,
+                        .amux   = CX25840_AUDIO7,
+                        .gpio0  = 0x704040,
+                }, {
+                        .type   = CX23885_VMUX_SVIDEO,
+                        .vmux   = CX25840_SVIDEO_LUMA3 |
+                                  CX25840_SVIDEO_CHROMA4,
+                        .amux   = CX25840_AUDIO7,
+                        .gpio0  = 0x704040,
+                }, {
+                        .type   = CX23885_VMUX_COMPONENT,
+                        .vmux   = CX25840_VIN7_CH1 |
+                                  CX25840_VIN6_CH2 |
+                                  CX25840_VIN8_CH3 |
+                                  CX25840_COMPONENT_ON,
+                        .amux   = CX25840_AUDIO7,
+                        .gpio0  = 0x704040,
+                } },
+        },
         [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000] = {
                 .name           = "Leadtek Winfast PxDVR3200 H XC4000",
                 .porta          = CX23885_ANALOG_VIDEO,
@@ -259,6 +292,16 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "TurboSight TBS 6920",
                 .portb          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_TBS_6980] = {
+                .name           = "TurboSight TBS 6980",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_TBS_6981] = {
+                .name           = "TurboSight TBS 6981",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
         [CX23885_BOARD_TEVII_S470] = {
                 .name           = "TeVii S470",
                 .portb          = CX23885_MPEG_DVB,
@@ -688,6 +731,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
         }, {
                 .subvendor = 0x107d,
+                .subdevice = 0x6f21,
+                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
+        }, {
+                .subvendor = 0x107d,
                 .subdevice = 0x6f39,
                 .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000,
         }, {
@@ -699,6 +746,14 @@ struct cx23885_subid cx23885_subids[] = {
                 .subdevice = 0x8888,
                 .card      = CX23885_BOARD_TBS_6920,
         }, {
+                .subvendor = 0x6980,
+                .subdevice = 0x8888,
+                .card      = CX23885_BOARD_TBS_6980,
+        }, {
+                .subvendor = 0x6981,
+                .subdevice = 0x8888,
+                .card      = CX23885_BOARD_TBS_6981,
+        }, {
                 .subvendor = 0xd470,
                 .subdevice = 0x9022,
                 .card      = CX23885_BOARD_TEVII_S470,
@@ -1023,6 +1078,35 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                         dev->name, tv.model);
 }
 
+/* Some TBS cards require initing a chip using a bitbanged SPI attached
+   to the cx23885 gpio's. If this chip doesn't get init'ed the demod
+   doesn't respond to any command. */
+static void tbs_card_init(struct cx23885_dev *dev)
+{
+        int i;
+        const u8 buf[] = {
+                0xe0, 0x06, 0x66, 0x33, 0x65,
+                0x01, 0x17, 0x06, 0xde};
+
+        switch (dev->board) {
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                cx_set(GP0_IO, 0x00070007);
+                usleep_range(1000, 10000);
+                cx_clear(GP0_IO, 2);
+                usleep_range(1000, 10000);
+                for (i = 0; i < 9 * 8; i++) {
+                        cx_clear(GP0_IO, 7);
+                        usleep_range(1000, 10000);
+                        cx_set(GP0_IO,
+                                ((buf[i >> 3] >> (7 - (i & 7))) & 1) | 4);
+                        usleep_range(1000, 10000);
+                }
+                cx_set(GP0_IO, 7);
+                break;
+        }
+}
+
 int cx23885_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct cx23885_tsport *port = priv;
@@ -1043,6 +1127,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
@@ -1208,6 +1293,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x000f000f);
                 break;
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
@@ -1225,6 +1311,8 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x00040004);
                 break;
         case CX23885_BOARD_TBS_6920:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
         case CX23885_BOARD_PROF_8000:
                 cx_write(MC417_CTL, 0x00000036);
                 cx_write(MC417_OEN, 0x00001000);
@@ -1473,6 +1561,8 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 if (!enable_885_ir)
                         break;
                 dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
@@ -1516,6 +1606,8 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 cx23885_irq_remove(dev, PCI_MSK_AV_CORE);
                 /* sd_ir is a duplicate pointer to the AV Core, just clear it */
                 dev->sd_ir = NULL;
@@ -1561,6 +1653,8 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 if (dev->sd_ir)
                         cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
                 break;
@@ -1676,6 +1770,16 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                ts1->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
+                ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
+                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                tbs_card_init(dev);
+                break;
         case CX23885_BOARD_MYGICA_X8506:
         case CX23885_BOARD_MAGICPRO_PROHDTVE2:
         case CX23885_BOARD_MYGICA_X8507:
@@ -1704,6 +1808,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
@@ -1733,6 +1838,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@@ -1752,6 +1858,8 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_AVERMEDIA_HC81R:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 9f63d93239ec..edcd79db1e4e 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -2129,7 +2129,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
         }
 
         err = request_irq(pci_dev->irq, cx23885_irq,
-                          IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                          IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->name, pci_dev->irq);
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 971e4ff1b87f..05492053b473 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -51,6 +51,7 @@
 #include "stv6110.h"
 #include "lnbh24.h"
 #include "cx24116.h"
+#include "cx24117.h"
 #include "cimax2.h"
 #include "lgs8gxx.h"
 #include "netup-eeprom.h"
@@ -461,6 +462,10 @@ static struct cx24116_config tbs_cx24116_config = {
         .demod_address = 0x55,
 };
 
+static struct cx24117_config tbs_cx24117_config = {
+        .demod_address = 0x55,
+};
+
 static struct ds3000_config tevii_ds3000_config = {
         .demod_address = 0x68,
 };
@@ -1044,6 +1049,25 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
 
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                i2c_bus = &dev->i2c_bus[1];
+
+                switch (port->nr) {
+                /* PORT B */
+                case 1:
+                        fe0->dvb.frontend = dvb_attach(cx24117_attach,
+                                        &tbs_cx24117_config,
+                                        &i2c_bus->i2c_adap);
+                        break;
+                /* PORT C */
+                case 2:
+                        fe0->dvb.frontend = dvb_attach(cx24117_attach,
+                                        &tbs_cx24117_config,
+                                        &i2c_bus->i2c_adap);
+                        break;
+                }
+                break;
         case CX23885_BOARD_TEVII_S470:
                 i2c_bus = &dev->i2c_bus[1];
 
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 7875dfbe09ff..8a49e7c9eddd 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -90,6 +90,8 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 /*
                  * The only boards we handle right now.  However other boards
                  * using the CX2388x integrated IR controller should be similar
@@ -168,6 +170,8 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
                 break;
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_TEVII_S470:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 /*
                  * The IR controller on this board only returns pulse widths.
                  * Any other mode setting will fail to set up the device.
@@ -298,6 +302,14 @@ int cx23885_input_init(struct cx23885_dev *dev)
                 /* A guess at the remote */
                 rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02;
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                /* Integrated CX23885 IR controller */
+                driver_type = RC_DRIVER_IR_RAW;
+                allowed_protos = RC_BIT_ALL;
+                /* A guess at the remote */
+                rc_map = RC_MAP_TBS_NEC;
+                break;
         default:
                 return -ENODEV;
         }
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 161686832b20..7891f34157d1 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -1865,7 +1865,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
 
                         v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
 
-                        if (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) {
+                        if ((dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) ||
+                            (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200)) {
                                 struct xc2028_ctrl ctrl = {
                                         .fname = XC2028_DEFAULT_FIRMWARE,
                                         .max_len = 64
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 038caf53908b..0fa4048ab872 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -93,6 +93,9 @@
 #define CX23885_BOARD_PROF_8000                37
 #define CX23885_BOARD_HAUPPAUGE_HVR4400        38
 #define CX23885_BOARD_AVERMEDIA_HC81R          39
+#define CX23885_BOARD_TBS_6981                 40
+#define CX23885_BOARD_TBS_6980                 41
+#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 42
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
index 3b409feb03d8..f2ebc989b303 100644
--- a/drivers/media/pci/cx25821/cx25821-cards.c
+++ b/drivers/media/pci/cx25821/cx25821-cards.c
@@ -45,5 +45,3 @@ struct cx25821_board cx25821_boards[] = {
         },
 
 };
-
-const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.c b/drivers/media/pci/cx25821/cx25821-medusa-video.c
index 22fa04415ccc..43bdfa4dfba1 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.c
@@ -438,7 +438,7 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
                 decoder_count = decoder_select + 1;
         } else {
                 decoder = 0;
-                decoder_count = _num_decoders;
+                decoder_count = dev->_max_num_decoders;
         }
 
         switch (width) {
@@ -506,8 +506,6 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
                 break;
         }
 
-        _display_field_cnt[decoder] = duration;
-
         /* update hardware */
         fld_cnt = cx25821_i2c_read(&dev->i2c_bus[0], disp_cnt_reg, &tmp);
 
@@ -667,8 +665,6 @@ int medusa_video_init(struct cx25821_dev *dev)
         int ret_val = 0;
         int i = 0;
 
-        _num_decoders = dev->_max_num_decoders;
-
         /* disable Auto source selection on all video decoders */
         value = cx25821_i2c_read(&dev->i2c_bus[0], MON_A_CTRL, &tmp);
         value &= 0xFFFFF0FF;
@@ -685,8 +681,14 @@ int medusa_video_init(struct cx25821_dev *dev)
         if (ret_val < 0)
                 goto error;
 
-        for (i = 0; i < _num_decoders; i++)
-                medusa_set_decoderduration(dev, i, _display_field_cnt[i]);
+        /*
+         * FIXME: due to a coding bug the duration was always 0. It's
+         * likely that it really should be something else, but due to the
+         * lack of documentation I have no idea what it should be. For
+         * now just fill in 0 as the duration.
+         */
+        for (i = 0; i < dev->_max_num_decoders; i++)
+                medusa_set_decoderduration(dev, i, 0);
 
         /* Select monitor as DENC A input, power up the DAC */
         value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_AB_CTRL, &tmp);
@@ -717,7 +719,7 @@ int medusa_video_init(struct cx25821_dev *dev)
         /* Turn on all of the data out and control output pins. */
         value = cx25821_i2c_read(&dev->i2c_bus[0], PIN_OE_CTRL, &tmp);
         value &= 0xFEF0FE00;
-        if (_num_decoders == MAX_DECODERS) {
+        if (dev->_max_num_decoders == MAX_DECODERS) {
                 /*
                  * Note: The octal board does not support control pins(bit16-19)
                  * These bits are ignored in the octal board.
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.h b/drivers/media/pci/cx25821/cx25821-medusa-video.h
index 6175e0961855..8bf602ff27b1 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.h
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.h
@@ -40,10 +40,4 @@
 #define CONTRAST_DEFAULT                5000
 #define HUE_DEFAULT                     5000
 
-unsigned short _num_decoders;
-unsigned short _num_cameras;
-
-unsigned int _video_standard;
-int _display_field_cnt[MAX_DECODERS];
-
 #endif
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 88ffef410c50..1f43be0b04c8 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -159,10 +159,10 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_channel *chan, __le32
                  * For the upstream video channel, the risc engine will enable
                  * the FIFO. */
                 if (fifo_enable && line == 3) {
-                        *(rp++) = RISC_WRITECR;
-                        *(rp++) = sram_ch->dma_ctl;
-                        *(rp++) = FLD_VID_FIFO_EN;
-                        *(rp++) = 0x00000001;
+                        *(rp++) = cpu_to_le32(RISC_WRITECR);
+                        *(rp++) = cpu_to_le32(sram_ch->dma_ctl);
+                        *(rp++) = cpu_to_le32(FLD_VID_FIFO_EN);
+                        *(rp++) = cpu_to_le32(0x00000001);
                 }
         }
 
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index aba5b1c649e6..400eb1c42d3f 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -834,7 +834,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
 
         /* get irq */
         err = request_irq(chip->pci->irq, cx8801_irq,
-                          IRQF_SHARED | IRQF_DISABLED, chip->core->name, chip);
+                          IRQF_SHARED, chip->core->name, chip);
         if (err < 0) {
                 dprintk(0, "%s: can't get IRQ %d\n",
                        chip->core->name, chip->pci->irq);
@@ -935,8 +935,6 @@ static void cx88_audio_finidev(struct pci_dev *pci)
 
         snd_card_free((void *)card);
 
-        pci_set_drvdata(pci, NULL);
-
         devno--;
 }
 
@@ -951,27 +949,4 @@ static struct pci_driver cx88_audio_pci_driver = {
         .remove   = cx88_audio_finidev,
 };
 
-/****************************************************************************
-                                LINUX MODULE INIT
- ****************************************************************************/
-
-/*
- * module init
- */
-static int __init cx88_audio_init(void)
-{
-        printk(KERN_INFO "cx2388x alsa driver version %s loaded\n",
-               CX88_VERSION);
-        return pci_register_driver(&cx88_audio_pci_driver);
-}
-
-/*
- * module remove
- */
-static void __exit cx88_audio_fini(void)
-{
-        pci_unregister_driver(&cx88_audio_pci_driver);
-}
-
-module_init(cx88_audio_init);
-module_exit(cx88_audio_fini);
+module_pci_driver(cx88_audio_pci_driver);
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 2d3507eb4897..74b7b8614c23 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -499,7 +499,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
 
         /* get irq */
         err = request_irq(dev->pci->irq, cx8802_irq,
-                          IRQF_SHARED | IRQF_DISABLED, dev->core->name, dev);
+                          IRQF_SHARED, dev->core->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->core->name, dev->pci->irq);
@@ -520,7 +520,6 @@ static void cx8802_fini_common(struct cx8802_dev *dev)
 
         /* unregister stuff */
         free_irq(dev->pci->irq, dev);
-        pci_set_drvdata(dev->pci, NULL);
 
         /* free memory */
         btcx_riscmem_free(dev->pci,&dev->mpegq.stopper);
@@ -903,20 +902,8 @@ static struct pci_driver cx8802_pci_driver = {
         .remove   = cx8802_remove,
 };
 
-static int __init cx8802_init(void)
-{
-        printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %s loaded\n",
-               CX88_VERSION);
-        return pci_register_driver(&cx8802_pci_driver);
-}
-
-static void __exit cx8802_fini(void)
-{
-        pci_unregister_driver(&cx8802_pci_driver);
-}
+module_pci_driver(cx8802_pci_driver);
 
-module_init(cx8802_init);
-module_exit(cx8802_fini);
 EXPORT_SYMBOL(cx8802_buf_prepare);
 EXPORT_SYMBOL(cx8802_buf_queue);
 EXPORT_SYMBOL(cx8802_cancel_buffers);
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index ecf21d9f1f34..ed8cb9037b6f 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1738,7 +1738,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 
         /* get irq */
         err = request_irq(pci_dev->irq, cx8800_irq,
-                          IRQF_SHARED | IRQF_DISABLED, core->name, dev);
+                          IRQF_SHARED, core->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s/0: can't get IRQ %d\n",
                        core->name,pci_dev->irq);
@@ -1922,7 +1922,6 @@ static void cx8800_finidev(struct pci_dev *pci_dev)
 
         free_irq(pci_dev->irq, dev);
         cx8800_unregister_video(dev);
-        pci_set_drvdata(pci_dev, NULL);
 
         /* free memory */
         btcx_riscmem_free(dev->pci,&dev->vidq.stopper);
@@ -2039,17 +2038,4 @@ static struct pci_driver cx8800_pci_driver = {
 #endif
 };
 
-static int __init cx8800_init(void)
-{
-        printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %s loaded\n",
-               CX88_VERSION);
-        return pci_register_driver(&cx8800_pci_driver);
-}
-
-static void __exit cx8800_fini(void)
-{
-        pci_unregister_driver(&cx8800_pci_driver);
-}
-
-module_init(cx8800_init);
-module_exit(cx8800_fini);
+module_pci_driver(cx8800_pci_driver);
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 36e34522b9a8..9375f30d9a81 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -1544,7 +1544,7 @@ static void ddb_unmap(struct ddb *dev)
 
 static void ddb_remove(struct pci_dev *pdev)
 {
-        struct ddb *dev = (struct ddb *) pci_get_drvdata(pdev);
+        struct ddb *dev = pci_get_drvdata(pdev);
 
         ddb_ports_detach(dev);
         ddb_i2c_release(dev);
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index ab797fe466d2..e60ac35fc10c 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -1178,7 +1178,6 @@ err_pci_release_regions:
 err_pci_disable_device:
         pci_disable_device(pdev);
 err_kfree:
-        pci_set_drvdata(pdev, NULL);
         kfree(dev);
         return ret;
 }
@@ -1202,8 +1201,7 @@ static void dm1105_remove(struct pci_dev *pdev)
         dvb_dmxdev_release(&dev->dmxdev);
         dvb_dmx_release(dvbdemux);
         dvb_unregister_adapter(dvb_adapter);
-        if (&dev->i2c_adap)
-                i2c_del_adapter(&dev->i2c_adap);
+        i2c_del_adapter(&dev->i2c_adap);
 
         dm1105_hw_exit(dev);
         synchronize_irq(pdev->irq);
@@ -1211,7 +1209,6 @@ static void dm1105_remove(struct pci_dev *pdev)
         pci_iounmap(pdev, dev->io_mem);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
         dm1105_devcount--;
         kfree(dev);
 }
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index c08ae3eb9554..802642d26643 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -1261,7 +1261,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 
         /* Register IRQ */
         retval = request_irq(itv->pdev->irq, ivtv_irq_handler,
-             IRQF_SHARED | IRQF_DISABLED, itv->v4l2_dev.name, (void *)itv);
+             IRQF_SHARED, itv->v4l2_dev.name, (void *)itv);
         if (retval) {
                 IVTV_ERR("Failed to register irq %d\n", retval);
                 goto free_i2c;
diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
index a846036ea022..9e89e045213a 100644
--- a/drivers/media/pci/mantis/mantis_pci.c
+++ b/drivers/media/pci/mantis/mantis_pci.c
@@ -143,7 +143,6 @@ fail1:
 
 fail0:
         dprintk(MANTIS_ERROR, 1, "ERROR: <%d> exiting", ret);
-        pci_set_drvdata(pdev, NULL);
         return ret;
 }
 EXPORT_SYMBOL_GPL(mantis_pci_init);
@@ -161,7 +160,6 @@ void mantis_pci_exit(struct mantis_pci *mantis)
         }
 
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
 }
 EXPORT_SYMBOL_GPL(mantis_pci_exit);
 
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 2381b05432e6..54d5c821007c 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1698,7 +1698,7 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
 
         meye.mchip_irq = pcidev->irq;
         if (request_irq(meye.mchip_irq, meye_irq,
-                        IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) {
+                        IRQF_SHARED, "meye", meye_irq)) {
                 v4l2_err(v4l2_dev, "request_irq failed\n");
                 goto outreqirq;
         }
diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
index 37ebc42392ad..970e83308525 100644
--- a/drivers/media/pci/ngene/ngene-core.c
+++ b/drivers/media/pci/ngene/ngene-core.c
@@ -1622,7 +1622,7 @@ static void ngene_unlink(struct ngene *dev)
 
 void ngene_shutdown(struct pci_dev *pdev)
 {
-        struct ngene *dev = (struct ngene *)pci_get_drvdata(pdev);
+        struct ngene *dev = pci_get_drvdata(pdev);
 
         if (!dev || !shutdown_workaround)
                 return;
@@ -1648,7 +1648,6 @@ void ngene_remove(struct pci_dev *pdev)
                 cxd_detach(dev);
         ngene_stop(dev);
         ngene_release_buffers(dev);
-        pci_set_drvdata(pdev, NULL);
         pci_disable_device(pdev);
 }
 
@@ -1702,6 +1701,5 @@ fail1:
         ngene_release_buffers(dev);
 fail0:
         pci_disable_device(pci_dev);
-        pci_set_drvdata(pci_dev, NULL);
         return stat;
 }
diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
index 493828500055..8164d74b46a4 100644
--- a/drivers/media/pci/pluto2/pluto2.c
+++ b/drivers/media/pci/pluto2/pluto2.c
@@ -736,7 +736,6 @@ err_pci_release_regions:
 err_pci_disable_device:
         pci_disable_device(pdev);
 err_kfree:
-        pci_set_drvdata(pdev, NULL);
         kfree(pluto);
         goto out;
 }
@@ -765,7 +764,6 @@ static void pluto2_remove(struct pci_dev *pdev)
         pci_iounmap(pdev, pluto->io_mem);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
         kfree(pluto);
 }
 
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
index 75ce14229e03..db887b0c37b1 100644
--- a/drivers/media/pci/pt1/pt1.c
+++ b/drivers/media/pci/pt1/pt1.c
@@ -1076,7 +1076,6 @@ static void pt1_remove(struct pci_dev *pdev)
         pt1_update_power(pt1);
         pt1_cleanup_adapters(pt1);
         i2c_del_adapter(&pt1->i2c_adap);
-        pci_set_drvdata(pdev, NULL);
         kfree(pt1);
         pci_iounmap(pdev, regs);
         pci_release_regions(pdev);
@@ -1198,7 +1197,6 @@ err_i2c_del_adapter:
 err_pt1_cleanup_adapters:
         pt1_cleanup_adapters(pt1);
 err_kfree:
-        pci_set_drvdata(pdev, NULL);
         kfree(pt1);
 err_pci_iounmap:
         pci_iounmap(pdev, regs);
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index dbcdfbf8aed0..dd67c8a400cc 100644
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -1096,7 +1096,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
 
 
         err = request_irq(dev->pci->irq, saa7134_alsa_irq,
-                                IRQF_SHARED | IRQF_DISABLED, dev->name,
+                                IRQF_SHARED, dev->name,
                                 (void*) &dev->dmasound);
 
         if (err < 0) {
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 45f0aca597ae..27d7ee709c58 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -992,7 +992,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
 
         /* get irq */
         err = request_irq(pci_dev->irq, saa7134_irq,
-                          IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                          IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->name,pci_dev->irq);
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index d37ee37aaefe..57ef5456f1e8 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1232,7 +1232,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
         }
 
         err = request_irq(pci_dev->irq, saa7164_irq,
-                IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
                         pci_dev->irq);
@@ -1439,7 +1439,6 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
 
         /* unregister stuff */
         free_irq(pci_dev->irq, dev);
-        pci_set_drvdata(pci_dev, NULL);
 
         mutex_lock(&devlist);
         list_del(&dev->devlist);
diff --git a/drivers/media/pci/ttpci/av7110_hw.c b/drivers/media/pci/ttpci/av7110_hw.c
index f1cbfe526989..6299d5dadb82 100644
--- a/drivers/media/pci/ttpci/av7110_hw.c
+++ b/drivers/media/pci/ttpci/av7110_hw.c
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
  *
- * the project's page is at http://www.linuxtv.org/ 
+ * the project's page is at http://www.linuxtv.org/
  */
 
 /* for debugging ARM communication: */
@@ -40,6 +40,14 @@
 
 #define _NOHANDSHAKE
 
+/*
+ * Max transfer size done by av7110_fw_cmd()
+ *
+ * The maximum size passed to this function is 6 bytes. The buffer also
+ * uses two additional ones for type and size. So, 8 bytes is enough.
+ */
+#define MAX_XFER_SIZE  8
+
 /****************************************************************************
  * DEBI functions
  ****************************************************************************/
@@ -488,11 +496,18 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
 int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
 {
         va_list args;
-        u16 buf[num + 2];
+        u16 buf[MAX_XFER_SIZE];
         int i, ret;
 
 //      dprintk(4, "%p\n", av7110);
 
+        if (2 + num > sizeof(buf)) {
+                printk(KERN_WARNING
+                       "%s: %s len=%d is too big!\n",
+                       KBUILD_MODNAME, __func__, num);
+                return -EINVAL;
+        }
+
         buf[0] = ((type << 8) | com);
         buf[1] = num;
 
diff --git a/drivers/media/pci/zoran/Kconfig b/drivers/media/pci/zoran/Kconfig
index 26ca8702e33f..39ec35bd21a5 100644
--- a/drivers/media/pci/zoran/Kconfig
+++ b/drivers/media/pci/zoran/Kconfig
@@ -1,6 +1,7 @@
 config VIDEO_ZORAN
         tristate "Zoran ZR36057/36067 Video For Linux"
         depends on PCI && I2C_ALGOBIT && VIDEO_V4L2 && VIRT_TO_BUS
+        depends on !ALPHA
         help
           Say Y for support for MJPEG capture cards based on the Zoran
           36057/36067 PCI controller chipset. This includes the Iomega
diff --git a/drivers/media/pci/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c
index 923d59a321f8..cec5b7553f28 100644
--- a/drivers/media/pci/zoran/zoran_card.c
+++ b/drivers/media/pci/zoran/zoran_card.c
@@ -1293,7 +1293,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         result = request_irq(zr->pci_dev->irq, zoran_irq,
-                             IRQF_SHARED | IRQF_DISABLED, ZR_DEVNAME(zr), zr);
+                             IRQF_SHARED, ZR_DEVNAME(zr), zr);
         if (result < 0) {
                 if (result == -EINVAL) {
                         dprintk(1,
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index eb70dda8cbf3..d7f0249e4050 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -143,6 +143,7 @@ if V4L_MEM2MEM_DRIVERS
 config VIDEO_CODA
         tristate "Chips&Media Coda multi-standard codec IP"
         depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC
+        select SRAM
         select VIDEOBUF2_DMA_CONTIG
         select V4L2_MEM2MEM_DEV
         ---help---
@@ -212,7 +213,7 @@ config VIDEO_SH_VEU
 
 config VIDEO_RENESAS_VSP1
         tristate "Renesas VSP1 Video Processing Engine"
-        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
         select VIDEOBUF2_DMA_CONTIG
         ---help---
           This is a V4L2 driver for the Renesas VSP1 video processing engine.
@@ -220,6 +221,22 @@ config VIDEO_RENESAS_VSP1
           To compile this driver as a module, choose M here: the module
           will be called vsp1.
 
+config VIDEO_TI_VPE
+        tristate "TI VPE (Video Processing Engine) driver"
+        depends on VIDEO_DEV && VIDEO_V4L2 && SOC_DRA7XX
+        select VIDEOBUF2_DMA_CONTIG
+        select V4L2_MEM2MEM_DEV
+        default n
+        ---help---
+          Support for the TI VPE(Video Processing Engine) block
+          found on DRA7XX SoC.
+
+config VIDEO_TI_VPE_DEBUG
+        bool "VPE debug messages"
+        depends on VIDEO_TI_VPE
+        ---help---
+          Enable debug messages on VPE driver.
+
 endif # V4L_MEM2MEM_DRIVERS
 
 menuconfig V4L_TEST_DRIVERS
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 4e4da482c522..1348ba1faf92 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_VIDEO_VIVI) += vivi.o
 
 obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
 
+obj-$(CONFIG_VIDEO_TI_VPE)              += ti-vpe/
+
 obj-$(CONFIG_VIDEO_MX2_EMMAPRP)         += mx2_emmaprp.o
 obj-$(CONFIG_VIDEO_CODA)                += coda.o
 
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 4993610051ee..bd72fb97fea5 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -39,7 +39,7 @@
 
 #define CODA_NAME               "coda"
 
-#define CODA_MAX_INSTANCES      4
+#define CODADX6_MAX_INSTANCES   4
 
 #define CODA_FMO_BUF_SIZE       32
 #define CODADX6_WORK_BUF_SIZE   (288 * 1024 + CODA_FMO_BUF_SIZE * 8 * 1024)
@@ -54,8 +54,6 @@
 
 #define CODA_MAX_FRAMEBUFFERS   8
 
-#define MAX_W           8192
-#define MAX_H           8192
 #define CODA_MAX_FRAME_SIZE     0x100000
 #define FMO_SLICE_SAVE_BUF_SIZE         (32)
 #define CODA_DEFAULT_GAMMA              4096
@@ -394,14 +392,57 @@ static struct coda_codec *coda_find_codec(struct coda_dev *dev, int src_fourcc,
         return &codecs[k];
 }
 
+static void coda_get_max_dimensions(struct coda_dev *dev,
+                                    struct coda_codec *codec,
+                                    int *max_w, int *max_h)
+{
+        struct coda_codec *codecs = dev->devtype->codecs;
+        int num_codecs = dev->devtype->num_codecs;
+        unsigned int w, h;
+        int k;
+
+        if (codec) {
+                w = codec->max_w;
+                h = codec->max_h;
+        } else {
+                for (k = 0, w = 0, h = 0; k < num_codecs; k++) {
+                        w = max(w, codecs[k].max_w);
+                        h = max(h, codecs[k].max_h);
+                }
+        }
+
+        if (max_w)
+                *max_w = w;
+        if (max_h)
+                *max_h = h;
+}
+
+static char *coda_product_name(int product)
+{
+        static char buf[9];
+
+        switch (product) {
+        case CODA_DX6:
+                return "CodaDx6";
+        case CODA_7541:
+                return "CODA7541";
+        default:
+                snprintf(buf, sizeof(buf), "(0x%04x)", product);
+                return buf;
+        }
+}
+
 /*
  * V4L2 ioctl() operations.
  */
-static int vidioc_querycap(struct file *file, void *priv,
-                           struct v4l2_capability *cap)
+static int coda_querycap(struct file *file, void *priv,
+                         struct v4l2_capability *cap)
 {
+        struct coda_ctx *ctx = fh_to_ctx(priv);
+
         strlcpy(cap->driver, CODA_NAME, sizeof(cap->driver));
-        strlcpy(cap->card, CODA_NAME, sizeof(cap->card));
+        strlcpy(cap->card, coda_product_name(ctx->dev->devtype->product),
+                sizeof(cap->card));
         strlcpy(cap->bus_info, "platform:" CODA_NAME, sizeof(cap->bus_info));
         /*
          * This is only a mem-to-mem video device. The capture and output
@@ -457,6 +498,8 @@ static int enum_fmt(void *priv, struct v4l2_fmtdesc *f,
                 fmt = &formats[i];
                 strlcpy(f->description, fmt->name, sizeof(f->description));
                 f->pixelformat = fmt->fourcc;
+                if (!coda_format_is_yuv(fmt->fourcc))
+                        f->flags |= V4L2_FMT_FLAG_COMPRESSED;
                 return 0;
         }
 
@@ -464,8 +507,8 @@ static int enum_fmt(void *priv, struct v4l2_fmtdesc *f,
         return -EINVAL;
 }
 
-static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
-                                   struct v4l2_fmtdesc *f)
+static int coda_enum_fmt_vid_cap(struct file *file, void *priv,
+                                 struct v4l2_fmtdesc *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         struct vb2_queue *src_vq;
@@ -483,13 +526,14 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
         return enum_fmt(priv, f, V4L2_BUF_TYPE_VIDEO_CAPTURE, 0);
 }
 
-static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
-                                   struct v4l2_fmtdesc *f)
+static int coda_enum_fmt_vid_out(struct file *file, void *priv,
+                                 struct v4l2_fmtdesc *f)
 {
         return enum_fmt(priv, f, V4L2_BUF_TYPE_VIDEO_OUTPUT, 0);
 }
 
-static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
+static int coda_g_fmt(struct file *file, void *priv,
+                      struct v4l2_format *f)
 {
         struct vb2_queue *vq;
         struct coda_q_data *q_data;
@@ -516,8 +560,11 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
         return 0;
 }
 
-static int vidioc_try_fmt(struct coda_codec *codec, struct v4l2_format *f)
+static int coda_try_fmt(struct coda_ctx *ctx, struct coda_codec *codec,
+                        struct v4l2_format *f)
 {
+        struct coda_dev *dev = ctx->dev;
+        struct coda_q_data *q_data;
         unsigned int max_w, max_h;
         enum v4l2_field field;
 
@@ -531,32 +578,48 @@ static int vidioc_try_fmt(struct coda_codec *codec, struct v4l2_format *f)
          * if any of the dimensions is unsupported */
         f->fmt.pix.field = field;
 
-        if (codec) {
-                max_w = codec->max_w;
-                max_h = codec->max_h;
-        } else {
-                max_w = MAX_W;
-                max_h = MAX_H;
+        coda_get_max_dimensions(dev, codec, &max_w, &max_h);
+        v4l_bound_align_image(&f->fmt.pix.width, MIN_W, max_w, W_ALIGN,
+                              &f->fmt.pix.height, MIN_H, max_h, H_ALIGN,
+                              S_ALIGN);
+
+        switch (f->fmt.pix.pixelformat) {
+        case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_YVU420:
+        case V4L2_PIX_FMT_H264:
+        case V4L2_PIX_FMT_MPEG4:
+        case V4L2_PIX_FMT_JPEG:
+                break;
+        default:
+                q_data = get_q_data(ctx, f->type);
+                f->fmt.pix.pixelformat = q_data->fourcc;
         }
-        v4l_bound_align_image(&f->fmt.pix.width, MIN_W, max_w,
-                              W_ALIGN, &f->fmt.pix.height,
-                              MIN_H, max_h, H_ALIGN, S_ALIGN);
 
-        if (coda_format_is_yuv(f->fmt.pix.pixelformat)) {
+        switch (f->fmt.pix.pixelformat) {
+        case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_YVU420:
                 /* Frame stride must be multiple of 8 */
                 f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 8);
                 f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
                                         f->fmt.pix.height * 3 / 2;
-        } else { /*encoded formats h.264/mpeg4 */
+                break;
+        case V4L2_PIX_FMT_H264:
+        case V4L2_PIX_FMT_MPEG4:
+        case V4L2_PIX_FMT_JPEG:
                 f->fmt.pix.bytesperline = 0;
                 f->fmt.pix.sizeimage = CODA_MAX_FRAME_SIZE;
+                break;
+        default:
+                BUG();
         }
 
+        f->fmt.pix.priv = 0;
+
         return 0;
 }
 
-static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
-                                  struct v4l2_format *f)
+static int coda_try_fmt_vid_cap(struct file *file, void *priv,
+                                struct v4l2_format *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         struct coda_codec *codec;
@@ -584,7 +647,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 
         f->fmt.pix.colorspace = ctx->colorspace;
 
-        ret = vidioc_try_fmt(codec, f);
+        ret = coda_try_fmt(ctx, codec, f);
         if (ret < 0)
                 return ret;
 
@@ -600,8 +663,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
-                                  struct v4l2_format *f)
+static int coda_try_fmt_vid_out(struct file *file, void *priv,
+                                struct v4l2_format *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         struct coda_codec *codec;
@@ -613,10 +676,10 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
         if (!f->fmt.pix.colorspace)
                 f->fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
 
-        return vidioc_try_fmt(codec, f);
+        return coda_try_fmt(ctx, codec, f);
 }
 
-static int vidioc_s_fmt(struct coda_ctx *ctx, struct v4l2_format *f)
+static int coda_s_fmt(struct coda_ctx *ctx, struct v4l2_format *f)
 {
         struct coda_q_data *q_data;
         struct vb2_queue *vq;
@@ -646,61 +709,62 @@ static int vidioc_s_fmt(struct coda_ctx *ctx, struct v4l2_format *f)
         return 0;
 }
 
-static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
-                                struct v4l2_format *f)
+static int coda_s_fmt_vid_cap(struct file *file, void *priv,
+                              struct v4l2_format *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         int ret;
 
-        ret = vidioc_try_fmt_vid_cap(file, priv, f);
+        ret = coda_try_fmt_vid_cap(file, priv, f);
         if (ret)
                 return ret;
 
-        return vidioc_s_fmt(ctx, f);
+        return coda_s_fmt(ctx, f);
 }
 
-static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
-                                struct v4l2_format *f)
+static int coda_s_fmt_vid_out(struct file *file, void *priv,
+                              struct v4l2_format *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         int ret;
 
-        ret = vidioc_try_fmt_vid_out(file, priv, f);
+        ret = coda_try_fmt_vid_out(file, priv, f);
         if (ret)
                 return ret;
 
-        ret = vidioc_s_fmt(ctx, f);
+        ret = coda_s_fmt(ctx, f);
         if (ret)
                 ctx->colorspace = f->fmt.pix.colorspace;
 
         return ret;
 }
 
-static int vidioc_reqbufs(struct file *file, void *priv,
-                          struct v4l2_requestbuffers *reqbufs)
+static int coda_reqbufs(struct file *file, void *priv,
+                        struct v4l2_requestbuffers *reqbufs)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
 
         return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
 }
 
-static int vidioc_querybuf(struct file *file, void *priv,
-                           struct v4l2_buffer *buf)
+static int coda_querybuf(struct file *file, void *priv,
+                         struct v4l2_buffer *buf)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
 
         return v4l2_m2m_querybuf(file, ctx->m2m_ctx, buf);
 }
 
-static int vidioc_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+static int coda_qbuf(struct file *file, void *priv,
+                     struct v4l2_buffer *buf)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
 
         return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf);
 }
 
-static int vidioc_expbuf(struct file *file, void *priv,
-                         struct v4l2_exportbuffer *eb)
+static int coda_expbuf(struct file *file, void *priv,
+                       struct v4l2_exportbuffer *eb)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
 
@@ -718,7 +782,8 @@ static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx,
                 (buf->sequence == (ctx->qsequence - 1)));
 }
 
-static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+static int coda_dqbuf(struct file *file, void *priv,
+                      struct v4l2_buffer *buf)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         int ret;
@@ -738,24 +803,24 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
         return ret;
 }
 
-static int vidioc_create_bufs(struct file *file, void *priv,
-                              struct v4l2_create_buffers *create)
+static int coda_create_bufs(struct file *file, void *priv,
+                            struct v4l2_create_buffers *create)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
 
         return v4l2_m2m_create_bufs(file, ctx->m2m_ctx, create);
 }
 
-static int vidioc_streamon(struct file *file, void *priv,
-                           enum v4l2_buf_type type)
+static int coda_streamon(struct file *file, void *priv,
+                         enum v4l2_buf_type type)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
 
         return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
 }
 
-static int vidioc_streamoff(struct file *file, void *priv,
-                            enum v4l2_buf_type type)
+static int coda_streamoff(struct file *file, void *priv,
+                          enum v4l2_buf_type type)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
         int ret;
@@ -772,23 +837,34 @@ static int vidioc_streamoff(struct file *file, void *priv,
         return ret;
 }
 
-static int vidioc_decoder_cmd(struct file *file, void *fh,
-                              struct v4l2_decoder_cmd *dc)
+static int coda_try_decoder_cmd(struct file *file, void *fh,
+                                struct v4l2_decoder_cmd *dc)
 {
-        struct coda_ctx *ctx = fh_to_ctx(fh);
-
         if (dc->cmd != V4L2_DEC_CMD_STOP)
                 return -EINVAL;
 
-        if ((dc->flags & V4L2_DEC_CMD_STOP_TO_BLACK) ||
-            (dc->flags & V4L2_DEC_CMD_STOP_IMMEDIATELY))
+        if (dc->flags & V4L2_DEC_CMD_STOP_TO_BLACK)
                 return -EINVAL;
 
-        if (dc->stop.pts != 0)
+        if (!(dc->flags & V4L2_DEC_CMD_STOP_IMMEDIATELY) && (dc->stop.pts != 0))
                 return -EINVAL;
 
+        return 0;
+}
+
+static int coda_decoder_cmd(struct file *file, void *fh,
+                            struct v4l2_decoder_cmd *dc)
+{
+        struct coda_ctx *ctx = fh_to_ctx(fh);
+        int ret;
+
+        ret = coda_try_decoder_cmd(file, fh, dc);
+        if (ret < 0)
+                return ret;
+
+        /* Ignore decoder stop command silently in encoder context */
         if (ctx->inst_type != CODA_INST_DECODER)
-                return -EINVAL;
+                return 0;
 
         /* Set the strem-end flag on this context */
         ctx->bit_stream_param |= CODA_BIT_STREAM_END_FLAG;
@@ -796,8 +872,8 @@ static int vidioc_decoder_cmd(struct file *file, void *fh,
         return 0;
 }
 
-static int vidioc_subscribe_event(struct v4l2_fh *fh,
-                                  const struct v4l2_event_subscription *sub)
+static int coda_subscribe_event(struct v4l2_fh *fh,
+                                const struct v4l2_event_subscription *sub)
 {
         switch (sub->type) {
         case V4L2_EVENT_EOS:
@@ -808,32 +884,33 @@ static int vidioc_subscribe_event(struct v4l2_fh *fh,
 }
 
 static const struct v4l2_ioctl_ops coda_ioctl_ops = {
-        .vidioc_querycap        = vidioc_querycap,
+        .vidioc_querycap        = coda_querycap,
 
-        .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
-        .vidioc_g_fmt_vid_cap   = vidioc_g_fmt,
-        .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap,
-        .vidioc_s_fmt_vid_cap   = vidioc_s_fmt_vid_cap,
+        .vidioc_enum_fmt_vid_cap = coda_enum_fmt_vid_cap,
+        .vidioc_g_fmt_vid_cap   = coda_g_fmt,
+        .vidioc_try_fmt_vid_cap = coda_try_fmt_vid_cap,
+        .vidioc_s_fmt_vid_cap   = coda_s_fmt_vid_cap,
 
-        .vidioc_enum_fmt_vid_out = vidioc_enum_fmt_vid_out,
-        .vidioc_g_fmt_vid_out   = vidioc_g_fmt,
-        .vidioc_try_fmt_vid_out = vidioc_try_fmt_vid_out,
-        .vidioc_s_fmt_vid_out   = vidioc_s_fmt_vid_out,
+        .vidioc_enum_fmt_vid_out = coda_enum_fmt_vid_out,
+        .vidioc_g_fmt_vid_out   = coda_g_fmt,
+        .vidioc_try_fmt_vid_out = coda_try_fmt_vid_out,
+        .vidioc_s_fmt_vid_out   = coda_s_fmt_vid_out,
 
-        .vidioc_reqbufs         = vidioc_reqbufs,
-        .vidioc_querybuf        = vidioc_querybuf,
+        .vidioc_reqbufs         = coda_reqbufs,
+        .vidioc_querybuf        = coda_querybuf,
 
-        .vidioc_qbuf            = vidioc_qbuf,
-        .vidioc_expbuf          = vidioc_expbuf,
-        .vidioc_dqbuf           = vidioc_dqbuf,
-        .vidioc_create_bufs     = vidioc_create_bufs,
+        .vidioc_qbuf            = coda_qbuf,
+        .vidioc_expbuf          = coda_expbuf,
+        .vidioc_dqbuf           = coda_dqbuf,
+        .vidioc_create_bufs     = coda_create_bufs,
 
-        .vidioc_streamon        = vidioc_streamon,
-        .vidioc_streamoff       = vidioc_streamoff,
+        .vidioc_streamon        = coda_streamon,
+        .vidioc_streamoff       = coda_streamoff,
 
-        .vidioc_decoder_cmd     = vidioc_decoder_cmd,
+        .vidioc_try_decoder_cmd = coda_try_decoder_cmd,
+        .vidioc_decoder_cmd     = coda_decoder_cmd,
 
-        .vidioc_subscribe_event = vidioc_subscribe_event,
+        .vidioc_subscribe_event = coda_subscribe_event,
         .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
 
@@ -1928,8 +2005,9 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
         if (!(ctx->streamon_out & ctx->streamon_cap))
                 return 0;
 
-        /* Allow device_run with no buffers queued and after streamoff */
-        v4l2_m2m_set_src_buffered(ctx->m2m_ctx, true);
+        /* Allow decoder device_run with no new buffers queued */
+        if (ctx->inst_type == CODA_INST_DECODER)
+                v4l2_m2m_set_src_buffered(ctx->m2m_ctx, true);
 
         ctx->gopcounter = ctx->params.gop_size - 1;
         buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
@@ -2071,10 +2149,8 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
         coda_setup_iram(ctx);
 
         if (dst_fourcc == V4L2_PIX_FMT_H264) {
-                value  = (FMO_SLICE_SAVE_BUF_SIZE << 7);
-                value |= (0 & CODA_FMOPARAM_TYPE_MASK) << CODA_FMOPARAM_TYPE_OFFSET;
-                value |=  0 & CODA_FMOPARAM_SLICENUM_MASK;
                 if (dev->devtype->product == CODA_DX6) {
+                        value = FMO_SLICE_SAVE_BUF_SIZE << 7;
                         coda_write(dev, value, CODADX6_CMD_ENC_SEQ_FMO);
                 } else {
                         coda_write(dev, ctx->iram_info.search_ram_paddr,
@@ -2371,7 +2447,13 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
 
 static int coda_next_free_instance(struct coda_dev *dev)
 {
-        return ffz(dev->instance_mask);
+        int idx = ffz(dev->instance_mask);
+
+        if ((idx < 0) ||
+            (dev->devtype->product == CODA_DX6 && idx > CODADX6_MAX_INSTANCES))
+                return -EBUSY;
+
+        return idx;
 }
 
 static int coda_open(struct file *file)
@@ -2386,8 +2468,8 @@ static int coda_open(struct file *file)
                 return -ENOMEM;
 
         idx = coda_next_free_instance(dev);
-        if (idx >= CODA_MAX_INSTANCES) {
-                ret = -EBUSY;
+        if (idx < 0) {
+                ret = idx;
                 goto err_coda_max;
         }
         set_bit(idx, &dev->instance_mask);
@@ -2719,7 +2801,6 @@ static void coda_finish_encode(struct coda_ctx *ctx)
         dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
 
         /* Get results from the coda */
-        coda_read(dev, CODA_RET_ENC_PIC_TYPE);
         start_ptr = coda_read(dev, CODA_CMD_ENC_PIC_BB_START);
         wr_ptr = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx));
 
@@ -2739,7 +2820,7 @@ static void coda_finish_encode(struct coda_ctx *ctx)
         coda_read(dev, CODA_RET_ENC_PIC_SLICE_NUM);
         coda_read(dev, CODA_RET_ENC_PIC_FLAG);
 
-        if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) {
+        if (coda_read(dev, CODA_RET_ENC_PIC_TYPE) == 0) {
                 dst_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
                 dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_PFRAME;
         } else {
@@ -2861,21 +2942,6 @@ static bool coda_firmware_supported(u32 vernum)
         return false;
 }
 
-static char *coda_product_name(int product)
-{
-        static char buf[9];
-
-        switch (product) {
-        case CODA_DX6:
-                return "CodaDx6";
-        case CODA_7541:
-                return "CODA7541";
-        default:
-                snprintf(buf, sizeof(buf), "(0x%04x)", product);
-                return buf;
-        }
-}
-
 static int coda_hw_init(struct coda_dev *dev)
 {
         u16 product, major, minor, release;
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 04609cc6eba7..eac472b5ae83 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -1785,7 +1785,7 @@ static int vpbe_display_probe(struct platform_device *pdev)
         }
 
         irq = res->start;
-        err = devm_request_irq(&pdev->dev, irq, venc_isr, IRQF_DISABLED,
+        err = devm_request_irq(&pdev->dev, irq, venc_isr, 0,
                                VPBE_DISPLAY_DRIVER, disp_dev);
         if (err) {
                 v4l2_err(&disp_dev->vpbe_dev->v4l2_dev,
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 93609091cb23..d762246eabf5 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -688,7 +688,7 @@ static int vpfe_attach_irq(struct vpfe_device *vpfe_dev)
         frame_format = ccdc_dev->hw_ops.get_frame_format();
         if (frame_format == CCDC_FRMFMT_PROGRESSIVE) {
                 return request_irq(vpfe_dev->ccdc_irq1, vdint1_isr,
-                                    IRQF_DISABLED, "vpfe_capture1",
+                                    0, "vpfe_capture1",
                                     vpfe_dev);
         }
         return 0;
@@ -1863,7 +1863,7 @@ static int vpfe_probe(struct platform_device *pdev)
         }
         vpfe_dev->ccdc_irq1 = res1->start;
 
-        ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, IRQF_DISABLED,
+        ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, 0,
                           "vpfe_capture0", vpfe_dev);
 
         if (0 != ret) {
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 1089834a4efe..52ac5e6c8625 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -2154,7 +2154,7 @@ static __init int vpif_probe(struct platform_device *pdev)
 
                         if (!vpif_obj.sd[i]) {
                                 vpif_err("Error registering v4l2 subdevice\n");
-                                err = -ENOMEM;
+                                err = -ENODEV;
                                 goto probe_subdev_out;
                         }
                         v4l2_info(&vpif_obj.v4l2_dev,
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
index 76435d3bf62d..ef0a6564cef9 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
@@ -45,6 +45,7 @@
 #define GSC_DST_FMT                     (1 << 2)
 #define GSC_CTX_M2M                     (1 << 3)
 #define GSC_CTX_STOP_REQ                (1 << 6)
+#define GSC_CTX_ABORT                   (1 << 7)
 
 enum gsc_dev_flags {
         /* for global */
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index e576ff2de3de..810c3e13970c 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -46,6 +46,17 @@ static int gsc_m2m_ctx_stop_req(struct gsc_ctx *ctx)
         return ret == 0 ? -ETIMEDOUT : ret;
 }
 
+static void __gsc_m2m_job_abort(struct gsc_ctx *ctx)
+{
+        int ret;
+
+        ret = gsc_m2m_ctx_stop_req(ctx);
+        if ((ret == -ETIMEDOUT) || (ctx->state & GSC_CTX_ABORT)) {
+                gsc_ctx_state_lock_clear(GSC_CTX_STOP_REQ | GSC_CTX_ABORT, ctx);
+                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
+        }
+}
+
 static int gsc_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
 {
         struct gsc_ctx *ctx = q->drv_priv;
@@ -58,11 +69,8 @@ static int gsc_m2m_start_streaming(struct vb2_queue *q, unsigned int count)
 static int gsc_m2m_stop_streaming(struct vb2_queue *q)
 {
         struct gsc_ctx *ctx = q->drv_priv;
-        int ret;
 
-        ret = gsc_m2m_ctx_stop_req(ctx);
-        if (ret == -ETIMEDOUT)
-                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
+        __gsc_m2m_job_abort(ctx);
 
         pm_runtime_put(&ctx->gsc_dev->pdev->dev);
 
@@ -91,15 +99,9 @@ void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state)
         }
 }
 
-
 static void gsc_m2m_job_abort(void *priv)
 {
-        struct gsc_ctx *ctx = priv;
-        int ret;
-
-        ret = gsc_m2m_ctx_stop_req(ctx);
-        if (ret == -ETIMEDOUT)
-                gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
+        __gsc_m2m_job_abort((struct gsc_ctx *)priv);
 }
 
 static int gsc_get_bufs(struct gsc_ctx *ctx)
@@ -150,9 +152,10 @@ static void gsc_m2m_device_run(void *priv)
                 gsc->m2m.ctx = ctx;
         }
 
-        is_set = (ctx->state & GSC_CTX_STOP_REQ) ? 1 : 0;
-        ctx->state &= ~GSC_CTX_STOP_REQ;
+        is_set = ctx->state & GSC_CTX_STOP_REQ;
         if (is_set) {
+                ctx->state &= ~GSC_CTX_STOP_REQ;
+                ctx->state |= GSC_CTX_ABORT;
                 wake_up(&gsc->irq_queue);
                 goto put_device;
         }
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/exynos4-is/fimc-isp.c
index d2e6cba3566d..f3c6136aa5b4 100644
--- a/drivers/media/platform/exynos4-is/fimc-isp.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp.c
@@ -511,7 +511,7 @@ static int __ctrl_set_metering(struct fimc_is *is, unsigned int value)
                 break;
         default:
                 return -EINVAL;
-        };
+        }
 
         __is_set_isp_metering(is, IS_METERING_CONFIG_CMD, val);
         return 0;
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index a83511278317..7a4ee4c0449d 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -411,8 +411,8 @@ static int fimc_md_of_add_sensor(struct fimc_md *fmd,
 
         device_lock(&client->dev);
 
-        if (!client->driver ||
-            !try_module_get(client->driver->driver.owner)) {
+        if (!client->dev.driver ||
+            !try_module_get(client->dev.driver->owner)) {
                 ret = -EPROBE_DEFER;
                 v4l2_info(&fmd->v4l2_dev, "No driver found for %s\n",
                                                 node->full_name);
@@ -442,7 +442,7 @@ static int fimc_md_of_add_sensor(struct fimc_md *fmd,
         fmd->num_sensors++;
 
 mod_put:
-        module_put(client->driver->driver.owner);
+        module_put(client->dev.driver->owner);
 dev_put:
         device_unlock(&client->dev);
         put_device(&client->dev);
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 540516ca872c..36513e896413 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -1084,8 +1084,7 @@ free_dev:
 
 static int deinterlace_remove(struct platform_device *pdev)
 {
-        struct deinterlace_dev *pcdev =
-                (struct deinterlace_dev *)platform_get_drvdata(pdev);
+        struct deinterlace_dev *pcdev = platform_get_drvdata(pdev);
 
         v4l2_info(&pcdev->v4l2_dev, "Removing " MEM2MEM_TEST_MODULE_NAME);
         v4l2_m2m_release(pcdev->m2m_dev);
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 5184887b155c..32fab30a9105 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1221,16 +1221,16 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
 {
         struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
         struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
-        struct vb2_dma_sg_desc *sgd = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
         struct mcam_dma_desc *desc = mvb->dma_desc;
         struct scatterlist *sg;
         int i;
 
-        mvb->dma_desc_nent = dma_map_sg(cam->dev, sgd->sglist, sgd->num_pages,
-                        DMA_FROM_DEVICE);
+        mvb->dma_desc_nent = dma_map_sg(cam->dev, sg_table->sgl,
+                        sg_table->nents, DMA_FROM_DEVICE);
         if (mvb->dma_desc_nent <= 0)
                 return -EIO;  /* Not sure what's right here */
-        for_each_sg(sgd->sglist, sg, mvb->dma_desc_nent, i) {
+        for_each_sg(sg_table->sgl, sg, mvb->dma_desc_nent, i) {
                 desc->dma_addr = sg_dma_address(sg);
                 desc->segment_len = sg_dma_len(sg);
                 desc++;
@@ -1241,9 +1241,11 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
 static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
 {
         struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
-        struct vb2_dma_sg_desc *sgd = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
 
-        dma_unmap_sg(cam->dev, sgd->sglist, sgd->num_pages, DMA_FROM_DEVICE);
+        if (sg_table)
+                dma_unmap_sg(cam->dev, sg_table->sgl,
+                                sg_table->nents, DMA_FROM_DEVICE);
         return 0;
 }
 
diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c
index b5a19af5c587..3458fa0e2fd5 100644
--- a/drivers/media/platform/marvell-ccic/mmp-driver.c
+++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
@@ -481,7 +481,6 @@ static int mmpcam_remove(struct mmp_camera *cam)
         struct mmp_camera_platform_data *pdata;
 
         mmpcam_remove_device(cam);
-        free_irq(cam->irq, mcam);
         mccic_shutdown(mcam);
         mmpcam_power_down(mcam);
         pdata = cam->pdev->dev.platform_data;
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index 6a17676f9d72..8df5975b700a 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -1090,8 +1090,7 @@ unreg_dev:
 
 static int m2mtest_remove(struct platform_device *pdev)
 {
-        struct m2mtest_dev *dev =
-                (struct m2mtest_dev *)platform_get_drvdata(pdev);
+        struct m2mtest_dev *dev = platform_get_drvdata(pdev);
 
         v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_TEST_MODULE_NAME);
         v4l2_m2m_release(dev->m2m_dev);
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index fd6289d60cde..0b2948376aee 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -840,7 +840,7 @@ put_clk:
 
 static int g2d_remove(struct platform_device *pdev)
 {
-        struct g2d_dev *dev = (struct g2d_dev *)platform_get_drvdata(pdev);
+        struct g2d_dev *dev = platform_get_drvdata(pdev);
 
         v4l2_info(&dev->v4l2_dev, "Removing " G2D_NAME);
         v4l2_m2m_release(dev->m2m_dev);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 084263dd126f..5f2c4ad6c2cb 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -404,7 +404,11 @@ leave_handle_frame:
         if (test_and_clear_bit(0, &dev->hw_lock) == 0)
                 BUG();
         s5p_mfc_clock_off();
-        s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);
+        /* if suspending, wake up device and do not try_run again*/
+        if (test_bit(0, &dev->enter_suspend))
+                wake_up_dev(dev, reason, err);
+        else
+                s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);
 }
 
 /* Error handling for interrupt */
@@ -1101,7 +1105,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
         }
         dev->irq = res->start;
         ret = devm_request_irq(&pdev->dev, dev->irq, s5p_mfc_irq,
-                                        IRQF_DISABLED, pdev->name, dev);
+                                        0, pdev->name, dev);
         if (ret) {
                 dev_err(&pdev->dev, "Failed to install irq (%d)\n", ret);
                 goto err_res;
@@ -1286,9 +1290,7 @@ static int s5p_mfc_suspend(struct device *dev)
                 /* Try and lock the HW */
                 /* Wait on the interrupt waitqueue */
                 ret = wait_event_interruptible_timeout(m_dev->queue,
-                        m_dev->int_cond || m_dev->ctx[m_dev->curr_ctx]->int_cond,
-                        msecs_to_jiffies(MFC_INT_TIMEOUT));
-
+                        m_dev->int_cond, msecs_to_jiffies(MFC_INT_TIMEOUT));
                 if (ret == 0) {
                         mfc_err("Waiting for hardware to finish timed out\n");
                         return -EIO;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
index ad4f1df0a18e..9a6efd6c1329 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
@@ -111,7 +111,7 @@ static int s5p_mfc_open_inst_cmd_v5(struct s5p_mfc_ctx *ctx)
                 break;
         default:
                 h2r_args.arg[0] = S5P_FIMV_CODEC_NONE;
-        };
+        }
         h2r_args.arg[1] = 0; /* no crc & no pixelcache */
         h2r_args.arg[2] = ctx->ctx.ofs;
         h2r_args.arg[3] = ctx->ctx.size;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
index db796c8e7874..ec1a5947ed7d 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
@@ -113,7 +113,7 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx)
                 break;
         default:
                 codec_type = S5P_FIMV_CODEC_NONE_V6;
-        };
+        }
         mfc_write(dev, codec_type, S5P_FIMV_CODEC_TYPE_V6);
         mfc_write(dev, ctx->ctx.dma, S5P_FIMV_CONTEXT_MEM_ADDR_V6);
         mfc_write(dev, ctx->ctx.size, S5P_FIMV_CONTEXT_MEM_SIZE_V6);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 41f5a3c10dbd..4ff3b6cd6842 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -113,7 +113,7 @@ static struct mfc_control controls[] = {
                 .minimum = 0,
                 .maximum = (1 << 16) - 1,
                 .step = 1,
-                .default_value = 0,
+                .default_value = 12,
         },
         {
                 .id = V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,
@@ -356,7 +356,7 @@ static struct mfc_control controls[] = {
                 .minimum = 0,
                 .maximum = 51,
                 .step = 1,
-                .default_value = 1,
+                .default_value = 51,
         },
         {
                 .id = V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP,
@@ -399,7 +399,7 @@ static struct mfc_control controls[] = {
                 .minimum = 1,
                 .maximum = 31,
                 .step = 1,
-                .default_value = 1,
+                .default_value = 31,
         },
         {
                 .id = V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP,
@@ -444,7 +444,7 @@ static struct mfc_control controls[] = {
                 .minimum = 0,
                 .maximum = 51,
                 .step = 1,
-                .default_value = 1,
+                .default_value = 51,
         },
         {
                 .id = V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 368582b091bf..58ec7bb26ebc 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -1582,7 +1582,7 @@ static int s5p_mfc_get_int_reason_v5(struct s5p_mfc_dev *dev)
                 break;
         default:
                 reason = S5P_MFC_R2H_CMD_EMPTY;
-        };
+        }
         return reason;
 }
 
diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
index b93a21f5aa13..74344c764daa 100644
--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
@@ -226,7 +226,7 @@ static void mxr_graph_fix_geometry(struct mxr_layer *layer,
                         src->width + src->x_offset, 32767);
                 src->full_height = clamp_val(src->full_height,
                         src->height + src->y_offset, 2047);
-        };
+        }
 }
 
 /* PUBLIC API */
diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
index 3d13a636877b..c9388c45ad75 100644
--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
@@ -197,7 +197,7 @@ static void mxr_vp_fix_geometry(struct mxr_layer *layer,
                         ALIGN(src->width + src->x_offset, 8), 8192U);
                 src->full_height = clamp(src->full_height,
                         src->height + src->y_offset, 8192U);
-        };
+        }
 }
 
 /* PUBLIC API */
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index d02a7e0b773f..6866bb4fbebc 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -16,6 +16,7 @@
 
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/platform_data/camera-rcar.h>
@@ -105,6 +106,7 @@
 #define VIN_MAX_HEIGHT          2048
 
 enum chip_id {
+        RCAR_H2,
         RCAR_H1,
         RCAR_M1,
         RCAR_E1,
@@ -300,7 +302,8 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
                 dmr = 0;
                 break;
         case V4L2_PIX_FMT_RGB32:
-                if (priv->chip == RCAR_H1 || priv->chip == RCAR_E1) {
+                if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||
+                    priv->chip == RCAR_E1) {
                         dmr = VNDMR_EXRGB;
                         break;
                 }
@@ -1381,6 +1384,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
 };
 
 static struct platform_device_id rcar_vin_id_table[] = {
+        { "r8a7790-vin",  RCAR_H2 },
         { "r8a7779-vin",  RCAR_H1 },
         { "r8a7778-vin",  RCAR_M1 },
         { "uPD35004-vin", RCAR_E1 },
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 8df22f779175..150bd4df413c 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -1800,7 +1800,7 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev)
 
         /* request irq */
         err = devm_request_irq(&pdev->dev, pcdev->irq, sh_mobile_ceu_irq,
-                               IRQF_DISABLED, dev_name(&pdev->dev), pcdev);
+                               0, dev_name(&pdev->dev), pcdev);
         if (err) {
                 dev_err(&pdev->dev, "Unable to register CEU interrupt.\n");
                 goto exit_release_mem;
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 387a232d95a4..4b8c024fc487 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -71,13 +71,23 @@ static int video_dev_create(struct soc_camera_device *icd);
 int soc_camera_power_on(struct device *dev, struct soc_camera_subdev_desc *ssdd,
                         struct v4l2_clk *clk)
 {
-        int ret = clk ? v4l2_clk_enable(clk) : 0;
-        if (ret < 0) {
-                dev_err(dev, "Cannot enable clock: %d\n", ret);
-                return ret;
+        int ret;
+        bool clock_toggle;
+
+        if (clk && (!ssdd->unbalanced_power ||
+                    !test_and_set_bit(0, &ssdd->clock_state))) {
+                ret = v4l2_clk_enable(clk);
+                if (ret < 0) {
+                        dev_err(dev, "Cannot enable clock: %d\n", ret);
+                        return ret;
+                }
+                clock_toggle = true;
+        } else {
+                clock_toggle = false;
         }
-        ret = regulator_bulk_enable(ssdd->num_regulators,
-                                        ssdd->regulators);
+
+        ret = regulator_bulk_enable(ssdd->sd_pdata.num_regulators,
+                                    ssdd->sd_pdata.regulators);
         if (ret < 0) {
                 dev_err(dev, "Cannot enable regulators\n");
                 goto eregenable;
@@ -95,10 +105,10 @@ int soc_camera_power_on(struct device *dev, struct soc_camera_subdev_desc *ssdd,
         return 0;
 
 epwron:
-        regulator_bulk_disable(ssdd->num_regulators,
-                               ssdd->regulators);
+        regulator_bulk_disable(ssdd->sd_pdata.num_regulators,
+                               ssdd->sd_pdata.regulators);
 eregenable:
-        if (clk)
+        if (clock_toggle)
                 v4l2_clk_disable(clk);
 
         return ret;
@@ -120,14 +130,14 @@ int soc_camera_power_off(struct device *dev, struct soc_camera_subdev_desc *ssdd
                 }
         }
 
-        err = regulator_bulk_disable(ssdd->num_regulators,
-                                     ssdd->regulators);
+        err = regulator_bulk_disable(ssdd->sd_pdata.num_regulators,
+                                     ssdd->sd_pdata.regulators);
         if (err < 0) {
                 dev_err(dev, "Cannot disable regulators\n");
                 ret = ret ? : err;
         }
 
-        if (clk)
+        if (clk && (!ssdd->unbalanced_power || test_and_clear_bit(0, &ssdd->clock_state)))
                 v4l2_clk_disable(clk);
 
         return ret;
@@ -137,8 +147,8 @@ EXPORT_SYMBOL(soc_camera_power_off);
 int soc_camera_power_init(struct device *dev, struct soc_camera_subdev_desc *ssdd)
 {
         /* Should not have any effect in synchronous case */
-        return devm_regulator_bulk_get(dev, ssdd->num_regulators,
-                                       ssdd->regulators);
+        return devm_regulator_bulk_get(dev, ssdd->sd_pdata.num_regulators,
+                                       ssdd->sd_pdata.regulators);
 }
 EXPORT_SYMBOL(soc_camera_power_init);
 
@@ -1346,8 +1356,8 @@ static int soc_camera_i2c_init(struct soc_camera_device *icd,
          * soc_camera_pdrv_probe(), make sure the subdevice driver doesn't try
          * to allocate them again.
          */
-        ssdd->num_regulators = 0;
-        ssdd->regulators = NULL;
+        ssdd->sd_pdata.num_regulators = 0;
+        ssdd->sd_pdata.regulators = NULL;
         shd->board_info->platform_data = ssdd;
 
         snprintf(clk_name, sizeof(clk_name), "%d-%04x",
@@ -2020,8 +2030,8 @@ static int soc_camera_pdrv_probe(struct platform_device *pdev)
          * that case regulators are attached to the I2C device and not to the
          * camera platform device.
          */
-        ret = devm_regulator_bulk_get(&pdev->dev, ssdd->num_regulators,
-                                      ssdd->regulators);
+        ret = devm_regulator_bulk_get(&pdev->dev, ssdd->sd_pdata.num_regulators,
+                                      ssdd->sd_pdata.regulators);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/media/platform/ti-vpe/Makefile b/drivers/media/platform/ti-vpe/Makefile
new file mode 100644
index 000000000000..cbf0a806ba1d
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_VIDEO_TI_VPE) += ti-vpe.o
+
+ti-vpe-y := vpe.o vpdma.o
+
+ccflags-$(CONFIG_VIDEO_TI_VPE_DEBUG) += -DDEBUG
diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti-vpe/vpdma.c
new file mode 100644
index 000000000000..af0a5ffcaa98
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/vpdma.c
@@ -0,0 +1,846 @@
+/*
+ * VPDMA helper library
+ *
+ * Copyright (c) 2013 Texas Instruments Inc.
+ *
+ * David Griego, <dagriego@biglakesoftware.com>
+ * Dale Farnsworth, <dale@farnsworth.org>
+ * Archit Taneja, <archit@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/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <linux/firmware.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/videodev2.h>
+
+#include "vpdma.h"
+#include "vpdma_priv.h"
+
+#define VPDMA_FIRMWARE  "vpdma-1b8.bin"
+
+const struct vpdma_data_format vpdma_yuv_fmts[] = {
+        [VPDMA_DATA_FMT_Y444] = {
+                .data_type      = DATA_TYPE_Y444,
+                .depth          = 8,
+        },
+        [VPDMA_DATA_FMT_Y422] = {
+                .data_type      = DATA_TYPE_Y422,
+                .depth          = 8,
+        },
+        [VPDMA_DATA_FMT_Y420] = {
+                .data_type      = DATA_TYPE_Y420,
+                .depth          = 8,
+        },
+        [VPDMA_DATA_FMT_C444] = {
+                .data_type      = DATA_TYPE_C444,
+                .depth          = 8,
+        },
+        [VPDMA_DATA_FMT_C422] = {
+                .data_type      = DATA_TYPE_C422,
+                .depth          = 8,
+        },
+        [VPDMA_DATA_FMT_C420] = {
+                .data_type      = DATA_TYPE_C420,
+                .depth          = 4,
+        },
+        [VPDMA_DATA_FMT_YC422] = {
+                .data_type      = DATA_TYPE_YC422,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_YC444] = {
+                .data_type      = DATA_TYPE_YC444,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_CY422] = {
+                .data_type      = DATA_TYPE_CY422,
+                .depth          = 16,
+        },
+};
+
+const struct vpdma_data_format vpdma_rgb_fmts[] = {
+        [VPDMA_DATA_FMT_RGB565] = {
+                .data_type      = DATA_TYPE_RGB16_565,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_ARGB16_1555] = {
+                .data_type      = DATA_TYPE_ARGB_1555,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_ARGB16] = {
+                .data_type      = DATA_TYPE_ARGB_4444,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_RGBA16_5551] = {
+                .data_type      = DATA_TYPE_RGBA_5551,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_RGBA16] = {
+                .data_type      = DATA_TYPE_RGBA_4444,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_ARGB24] = {
+                .data_type      = DATA_TYPE_ARGB24_6666,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_RGB24] = {
+                .data_type      = DATA_TYPE_RGB24_888,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_ARGB32] = {
+                .data_type      = DATA_TYPE_ARGB32_8888,
+                .depth          = 32,
+        },
+        [VPDMA_DATA_FMT_RGBA24] = {
+                .data_type      = DATA_TYPE_RGBA24_6666,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_RGBA32] = {
+                .data_type      = DATA_TYPE_RGBA32_8888,
+                .depth          = 32,
+        },
+        [VPDMA_DATA_FMT_BGR565] = {
+                .data_type      = DATA_TYPE_BGR16_565,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_ABGR16_1555] = {
+                .data_type      = DATA_TYPE_ABGR_1555,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_ABGR16] = {
+                .data_type      = DATA_TYPE_ABGR_4444,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_BGRA16_5551] = {
+                .data_type      = DATA_TYPE_BGRA_5551,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_BGRA16] = {
+                .data_type      = DATA_TYPE_BGRA_4444,
+                .depth          = 16,
+        },
+        [VPDMA_DATA_FMT_ABGR24] = {
+                .data_type      = DATA_TYPE_ABGR24_6666,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_BGR24] = {
+                .data_type      = DATA_TYPE_BGR24_888,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_ABGR32] = {
+                .data_type      = DATA_TYPE_ABGR32_8888,
+                .depth          = 32,
+        },
+        [VPDMA_DATA_FMT_BGRA24] = {
+                .data_type      = DATA_TYPE_BGRA24_6666,
+                .depth          = 24,
+        },
+        [VPDMA_DATA_FMT_BGRA32] = {
+                .data_type      = DATA_TYPE_BGRA32_8888,
+                .depth          = 32,
+        },
+};
+
+const struct vpdma_data_format vpdma_misc_fmts[] = {
+        [VPDMA_DATA_FMT_MV] = {
+                .data_type      = DATA_TYPE_MV,
+                .depth          = 4,
+        },
+};
+
+struct vpdma_channel_info {
+        int num;                /* VPDMA channel number */
+        int cstat_offset;       /* client CSTAT register offset */
+};
+
+static const struct vpdma_channel_info chan_info[] = {
+        [VPE_CHAN_LUMA1_IN] = {
+                .num            = VPE_CHAN_NUM_LUMA1_IN,
+                .cstat_offset   = VPDMA_DEI_LUMA1_CSTAT,
+        },
+        [VPE_CHAN_CHROMA1_IN] = {
+                .num            = VPE_CHAN_NUM_CHROMA1_IN,
+                .cstat_offset   = VPDMA_DEI_CHROMA1_CSTAT,
+        },
+        [VPE_CHAN_LUMA2_IN] = {
+                .num            = VPE_CHAN_NUM_LUMA2_IN,
+                .cstat_offset   = VPDMA_DEI_LUMA2_CSTAT,
+        },
+        [VPE_CHAN_CHROMA2_IN] = {
+                .num            = VPE_CHAN_NUM_CHROMA2_IN,
+                .cstat_offset   = VPDMA_DEI_CHROMA2_CSTAT,
+        },
+        [VPE_CHAN_LUMA3_IN] = {
+                .num            = VPE_CHAN_NUM_LUMA3_IN,
+                .cstat_offset   = VPDMA_DEI_LUMA3_CSTAT,
+        },
+        [VPE_CHAN_CHROMA3_IN] = {
+                .num            = VPE_CHAN_NUM_CHROMA3_IN,
+                .cstat_offset   = VPDMA_DEI_CHROMA3_CSTAT,
+        },
+        [VPE_CHAN_MV_IN] = {
+                .num            = VPE_CHAN_NUM_MV_IN,
+                .cstat_offset   = VPDMA_DEI_MV_IN_CSTAT,
+        },
+        [VPE_CHAN_MV_OUT] = {
+                .num            = VPE_CHAN_NUM_MV_OUT,
+                .cstat_offset   = VPDMA_DEI_MV_OUT_CSTAT,
+        },
+        [VPE_CHAN_LUMA_OUT] = {
+                .num            = VPE_CHAN_NUM_LUMA_OUT,
+                .cstat_offset   = VPDMA_VIP_UP_Y_CSTAT,
+        },
+        [VPE_CHAN_CHROMA_OUT] = {
+                .num            = VPE_CHAN_NUM_CHROMA_OUT,
+                .cstat_offset   = VPDMA_VIP_UP_UV_CSTAT,
+        },
+        [VPE_CHAN_RGB_OUT] = {
+                .num            = VPE_CHAN_NUM_RGB_OUT,
+                .cstat_offset   = VPDMA_VIP_UP_Y_CSTAT,
+        },
+};
+
+static u32 read_reg(struct vpdma_data *vpdma, int offset)
+{
+        return ioread32(vpdma->base + offset);
+}
+
+static void write_reg(struct vpdma_data *vpdma, int offset, u32 value)
+{
+        iowrite32(value, vpdma->base + offset);
+}
+
+static int read_field_reg(struct vpdma_data *vpdma, int offset,
+                u32 mask, int shift)
+{
+        return (read_reg(vpdma, offset) & (mask << shift)) >> shift;
+}
+
+static void write_field_reg(struct vpdma_data *vpdma, int offset, u32 field,
+                u32 mask, int shift)
+{
+        u32 val = read_reg(vpdma, offset);
+
+        val &= ~(mask << shift);
+        val |= (field & mask) << shift;
+
+        write_reg(vpdma, offset, val);
+}
+
+void vpdma_dump_regs(struct vpdma_data *vpdma)
+{
+        struct device *dev = &vpdma->pdev->dev;
+
+#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, read_reg(vpdma, VPDMA_##r))
+
+        dev_dbg(dev, "VPDMA Registers:\n");
+
+        DUMPREG(PID);
+        DUMPREG(LIST_ADDR);
+        DUMPREG(LIST_ATTR);
+        DUMPREG(LIST_STAT_SYNC);
+        DUMPREG(BG_RGB);
+        DUMPREG(BG_YUV);
+        DUMPREG(SETUP);
+        DUMPREG(MAX_SIZE1);
+        DUMPREG(MAX_SIZE2);
+        DUMPREG(MAX_SIZE3);
+
+        /*
+         * dumping registers of only group0 and group3, because VPE channels
+         * lie within group0 and group3 registers
+         */
+        DUMPREG(INT_CHAN_STAT(0));
+        DUMPREG(INT_CHAN_MASK(0));
+        DUMPREG(INT_CHAN_STAT(3));
+        DUMPREG(INT_CHAN_MASK(3));
+        DUMPREG(INT_CLIENT0_STAT);
+        DUMPREG(INT_CLIENT0_MASK);
+        DUMPREG(INT_CLIENT1_STAT);
+        DUMPREG(INT_CLIENT1_MASK);
+        DUMPREG(INT_LIST0_STAT);
+        DUMPREG(INT_LIST0_MASK);
+
+        /*
+         * these are registers specific to VPE clients, we can make this
+         * function dump client registers specific to VPE or VIP based on
+         * who is using it
+         */
+        DUMPREG(DEI_CHROMA1_CSTAT);
+        DUMPREG(DEI_LUMA1_CSTAT);
+        DUMPREG(DEI_CHROMA2_CSTAT);
+        DUMPREG(DEI_LUMA2_CSTAT);
+        DUMPREG(DEI_CHROMA3_CSTAT);
+        DUMPREG(DEI_LUMA3_CSTAT);
+        DUMPREG(DEI_MV_IN_CSTAT);
+        DUMPREG(DEI_MV_OUT_CSTAT);
+        DUMPREG(VIP_UP_Y_CSTAT);
+        DUMPREG(VIP_UP_UV_CSTAT);
+        DUMPREG(VPI_CTL_CSTAT);
+}
+
+/*
+ * Allocate a DMA buffer
+ */
+int vpdma_alloc_desc_buf(struct vpdma_buf *buf, size_t size)
+{
+        buf->size = size;
+        buf->mapped = false;
+        buf->addr = kzalloc(size, GFP_KERNEL);
+        if (!buf->addr)
+                return -ENOMEM;
+
+        WARN_ON((u32) buf->addr & VPDMA_DESC_ALIGN);
+
+        return 0;
+}
+
+void vpdma_free_desc_buf(struct vpdma_buf *buf)
+{
+        WARN_ON(buf->mapped);
+        kfree(buf->addr);
+        buf->addr = NULL;
+        buf->size = 0;
+}
+
+/*
+ * map descriptor/payload DMA buffer, enabling DMA access
+ */
+int vpdma_map_desc_buf(struct vpdma_data *vpdma, struct vpdma_buf *buf)
+{
+        struct device *dev = &vpdma->pdev->dev;
+
+        WARN_ON(buf->mapped);
+        buf->dma_addr = dma_map_single(dev, buf->addr, buf->size,
+                                DMA_TO_DEVICE);
+        if (dma_mapping_error(dev, buf->dma_addr)) {
+                dev_err(dev, "failed to map buffer\n");
+                return -EINVAL;
+        }
+
+        buf->mapped = true;
+
+        return 0;
+}
+
+/*
+ * unmap descriptor/payload DMA buffer, disabling DMA access and
+ * allowing the main processor to acces the data
+ */
+void vpdma_unmap_desc_buf(struct vpdma_data *vpdma, struct vpdma_buf *buf)
+{
+        struct device *dev = &vpdma->pdev->dev;
+
+        if (buf->mapped)
+                dma_unmap_single(dev, buf->dma_addr, buf->size, DMA_TO_DEVICE);
+
+        buf->mapped = false;
+}
+
+/*
+ * create a descriptor list, the user of this list will append configuration,
+ * control and data descriptors to this list, this list will be submitted to
+ * VPDMA. VPDMA's list parser will go through each descriptor and perform the
+ * required DMA operations
+ */
+int vpdma_create_desc_list(struct vpdma_desc_list *list, size_t size, int type)
+{
+        int r;
+
+        r = vpdma_alloc_desc_buf(&list->buf, size);
+        if (r)
+                return r;
+
+        list->next = list->buf.addr;
+
+        list->type = type;
+
+        return 0;
+}
+
+/*
+ * once a descriptor list is parsed by VPDMA, we reset the list by emptying it,
+ * to allow new descriptors to be added to the list.
+ */
+void vpdma_reset_desc_list(struct vpdma_desc_list *list)
+{
+        list->next = list->buf.addr;
+}
+
+/*
+ * free the buffer allocated fot the VPDMA descriptor list, this should be
+ * called when the user doesn't want to use VPDMA any more.
+ */
+void vpdma_free_desc_list(struct vpdma_desc_list *list)
+{
+        vpdma_free_desc_buf(&list->buf);
+
+        list->next = NULL;
+}
+
+static bool vpdma_list_busy(struct vpdma_data *vpdma, int list_num)
+{
+        return read_reg(vpdma, VPDMA_LIST_STAT_SYNC) & BIT(list_num + 16);
+}
+
+/*
+ * submit a list of DMA descriptors to the VPE VPDMA, do not wait for completion
+ */
+int vpdma_submit_descs(struct vpdma_data *vpdma, struct vpdma_desc_list *list)
+{
+        /* we always use the first list */
+        int list_num = 0;
+        int list_size;
+
+        if (vpdma_list_busy(vpdma, list_num))
+                return -EBUSY;
+
+        /* 16-byte granularity */
+        list_size = (list->next - list->buf.addr) >> 4;
+
+        write_reg(vpdma, VPDMA_LIST_ADDR, (u32) list->buf.dma_addr);
+
+        write_reg(vpdma, VPDMA_LIST_ATTR,
+                        (list_num << VPDMA_LIST_NUM_SHFT) |
+                        (list->type << VPDMA_LIST_TYPE_SHFT) |
+                        list_size);
+
+        return 0;
+}
+
+static void dump_cfd(struct vpdma_cfd *cfd)
+{
+        int class;
+
+        class = cfd_get_class(cfd);
+
+        pr_debug("config descriptor of payload class: %s\n",
+                class == CFD_CLS_BLOCK ? "simple block" :
+                "address data block");
+
+        if (class == CFD_CLS_BLOCK)
+                pr_debug("word0: dst_addr_offset = 0x%08x\n",
+                        cfd->dest_addr_offset);
+
+        if (class == CFD_CLS_BLOCK)
+                pr_debug("word1: num_data_wrds = %d\n", cfd->block_len);
+
+        pr_debug("word2: payload_addr = 0x%08x\n", cfd->payload_addr);
+
+        pr_debug("word3: pkt_type = %d, direct = %d, class = %d, dest = %d, "
+                "payload_len = %d\n", cfd_get_pkt_type(cfd),
+                cfd_get_direct(cfd), class, cfd_get_dest(cfd),
+                cfd_get_payload_len(cfd));
+}
+
+/*
+ * append a configuration descriptor to the given descriptor list, where the
+ * payload is in the form of a simple data block specified in the descriptor
+ * header, this is used to upload scaler coefficients to the scaler module
+ */
+void vpdma_add_cfd_block(struct vpdma_desc_list *list, int client,
+                struct vpdma_buf *blk, u32 dest_offset)
+{
+        struct vpdma_cfd *cfd;
+        int len = blk->size;
+
+        WARN_ON(blk->dma_addr & VPDMA_DESC_ALIGN);
+
+        cfd = list->next;
+        WARN_ON((void *)(cfd + 1) > (list->buf.addr + list->buf.size));
+
+        cfd->dest_addr_offset = dest_offset;
+        cfd->block_len = len;
+        cfd->payload_addr = (u32) blk->dma_addr;
+        cfd->ctl_payload_len = cfd_pkt_payload_len(CFD_INDIRECT, CFD_CLS_BLOCK,
+                                client, len >> 4);
+
+        list->next = cfd + 1;
+
+        dump_cfd(cfd);
+}
+
+/*
+ * append a configuration descriptor to the given descriptor list, where the
+ * payload is in the address data block format, this is used to a configure a
+ * discontiguous set of MMRs
+ */
+void vpdma_add_cfd_adb(struct vpdma_desc_list *list, int client,
+                struct vpdma_buf *adb)
+{
+        struct vpdma_cfd *cfd;
+        unsigned int len = adb->size;
+
+        WARN_ON(len & VPDMA_ADB_SIZE_ALIGN);
+        WARN_ON(adb->dma_addr & VPDMA_DESC_ALIGN);
+
+        cfd = list->next;
+        BUG_ON((void *)(cfd + 1) > (list->buf.addr + list->buf.size));
+
+        cfd->w0 = 0;
+        cfd->w1 = 0;
+        cfd->payload_addr = (u32) adb->dma_addr;
+        cfd->ctl_payload_len = cfd_pkt_payload_len(CFD_INDIRECT, CFD_CLS_ADB,
+                                client, len >> 4);
+
+        list->next = cfd + 1;
+
+        dump_cfd(cfd);
+};
+
+/*
+ * control descriptor format change based on what type of control descriptor it
+ * is, we only use 'sync on channel' control descriptors for now, so assume it's
+ * that
+ */
+static void dump_ctd(struct vpdma_ctd *ctd)
+{
+        pr_debug("control descriptor\n");
+
+        pr_debug("word3: pkt_type = %d, source = %d, ctl_type = %d\n",
+                ctd_get_pkt_type(ctd), ctd_get_source(ctd), ctd_get_ctl(ctd));
+}
+
+/*
+ * append a 'sync on channel' type control descriptor to the given descriptor
+ * list, this descriptor stalls the VPDMA list till the time DMA is completed
+ * on the specified channel
+ */
+void vpdma_add_sync_on_channel_ctd(struct vpdma_desc_list *list,
+                enum vpdma_channel chan)
+{
+        struct vpdma_ctd *ctd;
+
+        ctd = list->next;
+        WARN_ON((void *)(ctd + 1) > (list->buf.addr + list->buf.size));
+
+        ctd->w0 = 0;
+        ctd->w1 = 0;
+        ctd->w2 = 0;
+        ctd->type_source_ctl = ctd_type_source_ctl(chan_info[chan].num,
+                                CTD_TYPE_SYNC_ON_CHANNEL);
+
+        list->next = ctd + 1;
+
+        dump_ctd(ctd);
+}
+
+static void dump_dtd(struct vpdma_dtd *dtd)
+{
+        int dir, chan;
+
+        dir = dtd_get_dir(dtd);
+        chan = dtd_get_chan(dtd);
+
+        pr_debug("%s data transfer descriptor for channel %d\n",
+                dir == DTD_DIR_OUT ? "outbound" : "inbound", chan);
+
+        pr_debug("word0: data_type = %d, notify = %d, field = %d, 1D = %d, "
+                "even_ln_skp = %d, odd_ln_skp = %d, line_stride = %d\n",
+                dtd_get_data_type(dtd), dtd_get_notify(dtd), dtd_get_field(dtd),
+                dtd_get_1d(dtd), dtd_get_even_line_skip(dtd),
+                dtd_get_odd_line_skip(dtd), dtd_get_line_stride(dtd));
+
+        if (dir == DTD_DIR_IN)
+                pr_debug("word1: line_length = %d, xfer_height = %d\n",
+                        dtd_get_line_length(dtd), dtd_get_xfer_height(dtd));
+
+        pr_debug("word2: start_addr = 0x%08x\n", dtd->start_addr);
+
+        pr_debug("word3: pkt_type = %d, mode = %d, dir = %d, chan = %d, "
+                "pri = %d, next_chan = %d\n", dtd_get_pkt_type(dtd),
+                dtd_get_mode(dtd), dir, chan, dtd_get_priority(dtd),
+                dtd_get_next_chan(dtd));
+
+        if (dir == DTD_DIR_IN)
+                pr_debug("word4: frame_width = %d, frame_height = %d\n",
+                        dtd_get_frame_width(dtd), dtd_get_frame_height(dtd));
+        else
+                pr_debug("word4: desc_write_addr = 0x%08x, write_desc = %d, "
+                        "drp_data = %d, use_desc_reg = %d\n",
+                        dtd_get_desc_write_addr(dtd), dtd_get_write_desc(dtd),
+                        dtd_get_drop_data(dtd), dtd_get_use_desc(dtd));
+
+        if (dir == DTD_DIR_IN)
+                pr_debug("word5: hor_start = %d, ver_start = %d\n",
+                        dtd_get_h_start(dtd), dtd_get_v_start(dtd));
+        else
+                pr_debug("word5: max_width %d, max_height %d\n",
+                        dtd_get_max_width(dtd), dtd_get_max_height(dtd));
+
+        pr_debug("word6: client specfic attr0 = 0x%08x\n", dtd->client_attr0);
+        pr_debug("word7: client specfic attr1 = 0x%08x\n", dtd->client_attr1);
+}
+
+/*
+ * append an outbound data transfer descriptor to the given descriptor list,
+ * this sets up a 'client to memory' VPDMA transfer for the given VPDMA channel
+ */
+void vpdma_add_out_dtd(struct vpdma_desc_list *list, struct v4l2_rect *c_rect,
+                const struct vpdma_data_format *fmt, dma_addr_t dma_addr,
+                enum vpdma_channel chan, u32 flags)
+{
+        int priority = 0;
+        int field = 0;
+        int notify = 1;
+        int channel, next_chan;
+        int depth = fmt->depth;
+        int stride;
+        struct vpdma_dtd *dtd;
+
+        channel = next_chan = chan_info[chan].num;
+
+        if (fmt->data_type == DATA_TYPE_C420)
+                depth = 8;
+
+        stride = (depth * c_rect->width) >> 3;
+        dma_addr += (c_rect->left * depth) >> 3;
+
+        dtd = list->next;
+        WARN_ON((void *)(dtd + 1) > (list->buf.addr + list->buf.size));
+
+        dtd->type_ctl_stride = dtd_type_ctl_stride(fmt->data_type,
+                                        notify,
+                                        field,
+                                        !!(flags & VPDMA_DATA_FRAME_1D),
+                                        !!(flags & VPDMA_DATA_EVEN_LINE_SKIP),
+                                        !!(flags & VPDMA_DATA_ODD_LINE_SKIP),
+                                        stride);
+        dtd->w1 = 0;
+        dtd->start_addr = (u32) dma_addr;
+        dtd->pkt_ctl = dtd_pkt_ctl(!!(flags & VPDMA_DATA_MODE_TILED),
+                                DTD_DIR_OUT, channel, priority, next_chan);
+        dtd->desc_write_addr = dtd_desc_write_addr(0, 0, 0, 0);
+        dtd->max_width_height = dtd_max_width_height(MAX_OUT_WIDTH_1920,
+                                        MAX_OUT_HEIGHT_1080);
+        dtd->client_attr0 = 0;
+        dtd->client_attr1 = 0;
+
+        list->next = dtd + 1;
+
+        dump_dtd(dtd);
+}
+
+/*
+ * append an inbound data transfer descriptor to the given descriptor list,
+ * this sets up a 'memory to client' VPDMA transfer for the given VPDMA channel
+ */
+void vpdma_add_in_dtd(struct vpdma_desc_list *list, int frame_width,
+                int frame_height, struct v4l2_rect *c_rect,
+                const struct vpdma_data_format *fmt, dma_addr_t dma_addr,
+                enum vpdma_channel chan, int field, u32 flags)
+{
+        int priority = 0;
+        int notify = 1;
+        int depth = fmt->depth;
+        int channel, next_chan;
+        int stride;
+        int height = c_rect->height;
+        struct vpdma_dtd *dtd;
+
+        channel = next_chan = chan_info[chan].num;
+
+        if (fmt->data_type == DATA_TYPE_C420) {
+                height >>= 1;
+                frame_height >>= 1;
+                depth = 8;
+        }
+
+        stride = (depth * c_rect->width) >> 3;
+        dma_addr += (c_rect->left * depth) >> 3;
+
+        dtd = list->next;
+        WARN_ON((void *)(dtd + 1) > (list->buf.addr + list->buf.size));
+
+        dtd->type_ctl_stride = dtd_type_ctl_stride(fmt->data_type,
+                                        notify,
+                                        field,
+                                        !!(flags & VPDMA_DATA_FRAME_1D),
+                                        !!(flags & VPDMA_DATA_EVEN_LINE_SKIP),
+                                        !!(flags & VPDMA_DATA_ODD_LINE_SKIP),
+                                        stride);
+
+        dtd->xfer_length_height = dtd_xfer_length_height(c_rect->width, height);
+        dtd->start_addr = (u32) dma_addr;
+        dtd->pkt_ctl = dtd_pkt_ctl(!!(flags & VPDMA_DATA_MODE_TILED),
+                                DTD_DIR_IN, channel, priority, next_chan);
+        dtd->frame_width_height = dtd_frame_width_height(frame_width,
+                                        frame_height);
+        dtd->start_h_v = dtd_start_h_v(c_rect->left, c_rect->top);
+        dtd->client_attr0 = 0;
+        dtd->client_attr1 = 0;
+
+        list->next = dtd + 1;
+
+        dump_dtd(dtd);
+}
+
+/* set or clear the mask for list complete interrupt */
+void vpdma_enable_list_complete_irq(struct vpdma_data *vpdma, int list_num,
+                bool enable)
+{
+        u32 val;
+
+        val = read_reg(vpdma, VPDMA_INT_LIST0_MASK);
+        if (enable)
+                val |= (1 << (list_num * 2));
+        else
+                val &= ~(1 << (list_num * 2));
+        write_reg(vpdma, VPDMA_INT_LIST0_MASK, val);
+}
+
+/* clear previosuly occured list intterupts in the LIST_STAT register */
+void vpdma_clear_list_stat(struct vpdma_data *vpdma)
+{
+        write_reg(vpdma, VPDMA_INT_LIST0_STAT,
+                read_reg(vpdma, VPDMA_INT_LIST0_STAT));
+}
+
+/*
+ * configures the output mode of the line buffer for the given client, the
+ * line buffer content can either be mirrored(each line repeated twice) or
+ * passed to the client as is
+ */
+void vpdma_set_line_mode(struct vpdma_data *vpdma, int line_mode,
+                enum vpdma_channel chan)
+{
+        int client_cstat = chan_info[chan].cstat_offset;
+
+        write_field_reg(vpdma, client_cstat, line_mode,
+                VPDMA_CSTAT_LINE_MODE_MASK, VPDMA_CSTAT_LINE_MODE_SHIFT);
+}
+
+/*
+ * configures the event which should trigger VPDMA transfer for the given
+ * client
+ */
+void vpdma_set_frame_start_event(struct vpdma_data *vpdma,
+                enum vpdma_frame_start_event fs_event,
+                enum vpdma_channel chan)
+{
+        int client_cstat = chan_info[chan].cstat_offset;
+
+        write_field_reg(vpdma, client_cstat, fs_event,
+                VPDMA_CSTAT_FRAME_START_MASK, VPDMA_CSTAT_FRAME_START_SHIFT);
+}
+
+static void vpdma_firmware_cb(const struct firmware *f, void *context)
+{
+        struct vpdma_data *vpdma = context;
+        struct vpdma_buf fw_dma_buf;
+        int i, r;
+
+        dev_dbg(&vpdma->pdev->dev, "firmware callback\n");
+
+        if (!f || !f->data) {
+                dev_err(&vpdma->pdev->dev, "couldn't get firmware\n");
+                return;
+        }
+
+        /* already initialized */
+        if (read_field_reg(vpdma, VPDMA_LIST_ATTR, VPDMA_LIST_RDY_MASK,
+                        VPDMA_LIST_RDY_SHFT)) {
+                vpdma->ready = true;
+                return;
+        }
+
+        r = vpdma_alloc_desc_buf(&fw_dma_buf, f->size);
+        if (r) {
+                dev_err(&vpdma->pdev->dev,
+                        "failed to allocate dma buffer for firmware\n");
+                goto rel_fw;
+        }
+
+        memcpy(fw_dma_buf.addr, f->data, f->size);
+
+        vpdma_map_desc_buf(vpdma, &fw_dma_buf);
+
+        write_reg(vpdma, VPDMA_LIST_ADDR, (u32) fw_dma_buf.dma_addr);
+
+        for (i = 0; i < 100; i++) {             /* max 1 second */
+                msleep_interruptible(10);
+
+                if (read_field_reg(vpdma, VPDMA_LIST_ATTR, VPDMA_LIST_RDY_MASK,
+                                VPDMA_LIST_RDY_SHFT))
+                        break;
+        }
+
+        if (i == 100) {
+                dev_err(&vpdma->pdev->dev, "firmware upload failed\n");
+                goto free_buf;
+        }
+
+        vpdma->ready = true;
+
+free_buf:
+        vpdma_unmap_desc_buf(vpdma, &fw_dma_buf);
+
+        vpdma_free_desc_buf(&fw_dma_buf);
+rel_fw:
+        release_firmware(f);
+}
+
+static int vpdma_load_firmware(struct vpdma_data *vpdma)
+{
+        int r;
+        struct device *dev = &vpdma->pdev->dev;
+
+        r = request_firmware_nowait(THIS_MODULE, 1,
+                (const char *) VPDMA_FIRMWARE, dev, GFP_KERNEL, vpdma,
+                vpdma_firmware_cb);
+        if (r) {
+                dev_err(dev, "firmware not available %s\n", VPDMA_FIRMWARE);
+                return r;
+        } else {
+                dev_info(dev, "loading firmware %s\n", VPDMA_FIRMWARE);
+        }
+
+        return 0;
+}
+
+struct vpdma_data *vpdma_create(struct platform_device *pdev)
+{
+        struct resource *res;
+        struct vpdma_data *vpdma;
+        int r;
+
+        dev_dbg(&pdev->dev, "vpdma_create\n");
+
+        vpdma = devm_kzalloc(&pdev->dev, sizeof(*vpdma), GFP_KERNEL);
+        if (!vpdma) {
+                dev_err(&pdev->dev, "couldn't alloc vpdma_dev\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        vpdma->pdev = pdev;
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vpdma");
+        if (res == NULL) {
+                dev_err(&pdev->dev, "missing platform resources data\n");
+                return ERR_PTR(-ENODEV);
+        }
+
+        vpdma->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+        if (!vpdma->base) {
+                dev_err(&pdev->dev, "failed to ioremap\n");
+                return ERR_PTR(-ENOMEM);
+        }
+
+        r = vpdma_load_firmware(vpdma);
+        if (r) {
+                pr_err("failed to load firmware %s\n", VPDMA_FIRMWARE);
+                return ERR_PTR(r);
+        }
+
+        return vpdma;
+}
+MODULE_FIRMWARE(VPDMA_FIRMWARE);
diff --git a/drivers/media/platform/ti-vpe/vpdma.h b/drivers/media/platform/ti-vpe/vpdma.h
new file mode 100644
index 000000000000..eaa2a71a5db9
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/vpdma.h
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2013 Texas Instruments Inc.
+ *
+ * David Griego, <dagriego@biglakesoftware.com>
+ * Dale Farnsworth, <dale@farnsworth.org>
+ * Archit Taneja, <archit@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 __TI_VPDMA_H_
+#define __TI_VPDMA_H_
+
+/*
+ * A vpdma_buf tracks the size, DMA address and mapping status of each
+ * driver DMA area.
+ */
+struct vpdma_buf {
+        void                    *addr;
+        dma_addr_t              dma_addr;
+        size_t                  size;
+        bool                    mapped;
+};
+
+struct vpdma_desc_list {
+        struct vpdma_buf buf;
+        void *next;
+        int type;
+};
+
+struct vpdma_data {
+        void __iomem            *base;
+
+        struct platform_device  *pdev;
+
+        /* tells whether vpdma firmware is loaded or not */
+        bool ready;
+};
+
+struct vpdma_data_format {
+        int data_type;
+        u8 depth;
+};
+
+#define VPDMA_DESC_ALIGN                16      /* 16-byte descriptor alignment */
+
+#define VPDMA_DTD_DESC_SIZE             32      /* 8 words */
+#define VPDMA_CFD_CTD_DESC_SIZE         16      /* 4 words */
+
+#define VPDMA_LIST_TYPE_NORMAL          0
+#define VPDMA_LIST_TYPE_SELF_MODIFYING  1
+#define VPDMA_LIST_TYPE_DOORBELL        2
+
+enum vpdma_yuv_formats {
+        VPDMA_DATA_FMT_Y444 = 0,
+        VPDMA_DATA_FMT_Y422,
+        VPDMA_DATA_FMT_Y420,
+        VPDMA_DATA_FMT_C444,
+        VPDMA_DATA_FMT_C422,
+        VPDMA_DATA_FMT_C420,
+        VPDMA_DATA_FMT_YC422,
+        VPDMA_DATA_FMT_YC444,
+        VPDMA_DATA_FMT_CY422,
+};
+
+enum vpdma_rgb_formats {
+        VPDMA_DATA_FMT_RGB565 = 0,
+        VPDMA_DATA_FMT_ARGB16_1555,
+        VPDMA_DATA_FMT_ARGB16,
+        VPDMA_DATA_FMT_RGBA16_5551,
+        VPDMA_DATA_FMT_RGBA16,
+        VPDMA_DATA_FMT_ARGB24,
+        VPDMA_DATA_FMT_RGB24,
+        VPDMA_DATA_FMT_ARGB32,
+        VPDMA_DATA_FMT_RGBA24,
+        VPDMA_DATA_FMT_RGBA32,
+        VPDMA_DATA_FMT_BGR565,
+        VPDMA_DATA_FMT_ABGR16_1555,
+        VPDMA_DATA_FMT_ABGR16,
+        VPDMA_DATA_FMT_BGRA16_5551,
+        VPDMA_DATA_FMT_BGRA16,
+        VPDMA_DATA_FMT_ABGR24,
+        VPDMA_DATA_FMT_BGR24,
+        VPDMA_DATA_FMT_ABGR32,
+        VPDMA_DATA_FMT_BGRA24,
+        VPDMA_DATA_FMT_BGRA32,
+};
+
+enum vpdma_misc_formats {
+        VPDMA_DATA_FMT_MV = 0,
+};
+
+extern const struct vpdma_data_format vpdma_yuv_fmts[];
+extern const struct vpdma_data_format vpdma_rgb_fmts[];
+extern const struct vpdma_data_format vpdma_misc_fmts[];
+
+enum vpdma_frame_start_event {
+        VPDMA_FSEVENT_HDMI_FID = 0,
+        VPDMA_FSEVENT_DVO2_FID,
+        VPDMA_FSEVENT_HDCOMP_FID,
+        VPDMA_FSEVENT_SD_FID,
+        VPDMA_FSEVENT_LM_FID0,
+        VPDMA_FSEVENT_LM_FID1,
+        VPDMA_FSEVENT_LM_FID2,
+        VPDMA_FSEVENT_CHANNEL_ACTIVE,
+};
+
+/*
+ * VPDMA channel numbers
+ */
+enum vpdma_channel {
+        VPE_CHAN_LUMA1_IN,
+        VPE_CHAN_CHROMA1_IN,
+        VPE_CHAN_LUMA2_IN,
+        VPE_CHAN_CHROMA2_IN,
+        VPE_CHAN_LUMA3_IN,
+        VPE_CHAN_CHROMA3_IN,
+        VPE_CHAN_MV_IN,
+        VPE_CHAN_MV_OUT,
+        VPE_CHAN_LUMA_OUT,
+        VPE_CHAN_CHROMA_OUT,
+        VPE_CHAN_RGB_OUT,
+};
+
+/* flags for VPDMA data descriptors */
+#define VPDMA_DATA_ODD_LINE_SKIP        (1 << 0)
+#define VPDMA_DATA_EVEN_LINE_SKIP       (1 << 1)
+#define VPDMA_DATA_FRAME_1D             (1 << 2)
+#define VPDMA_DATA_MODE_TILED           (1 << 3)
+
+/*
+ * client identifiers used for configuration descriptors
+ */
+#define CFD_MMR_CLIENT          0
+#define CFD_SC_CLIENT           4
+
+/* Address data block header format */
+struct vpdma_adb_hdr {
+        u32                     offset;
+        u32                     nwords;
+        u32                     reserved0;
+        u32                     reserved1;
+};
+
+/* helpers for creating ADB headers for config descriptors MMRs as client */
+#define ADB_ADDR(dma_buf, str, fld)     ((dma_buf)->addr + offsetof(str, fld))
+#define MMR_ADB_ADDR(buf, str, fld)     ADB_ADDR(&(buf), struct str, fld)
+
+#define VPDMA_SET_MMR_ADB_HDR(buf, str, hdr, regs, offset_a)    \
+        do {                                                    \
+                struct vpdma_adb_hdr *h;                        \
+                struct str *adb = NULL;                         \
+                h = MMR_ADB_ADDR(buf, str, hdr);                \
+                h->offset = (offset_a);                         \
+                h->nwords = sizeof(adb->regs) >> 2;             \
+        } while (0)
+
+/* vpdma descriptor buffer allocation and management */
+int vpdma_alloc_desc_buf(struct vpdma_buf *buf, size_t size);
+void vpdma_free_desc_buf(struct vpdma_buf *buf);
+int vpdma_map_desc_buf(struct vpdma_data *vpdma, struct vpdma_buf *buf);
+void vpdma_unmap_desc_buf(struct vpdma_data *vpdma, struct vpdma_buf *buf);
+
+/* vpdma descriptor list funcs */
+int vpdma_create_desc_list(struct vpdma_desc_list *list, size_t size, int type);
+void vpdma_reset_desc_list(struct vpdma_desc_list *list);
+void vpdma_free_desc_list(struct vpdma_desc_list *list);
+int vpdma_submit_descs(struct vpdma_data *vpdma, struct vpdma_desc_list *list);
+
+/* helpers for creating vpdma descriptors */
+void vpdma_add_cfd_block(struct vpdma_desc_list *list, int client,
+                struct vpdma_buf *blk, u32 dest_offset);
+void vpdma_add_cfd_adb(struct vpdma_desc_list *list, int client,
+                struct vpdma_buf *adb);
+void vpdma_add_sync_on_channel_ctd(struct vpdma_desc_list *list,
+                enum vpdma_channel chan);
+void vpdma_add_out_dtd(struct vpdma_desc_list *list, struct v4l2_rect *c_rect,
+                const struct vpdma_data_format *fmt, dma_addr_t dma_addr,
+                enum vpdma_channel chan, u32 flags);
+void vpdma_add_in_dtd(struct vpdma_desc_list *list, int frame_width,
+                int frame_height, struct v4l2_rect *c_rect,
+                const struct vpdma_data_format *fmt, dma_addr_t dma_addr,
+                enum vpdma_channel chan, int field, u32 flags);
+
+/* vpdma list interrupt management */
+void vpdma_enable_list_complete_irq(struct vpdma_data *vpdma, int list_num,
+                bool enable);
+void vpdma_clear_list_stat(struct vpdma_data *vpdma);
+
+/* vpdma client configuration */
+void vpdma_set_line_mode(struct vpdma_data *vpdma, int line_mode,
+                enum vpdma_channel chan);
+void vpdma_set_frame_start_event(struct vpdma_data *vpdma,
+                enum vpdma_frame_start_event fs_event, enum vpdma_channel chan);
+
+void vpdma_dump_regs(struct vpdma_data *vpdma);
+
+/* initialize vpdma, passed with VPE's platform device pointer */
+struct vpdma_data *vpdma_create(struct platform_device *pdev);
+
+#endif
diff --git a/drivers/media/platform/ti-vpe/vpdma_priv.h b/drivers/media/platform/ti-vpe/vpdma_priv.h
new file mode 100644
index 000000000000..f0e9a8038c1b
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/vpdma_priv.h
@@ -0,0 +1,641 @@
+/*
+ * Copyright (c) 2013 Texas Instruments Inc.
+ *
+ * David Griego, <dagriego@biglakesoftware.com>
+ * Dale Farnsworth, <dale@farnsworth.org>
+ * Archit Taneja, <archit@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 _TI_VPDMA_PRIV_H_
+#define _TI_VPDMA_PRIV_H_
+
+/*
+ * VPDMA Register offsets
+ */
+
+/* Top level */
+#define VPDMA_PID               0x00
+#define VPDMA_LIST_ADDR         0x04
+#define VPDMA_LIST_ATTR         0x08
+#define VPDMA_LIST_STAT_SYNC    0x0c
+#define VPDMA_BG_RGB            0x18
+#define VPDMA_BG_YUV            0x1c
+#define VPDMA_SETUP             0x30
+#define VPDMA_MAX_SIZE1         0x34
+#define VPDMA_MAX_SIZE2         0x38
+#define VPDMA_MAX_SIZE3         0x3c
+
+/* Interrupts */
+#define VPDMA_INT_CHAN_STAT(grp)        (0x40 + grp * 8)
+#define VPDMA_INT_CHAN_MASK(grp)        (VPDMA_INT_CHAN_STAT(grp) + 4)
+#define VPDMA_INT_CLIENT0_STAT          0x78
+#define VPDMA_INT_CLIENT0_MASK          0x7c
+#define VPDMA_INT_CLIENT1_STAT          0x80
+#define VPDMA_INT_CLIENT1_MASK          0x84
+#define VPDMA_INT_LIST0_STAT            0x88
+#define VPDMA_INT_LIST0_MASK            0x8c
+
+#define VPDMA_PERFMON(i)                (0x200 + i * 4)
+
+/* VPE specific client registers */
+#define VPDMA_DEI_CHROMA1_CSTAT         0x0300
+#define VPDMA_DEI_LUMA1_CSTAT           0x0304
+#define VPDMA_DEI_LUMA2_CSTAT           0x0308
+#define VPDMA_DEI_CHROMA2_CSTAT         0x030c
+#define VPDMA_DEI_LUMA3_CSTAT           0x0310
+#define VPDMA_DEI_CHROMA3_CSTAT         0x0314
+#define VPDMA_DEI_MV_IN_CSTAT           0x0330
+#define VPDMA_DEI_MV_OUT_CSTAT          0x033c
+#define VPDMA_VIP_UP_Y_CSTAT            0x0390
+#define VPDMA_VIP_UP_UV_CSTAT           0x0394
+#define VPDMA_VPI_CTL_CSTAT             0x03d0
+
+/* Reg field info for VPDMA_CLIENT_CSTAT registers */
+#define VPDMA_CSTAT_LINE_MODE_MASK      0x03
+#define VPDMA_CSTAT_LINE_MODE_SHIFT     8
+#define VPDMA_CSTAT_FRAME_START_MASK    0xf
+#define VPDMA_CSTAT_FRAME_START_SHIFT   10
+
+#define VPDMA_LIST_NUM_MASK             0x07
+#define VPDMA_LIST_NUM_SHFT             24
+#define VPDMA_LIST_STOP_SHFT            20
+#define VPDMA_LIST_RDY_MASK             0x01
+#define VPDMA_LIST_RDY_SHFT             19
+#define VPDMA_LIST_TYPE_MASK            0x03
+#define VPDMA_LIST_TYPE_SHFT            16
+#define VPDMA_LIST_SIZE_MASK            0xffff
+
+/* VPDMA data type values for data formats */
+#define DATA_TYPE_Y444                          0x0
+#define DATA_TYPE_Y422                          0x1
+#define DATA_TYPE_Y420                          0x2
+#define DATA_TYPE_C444                          0x4
+#define DATA_TYPE_C422                          0x5
+#define DATA_TYPE_C420                          0x6
+#define DATA_TYPE_YC422                         0x7
+#define DATA_TYPE_YC444                         0x8
+#define DATA_TYPE_CY422                         0x23
+
+#define DATA_TYPE_RGB16_565                     0x0
+#define DATA_TYPE_ARGB_1555                     0x1
+#define DATA_TYPE_ARGB_4444                     0x2
+#define DATA_TYPE_RGBA_5551                     0x3
+#define DATA_TYPE_RGBA_4444                     0x4
+#define DATA_TYPE_ARGB24_6666                   0x5
+#define DATA_TYPE_RGB24_888                     0x6
+#define DATA_TYPE_ARGB32_8888                   0x7
+#define DATA_TYPE_RGBA24_6666                   0x8
+#define DATA_TYPE_RGBA32_8888                   0x9
+#define DATA_TYPE_BGR16_565                     0x10
+#define DATA_TYPE_ABGR_1555                     0x11
+#define DATA_TYPE_ABGR_4444                     0x12
+#define DATA_TYPE_BGRA_5551                     0x13
+#define DATA_TYPE_BGRA_4444                     0x14
+#define DATA_TYPE_ABGR24_6666                   0x15
+#define DATA_TYPE_BGR24_888                     0x16
+#define DATA_TYPE_ABGR32_8888                   0x17
+#define DATA_TYPE_BGRA24_6666                   0x18
+#define DATA_TYPE_BGRA32_8888                   0x19
+
+#define DATA_TYPE_MV                            0x3
+
+/* VPDMA channel numbers(only VPE channels for now) */
+#define VPE_CHAN_NUM_LUMA1_IN           0
+#define VPE_CHAN_NUM_CHROMA1_IN         1
+#define VPE_CHAN_NUM_LUMA2_IN           2
+#define VPE_CHAN_NUM_CHROMA2_IN         3
+#define VPE_CHAN_NUM_LUMA3_IN           4
+#define VPE_CHAN_NUM_CHROMA3_IN         5
+#define VPE_CHAN_NUM_MV_IN              12
+#define VPE_CHAN_NUM_MV_OUT             15
+#define VPE_CHAN_NUM_LUMA_OUT           102
+#define VPE_CHAN_NUM_CHROMA_OUT         103
+#define VPE_CHAN_NUM_RGB_OUT            106
+
+/*
+ * a VPDMA address data block payload for a configuration descriptor needs to
+ * have each sub block length as a multiple of 16 bytes. Therefore, the overall
+ * size of the payload also needs to be a multiple of 16 bytes. The sub block
+ * lengths should be ensured to be aligned by the VPDMA user.
+ */
+#define VPDMA_ADB_SIZE_ALIGN            0x0f
+
+/*
+ * data transfer descriptor
+ */
+struct vpdma_dtd {
+        u32                     type_ctl_stride;
+        union {
+                u32             xfer_length_height;
+                u32             w1;
+        };
+        dma_addr_t              start_addr;
+        u32                     pkt_ctl;
+        union {
+                u32             frame_width_height;     /* inbound */
+                dma_addr_t      desc_write_addr;        /* outbound */
+        };
+        union {
+                u32             start_h_v;              /* inbound */
+                u32             max_width_height;       /* outbound */
+        };
+        u32                     client_attr0;
+        u32                     client_attr1;
+};
+
+/* Data Transfer Descriptor specifics */
+#define DTD_NO_NOTIFY           0
+#define DTD_NOTIFY              1
+
+#define DTD_PKT_TYPE            0xa
+#define DTD_DIR_IN              0
+#define DTD_DIR_OUT             1
+
+/* type_ctl_stride */
+#define DTD_DATA_TYPE_MASK      0x3f
+#define DTD_DATA_TYPE_SHFT      26
+#define DTD_NOTIFY_MASK         0x01
+#define DTD_NOTIFY_SHFT         25
+#define DTD_FIELD_MASK          0x01
+#define DTD_FIELD_SHFT          24
+#define DTD_1D_MASK             0x01
+#define DTD_1D_SHFT             23
+#define DTD_EVEN_LINE_SKIP_MASK 0x01
+#define DTD_EVEN_LINE_SKIP_SHFT 20
+#define DTD_ODD_LINE_SKIP_MASK  0x01
+#define DTD_ODD_LINE_SKIP_SHFT  16
+#define DTD_LINE_STRIDE_MASK    0xffff
+#define DTD_LINE_STRIDE_SHFT    0
+
+/* xfer_length_height */
+#define DTD_LINE_LENGTH_MASK    0xffff
+#define DTD_LINE_LENGTH_SHFT    16
+#define DTD_XFER_HEIGHT_MASK    0xffff
+#define DTD_XFER_HEIGHT_SHFT    0
+
+/* pkt_ctl */
+#define DTD_PKT_TYPE_MASK       0x1f
+#define DTD_PKT_TYPE_SHFT       27
+#define DTD_MODE_MASK           0x01
+#define DTD_MODE_SHFT           26
+#define DTD_DIR_MASK            0x01
+#define DTD_DIR_SHFT            25
+#define DTD_CHAN_MASK           0x01ff
+#define DTD_CHAN_SHFT           16
+#define DTD_PRI_MASK            0x0f
+#define DTD_PRI_SHFT            9
+#define DTD_NEXT_CHAN_MASK      0x01ff
+#define DTD_NEXT_CHAN_SHFT      0
+
+/* frame_width_height */
+#define DTD_FRAME_WIDTH_MASK    0xffff
+#define DTD_FRAME_WIDTH_SHFT    16
+#define DTD_FRAME_HEIGHT_MASK   0xffff
+#define DTD_FRAME_HEIGHT_SHFT   0
+
+/* start_h_v */
+#define DTD_H_START_MASK        0xffff
+#define DTD_H_START_SHFT        16
+#define DTD_V_START_MASK        0xffff
+#define DTD_V_START_SHFT        0
+
+#define DTD_DESC_START_SHIFT    5
+#define DTD_WRITE_DESC_MASK     0x01
+#define DTD_WRITE_DESC_SHIFT    2
+#define DTD_DROP_DATA_MASK      0x01
+#define DTD_DROP_DATA_SHIFT     1
+#define DTD_USE_DESC_MASK       0x01
+#define DTD_USE_DESC_SHIFT      0
+
+/* max_width_height */
+#define DTD_MAX_WIDTH_MASK      0x07
+#define DTD_MAX_WIDTH_SHFT      4
+#define DTD_MAX_HEIGHT_MASK     0x07
+#define DTD_MAX_HEIGHT_SHFT     0
+
+/* max width configurations */
+ /* unlimited width */
+#define MAX_OUT_WIDTH_UNLIMITED         0
+/* as specified in max_size1 reg */
+#define MAX_OUT_WIDTH_REG1              1
+/* as specified in max_size2 reg */
+#define MAX_OUT_WIDTH_REG2              2
+/* as specified in max_size3 reg */
+#define MAX_OUT_WIDTH_REG3              3
+/* maximum of 352 pixels as width */
+#define MAX_OUT_WIDTH_352               4
+/* maximum of 768 pixels as width */
+#define MAX_OUT_WIDTH_768               5
+/* maximum of 1280 pixels width */
+#define MAX_OUT_WIDTH_1280              6
+/* maximum of 1920 pixels as width */
+#define MAX_OUT_WIDTH_1920              7
+
+/* max height configurations */
+ /* unlimited height */
+#define MAX_OUT_HEIGHT_UNLIMITED        0
+/* as specified in max_size1 reg */
+#define MAX_OUT_HEIGHT_REG1             1
+/* as specified in max_size2 reg */
+#define MAX_OUT_HEIGHT_REG2             2
+/* as specified in max_size3 reg */
+#define MAX_OUT_HEIGHT_REG3             3
+/* maximum of 288 lines as height */
+#define MAX_OUT_HEIGHT_288              4
+/* maximum of 576 lines as height */
+#define MAX_OUT_HEIGHT_576              5
+/* maximum of 720 lines as height */
+#define MAX_OUT_HEIGHT_720              6
+/* maximum of 1080 lines as height */
+#define MAX_OUT_HEIGHT_1080             7
+
+static inline u32 dtd_type_ctl_stride(int type, bool notify, int field,
+                        bool one_d, bool even_line_skip, bool odd_line_skip,
+                        int line_stride)
+{
+        return (type << DTD_DATA_TYPE_SHFT) | (notify << DTD_NOTIFY_SHFT) |
+                (field << DTD_FIELD_SHFT) | (one_d << DTD_1D_SHFT) |
+                (even_line_skip << DTD_EVEN_LINE_SKIP_SHFT) |
+                (odd_line_skip << DTD_ODD_LINE_SKIP_SHFT) |
+                line_stride;
+}
+
+static inline u32 dtd_xfer_length_height(int line_length, int xfer_height)
+{
+        return (line_length << DTD_LINE_LENGTH_SHFT) | xfer_height;
+}
+
+static inline u32 dtd_pkt_ctl(bool mode, bool dir, int chan, int pri,
+                        int next_chan)
+{
+        return (DTD_PKT_TYPE << DTD_PKT_TYPE_SHFT) | (mode << DTD_MODE_SHFT) |
+                (dir << DTD_DIR_SHFT) | (chan << DTD_CHAN_SHFT) |
+                (pri << DTD_PRI_SHFT) | next_chan;
+}
+
+static inline u32 dtd_frame_width_height(int width, int height)
+{
+        return (width << DTD_FRAME_WIDTH_SHFT) | height;
+}
+
+static inline u32 dtd_desc_write_addr(unsigned int addr, bool write_desc,
+                        bool drop_data, bool use_desc)
+{
+        return (addr << DTD_DESC_START_SHIFT) |
+                (write_desc << DTD_WRITE_DESC_SHIFT) |
+                (drop_data << DTD_DROP_DATA_SHIFT) |
+                use_desc;
+}
+
+static inline u32 dtd_start_h_v(int h_start, int v_start)
+{
+        return (h_start << DTD_H_START_SHFT) | v_start;
+}
+
+static inline u32 dtd_max_width_height(int max_width, int max_height)
+{
+        return (max_width << DTD_MAX_WIDTH_SHFT) | max_height;
+}
+
+static inline int dtd_get_data_type(struct vpdma_dtd *dtd)
+{
+        return dtd->type_ctl_stride >> DTD_DATA_TYPE_SHFT;
+}
+
+static inline bool dtd_get_notify(struct vpdma_dtd *dtd)
+{
+        return (dtd->type_ctl_stride >> DTD_NOTIFY_SHFT) & DTD_NOTIFY_MASK;
+}
+
+static inline int dtd_get_field(struct vpdma_dtd *dtd)
+{
+        return (dtd->type_ctl_stride >> DTD_FIELD_SHFT) & DTD_FIELD_MASK;
+}
+
+static inline bool dtd_get_1d(struct vpdma_dtd *dtd)
+{
+        return (dtd->type_ctl_stride >> DTD_1D_SHFT) & DTD_1D_MASK;
+}
+
+static inline bool dtd_get_even_line_skip(struct vpdma_dtd *dtd)
+{
+        return (dtd->type_ctl_stride >> DTD_EVEN_LINE_SKIP_SHFT)
+                & DTD_EVEN_LINE_SKIP_MASK;
+}
+
+static inline bool dtd_get_odd_line_skip(struct vpdma_dtd *dtd)
+{
+        return (dtd->type_ctl_stride >> DTD_ODD_LINE_SKIP_SHFT)
+                & DTD_ODD_LINE_SKIP_MASK;
+}
+
+static inline int dtd_get_line_stride(struct vpdma_dtd *dtd)
+{
+        return dtd->type_ctl_stride & DTD_LINE_STRIDE_MASK;
+}
+
+static inline int dtd_get_line_length(struct vpdma_dtd *dtd)
+{
+        return dtd->xfer_length_height >> DTD_LINE_LENGTH_SHFT;
+}
+
+static inline int dtd_get_xfer_height(struct vpdma_dtd *dtd)
+{
+        return dtd->xfer_length_height & DTD_XFER_HEIGHT_MASK;
+}
+
+static inline int dtd_get_pkt_type(struct vpdma_dtd *dtd)
+{
+        return dtd->pkt_ctl >> DTD_PKT_TYPE_SHFT;
+}
+
+static inline bool dtd_get_mode(struct vpdma_dtd *dtd)
+{
+        return (dtd->pkt_ctl >> DTD_MODE_SHFT) & DTD_MODE_MASK;
+}
+
+static inline bool dtd_get_dir(struct vpdma_dtd *dtd)
+{
+        return (dtd->pkt_ctl >> DTD_DIR_SHFT) & DTD_DIR_MASK;
+}
+
+static inline int dtd_get_chan(struct vpdma_dtd *dtd)
+{
+        return (dtd->pkt_ctl >> DTD_CHAN_SHFT) & DTD_CHAN_MASK;
+}
+
+static inline int dtd_get_priority(struct vpdma_dtd *dtd)
+{
+        return (dtd->pkt_ctl >> DTD_PRI_SHFT) & DTD_PRI_MASK;
+}
+
+static inline int dtd_get_next_chan(struct vpdma_dtd *dtd)
+{
+        return (dtd->pkt_ctl >> DTD_NEXT_CHAN_SHFT) & DTD_NEXT_CHAN_MASK;
+}
+
+static inline int dtd_get_frame_width(struct vpdma_dtd *dtd)
+{
+        return dtd->frame_width_height >> DTD_FRAME_WIDTH_SHFT;
+}
+
+static inline int dtd_get_frame_height(struct vpdma_dtd *dtd)
+{
+        return dtd->frame_width_height & DTD_FRAME_HEIGHT_MASK;
+}
+
+static inline int dtd_get_desc_write_addr(struct vpdma_dtd *dtd)
+{
+        return dtd->desc_write_addr >> DTD_DESC_START_SHIFT;
+}
+
+static inline bool dtd_get_write_desc(struct vpdma_dtd *dtd)
+{
+        return (dtd->desc_write_addr >> DTD_WRITE_DESC_SHIFT) &
+                                                        DTD_WRITE_DESC_MASK;
+}
+
+static inline bool dtd_get_drop_data(struct vpdma_dtd *dtd)
+{
+        return (dtd->desc_write_addr >> DTD_DROP_DATA_SHIFT) &
+                                                        DTD_DROP_DATA_MASK;
+}
+
+static inline bool dtd_get_use_desc(struct vpdma_dtd *dtd)
+{
+        return dtd->desc_write_addr & DTD_USE_DESC_MASK;
+}
+
+static inline int dtd_get_h_start(struct vpdma_dtd *dtd)
+{
+        return dtd->start_h_v >> DTD_H_START_SHFT;
+}
+
+static inline int dtd_get_v_start(struct vpdma_dtd *dtd)
+{
+        return dtd->start_h_v & DTD_V_START_MASK;
+}
+
+static inline int dtd_get_max_width(struct vpdma_dtd *dtd)
+{
+        return (dtd->max_width_height >> DTD_MAX_WIDTH_SHFT) &
+                                                        DTD_MAX_WIDTH_MASK;
+}
+
+static inline int dtd_get_max_height(struct vpdma_dtd *dtd)
+{
+        return (dtd->max_width_height >> DTD_MAX_HEIGHT_SHFT) &
+                                                        DTD_MAX_HEIGHT_MASK;
+}
+
+/*
+ * configuration descriptor
+ */
+struct vpdma_cfd {
+        union {
+                u32     dest_addr_offset;
+                u32     w0;
+        };
+        union {
+                u32     block_len;              /* in words */
+                u32     w1;
+        };
+        u32             payload_addr;
+        u32             ctl_payload_len;        /* in words */
+};
+
+/* Configuration descriptor specifics */
+
+#define CFD_PKT_TYPE            0xb
+
+#define CFD_DIRECT              1
+#define CFD_INDIRECT            0
+#define CFD_CLS_ADB             0
+#define CFD_CLS_BLOCK           1
+
+/* block_len */
+#define CFD__BLOCK_LEN_MASK     0xffff
+#define CFD__BLOCK_LEN_SHFT     0
+
+/* ctl_payload_len */
+#define CFD_PKT_TYPE_MASK       0x1f
+#define CFD_PKT_TYPE_SHFT       27
+#define CFD_DIRECT_MASK         0x01
+#define CFD_DIRECT_SHFT         26
+#define CFD_CLASS_MASK          0x03
+#define CFD_CLASS_SHFT          24
+#define CFD_DEST_MASK           0xff
+#define CFD_DEST_SHFT           16
+#define CFD_PAYLOAD_LEN_MASK    0xffff
+#define CFD_PAYLOAD_LEN_SHFT    0
+
+static inline u32 cfd_pkt_payload_len(bool direct, int cls, int dest,
+                int payload_len)
+{
+        return (CFD_PKT_TYPE << CFD_PKT_TYPE_SHFT) |
+                (direct << CFD_DIRECT_SHFT) |
+                (cls << CFD_CLASS_SHFT) |
+                (dest << CFD_DEST_SHFT) |
+                payload_len;
+}
+
+static inline int cfd_get_pkt_type(struct vpdma_cfd *cfd)
+{
+        return cfd->ctl_payload_len >> CFD_PKT_TYPE_SHFT;
+}
+
+static inline bool cfd_get_direct(struct vpdma_cfd *cfd)
+{
+        return (cfd->ctl_payload_len >> CFD_DIRECT_SHFT) & CFD_DIRECT_MASK;
+}
+
+static inline bool cfd_get_class(struct vpdma_cfd *cfd)
+{
+        return (cfd->ctl_payload_len >> CFD_CLASS_SHFT) & CFD_CLASS_MASK;
+}
+
+static inline int cfd_get_dest(struct vpdma_cfd *cfd)
+{
+        return (cfd->ctl_payload_len >> CFD_DEST_SHFT) & CFD_DEST_MASK;
+}
+
+static inline int cfd_get_payload_len(struct vpdma_cfd *cfd)
+{
+        return cfd->ctl_payload_len & CFD_PAYLOAD_LEN_MASK;
+}
+
+/*
+ * control descriptor
+ */
+struct vpdma_ctd {
+        union {
+                u32     timer_value;
+                u32     list_addr;
+                u32     w0;
+        };
+        union {
+                u32     pixel_line_count;
+                u32     list_size;
+                u32     w1;
+        };
+        union {
+                u32     event;
+                u32     fid_ctl;
+                u32     w2;
+        };
+        u32             type_source_ctl;
+};
+
+/* control descriptor types */
+#define CTD_TYPE_SYNC_ON_CLIENT         0
+#define CTD_TYPE_SYNC_ON_LIST           1
+#define CTD_TYPE_SYNC_ON_EXT            2
+#define CTD_TYPE_SYNC_ON_LM_TIMER       3
+#define CTD_TYPE_SYNC_ON_CHANNEL        4
+#define CTD_TYPE_CHNG_CLIENT_IRQ        5
+#define CTD_TYPE_SEND_IRQ               6
+#define CTD_TYPE_RELOAD_LIST            7
+#define CTD_TYPE_ABORT_CHANNEL          8
+
+#define CTD_PKT_TYPE            0xc
+
+/* timer_value */
+#define CTD_TIMER_VALUE_MASK    0xffff
+#define CTD_TIMER_VALUE_SHFT    0
+
+/* pixel_line_count */
+#define CTD_PIXEL_COUNT_MASK    0xffff
+#define CTD_PIXEL_COUNT_SHFT    16
+#define CTD_LINE_COUNT_MASK     0xffff
+#define CTD_LINE_COUNT_SHFT     0
+
+/* list_size */
+#define CTD_LIST_SIZE_MASK      0xffff
+#define CTD_LIST_SIZE_SHFT      0
+
+/* event */
+#define CTD_EVENT_MASK          0x0f
+#define CTD_EVENT_SHFT          0
+
+/* fid_ctl */
+#define CTD_FID2_MASK           0x03
+#define CTD_FID2_SHFT           4
+#define CTD_FID1_MASK           0x03
+#define CTD_FID1_SHFT           2
+#define CTD_FID0_MASK           0x03
+#define CTD_FID0_SHFT           0
+
+/* type_source_ctl */
+#define CTD_PKT_TYPE_MASK       0x1f
+#define CTD_PKT_TYPE_SHFT       27
+#define CTD_SOURCE_MASK         0xff
+#define CTD_SOURCE_SHFT         16
+#define CTD_CONTROL_MASK        0x0f
+#define CTD_CONTROL_SHFT        0
+
+static inline u32 ctd_pixel_line_count(int pixel_count, int line_count)
+{
+        return (pixel_count << CTD_PIXEL_COUNT_SHFT) | line_count;
+}
+
+static inline u32 ctd_set_fid_ctl(int fid0, int fid1, int fid2)
+{
+        return (fid2 << CTD_FID2_SHFT) | (fid1 << CTD_FID1_SHFT) | fid0;
+}
+
+static inline u32 ctd_type_source_ctl(int source, int control)
+{
+        return (CTD_PKT_TYPE << CTD_PKT_TYPE_SHFT) |
+                (source << CTD_SOURCE_SHFT) | control;
+}
+
+static inline u32 ctd_get_pixel_count(struct vpdma_ctd *ctd)
+{
+        return ctd->pixel_line_count >> CTD_PIXEL_COUNT_SHFT;
+}
+
+static inline int ctd_get_line_count(struct vpdma_ctd *ctd)
+{
+        return ctd->pixel_line_count & CTD_LINE_COUNT_MASK;
+}
+
+static inline int ctd_get_event(struct vpdma_ctd *ctd)
+{
+        return ctd->event & CTD_EVENT_MASK;
+}
+
+static inline int ctd_get_fid2_ctl(struct vpdma_ctd *ctd)
+{
+        return (ctd->fid_ctl >> CTD_FID2_SHFT) & CTD_FID2_MASK;
+}
+
+static inline int ctd_get_fid1_ctl(struct vpdma_ctd *ctd)
+{
+        return (ctd->fid_ctl >> CTD_FID1_SHFT) & CTD_FID1_MASK;
+}
+
+static inline int ctd_get_fid0_ctl(struct vpdma_ctd *ctd)
+{
+        return ctd->fid_ctl & CTD_FID2_MASK;
+}
+
+static inline int ctd_get_pkt_type(struct vpdma_ctd *ctd)
+{
+        return ctd->type_source_ctl >> CTD_PKT_TYPE_SHFT;
+}
+
+static inline int ctd_get_source(struct vpdma_ctd *ctd)
+{
+        return (ctd->type_source_ctl >> CTD_SOURCE_SHFT) & CTD_SOURCE_MASK;
+}
+
+static inline int ctd_get_ctl(struct vpdma_ctd *ctd)
+{
+        return ctd->type_source_ctl & CTD_CONTROL_MASK;
+}
+
+#endif
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
new file mode 100644
index 000000000000..4e58069e24ff
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -0,0 +1,2099 @@
+/*
+ * TI VPE mem2mem driver, based on the virtual v4l2-mem2mem example driver
+ *
+ * Copyright (c) 2013 Texas Instruments Inc.
+ * David Griego, <dagriego@biglakesoftware.com>
+ * Dale Farnsworth, <dale@farnsworth.org>
+ * Archit Taneja, <archit@ti.com>
+ *
+ * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
+ * Pawel Osciak, <pawel@osciak.com>
+ * Marek Szyprowski, <m.szyprowski@samsung.com>
+ *
+ * Based on the virtual v4l2-mem2mem example device
+ *
+ * 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/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/err.h>
+#include <linux/fs.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioctl.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/videodev2.h>
+
+#include <media/v4l2-common.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-event.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
+
+#include "vpdma.h"
+#include "vpe_regs.h"
+
+#define VPE_MODULE_NAME "vpe"
+
+/* minimum and maximum frame sizes */
+#define MIN_W           128
+#define MIN_H           128
+#define MAX_W           1920
+#define MAX_H           1080
+
+/* required alignments */
+#define S_ALIGN         0       /* multiple of 1 */
+#define H_ALIGN         1       /* multiple of 2 */
+#define W_ALIGN         1       /* multiple of 2 */
+
+/* multiple of 128 bits, line stride, 16 bytes */
+#define L_ALIGN         4
+
+/* flags that indicate a format can be used for capture/output */
+#define VPE_FMT_TYPE_CAPTURE    (1 << 0)
+#define VPE_FMT_TYPE_OUTPUT     (1 << 1)
+
+/* used as plane indices */
+#define VPE_MAX_PLANES  2
+#define VPE_LUMA        0
+#define VPE_CHROMA      1
+
+/* per m2m context info */
+#define VPE_MAX_SRC_BUFS        3       /* need 3 src fields to de-interlace */
+
+#define VPE_DEF_BUFS_PER_JOB    1       /* default one buffer per batch job */
+
+/*
+ * each VPE context can need up to 3 config desciptors, 7 input descriptors,
+ * 3 output descriptors, and 10 control descriptors
+ */
+#define VPE_DESC_LIST_SIZE      (10 * VPDMA_DTD_DESC_SIZE +     \
+                                        13 * VPDMA_CFD_CTD_DESC_SIZE)
+
+#define vpe_dbg(vpedev, fmt, arg...)    \
+                dev_dbg((vpedev)->v4l2_dev.dev, fmt, ##arg)
+#define vpe_err(vpedev, fmt, arg...)    \
+                dev_err((vpedev)->v4l2_dev.dev, fmt, ##arg)
+
+struct vpe_us_coeffs {
+        unsigned short  anchor_fid0_c0;
+        unsigned short  anchor_fid0_c1;
+        unsigned short  anchor_fid0_c2;
+        unsigned short  anchor_fid0_c3;
+        unsigned short  interp_fid0_c0;
+        unsigned short  interp_fid0_c1;
+        unsigned short  interp_fid0_c2;
+        unsigned short  interp_fid0_c3;
+        unsigned short  anchor_fid1_c0;
+        unsigned short  anchor_fid1_c1;
+        unsigned short  anchor_fid1_c2;
+        unsigned short  anchor_fid1_c3;
+        unsigned short  interp_fid1_c0;
+        unsigned short  interp_fid1_c1;
+        unsigned short  interp_fid1_c2;
+        unsigned short  interp_fid1_c3;
+};
+
+/*
+ * Default upsampler coefficients
+ */
+static const struct vpe_us_coeffs us_coeffs[] = {
+        {
+                /* Coefficients for progressive input */
+                0x00C8, 0x0348, 0x0018, 0x3FD8, 0x3FB8, 0x0378, 0x00E8, 0x3FE8,
+                0x00C8, 0x0348, 0x0018, 0x3FD8, 0x3FB8, 0x0378, 0x00E8, 0x3FE8,
+        },
+        {
+                /* Coefficients for Top Field Interlaced input */
+                0x0051, 0x03D5, 0x3FE3, 0x3FF7, 0x3FB5, 0x02E9, 0x018F, 0x3FD3,
+                /* Coefficients for Bottom Field Interlaced input */
+                0x016B, 0x0247, 0x00B1, 0x3F9D, 0x3FCF, 0x03DB, 0x005D, 0x3FF9,
+        },
+};
+
+/*
+ * the following registers are for configuring some of the parameters of the
+ * motion and edge detection blocks inside DEI, these generally remain the same,
+ * these could be passed later via userspace if some one needs to tweak these.
+ */
+struct vpe_dei_regs {
+        unsigned long mdt_spacial_freq_thr_reg;         /* VPE_DEI_REG2 */
+        unsigned long edi_config_reg;                   /* VPE_DEI_REG3 */
+        unsigned long edi_lut_reg0;                     /* VPE_DEI_REG4 */
+        unsigned long edi_lut_reg1;                     /* VPE_DEI_REG5 */
+        unsigned long edi_lut_reg2;                     /* VPE_DEI_REG6 */
+        unsigned long edi_lut_reg3;                     /* VPE_DEI_REG7 */
+};
+
+/*
+ * default expert DEI register values, unlikely to be modified.
+ */
+static const struct vpe_dei_regs dei_regs = {
+        0x020C0804u,
+        0x0118100Fu,
+        0x08040200u,
+        0x1010100Cu,
+        0x10101010u,
+        0x10101010u,
+};
+
+/*
+ * The port_data structure contains per-port data.
+ */
+struct vpe_port_data {
+        enum vpdma_channel channel;     /* VPDMA channel */
+        u8      vb_index;               /* input frame f, f-1, f-2 index */
+        u8      vb_part;                /* plane index for co-panar formats */
+};
+
+/*
+ * Define indices into the port_data tables
+ */
+#define VPE_PORT_LUMA1_IN       0
+#define VPE_PORT_CHROMA1_IN     1
+#define VPE_PORT_LUMA2_IN       2
+#define VPE_PORT_CHROMA2_IN     3
+#define VPE_PORT_LUMA3_IN       4
+#define VPE_PORT_CHROMA3_IN     5
+#define VPE_PORT_MV_IN          6
+#define VPE_PORT_MV_OUT         7
+#define VPE_PORT_LUMA_OUT       8
+#define VPE_PORT_CHROMA_OUT     9
+#define VPE_PORT_RGB_OUT        10
+
+static const struct vpe_port_data port_data[11] = {
+        [VPE_PORT_LUMA1_IN] = {
+                .channel        = VPE_CHAN_LUMA1_IN,
+                .vb_index       = 0,
+                .vb_part        = VPE_LUMA,
+        },
+        [VPE_PORT_CHROMA1_IN] = {
+                .channel        = VPE_CHAN_CHROMA1_IN,
+                .vb_index       = 0,
+                .vb_part        = VPE_CHROMA,
+        },
+        [VPE_PORT_LUMA2_IN] = {
+                .channel        = VPE_CHAN_LUMA2_IN,
+                .vb_index       = 1,
+                .vb_part        = VPE_LUMA,
+        },
+        [VPE_PORT_CHROMA2_IN] = {
+                .channel        = VPE_CHAN_CHROMA2_IN,
+                .vb_index       = 1,
+                .vb_part        = VPE_CHROMA,
+        },
+        [VPE_PORT_LUMA3_IN] = {
+                .channel        = VPE_CHAN_LUMA3_IN,
+                .vb_index       = 2,
+                .vb_part        = VPE_LUMA,
+        },
+        [VPE_PORT_CHROMA3_IN] = {
+                .channel        = VPE_CHAN_CHROMA3_IN,
+                .vb_index       = 2,
+                .vb_part        = VPE_CHROMA,
+        },
+        [VPE_PORT_MV_IN] = {
+                .channel        = VPE_CHAN_MV_IN,
+        },
+        [VPE_PORT_MV_OUT] = {
+                .channel        = VPE_CHAN_MV_OUT,
+        },
+        [VPE_PORT_LUMA_OUT] = {
+                .channel        = VPE_CHAN_LUMA_OUT,
+                .vb_part        = VPE_LUMA,
+        },
+        [VPE_PORT_CHROMA_OUT] = {
+                .channel        = VPE_CHAN_CHROMA_OUT,
+                .vb_part        = VPE_CHROMA,
+        },
+        [VPE_PORT_RGB_OUT] = {
+                .channel        = VPE_CHAN_RGB_OUT,
+                .vb_part        = VPE_LUMA,
+        },
+};
+
+
+/* driver info for each of the supported video formats */
+struct vpe_fmt {
+        char    *name;                  /* human-readable name */
+        u32     fourcc;                 /* standard format identifier */
+        u8      types;                  /* CAPTURE and/or OUTPUT */
+        u8      coplanar;               /* set for unpacked Luma and Chroma */
+        /* vpdma format info for each plane */
+        struct vpdma_data_format const *vpdma_fmt[VPE_MAX_PLANES];
+};
+
+static struct vpe_fmt vpe_formats[] = {
+        {
+                .name           = "YUV 422 co-planar",
+                .fourcc         = V4L2_PIX_FMT_NV16,
+                .types          = VPE_FMT_TYPE_CAPTURE | VPE_FMT_TYPE_OUTPUT,
+                .coplanar       = 1,
+                .vpdma_fmt      = { &vpdma_yuv_fmts[VPDMA_DATA_FMT_Y444],
+                                    &vpdma_yuv_fmts[VPDMA_DATA_FMT_C444],
+                                  },
+        },
+        {
+                .name           = "YUV 420 co-planar",
+                .fourcc         = V4L2_PIX_FMT_NV12,
+                .types          = VPE_FMT_TYPE_CAPTURE | VPE_FMT_TYPE_OUTPUT,
+                .coplanar       = 1,
+                .vpdma_fmt      = { &vpdma_yuv_fmts[VPDMA_DATA_FMT_Y420],
+                                    &vpdma_yuv_fmts[VPDMA_DATA_FMT_C420],
+                                  },
+        },
+        {
+                .name           = "YUYV 422 packed",
+                .fourcc         = V4L2_PIX_FMT_YUYV,
+                .types          = VPE_FMT_TYPE_CAPTURE | VPE_FMT_TYPE_OUTPUT,
+                .coplanar       = 0,
+                .vpdma_fmt      = { &vpdma_yuv_fmts[VPDMA_DATA_FMT_YC422],
+                                  },
+        },
+        {
+                .name           = "UYVY 422 packed",
+                .fourcc         = V4L2_PIX_FMT_UYVY,
+                .types          = VPE_FMT_TYPE_CAPTURE | VPE_FMT_TYPE_OUTPUT,
+                .coplanar       = 0,
+                .vpdma_fmt      = { &vpdma_yuv_fmts[VPDMA_DATA_FMT_CY422],
+                                  },
+        },
+};
+
+/*
+ * per-queue, driver-specific private data.
+ * there is one source queue and one destination queue for each m2m context.
+ */
+struct vpe_q_data {
+        unsigned int            width;                          /* frame width */
+        unsigned int            height;                         /* frame height */
+        unsigned int            bytesperline[VPE_MAX_PLANES];   /* bytes per line in memory */
+        enum v4l2_colorspace    colorspace;
+        enum v4l2_field         field;                          /* supported field value */
+        unsigned int            flags;
+        unsigned int            sizeimage[VPE_MAX_PLANES];      /* image size in memory */
+        struct v4l2_rect        c_rect;                         /* crop/compose rectangle */
+        struct vpe_fmt          *fmt;                           /* format info */
+};
+
+/* vpe_q_data flag bits */
+#define Q_DATA_FRAME_1D         (1 << 0)
+#define Q_DATA_MODE_TILED       (1 << 1)
+#define Q_DATA_INTERLACED       (1 << 2)
+
+enum {
+        Q_DATA_SRC = 0,
+        Q_DATA_DST = 1,
+};
+
+/* find our format description corresponding to the passed v4l2_format */
+static struct vpe_fmt *find_format(struct v4l2_format *f)
+{
+        struct vpe_fmt *fmt;
+        unsigned int k;
+
+        for (k = 0; k < ARRAY_SIZE(vpe_formats); k++) {
+                fmt = &vpe_formats[k];
+                if (fmt->fourcc == f->fmt.pix.pixelformat)
+                        return fmt;
+        }
+
+        return NULL;
+}
+
+/*
+ * there is one vpe_dev structure in the driver, it is shared by
+ * all instances.
+ */
+struct vpe_dev {
+        struct v4l2_device      v4l2_dev;
+        struct video_device     vfd;
+        struct v4l2_m2m_dev     *m2m_dev;
+
+        atomic_t                num_instances;  /* count of driver instances */
+        dma_addr_t              loaded_mmrs;    /* shadow mmrs in device */
+        struct mutex            dev_mutex;
+        spinlock_t              lock;
+
+        int                     irq;
+        void __iomem            *base;
+
+        struct vb2_alloc_ctx    *alloc_ctx;
+        struct vpdma_data       *vpdma;         /* vpdma data handle */
+};
+
+/*
+ * There is one vpe_ctx structure for each m2m context.
+ */
+struct vpe_ctx {
+        struct v4l2_fh          fh;
+        struct vpe_dev          *dev;
+        struct v4l2_m2m_ctx     *m2m_ctx;
+        struct v4l2_ctrl_handler hdl;
+
+        unsigned int            field;                  /* current field */
+        unsigned int            sequence;               /* current frame/field seq */
+        unsigned int            aborting;               /* abort after next irq */
+
+        unsigned int            bufs_per_job;           /* input buffers per batch */
+        unsigned int            bufs_completed;         /* bufs done in this batch */
+
+        struct vpe_q_data       q_data[2];              /* src & dst queue data */
+        struct vb2_buffer       *src_vbs[VPE_MAX_SRC_BUFS];
+        struct vb2_buffer       *dst_vb;
+
+        dma_addr_t              mv_buf_dma[2];          /* dma addrs of motion vector in/out bufs */
+        void                    *mv_buf[2];             /* virtual addrs of motion vector bufs */
+        size_t                  mv_buf_size;            /* current motion vector buffer size */
+        struct vpdma_buf        mmr_adb;                /* shadow reg addr/data block */
+        struct vpdma_desc_list  desc_list;              /* DMA descriptor list */
+
+        bool                    deinterlacing;          /* using de-interlacer */
+        bool                    load_mmrs;              /* have new shadow reg values */
+
+        unsigned int            src_mv_buf_selector;
+};
+
+
+/*
+ * M2M devices get 2 queues.
+ * Return the queue given the type.
+ */
+static struct vpe_q_data *get_q_data(struct vpe_ctx *ctx,
+                                     enum v4l2_buf_type type)
+{
+        switch (type) {
+        case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
+                return &ctx->q_data[Q_DATA_SRC];
+        case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
+                return &ctx->q_data[Q_DATA_DST];
+        default:
+                BUG();
+        }
+        return NULL;
+}
+
+static u32 read_reg(struct vpe_dev *dev, int offset)
+{
+        return ioread32(dev->base + offset);
+}
+
+static void write_reg(struct vpe_dev *dev, int offset, u32 value)
+{
+        iowrite32(value, dev->base + offset);
+}
+
+/* register field read/write helpers */
+static int get_field(u32 value, u32 mask, int shift)
+{
+        return (value & (mask << shift)) >> shift;
+}
+
+static int read_field_reg(struct vpe_dev *dev, int offset, u32 mask, int shift)
+{
+        return get_field(read_reg(dev, offset), mask, shift);
+}
+
+static void write_field(u32 *valp, u32 field, u32 mask, int shift)
+{
+        u32 val = *valp;
+
+        val &= ~(mask << shift);
+        val |= (field & mask) << shift;
+        *valp = val;
+}
+
+static void write_field_reg(struct vpe_dev *dev, int offset, u32 field,
+                u32 mask, int shift)
+{
+        u32 val = read_reg(dev, offset);
+
+        write_field(&val, field, mask, shift);
+
+        write_reg(dev, offset, val);
+}
+
+/*
+ * DMA address/data block for the shadow registers
+ */
+struct vpe_mmr_adb {
+        struct vpdma_adb_hdr    out_fmt_hdr;
+        u32                     out_fmt_reg[1];
+        u32                     out_fmt_pad[3];
+        struct vpdma_adb_hdr    us1_hdr;
+        u32                     us1_regs[8];
+        struct vpdma_adb_hdr    us2_hdr;
+        u32                     us2_regs[8];
+        struct vpdma_adb_hdr    us3_hdr;
+        u32                     us3_regs[8];
+        struct vpdma_adb_hdr    dei_hdr;
+        u32                     dei_regs[8];
+        struct vpdma_adb_hdr    sc_hdr;
+        u32                     sc_regs[1];
+        u32                     sc_pad[3];
+        struct vpdma_adb_hdr    csc_hdr;
+        u32                     csc_regs[6];
+        u32                     csc_pad[2];
+};
+
+#define VPE_SET_MMR_ADB_HDR(ctx, hdr, regs, offset_a)   \
+        VPDMA_SET_MMR_ADB_HDR(ctx->mmr_adb, vpe_mmr_adb, hdr, regs, offset_a)
+/*
+ * Set the headers for all of the address/data block structures.
+ */
+static void init_adb_hdrs(struct vpe_ctx *ctx)
+{
+        VPE_SET_MMR_ADB_HDR(ctx, out_fmt_hdr, out_fmt_reg, VPE_CLK_FORMAT_SELECT);
+        VPE_SET_MMR_ADB_HDR(ctx, us1_hdr, us1_regs, VPE_US1_R0);
+        VPE_SET_MMR_ADB_HDR(ctx, us2_hdr, us2_regs, VPE_US2_R0);
+        VPE_SET_MMR_ADB_HDR(ctx, us3_hdr, us3_regs, VPE_US3_R0);
+        VPE_SET_MMR_ADB_HDR(ctx, dei_hdr, dei_regs, VPE_DEI_FRAME_SIZE);
+        VPE_SET_MMR_ADB_HDR(ctx, sc_hdr, sc_regs, VPE_SC_MP_SC0);
+        VPE_SET_MMR_ADB_HDR(ctx, csc_hdr, csc_regs, VPE_CSC_CSC00);
+};
+
+/*
+ * Allocate or re-allocate the motion vector DMA buffers
+ * There are two buffers, one for input and one for output.
+ * However, the roles are reversed after each field is processed.
+ * In other words, after each field is processed, the previous
+ * output (dst) MV buffer becomes the new input (src) MV buffer.
+ */
+static int realloc_mv_buffers(struct vpe_ctx *ctx, size_t size)
+{
+        struct device *dev = ctx->dev->v4l2_dev.dev;
+
+        if (ctx->mv_buf_size == size)
+                return 0;
+
+        if (ctx->mv_buf[0])
+                dma_free_coherent(dev, ctx->mv_buf_size, ctx->mv_buf[0],
+                        ctx->mv_buf_dma[0]);
+
+        if (ctx->mv_buf[1])
+                dma_free_coherent(dev, ctx->mv_buf_size, ctx->mv_buf[1],
+                        ctx->mv_buf_dma[1]);
+
+        if (size == 0)
+                return 0;
+
+        ctx->mv_buf[0] = dma_alloc_coherent(dev, size, &ctx->mv_buf_dma[0],
+                                GFP_KERNEL);
+        if (!ctx->mv_buf[0]) {
+                vpe_err(ctx->dev, "failed to allocate motion vector buffer\n");
+                return -ENOMEM;
+        }
+
+        ctx->mv_buf[1] = dma_alloc_coherent(dev, size, &ctx->mv_buf_dma[1],
+                                GFP_KERNEL);
+        if (!ctx->mv_buf[1]) {
+                vpe_err(ctx->dev, "failed to allocate motion vector buffer\n");
+                dma_free_coherent(dev, size, ctx->mv_buf[0],
+                        ctx->mv_buf_dma[0]);
+
+                return -ENOMEM;
+        }
+
+        ctx->mv_buf_size = size;
+        ctx->src_mv_buf_selector = 0;
+
+        return 0;
+}
+
+static void free_mv_buffers(struct vpe_ctx *ctx)
+{
+        realloc_mv_buffers(ctx, 0);
+}
+
+/*
+ * While de-interlacing, we keep the two most recent input buffers
+ * around.  This function frees those two buffers when we have
+ * finished processing the current stream.
+ */
+static void free_vbs(struct vpe_ctx *ctx)
+{
+        struct vpe_dev *dev = ctx->dev;
+        unsigned long flags;
+
+        if (ctx->src_vbs[2] == NULL)
+                return;
+
+        spin_lock_irqsave(&dev->lock, flags);
+        if (ctx->src_vbs[2]) {
+                v4l2_m2m_buf_done(ctx->src_vbs[2], VB2_BUF_STATE_DONE);
+                v4l2_m2m_buf_done(ctx->src_vbs[1], VB2_BUF_STATE_DONE);
+        }
+        spin_unlock_irqrestore(&dev->lock, flags);
+}
+
+/*
+ * Enable or disable the VPE clocks
+ */
+static void vpe_set_clock_enable(struct vpe_dev *dev, bool on)
+{
+        u32 val = 0;
+
+        if (on)
+                val = VPE_DATA_PATH_CLK_ENABLE | VPE_VPEDMA_CLK_ENABLE;
+        write_reg(dev, VPE_CLK_ENABLE, val);
+}
+
+static void vpe_top_reset(struct vpe_dev *dev)
+{
+
+        write_field_reg(dev, VPE_CLK_RESET, 1, VPE_DATA_PATH_CLK_RESET_MASK,
+                VPE_DATA_PATH_CLK_RESET_SHIFT);
+
+        usleep_range(100, 150);
+
+        write_field_reg(dev, VPE_CLK_RESET, 0, VPE_DATA_PATH_CLK_RESET_MASK,
+                VPE_DATA_PATH_CLK_RESET_SHIFT);
+}
+
+static void vpe_top_vpdma_reset(struct vpe_dev *dev)
+{
+        write_field_reg(dev, VPE_CLK_RESET, 1, VPE_VPDMA_CLK_RESET_MASK,
+                VPE_VPDMA_CLK_RESET_SHIFT);
+
+        usleep_range(100, 150);
+
+        write_field_reg(dev, VPE_CLK_RESET, 0, VPE_VPDMA_CLK_RESET_MASK,
+                VPE_VPDMA_CLK_RESET_SHIFT);
+}
+
+/*
+ * Load the correct of upsampler coefficients into the shadow MMRs
+ */
+static void set_us_coefficients(struct vpe_ctx *ctx)
+{
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        struct vpe_q_data *s_q_data = &ctx->q_data[Q_DATA_SRC];
+        u32 *us1_reg = &mmr_adb->us1_regs[0];
+        u32 *us2_reg = &mmr_adb->us2_regs[0];
+        u32 *us3_reg = &mmr_adb->us3_regs[0];
+        const unsigned short *cp, *end_cp;
+
+        cp = &us_coeffs[0].anchor_fid0_c0;
+
+        if (s_q_data->flags & Q_DATA_INTERLACED)        /* interlaced */
+                cp += sizeof(us_coeffs[0]) / sizeof(*cp);
+
+        end_cp = cp + sizeof(us_coeffs[0]) / sizeof(*cp);
+
+        while (cp < end_cp) {
+                write_field(us1_reg, *cp++, VPE_US_C0_MASK, VPE_US_C0_SHIFT);
+                write_field(us1_reg, *cp++, VPE_US_C1_MASK, VPE_US_C1_SHIFT);
+                *us2_reg++ = *us1_reg;
+                *us3_reg++ = *us1_reg++;
+        }
+        ctx->load_mmrs = true;
+}
+
+/*
+ * Set the upsampler config mode and the VPDMA line mode in the shadow MMRs.
+ */
+static void set_cfg_and_line_modes(struct vpe_ctx *ctx)
+{
+        struct vpe_fmt *fmt = ctx->q_data[Q_DATA_SRC].fmt;
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        u32 *us1_reg0 = &mmr_adb->us1_regs[0];
+        u32 *us2_reg0 = &mmr_adb->us2_regs[0];
+        u32 *us3_reg0 = &mmr_adb->us3_regs[0];
+        int line_mode = 1;
+        int cfg_mode = 1;
+
+        /*
+         * Cfg Mode 0: YUV420 source, enable upsampler, DEI is de-interlacing.
+         * Cfg Mode 1: YUV422 source, disable upsampler, DEI is de-interlacing.
+         */
+
+        if (fmt->fourcc == V4L2_PIX_FMT_NV12) {
+                cfg_mode = 0;
+                line_mode = 0;          /* double lines to line buffer */
+        }
+
+        write_field(us1_reg0, cfg_mode, VPE_US_MODE_MASK, VPE_US_MODE_SHIFT);
+        write_field(us2_reg0, cfg_mode, VPE_US_MODE_MASK, VPE_US_MODE_SHIFT);
+        write_field(us3_reg0, cfg_mode, VPE_US_MODE_MASK, VPE_US_MODE_SHIFT);
+
+        /* regs for now */
+        vpdma_set_line_mode(ctx->dev->vpdma, line_mode, VPE_CHAN_CHROMA1_IN);
+        vpdma_set_line_mode(ctx->dev->vpdma, line_mode, VPE_CHAN_CHROMA2_IN);
+        vpdma_set_line_mode(ctx->dev->vpdma, line_mode, VPE_CHAN_CHROMA3_IN);
+
+        /* frame start for input luma */
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_LUMA1_IN);
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_LUMA2_IN);
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_LUMA3_IN);
+
+        /* frame start for input chroma */
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_CHROMA1_IN);
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_CHROMA2_IN);
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_CHROMA3_IN);
+
+        /* frame start for MV in client */
+        vpdma_set_frame_start_event(ctx->dev->vpdma, VPDMA_FSEVENT_CHANNEL_ACTIVE,
+                VPE_CHAN_MV_IN);
+
+        ctx->load_mmrs = true;
+}
+
+/*
+ * Set the shadow registers that are modified when the source
+ * format changes.
+ */
+static void set_src_registers(struct vpe_ctx *ctx)
+{
+        set_us_coefficients(ctx);
+}
+
+/*
+ * Set the shadow registers that are modified when the destination
+ * format changes.
+ */
+static void set_dst_registers(struct vpe_ctx *ctx)
+{
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        struct vpe_fmt *fmt = ctx->q_data[Q_DATA_DST].fmt;
+        u32 val = 0;
+
+        /* select RGB path when color space conversion is supported in future */
+        if (fmt->fourcc == V4L2_PIX_FMT_RGB24)
+                val |= VPE_RGB_OUT_SELECT | VPE_CSC_SRC_DEI_SCALER;
+        else if (fmt->fourcc == V4L2_PIX_FMT_NV16)
+                val |= VPE_COLOR_SEPARATE_422;
+
+        /* The source of CHR_DS is always the scaler, whether it's used or not */
+        val |= VPE_DS_SRC_DEI_SCALER;
+
+        if (fmt->fourcc != V4L2_PIX_FMT_NV12)
+                val |= VPE_DS_BYPASS;
+
+        mmr_adb->out_fmt_reg[0] = val;
+
+        ctx->load_mmrs = true;
+}
+
+/*
+ * Set the de-interlacer shadow register values
+ */
+static void set_dei_regs(struct vpe_ctx *ctx)
+{
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        struct vpe_q_data *s_q_data = &ctx->q_data[Q_DATA_SRC];
+        unsigned int src_h = s_q_data->c_rect.height;
+        unsigned int src_w = s_q_data->c_rect.width;
+        u32 *dei_mmr0 = &mmr_adb->dei_regs[0];
+        bool deinterlace = true;
+        u32 val = 0;
+
+        /*
+         * according to TRM, we should set DEI in progressive bypass mode when
+         * the input content is progressive, however, DEI is bypassed correctly
+         * for both progressive and interlace content in interlace bypass mode.
+         * It has been recommended not to use progressive bypass mode.
+         */
+        if ((!ctx->deinterlacing && (s_q_data->flags & Q_DATA_INTERLACED)) ||
+                        !(s_q_data->flags & Q_DATA_INTERLACED)) {
+                deinterlace = false;
+                val = VPE_DEI_INTERLACE_BYPASS;
+        }
+
+        src_h = deinterlace ? src_h * 2 : src_h;
+
+        val |= (src_h << VPE_DEI_HEIGHT_SHIFT) |
+                (src_w << VPE_DEI_WIDTH_SHIFT) |
+                VPE_DEI_FIELD_FLUSH;
+
+        *dei_mmr0 = val;
+
+        ctx->load_mmrs = true;
+}
+
+static void set_dei_shadow_registers(struct vpe_ctx *ctx)
+{
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        u32 *dei_mmr = &mmr_adb->dei_regs[0];
+        const struct vpe_dei_regs *cur = &dei_regs;
+
+        dei_mmr[2]  = cur->mdt_spacial_freq_thr_reg;
+        dei_mmr[3]  = cur->edi_config_reg;
+        dei_mmr[4]  = cur->edi_lut_reg0;
+        dei_mmr[5]  = cur->edi_lut_reg1;
+        dei_mmr[6]  = cur->edi_lut_reg2;
+        dei_mmr[7]  = cur->edi_lut_reg3;
+
+        ctx->load_mmrs = true;
+}
+
+static void set_csc_coeff_bypass(struct vpe_ctx *ctx)
+{
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        u32 *shadow_csc_reg5 = &mmr_adb->csc_regs[5];
+
+        *shadow_csc_reg5 |= VPE_CSC_BYPASS;
+
+        ctx->load_mmrs = true;
+}
+
+static void set_sc_regs_bypass(struct vpe_ctx *ctx)
+{
+        struct vpe_mmr_adb *mmr_adb = ctx->mmr_adb.addr;
+        u32 *sc_reg0 = &mmr_adb->sc_regs[0];
+        u32 val = 0;
+
+        val |= VPE_SC_BYPASS;
+        *sc_reg0 = val;
+
+        ctx->load_mmrs = true;
+}
+
+/*
+ * Set the shadow registers whose values are modified when either the
+ * source or destination format is changed.
+ */
+static int set_srcdst_params(struct vpe_ctx *ctx)
+{
+        struct vpe_q_data *s_q_data =  &ctx->q_data[Q_DATA_SRC];
+        struct vpe_q_data *d_q_data =  &ctx->q_data[Q_DATA_DST];
+        size_t mv_buf_size;
+        int ret;
+
+        ctx->sequence = 0;
+        ctx->field = V4L2_FIELD_TOP;
+
+        if ((s_q_data->flags & Q_DATA_INTERLACED) &&
+                        !(d_q_data->flags & Q_DATA_INTERLACED)) {
+                const struct vpdma_data_format *mv =
+                        &vpdma_misc_fmts[VPDMA_DATA_FMT_MV];
+
+                ctx->deinterlacing = 1;
+                mv_buf_size =
+                        (s_q_data->width * s_q_data->height * mv->depth) >> 3;
+        } else {
+                ctx->deinterlacing = 0;
+                mv_buf_size = 0;
+        }
+
+        free_vbs(ctx);
+
+        ret = realloc_mv_buffers(ctx, mv_buf_size);
+        if (ret)
+                return ret;
+
+        set_cfg_and_line_modes(ctx);
+        set_dei_regs(ctx);
+        set_csc_coeff_bypass(ctx);
+        set_sc_regs_bypass(ctx);
+
+        return 0;
+}
+
+/*
+ * Return the vpe_ctx structure for a given struct file
+ */
+static struct vpe_ctx *file2ctx(struct file *file)
+{
+        return container_of(file->private_data, struct vpe_ctx, fh);
+}
+
+/*
+ * mem2mem callbacks
+ */
+
+/**
+ * job_ready() - check whether an instance is ready to be scheduled to run
+ */
+static int job_ready(void *priv)
+{
+        struct vpe_ctx *ctx = priv;
+        int needed = ctx->bufs_per_job;
+
+        if (ctx->deinterlacing && ctx->src_vbs[2] == NULL)
+                needed += 2;    /* need additional two most recent fields */
+
+        if (v4l2_m2m_num_src_bufs_ready(ctx->m2m_ctx) < needed)
+                return 0;
+
+        return 1;
+}
+
+static void job_abort(void *priv)
+{
+        struct vpe_ctx *ctx = priv;
+
+        /* Will cancel the transaction in the next interrupt handler */
+        ctx->aborting = 1;
+}
+
+/*
+ * Lock access to the device
+ */
+static void vpe_lock(void *priv)
+{
+        struct vpe_ctx *ctx = priv;
+        struct vpe_dev *dev = ctx->dev;
+        mutex_lock(&dev->dev_mutex);
+}
+
+static void vpe_unlock(void *priv)
+{
+        struct vpe_ctx *ctx = priv;
+        struct vpe_dev *dev = ctx->dev;
+        mutex_unlock(&dev->dev_mutex);
+}
+
+static void vpe_dump_regs(struct vpe_dev *dev)
+{
+#define DUMPREG(r) vpe_dbg(dev, "%-35s %08x\n", #r, read_reg(dev, VPE_##r))
+
+        vpe_dbg(dev, "VPE Registers:\n");
+
+        DUMPREG(PID);
+        DUMPREG(SYSCONFIG);
+        DUMPREG(INT0_STATUS0_RAW);
+        DUMPREG(INT0_STATUS0);
+        DUMPREG(INT0_ENABLE0);
+        DUMPREG(INT0_STATUS1_RAW);
+        DUMPREG(INT0_STATUS1);
+        DUMPREG(INT0_ENABLE1);
+        DUMPREG(CLK_ENABLE);
+        DUMPREG(CLK_RESET);
+        DUMPREG(CLK_FORMAT_SELECT);
+        DUMPREG(CLK_RANGE_MAP);
+        DUMPREG(US1_R0);
+        DUMPREG(US1_R1);
+        DUMPREG(US1_R2);
+        DUMPREG(US1_R3);
+        DUMPREG(US1_R4);
+        DUMPREG(US1_R5);
+        DUMPREG(US1_R6);
+        DUMPREG(US1_R7);
+        DUMPREG(US2_R0);
+        DUMPREG(US2_R1);
+        DUMPREG(US2_R2);
+        DUMPREG(US2_R3);
+        DUMPREG(US2_R4);
+        DUMPREG(US2_R5);
+        DUMPREG(US2_R6);
+        DUMPREG(US2_R7);
+        DUMPREG(US3_R0);
+        DUMPREG(US3_R1);
+        DUMPREG(US3_R2);
+        DUMPREG(US3_R3);
+        DUMPREG(US3_R4);
+        DUMPREG(US3_R5);
+        DUMPREG(US3_R6);
+        DUMPREG(US3_R7);
+        DUMPREG(DEI_FRAME_SIZE);
+        DUMPREG(MDT_BYPASS);
+        DUMPREG(MDT_SF_THRESHOLD);
+        DUMPREG(EDI_CONFIG);
+        DUMPREG(DEI_EDI_LUT_R0);
+        DUMPREG(DEI_EDI_LUT_R1);
+        DUMPREG(DEI_EDI_LUT_R2);
+        DUMPREG(DEI_EDI_LUT_R3);
+        DUMPREG(DEI_FMD_WINDOW_R0);
+        DUMPREG(DEI_FMD_WINDOW_R1);
+        DUMPREG(DEI_FMD_CONTROL_R0);
+        DUMPREG(DEI_FMD_CONTROL_R1);
+        DUMPREG(DEI_FMD_STATUS_R0);
+        DUMPREG(DEI_FMD_STATUS_R1);
+        DUMPREG(DEI_FMD_STATUS_R2);
+        DUMPREG(SC_MP_SC0);
+        DUMPREG(SC_MP_SC1);
+        DUMPREG(SC_MP_SC2);
+        DUMPREG(SC_MP_SC3);
+        DUMPREG(SC_MP_SC4);
+        DUMPREG(SC_MP_SC5);
+        DUMPREG(SC_MP_SC6);
+        DUMPREG(SC_MP_SC8);
+        DUMPREG(SC_MP_SC9);
+        DUMPREG(SC_MP_SC10);
+        DUMPREG(SC_MP_SC11);
+        DUMPREG(SC_MP_SC12);
+        DUMPREG(SC_MP_SC13);
+        DUMPREG(SC_MP_SC17);
+        DUMPREG(SC_MP_SC18);
+        DUMPREG(SC_MP_SC19);
+        DUMPREG(SC_MP_SC20);
+        DUMPREG(SC_MP_SC21);
+        DUMPREG(SC_MP_SC22);
+        DUMPREG(SC_MP_SC23);
+        DUMPREG(SC_MP_SC24);
+        DUMPREG(SC_MP_SC25);
+        DUMPREG(CSC_CSC00);
+        DUMPREG(CSC_CSC01);
+        DUMPREG(CSC_CSC02);
+        DUMPREG(CSC_CSC03);
+        DUMPREG(CSC_CSC04);
+        DUMPREG(CSC_CSC05);
+#undef DUMPREG
+}
+
+static void add_out_dtd(struct vpe_ctx *ctx, int port)
+{
+        struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_DST];
+        const struct vpe_port_data *p_data = &port_data[port];
+        struct vb2_buffer *vb = ctx->dst_vb;
+        struct v4l2_rect *c_rect = &q_data->c_rect;
+        struct vpe_fmt *fmt = q_data->fmt;
+        const struct vpdma_data_format *vpdma_fmt;
+        int mv_buf_selector = !ctx->src_mv_buf_selector;
+        dma_addr_t dma_addr;
+        u32 flags = 0;
+
+        if (port == VPE_PORT_MV_OUT) {
+                vpdma_fmt = &vpdma_misc_fmts[VPDMA_DATA_FMT_MV];
+                dma_addr = ctx->mv_buf_dma[mv_buf_selector];
+        } else {
+                /* to incorporate interleaved formats */
+                int plane = fmt->coplanar ? p_data->vb_part : 0;
+
+                vpdma_fmt = fmt->vpdma_fmt[plane];
+                dma_addr = vb2_dma_contig_plane_dma_addr(vb, plane);
+                if (!dma_addr) {
+                        vpe_err(ctx->dev,
+                                "acquiring output buffer(%d) dma_addr failed\n",
+                                port);
+                        return;
+                }
+        }
+
+        if (q_data->flags & Q_DATA_FRAME_1D)
+                flags |= VPDMA_DATA_FRAME_1D;
+        if (q_data->flags & Q_DATA_MODE_TILED)
+                flags |= VPDMA_DATA_MODE_TILED;
+
+        vpdma_add_out_dtd(&ctx->desc_list, c_rect, vpdma_fmt, dma_addr,
+                p_data->channel, flags);
+}
+
+static void add_in_dtd(struct vpe_ctx *ctx, int port)
+{
+        struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_SRC];
+        const struct vpe_port_data *p_data = &port_data[port];
+        struct vb2_buffer *vb = ctx->src_vbs[p_data->vb_index];
+        struct v4l2_rect *c_rect = &q_data->c_rect;
+        struct vpe_fmt *fmt = q_data->fmt;
+        const struct vpdma_data_format *vpdma_fmt;
+        int mv_buf_selector = ctx->src_mv_buf_selector;
+        int field = vb->v4l2_buf.field == V4L2_FIELD_BOTTOM;
+        dma_addr_t dma_addr;
+        u32 flags = 0;
+
+        if (port == VPE_PORT_MV_IN) {
+                vpdma_fmt = &vpdma_misc_fmts[VPDMA_DATA_FMT_MV];
+                dma_addr = ctx->mv_buf_dma[mv_buf_selector];
+        } else {
+                /* to incorporate interleaved formats */
+                int plane = fmt->coplanar ? p_data->vb_part : 0;
+
+                vpdma_fmt = fmt->vpdma_fmt[plane];
+
+                dma_addr = vb2_dma_contig_plane_dma_addr(vb, plane);
+                if (!dma_addr) {
+                        vpe_err(ctx->dev,
+                                "acquiring input buffer(%d) dma_addr failed\n",
+                                port);
+                        return;
+                }
+        }
+
+        if (q_data->flags & Q_DATA_FRAME_1D)
+                flags |= VPDMA_DATA_FRAME_1D;
+        if (q_data->flags & Q_DATA_MODE_TILED)
+                flags |= VPDMA_DATA_MODE_TILED;
+
+        vpdma_add_in_dtd(&ctx->desc_list, q_data->width, q_data->height,
+                c_rect, vpdma_fmt, dma_addr, p_data->channel, field, flags);
+}
+
+/*
+ * Enable the expected IRQ sources
+ */
+static void enable_irqs(struct vpe_ctx *ctx)
+{
+        write_reg(ctx->dev, VPE_INT0_ENABLE0_SET, VPE_INT0_LIST0_COMPLETE);
+        write_reg(ctx->dev, VPE_INT0_ENABLE1_SET, VPE_DEI_ERROR_INT |
+                                VPE_DS1_UV_ERROR_INT);
+
+        vpdma_enable_list_complete_irq(ctx->dev->vpdma, 0, true);
+}
+
+static void disable_irqs(struct vpe_ctx *ctx)
+{
+        write_reg(ctx->dev, VPE_INT0_ENABLE0_CLR, 0xffffffff);
+        write_reg(ctx->dev, VPE_INT0_ENABLE1_CLR, 0xffffffff);
+
+        vpdma_enable_list_complete_irq(ctx->dev->vpdma, 0, false);
+}
+
+/* device_run() - prepares and starts the device
+ *
+ * This function is only called when both the source and destination
+ * buffers are in place.
+ */
+static void device_run(void *priv)
+{
+        struct vpe_ctx *ctx = priv;
+        struct vpe_q_data *d_q_data = &ctx->q_data[Q_DATA_DST];
+
+        if (ctx->deinterlacing && ctx->src_vbs[2] == NULL) {
+                ctx->src_vbs[2] = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
+                WARN_ON(ctx->src_vbs[2] == NULL);
+                ctx->src_vbs[1] = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
+                WARN_ON(ctx->src_vbs[1] == NULL);
+        }
+
+        ctx->src_vbs[0] = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
+        WARN_ON(ctx->src_vbs[0] == NULL);
+        ctx->dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
+        WARN_ON(ctx->dst_vb == NULL);
+
+        /* config descriptors */
+        if (ctx->dev->loaded_mmrs != ctx->mmr_adb.dma_addr || ctx->load_mmrs) {
+                vpdma_map_desc_buf(ctx->dev->vpdma, &ctx->mmr_adb);
+                vpdma_add_cfd_adb(&ctx->desc_list, CFD_MMR_CLIENT, &ctx->mmr_adb);
+                ctx->dev->loaded_mmrs = ctx->mmr_adb.dma_addr;
+                ctx->load_mmrs = false;
+        }
+
+        /* output data descriptors */
+        if (ctx->deinterlacing)
+                add_out_dtd(ctx, VPE_PORT_MV_OUT);
+
+        add_out_dtd(ctx, VPE_PORT_LUMA_OUT);
+        if (d_q_data->fmt->coplanar)
+                add_out_dtd(ctx, VPE_PORT_CHROMA_OUT);
+
+        /* input data descriptors */
+        if (ctx->deinterlacing) {
+                add_in_dtd(ctx, VPE_PORT_LUMA3_IN);
+                add_in_dtd(ctx, VPE_PORT_CHROMA3_IN);
+
+                add_in_dtd(ctx, VPE_PORT_LUMA2_IN);
+                add_in_dtd(ctx, VPE_PORT_CHROMA2_IN);
+        }
+
+        add_in_dtd(ctx, VPE_PORT_LUMA1_IN);
+        add_in_dtd(ctx, VPE_PORT_CHROMA1_IN);
+
+        if (ctx->deinterlacing)
+                add_in_dtd(ctx, VPE_PORT_MV_IN);
+
+        /* sync on channel control descriptors for input ports */
+        vpdma_add_sync_on_channel_ctd(&ctx->desc_list, VPE_CHAN_LUMA1_IN);
+        vpdma_add_sync_on_channel_ctd(&ctx->desc_list, VPE_CHAN_CHROMA1_IN);
+
+        if (ctx->deinterlacing) {
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list,
+                        VPE_CHAN_LUMA2_IN);
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list,
+                        VPE_CHAN_CHROMA2_IN);
+
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list,
+                        VPE_CHAN_LUMA3_IN);
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list,
+                        VPE_CHAN_CHROMA3_IN);
+
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list, VPE_CHAN_MV_IN);
+        }
+
+        /* sync on channel control descriptors for output ports */
+        vpdma_add_sync_on_channel_ctd(&ctx->desc_list, VPE_CHAN_LUMA_OUT);
+        if (d_q_data->fmt->coplanar)
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list, VPE_CHAN_CHROMA_OUT);
+
+        if (ctx->deinterlacing)
+                vpdma_add_sync_on_channel_ctd(&ctx->desc_list, VPE_CHAN_MV_OUT);
+
+        enable_irqs(ctx);
+
+        vpdma_map_desc_buf(ctx->dev->vpdma, &ctx->desc_list.buf);
+        vpdma_submit_descs(ctx->dev->vpdma, &ctx->desc_list);
+}
+
+static void dei_error(struct vpe_ctx *ctx)
+{
+        dev_warn(ctx->dev->v4l2_dev.dev,
+                "received DEI error interrupt\n");
+}
+
+static void ds1_uv_error(struct vpe_ctx *ctx)
+{
+        dev_warn(ctx->dev->v4l2_dev.dev,
+                "received downsampler error interrupt\n");
+}
+
+static irqreturn_t vpe_irq(int irq_vpe, void *data)
+{
+        struct vpe_dev *dev = (struct vpe_dev *)data;
+        struct vpe_ctx *ctx;
+        struct vpe_q_data *d_q_data;
+        struct vb2_buffer *s_vb, *d_vb;
+        struct v4l2_buffer *s_buf, *d_buf;
+        unsigned long flags;
+        u32 irqst0, irqst1;
+
+        irqst0 = read_reg(dev, VPE_INT0_STATUS0);
+        if (irqst0) {
+                write_reg(dev, VPE_INT0_STATUS0_CLR, irqst0);
+                vpe_dbg(dev, "INT0_STATUS0 = 0x%08x\n", irqst0);
+        }
+
+        irqst1 = read_reg(dev, VPE_INT0_STATUS1);
+        if (irqst1) {
+                write_reg(dev, VPE_INT0_STATUS1_CLR, irqst1);
+                vpe_dbg(dev, "INT0_STATUS1 = 0x%08x\n", irqst1);
+        }
+
+        ctx = v4l2_m2m_get_curr_priv(dev->m2m_dev);
+        if (!ctx) {
+                vpe_err(dev, "instance released before end of transaction\n");
+                goto handled;
+        }
+
+        if (irqst1) {
+                if (irqst1 & VPE_DEI_ERROR_INT) {
+                        irqst1 &= ~VPE_DEI_ERROR_INT;
+                        dei_error(ctx);
+                }
+                if (irqst1 & VPE_DS1_UV_ERROR_INT) {
+                        irqst1 &= ~VPE_DS1_UV_ERROR_INT;
+                        ds1_uv_error(ctx);
+                }
+        }
+
+        if (irqst0) {
+                if (irqst0 & VPE_INT0_LIST0_COMPLETE)
+                        vpdma_clear_list_stat(ctx->dev->vpdma);
+
+                irqst0 &= ~(VPE_INT0_LIST0_COMPLETE);
+        }
+
+        if (irqst0 | irqst1) {
+                dev_warn(dev->v4l2_dev.dev, "Unexpected interrupt: "
+                        "INT0_STATUS0 = 0x%08x, INT0_STATUS1 = 0x%08x\n",
+                        irqst0, irqst1);
+        }
+
+        disable_irqs(ctx);
+
+        vpdma_unmap_desc_buf(dev->vpdma, &ctx->desc_list.buf);
+        vpdma_unmap_desc_buf(dev->vpdma, &ctx->mmr_adb);
+
+        vpdma_reset_desc_list(&ctx->desc_list);
+
+         /* the previous dst mv buffer becomes the next src mv buffer */
+        ctx->src_mv_buf_selector = !ctx->src_mv_buf_selector;
+
+        if (ctx->aborting)
+                goto finished;
+
+        s_vb = ctx->src_vbs[0];
+        d_vb = ctx->dst_vb;
+        s_buf = &s_vb->v4l2_buf;
+        d_buf = &d_vb->v4l2_buf;
+
+        d_buf->timestamp = s_buf->timestamp;
+        if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE) {
+                d_buf->flags |= V4L2_BUF_FLAG_TIMECODE;
+                d_buf->timecode = s_buf->timecode;
+        }
+        d_buf->sequence = ctx->sequence;
+        d_buf->field = ctx->field;
+
+        d_q_data = &ctx->q_data[Q_DATA_DST];
+        if (d_q_data->flags & Q_DATA_INTERLACED) {
+                if (ctx->field == V4L2_FIELD_BOTTOM) {
+                        ctx->sequence++;
+                        ctx->field = V4L2_FIELD_TOP;
+                } else {
+                        WARN_ON(ctx->field != V4L2_FIELD_TOP);
+                        ctx->field = V4L2_FIELD_BOTTOM;
+                }
+        } else {
+                ctx->sequence++;
+        }
+
+        if (ctx->deinterlacing)
+                s_vb = ctx->src_vbs[2];
+
+        spin_lock_irqsave(&dev->lock, flags);
+        v4l2_m2m_buf_done(s_vb, VB2_BUF_STATE_DONE);
+        v4l2_m2m_buf_done(d_vb, VB2_BUF_STATE_DONE);
+        spin_unlock_irqrestore(&dev->lock, flags);
+
+        if (ctx->deinterlacing) {
+                ctx->src_vbs[2] = ctx->src_vbs[1];
+                ctx->src_vbs[1] = ctx->src_vbs[0];
+        }
+
+        ctx->bufs_completed++;
+        if (ctx->bufs_completed < ctx->bufs_per_job) {
+                device_run(ctx);
+                goto handled;
+        }
+
+finished:
+        vpe_dbg(ctx->dev, "finishing transaction\n");
+        ctx->bufs_completed = 0;
+        v4l2_m2m_job_finish(dev->m2m_dev, ctx->m2m_ctx);
+handled:
+        return IRQ_HANDLED;
+}
+
+/*
+ * video ioctls
+ */
+static int vpe_querycap(struct file *file, void *priv,
+                        struct v4l2_capability *cap)
+{
+        strncpy(cap->driver, VPE_MODULE_NAME, sizeof(cap->driver) - 1);
+        strncpy(cap->card, VPE_MODULE_NAME, sizeof(cap->card) - 1);
+        strlcpy(cap->bus_info, VPE_MODULE_NAME, sizeof(cap->bus_info));
+        cap->device_caps  = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+        return 0;
+}
+
+static int __enum_fmt(struct v4l2_fmtdesc *f, u32 type)
+{
+        int i, index;
+        struct vpe_fmt *fmt = NULL;
+
+        index = 0;
+        for (i = 0; i < ARRAY_SIZE(vpe_formats); ++i) {
+                if (vpe_formats[i].types & type) {
+                        if (index == f->index) {
+                                fmt = &vpe_formats[i];
+                                break;
+                        }
+                        index++;
+                }
+        }
+
+        if (!fmt)
+                return -EINVAL;
+
+        strncpy(f->description, fmt->name, sizeof(f->description) - 1);
+        f->pixelformat = fmt->fourcc;
+        return 0;
+}
+
+static int vpe_enum_fmt(struct file *file, void *priv,
+                                struct v4l2_fmtdesc *f)
+{
+        if (V4L2_TYPE_IS_OUTPUT(f->type))
+                return __enum_fmt(f, VPE_FMT_TYPE_OUTPUT);
+
+        return __enum_fmt(f, VPE_FMT_TYPE_CAPTURE);
+}
+
+static int vpe_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+        struct v4l2_pix_format_mplane *pix = &f->fmt.pix_mp;
+        struct vpe_ctx *ctx = file2ctx(file);
+        struct vb2_queue *vq;
+        struct vpe_q_data *q_data;
+        int i;
+
+        vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);
+        if (!vq)
+                return -EINVAL;
+
+        q_data = get_q_data(ctx, f->type);
+
+        pix->width = q_data->width;
+        pix->height = q_data->height;
+        pix->pixelformat = q_data->fmt->fourcc;
+        pix->field = q_data->field;
+
+        if (V4L2_TYPE_IS_OUTPUT(f->type)) {
+                pix->colorspace = q_data->colorspace;
+        } else {
+                struct vpe_q_data *s_q_data;
+
+                /* get colorspace from the source queue */
+                s_q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+
+                pix->colorspace = s_q_data->colorspace;
+        }
+
+        pix->num_planes = q_data->fmt->coplanar ? 2 : 1;
+
+        for (i = 0; i < pix->num_planes; i++) {
+                pix->plane_fmt[i].bytesperline = q_data->bytesperline[i];
+                pix->plane_fmt[i].sizeimage = q_data->sizeimage[i];
+        }
+
+        return 0;
+}
+
+static int __vpe_try_fmt(struct vpe_ctx *ctx, struct v4l2_format *f,
+                       struct vpe_fmt *fmt, int type)
+{
+        struct v4l2_pix_format_mplane *pix = &f->fmt.pix_mp;
+        struct v4l2_plane_pix_format *plane_fmt;
+        int i;
+
+        if (!fmt || !(fmt->types & type)) {
+                vpe_err(ctx->dev, "Fourcc format (0x%08x) invalid.\n",
+                        pix->pixelformat);
+                return -EINVAL;
+        }
+
+        if (pix->field != V4L2_FIELD_NONE && pix->field != V4L2_FIELD_ALTERNATE)
+                pix->field = V4L2_FIELD_NONE;
+
+        v4l_bound_align_image(&pix->width, MIN_W, MAX_W, W_ALIGN,
+                              &pix->height, MIN_H, MAX_H, H_ALIGN,
+                              S_ALIGN);
+
+        pix->num_planes = fmt->coplanar ? 2 : 1;
+        pix->pixelformat = fmt->fourcc;
+
+        if (type == VPE_FMT_TYPE_CAPTURE) {
+                struct vpe_q_data *s_q_data;
+
+                /* get colorspace from the source queue */
+                s_q_data = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+
+                pix->colorspace = s_q_data->colorspace;
+        } else {
+                if (!pix->colorspace)
+                        pix->colorspace = V4L2_COLORSPACE_SMPTE240M;
+        }
+
+        for (i = 0; i < pix->num_planes; i++) {
+                int depth;
+
+                plane_fmt = &pix->plane_fmt[i];
+                depth = fmt->vpdma_fmt[i]->depth;
+
+                if (i == VPE_LUMA)
+                        plane_fmt->bytesperline =
+                                        round_up((pix->width * depth) >> 3,
+                                                1 << L_ALIGN);
+                else
+                        plane_fmt->bytesperline = pix->width;
+
+                plane_fmt->sizeimage =
+                                (pix->height * pix->width * depth) >> 3;
+        }
+
+        return 0;
+}
+
+static int vpe_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+        struct vpe_fmt *fmt = find_format(f);
+
+        if (V4L2_TYPE_IS_OUTPUT(f->type))
+                return __vpe_try_fmt(ctx, f, fmt, VPE_FMT_TYPE_OUTPUT);
+        else
+                return __vpe_try_fmt(ctx, f, fmt, VPE_FMT_TYPE_CAPTURE);
+}
+
+static int __vpe_s_fmt(struct vpe_ctx *ctx, struct v4l2_format *f)
+{
+        struct v4l2_pix_format_mplane *pix = &f->fmt.pix_mp;
+        struct v4l2_plane_pix_format *plane_fmt;
+        struct vpe_q_data *q_data;
+        struct vb2_queue *vq;
+        int i;
+
+        vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type);
+        if (!vq)
+                return -EINVAL;
+
+        if (vb2_is_busy(vq)) {
+                vpe_err(ctx->dev, "queue busy\n");
+                return -EBUSY;
+        }
+
+        q_data = get_q_data(ctx, f->type);
+        if (!q_data)
+                return -EINVAL;
+
+        q_data->fmt             = find_format(f);
+        q_data->width           = pix->width;
+        q_data->height          = pix->height;
+        q_data->colorspace      = pix->colorspace;
+        q_data->field           = pix->field;
+
+        for (i = 0; i < pix->num_planes; i++) {
+                plane_fmt = &pix->plane_fmt[i];
+
+                q_data->bytesperline[i] = plane_fmt->bytesperline;
+                q_data->sizeimage[i]    = plane_fmt->sizeimage;
+        }
+
+        q_data->c_rect.left     = 0;
+        q_data->c_rect.top      = 0;
+        q_data->c_rect.width    = q_data->width;
+        q_data->c_rect.height   = q_data->height;
+
+        if (q_data->field == V4L2_FIELD_ALTERNATE)
+                q_data->flags |= Q_DATA_INTERLACED;
+        else
+                q_data->flags &= ~Q_DATA_INTERLACED;
+
+        vpe_dbg(ctx->dev, "Setting format for type %d, wxh: %dx%d, fmt: %d bpl_y %d",
+                f->type, q_data->width, q_data->height, q_data->fmt->fourcc,
+                q_data->bytesperline[VPE_LUMA]);
+        if (q_data->fmt->coplanar)
+                vpe_dbg(ctx->dev, " bpl_uv %d\n",
+                        q_data->bytesperline[VPE_CHROMA]);
+
+        return 0;
+}
+
+static int vpe_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+        int ret;
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        ret = vpe_try_fmt(file, priv, f);
+        if (ret)
+                return ret;
+
+        ret = __vpe_s_fmt(ctx, f);
+        if (ret)
+                return ret;
+
+        if (V4L2_TYPE_IS_OUTPUT(f->type))
+                set_src_registers(ctx);
+        else
+                set_dst_registers(ctx);
+
+        return set_srcdst_params(ctx);
+}
+
+static int vpe_reqbufs(struct file *file, void *priv,
+                       struct v4l2_requestbuffers *reqbufs)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
+}
+
+static int vpe_querybuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        return v4l2_m2m_querybuf(file, ctx->m2m_ctx, buf);
+}
+
+static int vpe_qbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf);
+}
+
+static int vpe_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);
+}
+
+static int vpe_streamon(struct file *file, void *priv, enum v4l2_buf_type type)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
+}
+
+static int vpe_streamoff(struct file *file, void *priv, enum v4l2_buf_type type)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        vpe_dump_regs(ctx->dev);
+        vpdma_dump_regs(ctx->dev->vpdma);
+
+        return v4l2_m2m_streamoff(file, ctx->m2m_ctx, type);
+}
+
+/*
+ * defines number of buffers/frames a context can process with VPE before
+ * switching to a different context. default value is 1 buffer per context
+ */
+#define V4L2_CID_VPE_BUFS_PER_JOB               (V4L2_CID_USER_TI_VPE_BASE + 0)
+
+static int vpe_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct vpe_ctx *ctx =
+                container_of(ctrl->handler, struct vpe_ctx, hdl);
+
+        switch (ctrl->id) {
+        case V4L2_CID_VPE_BUFS_PER_JOB:
+                ctx->bufs_per_job = ctrl->val;
+                break;
+
+        default:
+                vpe_err(ctx->dev, "Invalid control\n");
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static const struct v4l2_ctrl_ops vpe_ctrl_ops = {
+        .s_ctrl = vpe_s_ctrl,
+};
+
+static const struct v4l2_ioctl_ops vpe_ioctl_ops = {
+        .vidioc_querycap        = vpe_querycap,
+
+        .vidioc_enum_fmt_vid_cap_mplane = vpe_enum_fmt,
+        .vidioc_g_fmt_vid_cap_mplane    = vpe_g_fmt,
+        .vidioc_try_fmt_vid_cap_mplane  = vpe_try_fmt,
+        .vidioc_s_fmt_vid_cap_mplane    = vpe_s_fmt,
+
+        .vidioc_enum_fmt_vid_out_mplane = vpe_enum_fmt,
+        .vidioc_g_fmt_vid_out_mplane    = vpe_g_fmt,
+        .vidioc_try_fmt_vid_out_mplane  = vpe_try_fmt,
+        .vidioc_s_fmt_vid_out_mplane    = vpe_s_fmt,
+
+        .vidioc_reqbufs         = vpe_reqbufs,
+        .vidioc_querybuf        = vpe_querybuf,
+
+        .vidioc_qbuf            = vpe_qbuf,
+        .vidioc_dqbuf           = vpe_dqbuf,
+
+        .vidioc_streamon        = vpe_streamon,
+        .vidioc_streamoff       = vpe_streamoff,
+        .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+};
+
+/*
+ * Queue operations
+ */
+static int vpe_queue_setup(struct vb2_queue *vq,
+                           const struct v4l2_format *fmt,
+                           unsigned int *nbuffers, unsigned int *nplanes,
+                           unsigned int sizes[], void *alloc_ctxs[])
+{
+        int i;
+        struct vpe_ctx *ctx = vb2_get_drv_priv(vq);
+        struct vpe_q_data *q_data;
+
+        q_data = get_q_data(ctx, vq->type);
+
+        *nplanes = q_data->fmt->coplanar ? 2 : 1;
+
+        for (i = 0; i < *nplanes; i++) {
+                sizes[i] = q_data->sizeimage[i];
+                alloc_ctxs[i] = ctx->dev->alloc_ctx;
+        }
+
+        vpe_dbg(ctx->dev, "get %d buffer(s) of size %d", *nbuffers,
+                sizes[VPE_LUMA]);
+        if (q_data->fmt->coplanar)
+                vpe_dbg(ctx->dev, " and %d\n", sizes[VPE_CHROMA]);
+
+        return 0;
+}
+
+static int vpe_buf_prepare(struct vb2_buffer *vb)
+{
+        struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+        struct vpe_q_data *q_data;
+        int i, num_planes;
+
+        vpe_dbg(ctx->dev, "type: %d\n", vb->vb2_queue->type);
+
+        q_data = get_q_data(ctx, vb->vb2_queue->type);
+        num_planes = q_data->fmt->coplanar ? 2 : 1;
+
+        for (i = 0; i < num_planes; i++) {
+                if (vb2_plane_size(vb, i) < q_data->sizeimage[i]) {
+                        vpe_err(ctx->dev,
+                                "data will not fit into plane (%lu < %lu)\n",
+                                vb2_plane_size(vb, i),
+                                (long) q_data->sizeimage[i]);
+                        return -EINVAL;
+                }
+        }
+
+        for (i = 0; i < num_planes; i++)
+                vb2_set_plane_payload(vb, i, q_data->sizeimage[i]);
+
+        return 0;
+}
+
+static void vpe_buf_queue(struct vb2_buffer *vb)
+{
+        struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+        v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);
+}
+
+static void vpe_wait_prepare(struct vb2_queue *q)
+{
+        struct vpe_ctx *ctx = vb2_get_drv_priv(q);
+        vpe_unlock(ctx);
+}
+
+static void vpe_wait_finish(struct vb2_queue *q)
+{
+        struct vpe_ctx *ctx = vb2_get_drv_priv(q);
+        vpe_lock(ctx);
+}
+
+static struct vb2_ops vpe_qops = {
+        .queue_setup     = vpe_queue_setup,
+        .buf_prepare     = vpe_buf_prepare,
+        .buf_queue       = vpe_buf_queue,
+        .wait_prepare    = vpe_wait_prepare,
+        .wait_finish     = vpe_wait_finish,
+};
+
+static int queue_init(void *priv, struct vb2_queue *src_vq,
+                      struct vb2_queue *dst_vq)
+{
+        struct vpe_ctx *ctx = priv;
+        int ret;
+
+        memset(src_vq, 0, sizeof(*src_vq));
+        src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+        src_vq->io_modes = VB2_MMAP;
+        src_vq->drv_priv = ctx;
+        src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+        src_vq->ops = &vpe_qops;
+        src_vq->mem_ops = &vb2_dma_contig_memops;
+        src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+
+        ret = vb2_queue_init(src_vq);
+        if (ret)
+                return ret;
+
+        memset(dst_vq, 0, sizeof(*dst_vq));
+        dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+        dst_vq->io_modes = VB2_MMAP;
+        dst_vq->drv_priv = ctx;
+        dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+        dst_vq->ops = &vpe_qops;
+        dst_vq->mem_ops = &vb2_dma_contig_memops;
+        dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+
+        return vb2_queue_init(dst_vq);
+}
+
+static const struct v4l2_ctrl_config vpe_bufs_per_job = {
+        .ops = &vpe_ctrl_ops,
+        .id = V4L2_CID_VPE_BUFS_PER_JOB,
+        .name = "Buffers Per Transaction",
+        .type = V4L2_CTRL_TYPE_INTEGER,
+        .def = VPE_DEF_BUFS_PER_JOB,
+        .min = 1,
+        .max = VIDEO_MAX_FRAME,
+        .step = 1,
+};
+
+/*
+ * File operations
+ */
+static int vpe_open(struct file *file)
+{
+        struct vpe_dev *dev = video_drvdata(file);
+        struct vpe_ctx *ctx = NULL;
+        struct vpe_q_data *s_q_data;
+        struct v4l2_ctrl_handler *hdl;
+        int ret;
+
+        vpe_dbg(dev, "vpe_open\n");
+
+        if (!dev->vpdma->ready) {
+                vpe_err(dev, "vpdma firmware not loaded\n");
+                return -ENODEV;
+        }
+
+        ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+        if (!ctx)
+                return -ENOMEM;
+
+        ctx->dev = dev;
+
+        if (mutex_lock_interruptible(&dev->dev_mutex)) {
+                ret = -ERESTARTSYS;
+                goto free_ctx;
+        }
+
+        ret = vpdma_create_desc_list(&ctx->desc_list, VPE_DESC_LIST_SIZE,
+                        VPDMA_LIST_TYPE_NORMAL);
+        if (ret != 0)
+                goto unlock;
+
+        ret = vpdma_alloc_desc_buf(&ctx->mmr_adb, sizeof(struct vpe_mmr_adb));
+        if (ret != 0)
+                goto free_desc_list;
+
+        init_adb_hdrs(ctx);
+
+        v4l2_fh_init(&ctx->fh, video_devdata(file));
+        file->private_data = &ctx->fh;
+
+        hdl = &ctx->hdl;
+        v4l2_ctrl_handler_init(hdl, 1);
+        v4l2_ctrl_new_custom(hdl, &vpe_bufs_per_job, NULL);
+        if (hdl->error) {
+                ret = hdl->error;
+                goto exit_fh;
+        }
+        ctx->fh.ctrl_handler = hdl;
+        v4l2_ctrl_handler_setup(hdl);
+
+        s_q_data = &ctx->q_data[Q_DATA_SRC];
+        s_q_data->fmt = &vpe_formats[2];
+        s_q_data->width = 1920;
+        s_q_data->height = 1080;
+        s_q_data->sizeimage[VPE_LUMA] = (s_q_data->width * s_q_data->height *
+                        s_q_data->fmt->vpdma_fmt[VPE_LUMA]->depth) >> 3;
+        s_q_data->colorspace = V4L2_COLORSPACE_SMPTE240M;
+        s_q_data->field = V4L2_FIELD_NONE;
+        s_q_data->c_rect.left = 0;
+        s_q_data->c_rect.top = 0;
+        s_q_data->c_rect.width = s_q_data->width;
+        s_q_data->c_rect.height = s_q_data->height;
+        s_q_data->flags = 0;
+
+        ctx->q_data[Q_DATA_DST] = *s_q_data;
+
+        set_dei_shadow_registers(ctx);
+        set_src_registers(ctx);
+        set_dst_registers(ctx);
+        ret = set_srcdst_params(ctx);
+        if (ret)
+                goto exit_fh;
+
+        ctx->m2m_ctx = v4l2_m2m_ctx_init(dev->m2m_dev, ctx, &queue_init);
+
+        if (IS_ERR(ctx->m2m_ctx)) {
+                ret = PTR_ERR(ctx->m2m_ctx);
+                goto exit_fh;
+        }
+
+        v4l2_fh_add(&ctx->fh);
+
+        /*
+         * for now, just report the creation of the first instance, we can later
+         * optimize the driver to enable or disable clocks when the first
+         * instance is created or the last instance released
+         */
+        if (atomic_inc_return(&dev->num_instances) == 1)
+                vpe_dbg(dev, "first instance created\n");
+
+        ctx->bufs_per_job = VPE_DEF_BUFS_PER_JOB;
+
+        ctx->load_mmrs = true;
+
+        vpe_dbg(dev, "created instance %p, m2m_ctx: %p\n",
+                ctx, ctx->m2m_ctx);
+
+        mutex_unlock(&dev->dev_mutex);
+
+        return 0;
+exit_fh:
+        v4l2_ctrl_handler_free(hdl);
+        v4l2_fh_exit(&ctx->fh);
+        vpdma_free_desc_buf(&ctx->mmr_adb);
+free_desc_list:
+        vpdma_free_desc_list(&ctx->desc_list);
+unlock:
+        mutex_unlock(&dev->dev_mutex);
+free_ctx:
+        kfree(ctx);
+        return ret;
+}
+
+static int vpe_release(struct file *file)
+{
+        struct vpe_dev *dev = video_drvdata(file);
+        struct vpe_ctx *ctx = file2ctx(file);
+
+        vpe_dbg(dev, "releasing instance %p\n", ctx);
+
+        mutex_lock(&dev->dev_mutex);
+        free_vbs(ctx);
+        free_mv_buffers(ctx);
+        vpdma_free_desc_list(&ctx->desc_list);
+        vpdma_free_desc_buf(&ctx->mmr_adb);
+
+        v4l2_fh_del(&ctx->fh);
+        v4l2_fh_exit(&ctx->fh);
+        v4l2_ctrl_handler_free(&ctx->hdl);
+        v4l2_m2m_ctx_release(ctx->m2m_ctx);
+
+        kfree(ctx);
+
+        /*
+         * for now, just report the release of the last instance, we can later
+         * optimize the driver to enable or disable clocks when the first
+         * instance is created or the last instance released
+         */
+        if (atomic_dec_return(&dev->num_instances) == 0)
+                vpe_dbg(dev, "last instance released\n");
+
+        mutex_unlock(&dev->dev_mutex);
+
+        return 0;
+}
+
+static unsigned int vpe_poll(struct file *file,
+                             struct poll_table_struct *wait)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+        struct vpe_dev *dev = ctx->dev;
+        int ret;
+
+        mutex_lock(&dev->dev_mutex);
+        ret = v4l2_m2m_poll(file, ctx->m2m_ctx, wait);
+        mutex_unlock(&dev->dev_mutex);
+        return ret;
+}
+
+static int vpe_mmap(struct file *file, struct vm_area_struct *vma)
+{
+        struct vpe_ctx *ctx = file2ctx(file);
+        struct vpe_dev *dev = ctx->dev;
+        int ret;
+
+        if (mutex_lock_interruptible(&dev->dev_mutex))
+                return -ERESTARTSYS;
+        ret = v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);
+        mutex_unlock(&dev->dev_mutex);
+        return ret;
+}
+
+static const struct v4l2_file_operations vpe_fops = {
+        .owner          = THIS_MODULE,
+        .open           = vpe_open,
+        .release        = vpe_release,
+        .poll           = vpe_poll,
+        .unlocked_ioctl = video_ioctl2,
+        .mmap           = vpe_mmap,
+};
+
+static struct video_device vpe_videodev = {
+        .name           = VPE_MODULE_NAME,
+        .fops           = &vpe_fops,
+        .ioctl_ops      = &vpe_ioctl_ops,
+        .minor          = -1,
+        .release        = video_device_release,
+        .vfl_dir        = VFL_DIR_M2M,
+};
+
+static struct v4l2_m2m_ops m2m_ops = {
+        .device_run     = device_run,
+        .job_ready      = job_ready,
+        .job_abort      = job_abort,
+        .lock           = vpe_lock,
+        .unlock         = vpe_unlock,
+};
+
+static int vpe_runtime_get(struct platform_device *pdev)
+{
+        int r;
+
+        dev_dbg(&pdev->dev, "vpe_runtime_get\n");
+
+        r = pm_runtime_get_sync(&pdev->dev);
+        WARN_ON(r < 0);
+        return r < 0 ? r : 0;
+}
+
+static void vpe_runtime_put(struct platform_device *pdev)
+{
+
+        int r;
+
+        dev_dbg(&pdev->dev, "vpe_runtime_put\n");
+
+        r = pm_runtime_put_sync(&pdev->dev);
+        WARN_ON(r < 0 && r != -ENOSYS);
+}
+
+static int vpe_probe(struct platform_device *pdev)
+{
+        struct vpe_dev *dev;
+        struct video_device *vfd;
+        struct resource *res;
+        int ret, irq, func;
+
+        dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
+        if (IS_ERR(dev))
+                return PTR_ERR(dev);
+
+        spin_lock_init(&dev->lock);
+
+        ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
+        if (ret)
+                return ret;
+
+        atomic_set(&dev->num_instances, 0);
+        mutex_init(&dev->dev_mutex);
+
+        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vpe_top");
+        /*
+         * HACK: we get resource info from device tree in the form of a list of
+         * VPE sub blocks, the driver currently uses only the base of vpe_top
+         * for register access, the driver should be changed later to access
+         * registers based on the sub block base addresses
+         */
+        dev->base = devm_ioremap(&pdev->dev, res->start, SZ_32K);
+        if (IS_ERR(dev->base)) {
+                ret = PTR_ERR(dev->base);
+                goto v4l2_dev_unreg;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        ret = devm_request_irq(&pdev->dev, irq, vpe_irq, 0, VPE_MODULE_NAME,
+                        dev);
+        if (ret)
+                goto v4l2_dev_unreg;
+
+        platform_set_drvdata(pdev, dev);
+
+        dev->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
+        if (IS_ERR(dev->alloc_ctx)) {
+                vpe_err(dev, "Failed to alloc vb2 context\n");
+                ret = PTR_ERR(dev->alloc_ctx);
+                goto v4l2_dev_unreg;
+        }
+
+        dev->m2m_dev = v4l2_m2m_init(&m2m_ops);
+        if (IS_ERR(dev->m2m_dev)) {
+                vpe_err(dev, "Failed to init mem2mem device\n");
+                ret = PTR_ERR(dev->m2m_dev);
+                goto rel_ctx;
+        }
+
+        pm_runtime_enable(&pdev->dev);
+
+        ret = vpe_runtime_get(pdev);
+        if (ret)
+                goto rel_m2m;
+
+        /* Perform clk enable followed by reset */
+        vpe_set_clock_enable(dev, 1);
+
+        vpe_top_reset(dev);
+
+        func = read_field_reg(dev, VPE_PID, VPE_PID_FUNC_MASK,
+                VPE_PID_FUNC_SHIFT);
+        vpe_dbg(dev, "VPE PID function %x\n", func);
+
+        vpe_top_vpdma_reset(dev);
+
+        dev->vpdma = vpdma_create(pdev);
+        if (IS_ERR(dev->vpdma))
+                goto runtime_put;
+
+        vfd = &dev->vfd;
+        *vfd = vpe_videodev;
+        vfd->lock = &dev->dev_mutex;
+        vfd->v4l2_dev = &dev->v4l2_dev;
+
+        ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+        if (ret) {
+                vpe_err(dev, "Failed to register video device\n");
+                goto runtime_put;
+        }
+
+        video_set_drvdata(vfd, dev);
+        snprintf(vfd->name, sizeof(vfd->name), "%s", vpe_videodev.name);
+        dev_info(dev->v4l2_dev.dev, "Device registered as /dev/video%d\n",
+                vfd->num);
+
+        return 0;
+
+runtime_put:
+        vpe_runtime_put(pdev);
+rel_m2m:
+        pm_runtime_disable(&pdev->dev);
+        v4l2_m2m_release(dev->m2m_dev);
+rel_ctx:
+        vb2_dma_contig_cleanup_ctx(dev->alloc_ctx);
+v4l2_dev_unreg:
+        v4l2_device_unregister(&dev->v4l2_dev);
+
+        return ret;
+}
+
+static int vpe_remove(struct platform_device *pdev)
+{
+        struct vpe_dev *dev =
+                (struct vpe_dev *) platform_get_drvdata(pdev);
+
+        v4l2_info(&dev->v4l2_dev, "Removing " VPE_MODULE_NAME);
+
+        v4l2_m2m_release(dev->m2m_dev);
+        video_unregister_device(&dev->vfd);
+        v4l2_device_unregister(&dev->v4l2_dev);
+        vb2_dma_contig_cleanup_ctx(dev->alloc_ctx);
+
+        vpe_set_clock_enable(dev, 0);
+        vpe_runtime_put(pdev);
+        pm_runtime_disable(&pdev->dev);
+
+        return 0;
+}
+
+#if defined(CONFIG_OF)
+static const struct of_device_id vpe_of_match[] = {
+        {
+                .compatible = "ti,vpe",
+        },
+        {},
+};
+#else
+#define vpe_of_match NULL
+#endif
+
+static struct platform_driver vpe_pdrv = {
+        .probe          = vpe_probe,
+        .remove         = vpe_remove,
+        .driver         = {
+                .name   = VPE_MODULE_NAME,
+                .owner  = THIS_MODULE,
+                .of_match_table = vpe_of_match,
+        },
+};
+
+static void __exit vpe_exit(void)
+{
+        platform_driver_unregister(&vpe_pdrv);
+}
+
+static int __init vpe_init(void)
+{
+        return platform_driver_register(&vpe_pdrv);
+}
+
+module_init(vpe_init);
+module_exit(vpe_exit);
+
+MODULE_DESCRIPTION("TI VPE driver");
+MODULE_AUTHOR("Dale Farnsworth, <dale@farnsworth.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/platform/ti-vpe/vpe_regs.h b/drivers/media/platform/ti-vpe/vpe_regs.h
new file mode 100644
index 000000000000..ed214e828398
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/vpe_regs.h
@@ -0,0 +1,496 @@
+/*
+ * Copyright (c) 2013 Texas Instruments Inc.
+ *
+ * David Griego, <dagriego@biglakesoftware.com>
+ * Dale Farnsworth, <dale@farnsworth.org>
+ * Archit Taneja, <archit@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 __TI_VPE_REGS_H
+#define __TI_VPE_REGS_H
+
+/* VPE register offsets and field selectors */
+
+/* VPE top level regs */
+#define VPE_PID                         0x0000
+#define VPE_PID_MINOR_MASK              0x3f
+#define VPE_PID_MINOR_SHIFT             0
+#define VPE_PID_CUSTOM_MASK             0x03
+#define VPE_PID_CUSTOM_SHIFT            6
+#define VPE_PID_MAJOR_MASK              0x07
+#define VPE_PID_MAJOR_SHIFT             8
+#define VPE_PID_RTL_MASK                0x1f
+#define VPE_PID_RTL_SHIFT               11
+#define VPE_PID_FUNC_MASK               0xfff
+#define VPE_PID_FUNC_SHIFT              16
+#define VPE_PID_SCHEME_MASK             0x03
+#define VPE_PID_SCHEME_SHIFT            30
+
+#define VPE_SYSCONFIG                   0x0010
+#define VPE_SYSCONFIG_IDLE_MASK         0x03
+#define VPE_SYSCONFIG_IDLE_SHIFT        2
+#define VPE_SYSCONFIG_STANDBY_MASK      0x03
+#define VPE_SYSCONFIG_STANDBY_SHIFT     4
+#define VPE_FORCE_IDLE_MODE             0
+#define VPE_NO_IDLE_MODE                1
+#define VPE_SMART_IDLE_MODE             2
+#define VPE_SMART_IDLE_WAKEUP_MODE      3
+#define VPE_FORCE_STANDBY_MODE          0
+#define VPE_NO_STANDBY_MODE             1
+#define VPE_SMART_STANDBY_MODE          2
+#define VPE_SMART_STANDBY_WAKEUP_MODE   3
+
+#define VPE_INT0_STATUS0_RAW_SET        0x0020
+#define VPE_INT0_STATUS0_RAW            VPE_INT0_STATUS0_RAW_SET
+#define VPE_INT0_STATUS0_CLR            0x0028
+#define VPE_INT0_STATUS0                VPE_INT0_STATUS0_CLR
+#define VPE_INT0_ENABLE0_SET            0x0030
+#define VPE_INT0_ENABLE0                VPE_INT0_ENABLE0_SET
+#define VPE_INT0_ENABLE0_CLR            0x0038
+#define VPE_INT0_LIST0_COMPLETE         (1 << 0)
+#define VPE_INT0_LIST0_NOTIFY           (1 << 1)
+#define VPE_INT0_LIST1_COMPLETE         (1 << 2)
+#define VPE_INT0_LIST1_NOTIFY           (1 << 3)
+#define VPE_INT0_LIST2_COMPLETE         (1 << 4)
+#define VPE_INT0_LIST2_NOTIFY           (1 << 5)
+#define VPE_INT0_LIST3_COMPLETE         (1 << 6)
+#define VPE_INT0_LIST3_NOTIFY           (1 << 7)
+#define VPE_INT0_LIST4_COMPLETE         (1 << 8)
+#define VPE_INT0_LIST4_NOTIFY           (1 << 9)
+#define VPE_INT0_LIST5_COMPLETE         (1 << 10)
+#define VPE_INT0_LIST5_NOTIFY           (1 << 11)
+#define VPE_INT0_LIST6_COMPLETE         (1 << 12)
+#define VPE_INT0_LIST6_NOTIFY           (1 << 13)
+#define VPE_INT0_LIST7_COMPLETE         (1 << 14)
+#define VPE_INT0_LIST7_NOTIFY           (1 << 15)
+#define VPE_INT0_DESCRIPTOR             (1 << 16)
+#define VPE_DEI_FMD_INT                 (1 << 18)
+
+#define VPE_INT0_STATUS1_RAW_SET        0x0024
+#define VPE_INT0_STATUS1_RAW            VPE_INT0_STATUS1_RAW_SET
+#define VPE_INT0_STATUS1_CLR            0x002c
+#define VPE_INT0_STATUS1                VPE_INT0_STATUS1_CLR
+#define VPE_INT0_ENABLE1_SET            0x0034
+#define VPE_INT0_ENABLE1                VPE_INT0_ENABLE1_SET
+#define VPE_INT0_ENABLE1_CLR            0x003c
+#define VPE_INT0_CHANNEL_GROUP0         (1 << 0)
+#define VPE_INT0_CHANNEL_GROUP1         (1 << 1)
+#define VPE_INT0_CHANNEL_GROUP2         (1 << 2)
+#define VPE_INT0_CHANNEL_GROUP3         (1 << 3)
+#define VPE_INT0_CHANNEL_GROUP4         (1 << 4)
+#define VPE_INT0_CHANNEL_GROUP5         (1 << 5)
+#define VPE_INT0_CLIENT                 (1 << 7)
+#define VPE_DEI_ERROR_INT               (1 << 16)
+#define VPE_DS1_UV_ERROR_INT            (1 << 22)
+
+#define VPE_INTC_EOI                    0x00a0
+
+#define VPE_CLK_ENABLE                  0x0100
+#define VPE_VPEDMA_CLK_ENABLE           (1 << 0)
+#define VPE_DATA_PATH_CLK_ENABLE        (1 << 1)
+
+#define VPE_CLK_RESET                   0x0104
+#define VPE_VPDMA_CLK_RESET_MASK        0x1
+#define VPE_VPDMA_CLK_RESET_SHIFT       0
+#define VPE_DATA_PATH_CLK_RESET_MASK    0x1
+#define VPE_DATA_PATH_CLK_RESET_SHIFT   1
+#define VPE_MAIN_RESET_MASK             0x1
+#define VPE_MAIN_RESET_SHIFT            31
+
+#define VPE_CLK_FORMAT_SELECT           0x010c
+#define VPE_CSC_SRC_SELECT_MASK         0x03
+#define VPE_CSC_SRC_SELECT_SHIFT        0
+#define VPE_RGB_OUT_SELECT              (1 << 8)
+#define VPE_DS_SRC_SELECT_MASK          0x07
+#define VPE_DS_SRC_SELECT_SHIFT         9
+#define VPE_DS_BYPASS                   (1 << 16)
+#define VPE_COLOR_SEPARATE_422          (1 << 18)
+
+#define VPE_DS_SRC_DEI_SCALER           (5 << VPE_DS_SRC_SELECT_SHIFT)
+#define VPE_CSC_SRC_DEI_SCALER          (3 << VPE_CSC_SRC_SELECT_SHIFT)
+
+#define VPE_CLK_RANGE_MAP               0x011c
+#define VPE_RANGE_RANGE_MAP_Y_MASK      0x07
+#define VPE_RANGE_RANGE_MAP_Y_SHIFT     0
+#define VPE_RANGE_RANGE_MAP_UV_MASK     0x07
+#define VPE_RANGE_RANGE_MAP_UV_SHIFT    3
+#define VPE_RANGE_MAP_ON                (1 << 6)
+#define VPE_RANGE_REDUCTION_ON          (1 << 28)
+
+/* VPE chrominance upsampler regs */
+#define VPE_US1_R0                      0x0304
+#define VPE_US2_R0                      0x0404
+#define VPE_US3_R0                      0x0504
+#define VPE_US_C1_MASK                  0x3fff
+#define VPE_US_C1_SHIFT                 2
+#define VPE_US_C0_MASK                  0x3fff
+#define VPE_US_C0_SHIFT                 18
+#define VPE_US_MODE_MASK                0x03
+#define VPE_US_MODE_SHIFT               16
+#define VPE_ANCHOR_FID0_C1_MASK         0x3fff
+#define VPE_ANCHOR_FID0_C1_SHIFT        2
+#define VPE_ANCHOR_FID0_C0_MASK         0x3fff
+#define VPE_ANCHOR_FID0_C0_SHIFT        18
+
+#define VPE_US1_R1                      0x0308
+#define VPE_US2_R1                      0x0408
+#define VPE_US3_R1                      0x0508
+#define VPE_ANCHOR_FID0_C3_MASK         0x3fff
+#define VPE_ANCHOR_FID0_C3_SHIFT        2
+#define VPE_ANCHOR_FID0_C2_MASK         0x3fff
+#define VPE_ANCHOR_FID0_C2_SHIFT        18
+
+#define VPE_US1_R2                      0x030c
+#define VPE_US2_R2                      0x040c
+#define VPE_US3_R2                      0x050c
+#define VPE_INTERP_FID0_C1_MASK         0x3fff
+#define VPE_INTERP_FID0_C1_SHIFT        2
+#define VPE_INTERP_FID0_C0_MASK         0x3fff
+#define VPE_INTERP_FID0_C0_SHIFT        18
+
+#define VPE_US1_R3                      0x0310
+#define VPE_US2_R3                      0x0410
+#define VPE_US3_R3                      0x0510
+#define VPE_INTERP_FID0_C3_MASK         0x3fff
+#define VPE_INTERP_FID0_C3_SHIFT        2
+#define VPE_INTERP_FID0_C2_MASK         0x3fff
+#define VPE_INTERP_FID0_C2_SHIFT        18
+
+#define VPE_US1_R4                      0x0314
+#define VPE_US2_R4                      0x0414
+#define VPE_US3_R4                      0x0514
+#define VPE_ANCHOR_FID1_C1_MASK         0x3fff
+#define VPE_ANCHOR_FID1_C1_SHIFT        2
+#define VPE_ANCHOR_FID1_C0_MASK         0x3fff
+#define VPE_ANCHOR_FID1_C0_SHIFT        18
+
+#define VPE_US1_R5                      0x0318
+#define VPE_US2_R5                      0x0418
+#define VPE_US3_R5                      0x0518
+#define VPE_ANCHOR_FID1_C3_MASK         0x3fff
+#define VPE_ANCHOR_FID1_C3_SHIFT        2
+#define VPE_ANCHOR_FID1_C2_MASK         0x3fff
+#define VPE_ANCHOR_FID1_C2_SHIFT        18
+
+#define VPE_US1_R6                      0x031c
+#define VPE_US2_R6                      0x041c
+#define VPE_US3_R6                      0x051c
+#define VPE_INTERP_FID1_C1_MASK         0x3fff
+#define VPE_INTERP_FID1_C1_SHIFT        2
+#define VPE_INTERP_FID1_C0_MASK         0x3fff
+#define VPE_INTERP_FID1_C0_SHIFT        18
+
+#define VPE_US1_R7                      0x0320
+#define VPE_US2_R7                      0x0420
+#define VPE_US3_R7                      0x0520
+#define VPE_INTERP_FID0_C3_MASK         0x3fff
+#define VPE_INTERP_FID0_C3_SHIFT        2
+#define VPE_INTERP_FID0_C2_MASK         0x3fff
+#define VPE_INTERP_FID0_C2_SHIFT        18
+
+/* VPE de-interlacer regs */
+#define VPE_DEI_FRAME_SIZE              0x0600
+#define VPE_DEI_WIDTH_MASK              0x07ff
+#define VPE_DEI_WIDTH_SHIFT             0
+#define VPE_DEI_HEIGHT_MASK             0x07ff
+#define VPE_DEI_HEIGHT_SHIFT            16
+#define VPE_DEI_INTERLACE_BYPASS        (1 << 29)
+#define VPE_DEI_FIELD_FLUSH             (1 << 30)
+#define VPE_DEI_PROGRESSIVE             (1 << 31)
+
+#define VPE_MDT_BYPASS                  0x0604
+#define VPE_MDT_TEMPMAX_BYPASS          (1 << 0)
+#define VPE_MDT_SPATMAX_BYPASS          (1 << 1)
+
+#define VPE_MDT_SF_THRESHOLD            0x0608
+#define VPE_MDT_SF_SC_THR1_MASK         0xff
+#define VPE_MDT_SF_SC_THR1_SHIFT        0
+#define VPE_MDT_SF_SC_THR2_MASK         0xff
+#define VPE_MDT_SF_SC_THR2_SHIFT        0
+#define VPE_MDT_SF_SC_THR3_MASK         0xff
+#define VPE_MDT_SF_SC_THR3_SHIFT        0
+
+#define VPE_EDI_CONFIG                  0x060c
+#define VPE_EDI_INP_MODE_MASK           0x03
+#define VPE_EDI_INP_MODE_SHIFT          0
+#define VPE_EDI_ENABLE_3D               (1 << 2)
+#define VPE_EDI_ENABLE_CHROMA_3D        (1 << 3)
+#define VPE_EDI_CHROMA3D_COR_THR_MASK   0xff
+#define VPE_EDI_CHROMA3D_COR_THR_SHIFT  8
+#define VPE_EDI_DIR_COR_LOWER_THR_MASK  0xff
+#define VPE_EDI_DIR_COR_LOWER_THR_SHIFT 16
+#define VPE_EDI_COR_SCALE_FACTOR_MASK   0xff
+#define VPE_EDI_COR_SCALE_FACTOR_SHIFT  23
+
+#define VPE_DEI_EDI_LUT_R0              0x0610
+#define VPE_EDI_LUT0_MASK               0x1f
+#define VPE_EDI_LUT0_SHIFT              0
+#define VPE_EDI_LUT1_MASK               0x1f
+#define VPE_EDI_LUT1_SHIFT              8
+#define VPE_EDI_LUT2_MASK               0x1f
+#define VPE_EDI_LUT2_SHIFT              16
+#define VPE_EDI_LUT3_MASK               0x1f
+#define VPE_EDI_LUT3_SHIFT              24
+
+#define VPE_DEI_EDI_LUT_R1              0x0614
+#define VPE_EDI_LUT0_MASK               0x1f
+#define VPE_EDI_LUT0_SHIFT              0
+#define VPE_EDI_LUT1_MASK               0x1f
+#define VPE_EDI_LUT1_SHIFT              8
+#define VPE_EDI_LUT2_MASK               0x1f
+#define VPE_EDI_LUT2_SHIFT              16
+#define VPE_EDI_LUT3_MASK               0x1f
+#define VPE_EDI_LUT3_SHIFT              24
+
+#define VPE_DEI_EDI_LUT_R2              0x0618
+#define VPE_EDI_LUT4_MASK               0x1f
+#define VPE_EDI_LUT4_SHIFT              0
+#define VPE_EDI_LUT5_MASK               0x1f
+#define VPE_EDI_LUT5_SHIFT              8
+#define VPE_EDI_LUT6_MASK               0x1f
+#define VPE_EDI_LUT6_SHIFT              16
+#define VPE_EDI_LUT7_MASK               0x1f
+#define VPE_EDI_LUT7_SHIFT              24
+
+#define VPE_DEI_EDI_LUT_R3              0x061c
+#define VPE_EDI_LUT8_MASK               0x1f
+#define VPE_EDI_LUT8_SHIFT              0
+#define VPE_EDI_LUT9_MASK               0x1f
+#define VPE_EDI_LUT9_SHIFT              8
+#define VPE_EDI_LUT10_MASK              0x1f
+#define VPE_EDI_LUT10_SHIFT             16
+#define VPE_EDI_LUT11_MASK              0x1f
+#define VPE_EDI_LUT11_SHIFT             24
+
+#define VPE_DEI_FMD_WINDOW_R0           0x0620
+#define VPE_FMD_WINDOW_MINX_MASK        0x07ff
+#define VPE_FMD_WINDOW_MINX_SHIFT       0
+#define VPE_FMD_WINDOW_MAXX_MASK        0x07ff
+#define VPE_FMD_WINDOW_MAXX_SHIFT       16
+#define VPE_FMD_WINDOW_ENABLE           (1 << 31)
+
+#define VPE_DEI_FMD_WINDOW_R1           0x0624
+#define VPE_FMD_WINDOW_MINY_MASK        0x07ff
+#define VPE_FMD_WINDOW_MINY_SHIFT       0
+#define VPE_FMD_WINDOW_MAXY_MASK        0x07ff
+#define VPE_FMD_WINDOW_MAXY_SHIFT       16
+
+#define VPE_DEI_FMD_CONTROL_R0          0x0628
+#define VPE_FMD_ENABLE                  (1 << 0)
+#define VPE_FMD_LOCK                    (1 << 1)
+#define VPE_FMD_JAM_DIR                 (1 << 2)
+#define VPE_FMD_BED_ENABLE              (1 << 3)
+#define VPE_FMD_CAF_FIELD_THR_MASK      0xff
+#define VPE_FMD_CAF_FIELD_THR_SHIFT     16
+#define VPE_FMD_CAF_LINE_THR_MASK       0xff
+#define VPE_FMD_CAF_LINE_THR_SHIFT      24
+
+#define VPE_DEI_FMD_CONTROL_R1          0x062c
+#define VPE_FMD_CAF_THR_MASK            0x000fffff
+#define VPE_FMD_CAF_THR_SHIFT           0
+
+#define VPE_DEI_FMD_STATUS_R0           0x0630
+#define VPE_FMD_CAF_MASK                0x000fffff
+#define VPE_FMD_CAF_SHIFT               0
+#define VPE_FMD_RESET                   (1 << 24)
+
+#define VPE_DEI_FMD_STATUS_R1           0x0634
+#define VPE_FMD_FIELD_DIFF_MASK         0x0fffffff
+#define VPE_FMD_FIELD_DIFF_SHIFT        0
+
+#define VPE_DEI_FMD_STATUS_R2           0x0638
+#define VPE_FMD_FRAME_DIFF_MASK         0x000fffff
+#define VPE_FMD_FRAME_DIFF_SHIFT        0
+
+/* VPE scaler regs */
+#define VPE_SC_MP_SC0                   0x0700
+#define VPE_INTERLACE_O                 (1 << 0)
+#define VPE_LINEAR                      (1 << 1)
+#define VPE_SC_BYPASS                   (1 << 2)
+#define VPE_INVT_FID                    (1 << 3)
+#define VPE_USE_RAV                     (1 << 4)
+#define VPE_ENABLE_EV                   (1 << 5)
+#define VPE_AUTO_HS                     (1 << 6)
+#define VPE_DCM_2X                      (1 << 7)
+#define VPE_DCM_4X                      (1 << 8)
+#define VPE_HP_BYPASS                   (1 << 9)
+#define VPE_INTERLACE_I                 (1 << 10)
+#define VPE_ENABLE_SIN2_VER_INTP        (1 << 11)
+#define VPE_Y_PK_EN                     (1 << 14)
+#define VPE_TRIM                        (1 << 15)
+#define VPE_SELFGEN_FID                 (1 << 16)
+
+#define VPE_SC_MP_SC1                   0x0704
+#define VPE_ROW_ACC_INC_MASK            0x07ffffff
+#define VPE_ROW_ACC_INC_SHIFT           0
+
+#define VPE_SC_MP_SC2                   0x0708
+#define VPE_ROW_ACC_OFFSET_MASK         0x0fffffff
+#define VPE_ROW_ACC_OFFSET_SHIFT        0
+
+#define VPE_SC_MP_SC3                   0x070c
+#define VPE_ROW_ACC_OFFSET_B_MASK       0x0fffffff
+#define VPE_ROW_ACC_OFFSET_B_SHIFT      0
+
+#define VPE_SC_MP_SC4                   0x0710
+#define VPE_TAR_H_MASK                  0x07ff
+#define VPE_TAR_H_SHIFT                 0
+#define VPE_TAR_W_MASK                  0x07ff
+#define VPE_TAR_W_SHIFT                 12
+#define VPE_LIN_ACC_INC_U_MASK          0x07
+#define VPE_LIN_ACC_INC_U_SHIFT         24
+#define VPE_NLIN_ACC_INIT_U_MASK        0x07
+#define VPE_NLIN_ACC_INIT_U_SHIFT       28
+
+#define VPE_SC_MP_SC5                   0x0714
+#define VPE_SRC_H_MASK                  0x07ff
+#define VPE_SRC_H_SHIFT                 0
+#define VPE_SRC_W_MASK                  0x07ff
+#define VPE_SRC_W_SHIFT                 12
+#define VPE_NLIN_ACC_INC_U_MASK         0x07
+#define VPE_NLIN_ACC_INC_U_SHIFT        24
+
+#define VPE_SC_MP_SC6                   0x0718
+#define VPE_ROW_ACC_INIT_RAV_MASK       0x03ff
+#define VPE_ROW_ACC_INIT_RAV_SHIFT      0
+#define VPE_ROW_ACC_INIT_RAV_B_MASK     0x03ff
+#define VPE_ROW_ACC_INIT_RAV_B_SHIFT    10
+
+#define VPE_SC_MP_SC8                   0x0720
+#define VPE_NLIN_LEFT_MASK              0x07ff
+#define VPE_NLIN_LEFT_SHIFT             0
+#define VPE_NLIN_RIGHT_MASK             0x07ff
+#define VPE_NLIN_RIGHT_SHIFT            12
+
+#define VPE_SC_MP_SC9                   0x0724
+#define VPE_LIN_ACC_INC                 VPE_SC_MP_SC9
+
+#define VPE_SC_MP_SC10                  0x0728
+#define VPE_NLIN_ACC_INIT               VPE_SC_MP_SC10
+
+#define VPE_SC_MP_SC11                  0x072c
+#define VPE_NLIN_ACC_INC                VPE_SC_MP_SC11
+
+#define VPE_SC_MP_SC12                  0x0730
+#define VPE_COL_ACC_OFFSET_MASK         0x01ffffff
+#define VPE_COL_ACC_OFFSET_SHIFT        0
+
+#define VPE_SC_MP_SC13                  0x0734
+#define VPE_SC_FACTOR_RAV_MASK          0x03ff
+#define VPE_SC_FACTOR_RAV_SHIFT         0
+#define VPE_CHROMA_INTP_THR_MASK        0x03ff
+#define VPE_CHROMA_INTP_THR_SHIFT       12
+#define VPE_DELTA_CHROMA_THR_MASK       0x0f
+#define VPE_DELTA_CHROMA_THR_SHIFT      24
+
+#define VPE_SC_MP_SC17                  0x0744
+#define VPE_EV_THR_MASK                 0x03ff
+#define VPE_EV_THR_SHIFT                12
+#define VPE_DELTA_LUMA_THR_MASK         0x0f
+#define VPE_DELTA_LUMA_THR_SHIFT        24
+#define VPE_DELTA_EV_THR_MASK           0x0f
+#define VPE_DELTA_EV_THR_SHIFT          28
+
+#define VPE_SC_MP_SC18                  0x0748
+#define VPE_HS_FACTOR_MASK              0x03ff
+#define VPE_HS_FACTOR_SHIFT             0
+#define VPE_CONF_DEFAULT_MASK           0x01ff
+#define VPE_CONF_DEFAULT_SHIFT          16
+
+#define VPE_SC_MP_SC19                  0x074c
+#define VPE_HPF_COEFF0_MASK             0xff
+#define VPE_HPF_COEFF0_SHIFT            0
+#define VPE_HPF_COEFF1_MASK             0xff
+#define VPE_HPF_COEFF1_SHIFT            8
+#define VPE_HPF_COEFF2_MASK             0xff
+#define VPE_HPF_COEFF2_SHIFT            16
+#define VPE_HPF_COEFF3_MASK             0xff
+#define VPE_HPF_COEFF3_SHIFT            23
+
+#define VPE_SC_MP_SC20                  0x0750
+#define VPE_HPF_COEFF4_MASK             0xff
+#define VPE_HPF_COEFF4_SHIFT            0
+#define VPE_HPF_COEFF5_MASK             0xff
+#define VPE_HPF_COEFF5_SHIFT            8
+#define VPE_HPF_NORM_SHIFT_MASK         0x07
+#define VPE_HPF_NORM_SHIFT_SHIFT        16
+#define VPE_NL_LIMIT_MASK               0x1ff
+#define VPE_NL_LIMIT_SHIFT              20
+
+#define VPE_SC_MP_SC21                  0x0754
+#define VPE_NL_LO_THR_MASK              0x01ff
+#define VPE_NL_LO_THR_SHIFT             0
+#define VPE_NL_LO_SLOPE_MASK            0xff
+#define VPE_NL_LO_SLOPE_SHIFT           16
+
+#define VPE_SC_MP_SC22                  0x0758
+#define VPE_NL_HI_THR_MASK              0x01ff
+#define VPE_NL_HI_THR_SHIFT             0
+#define VPE_NL_HI_SLOPE_SH_MASK         0x07
+#define VPE_NL_HI_SLOPE_SH_SHIFT        16
+
+#define VPE_SC_MP_SC23                  0x075c
+#define VPE_GRADIENT_THR_MASK           0x07ff
+#define VPE_GRADIENT_THR_SHIFT          0
+#define VPE_GRADIENT_THR_RANGE_MASK     0x0f
+#define VPE_GRADIENT_THR_RANGE_SHIFT    12
+#define VPE_MIN_GY_THR_MASK             0xff
+#define VPE_MIN_GY_THR_SHIFT            16
+#define VPE_MIN_GY_THR_RANGE_MASK       0x0f
+#define VPE_MIN_GY_THR_RANGE_SHIFT      28
+
+#define VPE_SC_MP_SC24                  0x0760
+#define VPE_ORG_H_MASK                  0x07ff
+#define VPE_ORG_H_SHIFT                 0
+#define VPE_ORG_W_MASK                  0x07ff
+#define VPE_ORG_W_SHIFT                 16
+
+#define VPE_SC_MP_SC25                  0x0764
+#define VPE_OFF_H_MASK                  0x07ff
+#define VPE_OFF_H_SHIFT                 0
+#define VPE_OFF_W_MASK                  0x07ff
+#define VPE_OFF_W_SHIFT                 16
+
+/* VPE color space converter regs */
+#define VPE_CSC_CSC00                   0x5700
+#define VPE_CSC_A0_MASK                 0x1fff
+#define VPE_CSC_A0_SHIFT                0
+#define VPE_CSC_B0_MASK                 0x1fff
+#define VPE_CSC_B0_SHIFT                16
+
+#define VPE_CSC_CSC01                   0x5704
+#define VPE_CSC_C0_MASK                 0x1fff
+#define VPE_CSC_C0_SHIFT                0
+#define VPE_CSC_A1_MASK                 0x1fff
+#define VPE_CSC_A1_SHIFT                16
+
+#define VPE_CSC_CSC02                   0x5708
+#define VPE_CSC_B1_MASK                 0x1fff
+#define VPE_CSC_B1_SHIFT                0
+#define VPE_CSC_C1_MASK                 0x1fff
+#define VPE_CSC_C1_SHIFT                16
+
+#define VPE_CSC_CSC03                   0x570c
+#define VPE_CSC_A2_MASK                 0x1fff
+#define VPE_CSC_A2_SHIFT                0
+#define VPE_CSC_B2_MASK                 0x1fff
+#define VPE_CSC_B2_SHIFT                16
+
+#define VPE_CSC_CSC04                   0x5710
+#define VPE_CSC_C2_MASK                 0x1fff
+#define VPE_CSC_C2_SHIFT                0
+#define VPE_CSC_D0_MASK                 0x0fff
+#define VPE_CSC_D0_SHIFT                16
+
+#define VPE_CSC_CSC05                   0x5714
+#define VPE_CSC_D1_MASK                 0x0fff
+#define VPE_CSC_D1_SHIFT                0
+#define VPE_CSC_D2_MASK                 0x0fff
+#define VPE_CSC_D2_SHIFT                16
+#define VPE_CSC_BYPASS                  (1 << 28)
+
+#endif
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index b557caf5b1a4..6a74ce040d28 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -403,7 +403,7 @@ static int timblogiw_s_input(struct file *file, void  *priv, unsigned int input)
         return 0;
 }
 
-static int timblogiw_streamon(struct file *file, void  *priv, unsigned int type)
+static int timblogiw_streamon(struct file *file, void  *priv, enum v4l2_buf_type type)
 {
         struct video_device *vdev = video_devdata(file);
         struct timblogiw_fh *fh = priv;
@@ -420,7 +420,7 @@ static int timblogiw_streamon(struct file *file, void  *priv, unsigned int type)
 }
 
 static int timblogiw_streamoff(struct file *file, void  *priv,
-        unsigned int type)
+        enum v4l2_buf_type type)
 {
         struct video_device *vdev = video_devdata(file);
         struct timblogiw_fh *fh = priv;
diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c
index 21db23b196be..fa3964022b96 100644
--- a/drivers/media/radio/radio-keene.c
+++ b/drivers/media/radio/radio-keene.c
@@ -123,7 +123,7 @@ static int keene_cmd_set(struct keene_device *radio)
         /* If bit 0 is set, then transmit mono, otherwise stereo.
            If bit 2 is set, then enable 75 us preemphasis, otherwise
            it is 50 us. */
-        radio->buffer[3] = (!radio->stereo) | (radio->preemph_75_us ? 4 : 0);
+        radio->buffer[3] = (radio->stereo ? 0 : 1) | (radio->preemph_75_us ? 4 : 0);
         radio->buffer[4] = 0x00;
         radio->buffer[5] = 0x00;
         radio->buffer[6] = 0x00;
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index f1e3714b5f16..93d864eb8306 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -74,8 +74,8 @@ static u8 fmr2_tea575x_get_pins(struct snd_tea575x *tea)
         struct fmr2 *fmr2 = tea->private_data;
         u8 bits = inb(fmr2->io);
 
-        return  (bits & STR_DATA) ? TEA575X_DATA : 0 |
-                (bits & STR_MOST) ? TEA575X_MOST : 0;
+        return  ((bits & STR_DATA) ? TEA575X_DATA : 0) |
+                ((bits & STR_MOST) ? TEA575X_MOST : 0);
 }
 
 static void fmr2_tea575x_set_direction(struct snd_tea575x *tea, bool output)
@@ -295,7 +295,6 @@ static void fmr2_remove(struct fmr2 *fmr2)
 static int fmr2_isa_remove(struct device *pdev, unsigned int ndev)
 {
         fmr2_remove(dev_get_drvdata(pdev));
-        dev_set_drvdata(pdev, NULL);
 
         return 0;
 }
diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
index b91477212413..3db8a8cfe1a8 100644
--- a/drivers/media/radio/radio-shark.c
+++ b/drivers/media/radio/radio-shark.c
@@ -271,6 +271,7 @@ static void shark_unregister_leds(struct shark_device *shark)
         cancel_work_sync(&shark->led_work);
 }
 
+#ifdef CONFIG_PM
 static void shark_resume_leds(struct shark_device *shark)
 {
         if (test_bit(BLUE_IS_PULSE, &shark->brightness_new))
@@ -280,6 +281,7 @@ static void shark_resume_leds(struct shark_device *shark)
         set_bit(RED_LED, &shark->brightness_new);
         schedule_work(&shark->led_work);
 }
+#endif
 #else
 static int shark_register_leds(struct shark_device *shark, struct device *dev)
 {
diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
index 9fb669721e66..d86d90dab8bf 100644
--- a/drivers/media/radio/radio-shark2.c
+++ b/drivers/media/radio/radio-shark2.c
@@ -237,6 +237,7 @@ static void shark_unregister_leds(struct shark_device *shark)
         cancel_work_sync(&shark->led_work);
 }
 
+#ifdef CONFIG_PM
 static void shark_resume_leds(struct shark_device *shark)
 {
         int i;
@@ -246,6 +247,7 @@ static void shark_resume_leds(struct shark_device *shark)
 
         schedule_work(&shark->led_work);
 }
+#endif
 #else
 static int shark_register_leds(struct shark_device *shark, struct device *dev)
 {
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 0bd250068285..0e750aef656a 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -254,7 +254,7 @@ static unsigned int si470x_get_step(struct si470x_device *radio)
         /* 2:  50 kHz */
         default:
                 return 50 * 16;
-        };
+        }
 }
 
 
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index e5fc9acd0c4f..2a497c80c77f 100644
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -463,7 +463,7 @@ static int si470x_i2c_remove(struct i2c_client *client)
 }
 
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /*
  * si470x_i2c_suspend - suspend the device
  */
@@ -509,7 +509,7 @@ static struct i2c_driver si470x_i2c_driver = {
         .driver = {
                 .name           = "si470x",
                 .owner          = THIS_MODULE,
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
                 .pm             = &si470x_i2c_pm,
 #endif
         },
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index fe160882ee10..9ec48ccbcf0b 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1456,7 +1456,7 @@ static int si4713_probe(struct i2c_client *client,
 
         if (client->irq) {
                 rval = request_irq(client->irq,
-                        si4713_handler, IRQF_TRIGGER_FALLING | IRQF_DISABLED,
+                        si4713_handler, IRQF_TRIGGER_FALLING,
                         client->name, sdev);
                 if (rval < 0) {
                         v4l2_err(&sdev->sd, "Could not request IRQ\n");
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 06ac69245ca1..69e3245a58a0 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -48,15 +48,15 @@
 #define WM_SUB_TEST             0xF
 
 /* Different modes of the MSA register */
-#define MODE_BUFFER             0x0
-#define MODE_PRESET             0x1
-#define MODE_SEARCH             0x2
-#define MODE_AF_UPDATE          0x3
-#define MODE_JUMP               0x4
-#define MODE_CHECK              0x5
-#define MODE_LOAD               0x6
-#define MODE_END                0x7
-#define MODE_SHIFT              5
+#define MSA_MODE_BUFFER         0x0
+#define MSA_MODE_PRESET         0x1
+#define MSA_MODE_SEARCH         0x2
+#define MSA_MODE_AF_UPDATE      0x3
+#define MSA_MODE_JUMP           0x4
+#define MSA_MODE_CHECK          0x5
+#define MSA_MODE_LOAD           0x6
+#define MSA_MODE_END            0x7
+#define MSA_MODE_SHIFT          5
 
 struct tef6862_state {
         struct v4l2_subdev sd;
@@ -114,7 +114,7 @@ static int tef6862_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequen
 
         clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ);
         pll = 1964 + ((freq - TEF6862_LO_FREQ) * 20) / FREQ_MUL;
-        i2cmsg[0] = (MODE_PRESET << MODE_SHIFT) | WM_SUB_PLLM;
+        i2cmsg[0] = (MSA_MODE_PRESET << MSA_MODE_SHIFT) | WM_SUB_PLLM;
         i2cmsg[1] = (pll >> 8) & 0xff;
         i2cmsg[2] = pll & 0xff;
 
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index 253f307f0b37..4b2e9e8298e1 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -175,7 +175,7 @@ static int_handler_prototype int_handler_table[] = {
         fm_irq_handle_intmsk_cmd_resp
 };
 
-long (*g_st_write) (struct sk_buff *skb);
+static long (*g_st_write) (struct sk_buff *skb);
 static struct completion wait_for_fmdrv_reg_comp;
 
 static inline void fm_irq_call(struct fmdev *fmdev)
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 11e84bcc23a1..904f11367c29 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -322,4 +322,14 @@ config IR_GPIO_CIR
            To compile this driver as a module, choose M here: the module will
            be called gpio-ir-recv.
 
+config RC_ST
+        tristate "ST remote control receiver"
+        depends on ARCH_STI && RC_CORE
+        help
+         Say Y here if you want support for ST remote control driver
+         which allows both IR and UHF RX.
+         The driver passes raw pulse and space information to the LIRC decoder.
+
+         If you're not sure, select N here.
+
 endif #RC_DEVICES
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 56bacf07b361..f4eb32c0a455 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o
 obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o
 obj-$(CONFIG_IR_IGUANA) += iguanair.o
 obj-$(CONFIG_IR_TTUSBIR) += ttusbir.o
+obj-$(CONFIG_RC_ST) += st_rc.o
diff --git a/drivers/media/rc/fintek-cir.h b/drivers/media/rc/fintek-cir.h
index 82516a1d39b0..b698f3d2ced9 100644
--- a/drivers/media/rc/fintek-cir.h
+++ b/drivers/media/rc/fintek-cir.h
@@ -76,8 +76,8 @@ struct fintek_dev {
         } tx;
 
         /* Config register index/data port pair */
-        u8 cr_ip;
-        u8 cr_dp;
+        u32 cr_ip;
+        u32 cr_dp;
 
         /* hardware I/O settings */
         unsigned long cir_addr;
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 07aacfa5903d..80c611c2e8c2 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 #include <linux/of_gpio.h>
 #include <linux/platform_device.h>
 #include <linux/irq.h>
diff --git a/drivers/media/rc/iguanair.c b/drivers/media/rc/iguanair.c
index b53626ba6f49..fdae05c4f377 100644
--- a/drivers/media/rc/iguanair.c
+++ b/drivers/media/rc/iguanair.c
@@ -308,22 +308,12 @@ static int iguanair_set_tx_carrier(struct rc_dev *dev, uint32_t carrier)
                 cycles = DIV_ROUND_CLOSEST(24000000, carrier * 2) -
                                                         ir->cycle_overhead;
 
-                /*  make up the the remainer of 4-cycle blocks */
-                switch (cycles & 3) {
-                case 0:
-                        sevens = 0;
-                        break;
-                case 1:
-                        sevens = 3;
-                        break;
-                case 2:
-                        sevens = 2;
-                        break;
-                case 3:
-                        sevens = 1;
-                        break;
-                }
-
+                /*
+                 * Calculate minimum number of 7 cycles needed so
+                 * we are left with a multiple of 4; so we want to have
+                 * (sevens * 7) & 3 == cycles & 3
+                 */
+                sevens = (4 - cycles) & 3;
                 fours = (cycles - sevens * 7) / 4;
 
                 /* magic happens here */
diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c
index 31b955bf7664..b1e19a26208d 100644
--- a/drivers/media/rc/ir-rx51.c
+++ b/drivers/media/rc/ir-rx51.c
@@ -201,8 +201,7 @@ static int lirc_rx51_init_port(struct lirc_rx51 *lirc_rx51)
 
         lirc_rx51->irq_num = omap_dm_timer_get_irq(lirc_rx51->pulse_timer);
         retval = request_irq(lirc_rx51->irq_num, lirc_rx51_interrupt_handler,
-                             IRQF_DISABLED | IRQF_SHARED,
-                             "lirc_pulse_timer", lirc_rx51);
+                             IRQF_SHARED, "lirc_pulse_timer", lirc_rx51);
         if (retval) {
                 dev_err(lirc_rx51->dev, ": Failed to request interrupt line\n");
                 goto err2;
diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
index 7c3674ff5ea2..07e83108df0f 100644
--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
@@ -84,8 +84,8 @@ struct nvt_dev {
         } tx;
 
         /* EFER Config register index/data pair */
-        u8 cr_efir;
-        u8 cr_efdr;
+        u32 cr_efir;
+        u32 cr_efdr;
 
         /* hardware I/O settings */
         unsigned long cir_addr;
diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c
new file mode 100644
index 000000000000..65120c2d47ad
--- /dev/null
+++ b/drivers/media/rc/st_rc.c
@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2013 STMicroelectronics Limited
+ * Author: Srinivas Kandagatla <srinivas.kandagatla@st.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/clk.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <media/rc-core.h>
+#include <linux/pinctrl/consumer.h>
+
+struct st_rc_device {
+        struct device                   *dev;
+        int                             irq;
+        int                             irq_wake;
+        struct clk                      *sys_clock;
+        void                            *base;  /* Register base address */
+        void                            *rx_base;/* RX Register base address */
+        struct rc_dev                   *rdev;
+        bool                            overclocking;
+        int                             sample_mult;
+        int                             sample_div;
+        bool                            rxuhfmode;
+};
+
+/* Registers */
+#define IRB_SAMPLE_RATE_COMM    0x64    /* sample freq divisor*/
+#define IRB_CLOCK_SEL           0x70    /* clock select       */
+#define IRB_CLOCK_SEL_STATUS    0x74    /* clock status       */
+/* IRB IR/UHF receiver registers */
+#define IRB_RX_ON               0x40    /* pulse time capture */
+#define IRB_RX_SYS              0X44    /* sym period capture */
+#define IRB_RX_INT_EN           0x48    /* IRQ enable (R/W)   */
+#define IRB_RX_INT_STATUS       0x4c    /* IRQ status (R/W)   */
+#define IRB_RX_EN               0x50    /* Receive enable     */
+#define IRB_MAX_SYM_PERIOD      0x54    /* max sym value      */
+#define IRB_RX_INT_CLEAR        0x58    /* overrun status     */
+#define IRB_RX_STATUS           0x6c    /* receive status     */
+#define IRB_RX_NOISE_SUPPR      0x5c    /* noise suppression  */
+#define IRB_RX_POLARITY_INV     0x68    /* polarity inverter  */
+
+/**
+ * IRQ set: Enable full FIFO                 1  -> bit  3;
+ *          Enable overrun IRQ               1  -> bit  2;
+ *          Enable last symbol IRQ           1  -> bit  1:
+ *          Enable RX interrupt              1  -> bit  0;
+ */
+#define IRB_RX_INTS             0x0f
+#define IRB_RX_OVERRUN_INT      0x04
+ /* maximum symbol period (microsecs),timeout to detect end of symbol train */
+#define MAX_SYMB_TIME           0x5000
+#define IRB_SAMPLE_FREQ         10000000
+#define IRB_FIFO_NOT_EMPTY      0xff00
+#define IRB_OVERFLOW            0x4
+#define IRB_TIMEOUT             0xffff
+#define IR_ST_NAME "st-rc"
+
+static void st_rc_send_lirc_timeout(struct rc_dev *rdev)
+{
+        DEFINE_IR_RAW_EVENT(ev);
+        ev.timeout = true;
+        ir_raw_event_store(rdev, &ev);
+}
+
+/**
+ * RX graphical example to better understand the difference between ST IR block
+ * output and standard definition used by LIRC (and most of the world!)
+ *
+ *           mark                                     mark
+ *      |-IRB_RX_ON-|                            |-IRB_RX_ON-|
+ *      ___  ___  ___                            ___  ___  ___             _
+ *      | |  | |  | |                            | |  | |  | |             |
+ *      | |  | |  | |         space 0            | |  | |  | |   space 1   |
+ * _____| |__| |__| |____________________________| |__| |__| |_____________|
+ *
+ *      |--------------- IRB_RX_SYS -------------|------ IRB_RX_SYS -------|
+ *
+ *      |------------- encoding bit 0 -----------|---- encoding bit 1 -----|
+ *
+ * ST hardware returns mark (IRB_RX_ON) and total symbol time (IRB_RX_SYS), so
+ * convert to standard mark/space we have to calculate space=(IRB_RX_SYS-mark)
+ * The mark time represents the amount of time the carrier (usually 36-40kHz)
+ * is detected.The above examples shows Pulse Width Modulation encoding where
+ * bit 0 is represented by space>mark.
+ */
+
+static irqreturn_t st_rc_rx_interrupt(int irq, void *data)
+{
+        unsigned int symbol, mark = 0;
+        struct st_rc_device *dev = data;
+        int last_symbol = 0;
+        u32 status;
+        DEFINE_IR_RAW_EVENT(ev);
+
+        if (dev->irq_wake)
+                pm_wakeup_event(dev->dev, 0);
+
+        status  = readl(dev->rx_base + IRB_RX_STATUS);
+
+        while (status & (IRB_FIFO_NOT_EMPTY | IRB_OVERFLOW)) {
+                u32 int_status = readl(dev->rx_base + IRB_RX_INT_STATUS);
+                if (unlikely(int_status & IRB_RX_OVERRUN_INT)) {
+                        /* discard the entire collection in case of errors!  */
+                        ir_raw_event_reset(dev->rdev);
+                        dev_info(dev->dev, "IR RX overrun\n");
+                        writel(IRB_RX_OVERRUN_INT,
+                                        dev->rx_base + IRB_RX_INT_CLEAR);
+                        continue;
+                }
+
+                symbol = readl(dev->rx_base + IRB_RX_SYS);
+                mark = readl(dev->rx_base + IRB_RX_ON);
+
+                if (symbol == IRB_TIMEOUT)
+                        last_symbol = 1;
+
+                 /* Ignore any noise */
+                if ((mark > 2) && (symbol > 1)) {
+                        symbol -= mark;
+                        if (dev->overclocking) { /* adjustments to timings */
+                                symbol *= dev->sample_mult;
+                                symbol /= dev->sample_div;
+                                mark *= dev->sample_mult;
+                                mark /= dev->sample_div;
+                        }
+
+                        ev.duration = US_TO_NS(mark);
+                        ev.pulse = true;
+                        ir_raw_event_store(dev->rdev, &ev);
+
+                        if (!last_symbol) {
+                                ev.duration = US_TO_NS(symbol);
+                                ev.pulse = false;
+                                ir_raw_event_store(dev->rdev, &ev);
+                        } else  {
+                                st_rc_send_lirc_timeout(dev->rdev);
+                        }
+
+                }
+                last_symbol = 0;
+                status  = readl(dev->rx_base + IRB_RX_STATUS);
+        }
+
+        writel(IRB_RX_INTS, dev->rx_base + IRB_RX_INT_CLEAR);
+
+        /* Empty software fifo */
+        ir_raw_event_handle(dev->rdev);
+        return IRQ_HANDLED;
+}
+
+static void st_rc_hardware_init(struct st_rc_device *dev)
+{
+        int baseclock, freqdiff;
+        unsigned int rx_max_symbol_per = MAX_SYMB_TIME;
+        unsigned int rx_sampling_freq_div;
+
+        clk_prepare_enable(dev->sys_clock);
+        baseclock = clk_get_rate(dev->sys_clock);
+
+        /* IRB input pins are inverted internally from high to low. */
+        writel(1, dev->rx_base + IRB_RX_POLARITY_INV);
+
+        rx_sampling_freq_div = baseclock / IRB_SAMPLE_FREQ;
+        writel(rx_sampling_freq_div, dev->base + IRB_SAMPLE_RATE_COMM);
+
+        freqdiff = baseclock - (rx_sampling_freq_div * IRB_SAMPLE_FREQ);
+        if (freqdiff) { /* over clocking, workout the adjustment factors */
+                dev->overclocking = true;
+                dev->sample_mult = 1000;
+                dev->sample_div = baseclock / (10000 * rx_sampling_freq_div);
+                rx_max_symbol_per = (rx_max_symbol_per * 1000)/dev->sample_div;
+        }
+
+        writel(rx_max_symbol_per, dev->rx_base + IRB_MAX_SYM_PERIOD);
+}
+
+static int st_rc_remove(struct platform_device *pdev)
+{
+        struct st_rc_device *rc_dev = platform_get_drvdata(pdev);
+        clk_disable_unprepare(rc_dev->sys_clock);
+        rc_unregister_device(rc_dev->rdev);
+        return 0;
+}
+
+static int st_rc_open(struct rc_dev *rdev)
+{
+        struct st_rc_device *dev = rdev->priv;
+        unsigned long flags;
+        local_irq_save(flags);
+        /* enable interrupts and receiver */
+        writel(IRB_RX_INTS, dev->rx_base + IRB_RX_INT_EN);
+        writel(0x01, dev->rx_base + IRB_RX_EN);
+        local_irq_restore(flags);
+
+        return 0;
+}
+
+static void st_rc_close(struct rc_dev *rdev)
+{
+        struct st_rc_device *dev = rdev->priv;
+        /* disable interrupts and receiver */
+        writel(0x00, dev->rx_base + IRB_RX_EN);
+        writel(0x00, dev->rx_base + IRB_RX_INT_EN);
+}
+
+static int st_rc_probe(struct platform_device *pdev)
+{
+        int ret = -EINVAL;
+        struct rc_dev *rdev;
+        struct device *dev = &pdev->dev;
+        struct resource *res;
+        struct st_rc_device *rc_dev;
+        struct device_node *np = pdev->dev.of_node;
+        const char *rx_mode;
+
+        rc_dev = devm_kzalloc(dev, sizeof(struct st_rc_device), GFP_KERNEL);
+
+        if (!rc_dev)
+                return -ENOMEM;
+
+        rdev = rc_allocate_device();
+
+        if (!rdev)
+                return -ENOMEM;
+
+        if (np && !of_property_read_string(np, "rx-mode", &rx_mode)) {
+
+                if (!strcmp(rx_mode, "uhf")) {
+                        rc_dev->rxuhfmode = true;
+                } else if (!strcmp(rx_mode, "infrared")) {
+                        rc_dev->rxuhfmode = false;
+                } else {
+                        dev_err(dev, "Unsupported rx mode [%s]\n", rx_mode);
+                        goto err;
+                }
+
+        } else {
+                goto err;
+        }
+
+        rc_dev->sys_clock = devm_clk_get(dev, NULL);
+        if (IS_ERR(rc_dev->sys_clock)) {
+                dev_err(dev, "System clock not found\n");
+                ret = PTR_ERR(rc_dev->sys_clock);
+                goto err;
+        }
+
+        rc_dev->irq = platform_get_irq(pdev, 0);
+        if (rc_dev->irq < 0) {
+                ret = rc_dev->irq;
+                goto err;
+        }
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        rc_dev->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(rc_dev->base)) {
+                ret = PTR_ERR(rc_dev->base);
+                goto err;
+        }
+
+        if (rc_dev->rxuhfmode)
+                rc_dev->rx_base = rc_dev->base + 0x40;
+        else
+                rc_dev->rx_base = rc_dev->base;
+
+        rc_dev->dev = dev;
+        platform_set_drvdata(pdev, rc_dev);
+        st_rc_hardware_init(rc_dev);
+
+        rdev->driver_type = RC_DRIVER_IR_RAW;
+        rdev->allowed_protos = RC_BIT_ALL;
+        /* rx sampling rate is 10Mhz */
+        rdev->rx_resolution = 100;
+        rdev->timeout = US_TO_NS(MAX_SYMB_TIME);
+        rdev->priv = rc_dev;
+        rdev->open = st_rc_open;
+        rdev->close = st_rc_close;
+        rdev->driver_name = IR_ST_NAME;
+        rdev->map_name = RC_MAP_LIRC;
+        rdev->input_name = "ST Remote Control Receiver";
+
+        /* enable wake via this device */
+        device_set_wakeup_capable(dev, true);
+        device_set_wakeup_enable(dev, true);
+
+        ret = rc_register_device(rdev);
+        if (ret < 0)
+                goto clkerr;
+
+        rc_dev->rdev = rdev;
+        if (devm_request_irq(dev, rc_dev->irq, st_rc_rx_interrupt,
+                        IRQF_NO_SUSPEND, IR_ST_NAME, rc_dev) < 0) {
+                dev_err(dev, "IRQ %d register failed\n", rc_dev->irq);
+                ret = -EINVAL;
+                goto rcerr;
+        }
+
+        /**
+         * for LIRC_MODE_MODE2 or LIRC_MODE_PULSE or LIRC_MODE_RAW
+         * lircd expects a long space first before a signal train to sync.
+         */
+        st_rc_send_lirc_timeout(rdev);
+
+        dev_info(dev, "setup in %s mode\n", rc_dev->rxuhfmode ? "UHF" : "IR");
+
+        return ret;
+rcerr:
+        rc_unregister_device(rdev);
+        rdev = NULL;
+clkerr:
+        clk_disable_unprepare(rc_dev->sys_clock);
+err:
+        rc_free_device(rdev);
+        dev_err(dev, "Unable to register device (%d)\n", ret);
+        return ret;
+}
+
+#ifdef CONFIG_PM
+static int st_rc_suspend(struct device *dev)
+{
+        struct st_rc_device *rc_dev = dev_get_drvdata(dev);
+
+        if (device_may_wakeup(dev)) {
+                if (!enable_irq_wake(rc_dev->irq))
+                        rc_dev->irq_wake = 1;
+                else
+                        return -EINVAL;
+        } else {
+                pinctrl_pm_select_sleep_state(dev);
+                writel(0x00, rc_dev->rx_base + IRB_RX_EN);
+                writel(0x00, rc_dev->rx_base + IRB_RX_INT_EN);
+                clk_disable_unprepare(rc_dev->sys_clock);
+        }
+
+        return 0;
+}
+
+static int st_rc_resume(struct device *dev)
+{
+        struct st_rc_device *rc_dev = dev_get_drvdata(dev);
+        struct rc_dev   *rdev = rc_dev->rdev;
+
+        if (rc_dev->irq_wake) {
+                disable_irq_wake(rc_dev->irq);
+                rc_dev->irq_wake = 0;
+        } else {
+                pinctrl_pm_select_default_state(dev);
+                st_rc_hardware_init(rc_dev);
+                if (rdev->users) {
+                        writel(IRB_RX_INTS, rc_dev->rx_base + IRB_RX_INT_EN);
+                        writel(0x01, rc_dev->rx_base + IRB_RX_EN);
+                }
+        }
+
+        return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume);
+#endif
+
+#ifdef CONFIG_OF
+static struct of_device_id st_rc_match[] = {
+        { .compatible = "st,comms-irb", },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, st_rc_match);
+#endif
+
+static struct platform_driver st_rc_driver = {
+        .driver = {
+                .name = IR_ST_NAME,
+                .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(st_rc_match),
+#ifdef CONFIG_PM
+                .pm     = &st_rc_pm_ops,
+#endif
+        },
+        .probe = st_rc_probe,
+        .remove = st_rc_remove,
+};
+
+module_platform_driver(st_rc_driver);
+
+MODULE_DESCRIPTION("RC Transceiver driver for STMicroelectronics platforms");
+MODULE_AUTHOR("STMicroelectronics (R&D) Ltd");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 98bd4960c75e..904baf4eec28 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1110,7 +1110,7 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
         }
 
         err = request_irq(data->irq, wbcir_irq_handler,
-                          IRQF_DISABLED, DRVNAME, device);
+                          0, DRVNAME, device);
         if (err) {
                 dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
                 err = -EBUSY;
diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c
index 6c96e4898777..72971a8d3c37 100644
--- a/drivers/media/tuners/e4000.c
+++ b/drivers/media/tuners/e4000.c
@@ -21,20 +21,30 @@
 #include "e4000_priv.h"
 #include <linux/math64.h>
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /* write multiple registers */
 static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
 {
         int ret;
-        u8 buf[1 + len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg->i2c_addr,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = 1 + len,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
@@ -54,7 +64,7 @@ static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
 static int e4000_rd_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
 {
         int ret;
-        u8 buf[len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[2] = {
                 {
                         .addr = priv->cfg->i2c_addr,
@@ -64,11 +74,18 @@ static int e4000_rd_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
                 }, {
                         .addr = priv->cfg->i2c_addr,
                         .flags = I2C_M_RD,
-                        .len = sizeof(buf),
+                        .len = len,
                         .buf = buf,
                 }
         };
 
+        if (len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c rd reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         ret = i2c_transfer(priv->i2c, msg, 2);
         if (ret == 2) {
                 memcpy(val, buf, len);
diff --git a/drivers/media/tuners/fc0012.c b/drivers/media/tuners/fc0012.c
index f4d0e797a6cc..d74e92056810 100644
--- a/drivers/media/tuners/fc0012.c
+++ b/drivers/media/tuners/fc0012.c
@@ -139,7 +139,7 @@ static int fc0012_set_params(struct dvb_frontend *fe)
         unsigned char reg[7], am, pm, multi, tmp;
         unsigned long f_vco;
         unsigned short xtal_freq_khz_2, xin, xdiv;
-        int vco_select = false;
+        bool vco_select = false;
 
         if (fe->callback) {
                 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER,
diff --git a/drivers/media/tuners/fc0013.c b/drivers/media/tuners/fc0013.c
index bd8f0f1e8f3b..b4162315773d 100644
--- a/drivers/media/tuners/fc0013.c
+++ b/drivers/media/tuners/fc0013.c
@@ -233,7 +233,7 @@ static int fc0013_set_params(struct dvb_frontend *fe)
         unsigned char reg[7], am, pm, multi, tmp;
         unsigned long f_vco;
         unsigned short xtal_freq_khz_2, xin, xdiv;
-        int vco_select = false;
+        bool vco_select = false;
 
         if (fe->callback) {
                 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER,
diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c
index 81f38aae9c66..3aecaf465094 100644
--- a/drivers/media/tuners/fc2580.c
+++ b/drivers/media/tuners/fc2580.c
@@ -20,6 +20,9 @@
 
 #include "fc2580_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /*
  * TODO:
  * I2C write and read works only for one single register. Multiple registers
@@ -41,16 +44,23 @@
 static int fc2580_wr_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len)
 {
         int ret;
-        u8 buf[1 + len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg->i2c_addr,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = 1 + len,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
@@ -69,7 +79,7 @@ static int fc2580_wr_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len)
 static int fc2580_rd_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len)
 {
         int ret;
-        u8 buf[len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[2] = {
                 {
                         .addr = priv->cfg->i2c_addr,
@@ -79,11 +89,18 @@ static int fc2580_rd_regs(struct fc2580_priv *priv, u8 reg, u8 *val, int len)
                 }, {
                         .addr = priv->cfg->i2c_addr,
                         .flags = I2C_M_RD,
-                        .len = sizeof(buf),
+                        .len = len,
                         .buf = buf,
                 }
         };
 
+        if (len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c rd reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         ret = i2c_transfer(priv->i2c, msg, 2);
         if (ret == 2) {
                 memcpy(val, buf, len);
diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index 1c23666468cf..d9ee43fae62d 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -612,10 +612,19 @@ static int r820t_set_pll(struct r820t_priv *priv, enum v4l2_tuner_type type,
 
         vco_fine_tune = (data[4] & 0x30) >> 4;
 
-        if (vco_fine_tune > VCO_POWER_REF)
-                div_num = div_num - 1;
-        else if (vco_fine_tune < VCO_POWER_REF)
-                div_num = div_num + 1;
+        tuner_dbg("mix_div=%d div_num=%d vco_fine_tune=%d\n",
+                        mix_div, div_num, vco_fine_tune);
+
+        /*
+         * XXX: R828D/16MHz seems to have always vco_fine_tune=1.
+         * Due to that, this calculation goes wrong.
+         */
+        if (priv->cfg->rafael_chip != CHIP_R828D) {
+                if (vco_fine_tune > VCO_POWER_REF)
+                        div_num = div_num - 1;
+                else if (vco_fine_tune < VCO_POWER_REF)
+                        div_num = div_num + 1;
+        }
 
         rc = r820t_write_reg_mask(priv, 0x10, div_num << 5, 0xe0);
         if (rc < 0)
@@ -637,11 +646,6 @@ static int r820t_set_pll(struct r820t_priv *priv, enum v4l2_tuner_type type,
                 vco_fra = pll_ref * 129 / 128;
         }
 
-        if (nint > 63) {
-                tuner_info("No valid PLL values for %u kHz!\n", freq);
-                return -EINVAL;
-        }
-
         ni = (nint - 13) / 4;
         si = nint - 4 * ni - 13;
 
diff --git a/drivers/media/tuners/tda18212.c b/drivers/media/tuners/tda18212.c
index e4a84ee231cf..abe256e1f843 100644
--- a/drivers/media/tuners/tda18212.c
+++ b/drivers/media/tuners/tda18212.c
@@ -20,6 +20,9 @@
 
 #include "tda18212.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 struct tda18212_priv {
         struct tda18212_config *cfg;
         struct i2c_adapter *i2c;
@@ -32,16 +35,23 @@ static int tda18212_wr_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
         int len)
 {
         int ret;
-        u8 buf[len+1];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg->i2c_address,
                         .flags = 0,
-                        .len = sizeof(buf),
+                        .len = 1 + len,
                         .buf = buf,
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         buf[0] = reg;
         memcpy(&buf[1], val, len);
 
@@ -61,7 +71,7 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
         int len)
 {
         int ret;
-        u8 buf[len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[2] = {
                 {
                         .addr = priv->cfg->i2c_address,
@@ -71,11 +81,18 @@ static int tda18212_rd_regs(struct tda18212_priv *priv, u8 reg, u8 *val,
                 }, {
                         .addr = priv->cfg->i2c_address,
                         .flags = I2C_M_RD,
-                        .len = sizeof(buf),
+                        .len = len,
                         .buf = buf,
                 }
         };
 
+        if (len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c rd reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         ret = i2c_transfer(priv->i2c, msg, 2);
         if (ret == 2) {
                 memcpy(val, buf, len);
diff --git a/drivers/media/tuners/tda18218.c b/drivers/media/tuners/tda18218.c
index 2d31aeb6b088..9300e9361e3b 100644
--- a/drivers/media/tuners/tda18218.c
+++ b/drivers/media/tuners/tda18218.c
@@ -20,11 +20,14 @@
 
 #include "tda18218_priv.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /* write multiple registers */
 static int tda18218_wr_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len)
 {
         int ret = 0, len2, remaining;
-        u8 buf[1 + len];
+        u8 buf[MAX_XFER_SIZE];
         struct i2c_msg msg[1] = {
                 {
                         .addr = priv->cfg->i2c_address,
@@ -33,6 +36,13 @@ static int tda18218_wr_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len)
                 }
         };
 
+        if (1 + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         for (remaining = len; remaining > 0;
                         remaining -= (priv->cfg->i2c_wr_max - 1)) {
                 len2 = remaining;
@@ -63,7 +73,7 @@ static int tda18218_wr_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len)
 static int tda18218_rd_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len)
 {
         int ret;
-        u8 buf[reg+len]; /* we must start read always from reg 0x00 */
+        u8 buf[MAX_XFER_SIZE]; /* we must start read always from reg 0x00 */
         struct i2c_msg msg[2] = {
                 {
                         .addr = priv->cfg->i2c_address,
@@ -73,11 +83,18 @@ static int tda18218_rd_regs(struct tda18218_priv *priv, u8 reg, u8 *val, u8 len)
                 }, {
                         .addr = priv->cfg->i2c_address,
                         .flags = I2C_M_RD,
-                        .len = sizeof(buf),
+                        .len = reg + len,
                         .buf = buf,
                 }
         };
 
+        if (reg + len > sizeof(buf)) {
+                dev_warn(&priv->i2c->dev,
+                         "%s: i2c wr reg=%04x: len=%d is too big!\n",
+                         KBUILD_MODNAME, reg, len);
+                return -EINVAL;
+        }
+
         ret = i2c_transfer(priv->i2c, msg, 2);
         if (ret == 2) {
                 memcpy(val, &buf[reg], len);
diff --git a/drivers/media/tuners/tda9887.c b/drivers/media/tuners/tda9887.c
index 300005c535ba..9823248d743f 100644
--- a/drivers/media/tuners/tda9887.c
+++ b/drivers/media/tuners/tda9887.c
@@ -536,8 +536,8 @@ static int tda9887_status(struct dvb_frontend *fe)
         unsigned char buf[1];
         int rc;
 
-        memset(buf,0,sizeof(buf));
-        if (1 != (rc = tuner_i2c_xfer_recv(&priv->i2c_props,buf,1)))
+        rc = tuner_i2c_xfer_recv(&priv->i2c_props, buf, 1);
+        if (rc != 1)
                 tuner_info("i2c i/o error: rc == %d (should be 1)\n", rc);
         dump_read_message(fe, buf);
         return 0;
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
index 878d2c4d9e8e..4be5cf808a40 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/tuner-xc2028.c
@@ -24,6 +24,9 @@
 #include <linux/dvb/frontend.h>
 #include "dvb_frontend.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  80
+
 /* Registers (Write-only) */
 #define XREG_INIT         0x00
 #define XREG_RF_FREQ      0x02
@@ -547,7 +550,10 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 {
         struct xc2028_data *priv = fe->tuner_priv;
         int                pos, rc;
-        unsigned char      *p, *endp, buf[priv->ctrl.max_len];
+        unsigned char      *p, *endp, buf[MAX_XFER_SIZE];
+
+        if (priv->ctrl.max_len > sizeof(buf))
+                priv->ctrl.max_len = sizeof(buf);
 
         tuner_dbg("%s called\n", __func__);
 
@@ -572,7 +578,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
                         return -EINVAL;
                 }
 
-                size = le16_to_cpu(*(__u16 *) p);
+                size = le16_to_cpu(*(__le16 *) p);
                 p += sizeof(size);
 
                 if (size == 0xffff)
@@ -683,7 +689,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
                 /* 16 SCODE entries per file; each SCODE entry is 12 bytes and
                  * has a 2-byte size header in the firmware format. */
                 if (priv->firm[pos].size != 14 * 16 || scode >= 16 ||
-                    le16_to_cpu(*(__u16 *)(p + 14 * scode)) != 12)
+                    le16_to_cpu(*(__le16 *)(p + 14 * scode)) != 12)
                         return -EINVAL;
                 p += 14 * scode + 2;
         }
diff --git a/drivers/media/usb/b2c2/flexcop-usb.c b/drivers/media/usb/b2c2/flexcop-usb.c
index 8b6275f85908..0bd969063392 100644
--- a/drivers/media/usb/b2c2/flexcop-usb.c
+++ b/drivers/media/usb/b2c2/flexcop-usb.c
@@ -390,7 +390,7 @@ static void flexcop_usb_transfer_exit(struct flexcop_usb *fc_usb)
                 }
 
         if (fc_usb->iso_buffer != NULL)
-                pci_free_consistent(NULL,
+                usb_free_coherent(fc_usb->udev,
                         fc_usb->buffer_size, fc_usb->iso_buffer,
                         fc_usb->dma_addr);
 }
@@ -407,8 +407,8 @@ static int flexcop_usb_transfer_init(struct flexcop_usb *fc_usb)
                         "each of %d bytes size = %d.\n", B2C2_USB_NUM_ISO_URB,
                         B2C2_USB_FRAMES_PER_ISO, frame_size, bufsize);
 
-        fc_usb->iso_buffer = pci_alloc_consistent(NULL,
-                        bufsize, &fc_usb->dma_addr);
+        fc_usb->iso_buffer = usb_alloc_coherent(fc_usb->udev,
+                        bufsize, GFP_KERNEL, &fc_usb->dma_addr);
         if (fc_usb->iso_buffer == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/media/usb/cpia2/cpia2_usb.c b/drivers/media/usb/cpia2/cpia2_usb.c
index be1719283609..351a78a84c3d 100644
--- a/drivers/media/usb/cpia2/cpia2_usb.c
+++ b/drivers/media/usb/cpia2/cpia2_usb.c
@@ -209,7 +209,7 @@ static void cpia2_usb_complete(struct urb *urb)
 {
         int i;
         unsigned char *cdata;
-        static int frame_ready = false;
+        static bool frame_ready = false;
         struct camera_data *cam = (struct camera_data *) urb->context;
 
         if (urb->status!=0) {
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index a384f80f595e..e9d017bea377 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -978,7 +978,6 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
                             int minor)
 {
         int retval = -ENOMEM;
-        int errCode;
         unsigned int maxh, maxw;
 
         dev->udev = udev;
@@ -1014,8 +1013,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         /* Cx231xx pre card setup */
         cx231xx_pre_card_setup(dev);
 
-        errCode = cx231xx_config(dev);
-        if (errCode) {
+        retval = cx231xx_config(dev);
+        if (retval) {
                 cx231xx_errdev("error configuring device\n");
                 return -ENOMEM;
         }
@@ -1024,12 +1023,11 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         dev->norm = dev->board.norm;
 
         /* register i2c bus */
-        errCode = cx231xx_dev_init(dev);
-        if (errCode < 0) {
-                cx231xx_dev_uninit(dev);
+        retval = cx231xx_dev_init(dev);
+        if (retval) {
                 cx231xx_errdev("%s: cx231xx_i2c_register - errCode [%d]!\n",
-                               __func__, errCode);
-                return errCode;
+                               __func__, retval);
+                goto err_dev_init;
         }
 
         /* Do board specific init */
@@ -1047,11 +1045,11 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         dev->interlaced = 0;
         dev->video_input = 0;
 
-        errCode = cx231xx_config(dev);
-        if (errCode < 0) {
+        retval = cx231xx_config(dev);
+        if (retval) {
                 cx231xx_errdev("%s: cx231xx_config - errCode [%d]!\n",
-                               __func__, errCode);
-                return errCode;
+                               __func__, retval);
+                goto err_dev_init;
         }
 
         /* init video dma queues */
@@ -1075,9 +1073,9 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         }
 
         retval = cx231xx_register_analog_devices(dev);
-        if (retval < 0) {
-                cx231xx_release_resources(dev);
-                return retval;
+        if (retval) {
+                cx231xx_release_analog_resources(dev);
+                goto err_analog;
         }
 
         cx231xx_ir_init(dev);
@@ -1085,6 +1083,11 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         cx231xx_init_extension(dev);
 
         return 0;
+err_analog:
+        cx231xx_remove_from_devlist(dev);
+err_dev_init:
+        cx231xx_dev_uninit(dev);
+        return retval;
 }
 
 #if defined(CONFIG_MODULES) && defined(MODULE)
@@ -1132,7 +1135,6 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         char *speed;
         struct usb_interface_assoc_descriptor *assoc_desc;
 
-        udev = usb_get_dev(interface_to_usbdev(interface));
         ifnum = interface->altsetting[0].desc.bInterfaceNumber;
 
         /*
@@ -1161,6 +1163,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 return -ENOMEM;
         }
 
+        udev = usb_get_dev(interface_to_usbdev(interface));
+
         snprintf(dev->name, 29, "cx231xx #%d", nr);
         dev->devno = nr;
         dev->model = id->driver_info;
@@ -1223,10 +1227,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         if (assoc_desc->bFirstInterface != ifnum) {
                 cx231xx_err(DRIVER_NAME ": Not found "
                             "matching IAD interface\n");
-                clear_bit(dev->devno, &cx231xx_devused);
-                kfree(dev);
-                dev = NULL;
-                return -ENODEV;
+                retval = -ENODEV;
+                goto err_if;
         }
 
         cx231xx_info("registering interface %d\n", ifnum);
@@ -1242,22 +1244,13 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
         if (retval) {
                 cx231xx_errdev("v4l2_device_register failed\n");
-                clear_bit(dev->devno, &cx231xx_devused);
-                kfree(dev);
-                dev = NULL;
-                return -EIO;
+                retval = -EIO;
+                goto err_v4l2;
         }
         /* allocate device struct */
         retval = cx231xx_init_dev(dev, udev, nr);
-        if (retval) {
-                clear_bit(dev->devno, &cx231xx_devused);
-                v4l2_device_unregister(&dev->v4l2_dev);
-                kfree(dev);
-                dev = NULL;
-                usb_set_intfdata(interface, NULL);
-
-                return retval;
-        }
+        if (retval)
+                goto err_init;
 
         /* compute alternate max packet sizes for video */
         uif = udev->actconfig->interface[dev->current_pcb_config.
@@ -1275,11 +1268,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 
         if (dev->video_mode.alt_max_pkt_size == NULL) {
                 cx231xx_errdev("out of memory!\n");
-                clear_bit(dev->devno, &cx231xx_devused);
-                v4l2_device_unregister(&dev->v4l2_dev);
-                kfree(dev);
-                dev = NULL;
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto err_video_alt;
         }
 
         for (i = 0; i < dev->video_mode.num_alt; i++) {
@@ -1309,11 +1299,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 
         if (dev->vbi_mode.alt_max_pkt_size == NULL) {
                 cx231xx_errdev("out of memory!\n");
-                clear_bit(dev->devno, &cx231xx_devused);
-                v4l2_device_unregister(&dev->v4l2_dev);
-                kfree(dev);
-                dev = NULL;
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto err_vbi_alt;
         }
 
         for (i = 0; i < dev->vbi_mode.num_alt; i++) {
@@ -1344,11 +1331,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 
         if (dev->sliced_cc_mode.alt_max_pkt_size == NULL) {
                 cx231xx_errdev("out of memory!\n");
-                clear_bit(dev->devno, &cx231xx_devused);
-                v4l2_device_unregister(&dev->v4l2_dev);
-                kfree(dev);
-                dev = NULL;
-                return -ENOMEM;
+                retval = -ENOMEM;
+                goto err_sliced_cc_alt;
         }
 
         for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {
@@ -1380,11 +1364,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 
                 if (dev->ts1_mode.alt_max_pkt_size == NULL) {
                         cx231xx_errdev("out of memory!\n");
-                        clear_bit(dev->devno, &cx231xx_devused);
-                        v4l2_device_unregister(&dev->v4l2_dev);
-                        kfree(dev);
-                        dev = NULL;
-                        return -ENOMEM;
+                        retval = -ENOMEM;
+                        goto err_ts1_alt;
                 }
 
                 for (i = 0; i < dev->ts1_mode.num_alt; i++) {
@@ -1411,6 +1392,29 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         request_modules(dev);
 
         return 0;
+err_ts1_alt:
+        kfree(dev->sliced_cc_mode.alt_max_pkt_size);
+err_sliced_cc_alt:
+        kfree(dev->vbi_mode.alt_max_pkt_size);
+err_vbi_alt:
+        kfree(dev->video_mode.alt_max_pkt_size);
+err_video_alt:
+        /* cx231xx_uninit_dev: */
+        cx231xx_close_extension(dev);
+        cx231xx_ir_exit(dev);
+        cx231xx_release_analog_resources(dev);
+        cx231xx_417_unregister(dev);
+        cx231xx_remove_from_devlist(dev);
+        cx231xx_dev_uninit(dev);
+err_init:
+        v4l2_device_unregister(&dev->v4l2_dev);
+err_v4l2:
+        usb_set_intfdata(interface, NULL);
+err_if:
+        usb_put_dev(udev);
+        kfree(dev);
+        clear_bit(dev->devno, &cx231xx_devused);
+        return retval;
 }
 
 /*
diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
index d7308ab7a90f..2a34ceee4802 100644
--- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
+++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
@@ -28,7 +28,7 @@ MODULE_PARM_DESC(pcb_debug, "enable pcb config debug messages [video]");
 
 /******************************************************************************/
 
-struct pcb_config cx231xx_Scenario[] = {
+static struct pcb_config cx231xx_Scenario[] = {
         {
          INDEX_SELFPOWER_DIGITAL_ONLY,  /* index */
          USB_SELF_POWER,        /* power_type */
@@ -672,7 +672,7 @@ u32 initialize_cx231xx(struct cx231xx *dev)
         pcb config it is related to */
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT, data, 4);
 
-        config_info = le32_to_cpu(*((u32 *) data));
+        config_info = le32_to_cpu(*((__le32 *)data));
         usb_speed = (u8) (config_info & 0x1);
 
         /* Verify this device belongs to Bus power or Self power device */
diff --git a/drivers/media/usb/dvb-usb-v2/af9015.c b/drivers/media/usb/dvb-usb-v2/af9015.c
index d556042cf312..da47d2392f2a 100644
--- a/drivers/media/usb/dvb-usb-v2/af9015.c
+++ b/drivers/media/usb/dvb-usb-v2/af9015.c
@@ -397,12 +397,13 @@ error:
         return ret;
 }
 
+#define AF9015_EEPROM_SIZE 256
+
 /* hash (and dump) eeprom */
 static int af9015_eeprom_hash(struct dvb_usb_device *d)
 {
         struct af9015_state *state = d_to_priv(d);
         int ret, i;
-        static const unsigned int AF9015_EEPROM_SIZE = 256;
         u8 buf[AF9015_EEPROM_SIZE];
         struct req_t req = {READ_I2C, AF9015_I2C_EEPROM, 0, 0, 1, 1, NULL};
 
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 1ea17dc2a76e..c8fcd78425bd 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -21,6 +21,9 @@
 
 #include "af9035.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 static u16 af9035_checksum(const u8 *buf, size_t len)
@@ -126,10 +129,16 @@ exit:
 /* write multiple registers */
 static int af9035_wr_regs(struct dvb_usb_device *d, u32 reg, u8 *val, int len)
 {
-        u8 wbuf[6 + len];
+        u8 wbuf[MAX_XFER_SIZE];
         u8 mbox = (reg >> 16) & 0xff;
         struct usb_req req = { CMD_MEM_WR, mbox, sizeof(wbuf), wbuf, 0, NULL };
 
+        if (6 + len > sizeof(wbuf)) {
+                dev_warn(&d->udev->dev, "%s: i2c wr: len=%d is too big!\n",
+                         KBUILD_MODNAME, len);
+                return -EOPNOTSUPP;
+        }
+
         wbuf[0] = len;
         wbuf[1] = 2;
         wbuf[2] = 0;
@@ -228,9 +237,16 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
                                         msg[1].len);
                 } else {
                         /* I2C */
-                        u8 buf[5 + msg[0].len];
+                        u8 buf[MAX_XFER_SIZE];
                         struct usb_req req = { CMD_I2C_RD, 0, sizeof(buf),
                                         buf, msg[1].len, msg[1].buf };
+
+                        if (5 + msg[0].len > sizeof(buf)) {
+                                dev_warn(&d->udev->dev,
+                                         "%s: i2c xfer: len=%d is too big!\n",
+                                         KBUILD_MODNAME, msg[0].len);
+                                return -EOPNOTSUPP;
+                        }
                         req.mbox |= ((msg[0].addr & 0x80)  >>  3);
                         buf[0] = msg[1].len;
                         buf[1] = msg[0].addr << 1;
@@ -257,9 +273,16 @@ static int af9035_i2c_master_xfer(struct i2c_adapter *adap,
                                         msg[0].len - 3);
                 } else {
                         /* I2C */
-                        u8 buf[5 + msg[0].len];
+                        u8 buf[MAX_XFER_SIZE];
                         struct usb_req req = { CMD_I2C_WR, 0, sizeof(buf), buf,
                                         0, NULL };
+
+                        if (5 + msg[0].len > sizeof(buf)) {
+                                dev_warn(&d->udev->dev,
+                                         "%s: i2c xfer: len=%d is too big!\n",
+                                         KBUILD_MODNAME, msg[0].len);
+                                return -EOPNOTSUPP;
+                        }
                         req.mbox |= ((msg[0].addr & 0x80)  >>  3);
                         buf[0] = msg[0].len;
                         buf[1] = msg[0].addr << 1;
diff --git a/drivers/media/usb/dvb-usb-v2/mxl111sf.c b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
index e97964ef7f56..2627553f7de1 100644
--- a/drivers/media/usb/dvb-usb-v2/mxl111sf.c
+++ b/drivers/media/usb/dvb-usb-v2/mxl111sf.c
@@ -23,6 +23,9 @@
 #include "lgdt3305.h"
 #include "lg2160.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 int dvb_usb_mxl111sf_debug;
 module_param_named(debug, dvb_usb_mxl111sf_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level "
@@ -57,7 +60,12 @@ int mxl111sf_ctrl_msg(struct dvb_usb_device *d,
 {
         int wo = (rbuf == NULL || rlen == 0); /* write-only */
         int ret;
-        u8 sndbuf[1+wlen];
+        u8 sndbuf[MAX_XFER_SIZE];
+
+        if (1 + wlen > sizeof(sndbuf)) {
+                pr_warn("%s: len=%d is too big!\n", __func__, wlen);
+                return -EOPNOTSUPP;
+        }
 
         pr_debug("%s(wlen = %d, rlen = %d)\n", __func__, wlen, rlen);
 
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index c0cd0848631b..ecca03667f98 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -377,6 +377,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         struct rtl28xxu_req req_e4000 = {0x02c8, CMD_I2C_RD, 1, buf};
         struct rtl28xxu_req req_tda18272 = {0x00c0, CMD_I2C_RD, 2, buf};
         struct rtl28xxu_req req_r820t = {0x0034, CMD_I2C_RD, 1, buf};
+        struct rtl28xxu_req req_r828d = {0x0074, CMD_I2C_RD, 1, buf};
 
         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 
@@ -489,6 +490,15 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
                 goto found;
         }
 
+        /* check R828D ID register; reg=00 val=69 */
+        ret = rtl28xxu_ctrl_msg(d, &req_r828d);
+        if (ret == 0 && buf[0] == 0x69) {
+                priv->tuner = TUNER_RTL2832_R828D;
+                priv->tuner_name = "R828D";
+                goto found;
+        }
+
+
 found:
         dev_dbg(&d->udev->dev, "%s: tuner=%s\n", __func__, priv->tuner_name);
 
@@ -745,6 +755,7 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
                 rtl2832_config = &rtl28xxu_rtl2832_e4000_config;
                 break;
         case TUNER_RTL2832_R820T:
+        case TUNER_RTL2832_R828D:
                 rtl2832_config = &rtl28xxu_rtl2832_r820t_config;
                 break;
         default:
@@ -866,6 +877,13 @@ static const struct r820t_config rtl2832u_r820t_config = {
         .rafael_chip = CHIP_R820T,
 };
 
+static const struct r820t_config rtl2832u_r828d_config = {
+        .i2c_addr = 0x3a,
+        .xtal = 16000000,
+        .max_i2c_msg_len = 2,
+        .rafael_chip = CHIP_R828D,
+};
+
 static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
 {
         int ret;
@@ -923,6 +941,27 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
                 adap->fe[0]->ops.read_signal_strength =
                                 adap->fe[0]->ops.tuner_ops.get_rf_strength;
                 break;
+        case TUNER_RTL2832_R828D:
+                /* power off mn88472 demod on GPIO0 */
+                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_OUT_VAL, 0x00, 0x01);
+                if (ret)
+                        goto err;
+
+                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_DIR, 0x00, 0x01);
+                if (ret)
+                        goto err;
+
+                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_OUT_EN, 0x01, 0x01);
+                if (ret)
+                        goto err;
+
+                fe = dvb_attach(r820t_attach, adap->fe[0], &d->i2c_adap,
+                                &rtl2832u_r828d_config);
+
+                /* Use tuner to get the signal strength */
+                adap->fe[0]->ops.read_signal_strength =
+                                adap->fe[0]->ops.tuner_ops.get_rf_strength;
+                break;
         default:
                 fe = NULL;
                 dev_err(&d->udev->dev, "%s: unknown tuner=%d\n", KBUILD_MODNAME,
@@ -1388,6 +1427,9 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
                 &rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) },
         { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A,
                 &rtl2832u_props, "Crypto ReDi PC 50 A", NULL) },
+
+        { DVB_USB_DEVICE(USB_VID_HANFTEK, 0x0131,
+                &rtl2832u_props, "Astrometa DVB-T2", NULL) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
index 729b3540c2f9..2142bcb41b41 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
@@ -83,6 +83,7 @@ enum rtl28xxu_tuner {
         TUNER_RTL2832_TDA18272,
         TUNER_RTL2832_FC0013,
         TUNER_RTL2832_R820T,
+        TUNER_RTL2832_R828D,
 };
 
 struct rtl28xxu_req {
diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c
index ea2d5ee86576..c11138ebf6fb 100644
--- a/drivers/media/usb/dvb-usb/az6027.c
+++ b/drivers/media/usb/dvb-usb/az6027.c
@@ -254,7 +254,7 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
 
 
 
-struct stb0899_config az6027_stb0899_config = {
+static struct stb0899_config az6027_stb0899_config = {
         .init_dev               = az6027_stb0899_s1_init_1,
         .init_s2_demod          = stb0899_s2_init_2,
         .init_s1_demod          = az6027_stb0899_s1_init_3,
@@ -291,7 +291,7 @@ struct stb0899_config az6027_stb0899_config = {
         .tuner_set_rfsiggain    = NULL,
 };
 
-struct stb6100_config az6027_stb6100_config = {
+static struct stb6100_config az6027_stb6100_config = {
         .tuner_address  = 0xc0,
         .refclock       = 27000000,
 };
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 3940bb0f9ef6..20e345d9fe8f 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -43,6 +43,9 @@
 #include "lgs8gxx.h"
 #include "atbm8830.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 /* debug */
 static int dvb_usb_cxusb_debug;
 module_param_named(debug, dvb_usb_cxusb_debug, int, 0644);
@@ -57,7 +60,14 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
                           u8 cmd, u8 *wbuf, int wlen, u8 *rbuf, int rlen)
 {
         int wo = (rbuf == NULL || rlen == 0); /* write-only */
-        u8 sndbuf[1+wlen];
+        u8 sndbuf[MAX_XFER_SIZE];
+
+        if (1 + wlen > sizeof(sndbuf)) {
+                warn("i2c wr: len=%d is too big!\n",
+                     wlen);
+                return -EOPNOTSUPP;
+        }
+
         memset(sndbuf, 0, 1+wlen);
 
         sndbuf[0] = cmd;
@@ -158,7 +168,13 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
 
                 if (msg[i].flags & I2C_M_RD) {
                         /* read only */
-                        u8 obuf[3], ibuf[1+msg[i].len];
+                        u8 obuf[3], ibuf[MAX_XFER_SIZE];
+
+                        if (1 + msg[i].len > sizeof(ibuf)) {
+                                warn("i2c rd: len=%d is too big!\n",
+                                     msg[i].len);
+                                return -EOPNOTSUPP;
+                        }
                         obuf[0] = 0;
                         obuf[1] = msg[i].len;
                         obuf[2] = msg[i].addr;
@@ -172,7 +188,18 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 } else if (i+1 < num && (msg[i+1].flags & I2C_M_RD) &&
                            msg[i].addr == msg[i+1].addr) {
                         /* write to then read from same address */
-                        u8 obuf[3+msg[i].len], ibuf[1+msg[i+1].len];
+                        u8 obuf[MAX_XFER_SIZE], ibuf[MAX_XFER_SIZE];
+
+                        if (3 + msg[i].len > sizeof(obuf)) {
+                                warn("i2c wr: len=%d is too big!\n",
+                                     msg[i].len);
+                                return -EOPNOTSUPP;
+                        }
+                        if (1 + msg[i + 1].len > sizeof(ibuf)) {
+                                warn("i2c rd: len=%d is too big!\n",
+                                     msg[i + 1].len);
+                                return -EOPNOTSUPP;
+                        }
                         obuf[0] = msg[i].len;
                         obuf[1] = msg[i+1].len;
                         obuf[2] = msg[i].addr;
@@ -191,7 +218,13 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                         i++;
                 } else {
                         /* write only */
-                        u8 obuf[2+msg[i].len], ibuf;
+                        u8 obuf[MAX_XFER_SIZE], ibuf;
+
+                        if (2 + msg[i].len > sizeof(obuf)) {
+                                warn("i2c wr: len=%d is too big!\n",
+                                     msg[i].len);
+                                return -EOPNOTSUPP;
+                        }
                         obuf[0] = msg[i].addr;
                         obuf[1] = msg[i].len;
                         memcpy(&obuf[2], msg[i].buf, msg[i].len);
diff --git a/drivers/media/usb/dvb-usb/dibusb-common.c b/drivers/media/usb/dvb-usb/dibusb-common.c
index c2dded92f1d3..6d68af0c49c8 100644
--- a/drivers/media/usb/dvb-usb/dibusb-common.c
+++ b/drivers/media/usb/dvb-usb/dibusb-common.c
@@ -12,6 +12,9 @@
 #include <linux/kconfig.h>
 #include "dibusb.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info (|-able))." DVB_USB_DEBUG_STATUS);
@@ -105,11 +108,16 @@ EXPORT_SYMBOL(dibusb2_0_power_ctrl);
 static int dibusb_i2c_msg(struct dvb_usb_device *d, u8 addr,
                           u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
 {
-        u8 sndbuf[wlen+4]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */
+        u8 sndbuf[MAX_XFER_SIZE]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */
         /* write only ? */
         int wo = (rbuf == NULL || rlen == 0),
                 len = 2 + wlen + (wo ? 0 : 2);
 
+        if (4 + wlen > sizeof(sndbuf)) {
+                warn("i2c wr: len=%d is too big!\n", wlen);
+                return -EOPNOTSUPP;
+        }
+
         sndbuf[0] = wo ? DIBUSB_REQ_I2C_WRITE : DIBUSB_REQ_I2C_READ;
         sndbuf[1] = (addr << 1) | (wo ? 0 : 1);
 
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 6e237b6dd0a8..c1a63b2a6baa 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -30,6 +30,9 @@
 #include "stb6100_proc.h"
 #include "m88rs2000.h"
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 #ifndef USB_PID_DW2102
 #define USB_PID_DW2102 0x2102
 #endif
@@ -308,7 +311,14 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
         case 2: {
                 /* read */
                 /* first write first register number */
-                u8 ibuf[msg[1].len + 2], obuf[3];
+                u8 ibuf[MAX_XFER_SIZE], obuf[3];
+
+                if (2 + msg[1].len > sizeof(ibuf)) {
+                        warn("i2c rd: len=%d is too big!\n",
+                             msg[1].len);
+                        return -EOPNOTSUPP;
+                }
+
                 obuf[0] = msg[0].addr << 1;
                 obuf[1] = msg[0].len;
                 obuf[2] = msg[0].buf[0];
@@ -325,7 +335,14 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                 switch (msg[0].addr) {
                 case 0x68: {
                         /* write to register */
-                        u8 obuf[msg[0].len + 2];
+                        u8 obuf[MAX_XFER_SIZE];
+
+                        if (2 + msg[0].len > sizeof(obuf)) {
+                                warn("i2c wr: len=%d is too big!\n",
+                                     msg[1].len);
+                                return -EOPNOTSUPP;
+                        }
+
                         obuf[0] = msg[0].addr << 1;
                         obuf[1] = msg[0].len;
                         memcpy(obuf + 2, msg[0].buf, msg[0].len);
@@ -335,7 +352,14 @@ static int dw2102_earda_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg ms
                 }
                 case 0x61: {
                         /* write to tuner */
-                        u8 obuf[msg[0].len + 2];
+                        u8 obuf[MAX_XFER_SIZE];
+
+                        if (2 + msg[0].len > sizeof(obuf)) {
+                                warn("i2c wr: len=%d is too big!\n",
+                                     msg[1].len);
+                                return -EOPNOTSUPP;
+                        }
+
                         obuf[0] = msg[0].addr << 1;
                         obuf[1] = msg[0].len;
                         memcpy(obuf + 2, msg[0].buf, msg[0].len);
@@ -401,7 +425,14 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
                 default: {
                         if (msg[j].flags == I2C_M_RD) {
                                 /* read registers */
-                                u8  ibuf[msg[j].len + 2];
+                                u8  ibuf[MAX_XFER_SIZE];
+
+                                if (2 + msg[j].len > sizeof(ibuf)) {
+                                        warn("i2c rd: len=%d is too big!\n",
+                                             msg[j].len);
+                                        return -EOPNOTSUPP;
+                                }
+
                                 dw210x_op_rw(d->udev, 0xc3,
                                                 (msg[j].addr << 1) + 1, 0,
                                                 ibuf, msg[j].len + 2,
@@ -430,7 +461,14 @@ static int dw2104_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], i
                                 } while (len > 0);
                         } else {
                                 /* write registers */
-                                u8 obuf[msg[j].len + 2];
+                                u8 obuf[MAX_XFER_SIZE];
+
+                                if (2 + msg[j].len > sizeof(obuf)) {
+                                        warn("i2c wr: len=%d is too big!\n",
+                                             msg[j].len);
+                                        return -EOPNOTSUPP;
+                                }
+
                                 obuf[0] = msg[j].addr << 1;
                                 obuf[1] = msg[j].len;
                                 memcpy(obuf + 2, msg[j].buf, msg[j].len);
@@ -463,7 +501,13 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
         case 2: {
                 /* read */
                 /* first write first register number */
-                u8 ibuf[msg[1].len + 2], obuf[3];
+                u8 ibuf[MAX_XFER_SIZE], obuf[3];
+
+                if (2 + msg[1].len > sizeof(ibuf)) {
+                        warn("i2c rd: len=%d is too big!\n",
+                             msg[1].len);
+                        return -EOPNOTSUPP;
+                }
                 obuf[0] = msg[0].addr << 1;
                 obuf[1] = msg[0].len;
                 obuf[2] = msg[0].buf[0];
@@ -481,7 +525,13 @@ static int dw3101_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 case 0x60:
                 case 0x0c: {
                         /* write to register */
-                        u8 obuf[msg[0].len + 2];
+                        u8 obuf[MAX_XFER_SIZE];
+
+                        if (2 + msg[0].len > sizeof(obuf)) {
+                                warn("i2c wr: len=%d is too big!\n",
+                                     msg[0].len);
+                                return -EOPNOTSUPP;
+                        }
                         obuf[0] = msg[0].addr << 1;
                         obuf[1] = msg[0].len;
                         memcpy(obuf + 2, msg[0].buf, msg[0].len);
@@ -563,7 +613,14 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 default: {
                         if (msg[j].flags == I2C_M_RD) {
                                 /* read registers */
-                                u8 ibuf[msg[j].len];
+                                u8 ibuf[MAX_XFER_SIZE];
+
+                                if (msg[j].len > sizeof(ibuf)) {
+                                        warn("i2c rd: len=%d is too big!\n",
+                                             msg[j].len);
+                                        return -EOPNOTSUPP;
+                                }
+
                                 dw210x_op_rw(d->udev, 0x91, 0, 0,
                                                 ibuf, msg[j].len,
                                                 DW210X_READ_MSG);
@@ -590,7 +647,14 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                                 } while (len > 0);
                         } else if (j < (num - 1)) {
                                 /* write register addr before read */
-                                u8 obuf[msg[j].len + 2];
+                                u8 obuf[MAX_XFER_SIZE];
+
+                                if (2 + msg[j].len > sizeof(obuf)) {
+                                        warn("i2c wr: len=%d is too big!\n",
+                                             msg[j].len);
+                                        return -EOPNOTSUPP;
+                                }
+
                                 obuf[0] = msg[j + 1].len;
                                 obuf[1] = (msg[j].addr << 1);
                                 memcpy(obuf + 2, msg[j].buf, msg[j].len);
@@ -602,7 +666,13 @@ static int s6x0_i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                                 break;
                         } else {
                                 /* write registers */
-                                u8 obuf[msg[j].len + 2];
+                                u8 obuf[MAX_XFER_SIZE];
+
+                                if (2 + msg[j].len > sizeof(obuf)) {
+                                        warn("i2c wr: len=%d is too big!\n",
+                                             msg[j].len);
+                                        return -EOPNOTSUPP;
+                                }
                                 obuf[0] = msg[j].len + 1;
                                 obuf[1] = (msg[j].addr << 1);
                                 memcpy(obuf + 2, msg[j].buf, msg[j].len);
@@ -955,9 +1025,10 @@ static struct ds3000_config dw2104_ds3000_config = {
         .demod_address = 0x68,
 };
 
-static struct ts2020_config dw2104_ts2020_config  = {
+static struct ts2020_config dw2104_ts2020_config = {
         .tuner_address = 0x60,
         .clk_out_div = 1,
+        .frequency_div = 1060000,
 };
 
 static struct ds3000_config s660_ds3000_config = {
@@ -966,6 +1037,12 @@ static struct ds3000_config s660_ds3000_config = {
         .set_lock_led = dw210x_led_ctrl,
 };
 
+static struct ts2020_config s660_ts2020_config = {
+        .tuner_address = 0x60,
+        .clk_out_div = 1,
+        .frequency_div = 1146000,
+};
+
 static struct stv0900_config dw2104a_stv0900_config = {
         .demod_address = 0x6a,
         .demod_mode = 0,
@@ -1205,7 +1282,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d)
         if (d->fe_adap[0].fe == NULL)
                 return -EIO;
 
-        dvb_attach(ts2020_attach, d->fe_adap[0].fe, &dw2104_ts2020_config,
+        dvb_attach(ts2020_attach, d->fe_adap[0].fe, &s660_ts2020_config,
                 &d->dev->i2c_adap);
 
         st->old_set_voltage = d->fe_adap[0].fe->ops.set_voltage;
@@ -1213,7 +1290,7 @@ static int ds3000_frontend_attach(struct dvb_usb_adapter *d)
 
         dw210x_op_rw(d->dev->udev, 0x8a, 0, 0, obuf, 2, DW210X_WRITE_MSG);
 
-        info("Attached ds3000+ds2020!\n");
+        info("Attached ds3000+ts2020!\n");
 
         return 0;
 }
diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c
index 73cc50afa5e1..d666741797d4 100644
--- a/drivers/media/usb/em28xx/em28xx-camera.c
+++ b/drivers/media/usb/em28xx/em28xx-camera.c
@@ -22,6 +22,7 @@
 #include <linux/i2c.h>
 #include <media/soc_camera.h>
 #include <media/mt9v011.h>
+#include <media/v4l2-clk.h>
 #include <media/v4l2-common.h>
 
 #include "em28xx.h"
@@ -47,6 +48,7 @@ static struct soc_camera_link camlink = {
         .bus_id = 0,
         .flags = 0,
         .module_name = "em28xx",
+        .unbalanced_power = true,
 };
 
 
@@ -325,13 +327,24 @@ int em28xx_detect_sensor(struct em28xx *dev)
 
 int em28xx_init_camera(struct em28xx *dev)
 {
+        char clk_name[V4L2_SUBDEV_NAME_SIZE];
+        struct i2c_client *client = &dev->i2c_client[dev->def_i2c_bus];
+        struct i2c_adapter *adap = &dev->i2c_adap[dev->def_i2c_bus];
+        int ret = 0;
+
+        v4l2_clk_name_i2c(clk_name, sizeof(clk_name),
+                          i2c_adapter_id(adap), client->addr);
+        dev->clk = v4l2_clk_register_fixed(clk_name, "mclk", -EINVAL);
+        if (IS_ERR(dev->clk))
+                return PTR_ERR(dev->clk);
+
         switch (dev->em28xx_sensor) {
         case EM28XX_MT9V011:
         {
                 struct mt9v011_platform_data pdata;
                 struct i2c_board_info mt9v011_info = {
                         .type = "mt9v011",
-                        .addr = dev->i2c_client[dev->def_i2c_bus].addr,
+                        .addr = client->addr,
                         .platform_data = &pdata,
                 };
 
@@ -352,10 +365,11 @@ int em28xx_init_camera(struct em28xx *dev)
                 dev->sensor_xtal = 4300000;
                 pdata.xtal = dev->sensor_xtal;
                 if (NULL ==
-                    v4l2_i2c_new_subdev_board(&dev->v4l2_dev,
-                                              &dev->i2c_adap[dev->def_i2c_bus],
-                                              &mt9v011_info, NULL))
-                        return -ENODEV;
+                    v4l2_i2c_new_subdev_board(&dev->v4l2_dev, adap,
+                                              &mt9v011_info, NULL)) {
+                        ret = -ENODEV;
+                        break;
+                }
                 /* probably means GRGB 16 bit bayer */
                 dev->vinmode = 0x0d;
                 dev->vinctl = 0x00;
@@ -391,7 +405,7 @@ int em28xx_init_camera(struct em28xx *dev)
                 struct i2c_board_info ov2640_info = {
                         .type = "ov2640",
                         .flags = I2C_CLIENT_SCCB,
-                        .addr = dev->i2c_client[dev->def_i2c_bus].addr,
+                        .addr = client->addr,
                         .platform_data = &camlink,
                 };
                 struct v4l2_mbus_framefmt fmt;
@@ -408,9 +422,12 @@ int em28xx_init_camera(struct em28xx *dev)
                 dev->sensor_yres = 480;
 
                 subdev =
-                     v4l2_i2c_new_subdev_board(&dev->v4l2_dev,
-                                               &dev->i2c_adap[dev->def_i2c_bus],
+                     v4l2_i2c_new_subdev_board(&dev->v4l2_dev, adap,
                                                &ov2640_info, NULL);
+                if (NULL == subdev) {
+                        ret = -ENODEV;
+                        break;
+                }
 
                 fmt.code = V4L2_MBUS_FMT_YUYV8_2X8;
                 fmt.width = 640;
@@ -427,8 +444,13 @@ int em28xx_init_camera(struct em28xx *dev)
         }
         case EM28XX_NOSENSOR:
         default:
-                return -EINVAL;
+                ret = -EINVAL;
         }
 
-        return 0;
+        if (ret < 0) {
+                v4l2_clk_unregister_fixed(dev->clk);
+                dev->clk = NULL;
+        }
+
+        return ret;
 }
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index dc65742c4bbc..a5196697627f 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -36,6 +36,7 @@
 #include <media/tvaudio.h>
 #include <media/i2c-addr.h>
 #include <media/tveeprom.h>
+#include <media/v4l2-clk.h>
 #include <media/v4l2-common.h>
 
 #include "em28xx.h"
@@ -95,8 +96,8 @@ static struct em28xx_reg_seq default_digital[] = {
 /* Board Hauppauge WinTV HVR 900 analog */
 static struct em28xx_reg_seq hauppauge_wintv_hvr_900_analog[] = {
         {EM2820_R08_GPIO_CTRL,  0x2d,   ~EM_GPIO_4,     10},
-        {0x05,                  0xff,   0x10,           10},
-        {  -1,                  -1,     -1,             -1},
+        {       0x05,           0xff,   0x10,           10},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Board Hauppauge WinTV HVR 900 digital */
@@ -104,20 +105,20 @@ static struct em28xx_reg_seq hauppauge_wintv_hvr_900_digital[] = {
         {EM2820_R08_GPIO_CTRL,  0x2e,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x04,   0x0f,           10},
         {EM2880_R04_GPO,        0x0c,   0x0f,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Board Hauppauge WinTV HVR 900 (R2) digital */
 static struct em28xx_reg_seq hauppauge_wintv_hvr_900R2_digital[] = {
         {EM2820_R08_GPIO_CTRL,  0x2e,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x0c,   0x0f,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Boards - EM2880 MSI DIGIVOX AD and EM2880_BOARD_MSI_DIGIVOX_AD_II */
 static struct em28xx_reg_seq em2880_msi_digivox_ad_analog[] = {
-        {EM2820_R08_GPIO_CTRL,       0x69,   ~EM_GPIO_4,         10},
-        {       -1,             -1,     -1,              -1},
+        {EM2820_R08_GPIO_CTRL,  0x69,   ~EM_GPIO_4,     10},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Boards - EM2880 MSI DIGIVOX AD and EM2880_BOARD_MSI_DIGIVOX_AD_II */
@@ -132,7 +133,7 @@ static struct em28xx_reg_seq em2882_kworld_315u_digital[] = {
         {EM2880_R04_GPO,        0x04,   0xff,           10},
         {EM2880_R04_GPO,        0x0c,   0xff,           10},
         {EM2820_R08_GPIO_CTRL,  0x7e,   0xff,           10},
-        {  -1,                  -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 static struct em28xx_reg_seq em2882_kworld_315u_tuner_gpio[] = {
@@ -140,19 +141,19 @@ static struct em28xx_reg_seq em2882_kworld_315u_tuner_gpio[] = {
         {EM2880_R04_GPO,        0x0c,   0xff,           10},
         {EM2880_R04_GPO,        0x08,   0xff,           10},
         {EM2880_R04_GPO,        0x0c,   0xff,           10},
-        {  -1,                  -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 static struct em28xx_reg_seq kworld_330u_analog[] = {
         {EM2820_R08_GPIO_CTRL,  0x6d,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x00,   0xff,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 static struct em28xx_reg_seq kworld_330u_digital[] = {
         {EM2820_R08_GPIO_CTRL,  0x6e,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x08,   0xff,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Evga inDtube
@@ -170,11 +171,11 @@ static struct em28xx_reg_seq evga_indtube_digital[] = {
         {EM2820_R08_GPIO_CTRL,  0x7a,   0xff,            1},
         {EM2880_R04_GPO,        0x04,   0xff,           10},
         {EM2880_R04_GPO,        0x0c,   0xff,            1},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 /*
- * KWorld PlusTV 340U and UB435-Q (ATSC) GPIOs map:
+ * KWorld PlusTV 340U, UB435-Q and UB435-Q V2 (ATSC) GPIOs map:
  * EM_GPIO_0 - currently unknown
  * EM_GPIO_1 - LED disable/enable (1 = off, 0 = on)
  * EM_GPIO_2 - currently unknown
@@ -185,8 +186,8 @@ static struct em28xx_reg_seq evga_indtube_digital[] = {
  * EM_GPIO_7 - currently unknown
  */
 static struct em28xx_reg_seq kworld_a340_digital[] = {
-        {EM2820_R08_GPIO_CTRL,  0x6d,           ~EM_GPIO_4,     10},
-        { -1,                   -1,             -1,             -1},
+        {EM2820_R08_GPIO_CTRL,  0x6d,   ~EM_GPIO_4,     10},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Pinnacle Hybrid Pro eb1a:2881 */
@@ -205,13 +206,13 @@ static struct em28xx_reg_seq pinnacle_hybrid_pro_digital[] = {
 static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_analog[] = {
         {EM2820_R08_GPIO_CTRL,  0x6d,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x00,   0xff,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 static struct em28xx_reg_seq terratec_cinergy_USB_XS_FR_digital[] = {
         {EM2820_R08_GPIO_CTRL,  0x6e,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x08,   0xff,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* eb1a:2868 Reddo DVB-C USB TV Box
@@ -225,7 +226,7 @@ static struct em28xx_reg_seq reddo_dvb_c_usb_box[] = {
         {EM2820_R08_GPIO_CTRL,  0x7f,   0xff,           10},
         {EM2820_R08_GPIO_CTRL,  0x6f,   0xff,           10},
         {EM2820_R08_GPIO_CTRL,  0xff,   0xff,           10},
-        {-1,                    -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 /* Callback for the most boards */
@@ -233,23 +234,23 @@ static struct em28xx_reg_seq default_tuner_gpio[] = {
         {EM2820_R08_GPIO_CTRL,  EM_GPIO_4,      EM_GPIO_4,      10},
         {EM2820_R08_GPIO_CTRL,  0,              EM_GPIO_4,      10},
         {EM2820_R08_GPIO_CTRL,  EM_GPIO_4,      EM_GPIO_4,      10},
-        {  -1,                  -1,             -1,             -1},
+        {       -1,             -1,             -1,             -1},
 };
 
 /* Mute/unmute */
 static struct em28xx_reg_seq compro_unmute_tv_gpio[] = {
-        {EM2820_R08_GPIO_CTRL,  5,              7,              10},
-        {  -1,                  -1,             -1,             -1},
+        {EM2820_R08_GPIO_CTRL,  5,      7,      10},
+        {       -1,             -1,     -1,     -1},
 };
 
 static struct em28xx_reg_seq compro_unmute_svid_gpio[] = {
-        {EM2820_R08_GPIO_CTRL,  4,              7,              10},
-        {  -1,                  -1,             -1,             -1},
+        {EM2820_R08_GPIO_CTRL,  4,      7,      10},
+        {       -1,             -1,     -1,     -1},
 };
 
 static struct em28xx_reg_seq compro_mute_gpio[] = {
-        {EM2820_R08_GPIO_CTRL,  6,              7,              10},
-        {  -1,                  -1,             -1,             -1},
+        {EM2820_R08_GPIO_CTRL,  6,      7,      10},
+        {       -1,             -1,     -1,     -1},
 };
 
 /* Terratec AV350 */
@@ -279,21 +280,21 @@ static struct em28xx_reg_seq vc211a_enable[] = {
 static struct em28xx_reg_seq dikom_dk300_digital[] = {
         {EM2820_R08_GPIO_CTRL,  0x6e,   ~EM_GPIO_4,     10},
         {EM2880_R04_GPO,        0x08,   0xff,           10},
-        { -1,                   -1,     -1,             -1},
+        {       -1,             -1,     -1,             -1},
 };
 
 
 /* Reset for the most [digital] boards */
 static struct em28xx_reg_seq leadership_digital[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0x70,   0xff,   10},
-        {       -1,             -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 
 static struct em28xx_reg_seq leadership_reset[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0xf0,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0xb0,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0xf0,   0xff,   10},
-        {       -1,             -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 
 /* 2013:024f PCTV nanoStick T2 290e
@@ -304,7 +305,7 @@ static struct em28xx_reg_seq pctv_290e[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0x00,   0xff,   80},
         {EM2874_R80_GPIO_P0_CTRL,       0x40,   0xff,   80}, /* GPIO_6 = 1 */
         {EM2874_R80_GPIO_P0_CTRL,       0xc0,   0xff,   80}, /* GPIO_7 = 1 */
-        {-1,                    -1,     -1,             -1},
+        {       -1,                     -1,     -1,     -1},
 };
 
 #if 0
@@ -313,14 +314,14 @@ static struct em28xx_reg_seq terratec_h5_gpio[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   100},
         {EM2874_R80_GPIO_P0_CTRL,       0xf2,   0xff,   50},
         {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   50},
-        { -1,                   -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 
 static struct em28xx_reg_seq terratec_h5_digital[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0xe6,   0xff,   100},
         {EM2874_R80_GPIO_P0_CTRL,       0xa6,   0xff,   10},
-        { -1,                   -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 #endif
 
@@ -335,12 +336,12 @@ static struct em28xx_reg_seq terratec_h5_digital[] = {
  * GPIO_7 - LED (green LED)
  */
 static struct em28xx_reg_seq pctv_460e[] = {
-        {EM2874_R80_GPIO_P0_CTRL, 0x01, 0xff,  50},
-        {0x0d,            0xff, 0xff,  50},
-        {EM2874_R80_GPIO_P0_CTRL, 0x41, 0xff,  50}, /* GPIO_6=1 */
-        {0x0d,            0x42, 0xff,  50},
-        {EM2874_R80_GPIO_P0_CTRL, 0x61, 0xff,  50}, /* GPIO_5=1 */
-        {             -1,   -1,   -1,  -1},
+        {EM2874_R80_GPIO_P0_CTRL,       0x01,   0xff,   50},
+        {       0x0d,                   0xff,   0xff,   50},
+        {EM2874_R80_GPIO_P0_CTRL,       0x41,   0xff,   50}, /* GPIO_6=1 */
+        {       0x0d,                   0x42,   0xff,   50},
+        {EM2874_R80_GPIO_P0_CTRL,       0x61,   0xff,   50}, /* GPIO_5=1 */
+        {       -1,                     -1,     -1,     -1},
 };
 
 static struct em28xx_reg_seq c3tech_digital_duo_digital[] = {
@@ -352,7 +353,7 @@ static struct em28xx_reg_seq c3tech_digital_duo_digital[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0xfe,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0xbe,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0xfe,   0xff,   20},
-        { -1,                   -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 
 #if 0
@@ -361,14 +362,14 @@ static struct em28xx_reg_seq hauppauge_930c_gpio[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0x4f,   0xff,   10}, /* xc5000 reset */
         {EM2874_R80_GPIO_P0_CTRL,       0x6f,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0x4f,   0xff,   10},
-        { -1,                   -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 
 static struct em28xx_reg_seq hauppauge_930c_digital[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   10},
         {EM2874_R80_GPIO_P0_CTRL,       0xe6,   0xff,   100},
         {EM2874_R80_GPIO_P0_CTRL,       0xa6,   0xff,   10},
-        { -1,                   -1,     -1,     -1},
+        {       -1,                     -1,     -1,     -1},
 };
 #endif
 
@@ -378,10 +379,10 @@ static struct em28xx_reg_seq hauppauge_930c_digital[] = {
  * GPIO_7 - LED, 0=active
  */
 static struct em28xx_reg_seq maxmedia_ub425_tc[] = {
-        {EM2874_R80_GPIO_P0_CTRL,  0x83,  0xff,  100},
-        {EM2874_R80_GPIO_P0_CTRL,  0xc3,  0xff,  100}, /* GPIO_6 = 1 */
-        {EM2874_R80_GPIO_P0_CTRL,  0x43,  0xff,  000}, /* GPIO_7 = 0 */
-        {-1,                 -1,    -1,   -1},
+        {EM2874_R80_GPIO_P0_CTRL,       0x83,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0xc3,   0xff,   100}, /* GPIO_6 = 1 */
+        {EM2874_R80_GPIO_P0_CTRL,       0x43,   0xff,   000}, /* GPIO_7 = 0 */
+        {       -1,                     -1,     -1,     -1},
 };
 
 /* 2304:0242 PCTV QuatroStick (510e)
@@ -391,10 +392,10 @@ static struct em28xx_reg_seq maxmedia_ub425_tc[] = {
  * GPIO_7: LED, 1=active
  */
 static struct em28xx_reg_seq pctv_510e[] = {
-        {EM2874_R80_GPIO_P0_CTRL, 0x10, 0xff, 100},
-        {EM2874_R80_GPIO_P0_CTRL, 0x14, 0xff, 100}, /* GPIO_2 = 1 */
-        {EM2874_R80_GPIO_P0_CTRL, 0x54, 0xff, 050}, /* GPIO_6 = 1 */
-        {             -1,   -1,   -1,  -1},
+        {EM2874_R80_GPIO_P0_CTRL,       0x10,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0x14,   0xff,   100}, /* GPIO_2 = 1 */
+        {EM2874_R80_GPIO_P0_CTRL,       0x54,   0xff,   050}, /* GPIO_6 = 1 */
+        {       -1,                     -1,     -1,     -1},
 };
 
 /* 2013:0251 PCTV QuatroStick nano (520e)
@@ -404,11 +405,11 @@ static struct em28xx_reg_seq pctv_510e[] = {
  * GPIO_7: LED, 1=active
  */
 static struct em28xx_reg_seq pctv_520e[] = {
-        {EM2874_R80_GPIO_P0_CTRL, 0x10, 0xff, 100},
-        {EM2874_R80_GPIO_P0_CTRL, 0x14, 0xff, 100}, /* GPIO_2 = 1 */
-        {EM2874_R80_GPIO_P0_CTRL, 0x54, 0xff, 050}, /* GPIO_6 = 1 */
-        {EM2874_R80_GPIO_P0_CTRL, 0xd4, 0xff, 000}, /* GPIO_7 = 1 */
-        {             -1,   -1,   -1,  -1},
+        {EM2874_R80_GPIO_P0_CTRL,       0x10,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0x14,   0xff,   100}, /* GPIO_2 = 1 */
+        {EM2874_R80_GPIO_P0_CTRL,       0x54,   0xff,   050}, /* GPIO_6 = 1 */
+        {EM2874_R80_GPIO_P0_CTRL,       0xd4,   0xff,   000}, /* GPIO_7 = 1 */
+        {       -1,                     -1,     -1,     -1},
 };
 
 /*
@@ -2030,6 +2031,18 @@ struct em28xx_board em28xx_boards[] = {
                 .i2c_speed     = EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_400_KHZ,
         },
+        /*
+         * 1b80:e346 KWorld USB ATSC TV Stick UB435-Q V2
+         * Empia EM2874B + LG DT3305 + NXP TDA18271HDC2
+         */
+        [EM2874_BOARD_KWORLD_UB435Q_V2] = {
+                .name           = "KWorld USB ATSC TV Stick UB435-Q V2",
+                .tuner_type     = TUNER_ABSENT,
+                .has_dvb        = 1,
+                .dvb_gpio       = kworld_a340_digital,
+                .tuner_gpio     = default_tuner_gpio,
+                .def_i2c_bus    = 1,
+        },
 };
 const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards);
 
@@ -2173,6 +2186,8 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM2860_BOARD_GADMEI_UTV330 },
         { USB_DEVICE(0x1b80, 0xa340),
                         .driver_info = EM2870_BOARD_KWORLD_A340 },
+        { USB_DEVICE(0x1b80, 0xe346),
+                        .driver_info = EM2874_BOARD_KWORLD_UB435Q_V2 },
         { USB_DEVICE(0x2013, 0x024f),
                         .driver_info = EM28174_BOARD_PCTV_290E },
         { USB_DEVICE(0x2013, 0x024c),
@@ -2857,6 +2872,8 @@ void em28xx_release_resources(struct em28xx *dev)
         if (dev->def_i2c_bus)
                 em28xx_i2c_unregister(dev, 1);
         em28xx_i2c_unregister(dev, 0);
+        if (dev->clk)
+                v4l2_clk_unregister_fixed(dev->clk);
 
         v4l2_ctrl_handler_free(&dev->ctrl_handler);
 
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index bb1e8dca80cd..344042bb845c 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -298,6 +298,18 @@ static struct lgdt3305_config em2870_lgdt3304_dev = {
         .qam_if_khz         = 4000,
 };
 
+static struct lgdt3305_config em2874_lgdt3305_dev = {
+        .i2c_addr           = 0x0e,
+        .demod_chip         = LGDT3305,
+        .spectral_inversion = 1,
+        .deny_i2c_rptr      = 0,
+        .mpeg_mode          = LGDT3305_MPEG_SERIAL,
+        .tpclk_edge         = LGDT3305_TPCLK_FALLING_EDGE,
+        .tpvalid_polarity   = LGDT3305_TP_VALID_HIGH,
+        .vsb_if_khz         = 3250,
+        .qam_if_khz         = 4000,
+};
+
 static struct s921_config sharp_isdbt = {
         .demod_address = 0x30 >> 1
 };
@@ -329,6 +341,11 @@ static struct tda18271_config kworld_a340_config = {
         .std_map           = &kworld_a340_std_map,
 };
 
+static struct tda18271_config kworld_ub435q_v2_config = {
+        .std_map        = &kworld_a340_std_map,
+        .gate           = TDA18271_GATE_DIGITAL,
+};
+
 static struct zl10353_config em28xx_zl10353_xc3028_no_i2c_gate = {
         .demod_address = (0x1e >> 1),
         .no_tuner = 1,
@@ -384,7 +401,10 @@ static struct drxk_config maxmedia_ub425_tc_drxk = {
         .adr = 0x29,
         .single_master = 1,
         .no_i2c_bridge = 1,
+        .microcode_name = "dvb-demod-drxk-01.fw",
+        .chunk_size = 62,
         .load_firmware_sync = true,
+        .qam_demod_parameter_count = 2,
 };
 
 static struct drxk_config pctv_520e_drxk = {
@@ -424,7 +444,7 @@ static void hauppauge_hvr930c_init(struct em28xx *dev)
                 {EM2874_R80_GPIO_P0_CTRL,       0xff,   0xff,   0x65},
                 {EM2874_R80_GPIO_P0_CTRL,       0xfb,   0xff,   0x32},
                 {EM2874_R80_GPIO_P0_CTRL,       0xff,   0xff,   0xb8},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
         struct em28xx_reg_seq hauppauge_hvr930c_end[] = {
                 {EM2874_R80_GPIO_P0_CTRL,       0xef,   0xff,   0x01},
@@ -439,7 +459,7 @@ static void hauppauge_hvr930c_init(struct em28xx *dev)
                 {EM2874_R80_GPIO_P0_CTRL,       0xcf,   0xff,   0x0b},
                 {EM2874_R80_GPIO_P0_CTRL,       0xef,   0xff,   0x65},
 
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
 
         struct {
@@ -491,13 +511,13 @@ static void terratec_h5_init(struct em28xx *dev)
                 {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   100},
                 {EM2874_R80_GPIO_P0_CTRL,       0xf2,   0xff,   50},
                 {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   100},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
         struct em28xx_reg_seq terratec_h5_end[] = {
                 {EM2874_R80_GPIO_P0_CTRL,       0xe6,   0xff,   100},
                 {EM2874_R80_GPIO_P0_CTRL,       0xa6,   0xff,   50},
                 {EM2874_R80_GPIO_P0_CTRL,       0xe6,   0xff,   100},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
         struct {
                 unsigned char r[4];
@@ -547,12 +567,12 @@ static void terratec_htc_stick_init(struct em28xx *dev)
                 {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   100},
                 {EM2874_R80_GPIO_P0_CTRL,       0xe6,   0xff,   50},
                 {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   100},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
         struct em28xx_reg_seq terratec_htc_stick_end[] = {
                 {EM2874_R80_GPIO_P0_CTRL,       0xb6,   0xff,   100},
                 {EM2874_R80_GPIO_P0_CTRL,       0xf6,   0xff,   50},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
 
         /*
@@ -594,13 +614,13 @@ static void terratec_htc_usb_xs_init(struct em28xx *dev)
                 {EM2874_R80_GPIO_P0_CTRL,       0xb2,   0xff,   100},
                 {EM2874_R80_GPIO_P0_CTRL,       0xb2,   0xff,   50},
                 {EM2874_R80_GPIO_P0_CTRL,       0xb6,   0xff,   100},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
         struct em28xx_reg_seq terratec_htc_usb_xs_end[] = {
                 {EM2874_R80_GPIO_P0_CTRL,       0xa6,   0xff,   100},
                 {EM2874_R80_GPIO_P0_CTRL,       0xa6,   0xff,   50},
                 {EM2874_R80_GPIO_P0_CTRL,       0xe6,   0xff,   100},
-                { -1,                   -1,     -1,     -1},
+                {       -1,                     -1,     -1,     -1},
         };
 
         /*
@@ -1227,18 +1247,14 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         dvb->fe[0]->ops.i2c_gate_ctrl = NULL;
 
                         /* attach tuner */
-                        if (!dvb_attach(tda18271c2dd_attach, dvb->fe[0],
-                                        &dev->i2c_adap[dev->def_i2c_bus], 0x60)) {
+                        if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
+                                        &dev->i2c_adap[dev->def_i2c_bus],
+                                        &em28xx_cxd2820r_tda18271_config)) {
                                 dvb_frontend_detach(dvb->fe[0]);
                                 result = -EINVAL;
                                 goto out_free;
                         }
                 }
-
-                /* TODO: we need drx-3913k firmware in order to support DVB-T */
-                em28xx_info("MaxMedia UB425-TC/Delock 61959: only DVB-C " \
-                                "supported by that driver version\n");
-
                 break;
         case EM2884_BOARD_PCTV_510E:
         case EM2884_BOARD_PCTV_520E:
@@ -1297,6 +1313,23 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         goto out_free;
                 }
                 break;
+        case EM2874_BOARD_KWORLD_UB435Q_V2:
+                dvb->fe[0] = dvb_attach(lgdt3305_attach,
+                                        &em2874_lgdt3305_dev,
+                                        &dev->i2c_adap[dev->def_i2c_bus]);
+                if (!dvb->fe[0]) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+
+                /* Attach the demodulator. */
+                if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
+                                &dev->i2c_adap[dev->def_i2c_bus],
+                                &kworld_ub435q_v2_config)) {
+                        result = -EINVAL;
+                        goto out_free;
+                }
+                break;
         default:
                 em28xx_errdev("/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n");
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 9d103344f34a..fc5d60efd4ab 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -638,7 +638,7 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
         if (rc)
                 return rc;
 
-        if (dev->streaming_users++ == 0) {
+        if (dev->streaming_users == 0) {
                 /* First active streaming user, so allocate all the URBs */
 
                 /* Allocate the USB bandwidth */
@@ -657,7 +657,7 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
                                           dev->packet_multiplier,
                                           em28xx_urb_data_copy);
                 if (rc < 0)
-                        goto fail;
+                        return rc;
 
                 /*
                  * djh: it's not clear whether this code is still needed.  I'm
@@ -675,7 +675,8 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
                 v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, s_frequency, &f);
         }
 
-fail:
+        dev->streaming_users++;
+
         return rc;
 }
 
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 205e9038b1c0..f8726ad5d0a8 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -131,6 +131,7 @@
 #define EM2884_BOARD_TERRATEC_HTC_USB_XS          87
 #define EM2884_BOARD_C3TECH_DIGITAL_DUO           88
 #define EM2874_BOARD_DELOCK_61959                 89
+#define EM2874_BOARD_KWORLD_UB435Q_V2             90
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
@@ -492,6 +493,7 @@ struct em28xx {
 
         struct v4l2_device v4l2_dev;
         struct v4l2_ctrl_handler ctrl_handler;
+        struct v4l2_clk *clk;
         struct em28xx_board board;
 
         /* Webcam specific fields */
diff --git a/drivers/media/usb/gspca/conex.c b/drivers/media/usb/gspca/conex.c
index 38714df31ac4..2e15c80d6e3d 100644
--- a/drivers/media/usb/gspca/conex.c
+++ b/drivers/media/usb/gspca/conex.c
@@ -783,7 +783,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x22);          /* JPEG 411 */
         jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c
index 064b53043b15..f23df4a9d8c5 100644
--- a/drivers/media/usb/gspca/cpia1.c
+++ b/drivers/media/usb/gspca/cpia1.c
@@ -1553,9 +1553,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 sd->params.format.videoSize = VIDEOSIZE_CIF;
 
         sd->params.roi.colEnd = sd->params.roi.colStart +
-                                (gspca_dev->width >> 3);
+                                (gspca_dev->pixfmt.width >> 3);
         sd->params.roi.rowEnd = sd->params.roi.rowStart +
-                                (gspca_dev->height >> 2);
+                                (gspca_dev->pixfmt.height >> 2);
 
         /* And now set the camera to a known state */
         ret = do_command(gspca_dev, CPIA_COMMAND_SetGrabMode,
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index 048507b27bb2..f3a7ace0fac9 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -504,8 +504,7 @@ static int frame_alloc(struct gspca_dev *gspca_dev, struct file *file,
         unsigned int frsz;
         int i;
 
-        i = gspca_dev->curr_mode;
-        frsz = gspca_dev->cam.cam_mode[i].sizeimage;
+        frsz = gspca_dev->pixfmt.sizeimage;
         PDEBUG(D_STREAM, "frame alloc frsz: %d", frsz);
         frsz = PAGE_ALIGN(frsz);
         if (count >= GSPCA_MAX_FRAMES)
@@ -627,16 +626,14 @@ static struct usb_host_endpoint *alt_xfer(struct usb_host_interface *alt,
 static u32 which_bandwidth(struct gspca_dev *gspca_dev)
 {
         u32 bandwidth;
-        int i;
 
         /* get the (max) image size */
-        i = gspca_dev->curr_mode;
-        bandwidth = gspca_dev->cam.cam_mode[i].sizeimage;
+        bandwidth = gspca_dev->pixfmt.sizeimage;
 
         /* if the image is compressed, estimate its mean size */
         if (!gspca_dev->cam.needs_full_bandwidth &&
-            bandwidth < gspca_dev->cam.cam_mode[i].width *
-                                gspca_dev->cam.cam_mode[i].height)
+            bandwidth < gspca_dev->pixfmt.width *
+                                gspca_dev->pixfmt.height)
                 bandwidth = bandwidth * 3 / 8;  /* 0.375 */
 
         /* estimate the frame rate */
@@ -650,7 +647,7 @@ static u32 which_bandwidth(struct gspca_dev *gspca_dev)
 
                 /* don't hope more than 15 fps with USB 1.1 and
                  * image resolution >= 640x480 */
-                if (gspca_dev->width >= 640
+                if (gspca_dev->pixfmt.width >= 640
                  && gspca_dev->dev->speed == USB_SPEED_FULL)
                         bandwidth *= 15;                /* 15 fps */
                 else
@@ -982,9 +979,7 @@ static void gspca_set_default_mode(struct gspca_dev *gspca_dev)
 
         i = gspca_dev->cam.nmodes - 1;  /* take the highest mode */
         gspca_dev->curr_mode = i;
-        gspca_dev->width = gspca_dev->cam.cam_mode[i].width;
-        gspca_dev->height = gspca_dev->cam.cam_mode[i].height;
-        gspca_dev->pixfmt = gspca_dev->cam.cam_mode[i].pixelformat;
+        gspca_dev->pixfmt = gspca_dev->cam.cam_mode[i];
 
         /* does nothing if ctrl_handler == NULL */
         v4l2_ctrl_handler_setup(gspca_dev->vdev.ctrl_handler);
@@ -1105,10 +1100,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                             struct v4l2_format *fmt)
 {
         struct gspca_dev *gspca_dev = video_drvdata(file);
-        int mode;
 
-        mode = gspca_dev->curr_mode;
-        fmt->fmt.pix = gspca_dev->cam.cam_mode[mode];
+        fmt->fmt.pix = gspca_dev->pixfmt;
         /* some drivers use priv internally, zero it before giving it to
            userspace */
         fmt->fmt.pix.priv = 0;
@@ -1140,6 +1133,12 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,
                         mode = mode2;
         }
         fmt->fmt.pix = gspca_dev->cam.cam_mode[mode];
+        if (gspca_dev->sd_desc->try_fmt) {
+                /* pass original resolution to subdriver try_fmt */
+                fmt->fmt.pix.width = w;
+                fmt->fmt.pix.height = h;
+                gspca_dev->sd_desc->try_fmt(gspca_dev, fmt);
+        }
         /* some drivers use priv internally, zero it before giving it to
            userspace */
         fmt->fmt.pix.priv = 0;
@@ -1178,19 +1177,16 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                 goto out;
         }
 
-        if (ret == gspca_dev->curr_mode) {
-                ret = 0;
-                goto out;                       /* same mode */
-        }
-
         if (gspca_dev->streaming) {
                 ret = -EBUSY;
                 goto out;
         }
-        gspca_dev->width = fmt->fmt.pix.width;
-        gspca_dev->height = fmt->fmt.pix.height;
-        gspca_dev->pixfmt = fmt->fmt.pix.pixelformat;
         gspca_dev->curr_mode = ret;
+        if (gspca_dev->sd_desc->try_fmt)
+                /* subdriver try_fmt can modify format parameters */
+                gspca_dev->pixfmt = fmt->fmt.pix;
+        else
+                gspca_dev->pixfmt = gspca_dev->cam.cam_mode[ret];
 
         ret = 0;
 out:
@@ -1205,6 +1201,9 @@ static int vidioc_enum_framesizes(struct file *file, void *priv,
         int i;
         __u32 index = 0;
 
+        if (gspca_dev->sd_desc->enum_framesizes)
+                return gspca_dev->sd_desc->enum_framesizes(gspca_dev, fsize);
+
         for (i = 0; i < gspca_dev->cam.nmodes; i++) {
                 if (fsize->pixel_format !=
                                 gspca_dev->cam.cam_mode[i].pixelformat)
@@ -1471,8 +1470,9 @@ static int vidioc_streamon(struct file *file, void *priv,
                 if (ret < 0)
                         goto out;
         }
-        PDEBUG_MODE(gspca_dev, D_STREAM, "stream on OK", gspca_dev->pixfmt,
-                    gspca_dev->width, gspca_dev->height);
+        PDEBUG_MODE(gspca_dev, D_STREAM, "stream on OK",
+                    gspca_dev->pixfmt.pixelformat,
+                    gspca_dev->pixfmt.width, gspca_dev->pixfmt.height);
         ret = 0;
 out:
         mutex_unlock(&gspca_dev->queue_lock);
diff --git a/drivers/media/usb/gspca/gspca.h b/drivers/media/usb/gspca/gspca.h
index ac0b11f46f50..300642dc1a17 100644
--- a/drivers/media/usb/gspca/gspca.h
+++ b/drivers/media/usb/gspca/gspca.h
@@ -88,6 +88,10 @@ typedef void (*cam_pkt_op) (struct gspca_dev *gspca_dev,
 typedef int (*cam_int_pkt_op) (struct gspca_dev *gspca_dev,
                                 u8 *data,
                                 int len);
+typedef void (*cam_format_op) (struct gspca_dev *gspca_dev,
+                                struct v4l2_format *fmt);
+typedef int (*cam_frmsize_op) (struct gspca_dev *gspca_dev,
+                                struct v4l2_frmsizeenum *fsize);
 
 /* subdriver description */
 struct sd_desc {
@@ -109,6 +113,8 @@ struct sd_desc {
         cam_set_jpg_op set_jcomp;
         cam_streamparm_op get_streamparm;
         cam_streamparm_op set_streamparm;
+        cam_format_op try_fmt;
+        cam_frmsize_op enum_framesizes;
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         cam_set_reg_op set_register;
         cam_get_reg_op get_register;
@@ -183,9 +189,7 @@ struct gspca_dev {
         __u8 streaming;                 /* protected by both mutexes (*) */
 
         __u8 curr_mode;                 /* current camera mode */
-        __u32 pixfmt;                   /* current mode parameters */
-        __u16 width;
-        __u16 height;
+        struct v4l2_pix_format pixfmt;  /* current mode parameters */
         __u32 sequence;                 /* frame sequence number */
 
         wait_queue_head_t wq;           /* wait queue */
diff --git a/drivers/media/usb/gspca/jeilinj.c b/drivers/media/usb/gspca/jeilinj.c
index 8da3dde38385..19736e237b37 100644
--- a/drivers/media/usb/gspca/jeilinj.c
+++ b/drivers/media/usb/gspca/jeilinj.c
@@ -378,11 +378,12 @@ static int sd_start(struct gspca_dev *gspca_dev)
         struct sd *dev = (struct sd *) gspca_dev;
 
         /* create the JPEG header */
-        jpeg_define(dev->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(dev->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x21);          /* JPEG 422 */
         jpeg_set_qual(dev->jpeg_hdr, dev->quality);
         PDEBUG(D_STREAM, "Start streaming at %dx%d",
-                gspca_dev->height, gspca_dev->width);
+                gspca_dev->pixfmt.height, gspca_dev->pixfmt.width);
         jlj_start(gspca_dev);
         return gspca_dev->usb_err;
 }
diff --git a/drivers/media/usb/gspca/jl2005bcd.c b/drivers/media/usb/gspca/jl2005bcd.c
index fdaeeb14453f..5b481fa43099 100644
--- a/drivers/media/usb/gspca/jl2005bcd.c
+++ b/drivers/media/usb/gspca/jl2005bcd.c
@@ -455,7 +455,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
         sd->cap_mode = gspca_dev->cam.cam_mode;
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 640:
                 PDEBUG(D_STREAM, "Start streaming at vga resolution");
                 jl2005c_stream_start_vga_lg(gspca_dev);
diff --git a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c
index cfa4663f8934..27fcef11aef4 100644
--- a/drivers/media/usb/gspca/m5602/m5602_mt9m111.c
+++ b/drivers/media/usb/gspca/m5602/m5602_mt9m111.c
@@ -266,7 +266,7 @@ static int mt9m111_set_hvflip(struct gspca_dev *gspca_dev)
                 return err;
 
         data[0] = MT9M111_RMB_OVER_SIZED;
-        if (gspca_dev->width == 640) {
+        if (gspca_dev->pixfmt.width == 640) {
                 data[1] = MT9M111_RMB_ROW_SKIP_2X |
                           MT9M111_RMB_COLUMN_SKIP_2X |
                           (hflip << 1) | vflip;
diff --git a/drivers/media/usb/gspca/mars.c b/drivers/media/usb/gspca/mars.c
index ff2c5abf115b..779a8785f421 100644
--- a/drivers/media/usb/gspca/mars.c
+++ b/drivers/media/usb/gspca/mars.c
@@ -254,7 +254,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         int i;
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x21);          /* JPEG 422 */
         jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
@@ -270,8 +271,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         data[0] = 0x00;         /* address */
         data[1] = 0x0c | 0x01;  /* reg 0 */
         data[2] = 0x01;         /* reg 1 */
-        data[3] = gspca_dev->width / 8;         /* h_size , reg 2 */
-        data[4] = gspca_dev->height / 8;        /* v_size , reg 3 */
+        data[3] = gspca_dev->pixfmt.width / 8;  /* h_size , reg 2 */
+        data[4] = gspca_dev->pixfmt.height / 8; /* v_size , reg 3 */
         data[5] = 0x30;         /* reg 4, MI, PAS5101 :
                                  *      0x30 for 24mhz , 0x28 for 12mhz */
         data[6] = 0x02;         /* reg 5, H start - was 0x04 */
diff --git a/drivers/media/usb/gspca/mr97310a.c b/drivers/media/usb/gspca/mr97310a.c
index 68bb2f359666..f006e29ca019 100644
--- a/drivers/media/usb/gspca/mr97310a.c
+++ b/drivers/media/usb/gspca/mr97310a.c
@@ -521,7 +521,7 @@ static int start_cif_cam(struct gspca_dev *gspca_dev)
         if (sd->sensor_type)
                 data[5] = 0xbb;
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160:
                 data[9] |= 0x04;  /* reg 8, 2:1 scale down from 320 */
                 /* fall thru */
@@ -618,7 +618,7 @@ static int start_vga_cam(struct gspca_dev *gspca_dev)
                 data[10] = 0x18;
         }
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160:
                 data[9] |= 0x0c;  /* reg 8, 4:1 scale down */
                 /* fall thru */
@@ -847,7 +847,7 @@ static void setexposure(struct gspca_dev *gspca_dev, s32 expo, s32 min_clockdiv)
                 u8 clockdiv = (60 * expo + 7999) / 8000;
 
                 /* Limit framerate to not exceed usb bandwidth */
-                if (clockdiv < min_clockdiv && gspca_dev->width >= 320)
+                if (clockdiv < min_clockdiv && gspca_dev->pixfmt.width >= 320)
                         clockdiv = min_clockdiv;
                 else if (clockdiv < 2)
                         clockdiv = 2;
diff --git a/drivers/media/usb/gspca/nw80x.c b/drivers/media/usb/gspca/nw80x.c
index 44c9964b1b3e..599f755e75b8 100644
--- a/drivers/media/usb/gspca/nw80x.c
+++ b/drivers/media/usb/gspca/nw80x.c
@@ -1708,7 +1708,7 @@ static void setautogain(struct gspca_dev *gspca_dev, s32 val)
 
         reg_r(gspca_dev, 0x1004, 1);
         if (gspca_dev->usb_buf[0] & 0x04) {     /* if AE_FULL_FRM */
-                sd->ae_res = gspca_dev->width * gspca_dev->height;
+                sd->ae_res = gspca_dev->pixfmt.width * gspca_dev->pixfmt.height;
         } else {                                /* get the AE window size */
                 reg_r(gspca_dev, 0x1011, 8);
                 w = (gspca_dev->usb_buf[1] << 8) + gspca_dev->usb_buf[0]
@@ -1717,7 +1717,8 @@ static void setautogain(struct gspca_dev *gspca_dev, s32 val)
                   - (gspca_dev->usb_buf[7] << 8) - gspca_dev->usb_buf[6];
                 sd->ae_res = h * w;
                 if (sd->ae_res == 0)
-                        sd->ae_res = gspca_dev->width * gspca_dev->height;
+                        sd->ae_res = gspca_dev->pixfmt.width *
+                                        gspca_dev->pixfmt.height;
         }
 }
 
@@ -1856,21 +1857,21 @@ static int sd_start(struct gspca_dev *gspca_dev)
         reg_w_buf(gspca_dev, cmd);
         switch (sd->webcam) {
         case P35u:
-                if (gspca_dev->width == 320)
+                if (gspca_dev->pixfmt.width == 320)
                         reg_w_buf(gspca_dev, nw801_start_qvga);
                 else
                         reg_w_buf(gspca_dev, nw801_start_vga);
                 reg_w_buf(gspca_dev, nw801_start_2);
                 break;
         case Kr651us:
-                if (gspca_dev->width == 320)
+                if (gspca_dev->pixfmt.width == 320)
                         reg_w_buf(gspca_dev, kr651_start_qvga);
                 else
                         reg_w_buf(gspca_dev, kr651_start_vga);
                 reg_w_buf(gspca_dev, kr651_start_2);
                 break;
         case Proscope:
-                if (gspca_dev->width == 320)
+                if (gspca_dev->pixfmt.width == 320)
                         reg_w_buf(gspca_dev, proscope_start_qvga);
                 else
                         reg_w_buf(gspca_dev, proscope_start_vga);
diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c
index 8937d79fd176..c95f32a0c02b 100644
--- a/drivers/media/usb/gspca/ov519.c
+++ b/drivers/media/usb/gspca/ov519.c
@@ -3468,7 +3468,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
 
         switch (sd->bridge) {
         case BRIDGE_OVFX2:
-                if (gspca_dev->width != 800)
+                if (gspca_dev->pixfmt.width != 800)
                         gspca_dev->cam.bulk_size = OVFX2_BULK_SIZE;
                 else
                         gspca_dev->cam.bulk_size = 7 * 4096;
@@ -3507,8 +3507,8 @@ static void ov511_mode_init_regs(struct sd *sd)
         /* Here I'm assuming that snapshot size == image size.
          * I hope that's always true. --claudio
          */
-        hsegs = (sd->gspca_dev.width >> 3) - 1;
-        vsegs = (sd->gspca_dev.height >> 3) - 1;
+        hsegs = (sd->gspca_dev.pixfmt.width >> 3) - 1;
+        vsegs = (sd->gspca_dev.pixfmt.height >> 3) - 1;
 
         reg_w(sd, R511_CAM_PXCNT, hsegs);
         reg_w(sd, R511_CAM_LNCNT, vsegs);
@@ -3541,7 +3541,7 @@ static void ov511_mode_init_regs(struct sd *sd)
         case SEN_OV7640:
         case SEN_OV7648:
         case SEN_OV76BE:
-                if (sd->gspca_dev.width == 320)
+                if (sd->gspca_dev.pixfmt.width == 320)
                         interlaced = 1;
                 /* Fall through */
         case SEN_OV6630:
@@ -3551,7 +3551,7 @@ static void ov511_mode_init_regs(struct sd *sd)
                 case 30:
                 case 25:
                         /* Not enough bandwidth to do 640x480 @ 30 fps */
-                        if (sd->gspca_dev.width != 640) {
+                        if (sd->gspca_dev.pixfmt.width != 640) {
                                 sd->clockdiv = 0;
                                 break;
                         }
@@ -3584,7 +3584,8 @@ static void ov511_mode_init_regs(struct sd *sd)
 
         /* Check if we have enough bandwidth to disable compression */
         fps = (interlaced ? 60 : 30) / (sd->clockdiv + 1) + 1;
-        needed = fps * sd->gspca_dev.width * sd->gspca_dev.height * 3 / 2;
+        needed = fps * sd->gspca_dev.pixfmt.width *
+                        sd->gspca_dev.pixfmt.height * 3 / 2;
         /* 1000 isoc packets/sec */
         if (needed > 1000 * packet_size) {
                 /* Enable Y and UV quantization and compression */
@@ -3646,8 +3647,8 @@ static void ov518_mode_init_regs(struct sd *sd)
                 reg_w(sd, 0x38, 0x80);
         }
 
-        hsegs = sd->gspca_dev.width / 16;
-        vsegs = sd->gspca_dev.height / 4;
+        hsegs = sd->gspca_dev.pixfmt.width / 16;
+        vsegs = sd->gspca_dev.pixfmt.height / 4;
 
         reg_w(sd, 0x29, hsegs);
         reg_w(sd, 0x2a, vsegs);
@@ -3686,7 +3687,8 @@ static void ov518_mode_init_regs(struct sd *sd)
                          * happened to be with revision < 2 cams using an
                          * OV7620 and revision 2 cams using an OV7620AE.
                          */
-                        if (sd->revision > 0 && sd->gspca_dev.width == 640) {
+                        if (sd->revision > 0 &&
+                                        sd->gspca_dev.pixfmt.width == 640) {
                                 reg_w(sd, 0x20, 0x60);
                                 reg_w(sd, 0x21, 0x1f);
                         } else {
@@ -3812,8 +3814,8 @@ static void ov519_mode_init_regs(struct sd *sd)
                 break;
         }
 
-        reg_w(sd, OV519_R10_H_SIZE,     sd->gspca_dev.width >> 4);
-        reg_w(sd, OV519_R11_V_SIZE,     sd->gspca_dev.height >> 3);
+        reg_w(sd, OV519_R10_H_SIZE,     sd->gspca_dev.pixfmt.width >> 4);
+        reg_w(sd, OV519_R11_V_SIZE,     sd->gspca_dev.pixfmt.height >> 3);
         if (sd->sensor == SEN_OV7670 &&
             sd->gspca_dev.cam.cam_mode[sd->gspca_dev.curr_mode].priv)
                 reg_w(sd, OV519_R12_X_OFFSETL, 0x04);
@@ -3947,14 +3949,16 @@ static void mode_init_ov_sensor_regs(struct sd *sd)
             }
         case SEN_OV3610:
                 if (qvga) {
-                        xstart = (1040 - gspca_dev->width) / 2 + (0x1f << 4);
-                        ystart = (776 - gspca_dev->height) / 2;
+                        xstart = (1040 - gspca_dev->pixfmt.width) / 2 +
+                                (0x1f << 4);
+                        ystart = (776 - gspca_dev->pixfmt.height) / 2;
                 } else {
-                        xstart = (2076 - gspca_dev->width) / 2 + (0x10 << 4);
-                        ystart = (1544 - gspca_dev->height) / 2;
+                        xstart = (2076 - gspca_dev->pixfmt.width) / 2 +
+                                (0x10 << 4);
+                        ystart = (1544 - gspca_dev->pixfmt.height) / 2;
                 }
-                xend = xstart + gspca_dev->width;
-                yend = ystart + gspca_dev->height;
+                xend = xstart + gspca_dev->pixfmt.width;
+                yend = ystart + gspca_dev->pixfmt.height;
                 /* Writing to the COMH register resets the other windowing regs
                    to their default values, so we must do this first. */
                 i2c_w_mask(sd, 0x12, qvga ? 0x40 : 0x00, 0xf0);
@@ -4229,8 +4233,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         /* Default for most bridges, allow bridge_mode_init_regs to override */
-        sd->sensor_width = sd->gspca_dev.width;
-        sd->sensor_height = sd->gspca_dev.height;
+        sd->sensor_width = sd->gspca_dev.pixfmt.width;
+        sd->sensor_height = sd->gspca_dev.pixfmt.height;
 
         switch (sd->bridge) {
         case BRIDGE_OV511:
@@ -4345,12 +4349,13 @@ static void ov511_pkt_scan(struct gspca_dev *gspca_dev,
                 ov51x_handle_button(gspca_dev, (in[8] >> 2) & 1);
                 if (in[8] & 0x80) {
                         /* Frame end */
-                        if ((in[9] + 1) * 8 != gspca_dev->width ||
-                            (in[10] + 1) * 8 != gspca_dev->height) {
+                        if ((in[9] + 1) * 8 != gspca_dev->pixfmt.width ||
+                            (in[10] + 1) * 8 != gspca_dev->pixfmt.height) {
                                 PERR("Invalid frame size, got: %dx%d,"
                                         " requested: %dx%d\n",
                                         (in[9] + 1) * 8, (in[10] + 1) * 8,
-                                        gspca_dev->width, gspca_dev->height);
+                                        gspca_dev->pixfmt.width,
+                                        gspca_dev->pixfmt.height);
                                 gspca_dev->last_packet_type = DISCARD_PACKET;
                                 return;
                         }
@@ -4470,7 +4475,8 @@ static void ovfx2_pkt_scan(struct gspca_dev *gspca_dev,
                 if (sd->first_frame) {
                         sd->first_frame--;
                         if (gspca_dev->image_len <
-                                  sd->gspca_dev.width * sd->gspca_dev.height)
+                                  sd->gspca_dev.pixfmt.width *
+                                        sd->gspca_dev.pixfmt.height)
                                 gspca_dev->last_packet_type = DISCARD_PACKET;
                 }
                 gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0);
diff --git a/drivers/media/usb/gspca/ov534.c b/drivers/media/usb/gspca/ov534.c
index 03a33c46ca2c..90f0d637cd9d 100644
--- a/drivers/media/usb/gspca/ov534.c
+++ b/drivers/media/usb/gspca/ov534.c
@@ -1440,9 +1440,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
                 /* If this packet is marked as EOF, end the frame */
                 } else if (data[1] & UVC_STREAM_EOF) {
                         sd->last_pts = 0;
-                        if (gspca_dev->pixfmt == V4L2_PIX_FMT_YUYV
+                        if (gspca_dev->pixfmt.pixelformat == V4L2_PIX_FMT_YUYV
                          && gspca_dev->image_len + len - 12 !=
-                                   gspca_dev->width * gspca_dev->height * 2) {
+                                   gspca_dev->pixfmt.width *
+                                        gspca_dev->pixfmt.height * 2) {
                                 PDEBUG(D_PACK, "wrong sized frame");
                                 goto discard;
                         }
diff --git a/drivers/media/usb/gspca/ov534_9.c b/drivers/media/usb/gspca/ov534_9.c
index c4cd028fe0b4..47085cf2d723 100644
--- a/drivers/media/usb/gspca/ov534_9.c
+++ b/drivers/media/usb/gspca/ov534_9.c
@@ -59,6 +59,7 @@ enum sensors {
         SENSOR_OV965x,          /* ov9657 */
         SENSOR_OV971x,          /* ov9712 */
         SENSOR_OV562x,          /* ov5621 */
+        SENSOR_OV361x,          /* ov3610 */
         NSENSORS
 };
 
@@ -106,6 +107,274 @@ static const struct v4l2_pix_format ov562x_mode[] = {
         }
 };
 
+enum ov361x {
+        ov361x_2048 = 0,
+        ov361x_1600,
+        ov361x_1024,
+        ov361x_640,
+        ov361x_320,
+        ov361x_160,
+        ov361x_last
+};
+
+static const struct v4l2_pix_format ov361x_mode[] = {
+        {0x800, 0x600, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 0x800,
+                .sizeimage = 0x800 * 0x600,
+                .colorspace = V4L2_COLORSPACE_SRGB},
+        {1600, 1200, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 1600,
+                .sizeimage = 1600 * 1200,
+                .colorspace = V4L2_COLORSPACE_SRGB},
+        {1024, 768, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 768,
+                .sizeimage = 1024 * 768,
+                .colorspace = V4L2_COLORSPACE_SRGB},
+        {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 640,
+                .sizeimage = 640 * 480,
+                .colorspace = V4L2_COLORSPACE_SRGB},
+        {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 320,
+                .sizeimage = 320 * 240,
+                .colorspace = V4L2_COLORSPACE_SRGB},
+        {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
+                .bytesperline = 160,
+                .sizeimage = 160 * 120,
+                .colorspace = V4L2_COLORSPACE_SRGB}
+};
+
+static const u8 ov361x_start_2048[][2] = {
+        {0x12, 0x80},
+        {0x13, 0xcf},
+        {0x14, 0x40},
+        {0x15, 0x00},
+        {0x01, 0x80},
+        {0x02, 0x80},
+        {0x04, 0x70},
+        {0x0d, 0x40},
+        {0x0f, 0x47},
+        {0x11, 0x81},
+        {0x32, 0x36},
+        {0x33, 0x0c},
+        {0x34, 0x00},
+        {0x35, 0x90},
+        {0x12, 0x00},
+        {0x17, 0x10},
+        {0x18, 0x90},
+        {0x19, 0x00},
+        {0x1a, 0xc0},
+};
+static const u8 ov361x_bridge_start_2048[][2] = {
+        {0xf1, 0x60},
+        {0x88, 0x00},
+        {0x89, 0x08},
+        {0x8a, 0x00},
+        {0x8b, 0x06},
+        {0x8c, 0x01},
+        {0x8d, 0x10},
+        {0x1c, 0x00},
+        {0x1d, 0x48},
+        {0x1d, 0x00},
+        {0x1d, 0xff},
+        {0x1c, 0x0a},
+        {0x1d, 0x2e},
+        {0x1d, 0x1e},
+};
+
+static const u8 ov361x_start_1600[][2] = {
+        {0x12, 0x80},
+        {0x13, 0xcf},
+        {0x14, 0x40},
+        {0x15, 0x00},
+        {0x01, 0x80},
+        {0x02, 0x80},
+        {0x04, 0x70},
+        {0x0d, 0x40},
+        {0x0f, 0x47},
+        {0x11, 0x81},
+        {0x32, 0x36},
+        {0x33, 0x0C},
+        {0x34, 0x00},
+        {0x35, 0x90},
+        {0x12, 0x00},
+        {0x17, 0x10},
+        {0x18, 0x90},
+        {0x19, 0x00},
+        {0x1a, 0xc0},
+};
+static const u8 ov361x_bridge_start_1600[][2] = {
+        {0xf1, 0x60},  /* Hsize[7:0] */
+        {0x88, 0x00},  /* Hsize[15:8] Write Only, can't read */
+        {0x89, 0x08},  /* Vsize[7:0] */
+        {0x8a, 0x00},  /* Vsize[15:8] Write Only, can't read */
+        {0x8b, 0x06},  /* for Iso */
+        {0x8c, 0x01},  /* RAW input */
+        {0x8d, 0x10},
+        {0x1c, 0x00},  /* RAW output, Iso transfer */
+        {0x1d, 0x48},
+        {0x1d, 0x00},
+        {0x1d, 0xff},
+        {0x1c, 0x0a},  /* turn off JPEG, Iso mode */
+        {0x1d, 0x2e},  /* for Iso */
+        {0x1d, 0x1e},
+};
+
+static const u8 ov361x_start_1024[][2] = {
+        {0x12, 0x80},
+        {0x13, 0xcf},
+        {0x14, 0x40},
+        {0x15, 0x00},
+        {0x01, 0x80},
+        {0x02, 0x80},
+        {0x04, 0x70},
+        {0x0d, 0x40},
+        {0x0f, 0x47},
+        {0x11, 0x81},
+        {0x32, 0x36},
+        {0x33, 0x0C},
+        {0x34, 0x00},
+        {0x35, 0x90},
+        {0x12, 0x40},
+        {0x17, 0x1f},
+        {0x18, 0x5f},
+        {0x19, 0x00},
+        {0x1a, 0x68},
+};
+static const u8 ov361x_bridge_start_1024[][2] = {
+        {0xf1, 0x60},  /* Hsize[7:0] */
+        {0x88, 0x00},  /* Hsize[15:8] Write Only, can't read */
+        {0x89, 0x04},  /* Vsize[7:0] */
+        {0x8a, 0x00},  /* Vsize[15:8] Write Only, can't read */
+        {0x8b, 0x03},  /* for Iso */
+        {0x8c, 0x01},  /* RAW input  */
+        {0x8d, 0x10},
+        {0x1c, 0x00},  /* RAW output, Iso transfer */
+        {0x1d, 0x48},
+        {0x1d, 0x00},
+        {0x1d, 0xff},
+        {0x1c, 0x0a},  /* turn off JPEG, Iso mode */
+        {0x1d, 0x2e},  /* for Iso */
+        {0x1d, 0x1e},
+};
+
+static const u8 ov361x_start_640[][2] = {
+        {0x12, 0x80},
+        {0x13, 0xcf},
+        {0x14, 0x40},
+        {0x15, 0x00},
+        {0x01, 0x80},
+        {0x02, 0x80},
+        {0x04, 0x70},
+        {0x0d, 0x40},
+        {0x0f, 0x47},
+        {0x11, 0x81},
+        {0x32, 0x36},
+        {0x33, 0x0C},
+        {0x34, 0x00},
+        {0x35, 0x90},
+        {0x12, 0x40},
+        {0x17, 0x1f},
+        {0x18, 0x5f},
+        {0x19, 0x00},
+        {0x1a, 0x68},
+};
+
+static const u8 ov361x_bridge_start_640[][2] = {
+        {0xf1, 0x60},  /* Hsize[7:0]*/
+        {0x88, 0x00},  /* Hsize[15:8] Write Only, can't read */
+        {0x89, 0x04},  /* Vsize[7:0] */
+        {0x8a, 0x00},  /* Vsize[15:8] Write Only, can't read */
+        {0x8b, 0x03},  /* for Iso */
+        {0x8c, 0x01},  /* RAW input */
+        {0x8d, 0x10},
+        {0x1c, 0x00},  /* RAW output, Iso transfer */
+        {0x1d, 0x48},
+        {0x1d, 0x00},
+        {0x1d, 0xff},
+        {0x1c, 0x0a},  /* turn off JPEG, Iso mode */
+        {0x1d, 0x2e},  /* for Iso */
+        {0x1d, 0x1e},
+};
+
+static const u8 ov361x_start_320[][2] = {
+        {0x12, 0x80},
+        {0x13, 0xcf},
+        {0x14, 0x40},
+        {0x15, 0x00},
+        {0x01, 0x80},
+        {0x02, 0x80},
+        {0x04, 0x70},
+        {0x0d, 0x40},
+        {0x0f, 0x47},
+        {0x11, 0x81},
+        {0x32, 0x36},
+        {0x33, 0x0C},
+        {0x34, 0x00},
+        {0x35, 0x90},
+        {0x12, 0x40},
+        {0x17, 0x1f},
+        {0x18, 0x5f},
+        {0x19, 0x00},
+        {0x1a, 0x68},
+};
+
+static const u8 ov361x_bridge_start_320[][2] = {
+        {0xf1, 0x60},  /* Hsize[7:0] */
+        {0x88, 0x00},  /* Hsize[15:8] Write Only, can't read */
+        {0x89, 0x04},  /* Vsize[7:0] */
+        {0x8a, 0x00},  /* Vsize[15:8] Write Only, can't read */
+        {0x8b, 0x03},  /* for Iso */
+        {0x8c, 0x01},  /* RAW input */
+        {0x8d, 0x10},
+        {0x1c, 0x00},  /* RAW output, Iso transfer; */
+        {0x1d, 0x48},
+        {0x1d, 0x00},
+        {0x1d, 0xff},
+        {0x1c, 0x0a},  /* turn off JPEG, Iso mode */
+        {0x1d, 0x2e},  /* for Iso */
+        {0x1d, 0x1e},
+};
+
+static const u8 ov361x_start_160[][2] = {
+        {0x12, 0x80},
+        {0x13, 0xcf},
+        {0x14, 0x40},
+        {0x15, 0x00},
+        {0x01, 0x80},
+        {0x02, 0x80},
+        {0x04, 0x70},
+        {0x0d, 0x40},
+        {0x0f, 0x47},
+        {0x11, 0x81},
+        {0x32, 0x36},
+        {0x33, 0x0C},
+        {0x34, 0x00},
+        {0x35, 0x90},
+        {0x12, 0x40},
+        {0x17, 0x1f},
+        {0x18, 0x5f},
+        {0x19, 0x00},
+        {0x1a, 0x68},
+};
+
+static const u8 ov361x_bridge_start_160[][2] = {
+        {0xf1, 0x60},  /* Hsize[7:0] */
+        {0x88, 0x00},  /* Hsize[15:8] Write Only, can't read */
+        {0x89, 0x04},  /* Vsize[7:0] */
+        {0x8a, 0x00},  /* Vsize[15:8] Write Only, can't read */
+        {0x8b, 0x03},  /* for Iso */
+        {0x8c, 0x01},  /* RAW input */
+        {0x8d, 0x10},
+        {0x1c, 0x00},  /* RAW output, Iso transfer */
+        {0x1d, 0x48},
+        {0x1d, 0x00},
+        {0x1d, 0xff},
+        {0x1c, 0x0a},  /* turn off JPEG, Iso mode */
+        {0x1d, 0x2e},  /* for Iso */
+        {0x1d, 0x1e},
+};
+
 static const u8 bridge_init[][2] = {
         {0x88, 0xf8},
         {0x89, 0xff},
@@ -898,7 +1167,7 @@ static int sccb_check_status(struct gspca_dev *gspca_dev)
         int i;
 
         for (i = 0; i < 5; i++) {
-                msleep(10);
+                msleep(20);
                 data = reg_r(gspca_dev, OV534_REG_STATUS);
 
                 switch (data) {
@@ -1221,6 +1490,13 @@ static int sd_init(struct gspca_dev *gspca_dev)
                 sccb_w_array(gspca_dev, ov562x_init_2,
                                 ARRAY_SIZE(ov562x_init_2));
                 reg_w(gspca_dev, 0xe0, 0x00);
+        } else if ((sensor_id & 0xfff0) == 0x3610) {
+                sd->sensor = SENSOR_OV361x;
+                gspca_dev->cam.cam_mode = ov361x_mode;
+                gspca_dev->cam.nmodes = ARRAY_SIZE(ov361x_mode);
+                reg_w(gspca_dev, 0xe7, 0x3a);
+                reg_w(gspca_dev, 0xf1, 0x60);
+                sccb_write(gspca_dev, 0x12, 0x80);
         } else {
                 pr_err("Unknown sensor %04x", sensor_id);
                 return -EINVAL;
@@ -1229,6 +1505,53 @@ static int sd_init(struct gspca_dev *gspca_dev)
         return gspca_dev->usb_err;
 }
 
+static int sd_start_ov361x(struct gspca_dev *gspca_dev)
+{
+        sccb_write(gspca_dev, 0x12, 0x80);
+        msleep(20);
+        switch (gspca_dev->curr_mode % (ov361x_last)) {
+        case ov361x_2048:
+                reg_w_array(gspca_dev, ov361x_bridge_start_2048,
+                            ARRAY_SIZE(ov361x_bridge_start_2048));
+                sccb_w_array(gspca_dev, ov361x_start_2048,
+                             ARRAY_SIZE(ov361x_start_2048));
+                break;
+        case ov361x_1600:
+                reg_w_array(gspca_dev, ov361x_bridge_start_1600,
+                            ARRAY_SIZE(ov361x_bridge_start_1600));
+                sccb_w_array(gspca_dev, ov361x_start_1600,
+                             ARRAY_SIZE(ov361x_start_1600));
+                break;
+        case ov361x_1024:
+                reg_w_array(gspca_dev, ov361x_bridge_start_1024,
+                            ARRAY_SIZE(ov361x_bridge_start_1024));
+                sccb_w_array(gspca_dev, ov361x_start_1024,
+                             ARRAY_SIZE(ov361x_start_1024));
+                break;
+        case ov361x_640:
+                reg_w_array(gspca_dev, ov361x_bridge_start_640,
+                            ARRAY_SIZE(ov361x_bridge_start_640));
+                sccb_w_array(gspca_dev, ov361x_start_640,
+                             ARRAY_SIZE(ov361x_start_640));
+                break;
+        case ov361x_320:
+                reg_w_array(gspca_dev, ov361x_bridge_start_320,
+                            ARRAY_SIZE(ov361x_bridge_start_320));
+                sccb_w_array(gspca_dev, ov361x_start_320,
+                             ARRAY_SIZE(ov361x_start_320));
+                break;
+        case ov361x_160:
+                reg_w_array(gspca_dev, ov361x_bridge_start_160,
+                            ARRAY_SIZE(ov361x_bridge_start_160));
+                sccb_w_array(gspca_dev, ov361x_start_160,
+                             ARRAY_SIZE(ov361x_start_160));
+                break;
+        }
+        reg_w(gspca_dev, 0xe0, 0x00); /* start transfer */
+
+        return gspca_dev->usb_err;
+}
+
 static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
@@ -1237,6 +1560,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 return gspca_dev->usb_err;
         if (sd->sensor == SENSOR_OV562x)
                 return gspca_dev->usb_err;
+        if (sd->sensor == SENSOR_OV361x)
+                return sd_start_ov361x(gspca_dev);
 
         switch (gspca_dev->curr_mode) {
         case QVGA_MODE:                 /* 320x240 */
@@ -1290,6 +1615,11 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
 static void sd_stopN(struct gspca_dev *gspca_dev)
 {
+        if (((struct sd *)gspca_dev)->sensor == SENSOR_OV361x) {
+                reg_w(gspca_dev, 0xe0, 0x01); /* stop transfer */
+                /* reg_w(gspca_dev, 0x31, 0x09); */
+                return;
+        }
         reg_w(gspca_dev, 0xe0, 0x01);
         set_led(gspca_dev, 0);
         reg_w(gspca_dev, 0xe0, 0x00);
@@ -1425,6 +1755,8 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
 
         if (sd->sensor == SENSOR_OV971x)
                 return 0;
+        if (sd->sensor == SENSOR_OV361x)
+                return 0;
         gspca_dev->vdev.ctrl_handler = hdl;
         v4l2_ctrl_handler_init(hdl, 7);
         if (sd->sensor == SENSOR_OV562x) {
diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c
index 83519be94e58..cd79c180f67b 100644
--- a/drivers/media/usb/gspca/pac207.c
+++ b/drivers/media/usb/gspca/pac207.c
@@ -299,7 +299,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         pac207_write_regs(gspca_dev, 0x0042, pac207_sensor_init[3], 8);
 
         /* Compression Balance */
-        if (gspca_dev->width == 176)
+        if (gspca_dev->pixfmt.width == 176)
                 pac207_write_reg(gspca_dev, 0x4a, 0xff);
         else
                 pac207_write_reg(gspca_dev, 0x4a, 0x30);
@@ -317,7 +317,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 mode = 0x00;
         else
                 mode = 0x02;
-        if (gspca_dev->width == 176) {  /* 176x144 */
+        if (gspca_dev->pixfmt.width == 176) {   /* 176x144 */
                 mode |= 0x01;
                 PDEBUG(D_STREAM, "pac207_start mode 176x144");
         } else {                                /* 352x288 */
diff --git a/drivers/media/usb/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c
index 1a5bdc853a80..25f86b1e74a8 100644
--- a/drivers/media/usb/gspca/pac7311.c
+++ b/drivers/media/usb/gspca/pac7311.c
@@ -326,7 +326,7 @@ static void setexposure(struct gspca_dev *gspca_dev, s32 val)
          *  640x480 mode and page 4 reg 2 <= 3 then it must be 9
          */
         reg_w(gspca_dev, 0xff, 0x01);
-        if (gspca_dev->width != 640 && val <= 3)
+        if (gspca_dev->pixfmt.width != 640 && val <= 3)
                 reg_w(gspca_dev, 0x08, 0x09);
         else
                 reg_w(gspca_dev, 0x08, 0x08);
@@ -337,7 +337,7 @@ static void setexposure(struct gspca_dev *gspca_dev, s32 val)
          * camera to use higher compression or we may run out of
          * bandwidth.
          */
-        if (gspca_dev->width == 640 && val == 2)
+        if (gspca_dev->pixfmt.width == 640 && val == 2)
                 reg_w(gspca_dev, 0x80, 0x01);
         else
                 reg_w(gspca_dev, 0x80, 0x1c);
@@ -615,7 +615,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
 
                 /* Start the new frame with the jpeg header */
                 pac_start_frame(gspca_dev,
-                        gspca_dev->height, gspca_dev->width);
+                        gspca_dev->pixfmt.height, gspca_dev->pixfmt.width);
         }
         gspca_frame_add(gspca_dev, INTER_PACKET, data, len);
 }
diff --git a/drivers/media/usb/gspca/se401.c b/drivers/media/usb/gspca/se401.c
index 5f729b8aa2bd..5102cea50471 100644
--- a/drivers/media/usb/gspca/se401.c
+++ b/drivers/media/usb/gspca/se401.c
@@ -354,9 +354,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         /* set size + mode */
         se401_write_req(gspca_dev, SE401_REQ_SET_WIDTH,
-                        gspca_dev->width * mult, 0);
+                        gspca_dev->pixfmt.width * mult, 0);
         se401_write_req(gspca_dev, SE401_REQ_SET_HEIGHT,
-                        gspca_dev->height * mult, 0);
+                        gspca_dev->pixfmt.height * mult, 0);
         /*
          * HDG: disabled this as it does not seem to do anything
          * se401_write_req(gspca_dev, SE401_REQ_SET_OUTPUT_MODE,
@@ -480,7 +480,7 @@ static void sd_complete_frame(struct gspca_dev *gspca_dev, u8 *data, int len)
 static void sd_pkt_scan_janggu(struct gspca_dev *gspca_dev, u8 *data, int len)
 {
         struct sd *sd = (struct sd *)gspca_dev;
-        int imagesize = gspca_dev->width * gspca_dev->height;
+        int imagesize = gspca_dev->pixfmt.width * gspca_dev->pixfmt.height;
         int i, plen, bits, pixels, info, count;
 
         if (sd->restart_stream)
diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c
index f4453d52801b..2a38621cf718 100644
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -1955,7 +1955,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
                         return 0;
                 }
 
-                switch (gspca_dev->width) {
+                switch (gspca_dev->pixfmt.width) {
                 case 160: /* 160x120 */
                         gspca_dev->alt = 2;
                         break;
@@ -1985,8 +1985,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         int mode = gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv;
-        int width = gspca_dev->width;
-        int height = gspca_dev->height;
+        int width = gspca_dev->pixfmt.width;
+        int height = gspca_dev->pixfmt.height;
         u8 fmt, scale = 0;
 
         jpeg_define(sd->jpeg_hdr, height, width,
diff --git a/drivers/media/usb/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c
index d7ff3b9687c5..7277dbd2afcd 100644
--- a/drivers/media/usb/gspca/sonixb.c
+++ b/drivers/media/usb/gspca/sonixb.c
@@ -513,10 +513,7 @@ static void i2c_w(struct gspca_dev *gspca_dev, const u8 *buf)
                 if (gspca_dev->usb_buf[0] & 0x04) {
                         if (gspca_dev->usb_buf[0] & 0x08) {
                                 dev_err(gspca_dev->v4l2_dev.dev,
-                                        "i2c error writing %02x %02x %02x %02x"
-                                        " %02x %02x %02x %02x\n",
-                                        buf[0], buf[1], buf[2], buf[3],
-                                        buf[4], buf[5], buf[6], buf[7]);
+                                        "i2c error writing %8ph\n", buf);
                                 gspca_dev->usb_err = -EIO;
                         }
                         return;
@@ -753,7 +750,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
                 /* In 640x480, if the reg11 has less than 4, the image is
                    unstable (the bridge goes into a higher compression mode
                    which we have not reverse engineered yet). */
-                if (gspca_dev->width == 640 && reg11 < 4)
+                if (gspca_dev->pixfmt.width == 640 && reg11 < 4)
                         reg11 = 4;
 
                 /* frame exposure time in ms = 1000 * reg11 / 30    ->
diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c
index 3b5ccb1c4cdf..c69b45d7cfbf 100644
--- a/drivers/media/usb/gspca/sonixj.c
+++ b/drivers/media/usb/gspca/sonixj.c
@@ -2204,7 +2204,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
                                 { 0x14, 0xe7, 0x1e, 0xdd };
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x21);          /* JPEG 422 */
 
         /* initialize the bridge */
diff --git a/drivers/media/usb/gspca/spca1528.c b/drivers/media/usb/gspca/spca1528.c
index 688592b289ea..f38fd8949609 100644
--- a/drivers/media/usb/gspca/spca1528.c
+++ b/drivers/media/usb/gspca/spca1528.c
@@ -255,7 +255,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         /* initialize the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x22);          /* JPEG 411 */
 
         /* the JPEG quality shall be 85% */
diff --git a/drivers/media/usb/gspca/spca500.c b/drivers/media/usb/gspca/spca500.c
index 9f8bf51fd64b..f011a309dd65 100644
--- a/drivers/media/usb/gspca/spca500.c
+++ b/drivers/media/usb/gspca/spca500.c
@@ -608,7 +608,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         __u8 xmult, ymult;
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x22);          /* JPEG 411 */
         jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
diff --git a/drivers/media/usb/gspca/sq905c.c b/drivers/media/usb/gspca/sq905c.c
index acb19fb9a3df..aa21edc9502d 100644
--- a/drivers/media/usb/gspca/sq905c.c
+++ b/drivers/media/usb/gspca/sq905c.c
@@ -272,7 +272,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 
         dev->cap_mode = gspca_dev->cam.cam_mode;
         /* "Open the shutter" and set size, to start capture */
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 640:
                 PDEBUG(D_STREAM, "Start streaming at high resolution");
                 dev->cap_mode++;
diff --git a/drivers/media/usb/gspca/sq930x.c b/drivers/media/usb/gspca/sq930x.c
index b10d0821111c..e274cf19a3ea 100644
--- a/drivers/media/usb/gspca/sq930x.c
+++ b/drivers/media/usb/gspca/sq930x.c
@@ -906,7 +906,8 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
 
         gspca_dev->cam.bulk_nurbs = 1;  /* there must be one URB only */
         sd->do_ctrl = 0;
-        gspca_dev->cam.bulk_size = gspca_dev->width * gspca_dev->height + 8;
+        gspca_dev->cam.bulk_size = gspca_dev->pixfmt.width *
+                        gspca_dev->pixfmt.height + 8;
         return 0;
 }
 
diff --git a/drivers/media/usb/gspca/stk014.c b/drivers/media/usb/gspca/stk014.c
index 8c0982607f25..b0c70fea760b 100644
--- a/drivers/media/usb/gspca/stk014.c
+++ b/drivers/media/usb/gspca/stk014.c
@@ -250,7 +250,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         int ret, value;
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x22);          /* JPEG 411 */
         jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
@@ -261,7 +262,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
         set_par(gspca_dev, 0x00000000);
         set_par(gspca_dev, 0x8002e001);
         set_par(gspca_dev, 0x14000000);
-        if (gspca_dev->width > 320)
+        if (gspca_dev->pixfmt.width > 320)
                 value = 0x8002e001;             /* 640x480 */
         else
                 value = 0x4001f000;             /* 320x240 */
diff --git a/drivers/media/usb/gspca/stk1135.c b/drivers/media/usb/gspca/stk1135.c
index 585868835ace..1fc80af2a189 100644
--- a/drivers/media/usb/gspca/stk1135.c
+++ b/drivers/media/usb/gspca/stk1135.c
@@ -48,42 +48,11 @@ struct sd {
 };
 
 static const struct v4l2_pix_format stk1135_modes[] = {
-        {160, 120, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 160,
-                .sizeimage = 160 * 120,
-                .colorspace = V4L2_COLORSPACE_SRGB},
-        {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 176,
-                .sizeimage = 176 * 144,
-                .colorspace = V4L2_COLORSPACE_SRGB},
-        {320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 320,
-                .sizeimage = 320 * 240,
-                .colorspace = V4L2_COLORSPACE_SRGB},
-        {352, 288, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 352,
-                .sizeimage = 352 * 288,
-                .colorspace = V4L2_COLORSPACE_SRGB},
+        /* default mode (this driver supports variable resolution) */
         {640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
                 .bytesperline = 640,
                 .sizeimage = 640 * 480,
                 .colorspace = V4L2_COLORSPACE_SRGB},
-        {720, 576, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 720,
-                .sizeimage = 720 * 576,
-                .colorspace = V4L2_COLORSPACE_SRGB},
-        {800, 600, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 800,
-                .sizeimage = 800 * 600,
-                .colorspace = V4L2_COLORSPACE_SRGB},
-        {1024, 768, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 1024,
-                .sizeimage = 1024 * 768,
-                .colorspace = V4L2_COLORSPACE_SRGB},
-        {1280, 1024, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
-                .bytesperline = 1280,
-                .sizeimage = 1280 * 1024,
-                .colorspace = V4L2_COLORSPACE_SRGB},
 };
 
 /* -- read a register -- */
@@ -347,16 +316,16 @@ static void stk1135_configure_mt9m112(struct gspca_dev *gspca_dev)
                 sensor_write(gspca_dev, cfg[i].reg, cfg[i].val);
 
         /* set output size */
-        width = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].width;
-        height = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].height;
-        if (width <= 640) { /* use context A (half readout speed by default) */
+        width = gspca_dev->pixfmt.width;
+        height = gspca_dev->pixfmt.height;
+        if (width <= 640 && height <= 512) { /* context A (half readout speed)*/
                 sensor_write(gspca_dev, 0x1a7, width);
                 sensor_write(gspca_dev, 0x1aa, height);
                 /* set read mode context A */
                 sensor_write(gspca_dev, 0x0c8, 0x0000);
                 /* set resize, read mode, vblank, hblank context A */
                 sensor_write(gspca_dev, 0x2c8, 0x0000);
-        } else { /* use context B (full readout speed by default) */
+        } else { /* context B (full readout speed) */
                 sensor_write(gspca_dev, 0x1a1, width);
                 sensor_write(gspca_dev, 0x1a4, height);
                 /* set read mode context B */
@@ -484,8 +453,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         reg_w(gspca_dev, STK1135_REG_CISPO + 3, 0x00);
 
         /* set capture end position */
-        width = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].width;
-        height = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].height;
+        width = gspca_dev->pixfmt.width;
+        height = gspca_dev->pixfmt.height;
         reg_w(gspca_dev, STK1135_REG_CIEPO + 0, width & 0xff);
         reg_w(gspca_dev, STK1135_REG_CIEPO + 1, width >> 8);
         reg_w(gspca_dev, STK1135_REG_CIEPO + 2, height & 0xff);
@@ -643,6 +612,35 @@ static int sd_init_controls(struct gspca_dev *gspca_dev)
         return 0;
 }
 
+static void stk1135_try_fmt(struct gspca_dev *gspca_dev, struct v4l2_format *fmt)
+{
+        fmt->fmt.pix.width = clamp(fmt->fmt.pix.width, 32U, 1280U);
+        fmt->fmt.pix.height = clamp(fmt->fmt.pix.height, 32U, 1024U);
+        /* round up to even numbers */
+        fmt->fmt.pix.width += (fmt->fmt.pix.width & 1);
+        fmt->fmt.pix.height += (fmt->fmt.pix.height & 1);
+
+        fmt->fmt.pix.bytesperline = fmt->fmt.pix.width;
+        fmt->fmt.pix.sizeimage = fmt->fmt.pix.width * fmt->fmt.pix.height;
+}
+
+static int stk1135_enum_framesizes(struct gspca_dev *gspca_dev,
+                        struct v4l2_frmsizeenum *fsize)
+{
+        if (fsize->index != 0 || fsize->pixel_format != V4L2_PIX_FMT_SBGGR8)
+                return -EINVAL;
+
+        fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;
+        fsize->stepwise.min_width = 32;
+        fsize->stepwise.min_height = 32;
+        fsize->stepwise.max_width = 1280;
+        fsize->stepwise.max_height = 1024;
+        fsize->stepwise.step_width = 2;
+        fsize->stepwise.step_height = 2;
+
+        return 0;
+}
+
 /* sub-driver description */
 static const struct sd_desc sd_desc = {
         .name = MODULE_NAME,
@@ -653,6 +651,8 @@ static const struct sd_desc sd_desc = {
         .stopN = sd_stopN,
         .pkt_scan = sd_pkt_scan,
         .dq_callback = stk1135_dq_callback,
+        .try_fmt = stk1135_try_fmt,
+        .enum_framesizes = stk1135_enum_framesizes,
 };
 
 /* -- module initialisation -- */
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c
index 55ee7a61c67f..49d209bbf9ee 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c
@@ -452,7 +452,7 @@ frame_data:
                                         NULL, 0);
 
                         if (sd->bridge == BRIDGE_ST6422)
-                                sd->to_skip = gspca_dev->width * 4;
+                                sd->to_skip = gspca_dev->pixfmt.width * 4;
 
                         if (chunk_len)
                                 PERR("Chunk length is "
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
index 8206b7743300..8d785edcccf2 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c
@@ -421,7 +421,7 @@ static int pb0100_set_autogain_target(struct gspca_dev *gspca_dev, __s32 val)
 
         /* Number of pixels counted by the sensor when subsampling the pixels.
          * Slightly larger than the real value to avoid oscillation */
-        totalpixels = gspca_dev->width * gspca_dev->height;
+        totalpixels = gspca_dev->pixfmt.width * gspca_dev->pixfmt.height;
         totalpixels = totalpixels/(8*8) + totalpixels/(64*64);
 
         brightpixels = (totalpixels * val) >> 8;
diff --git a/drivers/media/usb/gspca/sunplus.c b/drivers/media/usb/gspca/sunplus.c
index af8767a9bd4c..a517d185febe 100644
--- a/drivers/media/usb/gspca/sunplus.c
+++ b/drivers/media/usb/gspca/sunplus.c
@@ -715,7 +715,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         int enable;
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x22);          /* JPEG 411 */
         jpeg_set_qual(sd->jpeg_hdr, QUALITY);
 
diff --git a/drivers/media/usb/gspca/topro.c b/drivers/media/usb/gspca/topro.c
index 4cb511ccc5f6..640c2fe760b3 100644
--- a/drivers/media/usb/gspca/topro.c
+++ b/drivers/media/usb/gspca/topro.c
@@ -3856,7 +3856,7 @@ static void setsharpness(struct gspca_dev *gspca_dev, s32 val)
 
         if (sd->bridge == BRIDGE_TP6800) {
                 val |= 0x08;            /* grid compensation enable */
-                if (gspca_dev->width == 640)
+                if (gspca_dev->pixfmt.width == 640)
                         reg_w(gspca_dev, TP6800_R78_FORMAT, 0x00); /* vga */
                 else
                         val |= 0x04;            /* scaling down enable */
@@ -3880,7 +3880,7 @@ static void set_resolution(struct gspca_dev *gspca_dev)
         struct sd *sd = (struct sd *) gspca_dev;
 
         reg_w(gspca_dev, TP6800_R21_ENDP_1_CTL, 0x00);
-        if (gspca_dev->width == 320) {
+        if (gspca_dev->pixfmt.width == 320) {
                 reg_w(gspca_dev, TP6800_R3F_FRAME_RATE, 0x06);
                 msleep(100);
                 i2c_w(gspca_dev, CX0342_AUTO_ADC_CALIB, 0x01);
@@ -3924,7 +3924,7 @@ static int get_fr_idx(struct gspca_dev *gspca_dev)
 
                 /* 640x480 * 30 fps does not work */
                 if (i == 6                      /* if 30 fps */
-                 && gspca_dev->width == 640)
+                 && gspca_dev->pixfmt.width == 640)
                         i = 0x05;               /* 15 fps */
         } else {
                 for (i = 0; i < ARRAY_SIZE(rates_6810) - 1; i++) {
@@ -3935,7 +3935,7 @@ static int get_fr_idx(struct gspca_dev *gspca_dev)
 
                 /* 640x480 * 30 fps does not work */
                 if (i == 7                      /* if 30 fps */
-                 && gspca_dev->width == 640)
+                 && gspca_dev->pixfmt.width == 640)
                         i = 6;                  /* 15 fps */
                 i |= 0x80;                      /* clock * 1 */
         }
@@ -4554,7 +4554,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width);
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width);
         set_dqt(gspca_dev, sd->quality);
         if (sd->bridge == BRIDGE_TP6800) {
                 if (sd->sensor == SENSOR_CX0342)
@@ -4737,7 +4738,7 @@ static void sd_dq_callback(struct gspca_dev *gspca_dev)
                         (gspca_dev->usb_buf[26] << 8) + gspca_dev->usb_buf[25] +
                         (gspca_dev->usb_buf[29] << 8) + gspca_dev->usb_buf[28])
                                 / 8;
-                if (gspca_dev->width == 640)
+                if (gspca_dev->pixfmt.width == 640)
                         luma /= 4;
                 reg_w(gspca_dev, 0x7d, 0x00);
 
diff --git a/drivers/media/usb/gspca/tv8532.c b/drivers/media/usb/gspca/tv8532.c
index 8591324a53e1..d497ba38af0d 100644
--- a/drivers/media/usb/gspca/tv8532.c
+++ b/drivers/media/usb/gspca/tv8532.c
@@ -268,7 +268,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
         packet_type0 = packet_type1 = INTER_PACKET;
         if (gspca_dev->empty_packet) {
                 gspca_dev->empty_packet = 0;
-                sd->packet = gspca_dev->height / 2;
+                sd->packet = gspca_dev->pixfmt.height / 2;
                 packet_type0 = FIRST_PACKET;
         } else if (sd->packet == 0)
                 return;                 /* 2 more lines in 352x288 ! */
@@ -284,9 +284,10 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev,
          * - 4 bytes
          */
         gspca_frame_add(gspca_dev, packet_type0,
-                        data + 2, gspca_dev->width);
+                        data + 2, gspca_dev->pixfmt.width);
         gspca_frame_add(gspca_dev, packet_type1,
-                        data + gspca_dev->width + 5, gspca_dev->width);
+                        data + gspca_dev->pixfmt.width + 5,
+                        gspca_dev->pixfmt.width);
 }
 
 static int sd_s_ctrl(struct v4l2_ctrl *ctrl)
diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c
index a2275cfe0b81..103f6c4236b0 100644
--- a/drivers/media/usb/gspca/vicam.c
+++ b/drivers/media/usb/gspca/vicam.c
@@ -121,13 +121,13 @@ static int vicam_read_frame(struct gspca_dev *gspca_dev, u8 *data, int size)
 
         memset(req_data, 0, 16);
         req_data[0] = gain;
-        if (gspca_dev->width == 256)
+        if (gspca_dev->pixfmt.width == 256)
                 req_data[1] |= 0x01; /* low nibble x-scale */
-        if (gspca_dev->height <= 122) {
+        if (gspca_dev->pixfmt.height <= 122) {
                 req_data[1] |= 0x10; /* high nibble y-scale */
-                unscaled_height = gspca_dev->height * 2;
+                unscaled_height = gspca_dev->pixfmt.height * 2;
         } else
-                unscaled_height = gspca_dev->height;
+                unscaled_height = gspca_dev->pixfmt.height;
         req_data[2] = 0x90; /* unknown, does not seem to do anything */
         if (unscaled_height <= 200)
                 req_data[3] = 0x06; /* vend? */
diff --git a/drivers/media/usb/gspca/w996Xcf.c b/drivers/media/usb/gspca/w996Xcf.c
index 2165da0c7ce1..fb9fe2ef3a6f 100644
--- a/drivers/media/usb/gspca/w996Xcf.c
+++ b/drivers/media/usb/gspca/w996Xcf.c
@@ -430,11 +430,11 @@ static void w9968cf_set_crop_window(struct sd *sd)
         #define SC(x) ((x) << 10)
 
         /* Scaling factors */
-        fw = SC(sd->gspca_dev.width) / max_width;
-        fh = SC(sd->gspca_dev.height) / max_height;
+        fw = SC(sd->gspca_dev.pixfmt.width) / max_width;
+        fh = SC(sd->gspca_dev.pixfmt.height) / max_height;
 
-        cw = (fw >= fh) ? max_width : SC(sd->gspca_dev.width) / fh;
-        ch = (fw >= fh) ? SC(sd->gspca_dev.height) / fw : max_height;
+        cw = (fw >= fh) ? max_width : SC(sd->gspca_dev.pixfmt.width) / fh;
+        ch = (fw >= fh) ? SC(sd->gspca_dev.pixfmt.height) / fw : max_height;
 
         sd->sensor_width = max_width;
         sd->sensor_height = max_height;
@@ -454,34 +454,34 @@ static void w9968cf_mode_init_regs(struct sd *sd)
 
         w9968cf_set_crop_window(sd);
 
-        reg_w(sd, 0x14, sd->gspca_dev.width);
-        reg_w(sd, 0x15, sd->gspca_dev.height);
+        reg_w(sd, 0x14, sd->gspca_dev.pixfmt.width);
+        reg_w(sd, 0x15, sd->gspca_dev.pixfmt.height);
 
         /* JPEG width & height */
-        reg_w(sd, 0x30, sd->gspca_dev.width);
-        reg_w(sd, 0x31, sd->gspca_dev.height);
+        reg_w(sd, 0x30, sd->gspca_dev.pixfmt.width);
+        reg_w(sd, 0x31, sd->gspca_dev.pixfmt.height);
 
         /* Y & UV frame buffer strides (in WORD) */
         if (w9968cf_vga_mode[sd->gspca_dev.curr_mode].pixelformat ==
             V4L2_PIX_FMT_JPEG) {
-                reg_w(sd, 0x2c, sd->gspca_dev.width / 2);
-                reg_w(sd, 0x2d, sd->gspca_dev.width / 4);
+                reg_w(sd, 0x2c, sd->gspca_dev.pixfmt.width / 2);
+                reg_w(sd, 0x2d, sd->gspca_dev.pixfmt.width / 4);
         } else
-                reg_w(sd, 0x2c, sd->gspca_dev.width);
+                reg_w(sd, 0x2c, sd->gspca_dev.pixfmt.width);
 
         reg_w(sd, 0x00, 0xbf17); /* reset everything */
         reg_w(sd, 0x00, 0xbf10); /* normal operation */
 
         /* Transfer size in WORDS (for UYVY format only) */
-        val = sd->gspca_dev.width * sd->gspca_dev.height;
+        val = sd->gspca_dev.pixfmt.width * sd->gspca_dev.pixfmt.height;
         reg_w(sd, 0x3d, val & 0xffff); /* low bits */
         reg_w(sd, 0x3e, val >> 16);    /* high bits */
 
         if (w9968cf_vga_mode[sd->gspca_dev.curr_mode].pixelformat ==
             V4L2_PIX_FMT_JPEG) {
                 /* We may get called multiple times (usb isoc bw negotiat.) */
-                jpeg_define(sd->jpeg_hdr, sd->gspca_dev.height,
-                            sd->gspca_dev.width, 0x22); /* JPEG 420 */
+                jpeg_define(sd->jpeg_hdr, sd->gspca_dev.pixfmt.height,
+                            sd->gspca_dev.pixfmt.width, 0x22); /* JPEG 420 */
                 jpeg_set_qual(sd->jpeg_hdr, v4l2_ctrl_g_ctrl(sd->jpegqual));
                 w9968cf_upload_quantizationtables(sd);
                 v4l2_ctrl_grab(sd->jpegqual, true);
diff --git a/drivers/media/usb/gspca/xirlink_cit.c b/drivers/media/usb/gspca/xirlink_cit.c
index 7eaf64eb867c..a41aa7817c54 100644
--- a/drivers/media/usb/gspca/xirlink_cit.c
+++ b/drivers/media/usb/gspca/xirlink_cit.c
@@ -1471,14 +1471,14 @@ static int cit_get_clock_div(struct gspca_dev *gspca_dev)
 
         while (clock_div > 3 &&
                         1000 * packet_size >
-                        gspca_dev->width * gspca_dev->height *
+                        gspca_dev->pixfmt.width * gspca_dev->pixfmt.height *
                         fps[clock_div - 1] * 3 / 2)
                 clock_div--;
 
         PDEBUG(D_PROBE,
                "PacketSize: %d, res: %dx%d -> using clockdiv: %d (%d fps)",
-               packet_size, gspca_dev->width, gspca_dev->height, clock_div,
-               fps[clock_div]);
+               packet_size, gspca_dev->pixfmt.width, gspca_dev->pixfmt.height,
+               clock_div, fps[clock_div]);
 
         return clock_div;
 }
@@ -1502,7 +1502,7 @@ static int cit_start_model0(struct gspca_dev *gspca_dev)
         cit_write_reg(gspca_dev, 0x0002, 0x0426);
         cit_write_reg(gspca_dev, 0x0014, 0x0427);
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160: /* 160x120 */
                 cit_write_reg(gspca_dev, 0x0004, 0x010b);
                 cit_write_reg(gspca_dev, 0x0001, 0x010a);
@@ -1643,7 +1643,7 @@ static int cit_start_model1(struct gspca_dev *gspca_dev)
         cit_write_reg(gspca_dev, 0x00, 0x0101);
         cit_write_reg(gspca_dev, 0x00, 0x010a);
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 128: /* 128x96 */
                 cit_write_reg(gspca_dev, 0x80, 0x0103);
                 cit_write_reg(gspca_dev, 0x60, 0x0105);
@@ -1700,7 +1700,7 @@ static int cit_start_model1(struct gspca_dev *gspca_dev)
         }
 
         /* Assorted init */
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 128: /* 128x96 */
                 cit_Packet_Format1(gspca_dev, 0x2b, 0x1e);
                 cit_write_reg(gspca_dev, 0xc9, 0x0119); /* Same everywhere */
@@ -1753,7 +1753,7 @@ static int cit_start_model2(struct gspca_dev *gspca_dev)
         cit_write_reg(gspca_dev, 0x0000, 0x0108);
         cit_write_reg(gspca_dev, 0x0001, 0x0133);
         cit_write_reg(gspca_dev, 0x0001, 0x0102);
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 176: /* 176x144 */
                 cit_write_reg(gspca_dev, 0x002c, 0x0103);       /* All except 320x240 */
                 cit_write_reg(gspca_dev, 0x0000, 0x0104);       /* Same */
@@ -1792,7 +1792,7 @@ static int cit_start_model2(struct gspca_dev *gspca_dev)
 
         cit_write_reg(gspca_dev, 0x0000, 0x0100);       /* LED on */
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 176: /* 176x144 */
                 cit_write_reg(gspca_dev, 0x0050, 0x0111);
                 cit_write_reg(gspca_dev, 0x00d0, 0x0111);
@@ -1840,7 +1840,7 @@ static int cit_start_model2(struct gspca_dev *gspca_dev)
          * Magic control of CMOS sensor. Only lower values like
          * 0-3 work, and picture shifts left or right. Don't change.
          */
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 176: /* 176x144 */
                 cit_model2_Packet1(gspca_dev, 0x0014, 0x0002);
                 cit_model2_Packet1(gspca_dev, 0x0016, 0x0002); /* Horizontal shift */
@@ -1899,7 +1899,7 @@ static int cit_start_model2(struct gspca_dev *gspca_dev)
          * does not allow arbitrary values and apparently is a bit mask, to
          * be activated only at appropriate time. Don't change it randomly!
          */
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 176: /* 176x144 */
                 cit_model2_Packet1(gspca_dev, 0x0026, 0x00c2);
                 break;
@@ -2023,7 +2023,7 @@ static int cit_start_model3(struct gspca_dev *gspca_dev)
         cit_model3_Packet1(gspca_dev, 0x009e, 0x0096);
         cit_model3_Packet1(gspca_dev, 0x009f, 0x000a);
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160:
                 cit_write_reg(gspca_dev, 0x0000, 0x0101); /* Same on 160x120, 320x240 */
                 cit_write_reg(gspca_dev, 0x00a0, 0x0103); /* Same on 160x120, 320x240 */
@@ -2134,7 +2134,7 @@ static int cit_start_model3(struct gspca_dev *gspca_dev)
            like with the IBM netcam pro). */
         cit_write_reg(gspca_dev, clock_div, 0x0111); /* Clock Divider */
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160:
                 cit_model3_Packet1(gspca_dev, 0x001f, 0x0000); /* Same */
                 cit_model3_Packet1(gspca_dev, 0x0039, 0x001f); /* Same */
@@ -2211,7 +2211,7 @@ static int cit_start_model4(struct gspca_dev *gspca_dev)
         cit_write_reg(gspca_dev, 0xfffa, 0x0124);
         cit_model4_Packet1(gspca_dev, 0x0034, 0x0000);
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 128: /* 128x96 */
                 cit_write_reg(gspca_dev, 0x0070, 0x0119);
                 cit_write_reg(gspca_dev, 0x00d0, 0x0111);
@@ -2531,7 +2531,7 @@ static int cit_start_ibm_netcam_pro(struct gspca_dev *gspca_dev)
         cit_write_reg(gspca_dev, 0x00fc, 0x012b); /* Same */
         cit_write_reg(gspca_dev, 0x0022, 0x012a); /* Same */
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160: /* 160x120 */
                 cit_write_reg(gspca_dev, 0x0024, 0x010b);
                 cit_write_reg(gspca_dev, 0x0089, 0x0119);
@@ -2635,7 +2635,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
         struct usb_host_interface *alt;
         int max_packet_size;
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160:
                 max_packet_size = 450;
                 break;
@@ -2659,7 +2659,7 @@ static int sd_isoc_nego(struct gspca_dev *gspca_dev)
         int ret, packet_size, min_packet_size;
         struct usb_host_interface *alt;
 
-        switch (gspca_dev->width) {
+        switch (gspca_dev->pixfmt.width) {
         case 160:
                 min_packet_size = 200;
                 break;
@@ -2780,7 +2780,7 @@ static u8 *cit_find_sof(struct gspca_dev *gspca_dev, u8 *data, int len)
         case CIT_MODEL1:
         case CIT_MODEL3:
         case CIT_IBM_NETCAM_PRO:
-                switch (gspca_dev->width) {
+                switch (gspca_dev->pixfmt.width) {
                 case 160: /* 160x120 */
                         byte3 = 0x02;
                         byte4 = 0x0a;
@@ -2864,20 +2864,16 @@ static u8 *cit_find_sof(struct gspca_dev *gspca_dev, u8 *data, int len)
                                 if (data[i] == 0xff) {
                                         if (i >= 4)
                                                 PDEBUG(D_FRAM,
-                                                       "header found at offset: %d: %02x %02x 00 %02x %02x %02x\n",
+                                                       "header found at offset: %d: %02x %02x 00 %3ph\n",
                                                        i - 1,
                                                        data[i - 4],
                                                        data[i - 3],
-                                                       data[i],
-                                                       data[i + 1],
-                                                       data[i + 2]);
+                                                       &data[i]);
                                         else
                                                 PDEBUG(D_FRAM,
-                                                       "header found at offset: %d: 00 %02x %02x %02x\n",
+                                                       "header found at offset: %d: 00 %3ph\n",
                                                        i - 1,
-                                                       data[i],
-                                                       data[i + 1],
-                                                       data[i + 2]);
+                                                       &data[i]);
                                         return data + i + (sd->sof_len - 1);
                                 }
                                 break;
diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index cbfc2f921427..7b95d8e88a20 100644
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -6700,7 +6700,8 @@ static int sd_start(struct gspca_dev *gspca_dev)
         };
 
         /* create the JPEG header */
-        jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width,
+        jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height,
+                        gspca_dev->pixfmt.width,
                         0x21);          /* JPEG 422 */
 
         mode = gspca_dev->cam.cam_mode[gspca_dev->curr_mode].priv;
diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 6e5070774dc2..2f0c89cbac76 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -78,7 +78,8 @@ void hdpvr_delete(struct hdpvr_device *dev)
 
 static void challenge(u8 *bytes)
 {
-        u64 *i64P, tmp64;
+        __le64 *i64P;
+        u64 tmp64;
         uint i, idx;
 
         for (idx = 0; idx < 32; ++idx) {
@@ -106,10 +107,10 @@ static void challenge(u8 *bytes)
                         for (i = 0; i < 3; i++)
                                 bytes[1] *= bytes[6] + 1;
                         for (i = 0; i < 3; i++) {
-                                i64P = (u64 *)bytes;
+                                i64P = (__le64 *)bytes;
                                 tmp64 = le64_to_cpup(i64P);
-                                tmp64 <<= bytes[7] & 0x0f;
-                                *i64P += cpu_to_le64(tmp64);
+                                tmp64 = tmp64 + (tmp64 << (bytes[7] & 0x0f));
+                                *i64P = cpu_to_le64(tmp64);
                         }
                         break;
                 }
@@ -301,8 +302,6 @@ static int hdpvr_probe(struct usb_interface *interface,
                 goto error;
         }
 
-        dev->workqueue = 0;
-
         /* init video transfer queues first of all */
         /* to prevent oops in hdpvr_delete() on error paths */
         INIT_LIST_HEAD(&dev->free_buff_list);
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
index c4d51d78f837..ea05f678b559 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -2868,7 +2868,7 @@ static void pvr2_subdev_set_control(struct pvr2_hdw *hdw, int id,
                 pvr2_subdev_set_control(hdw, id, #lab, (hdw)->lab##_val); \
         }
 
-v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
+static v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
 {
         v4l2_std_id std;
         std = (v4l2_std_id)hdw->std_mask_avail;
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c
index 03761c6f472f..05bd91a60c09 100644
--- a/drivers/media/usb/siano/smsusb.c
+++ b/drivers/media/usb/siano/smsusb.c
@@ -209,8 +209,10 @@ static int smsusb_sendrequest(void *context, void *buffer, size_t size)
         struct sms_msg_hdr *phdr = (struct sms_msg_hdr *) buffer;
         int dummy;
 
-        if (dev->state != SMSUSB_ACTIVE)
+        if (dev->state != SMSUSB_ACTIVE) {
+                sms_debug("Device not active yet");
                 return -ENOENT;
+        }
 
         sms_debug("sending %s(%d) size: %d",
                   smscore_translate_msg(phdr->msg_type), phdr->msg_type,
@@ -243,6 +245,9 @@ static int smsusb1_load_firmware(struct usb_device *udev, int id, int board_id)
         int rc, dummy;
         char *fw_filename;
 
+        if (id < 0)
+                id = sms_get_board(board_id)->default_mode;
+
         if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) {
                 sms_err("invalid firmware id specified %d", id);
                 return -EINVAL;
@@ -445,14 +450,15 @@ static int smsusb_probe(struct usb_interface *intf,
         char devpath[32];
         int i, rc;
 
-        sms_info("interface number %d",
+        sms_info("board id=%lu, interface number %d",
+                 id->driver_info,
                  intf->cur_altsetting->desc.bInterfaceNumber);
 
         if (sms_get_board(id->driver_info)->intf_num !=
             intf->cur_altsetting->desc.bInterfaceNumber) {
-                sms_err("interface number is %d expecting %d",
-                        sms_get_board(id->driver_info)->intf_num,
-                        intf->cur_altsetting->desc.bInterfaceNumber);
+                sms_debug("interface %d won't be used. Expecting interface %d to popup",
+                        intf->cur_altsetting->desc.bInterfaceNumber,
+                        sms_get_board(id->driver_info)->intf_num);
                 return -ENODEV;
         }
 
@@ -483,22 +489,32 @@ static int smsusb_probe(struct usb_interface *intf,
         }
         if ((udev->actconfig->desc.bNumInterfaces == 2) &&
             (intf->cur_altsetting->desc.bInterfaceNumber == 0)) {
-                sms_err("rom interface 0 is not used");
+                sms_debug("rom interface 0 is not used");
                 return -ENODEV;
         }
 
         if (id->driver_info == SMS1XXX_BOARD_SIANO_STELLAR_ROM) {
-                sms_info("stellar device was found.");
+                /* Detected a Siano Stellar uninitialized */
+
                 snprintf(devpath, sizeof(devpath), "usb\\%d-%s",
                          udev->bus->busnum, udev->devpath);
-                sms_info("stellar device was found.");
-                return smsusb1_load_firmware(
+                sms_info("stellar device in cold state was found at %s.", devpath);
+                rc = smsusb1_load_firmware(
                                 udev, smscore_registry_getmode(devpath),
                                 id->driver_info);
+
+                /* This device will reset and gain another USB ID */
+                if (!rc)
+                        sms_info("stellar device now in warm state");
+                else
+                        sms_err("Failed to put stellar in warm state. Error: %d", rc);
+
+                return rc;
+        } else {
+                rc = smsusb_init_device(intf, id->driver_info);
         }
 
-        rc = smsusb_init_device(intf, id->driver_info);
-        sms_info("rc %d", rc);
+        sms_info("Device initialized with return code %d", rc);
         sms_board_load_modules(id->driver_info);
         return rc;
 }
@@ -550,10 +566,13 @@ static int smsusb_resume(struct usb_interface *intf)
 }
 
 static const struct usb_device_id smsusb_id_table[] = {
+        /* This device is only present before firmware load */
         { USB_DEVICE(0x187f, 0x0010),
-                .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
+                .driver_info = SMS1XXX_BOARD_SIANO_STELLAR_ROM },
+        /* This device pops up after firmware load */
         { USB_DEVICE(0x187f, 0x0100),
                 .driver_info = SMS1XXX_BOARD_SIANO_STELLAR },
+
         { USB_DEVICE(0x187f, 0x0200),
                 .driver_info = SMS1XXX_BOARD_SIANO_NOVA_A },
         { USB_DEVICE(0x187f, 0x0201),
diff --git a/drivers/media/usb/tlg2300/pd-main.c b/drivers/media/usb/tlg2300/pd-main.c
index 95f94e5aa66d..3316caa4733b 100644
--- a/drivers/media/usb/tlg2300/pd-main.c
+++ b/drivers/media/usb/tlg2300/pd-main.c
@@ -232,7 +232,7 @@ static int firmware_download(struct usb_device *udev)
                 goto out;
         }
 
-        max_packet_size = udev->ep_out[0x1]->desc.wMaxPacketSize;
+        max_packet_size = le16_to_cpu(udev->ep_out[0x1]->desc.wMaxPacketSize);
         log("\t\t download size : %d", (int)max_packet_size);
 
         for (offset = 0; offset < fwlength; offset += max_packet_size) {
diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c
index e52c3b97f304..29724af9b9ab 100644
--- a/drivers/media/usb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c
@@ -366,7 +366,7 @@ static int ttusb_dec_get_stb_state (struct ttusb_dec *dec, unsigned int *mode,
                 }
                 return 0;
         } else {
-                return -1;
+                return -ENOENT;
         }
 }
 
@@ -1241,6 +1241,8 @@ static void ttusb_dec_init_v_pes(struct ttusb_dec *dec)
 
 static int ttusb_dec_init_usb(struct ttusb_dec *dec)
 {
+        int result;
+
         dprintk("%s\n", __func__);
 
         mutex_init(&dec->usb_mutex);
@@ -1258,7 +1260,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
                         return -ENOMEM;
                 }
                 dec->irq_buffer = usb_alloc_coherent(dec->udev,IRQ_PACKET_SIZE,
-                                        GFP_ATOMIC, &dec->irq_dma_handle);
+                                        GFP_KERNEL, &dec->irq_dma_handle);
                 if(!dec->irq_buffer) {
                         usb_free_urb(dec->irq_urb);
                         return -ENOMEM;
@@ -1270,7 +1272,13 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
                 dec->irq_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
         }
 
-        return ttusb_dec_alloc_iso_urbs(dec);
+        result = ttusb_dec_alloc_iso_urbs(dec);
+        if (result) {
+                usb_free_urb(dec->irq_urb);
+                usb_free_coherent(dec->udev, IRQ_PACKET_SIZE,
+                                  dec->irq_buffer, dec->irq_dma_handle);
+        }
+        return result;
 }
 
 static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
@@ -1293,10 +1301,11 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
 
         dprintk("%s\n", __func__);
 
-        if (request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev)) {
+        result = request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev);
+        if (result) {
                 printk(KERN_ERR "%s: Firmware (%s) unavailable.\n",
                        __func__, dec->firmware_name);
-                return 1;
+                return result;
         }
 
         firmware = fw_entry->data;
@@ -1306,7 +1315,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
                 printk("%s: firmware size too small for DSP code (%zu < 60).\n",
                         __func__, firmware_size);
                 release_firmware(fw_entry);
-                return -1;
+                return -ENOENT;
         }
 
         /* a 32 bit checksum over the first 56 bytes of the DSP Code is stored
@@ -1320,7 +1329,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
                        "0x%08x != 0x%08x in file), file invalid.\n",
                         __func__, crc32_csum, crc32_check);
                 release_firmware(fw_entry);
-                return -1;
+                return -ENOENT;
         }
         memcpy(idstring, &firmware[36], 20);
         idstring[20] = '\0';
@@ -1389,55 +1398,48 @@ static int ttusb_dec_init_stb(struct ttusb_dec *dec)
         dprintk("%s\n", __func__);
 
         result = ttusb_dec_get_stb_state(dec, &mode, &model, &version);
+        if (result)
+                return result;
 
-        if (!result) {
-                if (!mode) {
-                        if (version == 0xABCDEFAB)
-                                printk(KERN_INFO "ttusb_dec: no version "
-                                       "info in Firmware\n");
-                        else
-                                printk(KERN_INFO "ttusb_dec: Firmware "
-                                       "%x.%02x%c%c\n",
-                                       version >> 24, (version >> 16) & 0xff,
-                                       (version >> 8) & 0xff, version & 0xff);
-
-                        result = ttusb_dec_boot_dsp(dec);
-                        if (result)
-                                return result;
-                        else
-                                return 1;
-                } else {
-                        /* We can't trust the USB IDs that some firmwares
-                           give the box */
-                        switch (model) {
-                        case 0x00070001:
-                        case 0x00070008:
-                        case 0x0007000c:
-                                ttusb_dec_set_model(dec, TTUSB_DEC3000S);
-                                break;
-                        case 0x00070009:
-                        case 0x00070013:
-                                ttusb_dec_set_model(dec, TTUSB_DEC2000T);
-                                break;
-                        case 0x00070011:
-                                ttusb_dec_set_model(dec, TTUSB_DEC2540T);
-                                break;
-                        default:
-                                printk(KERN_ERR "%s: unknown model returned "
-                                       "by firmware (%08x) - please report\n",
-                                       __func__, model);
-                                return -1;
-                                break;
-                        }
+        if (!mode) {
+                if (version == 0xABCDEFAB)
+                        printk(KERN_INFO "ttusb_dec: no version "
+                               "info in Firmware\n");
+                else
+                        printk(KERN_INFO "ttusb_dec: Firmware "
+                               "%x.%02x%c%c\n",
+                               version >> 24, (version >> 16) & 0xff,
+                               (version >> 8) & 0xff, version & 0xff);
 
+                result = ttusb_dec_boot_dsp(dec);
+                if (result)
+                        return result;
+        } else {
+                /* We can't trust the USB IDs that some firmwares
+                   give the box */
+                switch (model) {
+                case 0x00070001:
+                case 0x00070008:
+                case 0x0007000c:
+                        ttusb_dec_set_model(dec, TTUSB_DEC3000S);
+                        break;
+                case 0x00070009:
+                case 0x00070013:
+                        ttusb_dec_set_model(dec, TTUSB_DEC2000T);
+                        break;
+                case 0x00070011:
+                        ttusb_dec_set_model(dec, TTUSB_DEC2540T);
+                        break;
+                default:
+                        printk(KERN_ERR "%s: unknown model returned "
+                               "by firmware (%08x) - please report\n",
+                               __func__, model);
+                        return -ENOENT;
+                }
                         if (version >= 0x01770000)
                                 dec->can_playback = 1;
-
-                        return 0;
-                }
         }
-        else
-                return result;
+        return 0;
 }
 
 static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
@@ -1539,19 +1541,7 @@ static void ttusb_dec_exit_dvb(struct ttusb_dec *dec)
 
 static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
 {
-
         dprintk("%s\n", __func__);
-        /* we have to check whether the irq URB is already submitted.
-          * As the irq is submitted after the interface is changed,
-          * this is the best method i figured out.
-          * Any others?*/
-        if (dec->interface == TTUSB_DEC_INTERFACE_IN)
-                usb_kill_urb(dec->irq_urb);
-
-        usb_free_urb(dec->irq_urb);
-
-        usb_free_coherent(dec->udev,IRQ_PACKET_SIZE,
-                          dec->irq_buffer, dec->irq_dma_handle);
 
         if (dec->rc_input_dev) {
                 input_unregister_device(dec->rc_input_dev);
@@ -1566,6 +1556,20 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec)
 
         dprintk("%s\n", __func__);
 
+        if (enable_rc) {
+                /* we have to check whether the irq URB is already submitted.
+                 * As the irq is submitted after the interface is changed,
+                 * this is the best method i figured out.
+                 * Any others?*/
+                if (dec->interface == TTUSB_DEC_INTERFACE_IN)
+                        usb_kill_urb(dec->irq_urb);
+
+                usb_free_urb(dec->irq_urb);
+
+                usb_free_coherent(dec->udev, IRQ_PACKET_SIZE,
+                                  dec->irq_buffer, dec->irq_dma_handle);
+        }
+
         dec->iso_stream_count = 0;
 
         for (i = 0; i < ISO_BUF_COUNT; i++)
@@ -1623,6 +1627,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
 {
         struct usb_device *udev;
         struct ttusb_dec *dec;
+        int result;
 
         dprintk("%s\n", __func__);
 
@@ -1651,13 +1656,15 @@ static int ttusb_dec_probe(struct usb_interface *intf,
 
         dec->udev = udev;
 
-        if (ttusb_dec_init_usb(dec))
-                return 0;
-        if (ttusb_dec_init_stb(dec)) {
-                ttusb_dec_exit_usb(dec);
-                return 0;
-        }
-        ttusb_dec_init_dvb(dec);
+        result = ttusb_dec_init_usb(dec);
+        if (result)
+                goto err_usb;
+        result = ttusb_dec_init_stb(dec);
+        if (result)
+                goto err_stb;
+        result = ttusb_dec_init_dvb(dec);
+        if (result)
+                goto err_stb;
 
         dec->adapter.priv = dec;
         switch (id->idProduct) {
@@ -1696,6 +1703,11 @@ static int ttusb_dec_probe(struct usb_interface *intf,
                 ttusb_init_rc(dec);
 
         return 0;
+err_stb:
+        ttusb_dec_exit_usb(dec);
+err_usb:
+        kfree(dec);
+        return result;
 }
 
 static void ttusb_dec_disconnect(struct usb_interface *intf)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index a2f4501c23ca..0eb82106d2ff 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -664,7 +664,7 @@ static struct uvc_control_mapping uvc_ctrl_mappings[] = {
                 .size           = 32,
                 .offset         = 0,
                 .v4l2_type      = V4L2_CTRL_TYPE_INTEGER,
-                .data_type      = UVC_CTRL_DATA_TYPE_UNSIGNED,
+                .data_type      = UVC_CTRL_DATA_TYPE_SIGNED,
         },
         {
                 .id             = V4L2_CID_TILT_ABSOLUTE,
@@ -674,7 +674,7 @@ static struct uvc_control_mapping uvc_ctrl_mappings[] = {
                 .size           = 32,
                 .offset         = 32,
                 .v4l2_type      = V4L2_CTRL_TYPE_INTEGER,
-                .data_type      = UVC_CTRL_DATA_TYPE_UNSIGNED,
+                .data_type      = UVC_CTRL_DATA_TYPE_SIGNED,
         },
         {
                 .id             = V4L2_CID_PRIVACY,
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 3394c3432011..899cb6d1c4a4 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -680,7 +680,8 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
                   stream->dev->name,
                   sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
                   y, ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC,
-                  v4l2_buf->timestamp.tv_sec, v4l2_buf->timestamp.tv_usec,
+                  v4l2_buf->timestamp.tv_sec,
+                  (unsigned long)v4l2_buf->timestamp.tv_usec,
                   x1, first->host_sof, first->dev_sof,
                   x2, last->host_sof, last->dev_sof, y1, y2);
 
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index ddc9379eb276..20c09229a08e 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -43,7 +43,7 @@
 
 #define UNSET (-1U)
 
-#define PREFIX (t->i2c->driver->driver.name)
+#define PREFIX (t->i2c->dev.driver->name)
 
 /*
  * Driver modprobe parameters
@@ -247,7 +247,7 @@ static const struct analog_demod_ops tuner_analog_ops = {
 /**
  * set_type - Sets the tuner type for a given device
  *
- * @c:                  i2c_client descriptoy
+ * @c:                  i2c_client descriptor
  * @type:               type of the tuner (e. g. tuner number)
  * @new_mode_mask:      Indicates if tuner supports TV and/or Radio
  * @new_config:         an optional parameter used by a few tuners to adjust
@@ -452,7 +452,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
         }
 
         tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
-                  c->adapter->name, c->driver->driver.name, c->addr << 1, type,
+                  c->adapter->name, c->dev.driver->name, c->addr << 1, type,
                   t->mode_mask);
         return;
 
@@ -556,7 +556,7 @@ static void tuner_lookup(struct i2c_adapter *adap,
                 int mode_mask;
 
                 if (pos->i2c->adapter != adap ||
-                    strcmp(pos->i2c->driver->driver.name, "tuner"))
+                    strcmp(pos->i2c->dev.driver->name, "tuner"))
                         continue;
 
                 mode_mask = pos->mode_mask;
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index c85d69da35bd..85a6a34128a8 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -189,30 +189,53 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
         struct v4l2_subdev *sd, *tmp;
         unsigned int notif_n_subdev = notifier->num_subdevs;
         unsigned int n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS);
-        struct device *dev[n_subdev];
+        struct device **dev;
         int i = 0;
 
         if (!notifier->v4l2_dev)
                 return;
 
+        dev = kmalloc(n_subdev * sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                dev_err(notifier->v4l2_dev->dev,
+                        "Failed to allocate device cache!\n");
+        }
+
         mutex_lock(&list_lock);
 
         list_del(&notifier->list);
 
         list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {
-                dev[i] = get_device(sd->dev);
+                struct device *d;
+
+                d = get_device(sd->dev);
 
                 v4l2_async_cleanup(sd);
 
                 /* If we handled USB devices, we'd have to lock the parent too */
-                device_release_driver(dev[i++]);
+                device_release_driver(d);
 
                 if (notifier->unbind)
                         notifier->unbind(notifier, sd, sd->asd);
+
+                /*
+                 * Store device at the device cache, in order to call
+                 * put_device() on the final step
+                 */
+                if (dev)
+                        dev[i++] = d;
+                else
+                        put_device(d);
         }
 
         mutex_unlock(&list_lock);
 
+        /*
+         * Call device_attach() to reprobe devices
+         *
+         * NOTE: If dev allocation fails, i is 0, and the whole loop won't be
+         * executed.
+         */
         while (i--) {
                 struct device *d = dev[i];
 
@@ -228,6 +251,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
                 }
                 put_device(d);
         }
+        kfree(dev);
 
         notifier->v4l2_dev = NULL;
 
diff --git a/drivers/media/v4l2-core/v4l2-clk.c b/drivers/media/v4l2-core/v4l2-clk.c
index b67de8642b5a..e18cc0469cf8 100644
--- a/drivers/media/v4l2-core/v4l2-clk.c
+++ b/drivers/media/v4l2-core/v4l2-clk.c
@@ -240,3 +240,42 @@ void v4l2_clk_unregister(struct v4l2_clk *clk)
         kfree(clk);
 }
 EXPORT_SYMBOL(v4l2_clk_unregister);
+
+struct v4l2_clk_fixed {
+        unsigned long rate;
+        struct v4l2_clk_ops ops;
+};
+
+static unsigned long fixed_get_rate(struct v4l2_clk *clk)
+{
+        struct v4l2_clk_fixed *priv = clk->priv;
+        return priv->rate;
+}
+
+struct v4l2_clk *__v4l2_clk_register_fixed(const char *dev_id,
+                const char *id, unsigned long rate, struct module *owner)
+{
+        struct v4l2_clk *clk;
+        struct v4l2_clk_fixed *priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+
+        if (!priv)
+                return ERR_PTR(-ENOMEM);
+
+        priv->rate = rate;
+        priv->ops.get_rate = fixed_get_rate;
+        priv->ops.owner = owner;
+
+        clk = v4l2_clk_register(&priv->ops, dev_id, id, priv);
+        if (IS_ERR(clk))
+                kfree(priv);
+
+        return clk;
+}
+EXPORT_SYMBOL(__v4l2_clk_register_fixed);
+
+void v4l2_clk_unregister_fixed(struct v4l2_clk *clk)
+{
+        kfree(clk->priv);
+        v4l2_clk_unregister(clk);
+}
+EXPORT_SYMBOL(v4l2_clk_unregister_fixed);
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 037d7a55aa8c..433d6d77942e 100644
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -236,14 +236,14 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
         v4l2_subdev_init(sd, ops);
         sd->flags |= V4L2_SUBDEV_FL_IS_I2C;
         /* the owner is the same as the i2c_client's driver owner */
-        sd->owner = client->driver->driver.owner;
+        sd->owner = client->dev.driver->owner;
         sd->dev = &client->dev;
         /* i2c_client and v4l2_subdev point to one another */
         v4l2_set_subdevdata(sd, client);
         i2c_set_clientdata(client, sd);
         /* initialize name */
         snprintf(sd->name, sizeof(sd->name), "%s %d-%04x",
-                client->driver->driver.name, i2c_adapter_id(client->adapter),
+                client->dev.driver->name, i2c_adapter_id(client->adapter),
                 client->addr);
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_init);
@@ -274,11 +274,11 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
            loaded. This delay-load mechanism doesn't work if other drivers
            want to use the i2c device, so explicitly loading the module
            is the best alternative. */
-        if (client == NULL || client->driver == NULL)
+        if (client == NULL || client->dev.driver == NULL)
                 goto error;
 
         /* Lock the module so we can safely get the v4l2_subdev pointer */
-        if (!try_module_get(client->driver->driver.owner))
+        if (!try_module_get(client->dev.driver->owner))
                 goto error;
         sd = i2c_get_clientdata(client);
 
@@ -287,7 +287,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
         if (v4l2_device_register_subdev(v4l2_dev, sd))
                 sd = NULL;
         /* Decrease the module use count to match the first try_module_get. */
-        module_put(client->driver->driver.owner);
+        module_put(client->dev.driver->owner);
 
 error:
         /* If we have a client but no subdev, then something went wrong and
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index c3f080388684..60dcc0f3b32e 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -565,13 +565,13 @@ EXPORT_SYMBOL(v4l2_ctrl_get_menu);
  * Returns NULL or an s64 type array containing the menu for given
  * control ID. The total number of the menu items is returned in @len.
  */
-const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len)
+const s64 *v4l2_ctrl_get_int_menu(u32 id, u32 *len)
 {
-        static const s64 const qmenu_int_vpx_num_partitions[] = {
+        static const s64 qmenu_int_vpx_num_partitions[] = {
                 1, 2, 4, 8,
         };
 
-        static const s64 const qmenu_int_vpx_num_ref_frames[] = {
+        static const s64 qmenu_int_vpx_num_ref_frames[] = {
                 1, 2, 3,
         };
 
@@ -583,7 +583,7 @@ const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len)
         default:
                 *len = 0;
                 return NULL;
-        };
+        }
 }
 EXPORT_SYMBOL(v4l2_ctrl_get_int_menu);
 
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 7c4371288215..73035ee0f4de 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -41,6 +41,8 @@ module_param(debug, bool, 0644);
 #define TRANS_QUEUED            (1 << 0)
 /* Instance is currently running in hardware */
 #define TRANS_RUNNING           (1 << 1)
+/* Instance is currently aborting */
+#define TRANS_ABORT             (1 << 2)
 
 
 /* Offset base for buffers on the destination queue - used to distinguish
@@ -221,6 +223,14 @@ static void v4l2_m2m_try_schedule(struct v4l2_m2m_ctx *m2m_ctx)
         }
 
         spin_lock_irqsave(&m2m_dev->job_spinlock, flags_job);
+
+        /* If the context is aborted then don't schedule it */
+        if (m2m_ctx->job_flags & TRANS_ABORT) {
+                spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
+                dprintk("Aborted context\n");
+                return;
+        }
+
         if (m2m_ctx->job_flags & TRANS_QUEUED) {
                 spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
                 dprintk("On job queue already\n");
@@ -280,6 +290,8 @@ static void v4l2_m2m_cancel_job(struct v4l2_m2m_ctx *m2m_ctx)
 
         m2m_dev = m2m_ctx->m2m_dev;
         spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
+
+        m2m_ctx->job_flags |= TRANS_ABORT;
         if (m2m_ctx->job_flags & TRANS_RUNNING) {
                 spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
                 m2m_dev->m2m_ops->job_abort(m2m_ctx->priv);
@@ -480,13 +492,15 @@ int v4l2_m2m_streamoff(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
         m2m_dev = m2m_ctx->m2m_dev;
         spin_lock_irqsave(&m2m_dev->job_spinlock, flags_job);
         /* We should not be scheduled anymore, since we're dropping a queue. */
-        INIT_LIST_HEAD(&m2m_ctx->queue);
+        if (m2m_ctx->job_flags & TRANS_QUEUED)
+                list_del(&m2m_ctx->queue);
         m2m_ctx->job_flags = 0;
 
         spin_lock_irqsave(&q_ctx->rdy_spinlock, flags);
         /* Drop queue, since streamoff returns device to the same state as after
          * calling reqbufs. */
         INIT_LIST_HEAD(&q_ctx->rdy_queue);
+        q_ctx->num_rdy = 0;
         spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags);
 
         if (m2m_dev->curr_ctx == m2m_ctx) {
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index de0e87f0b2c3..b19b306c8f7f 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -241,7 +241,8 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
                 q->bufs[q->num_buffers + buffer] = vb;
         }
 
-        __setup_offsets(q, buffer);
+        if (memory == V4L2_MEMORY_MMAP)
+                __setup_offsets(q, buffer);
 
         dprintk(1, "Allocated %d buffers, %d plane(s) each\n",
                         buffer, num_planes);
@@ -1015,6 +1016,10 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 
                 /* Check if the provided plane buffer is large enough */
                 if (planes[plane].length < q->plane_sizes[plane]) {
+                        dprintk(1, "qbuf: provided buffer size %u is less than "
+                                                "setup size %u for plane %d\n",
+                                                planes[plane].length,
+                                                q->plane_sizes[plane], plane);
                         ret = -EINVAL;
                         goto err;
                 }
@@ -1205,8 +1210,11 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b)
         int ret;
 
         ret = __verify_length(vb, b);
-        if (ret < 0)
+        if (ret < 0) {
+                dprintk(1, "%s(): plane parameters verification failed: %d\n",
+                        __func__, ret);
                 return ret;
+        }
 
         switch (q->memory) {
         case V4L2_MEMORY_MMAP:
@@ -2469,10 +2477,11 @@ size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
 }
 EXPORT_SYMBOL_GPL(vb2_read);
 
-size_t vb2_write(struct vb2_queue *q, char __user *data, size_t count,
+size_t vb2_write(struct vb2_queue *q, const char __user *data, size_t count,
                 loff_t *ppos, int nonblocking)
 {
-        return __vb2_perform_fileio(q, data, count, ppos, nonblocking, 0);
+        return __vb2_perform_fileio(q, (char __user *) data, count,
+                                                        ppos, nonblocking, 0);
 }
 EXPORT_SYMBOL_GPL(vb2_write);
 
@@ -2633,7 +2642,7 @@ int vb2_fop_release(struct file *file)
 }
 EXPORT_SYMBOL_GPL(vb2_fop_release);
 
-ssize_t vb2_fop_write(struct file *file, char __user *buf,
+ssize_t vb2_fop_write(struct file *file, const char __user *buf,
                 size_t count, loff_t *ppos)
 {
         struct video_device *vdev = video_devdata(file);
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index 16ae3dcc7e29..2f860543912c 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -35,17 +35,61 @@ struct vb2_dma_sg_buf {
         struct page                     **pages;
         int                             write;
         int                             offset;
-        struct vb2_dma_sg_desc          sg_desc;
+        struct sg_table                 sg_table;
+        size_t                          size;
+        unsigned int                    num_pages;
         atomic_t                        refcount;
         struct vb2_vmarea_handler       handler;
 };
 
 static void vb2_dma_sg_put(void *buf_priv);
 
+static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf,
+                gfp_t gfp_flags)
+{
+        unsigned int last_page = 0;
+        int size = buf->size;
+
+        while (size > 0) {
+                struct page *pages;
+                int order;
+                int i;
+
+                order = get_order(size);
+                /* Dont over allocate*/
+                if ((PAGE_SIZE << order) > size)
+                        order--;
+
+                pages = NULL;
+                while (!pages) {
+                        pages = alloc_pages(GFP_KERNEL | __GFP_ZERO |
+                                        __GFP_NOWARN | gfp_flags, order);
+                        if (pages)
+                                break;
+
+                        if (order == 0) {
+                                while (last_page--)
+                                        __free_page(buf->pages[last_page]);
+                                return -ENOMEM;
+                        }
+                        order--;
+                }
+
+                split_page(pages, order);
+                for (i = 0; i < (1 << order); i++)
+                        buf->pages[last_page++] = &pages[i];
+
+                size -= PAGE_SIZE << order;
+        }
+
+        return 0;
+}
+
 static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
 {
         struct vb2_dma_sg_buf *buf;
-        int i;
+        int ret;
+        int num_pages;
 
         buf = kzalloc(sizeof *buf, GFP_KERNEL);
         if (!buf)
@@ -54,29 +98,23 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla
         buf->vaddr = NULL;
         buf->write = 0;
         buf->offset = 0;
-        buf->sg_desc.size = size;
+        buf->size = size;
         /* size is already page aligned */
-        buf->sg_desc.num_pages = size >> PAGE_SHIFT;
+        buf->num_pages = size >> PAGE_SHIFT;
 
-        buf->sg_desc.sglist = vzalloc(buf->sg_desc.num_pages *
-                                      sizeof(*buf->sg_desc.sglist));
-        if (!buf->sg_desc.sglist)
-                goto fail_sglist_alloc;
-        sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages);
-
-        buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *),
+        buf->pages = kzalloc(buf->num_pages * sizeof(struct page *),
                              GFP_KERNEL);
         if (!buf->pages)
                 goto fail_pages_array_alloc;
 
-        for (i = 0; i < buf->sg_desc.num_pages; ++i) {
-                buf->pages[i] = alloc_page(GFP_KERNEL | __GFP_ZERO |
-                                           __GFP_NOWARN | gfp_flags);
-                if (NULL == buf->pages[i])
-                        goto fail_pages_alloc;
-                sg_set_page(&buf->sg_desc.sglist[i],
-                            buf->pages[i], PAGE_SIZE, 0);
-        }
+        ret = vb2_dma_sg_alloc_compacted(buf, gfp_flags);
+        if (ret)
+                goto fail_pages_alloc;
+
+        ret = sg_alloc_table_from_pages(&buf->sg_table, buf->pages,
+                        buf->num_pages, 0, size, gfp_flags);
+        if (ret)
+                goto fail_table_alloc;
 
         buf->handler.refcount = &buf->refcount;
         buf->handler.put = vb2_dma_sg_put;
@@ -85,18 +123,16 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla
         atomic_inc(&buf->refcount);
 
         dprintk(1, "%s: Allocated buffer of %d pages\n",
-                __func__, buf->sg_desc.num_pages);
+                __func__, buf->num_pages);
         return buf;
 
+fail_table_alloc:
+        num_pages = buf->num_pages;
+        while (num_pages--)
+                __free_page(buf->pages[num_pages]);
 fail_pages_alloc:
-        while (--i >= 0)
-                __free_page(buf->pages[i]);
         kfree(buf->pages);
-
 fail_pages_array_alloc:
-        vfree(buf->sg_desc.sglist);
-
-fail_sglist_alloc:
         kfree(buf);
         return NULL;
 }
@@ -104,14 +140,14 @@ fail_sglist_alloc:
 static void vb2_dma_sg_put(void *buf_priv)
 {
         struct vb2_dma_sg_buf *buf = buf_priv;
-        int i = buf->sg_desc.num_pages;
+        int i = buf->num_pages;
 
         if (atomic_dec_and_test(&buf->refcount)) {
                 dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
-                        buf->sg_desc.num_pages);
+                        buf->num_pages);
                 if (buf->vaddr)
-                        vm_unmap_ram(buf->vaddr, buf->sg_desc.num_pages);
-                vfree(buf->sg_desc.sglist);
+                        vm_unmap_ram(buf->vaddr, buf->num_pages);
+                sg_free_table(&buf->sg_table);
                 while (--i >= 0)
                         __free_page(buf->pages[i]);
                 kfree(buf->pages);
@@ -124,7 +160,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
 {
         struct vb2_dma_sg_buf *buf;
         unsigned long first, last;
-        int num_pages_from_user, i;
+        int num_pages_from_user;
 
         buf = kzalloc(sizeof *buf, GFP_KERNEL);
         if (!buf)
@@ -133,56 +169,41 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
         buf->vaddr = NULL;
         buf->write = write;
         buf->offset = vaddr & ~PAGE_MASK;
-        buf->sg_desc.size = size;
+        buf->size = size;
 
         first = (vaddr           & PAGE_MASK) >> PAGE_SHIFT;
         last  = ((vaddr + size - 1) & PAGE_MASK) >> PAGE_SHIFT;
-        buf->sg_desc.num_pages = last - first + 1;
-
-        buf->sg_desc.sglist = vzalloc(
-                buf->sg_desc.num_pages * sizeof(*buf->sg_desc.sglist));
-        if (!buf->sg_desc.sglist)
-                goto userptr_fail_sglist_alloc;
-
-        sg_init_table(buf->sg_desc.sglist, buf->sg_desc.num_pages);
+        buf->num_pages = last - first + 1;
 
-        buf->pages = kzalloc(buf->sg_desc.num_pages * sizeof(struct page *),
+        buf->pages = kzalloc(buf->num_pages * sizeof(struct page *),
                              GFP_KERNEL);
         if (!buf->pages)
-                goto userptr_fail_pages_array_alloc;
+                return NULL;
 
         num_pages_from_user = get_user_pages(current, current->mm,
                                              vaddr & PAGE_MASK,
-                                             buf->sg_desc.num_pages,
+                                             buf->num_pages,
                                              write,
                                              1, /* force */
                                              buf->pages,
                                              NULL);
 
-        if (num_pages_from_user != buf->sg_desc.num_pages)
+        if (num_pages_from_user != buf->num_pages)
                 goto userptr_fail_get_user_pages;
 
-        sg_set_page(&buf->sg_desc.sglist[0], buf->pages[0],
-                    PAGE_SIZE - buf->offset, buf->offset);
-        size -= PAGE_SIZE - buf->offset;
-        for (i = 1; i < buf->sg_desc.num_pages; ++i) {
-                sg_set_page(&buf->sg_desc.sglist[i], buf->pages[i],
-                            min_t(size_t, PAGE_SIZE, size), 0);
-                size -= min_t(size_t, PAGE_SIZE, size);
-        }
+        if (sg_alloc_table_from_pages(&buf->sg_table, buf->pages,
+                        buf->num_pages, buf->offset, size, 0))
+                goto userptr_fail_alloc_table_from_pages;
+
         return buf;
 
+userptr_fail_alloc_table_from_pages:
 userptr_fail_get_user_pages:
         dprintk(1, "get_user_pages requested/got: %d/%d]\n",
-               num_pages_from_user, buf->sg_desc.num_pages);
+               num_pages_from_user, buf->num_pages);
         while (--num_pages_from_user >= 0)
                 put_page(buf->pages[num_pages_from_user]);
         kfree(buf->pages);
-
-userptr_fail_pages_array_alloc:
-        vfree(buf->sg_desc.sglist);
-
-userptr_fail_sglist_alloc:
         kfree(buf);
         return NULL;
 }
@@ -194,18 +215,18 @@ userptr_fail_sglist_alloc:
 static void vb2_dma_sg_put_userptr(void *buf_priv)
 {
         struct vb2_dma_sg_buf *buf = buf_priv;
-        int i = buf->sg_desc.num_pages;
+        int i = buf->num_pages;
 
         dprintk(1, "%s: Releasing userspace buffer of %d pages\n",
-               __func__, buf->sg_desc.num_pages);
+               __func__, buf->num_pages);
         if (buf->vaddr)
-                vm_unmap_ram(buf->vaddr, buf->sg_desc.num_pages);
+                vm_unmap_ram(buf->vaddr, buf->num_pages);
+        sg_free_table(&buf->sg_table);
         while (--i >= 0) {
                 if (buf->write)
                         set_page_dirty_lock(buf->pages[i]);
                 put_page(buf->pages[i]);
         }
-        vfree(buf->sg_desc.sglist);
         kfree(buf->pages);
         kfree(buf);
 }
@@ -218,7 +239,7 @@ static void *vb2_dma_sg_vaddr(void *buf_priv)
 
         if (!buf->vaddr)
                 buf->vaddr = vm_map_ram(buf->pages,
-                                        buf->sg_desc.num_pages,
+                                        buf->num_pages,
                                         -1,
                                         PAGE_KERNEL);
 
@@ -274,7 +295,7 @@ static void *vb2_dma_sg_cookie(void *buf_priv)
 {
         struct vb2_dma_sg_buf *buf = buf_priv;
 
-        return &buf->sg_desc;
+        return &buf->sg_table;
 }
 
 const struct vb2_mem_ops vb2_dma_sg_memops = {
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 94b8a3324319..d87f77f790d6 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -22,7 +22,7 @@
 #include <linux/jiffies.h>
 #include <linux/of.h>
 #include <linux/i2c.h>
-#include <linux/i2c/at24.h>
+#include <linux/platform_data/at24.h>
 
 /*
  * I2C EEPROMs from most vendors are inexpensive and mostly interchangeable.
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 1a3163f1407e..29d5d988a51c 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2448,7 +2448,6 @@ static int _mmc_blk_suspend(struct mmc_card *card)
         struct mmc_blk_data *md = mmc_get_drvdata(card);
 
         if (md) {
-                pm_runtime_get_sync(&card->dev);
                 mmc_queue_suspend(&md->queue);
                 list_for_each_entry(part_md, &md->part, part) {
                         mmc_queue_suspend(&part_md->queue);
@@ -2483,7 +2482,6 @@ static int mmc_blk_resume(struct mmc_card *card)
                 list_for_each_entry(part_md, &md->part, part) {
                         mmc_queue_resume(&part_md->queue);
                 }
-                pm_runtime_put(&card->dev);
         }
         return 0;
 }
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 3e227bd91e81..64145a32b917 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -342,7 +342,7 @@ int mmc_add_card(struct mmc_card *card)
                 break;
         }
 
-        if (mmc_sd_card_uhs(card) &&
+        if (mmc_card_uhs(card) &&
                 (card->sd_bus_speed < ARRAY_SIZE(uhs_speeds)))
                 uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed];
 
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index bf18b6bfce48..57a2b403bf8e 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -23,6 +23,7 @@
 #include <linux/log2.h>
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
+#include <linux/pm_wakeup.h>
 #include <linux/suspend.h>
 #include <linux/fault-inject.h>
 #include <linux/random.h>
@@ -301,7 +302,7 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception)
         }
 
         err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                        EXT_CSD_BKOPS_START, 1, timeout, use_busy_signal);
+                        EXT_CSD_BKOPS_START, 1, timeout, use_busy_signal, true);
         if (err) {
                 pr_warn("%s: Error %d starting bkops\n",
                         mmc_hostname(card->host), err);
@@ -918,31 +919,6 @@ int __mmc_claim_host(struct mmc_host *host, atomic_t *abort)
 EXPORT_SYMBOL(__mmc_claim_host);
 
 /**
- *      mmc_try_claim_host - try exclusively to claim a host
- *      @host: mmc host to claim
- *
- *      Returns %1 if the host is claimed, %0 otherwise.
- */
-int mmc_try_claim_host(struct mmc_host *host)
-{
-        int claimed_host = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&host->lock, flags);
-        if (!host->claimed || host->claimer == current) {
-                host->claimed = 1;
-                host->claimer = current;
-                host->claim_cnt += 1;
-                claimed_host = 1;
-        }
-        spin_unlock_irqrestore(&host->lock, flags);
-        if (host->ops->enable && claimed_host && host->claim_cnt == 1)
-                host->ops->enable(host);
-        return claimed_host;
-}
-EXPORT_SYMBOL(mmc_try_claim_host);
-
-/**
  *      mmc_release_host - release a host
  *      @host: mmc host to release
  *
@@ -1382,22 +1358,31 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)
 {
         int bit;
 
-        ocr &= host->ocr_avail;
+        /*
+         * Sanity check the voltages that the card claims to
+         * support.
+         */
+        if (ocr & 0x7F) {
+                dev_warn(mmc_dev(host),
+                "card claims to support voltages below defined range\n");
+                ocr &= ~0x7F;
+        }
 
-        bit = ffs(ocr);
-        if (bit) {
-                bit -= 1;
+        ocr &= host->ocr_avail;
+        if (!ocr) {
+                dev_warn(mmc_dev(host), "no support for card's volts\n");
+                return 0;
+        }
 
+        if (host->caps2 & MMC_CAP2_FULL_PWR_CYCLE) {
+                bit = ffs(ocr) - 1;
                 ocr &= 3 << bit;
-
-                mmc_host_clk_hold(host);
-                host->ios.vdd = bit;
-                mmc_set_ios(host);
-                mmc_host_clk_release(host);
+                mmc_power_cycle(host, ocr);
         } else {
-                pr_warning("%s: host doesn't support card's voltages\n",
-                                mmc_hostname(host));
-                ocr = 0;
+                bit = fls(ocr) - 1;
+                ocr &= 3 << bit;
+                if (bit != host->ios.vdd)
+                        dev_warn(mmc_dev(host), "exceeding card's volts\n");
         }
 
         return ocr;
@@ -1422,7 +1407,7 @@ int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)
 
 }
 
-int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage)
+int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr)
 {
         struct mmc_command cmd = {0};
         int err = 0;
@@ -1504,7 +1489,7 @@ power_cycle:
         if (err) {
                 pr_debug("%s: Signal voltage switch failed, "
                         "power cycling card\n", mmc_hostname(host));
-                mmc_power_cycle(host);
+                mmc_power_cycle(host, ocr);
         }
 
         mmc_host_clk_release(host);
@@ -1545,22 +1530,14 @@ void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type)
  * If a host does all the power sequencing itself, ignore the
  * initial MMC_POWER_UP stage.
  */
-void mmc_power_up(struct mmc_host *host)
+void mmc_power_up(struct mmc_host *host, u32 ocr)
 {
-        int bit;
-
         if (host->ios.power_mode == MMC_POWER_ON)
                 return;
 
         mmc_host_clk_hold(host);
 
-        /* If ocr is set, we use it */
-        if (host->ocr)
-                bit = ffs(host->ocr) - 1;
-        else
-                bit = fls(host->ocr_avail) - 1;
-
-        host->ios.vdd = bit;
+        host->ios.vdd = fls(ocr) - 1;
         if (mmc_host_is_spi(host))
                 host->ios.chip_select = MMC_CS_HIGH;
         else
@@ -1604,13 +1581,6 @@ void mmc_power_off(struct mmc_host *host)
         host->ios.clock = 0;
         host->ios.vdd = 0;
 
-
-        /*
-         * Reset ocr mask to be the highest possible voltage supported for
-         * this mmc host. This value will be used at next power up.
-         */
-        host->ocr = 1 << (fls(host->ocr_avail) - 1);
-
         if (!mmc_host_is_spi(host)) {
                 host->ios.bus_mode = MMC_BUSMODE_OPENDRAIN;
                 host->ios.chip_select = MMC_CS_DONTCARE;
@@ -1630,12 +1600,12 @@ void mmc_power_off(struct mmc_host *host)
         mmc_host_clk_release(host);
 }
 
-void mmc_power_cycle(struct mmc_host *host)
+void mmc_power_cycle(struct mmc_host *host, u32 ocr)
 {
         mmc_power_off(host);
         /* Wait at least 1 ms according to SD spec */
         mmc_delay(1);
-        mmc_power_up(host);
+        mmc_power_up(host, ocr);
 }
 
 /*
@@ -1723,6 +1693,28 @@ void mmc_detach_bus(struct mmc_host *host)
         mmc_bus_put(host);
 }
 
+static void _mmc_detect_change(struct mmc_host *host, unsigned long delay,
+                                bool cd_irq)
+{
+#ifdef CONFIG_MMC_DEBUG
+        unsigned long flags;
+        spin_lock_irqsave(&host->lock, flags);
+        WARN_ON(host->removed);
+        spin_unlock_irqrestore(&host->lock, flags);
+#endif
+
+        /*
+         * If the device is configured as wakeup, we prevent a new sleep for
+         * 5 s to give provision for user space to consume the event.
+         */
+        if (cd_irq && !(host->caps & MMC_CAP_NEEDS_POLL) &&
+                device_can_wakeup(mmc_dev(host)))
+                pm_wakeup_event(mmc_dev(host), 5000);
+
+        host->detect_change = 1;
+        mmc_schedule_delayed_work(&host->detect, delay);
+}
+
 /**
  *      mmc_detect_change - process change of state on a MMC socket
  *      @host: host which changed state.
@@ -1735,16 +1727,8 @@ void mmc_detach_bus(struct mmc_host *host)
  */
 void mmc_detect_change(struct mmc_host *host, unsigned long delay)
 {
-#ifdef CONFIG_MMC_DEBUG
-        unsigned long flags;
-        spin_lock_irqsave(&host->lock, flags);
-        WARN_ON(host->removed);
-        spin_unlock_irqrestore(&host->lock, flags);
-#endif
-        host->detect_change = 1;
-        mmc_schedule_delayed_work(&host->detect, delay);
+        _mmc_detect_change(host, delay, true);
 }
-
 EXPORT_SYMBOL(mmc_detect_change);
 
 void mmc_init_erase(struct mmc_card *card)
@@ -2334,7 +2318,7 @@ static int mmc_rescan_try_freq(struct mmc_host *host, unsigned freq)
         pr_info("%s: %s: trying to init card at %u Hz\n",
                 mmc_hostname(host), __func__, host->f_init);
 #endif
-        mmc_power_up(host);
+        mmc_power_up(host, host->ocr_avail);
 
         /*
          * Some eMMCs (with VCCQ always on) may not be reset after power up, so
@@ -2423,7 +2407,7 @@ int mmc_detect_card_removed(struct mmc_host *host)
                          * rescan handle the card removal.
                          */
                         cancel_delayed_work(&host->detect);
-                        mmc_detect_change(host, 0);
+                        _mmc_detect_change(host, 0, false);
                 }
         }
 
@@ -2504,8 +2488,8 @@ void mmc_start_host(struct mmc_host *host)
         if (host->caps2 & MMC_CAP2_NO_PRESCAN_POWERUP)
                 mmc_power_off(host);
         else
-                mmc_power_up(host);
-        mmc_detect_change(host, 0);
+                mmc_power_up(host, host->ocr_avail);
+        _mmc_detect_change(host, 0, false);
 }
 
 void mmc_stop_host(struct mmc_host *host)
@@ -2583,7 +2567,7 @@ int mmc_power_restore_host(struct mmc_host *host)
                 return -EINVAL;
         }
 
-        mmc_power_up(host);
+        mmc_power_up(host, host->card->ocr);
         ret = host->bus_ops->power_restore(host);
 
         mmc_bus_put(host);
@@ -2657,28 +2641,6 @@ EXPORT_SYMBOL(mmc_cache_ctrl);
 
 #ifdef CONFIG_PM
 
-/**
- *      mmc_suspend_host - suspend a host
- *      @host: mmc host
- */
-int mmc_suspend_host(struct mmc_host *host)
-{
-        /* This function is deprecated */
-        return 0;
-}
-EXPORT_SYMBOL(mmc_suspend_host);
-
-/**
- *      mmc_resume_host - resume a previously suspended host
- *      @host: mmc host
- */
-int mmc_resume_host(struct mmc_host *host)
-{
-        /* This function is deprecated */
-        return 0;
-}
-EXPORT_SYMBOL(mmc_resume_host);
-
 /* Do the card removal on suspend if card is assumed removeable
  * Do that in pm notifier while userspace isn't yet frozen, so we will be able
    to sync the card.
@@ -2724,7 +2686,7 @@ int mmc_pm_notify(struct notifier_block *notify_block,
                 spin_lock_irqsave(&host->lock, flags);
                 host->rescan_disable = 0;
                 spin_unlock_irqrestore(&host->lock, flags);
-                mmc_detect_change(host, 0);
+                _mmc_detect_change(host, 0, false);
 
         }
 
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 5345d156493e..443a584660f0 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -42,13 +42,13 @@ void mmc_set_ungated(struct mmc_host *host);
 void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
 void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
 u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
-int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);
+int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, u32 ocr);
 int __mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage);
 void mmc_set_timing(struct mmc_host *host, unsigned int timing);
 void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type);
-void mmc_power_up(struct mmc_host *host);
+void mmc_power_up(struct mmc_host *host, u32 ocr);
 void mmc_power_off(struct mmc_host *host);
-void mmc_power_cycle(struct mmc_host *host);
+void mmc_power_cycle(struct mmc_host *host, u32 ocr);
 
 static inline void mmc_delay(unsigned int ms)
 {
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6d02012a1d0b..f631f5a9bf79 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
+#include <linux/pm_runtime.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
@@ -934,6 +935,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                         goto err;
                 }
 
+                card->ocr = ocr;
                 card->type = MMC_TYPE_MMC;
                 card->rca = 1;
                 memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
@@ -1404,9 +1406,9 @@ static int mmc_poweroff_notify(struct mmc_card *card, unsigned int notify_type)
         if (notify_type == EXT_CSD_POWER_OFF_LONG)
                 timeout = card->ext_csd.power_off_longtime;
 
-        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                         EXT_CSD_POWER_OFF_NOTIFICATION,
-                         notify_type, timeout);
+        err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                        EXT_CSD_POWER_OFF_NOTIFICATION,
+                        notify_type, timeout, true, false);
         if (err)
                 pr_err("%s: Power Off Notification timed out, %u\n",
                        mmc_hostname(card->host), timeout);
@@ -1477,6 +1479,9 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
 
         mmc_claim_host(host);
 
+        if (mmc_card_suspended(host->card))
+                goto out;
+
         if (mmc_card_doing_bkops(host->card)) {
                 err = mmc_stop_bkops(host->card);
                 if (err)
@@ -1496,51 +1501,93 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
                 err = mmc_deselect_cards(host);
         host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
 
-        if (!err)
+        if (!err) {
                 mmc_power_off(host);
+                mmc_card_set_suspended(host->card);
+        }
 out:
         mmc_release_host(host);
         return err;
 }
 
 /*
- * Suspend callback from host.
+ * Suspend callback
  */
 static int mmc_suspend(struct mmc_host *host)
 {
-        return _mmc_suspend(host, true);
-}
+        int err;
 
-/*
- * Shutdown callback
- */
-static int mmc_shutdown(struct mmc_host *host)
-{
-        return _mmc_suspend(host, false);
+        err = _mmc_suspend(host, true);
+        if (!err) {
+                pm_runtime_disable(&host->card->dev);
+                pm_runtime_set_suspended(&host->card->dev);
+        }
+
+        return err;
 }
 
 /*
- * Resume callback from host.
- *
  * This function tries to determine if the same card is still present
  * and, if so, restore all state to it.
  */
-static int mmc_resume(struct mmc_host *host)
+static int _mmc_resume(struct mmc_host *host)
 {
-        int err;
+        int err = 0;
 
         BUG_ON(!host);
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        mmc_power_up(host);
-        mmc_select_voltage(host, host->ocr);
-        err = mmc_init_card(host, host->ocr, host->card);
+
+        if (!mmc_card_suspended(host->card))
+                goto out;
+
+        mmc_power_up(host, host->card->ocr);
+        err = mmc_init_card(host, host->card->ocr, host->card);
+        mmc_card_clr_suspended(host->card);
+
+out:
         mmc_release_host(host);
+        return err;
+}
+
+/*
+ * Shutdown callback
+ */
+static int mmc_shutdown(struct mmc_host *host)
+{
+        int err = 0;
+
+        /*
+         * In a specific case for poweroff notify, we need to resume the card
+         * before we can shutdown it properly.
+         */
+        if (mmc_can_poweroff_notify(host->card) &&
+                !(host->caps2 & MMC_CAP2_FULL_PWR_CYCLE))
+                err = _mmc_resume(host);
+
+        if (!err)
+                err = _mmc_suspend(host, false);
 
         return err;
 }
 
+/*
+ * Callback for resume.
+ */
+static int mmc_resume(struct mmc_host *host)
+{
+        int err = 0;
+
+        if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {
+                err = _mmc_resume(host);
+                pm_runtime_set_active(&host->card->dev);
+                pm_runtime_mark_last_busy(&host->card->dev);
+        }
+        pm_runtime_enable(&host->card->dev);
+
+        return err;
+}
 
 /*
  * Callback for runtime_suspend.
@@ -1552,18 +1599,11 @@ static int mmc_runtime_suspend(struct mmc_host *host)
         if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))
                 return 0;
 
-        mmc_claim_host(host);
-
-        err = mmc_suspend(host);
-        if (err) {
+        err = _mmc_suspend(host, true);
+        if (err)
                 pr_err("%s: error %d doing aggessive suspend\n",
                         mmc_hostname(host), err);
-                goto out;
-        }
-        mmc_power_off(host);
 
-out:
-        mmc_release_host(host);
         return err;
 }
 
@@ -1574,18 +1614,14 @@ static int mmc_runtime_resume(struct mmc_host *host)
 {
         int err;
 
-        if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))
+        if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME)))
                 return 0;
 
-        mmc_claim_host(host);
-
-        mmc_power_up(host);
-        err = mmc_resume(host);
+        err = _mmc_resume(host);
         if (err)
                 pr_err("%s: error %d doing aggessive resume\n",
                         mmc_hostname(host), err);
 
-        mmc_release_host(host);
         return 0;
 }
 
@@ -1595,7 +1631,7 @@ static int mmc_power_restore(struct mmc_host *host)
 
         host->card->state &= ~(MMC_STATE_HIGHSPEED | MMC_STATE_HIGHSPEED_200);
         mmc_claim_host(host);
-        ret = mmc_init_card(host, host->ocr, host->card);
+        ret = mmc_init_card(host, host->card->ocr, host->card);
         mmc_release_host(host);
 
         return ret;
@@ -1640,7 +1676,7 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
 int mmc_attach_mmc(struct mmc_host *host)
 {
         int err;
-        u32 ocr;
+        u32 ocr, rocr;
 
         BUG_ON(!host);
         WARN_ON(!host->claimed);
@@ -1666,23 +1702,12 @@ int mmc_attach_mmc(struct mmc_host *host)
                         goto err;
         }
 
-        /*
-         * Sanity check the voltages that the card claims to
-         * support.
-         */
-        if (ocr & 0x7F) {
-                pr_warning("%s: card claims to support voltages "
-                       "below the defined range. These will be ignored.\n",
-                       mmc_hostname(host));
-                ocr &= ~0x7F;
-        }
-
-        host->ocr = mmc_select_voltage(host, ocr);
+        rocr = mmc_select_voltage(host, ocr);
 
         /*
          * Can we support the voltage of the card?
          */
-        if (!host->ocr) {
+        if (!rocr) {
                 err = -EINVAL;
                 goto err;
         }
@@ -1690,7 +1715,7 @@ int mmc_attach_mmc(struct mmc_host *host)
         /*
          * Detect and init the card.
          */
-        err = mmc_init_card(host, host->ocr, NULL);
+        err = mmc_init_card(host, rocr, NULL);
         if (err)
                 goto err;
 
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index ef183483d5b6..e5b5eeb548d1 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -23,6 +23,40 @@
 
 #define MMC_OPS_TIMEOUT_MS      (10 * 60 * 1000) /* 10 minute timeout */
 
+static inline int __mmc_send_status(struct mmc_card *card, u32 *status,
+                                    bool ignore_crc)
+{
+        int err;
+        struct mmc_command cmd = {0};
+
+        BUG_ON(!card);
+        BUG_ON(!card->host);
+
+        cmd.opcode = MMC_SEND_STATUS;
+        if (!mmc_host_is_spi(card->host))
+                cmd.arg = card->rca << 16;
+        cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC;
+        if (ignore_crc)
+                cmd.flags &= ~MMC_RSP_CRC;
+
+        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
+        if (err)
+                return err;
+
+        /* NOTE: callers are required to understand the difference
+         * between "native" and SPI format status words!
+         */
+        if (status)
+                *status = cmd.resp[0];
+
+        return 0;
+}
+
+int mmc_send_status(struct mmc_card *card, u32 *status)
+{
+        return __mmc_send_status(card, status, false);
+}
+
 static int _mmc_select_card(struct mmc_host *host, struct mmc_card *card)
 {
         int err;
@@ -370,16 +404,18 @@ int mmc_spi_set_crc(struct mmc_host *host, int use_crc)
  *      @timeout_ms: timeout (ms) for operation performed by register write,
  *                   timeout of zero implies maximum possible timeout
  *      @use_busy_signal: use the busy signal as response type
+ *      @send_status: send status cmd to poll for busy
  *
  *      Modifies the EXT_CSD register for selected card.
  */
 int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
-               unsigned int timeout_ms, bool use_busy_signal)
+                unsigned int timeout_ms, bool use_busy_signal, bool send_status)
 {
         int err;
         struct mmc_command cmd = {0};
         unsigned long timeout;
-        u32 status;
+        u32 status = 0;
+        bool ignore_crc = false;
 
         BUG_ON(!card);
         BUG_ON(!card->host);
@@ -408,17 +444,37 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
         if (!use_busy_signal)
                 return 0;
 
-        /* Must check status to be sure of no errors */
+        /*
+         * Must check status to be sure of no errors
+         * If CMD13 is to check the busy completion of the timing change,
+         * disable the check of CRC error.
+         */
+        if (index == EXT_CSD_HS_TIMING &&
+            !(card->host->caps & MMC_CAP_WAIT_WHILE_BUSY))
+                ignore_crc = true;
+
         timeout = jiffies + msecs_to_jiffies(MMC_OPS_TIMEOUT_MS);
         do {
-                err = mmc_send_status(card, &status);
-                if (err)
-                        return err;
+                if (send_status) {
+                        err = __mmc_send_status(card, &status, ignore_crc);
+                        if (err)
+                                return err;
+                }
                 if (card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)
                         break;
                 if (mmc_host_is_spi(card->host))
                         break;
 
+                /*
+                 * We are not allowed to issue a status command and the host
+                 * does'nt support MMC_CAP_WAIT_WHILE_BUSY, then we can only
+                 * rely on waiting for the stated timeout to be sufficient.
+                 */
+                if (!send_status) {
+                        mmc_delay(timeout_ms);
+                        return 0;
+                }
+
                 /* Timeout if the device never leaves the program state. */
                 if (time_after(jiffies, timeout)) {
                         pr_err("%s: Card stuck in programming state! %s\n",
@@ -445,36 +501,10 @@ EXPORT_SYMBOL_GPL(__mmc_switch);
 int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                 unsigned int timeout_ms)
 {
-        return __mmc_switch(card, set, index, value, timeout_ms, true);
+        return __mmc_switch(card, set, index, value, timeout_ms, true, true);
 }
 EXPORT_SYMBOL_GPL(mmc_switch);
 
-int mmc_send_status(struct mmc_card *card, u32 *status)
-{
-        int err;
-        struct mmc_command cmd = {0};
-
-        BUG_ON(!card);
-        BUG_ON(!card->host);
-
-        cmd.opcode = MMC_SEND_STATUS;
-        if (!mmc_host_is_spi(card->host))
-                cmd.arg = card->rca << 16;
-        cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC;
-
-        err = mmc_wait_for_cmd(card->host, &cmd, MMC_CMD_RETRIES);
-        if (err)
-                return err;
-
-        /* NOTE: callers are required to understand the difference
-         * between "native" and SPI format status words!
-         */
-        if (status)
-                *status = cmd.resp[0];
-
-        return 0;
-}
-
 static int
 mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,
                   u8 len)
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 5e8823dc3ef6..6f42050b7ccc 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/stat.h>
+#include <linux/pm_runtime.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
@@ -721,6 +722,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr)
         int err;
         u32 max_current;
         int retries = 10;
+        u32 pocr = ocr;
 
 try_again:
         if (!retries) {
@@ -773,7 +775,8 @@ try_again:
          */
         if (!mmc_host_is_spi(host) && rocr &&
            ((*rocr & 0x41000000) == 0x41000000)) {
-                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
+                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
+                                        pocr);
                 if (err == -EAGAIN) {
                         retries--;
                         goto try_again;
@@ -935,6 +938,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                 if (IS_ERR(card))
                         return PTR_ERR(card);
 
+                card->ocr = ocr;
                 card->type = MMC_TYPE_SD;
                 memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
         }
@@ -1064,10 +1068,7 @@ static void mmc_sd_detect(struct mmc_host *host)
         }
 }
 
-/*
- * Suspend callback from host.
- */
-static int mmc_sd_suspend(struct mmc_host *host)
+static int _mmc_sd_suspend(struct mmc_host *host)
 {
         int err = 0;
 
@@ -1075,34 +1076,77 @@ static int mmc_sd_suspend(struct mmc_host *host)
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
+
+        if (mmc_card_suspended(host->card))
+                goto out;
+
         if (!mmc_host_is_spi(host))
                 err = mmc_deselect_cards(host);
         host->card->state &= ~MMC_STATE_HIGHSPEED;
-        if (!err)
+        if (!err) {
                 mmc_power_off(host);
+                mmc_card_set_suspended(host->card);
+        }
+
+out:
         mmc_release_host(host);
+        return err;
+}
+
+/*
+ * Callback for suspend
+ */
+static int mmc_sd_suspend(struct mmc_host *host)
+{
+        int err;
+
+        err = _mmc_sd_suspend(host);
+        if (!err) {
+                pm_runtime_disable(&host->card->dev);
+                pm_runtime_set_suspended(&host->card->dev);
+        }
 
         return err;
 }
 
 /*
- * Resume callback from host.
- *
  * This function tries to determine if the same card is still present
  * and, if so, restore all state to it.
  */
-static int mmc_sd_resume(struct mmc_host *host)
+static int _mmc_sd_resume(struct mmc_host *host)
 {
-        int err;
+        int err = 0;
 
         BUG_ON(!host);
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        mmc_power_up(host);
-        mmc_select_voltage(host, host->ocr);
-        err = mmc_sd_init_card(host, host->ocr, host->card);
+
+        if (!mmc_card_suspended(host->card))
+                goto out;
+
+        mmc_power_up(host, host->card->ocr);
+        err = mmc_sd_init_card(host, host->card->ocr, host->card);
+        mmc_card_clr_suspended(host->card);
+
+out:
         mmc_release_host(host);
+        return err;
+}
+
+/*
+ * Callback for resume
+ */
+static int mmc_sd_resume(struct mmc_host *host)
+{
+        int err = 0;
+
+        if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) {
+                err = _mmc_sd_resume(host);
+                pm_runtime_set_active(&host->card->dev);
+                pm_runtime_mark_last_busy(&host->card->dev);
+        }
+        pm_runtime_enable(&host->card->dev);
 
         return err;
 }
@@ -1117,18 +1161,11 @@ static int mmc_sd_runtime_suspend(struct mmc_host *host)
         if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))
                 return 0;
 
-        mmc_claim_host(host);
-
-        err = mmc_sd_suspend(host);
-        if (err) {
+        err = _mmc_sd_suspend(host);
+        if (err)
                 pr_err("%s: error %d doing aggessive suspend\n",
                         mmc_hostname(host), err);
-                goto out;
-        }
-        mmc_power_off(host);
 
-out:
-        mmc_release_host(host);
         return err;
 }
 
@@ -1139,18 +1176,14 @@ static int mmc_sd_runtime_resume(struct mmc_host *host)
 {
         int err;
 
-        if (!(host->caps & MMC_CAP_AGGRESSIVE_PM))
+        if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME)))
                 return 0;
 
-        mmc_claim_host(host);
-
-        mmc_power_up(host);
-        err = mmc_sd_resume(host);
+        err = _mmc_sd_resume(host);
         if (err)
                 pr_err("%s: error %d doing aggessive resume\n",
                         mmc_hostname(host), err);
 
-        mmc_release_host(host);
         return 0;
 }
 
@@ -1160,7 +1193,7 @@ static int mmc_sd_power_restore(struct mmc_host *host)
 
         host->card->state &= ~MMC_STATE_HIGHSPEED;
         mmc_claim_host(host);
-        ret = mmc_sd_init_card(host, host->ocr, host->card);
+        ret = mmc_sd_init_card(host, host->card->ocr, host->card);
         mmc_release_host(host);
 
         return ret;
@@ -1205,7 +1238,7 @@ static void mmc_sd_attach_bus_ops(struct mmc_host *host)
 int mmc_attach_sd(struct mmc_host *host)
 {
         int err;
-        u32 ocr;
+        u32 ocr, rocr;
 
         BUG_ON(!host);
         WARN_ON(!host->claimed);
@@ -1229,31 +1262,12 @@ int mmc_attach_sd(struct mmc_host *host)
                         goto err;
         }
 
-        /*
-         * Sanity check the voltages that the card claims to
-         * support.
-         */
-        if (ocr & 0x7F) {
-                pr_warning("%s: card claims to support voltages "
-                       "below the defined range. These will be ignored.\n",
-                       mmc_hostname(host));
-                ocr &= ~0x7F;
-        }
-
-        if ((ocr & MMC_VDD_165_195) &&
-            !(host->ocr_avail_sd & MMC_VDD_165_195)) {
-                pr_warning("%s: SD card claims to support the "
-                       "incompletely defined 'low voltage range'. This "
-                       "will be ignored.\n", mmc_hostname(host));
-                ocr &= ~MMC_VDD_165_195;
-        }
-
-        host->ocr = mmc_select_voltage(host, ocr);
+        rocr = mmc_select_voltage(host, ocr);
 
         /*
          * Can we support the voltage(s) of the card(s)?
          */
-        if (!host->ocr) {
+        if (!rocr) {
                 err = -EINVAL;
                 goto err;
         }
@@ -1261,7 +1275,7 @@ int mmc_attach_sd(struct mmc_host *host)
         /*
          * Detect and init the card.
          */
-        err = mmc_sd_init_card(host, host->ocr, NULL);
+        err = mmc_sd_init_card(host, rocr, NULL);
         if (err)
                 goto err;
 
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 80d89cff7306..4d721c6e2af0 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -593,23 +593,28 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         struct mmc_card *card;
         int err;
         int retries = 10;
+        u32 rocr = 0;
+        u32 ocr_card = ocr;
 
         BUG_ON(!host);
         WARN_ON(!host->claimed);
 
+        /* to query card if 1.8V signalling is supported */
+        if (mmc_host_uhs(host))
+                ocr |= R4_18V_PRESENT;
+
 try_again:
         if (!retries) {
                 pr_warning("%s: Skipping voltage switch\n",
                                 mmc_hostname(host));
                 ocr &= ~R4_18V_PRESENT;
-                host->ocr &= ~R4_18V_PRESENT;
         }
 
         /*
          * Inform the card of the voltage
          */
         if (!powered_resume) {
-                err = mmc_send_io_op_cond(host, host->ocr, &ocr);
+                err = mmc_send_io_op_cond(host, ocr, &rocr);
                 if (err)
                         goto err;
         }
@@ -632,8 +637,8 @@ try_again:
                 goto err;
         }
 
-        if ((ocr & R4_MEMORY_PRESENT) &&
-            mmc_sd_get_cid(host, host->ocr & ocr, card->raw_cid, NULL) == 0) {
+        if ((rocr & R4_MEMORY_PRESENT) &&
+            mmc_sd_get_cid(host, ocr & rocr, card->raw_cid, NULL) == 0) {
                 card->type = MMC_TYPE_SD_COMBO;
 
                 if (oldcard && (oldcard->type != MMC_TYPE_SD_COMBO ||
@@ -663,8 +668,9 @@ try_again:
          * systems that claim 1.8v signalling in fact do not support
          * it.
          */
-        if (!powered_resume && (ocr & R4_18V_PRESENT) && mmc_host_uhs(host)) {
-                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180);
+        if (!powered_resume && (rocr & ocr & R4_18V_PRESENT)) {
+                err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180,
+                                        ocr);
                 if (err == -EAGAIN) {
                         sdio_reset(host);
                         mmc_go_idle(host);
@@ -674,12 +680,10 @@ try_again:
                         goto try_again;
                 } else if (err) {
                         ocr &= ~R4_18V_PRESENT;
-                        host->ocr &= ~R4_18V_PRESENT;
                 }
                 err = 0;
         } else {
                 ocr &= ~R4_18V_PRESENT;
-                host->ocr &= ~R4_18V_PRESENT;
         }
 
         /*
@@ -759,6 +763,7 @@ try_again:
 
                 card = oldcard;
         }
+        card->ocr = ocr_card;
         mmc_fixup_device(card, NULL);
 
         if (card->type == MMC_TYPE_SD_COMBO) {
@@ -981,8 +986,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
 
         /* Restore power if needed */
         if (!mmc_card_keep_power(host)) {
-                mmc_power_up(host);
-                mmc_select_voltage(host, host->ocr);
+                mmc_power_up(host, host->card->ocr);
                 /*
                  * Tell runtime PM core we just powered up the card,
                  * since it still believes the card is powered off.
@@ -1000,7 +1004,7 @@ static int mmc_sdio_resume(struct mmc_host *host)
         if (mmc_card_is_removable(host) || !mmc_card_keep_power(host)) {
                 sdio_reset(host);
                 mmc_go_idle(host);
-                err = mmc_sdio_init_card(host, host->ocr, host->card,
+                err = mmc_sdio_init_card(host, host->card->ocr, host->card,
                                         mmc_card_keep_power(host));
         } else if (mmc_card_keep_power(host) && mmc_card_wake_sdio_irq(host)) {
                 /* We may have switched to 1-bit mode during suspend */
@@ -1040,7 +1044,6 @@ static int mmc_sdio_resume(struct mmc_host *host)
 static int mmc_sdio_power_restore(struct mmc_host *host)
 {
         int ret;
-        u32 ocr;
 
         BUG_ON(!host);
         BUG_ON(!host->card);
@@ -1062,32 +1065,17 @@ static int mmc_sdio_power_restore(struct mmc_host *host)
          * for OLPC SD8686 (which expects a [CMD5,5,3,7] init sequence), and
          * harmless in other situations.
          *
-         * With these steps taken, mmc_select_voltage() is also required to
-         * restore the correct voltage setting of the card.
          */
 
         sdio_reset(host);
         mmc_go_idle(host);
         mmc_send_if_cond(host, host->ocr_avail);
 
-        ret = mmc_send_io_op_cond(host, 0, &ocr);
+        ret = mmc_send_io_op_cond(host, 0, NULL);
         if (ret)
                 goto out;
 
-        if (host->ocr_avail_sdio)
-                host->ocr_avail = host->ocr_avail_sdio;
-
-        host->ocr = mmc_select_voltage(host, ocr & ~0x7F);
-        if (!host->ocr) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        if (mmc_host_uhs(host))
-                /* to query card if 1.8V signalling is supported */
-                host->ocr |= R4_18V_PRESENT;
-
-        ret = mmc_sdio_init_card(host, host->ocr, host->card,
+        ret = mmc_sdio_init_card(host, host->card->ocr, host->card,
                                 mmc_card_keep_power(host));
         if (!ret && host->sdio_irqs)
                 mmc_signal_sdio_irq(host);
@@ -1108,7 +1096,7 @@ static int mmc_sdio_runtime_suspend(struct mmc_host *host)
 static int mmc_sdio_runtime_resume(struct mmc_host *host)
 {
         /* Restore power and re-initialize. */
-        mmc_power_up(host);
+        mmc_power_up(host, host->card->ocr);
         return mmc_sdio_power_restore(host);
 }
 
@@ -1131,7 +1119,7 @@ static const struct mmc_bus_ops mmc_sdio_ops = {
 int mmc_attach_sdio(struct mmc_host *host)
 {
         int err, i, funcs;
-        u32 ocr;
+        u32 ocr, rocr;
         struct mmc_card *card;
 
         BUG_ON(!host);
@@ -1145,23 +1133,13 @@ int mmc_attach_sdio(struct mmc_host *host)
         if (host->ocr_avail_sdio)
                 host->ocr_avail = host->ocr_avail_sdio;
 
-        /*
-         * Sanity check the voltages that the card claims to
-         * support.
-         */
-        if (ocr & 0x7F) {
-                pr_warning("%s: card claims to support voltages "
-                       "below the defined range. These will be ignored.\n",
-                       mmc_hostname(host));
-                ocr &= ~0x7F;
-        }
 
-        host->ocr = mmc_select_voltage(host, ocr);
+        rocr = mmc_select_voltage(host, ocr);
 
         /*
          * Can we support the voltage(s) of the card(s)?
          */
-        if (!host->ocr) {
+        if (!rocr) {
                 err = -EINVAL;
                 goto err;
         }
@@ -1169,22 +1147,10 @@ int mmc_attach_sdio(struct mmc_host *host)
         /*
          * Detect and init the card.
          */
-        if (mmc_host_uhs(host))
-                /* to query card if 1.8V signalling is supported */
-                host->ocr |= R4_18V_PRESENT;
+        err = mmc_sdio_init_card(host, rocr, NULL, 0);
+        if (err)
+                goto err;
 
-        err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
-        if (err) {
-                if (err == -EAGAIN) {
-                        /*
-                         * Retry initialization with S18R set to 0.
-                         */
-                        host->ocr &= ~R4_18V_PRESENT;
-                        err = mmc_sdio_init_card(host, host->ocr, NULL, 0);
-                }
-                if (err)
-                        goto err;
-        }
         card = host->card;
 
         /*
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 69e438ee043e..2cbb4516d353 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -255,7 +255,6 @@ struct atmel_mci_slot {
 #define ATMCI_CARD_PRESENT      0
 #define ATMCI_CARD_NEED_INIT    1
 #define ATMCI_SHUTDOWN          2
-#define ATMCI_SUSPENDED         3
 
         int                     detect_pin;
         int                     wp_pin;
@@ -589,6 +588,13 @@ static void atmci_timeout_timer(unsigned long data)
         if (host->mrq->cmd->data) {
                 host->mrq->cmd->data->error = -ETIMEDOUT;
                 host->data = NULL;
+                /*
+                 * With some SDIO modules, sometimes DMA transfer hangs. If
+                 * stop_transfer() is not called then the DMA request is not
+                 * removed, following ones are queued and never computed.
+                 */
+                if (host->state == STATE_DATA_XFER)
+                        host->stop_transfer(host);
         } else {
                 host->mrq->cmd->error = -ETIMEDOUT;
                 host->cmd = NULL;
@@ -1803,12 +1809,14 @@ static void atmci_tasklet_func(unsigned long priv)
                         if (unlikely(status)) {
                                 host->stop_transfer(host);
                                 host->data = NULL;
-                                if (status & ATMCI_DTOE) {
-                                        data->error = -ETIMEDOUT;
-                                } else if (status & ATMCI_DCRCE) {
-                                        data->error = -EILSEQ;
-                                } else {
-                                        data->error = -EIO;
+                                if (data) {
+                                        if (status & ATMCI_DTOE) {
+                                                data->error = -ETIMEDOUT;
+                                        } else if (status & ATMCI_DCRCE) {
+                                                data->error = -EILSEQ;
+                                        } else {
+                                                data->error = -EIO;
+                                        }
                                 }
                         }
 
@@ -2520,70 +2528,10 @@ static int __exit atmci_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int atmci_suspend(struct device *dev)
-{
-        struct atmel_mci *host = dev_get_drvdata(dev);
-        int i;
-
-         for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
-                struct atmel_mci_slot *slot = host->slot[i];
-                int ret;
-
-                if (!slot)
-                        continue;
-                ret = mmc_suspend_host(slot->mmc);
-                if (ret < 0) {
-                        while (--i >= 0) {
-                                slot = host->slot[i];
-                                if (slot
-                                && test_bit(ATMCI_SUSPENDED, &slot->flags)) {
-                                        mmc_resume_host(host->slot[i]->mmc);
-                                        clear_bit(ATMCI_SUSPENDED, &slot->flags);
-                                }
-                        }
-                        return ret;
-                } else {
-                        set_bit(ATMCI_SUSPENDED, &slot->flags);
-                }
-        }
-
-        return 0;
-}
-
-static int atmci_resume(struct device *dev)
-{
-        struct atmel_mci *host = dev_get_drvdata(dev);
-        int i;
-        int ret = 0;
-
-        for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
-                struct atmel_mci_slot *slot = host->slot[i];
-                int err;
-
-                slot = host->slot[i];
-                if (!slot)
-                        continue;
-                if (!test_bit(ATMCI_SUSPENDED, &slot->flags))
-                        continue;
-                err = mmc_resume_host(slot->mmc);
-                if (err < 0)
-                        ret = err;
-                else
-                        clear_bit(ATMCI_SUSPENDED, &slot->flags);
-        }
-
-        return ret;
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume);
-
 static struct platform_driver atmci_driver = {
         .remove         = __exit_p(atmci_remove),
         .driver         = {
                 .name           = "atmel_mci",
-                .pm             = &atmci_pm,
                 .of_match_table = of_match_ptr(atmci_dt_ids),
         },
 };
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index df9becdd2e99..f5443a6c4915 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -1157,11 +1157,6 @@ static int au1xmmc_remove(struct platform_device *pdev)
 static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct au1xmmc_host *host = platform_get_drvdata(pdev);
-        int ret;
-
-        ret = mmc_suspend_host(host->mmc);
-        if (ret)
-                return ret;
 
         au_writel(0, HOST_CONFIG2(host));
         au_writel(0, HOST_CONFIG(host));
@@ -1178,7 +1173,7 @@ static int au1xmmc_resume(struct platform_device *pdev)
 
         au1xmmc_reset_controller(host);
 
-        return mmc_resume_host(host->mmc);
+        return 0;
 }
 #else
 #define au1xmmc_suspend NULL
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c
index 94fae2f1baaf..2b7f37e82ca9 100644
--- a/drivers/mmc/host/bfin_sdh.c
+++ b/drivers/mmc/host/bfin_sdh.c
@@ -391,6 +391,7 @@ static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 /* Disable 4 bit SDIO */
                 cfg &= ~SD4E;
         }
+        bfin_write_SDH_CFG(cfg);
 
         host->power_mode = ios->power_mode;
 #ifndef RSI_BLKSZ
@@ -415,7 +416,6 @@ static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 cfg &= ~SD_CMD_OD;
 # endif
 
-
         if (ios->power_mode != MMC_POWER_OFF)
                 cfg |= PWR_ON;
         else
@@ -433,7 +433,6 @@ static void sdh_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 clk_ctl |= CLK_E;
                 host->clk_div = clk_div;
                 bfin_write_SDH_CLK_CTL(clk_ctl);
-
         } else
                 sdh_stop_clock(host);
 
@@ -640,21 +639,15 @@ static int sdh_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int sdh_suspend(struct platform_device *dev, pm_message_t state)
 {
-        struct mmc_host *mmc = platform_get_drvdata(dev);
         struct bfin_sd_host *drv_data = get_sdh_data(dev);
-        int ret = 0;
-
-        if (mmc)
-                ret = mmc_suspend_host(mmc);
 
         peripheral_free_list(drv_data->pin_req);
 
-        return ret;
+        return 0;
 }
 
 static int sdh_resume(struct platform_device *dev)
 {
-        struct mmc_host *mmc = platform_get_drvdata(dev);
         struct bfin_sd_host *drv_data = get_sdh_data(dev);
         int ret = 0;
 
@@ -665,10 +658,6 @@ static int sdh_resume(struct platform_device *dev)
         }
 
         sdh_reset();
-
-        if (mmc)
-                ret = mmc_resume_host(mmc);
-
         return ret;
 }
 #else
diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c
index 9d6e2b844404..1087b4c79cd6 100644
--- a/drivers/mmc/host/cb710-mmc.c
+++ b/drivers/mmc/host/cb710-mmc.c
@@ -667,12 +667,6 @@ static const struct mmc_host_ops cb710_mmc_host = {
 static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
-        struct mmc_host *mmc = cb710_slot_to_mmc(slot);
-        int err;
-
-        err = mmc_suspend_host(mmc);
-        if (err)
-                return err;
 
         cb710_mmc_enable_irq(slot, 0, ~0);
         return 0;
@@ -681,11 +675,9 @@ static int cb710_mmc_suspend(struct platform_device *pdev, pm_message_t state)
 static int cb710_mmc_resume(struct platform_device *pdev)
 {
         struct cb710_slot *slot = cb710_pdev_to_slot(pdev);
-        struct mmc_host *mmc = cb710_slot_to_mmc(slot);
 
         cb710_mmc_enable_irq(slot, 0, ~0);
-
-        return mmc_resume_host(mmc);
+        return 0;
 }
 
 #endif /* CONFIG_PM */
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c
index e9fa87df909c..d6153740b77f 100644
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@ -193,7 +193,6 @@ struct mmc_davinci_host {
 #define DAVINCI_MMC_DATADIR_READ        1
 #define DAVINCI_MMC_DATADIR_WRITE       2
         unsigned char data_dir;
-        unsigned char suspended;
 
         /* buffer is used during PIO of one scatterlist segment, and
          * is updated along with buffer_bytes_left.  bytes_left applies
@@ -1435,38 +1434,23 @@ static int davinci_mmcsd_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct mmc_davinci_host *host = platform_get_drvdata(pdev);
-        int ret;
 
-        ret = mmc_suspend_host(host->mmc);
-        if (!ret) {
-                writel(0, host->base + DAVINCI_MMCIM);
-                mmc_davinci_reset_ctrl(host, 1);
-                clk_disable(host->clk);
-                host->suspended = 1;
-        } else {
-                host->suspended = 0;
-        }
+        writel(0, host->base + DAVINCI_MMCIM);
+        mmc_davinci_reset_ctrl(host, 1);
+        clk_disable(host->clk);
 
-        return ret;
+        return 0;
 }
 
 static int davinci_mmcsd_resume(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct mmc_davinci_host *host = platform_get_drvdata(pdev);
-        int ret;
-
-        if (!host->suspended)
-                return 0;
 
         clk_enable(host->clk);
-
         mmc_davinci_reset_ctrl(host, 0);
-        ret = mmc_resume_host(host->mmc);
-        if (!ret)
-                host->suspended = 0;
 
-        return ret;
+        return 0;
 }
 
 static const struct dev_pm_ops davinci_mmcsd_pm = {
diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c
index 6a1fa2110a05..3423c5ed50c7 100644
--- a/drivers/mmc/host/dw_mmc-exynos.c
+++ b/drivers/mmc/host/dw_mmc-exynos.c
@@ -14,8 +14,10 @@
 #include <linux/clk.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/dw_mmc.h>
+#include <linux/mmc/mmc.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/slab.h>
 
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
@@ -30,16 +32,39 @@
 #define SDMMC_CLKSEL_TIMING(x, y, z)    (SDMMC_CLKSEL_CCLK_SAMPLE(x) |  \
                                         SDMMC_CLKSEL_CCLK_DRIVE(y) |    \
                                         SDMMC_CLKSEL_CCLK_DIVIDER(z))
+#define SDMMC_CLKSEL_WAKEUP_INT         BIT(11)
 
 #define EXYNOS4210_FIXED_CIU_CLK_DIV    2
 #define EXYNOS4412_FIXED_CIU_CLK_DIV    4
 
+/* Block number in eMMC */
+#define DWMCI_BLOCK_NUM         0xFFFFFFFF
+
+#define SDMMC_EMMCP_BASE        0x1000
+#define SDMMC_MPSECURITY        (SDMMC_EMMCP_BASE + 0x0010)
+#define SDMMC_MPSBEGIN0         (SDMMC_EMMCP_BASE + 0x0200)
+#define SDMMC_MPSEND0           (SDMMC_EMMCP_BASE + 0x0204)
+#define SDMMC_MPSCTRL0          (SDMMC_EMMCP_BASE + 0x020C)
+
+/* SMU control bits */
+#define DWMCI_MPSCTRL_SECURE_READ_BIT           BIT(7)
+#define DWMCI_MPSCTRL_SECURE_WRITE_BIT          BIT(6)
+#define DWMCI_MPSCTRL_NON_SECURE_READ_BIT       BIT(5)
+#define DWMCI_MPSCTRL_NON_SECURE_WRITE_BIT      BIT(4)
+#define DWMCI_MPSCTRL_USE_FUSE_KEY              BIT(3)
+#define DWMCI_MPSCTRL_ECB_MODE                  BIT(2)
+#define DWMCI_MPSCTRL_ENCRYPTION                BIT(1)
+#define DWMCI_MPSCTRL_VALID                     BIT(0)
+
+#define EXYNOS_CCLKIN_MIN       50000000        /* unit: HZ */
+
 /* Variations in Exynos specific dw-mshc controller */
 enum dw_mci_exynos_type {
         DW_MCI_TYPE_EXYNOS4210,
         DW_MCI_TYPE_EXYNOS4412,
         DW_MCI_TYPE_EXYNOS5250,
         DW_MCI_TYPE_EXYNOS5420,
+        DW_MCI_TYPE_EXYNOS5420_SMU,
 };
 
 /* Exynos implementation specific driver private data */
@@ -48,6 +73,7 @@ struct dw_mci_exynos_priv_data {
         u8                              ciu_div;
         u32                             sdr_timing;
         u32                             ddr_timing;
+        u32                             cur_speed;
 };
 
 static struct dw_mci_exynos_compatible {
@@ -66,44 +92,80 @@ static struct dw_mci_exynos_compatible {
         }, {
                 .compatible     = "samsung,exynos5420-dw-mshc",
                 .ctrl_type      = DW_MCI_TYPE_EXYNOS5420,
+        }, {
+                .compatible     = "samsung,exynos5420-dw-mshc-smu",
+                .ctrl_type      = DW_MCI_TYPE_EXYNOS5420_SMU,
         },
 };
 
 static int dw_mci_exynos_priv_init(struct dw_mci *host)
 {
-        struct dw_mci_exynos_priv_data *priv;
-        int idx;
-
-        priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                dev_err(host->dev, "mem alloc failed for private data\n");
-                return -ENOMEM;
-        }
+        struct dw_mci_exynos_priv_data *priv = host->priv;
 
-        for (idx = 0; idx < ARRAY_SIZE(exynos_compat); idx++) {
-                if (of_device_is_compatible(host->dev->of_node,
-                                        exynos_compat[idx].compatible))
-                        priv->ctrl_type = exynos_compat[idx].ctrl_type;
+        if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5420_SMU) {
+                mci_writel(host, MPSBEGIN0, 0);
+                mci_writel(host, MPSEND0, DWMCI_BLOCK_NUM);
+                mci_writel(host, MPSCTRL0, DWMCI_MPSCTRL_SECURE_WRITE_BIT |
+                           DWMCI_MPSCTRL_NON_SECURE_READ_BIT |
+                           DWMCI_MPSCTRL_VALID |
+                           DWMCI_MPSCTRL_NON_SECURE_WRITE_BIT);
         }
 
-        host->priv = priv;
         return 0;
 }
 
 static int dw_mci_exynos_setup_clock(struct dw_mci *host)
 {
         struct dw_mci_exynos_priv_data *priv = host->priv;
+        unsigned long rate = clk_get_rate(host->ciu_clk);
 
-        if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS5250 ||
-                priv->ctrl_type == DW_MCI_TYPE_EXYNOS5420)
-                host->bus_hz /= (priv->ciu_div + 1);
-        else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4412)
-                host->bus_hz /= EXYNOS4412_FIXED_CIU_CLK_DIV;
-        else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4210)
-                host->bus_hz /= EXYNOS4210_FIXED_CIU_CLK_DIV;
+        host->bus_hz = rate / (priv->ciu_div + 1);
+        return 0;
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int dw_mci_exynos_suspend(struct device *dev)
+{
+        struct dw_mci *host = dev_get_drvdata(dev);
+
+        return dw_mci_suspend(host);
+}
+
+static int dw_mci_exynos_resume(struct device *dev)
+{
+        struct dw_mci *host = dev_get_drvdata(dev);
+
+        dw_mci_exynos_priv_init(host);
+        return dw_mci_resume(host);
+}
+
+/**
+ * dw_mci_exynos_resume_noirq - Exynos-specific resume code
+ *
+ * On exynos5420 there is a silicon errata that will sometimes leave the
+ * WAKEUP_INT bit in the CLKSEL register asserted.  This bit is 1 to indicate
+ * that it fired and we can clear it by writing a 1 back.  Clear it to prevent
+ * interrupts from going off constantly.
+ *
+ * We run this code on all exynos variants because it doesn't hurt.
+ */
+
+static int dw_mci_exynos_resume_noirq(struct device *dev)
+{
+        struct dw_mci *host = dev_get_drvdata(dev);
+        u32 clksel;
+
+        clksel = mci_readl(host, CLKSEL);
+        if (clksel & SDMMC_CLKSEL_WAKEUP_INT)
+                mci_writel(host, CLKSEL, clksel);
 
         return 0;
 }
+#else
+#define dw_mci_exynos_suspend           NULL
+#define dw_mci_exynos_resume            NULL
+#define dw_mci_exynos_resume_noirq      NULL
+#endif /* CONFIG_PM_SLEEP */
 
 static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr)
 {
@@ -121,23 +183,68 @@ static void dw_mci_exynos_prepare_command(struct dw_mci *host, u32 *cmdr)
 static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios)
 {
         struct dw_mci_exynos_priv_data *priv = host->priv;
+        unsigned int wanted = ios->clock;
+        unsigned long actual;
+        u8 div = priv->ciu_div + 1;
 
-        if (ios->timing == MMC_TIMING_UHS_DDR50)
+        if (ios->timing == MMC_TIMING_UHS_DDR50) {
                 mci_writel(host, CLKSEL, priv->ddr_timing);
-        else
+                /* Should be double rate for DDR mode */
+                if (ios->bus_width == MMC_BUS_WIDTH_8)
+                        wanted <<= 1;
+        } else {
                 mci_writel(host, CLKSEL, priv->sdr_timing);
+        }
+
+        /* Don't care if wanted clock is zero */
+        if (!wanted)
+                return;
+
+        /* Guaranteed minimum frequency for cclkin */
+        if (wanted < EXYNOS_CCLKIN_MIN)
+                wanted = EXYNOS_CCLKIN_MIN;
+
+        if (wanted != priv->cur_speed) {
+                int ret = clk_set_rate(host->ciu_clk, wanted * div);
+                if (ret)
+                        dev_warn(host->dev,
+                                "failed to set clk-rate %u error: %d\n",
+                                 wanted * div, ret);
+                actual = clk_get_rate(host->ciu_clk);
+                host->bus_hz = actual / div;
+                priv->cur_speed = wanted;
+                host->current_speed = 0;
+        }
 }
 
 static int dw_mci_exynos_parse_dt(struct dw_mci *host)
 {
-        struct dw_mci_exynos_priv_data *priv = host->priv;
+        struct dw_mci_exynos_priv_data *priv;
         struct device_node *np = host->dev->of_node;
         u32 timing[2];
         u32 div = 0;
+        int idx;
         int ret;
 
-        of_property_read_u32(np, "samsung,dw-mshc-ciu-div", &div);
-        priv->ciu_div = div;
+        priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                dev_err(host->dev, "mem alloc failed for private data\n");
+                return -ENOMEM;
+        }
+
+        for (idx = 0; idx < ARRAY_SIZE(exynos_compat); idx++) {
+                if (of_device_is_compatible(np, exynos_compat[idx].compatible))
+                        priv->ctrl_type = exynos_compat[idx].ctrl_type;
+        }
+
+        if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4412)
+                priv->ciu_div = EXYNOS4412_FIXED_CIU_CLK_DIV - 1;
+        else if (priv->ctrl_type == DW_MCI_TYPE_EXYNOS4210)
+                priv->ciu_div = EXYNOS4210_FIXED_CIU_CLK_DIV - 1;
+        else {
+                of_property_read_u32(np, "samsung,dw-mshc-ciu-div", &div);
+                priv->ciu_div = div;
+        }
 
         ret = of_property_read_u32_array(np,
                         "samsung,dw-mshc-sdr-timing", timing, 2);
@@ -152,9 +259,131 @@ static int dw_mci_exynos_parse_dt(struct dw_mci *host)
                 return ret;
 
         priv->ddr_timing = SDMMC_CLKSEL_TIMING(timing[0], timing[1], div);
+        host->priv = priv;
         return 0;
 }
 
+static inline u8 dw_mci_exynos_get_clksmpl(struct dw_mci *host)
+{
+        return SDMMC_CLKSEL_CCLK_SAMPLE(mci_readl(host, CLKSEL));
+}
+
+static inline void dw_mci_exynos_set_clksmpl(struct dw_mci *host, u8 sample)
+{
+        u32 clksel;
+        clksel = mci_readl(host, CLKSEL);
+        clksel = (clksel & ~0x7) | SDMMC_CLKSEL_CCLK_SAMPLE(sample);
+        mci_writel(host, CLKSEL, clksel);
+}
+
+static inline u8 dw_mci_exynos_move_next_clksmpl(struct dw_mci *host)
+{
+        u32 clksel;
+        u8 sample;
+
+        clksel = mci_readl(host, CLKSEL);
+        sample = (clksel + 1) & 0x7;
+        clksel = (clksel & ~0x7) | sample;
+        mci_writel(host, CLKSEL, clksel);
+        return sample;
+}
+
+static s8 dw_mci_exynos_get_best_clksmpl(u8 candiates)
+{
+        const u8 iter = 8;
+        u8 __c;
+        s8 i, loc = -1;
+
+        for (i = 0; i < iter; i++) {
+                __c = ror8(candiates, i);
+                if ((__c & 0xc7) == 0xc7) {
+                        loc = i;
+                        goto out;
+                }
+        }
+
+        for (i = 0; i < iter; i++) {
+                __c = ror8(candiates, i);
+                if ((__c & 0x83) == 0x83) {
+                        loc = i;
+                        goto out;
+                }
+        }
+
+out:
+        return loc;
+}
+
+static int dw_mci_exynos_execute_tuning(struct dw_mci_slot *slot, u32 opcode,
+                                        struct dw_mci_tuning_data *tuning_data)
+{
+        struct dw_mci *host = slot->host;
+        struct mmc_host *mmc = slot->mmc;
+        const u8 *blk_pattern = tuning_data->blk_pattern;
+        u8 *blk_test;
+        unsigned int blksz = tuning_data->blksz;
+        u8 start_smpl, smpl, candiates = 0;
+        s8 found = -1;
+        int ret = 0;
+
+        blk_test = kmalloc(blksz, GFP_KERNEL);
+        if (!blk_test)
+                return -ENOMEM;
+
+        start_smpl = dw_mci_exynos_get_clksmpl(host);
+
+        do {
+                struct mmc_request mrq = {NULL};
+                struct mmc_command cmd = {0};
+                struct mmc_command stop = {0};
+                struct mmc_data data = {0};
+                struct scatterlist sg;
+
+                cmd.opcode = opcode;
+                cmd.arg = 0;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+                stop.opcode = MMC_STOP_TRANSMISSION;
+                stop.arg = 0;
+                stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
+
+                data.blksz = blksz;
+                data.blocks = 1;
+                data.flags = MMC_DATA_READ;
+                data.sg = &sg;
+                data.sg_len = 1;
+
+                sg_init_one(&sg, blk_test, blksz);
+                mrq.cmd = &cmd;
+                mrq.stop = &stop;
+                mrq.data = &data;
+                host->mrq = &mrq;
+
+                mci_writel(host, TMOUT, ~0);
+                smpl = dw_mci_exynos_move_next_clksmpl(host);
+
+                mmc_wait_for_req(mmc, &mrq);
+
+                if (!cmd.error && !data.error) {
+                        if (!memcmp(blk_pattern, blk_test, blksz))
+                                candiates |= (1 << smpl);
+                } else {
+                        dev_dbg(host->dev,
+                                "Tuning error: cmd.error:%d, data.error:%d\n",
+                                cmd.error, data.error);
+                }
+        } while (start_smpl != smpl);
+
+        found = dw_mci_exynos_get_best_clksmpl(candiates);
+        if (found >= 0)
+                dw_mci_exynos_set_clksmpl(host, found);
+        else
+                ret = -EIO;
+
+        kfree(blk_test);
+        return ret;
+}
+
 /* Common capabilities of Exynos4/Exynos5 SoC */
 static unsigned long exynos_dwmmc_caps[4] = {
         MMC_CAP_UHS_DDR50 | MMC_CAP_1_8V_DDR |
@@ -171,6 +400,7 @@ static const struct dw_mci_drv_data exynos_drv_data = {
         .prepare_command        = dw_mci_exynos_prepare_command,
         .set_ios                = dw_mci_exynos_set_ios,
         .parse_dt               = dw_mci_exynos_parse_dt,
+        .execute_tuning         = dw_mci_exynos_execute_tuning,
 };
 
 static const struct of_device_id dw_mci_exynos_match[] = {
@@ -180,6 +410,8 @@ static const struct of_device_id dw_mci_exynos_match[] = {
                         .data = &exynos_drv_data, },
         { .compatible = "samsung,exynos5420-dw-mshc",
                         .data = &exynos_drv_data, },
+        { .compatible = "samsung,exynos5420-dw-mshc-smu",
+                        .data = &exynos_drv_data, },
         {},
 };
 MODULE_DEVICE_TABLE(of, dw_mci_exynos_match);
@@ -194,13 +426,20 @@ static int dw_mci_exynos_probe(struct platform_device *pdev)
         return dw_mci_pltfm_register(pdev, drv_data);
 }
 
+const struct dev_pm_ops dw_mci_exynos_pmops = {
+        SET_SYSTEM_SLEEP_PM_OPS(dw_mci_exynos_suspend, dw_mci_exynos_resume)
+        .resume_noirq = dw_mci_exynos_resume_noirq,
+        .thaw_noirq = dw_mci_exynos_resume_noirq,
+        .restore_noirq = dw_mci_exynos_resume_noirq,
+};
+
 static struct platform_driver dw_mci_exynos_pltfm_driver = {
         .probe          = dw_mci_exynos_probe,
         .remove         = __exit_p(dw_mci_pltfm_remove),
         .driver         = {
                 .name           = "dwmmc_exynos",
                 .of_match_table = dw_mci_exynos_match,
-                .pm             = &dw_mci_pltfm_pmops,
+                .pm             = &dw_mci_exynos_pmops,
         },
 };
 
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 20897529ea5e..5c4965655297 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -39,7 +39,6 @@ int dw_mci_pltfm_register(struct platform_device *pdev,
 {
         struct dw_mci *host;
         struct resource *regs;
-        int ret;
 
         host = devm_kzalloc(&pdev->dev, sizeof(struct dw_mci), GFP_KERNEL);
         if (!host)
@@ -59,12 +58,6 @@ int dw_mci_pltfm_register(struct platform_device *pdev,
         if (IS_ERR(host->regs))
                 return PTR_ERR(host->regs);
 
-        if (drv_data && drv_data->init) {
-                ret = drv_data->init(host);
-                if (ret)
-                        return ret;
-        }
-
         platform_set_drvdata(pdev, host);
         return dw_mci_probe(host);
 }
diff --git a/drivers/mmc/host/dw_mmc-socfpga.c b/drivers/mmc/host/dw_mmc-socfpga.c
index 14b5961a851c..3e8e53ae3302 100644
--- a/drivers/mmc/host/dw_mmc-socfpga.c
+++ b/drivers/mmc/host/dw_mmc-socfpga.c
@@ -38,21 +38,6 @@ struct dw_mci_socfpga_priv_data {
 
 static int dw_mci_socfpga_priv_init(struct dw_mci *host)
 {
-        struct dw_mci_socfpga_priv_data *priv;
-
-        priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
-        if (!priv) {
-                dev_err(host->dev, "mem alloc failed for private data\n");
-                return -ENOMEM;
-        }
-
-        priv->sysreg = syscon_regmap_lookup_by_compatible("altr,sys-mgr");
-        if (IS_ERR(priv->sysreg)) {
-                dev_err(host->dev, "regmap for altr,sys-mgr lookup failed.\n");
-                return PTR_ERR(priv->sysreg);
-        }
-        host->priv = priv;
-
         return 0;
 }
 
@@ -79,12 +64,24 @@ static void dw_mci_socfpga_prepare_command(struct dw_mci *host, u32 *cmdr)
 
 static int dw_mci_socfpga_parse_dt(struct dw_mci *host)
 {
-        struct dw_mci_socfpga_priv_data *priv = host->priv;
+        struct dw_mci_socfpga_priv_data *priv;
         struct device_node *np = host->dev->of_node;
         u32 timing[2];
         u32 div = 0;
         int ret;
 
+        priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                dev_err(host->dev, "mem alloc failed for private data\n");
+                return -ENOMEM;
+        }
+
+        priv->sysreg = syscon_regmap_lookup_by_compatible("altr,sys-mgr");
+        if (IS_ERR(priv->sysreg)) {
+                dev_err(host->dev, "regmap for altr,sys-mgr lookup failed.\n");
+                return PTR_ERR(priv->sysreg);
+        }
+
         ret = of_property_read_u32(np, "altr,dw-mshc-ciu-div", &div);
         if (ret)
                 dev_info(host->dev, "No dw-mshc-ciu-div specified, assuming 1");
@@ -96,6 +93,7 @@ static int dw_mci_socfpga_parse_dt(struct dw_mci *host)
                 return ret;
 
         priv->hs_timing = SYSMGR_SDMMC_CTRL_SET(timing[0], timing[1]);
+        host->priv = priv;
         return 0;
 }
 
@@ -113,7 +111,7 @@ static const struct of_device_id dw_mci_socfpga_match[] = {
 };
 MODULE_DEVICE_TABLE(of, dw_mci_socfpga_match);
 
-int dw_mci_socfpga_probe(struct platform_device *pdev)
+static int dw_mci_socfpga_probe(struct platform_device *pdev)
 {
         const struct dw_mci_drv_data *drv_data;
         const struct of_device_id *match;
@@ -128,7 +126,7 @@ static struct platform_driver dw_mci_socfpga_pltfm_driver = {
         .remove         = __exit_p(dw_mci_pltfm_remove),
         .driver         = {
                 .name           = "dwmmc_socfpga",
-                .of_match_table = of_match_ptr(dw_mci_socfpga_match),
+                .of_match_table = dw_mci_socfpga_match,
                 .pm             = &dw_mci_pltfm_pmops,
         },
 };
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 018f365e5ae4..4bce0deec362 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -29,6 +29,7 @@
 #include <linux/irq.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
+#include <linux/mmc/sdio.h>
 #include <linux/mmc/dw_mmc.h>
 #include <linux/bitops.h>
 #include <linux/regulator/consumer.h>
@@ -50,6 +51,9 @@
 #define DW_MCI_RECV_STATUS      2
 #define DW_MCI_DMA_THRESHOLD    16
 
+#define DW_MCI_FREQ_MAX 200000000       /* unit: HZ */
+#define DW_MCI_FREQ_MIN 400000          /* unit: HZ */
+
 #ifdef CONFIG_MMC_DW_IDMAC
 #define IDMAC_INT_CLR           (SDMMC_IDMAC_INT_AI | SDMMC_IDMAC_INT_NI | \
                                  SDMMC_IDMAC_INT_CES | SDMMC_IDMAC_INT_DU | \
@@ -76,42 +80,39 @@ struct idmac_desc {
 };
 #endif /* CONFIG_MMC_DW_IDMAC */
 
-/**
- * struct dw_mci_slot - MMC slot state
- * @mmc: The mmc_host representing this slot.
- * @host: The MMC controller this slot is using.
- * @quirks: Slot-level quirks (DW_MCI_SLOT_QUIRK_XXX)
- * @wp_gpio: If gpio_is_valid() we'll use this to read write protect.
- * @ctype: Card type for this slot.
- * @mrq: mmc_request currently being processed or waiting to be
- *      processed, or NULL when the slot is idle.
- * @queue_node: List node for placing this node in the @queue list of
- *      &struct dw_mci.
- * @clock: Clock rate configured by set_ios(). Protected by host->lock.
- * @flags: Random state bits associated with the slot.
- * @id: Number of this slot.
- * @last_detect_state: Most recently observed card detect state.
- */
-struct dw_mci_slot {
-        struct mmc_host         *mmc;
-        struct dw_mci           *host;
-
-        int                     quirks;
-        int                     wp_gpio;
-
-        u32                     ctype;
-
-        struct mmc_request      *mrq;
-        struct list_head        queue_node;
+static const u8 tuning_blk_pattern_4bit[] = {
+        0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,
+        0xc3, 0x3c, 0xcc, 0xff, 0xfe, 0xff, 0xfe, 0xef,
+        0xff, 0xdf, 0xff, 0xdd, 0xff, 0xfb, 0xff, 0xfb,
+        0xbf, 0xff, 0x7f, 0xff, 0x77, 0xf7, 0xbd, 0xef,
+        0xff, 0xf0, 0xff, 0xf0, 0x0f, 0xfc, 0xcc, 0x3c,
+        0xcc, 0x33, 0xcc, 0xcf, 0xff, 0xef, 0xff, 0xee,
+        0xff, 0xfd, 0xff, 0xfd, 0xdf, 0xff, 0xbf, 0xff,
+        0xbb, 0xff, 0xf7, 0xff, 0xf7, 0x7f, 0x7b, 0xde,
+};
 
-        unsigned int            clock;
-        unsigned long           flags;
-#define DW_MMC_CARD_PRESENT     0
-#define DW_MMC_CARD_NEED_INIT   1
-        int                     id;
-        int                     last_detect_state;
+static const u8 tuning_blk_pattern_8bit[] = {
+        0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00,
+        0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc, 0xcc,
+        0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff, 0xff,
+        0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee, 0xff,
+        0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xdd,
+        0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xbb,
+        0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff,
+        0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee, 0xff,
+        0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0x00,
+        0x00, 0xff, 0xff, 0xcc, 0xcc, 0xcc, 0x33, 0xcc,
+        0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc, 0xcc, 0xff,
+        0xff, 0xff, 0xee, 0xff, 0xff, 0xff, 0xee, 0xee,
+        0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, 0xdd,
+        0xdd, 0xff, 0xff, 0xff, 0xbb, 0xff, 0xff, 0xff,
+        0xbb, 0xbb, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff,
+        0xff, 0x77, 0x77, 0xff, 0x77, 0xbb, 0xdd, 0xee,
 };
 
+static inline bool dw_mci_fifo_reset(struct dw_mci *host);
+static inline bool dw_mci_ctrl_all_reset(struct dw_mci *host);
+
 #if defined(CONFIG_DEBUG_FS)
 static int dw_mci_req_show(struct seq_file *s, void *v)
 {
@@ -249,10 +250,15 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
 
         cmdr = cmd->opcode;
 
-        if (cmdr == MMC_STOP_TRANSMISSION)
+        if (cmd->opcode == MMC_STOP_TRANSMISSION ||
+            cmd->opcode == MMC_GO_IDLE_STATE ||
+            cmd->opcode == MMC_GO_INACTIVE_STATE ||
+            (cmd->opcode == SD_IO_RW_DIRECT &&
+             ((cmd->arg >> 9) & 0x1FFFF) == SDIO_CCCR_ABORT))
                 cmdr |= SDMMC_CMD_STOP;
         else
-                cmdr |= SDMMC_CMD_PRV_DAT_WAIT;
+                if (cmd->opcode != MMC_SEND_STATUS && cmd->data)
+                        cmdr |= SDMMC_CMD_PRV_DAT_WAIT;
 
         if (cmd->flags & MMC_RSP_PRESENT) {
                 /* We expect a response, so set this bit */
@@ -279,6 +285,40 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd)
         return cmdr;
 }
 
+static u32 dw_mci_prep_stop_abort(struct dw_mci *host, struct mmc_command *cmd)
+{
+        struct mmc_command *stop;
+        u32 cmdr;
+
+        if (!cmd->data)
+                return 0;
+
+        stop = &host->stop_abort;
+        cmdr = cmd->opcode;
+        memset(stop, 0, sizeof(struct mmc_command));
+
+        if (cmdr == MMC_READ_SINGLE_BLOCK ||
+            cmdr == MMC_READ_MULTIPLE_BLOCK ||
+            cmdr == MMC_WRITE_BLOCK ||
+            cmdr == MMC_WRITE_MULTIPLE_BLOCK) {
+                stop->opcode = MMC_STOP_TRANSMISSION;
+                stop->arg = 0;
+                stop->flags = MMC_RSP_R1B | MMC_CMD_AC;
+        } else if (cmdr == SD_IO_RW_EXTENDED) {
+                stop->opcode = SD_IO_RW_DIRECT;
+                stop->arg |= (1 << 31) | (0 << 28) | (SDIO_CCCR_ABORT << 9) |
+                             ((cmd->arg >> 28) & 0x7);
+                stop->flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_AC;
+        } else {
+                return 0;
+        }
+
+        cmdr = stop->opcode | SDMMC_CMD_STOP |
+                SDMMC_CMD_RESP_CRC | SDMMC_CMD_RESP_EXP;
+
+        return cmdr;
+}
+
 static void dw_mci_start_command(struct dw_mci *host,
                                  struct mmc_command *cmd, u32 cmd_flags)
 {
@@ -293,9 +333,10 @@ static void dw_mci_start_command(struct dw_mci *host,
         mci_writel(host, CMD, cmd_flags | SDMMC_CMD_START);
 }
 
-static void send_stop_cmd(struct dw_mci *host, struct mmc_data *data)
+static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data)
 {
-        dw_mci_start_command(host, data->stop, host->stop_cmdr);
+        struct mmc_command *stop = data->stop ? data->stop : &host->stop_abort;
+        dw_mci_start_command(host, stop, host->stop_cmdr);
 }
 
 /* DMA interface functions */
@@ -304,10 +345,10 @@ static void dw_mci_stop_dma(struct dw_mci *host)
         if (host->using_dma) {
                 host->dma_ops->stop(host);
                 host->dma_ops->cleanup(host);
-        } else {
-                /* Data transfer was stopped by the interrupt handler */
-                set_bit(EVENT_XFER_COMPLETE, &host->pending_events);
         }
+
+        /* Data transfer was stopped by the interrupt handler */
+        set_bit(EVENT_XFER_COMPLETE, &host->pending_events);
 }
 
 static int dw_mci_get_dma_dir(struct mmc_data *data)
@@ -331,6 +372,14 @@ static void dw_mci_dma_cleanup(struct dw_mci *host)
                                      dw_mci_get_dma_dir(data));
 }
 
+static void dw_mci_idmac_reset(struct dw_mci *host)
+{
+        u32 bmod = mci_readl(host, BMOD);
+        /* Software reset of DMA */
+        bmod |= SDMMC_IDMAC_SWRESET;
+        mci_writel(host, BMOD, bmod);
+}
+
 static void dw_mci_idmac_stop_dma(struct dw_mci *host)
 {
         u32 temp;
@@ -344,6 +393,7 @@ static void dw_mci_idmac_stop_dma(struct dw_mci *host)
         /* Stop the IDMAC running */
         temp = mci_readl(host, BMOD);
         temp &= ~(SDMMC_IDMAC_ENABLE | SDMMC_IDMAC_FB);
+        temp |= SDMMC_IDMAC_SWRESET;
         mci_writel(host, BMOD, temp);
 }
 
@@ -435,7 +485,7 @@ static int dw_mci_idmac_init(struct dw_mci *host)
         p->des3 = host->sg_dma;
         p->des0 = IDMAC_DES0_ER;
 
-        mci_writel(host, BMOD, SDMMC_IDMAC_SWRESET);
+        dw_mci_idmac_reset(host);
 
         /* Mask out interrupts - get Tx & Rx complete only */
         mci_writel(host, IDSTS, IDMAC_INT_CLR);
@@ -532,6 +582,78 @@ static void dw_mci_post_req(struct mmc_host *mmc,
         data->host_cookie = 0;
 }
 
+static void dw_mci_adjust_fifoth(struct dw_mci *host, struct mmc_data *data)
+{
+#ifdef CONFIG_MMC_DW_IDMAC
+        unsigned int blksz = data->blksz;
+        const u32 mszs[] = {1, 4, 8, 16, 32, 64, 128, 256};
+        u32 fifo_width = 1 << host->data_shift;
+        u32 blksz_depth = blksz / fifo_width, fifoth_val;
+        u32 msize = 0, rx_wmark = 1, tx_wmark, tx_wmark_invers;
+        int idx = (sizeof(mszs) / sizeof(mszs[0])) - 1;
+
+        tx_wmark = (host->fifo_depth) / 2;
+        tx_wmark_invers = host->fifo_depth - tx_wmark;
+
+        /*
+         * MSIZE is '1',
+         * if blksz is not a multiple of the FIFO width
+         */
+        if (blksz % fifo_width) {
+                msize = 0;
+                rx_wmark = 1;
+                goto done;
+        }
+
+        do {
+                if (!((blksz_depth % mszs[idx]) ||
+                     (tx_wmark_invers % mszs[idx]))) {
+                        msize = idx;
+                        rx_wmark = mszs[idx] - 1;
+                        break;
+                }
+        } while (--idx > 0);
+        /*
+         * If idx is '0', it won't be tried
+         * Thus, initial values are uesed
+         */
+done:
+        fifoth_val = SDMMC_SET_FIFOTH(msize, rx_wmark, tx_wmark);
+        mci_writel(host, FIFOTH, fifoth_val);
+#endif
+}
+
+static void dw_mci_ctrl_rd_thld(struct dw_mci *host, struct mmc_data *data)
+{
+        unsigned int blksz = data->blksz;
+        u32 blksz_depth, fifo_depth;
+        u16 thld_size;
+
+        WARN_ON(!(data->flags & MMC_DATA_READ));
+
+        if (host->timing != MMC_TIMING_MMC_HS200 &&
+            host->timing != MMC_TIMING_UHS_SDR104)
+                goto disable;
+
+        blksz_depth = blksz / (1 << host->data_shift);
+        fifo_depth = host->fifo_depth;
+
+        if (blksz_depth > fifo_depth)
+                goto disable;
+
+        /*
+         * If (blksz_depth) >= (fifo_depth >> 1), should be 'thld_size <= blksz'
+         * If (blksz_depth) <  (fifo_depth >> 1), should be thld_size = blksz
+         * Currently just choose blksz.
+         */
+        thld_size = blksz;
+        mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(thld_size, 1));
+        return;
+
+disable:
+        mci_writel(host, CDTHRCTL, SDMMC_SET_RD_THLD(0, 0));
+}
+
 static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data)
 {
         int sg_len;
@@ -556,6 +678,14 @@ static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data)
                  (unsigned long)host->sg_cpu, (unsigned long)host->sg_dma,
                  sg_len);
 
+        /*
+         * Decide the MSIZE and RX/TX Watermark.
+         * If current block size is same with previous size,
+         * no need to update fifoth.
+         */
+        if (host->prev_blksz != data->blksz)
+                dw_mci_adjust_fifoth(host, data);
+
         /* Enable the DMA interface */
         temp = mci_readl(host, CTRL);
         temp |= SDMMC_CTRL_DMA_ENABLE;
@@ -581,10 +711,12 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data)
         host->sg = NULL;
         host->data = data;
 
-        if (data->flags & MMC_DATA_READ)
+        if (data->flags & MMC_DATA_READ) {
                 host->dir_status = DW_MCI_RECV_STATUS;
-        else
+                dw_mci_ctrl_rd_thld(host, data);
+        } else {
                 host->dir_status = DW_MCI_SEND_STATUS;
+        }
 
         if (dw_mci_submit_data_dma(host, data)) {
                 int flags = SG_MITER_ATOMIC;
@@ -606,6 +738,21 @@ static void dw_mci_submit_data(struct dw_mci *host, struct mmc_data *data)
                 temp = mci_readl(host, CTRL);
                 temp &= ~SDMMC_CTRL_DMA_ENABLE;
                 mci_writel(host, CTRL, temp);
+
+                /*
+                 * Use the initial fifoth_val for PIO mode.
+                 * If next issued data may be transfered by DMA mode,
+                 * prev_blksz should be invalidated.
+                 */
+                mci_writel(host, FIFOTH, host->fifoth_val);
+                host->prev_blksz = 0;
+        } else {
+                /*
+                 * Keep the current block size.
+                 * It will be used to decide whether to update
+                 * fifoth register next time.
+                 */
+                host->prev_blksz = data->blksz;
         }
 }
 
@@ -632,24 +779,31 @@ static void mci_send_cmd(struct dw_mci_slot *slot, u32 cmd, u32 arg)
 static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)
 {
         struct dw_mci *host = slot->host;
+        unsigned int clock = slot->clock;
         u32 div;
         u32 clk_en_a;
 
-        if (slot->clock != host->current_speed || force_clkinit) {
-                div = host->bus_hz / slot->clock;
-                if (host->bus_hz % slot->clock && host->bus_hz > slot->clock)
+        if (!clock) {
+                mci_writel(host, CLKENA, 0);
+                mci_send_cmd(slot,
+                             SDMMC_CMD_UPD_CLK | SDMMC_CMD_PRV_DAT_WAIT, 0);
+        } else if (clock != host->current_speed || force_clkinit) {
+                div = host->bus_hz / clock;
+                if (host->bus_hz % clock && host->bus_hz > clock)
                         /*
                          * move the + 1 after the divide to prevent
                          * over-clocking the card.
                          */
                         div += 1;
 
-                div = (host->bus_hz != slot->clock) ? DIV_ROUND_UP(div, 2) : 0;
+                div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0;
 
-                dev_info(&slot->mmc->class_dev,
-                         "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ"
-                         " div = %d)\n", slot->id, host->bus_hz, slot->clock,
-                         div ? ((host->bus_hz / div) >> 1) : host->bus_hz, div);
+                if ((clock << div) != slot->__clk_old || force_clkinit)
+                        dev_info(&slot->mmc->class_dev,
+                                 "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n",
+                                 slot->id, host->bus_hz, clock,
+                                 div ? ((host->bus_hz / div) >> 1) :
+                                 host->bus_hz, div);
 
                 /* disable clock */
                 mci_writel(host, CLKENA, 0);
@@ -676,9 +830,12 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)
                 mci_send_cmd(slot,
                              SDMMC_CMD_UPD_CLK | SDMMC_CMD_PRV_DAT_WAIT, 0);
 
-                host->current_speed = slot->clock;
+                /* keep the clock with reflecting clock dividor */
+                slot->__clk_old = clock << div;
         }
 
+        host->current_speed = clock;
+
         /* Set the current slot bus width */
         mci_writel(host, CTYPE, (slot->ctype << slot->id));
 }
@@ -700,7 +857,9 @@ static void __dw_mci_start_request(struct dw_mci *host,
 
         host->pending_events = 0;
         host->completed_events = 0;
+        host->cmd_status = 0;
         host->data_status = 0;
+        host->dir_status = 0;
 
         data = cmd->data;
         if (data) {
@@ -724,6 +883,8 @@ static void __dw_mci_start_request(struct dw_mci *host,
 
         if (mrq->stop)
                 host->stop_cmdr = dw_mci_prepare_command(slot->mmc, mrq->stop);
+        else
+                host->stop_cmdr = dw_mci_prep_stop_abort(host, cmd);
 }
 
 static void dw_mci_start_request(struct dw_mci *host,
@@ -806,14 +967,13 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 regs &= ~((0x1 << slot->id) << 16);
 
         mci_writel(slot->host, UHS_REG, regs);
+        slot->host->timing = ios->timing;
 
-        if (ios->clock) {
-                /*
-                 * Use mirror of ios->clock to prevent race with mmc
-                 * core ios update when finding the minimum.
-                 */
-                slot->clock = ios->clock;
-        }
+        /*
+         * Use mirror of ios->clock to prevent race with mmc
+         * core ios update when finding the minimum.
+         */
+        slot->clock = ios->clock;
 
         if (drv_data && drv_data->set_ios)
                 drv_data->set_ios(slot->host, ios);
@@ -939,6 +1099,38 @@ static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb)
         }
 }
 
+static int dw_mci_execute_tuning(struct mmc_host *mmc, u32 opcode)
+{
+        struct dw_mci_slot *slot = mmc_priv(mmc);
+        struct dw_mci *host = slot->host;
+        const struct dw_mci_drv_data *drv_data = host->drv_data;
+        struct dw_mci_tuning_data tuning_data;
+        int err = -ENOSYS;
+
+        if (opcode == MMC_SEND_TUNING_BLOCK_HS200) {
+                if (mmc->ios.bus_width == MMC_BUS_WIDTH_8) {
+                        tuning_data.blk_pattern = tuning_blk_pattern_8bit;
+                        tuning_data.blksz = sizeof(tuning_blk_pattern_8bit);
+                } else if (mmc->ios.bus_width == MMC_BUS_WIDTH_4) {
+                        tuning_data.blk_pattern = tuning_blk_pattern_4bit;
+                        tuning_data.blksz = sizeof(tuning_blk_pattern_4bit);
+                } else {
+                        return -EINVAL;
+                }
+        } else if (opcode == MMC_SEND_TUNING_BLOCK) {
+                tuning_data.blk_pattern = tuning_blk_pattern_4bit;
+                tuning_data.blksz = sizeof(tuning_blk_pattern_4bit);
+        } else {
+                dev_err(host->dev,
+                        "Undefined command(%d) for tuning\n", opcode);
+                return -EINVAL;
+        }
+
+        if (drv_data && drv_data->execute_tuning)
+                err = drv_data->execute_tuning(slot, opcode, &tuning_data);
+        return err;
+}
+
 static const struct mmc_host_ops dw_mci_ops = {
         .request                = dw_mci_request,
         .pre_req                = dw_mci_pre_req,
@@ -947,6 +1139,7 @@ static const struct mmc_host_ops dw_mci_ops = {
         .get_ro                 = dw_mci_get_ro,
         .get_cd                 = dw_mci_get_cd,
         .enable_sdio_irq        = dw_mci_enable_sdio_irq,
+        .execute_tuning         = dw_mci_execute_tuning,
 };
 
 static void dw_mci_request_end(struct dw_mci *host, struct mmc_request *mrq)
@@ -978,7 +1171,7 @@ static void dw_mci_request_end(struct dw_mci *host, struct mmc_request *mrq)
         spin_lock(&host->lock);
 }
 
-static void dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd)
+static int dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd)
 {
         u32 status = host->cmd_status;
 
@@ -1012,12 +1205,52 @@ static void dw_mci_command_complete(struct dw_mci *host, struct mmc_command *cmd
                 /* newer ip versions need a delay between retries */
                 if (host->quirks & DW_MCI_QUIRK_RETRY_DELAY)
                         mdelay(20);
+        }
 
-                if (cmd->data) {
-                        dw_mci_stop_dma(host);
-                        host->data = NULL;
+        return cmd->error;
+}
+
+static int dw_mci_data_complete(struct dw_mci *host, struct mmc_data *data)
+{
+        u32 status = host->data_status;
+
+        if (status & DW_MCI_DATA_ERROR_FLAGS) {
+                if (status & SDMMC_INT_DRTO) {
+                        data->error = -ETIMEDOUT;
+                } else if (status & SDMMC_INT_DCRC) {
+                        data->error = -EILSEQ;
+                } else if (status & SDMMC_INT_EBE) {
+                        if (host->dir_status ==
+                                DW_MCI_SEND_STATUS) {
+                                /*
+                                 * No data CRC status was returned.
+                                 * The number of bytes transferred
+                                 * will be exaggerated in PIO mode.
+                                 */
+                                data->bytes_xfered = 0;
+                                data->error = -ETIMEDOUT;
+                        } else if (host->dir_status ==
+                                        DW_MCI_RECV_STATUS) {
+                                data->error = -EIO;
+                        }
+                } else {
+                        /* SDMMC_INT_SBE is included */
+                        data->error = -EIO;
                 }
+
+                dev_err(host->dev, "data error, status 0x%08x\n", status);
+
+                /*
+                 * After an error, there may be data lingering
+                 * in the FIFO
+                 */
+                dw_mci_fifo_reset(host);
+        } else {
+                data->bytes_xfered = data->blocks * data->blksz;
+                data->error = 0;
         }
+
+        return data->error;
 }
 
 static void dw_mci_tasklet_func(unsigned long priv)
@@ -1025,14 +1258,16 @@ static void dw_mci_tasklet_func(unsigned long priv)
         struct dw_mci *host = (struct dw_mci *)priv;
         struct mmc_data *data;
         struct mmc_command *cmd;
+        struct mmc_request *mrq;
         enum dw_mci_state state;
         enum dw_mci_state prev_state;
-        u32 status, ctrl;
+        unsigned int err;
 
         spin_lock(&host->lock);
 
         state = host->state;
         data = host->data;
+        mrq = host->mrq;
 
         do {
                 prev_state = state;
@@ -1049,16 +1284,23 @@ static void dw_mci_tasklet_func(unsigned long priv)
                         cmd = host->cmd;
                         host->cmd = NULL;
                         set_bit(EVENT_CMD_COMPLETE, &host->completed_events);
-                        dw_mci_command_complete(host, cmd);
-                        if (cmd == host->mrq->sbc && !cmd->error) {
+                        err = dw_mci_command_complete(host, cmd);
+                        if (cmd == mrq->sbc && !err) {
                                 prev_state = state = STATE_SENDING_CMD;
                                 __dw_mci_start_request(host, host->cur_slot,
-                                                       host->mrq->cmd);
+                                                       mrq->cmd);
                                 goto unlock;
                         }
 
-                        if (!host->mrq->data || cmd->error) {
-                                dw_mci_request_end(host, host->mrq);
+                        if (cmd->data && err) {
+                                dw_mci_stop_dma(host);
+                                send_stop_abort(host, data);
+                                state = STATE_SENDING_STOP;
+                                break;
+                        }
+
+                        if (!cmd->data || err) {
+                                dw_mci_request_end(host, mrq);
                                 goto unlock;
                         }
 
@@ -1069,8 +1311,7 @@ static void dw_mci_tasklet_func(unsigned long priv)
                         if (test_and_clear_bit(EVENT_DATA_ERROR,
                                                &host->pending_events)) {
                                 dw_mci_stop_dma(host);
-                                if (data->stop)
-                                        send_stop_cmd(host, data);
+                                send_stop_abort(host, data);
                                 state = STATE_DATA_ERROR;
                                 break;
                         }
@@ -1090,60 +1331,27 @@ static void dw_mci_tasklet_func(unsigned long priv)
 
                         host->data = NULL;
                         set_bit(EVENT_DATA_COMPLETE, &host->completed_events);
-                        status = host->data_status;
-
-                        if (status & DW_MCI_DATA_ERROR_FLAGS) {
-                                if (status & SDMMC_INT_DRTO) {
-                                        data->error = -ETIMEDOUT;
-                                } else if (status & SDMMC_INT_DCRC) {
-                                        data->error = -EILSEQ;
-                                } else if (status & SDMMC_INT_EBE &&
-                                           host->dir_status ==
-                                                        DW_MCI_SEND_STATUS) {
-                                        /*
-                                         * No data CRC status was returned.
-                                         * The number of bytes transferred will
-                                         * be exaggerated in PIO mode.
-                                         */
-                                        data->bytes_xfered = 0;
-                                        data->error = -ETIMEDOUT;
-                                } else {
-                                        dev_err(host->dev,
-                                                "data FIFO error "
-                                                "(status=%08x)\n",
-                                                status);
-                                        data->error = -EIO;
-                                }
-                                /*
-                                 * After an error, there may be data lingering
-                                 * in the FIFO, so reset it - doing so
-                                 * generates a block interrupt, hence setting
-                                 * the scatter-gather pointer to NULL.
-                                 */
-                                sg_miter_stop(&host->sg_miter);
-                                host->sg = NULL;
-                                ctrl = mci_readl(host, CTRL);
-                                ctrl |= SDMMC_CTRL_FIFO_RESET;
-                                mci_writel(host, CTRL, ctrl);
-                        } else {
-                                data->bytes_xfered = data->blocks * data->blksz;
-                                data->error = 0;
-                        }
+                        err = dw_mci_data_complete(host, data);
 
-                        if (!data->stop) {
-                                dw_mci_request_end(host, host->mrq);
-                                goto unlock;
-                        }
+                        if (!err) {
+                                if (!data->stop || mrq->sbc) {
+                                        if (mrq->sbc)
+                                                data->stop->error = 0;
+                                        dw_mci_request_end(host, mrq);
+                                        goto unlock;
+                                }
 
-                        if (host->mrq->sbc && !data->error) {
-                                data->stop->error = 0;
-                                dw_mci_request_end(host, host->mrq);
-                                goto unlock;
+                                /* stop command for open-ended transfer*/
+                                if (data->stop)
+                                        send_stop_abort(host, data);
                         }
 
+                        /*
+                         * If err has non-zero,
+                         * stop-abort command has been already issued.
+                         */
                         prev_state = state = STATE_SENDING_STOP;
-                        if (!data->error)
-                                send_stop_cmd(host, data);
+
                         /* fall through */
 
                 case STATE_SENDING_STOP:
@@ -1151,9 +1359,19 @@ static void dw_mci_tasklet_func(unsigned long priv)
                                                 &host->pending_events))
                                 break;
 
+                        /* CMD error in data command */
+                        if (mrq->cmd->error && mrq->data)
+                                dw_mci_fifo_reset(host);
+
                         host->cmd = NULL;
-                        dw_mci_command_complete(host, host->mrq->stop);
-                        dw_mci_request_end(host, host->mrq);
+                        host->data = NULL;
+
+                        if (mrq->stop)
+                                dw_mci_command_complete(host, mrq->stop);
+                        else
+                                host->cmd_status = 0;
+
+                        dw_mci_request_end(host, mrq);
                         goto unlock;
 
                 case STATE_DATA_ERROR:
@@ -1697,7 +1915,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
                 struct mmc_host *mmc = slot->mmc;
                 struct mmc_request *mrq;
                 int present;
-                u32 ctrl;
 
                 present = dw_mci_get_cd(mmc);
                 while (present != slot->last_detect_state) {
@@ -1736,11 +1953,10 @@ static void dw_mci_work_routine_card(struct work_struct *work)
                                         case STATE_DATA_ERROR:
                                                 if (mrq->data->error == -EINPROGRESS)
                                                         mrq->data->error = -ENOMEDIUM;
-                                                if (!mrq->stop)
-                                                        break;
                                                 /* fall through */
                                         case STATE_SENDING_STOP:
-                                                mrq->stop->error = -ENOMEDIUM;
+                                                if (mrq->stop)
+                                                        mrq->stop->error = -ENOMEDIUM;
                                                 break;
                                         }
 
@@ -1763,23 +1979,10 @@ static void dw_mci_work_routine_card(struct work_struct *work)
                         if (present == 0) {
                                 clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
 
-                                /*
-                                 * Clear down the FIFO - doing so generates a
-                                 * block interrupt, hence setting the
-                                 * scatter-gather pointer to NULL.
-                                 */
-                                sg_miter_stop(&host->sg_miter);
-                                host->sg = NULL;
-
-                                ctrl = mci_readl(host, CTRL);
-                                ctrl |= SDMMC_CTRL_FIFO_RESET;
-                                mci_writel(host, CTRL, ctrl);
-
+                                /* Clear down the FIFO */
+                                dw_mci_fifo_reset(host);
 #ifdef CONFIG_MMC_DW_IDMAC
-                                ctrl = mci_readl(host, BMOD);
-                                /* Software reset of DMA */
-                                ctrl |= SDMMC_IDMAC_SWRESET;
-                                mci_writel(host, BMOD, ctrl);
+                                dw_mci_idmac_reset(host);
 #endif
 
                         }
@@ -1901,6 +2104,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
         struct dw_mci_slot *slot;
         const struct dw_mci_drv_data *drv_data = host->drv_data;
         int ctrl_id, ret;
+        u32 freq[2];
         u8 bus_width;
 
         mmc = mmc_alloc_host(sizeof(struct dw_mci_slot), host->dev);
@@ -1916,8 +2120,14 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
         slot->quirks = dw_mci_of_get_slot_quirks(host->dev, slot->id);
 
         mmc->ops = &dw_mci_ops;
-        mmc->f_min = DIV_ROUND_UP(host->bus_hz, 510);
-        mmc->f_max = host->bus_hz;
+        if (of_property_read_u32_array(host->dev->of_node,
+                                       "clock-freq-min-max", freq, 2)) {
+                mmc->f_min = DW_MCI_FREQ_MIN;
+                mmc->f_max = DW_MCI_FREQ_MAX;
+        } else {
+                mmc->f_min = freq[0];
+                mmc->f_max = freq[1];
+        }
 
         if (host->pdata->get_ocr)
                 mmc->ocr_avail = host->pdata->get_ocr(id);
@@ -1964,9 +2174,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
                 mmc->caps |= MMC_CAP_4_BIT_DATA;
         }
 
-        if (host->pdata->quirks & DW_MCI_QUIRK_HIGHSPEED)
-                mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
-
         if (host->pdata->blk_settings) {
                 mmc->max_segs = host->pdata->blk_settings->max_segs;
                 mmc->max_blk_size = host->pdata->blk_settings->max_blk_size;
@@ -2008,12 +2215,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
         /* Card initially undetected */
         slot->last_detect_state = 0;
 
-        /*
-         * Card may have been plugged in prior to boot so we
-         * need to run the detect tasklet
-         */
-        queue_work(host->card_workqueue, &host->card_work);
-
         return 0;
 
 err_setup_bus:
@@ -2074,36 +2275,57 @@ no_dma:
         return;
 }
 
-static bool mci_wait_reset(struct device *dev, struct dw_mci *host)
+static bool dw_mci_ctrl_reset(struct dw_mci *host, u32 reset)
 {
         unsigned long timeout = jiffies + msecs_to_jiffies(500);
-        unsigned int ctrl;
+        u32 ctrl;
 
-        mci_writel(host, CTRL, (SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET |
-                                SDMMC_CTRL_DMA_RESET));
+        ctrl = mci_readl(host, CTRL);
+        ctrl |= reset;
+        mci_writel(host, CTRL, ctrl);
 
         /* wait till resets clear */
         do {
                 ctrl = mci_readl(host, CTRL);
-                if (!(ctrl & (SDMMC_CTRL_RESET | SDMMC_CTRL_FIFO_RESET |
-                              SDMMC_CTRL_DMA_RESET)))
+                if (!(ctrl & reset))
                         return true;
         } while (time_before(jiffies, timeout));
 
-        dev_err(dev, "Timeout resetting block (ctrl %#x)\n", ctrl);
+        dev_err(host->dev,
+                "Timeout resetting block (ctrl reset %#x)\n",
+                ctrl & reset);
 
         return false;
 }
 
+static inline bool dw_mci_fifo_reset(struct dw_mci *host)
+{
+        /*
+         * Reseting generates a block interrupt, hence setting
+         * the scatter-gather pointer to NULL.
+         */
+        if (host->sg) {
+                sg_miter_stop(&host->sg_miter);
+                host->sg = NULL;
+        }
+
+        return dw_mci_ctrl_reset(host, SDMMC_CTRL_FIFO_RESET);
+}
+
+static inline bool dw_mci_ctrl_all_reset(struct dw_mci *host)
+{
+        return dw_mci_ctrl_reset(host,
+                                 SDMMC_CTRL_FIFO_RESET |
+                                 SDMMC_CTRL_RESET |
+                                 SDMMC_CTRL_DMA_RESET);
+}
+
 #ifdef CONFIG_OF
 static struct dw_mci_of_quirks {
         char *quirk;
         int id;
 } of_quirks[] = {
         {
-                .quirk  = "supports-highspeed",
-                .id     = DW_MCI_QUIRK_HIGHSPEED,
-        }, {
                 .quirk  = "broken-cd",
                 .id     = DW_MCI_QUIRK_BROKEN_CARD_DETECTION,
         },
@@ -2158,6 +2380,15 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
         if (of_find_property(np, "enable-sdio-wakeup", NULL))
                 pdata->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
 
+        if (of_find_property(np, "supports-highspeed", NULL))
+                pdata->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED;
+
+        if (of_find_property(np, "caps2-mmc-hs200-1_8v", NULL))
+                pdata->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
+
+        if (of_find_property(np, "caps2-mmc-hs200-1_2v", NULL))
+                pdata->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
+
         return pdata;
 }
 
@@ -2221,6 +2452,15 @@ int dw_mci_probe(struct dw_mci *host)
                 host->bus_hz = clk_get_rate(host->ciu_clk);
         }
 
+        if (drv_data && drv_data->init) {
+                ret = drv_data->init(host);
+                if (ret) {
+                        dev_err(host->dev,
+                                "implementation specific init failed\n");
+                        goto err_clk_ciu;
+                }
+        }
+
         if (drv_data && drv_data->setup_clock) {
                 ret = drv_data->setup_clock(host);
                 if (ret) {
@@ -2287,7 +2527,7 @@ int dw_mci_probe(struct dw_mci *host)
         }
 
         /* Reset all blocks */
-        if (!mci_wait_reset(host->dev, host))
+        if (!dw_mci_ctrl_all_reset(host))
                 return -ENODEV;
 
         host->dma_ops = host->pdata->dma_ops;
@@ -2317,8 +2557,8 @@ int dw_mci_probe(struct dw_mci *host)
                 fifo_size = host->pdata->fifo_depth;
         }
         host->fifo_depth = fifo_size;
-        host->fifoth_val = ((0x2 << 28) | ((fifo_size/2 - 1) << 16) |
-                        ((fifo_size/2) << 0));
+        host->fifoth_val =
+                SDMMC_SET_FIFOTH(0x2, fifo_size / 2 - 1, fifo_size / 2);
         mci_writel(host, FIFOTH, host->fifoth_val);
 
         /* disable clock to CIU */
@@ -2456,23 +2696,6 @@ EXPORT_SYMBOL(dw_mci_remove);
  */
 int dw_mci_suspend(struct dw_mci *host)
 {
-        int i, ret = 0;
-
-        for (i = 0; i < host->num_slots; i++) {
-                struct dw_mci_slot *slot = host->slot[i];
-                if (!slot)
-                        continue;
-                ret = mmc_suspend_host(slot->mmc);
-                if (ret < 0) {
-                        while (--i >= 0) {
-                                slot = host->slot[i];
-                                if (slot)
-                                        mmc_resume_host(host->slot[i]->mmc);
-                        }
-                        return ret;
-                }
-        }
-
         if (host->vmmc)
                 regulator_disable(host->vmmc);
 
@@ -2493,7 +2716,7 @@ int dw_mci_resume(struct dw_mci *host)
                 }
         }
 
-        if (!mci_wait_reset(host->dev, host)) {
+        if (!dw_mci_ctrl_all_reset(host)) {
                 ret = -ENODEV;
                 return ret;
         }
@@ -2501,8 +2724,15 @@ int dw_mci_resume(struct dw_mci *host)
         if (host->use_dma && host->dma_ops->init)
                 host->dma_ops->init(host);
 
-        /* Restore the old value at FIFOTH register */
+        /*
+         * Restore the initial value at FIFOTH register
+         * And Invalidate the prev_blksz with zero
+         */
         mci_writel(host, FIFOTH, host->fifoth_val);
+        host->prev_blksz = 0;
+
+        /* Put in max timeout */
+        mci_writel(host, TMOUT, 0xFFFFFFFF);
 
         mci_writel(host, RINTSTS, 0xFFFFFFFF);
         mci_writel(host, INTMASK, SDMMC_INT_CMD_DONE | SDMMC_INT_DATA_OVER |
@@ -2518,10 +2748,6 @@ int dw_mci_resume(struct dw_mci *host)
                         dw_mci_set_ios(slot->mmc, &slot->mmc->ios);
                         dw_mci_setup_bus(slot, true);
                 }
-
-                ret = mmc_resume_host(host->slot[i]->mmc);
-                if (ret < 0)
-                        return ret;
         }
         return 0;
 }
diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
index 81b29941c5b9..6bf24ab917e6 100644
--- a/drivers/mmc/host/dw_mmc.h
+++ b/drivers/mmc/host/dw_mmc.h
@@ -53,6 +53,7 @@
 #define SDMMC_IDINTEN           0x090
 #define SDMMC_DSCADDR           0x094
 #define SDMMC_BUFADDR           0x098
+#define SDMMC_CDTHRCTL          0x100
 #define SDMMC_DATA(x)           (x)
 
 /*
@@ -128,6 +129,10 @@
 #define SDMMC_CMD_INDX(n)               ((n) & 0x1F)
 /* Status register defines */
 #define SDMMC_GET_FCNT(x)               (((x)>>17) & 0x1FFF)
+/* FIFOTH register defines */
+#define SDMMC_SET_FIFOTH(m, r, t)       (((m) & 0x7) << 28 | \
+                                         ((r) & 0xFFF) << 16 | \
+                                         ((t) & 0xFFF))
 /* Internal DMAC interrupt defines */
 #define SDMMC_IDMAC_INT_AI              BIT(9)
 #define SDMMC_IDMAC_INT_NI              BIT(8)
@@ -142,6 +147,8 @@
 #define SDMMC_IDMAC_SWRESET             BIT(0)
 /* Version ID register define */
 #define SDMMC_GET_VERID(x)              ((x) & 0xFFFF)
+/* Card read threshold */
+#define SDMMC_SET_RD_THLD(v, x)         (((v) & 0x1FFF) << 16 | (x))
 
 /* Register access macros */
 #define mci_readl(dev, reg)                     \
@@ -184,6 +191,52 @@ extern int dw_mci_resume(struct dw_mci *host);
 #endif
 
 /**
+ * struct dw_mci_slot - MMC slot state
+ * @mmc: The mmc_host representing this slot.
+ * @host: The MMC controller this slot is using.
+ * @quirks: Slot-level quirks (DW_MCI_SLOT_QUIRK_XXX)
+ * @wp_gpio: If gpio_is_valid() we'll use this to read write protect.
+ * @ctype: Card type for this slot.
+ * @mrq: mmc_request currently being processed or waiting to be
+ *      processed, or NULL when the slot is idle.
+ * @queue_node: List node for placing this node in the @queue list of
+ *      &struct dw_mci.
+ * @clock: Clock rate configured by set_ios(). Protected by host->lock.
+ * @__clk_old: The last updated clock with reflecting clock divider.
+ *      Keeping track of this helps us to avoid spamming the console
+ *      with CONFIG_MMC_CLKGATE.
+ * @flags: Random state bits associated with the slot.
+ * @id: Number of this slot.
+ * @last_detect_state: Most recently observed card detect state.
+ */
+struct dw_mci_slot {
+        struct mmc_host         *mmc;
+        struct dw_mci           *host;
+
+        int                     quirks;
+        int                     wp_gpio;
+
+        u32                     ctype;
+
+        struct mmc_request      *mrq;
+        struct list_head        queue_node;
+
+        unsigned int            clock;
+        unsigned int            __clk_old;
+
+        unsigned long           flags;
+#define DW_MMC_CARD_PRESENT     0
+#define DW_MMC_CARD_NEED_INIT   1
+        int                     id;
+        int                     last_detect_state;
+};
+
+struct dw_mci_tuning_data {
+        const u8 *blk_pattern;
+        unsigned int blksz;
+};
+
+/**
  * dw_mci driver data - dw-mshc implementation specific driver data.
  * @caps: mmc subsystem specified capabilities of the controller(s).
  * @init: early implementation specific initialization.
@@ -203,5 +256,7 @@ struct dw_mci_drv_data {
         void            (*prepare_command)(struct dw_mci *host, u32 *cmdr);
         void            (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
         int             (*parse_dt)(struct dw_mci *host);
+        int             (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
+                                        struct dw_mci_tuning_data *tuning_data);
 };
 #endif /* _DW_MMC_H_ */
diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
index 66516339e3a0..de2139cf3444 100644
--- a/drivers/mmc/host/jz4740_mmc.c
+++ b/drivers/mmc/host/jz4740_mmc.c
@@ -880,8 +880,6 @@ static int jz4740_mmc_suspend(struct device *dev)
 {
         struct jz4740_mmc_host *host = dev_get_drvdata(dev);
 
-        mmc_suspend_host(host->mmc);
-
         jz_gpio_bulk_suspend(jz4740_mmc_pins, jz4740_mmc_num_pins(host));
 
         return 0;
@@ -893,8 +891,6 @@ static int jz4740_mmc_resume(struct device *dev)
 
         jz_gpio_bulk_resume(jz4740_mmc_pins, jz4740_mmc_num_pins(host));
 
-        mmc_resume_host(host->mmc);
-
         return 0;
 }
 
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index d135c76c4855..f32057972dd7 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1730,37 +1730,28 @@ static int mmci_suspend(struct device *dev)
 {
         struct amba_device *adev = to_amba_device(dev);
         struct mmc_host *mmc = amba_get_drvdata(adev);
-        int ret = 0;
 
         if (mmc) {
                 struct mmci_host *host = mmc_priv(mmc);
-
-                ret = mmc_suspend_host(mmc);
-                if (ret == 0) {
-                        pm_runtime_get_sync(dev);
-                        writel(0, host->base + MMCIMASK0);
-                }
+                pm_runtime_get_sync(dev);
+                writel(0, host->base + MMCIMASK0);
         }
 
-        return ret;
+        return 0;
 }
 
 static int mmci_resume(struct device *dev)
 {
         struct amba_device *adev = to_amba_device(dev);
         struct mmc_host *mmc = amba_get_drvdata(adev);
-        int ret = 0;
 
         if (mmc) {
                 struct mmci_host *host = mmc_priv(mmc);
-
                 writel(MCI_IRQENABLE, host->base + MMCIMASK0);
                 pm_runtime_put(dev);
-
-                ret = mmc_resume_host(mmc);
         }
 
-        return ret;
+        return 0;
 }
 #endif
 
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index b900de4e7e94..9405ecdaf6cf 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1416,28 +1416,10 @@ ioremap_free:
 }
 
 #ifdef CONFIG_PM
-#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ
-static void
-do_resume_work(struct work_struct *work)
-{
-        struct msmsdcc_host *host =
-                container_of(work, struct msmsdcc_host, resume_task);
-        struct mmc_host *mmc = host->mmc;
-
-        if (mmc) {
-                mmc_resume_host(mmc);
-                if (host->stat_irq)
-                        enable_irq(host->stat_irq);
-        }
-}
-#endif
-
-
 static int
 msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
 {
         struct mmc_host *mmc = mmc_get_drvdata(dev);
-        int rc = 0;
 
         if (mmc) {
                 struct msmsdcc_host *host = mmc_priv(mmc);
@@ -1445,14 +1427,11 @@ msmsdcc_suspend(struct platform_device *dev, pm_message_t state)
                 if (host->stat_irq)
                         disable_irq(host->stat_irq);
 
-                if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
-                        rc = mmc_suspend_host(mmc);
-                if (!rc)
-                        msmsdcc_writel(host, 0, MMCIMASK0);
+                msmsdcc_writel(host, 0, MMCIMASK0);
                 if (host->clks_on)
                         msmsdcc_disable_clocks(host, 0);
         }
-        return rc;
+        return 0;
 }
 
 static int
@@ -1467,8 +1446,6 @@ msmsdcc_resume(struct platform_device *dev)
 
                 msmsdcc_writel(host, host->saved_irq0mask, MMCIMASK0);
 
-                if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
-                        mmc_resume_host(mmc);
                 if (host->stat_irq)
                         enable_irq(host->stat_irq);
 #if BUSCLK_PWRSAVE
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index deecee08c288..45aa2206741d 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -775,9 +775,9 @@ static int mvsd_probe(struct platform_device *pdev)
 
         spin_lock_init(&host->lock);
 
-        host->base = devm_request_and_ioremap(&pdev->dev, r);
-        if (!host->base) {
-                ret = -ENOMEM;
+        host->base = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(host->base)) {
+                ret = PTR_ERR(host->base);
                 goto out;
         }
 
@@ -838,33 +838,6 @@ static int mvsd_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int mvsd_suspend(struct platform_device *dev, pm_message_t state)
-{
-        struct mmc_host *mmc = platform_get_drvdata(dev);
-        int ret = 0;
-
-        if (mmc)
-                ret = mmc_suspend_host(mmc);
-
-        return ret;
-}
-
-static int mvsd_resume(struct platform_device *dev)
-{
-        struct mmc_host *mmc = platform_get_drvdata(dev);
-        int ret = 0;
-
-        if (mmc)
-                ret = mmc_resume_host(mmc);
-
-        return ret;
-}
-#else
-#define mvsd_suspend    NULL
-#define mvsd_resume     NULL
-#endif
-
 static const struct of_device_id mvsdio_dt_ids[] = {
         { .compatible = "marvell,orion-sdio" },
         { /* sentinel */ }
@@ -874,8 +847,6 @@ MODULE_DEVICE_TABLE(of, mvsdio_dt_ids);
 static struct platform_driver mvsd_driver = {
         .probe          = mvsd_probe,
         .remove         = mvsd_remove,
-        .suspend        = mvsd_suspend,
-        .resume         = mvsd_resume,
         .driver         = {
                 .name   = DRIVER_NAME,
                 .of_match_table = mvsdio_dt_ids,
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index c174c6a0d224..f7199c83f5cf 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -1250,28 +1250,20 @@ static int mxcmci_suspend(struct device *dev)
 {
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct mxcmci_host *host = mmc_priv(mmc);
-        int ret = 0;
 
-        if (mmc)
-                ret = mmc_suspend_host(mmc);
         clk_disable_unprepare(host->clk_per);
         clk_disable_unprepare(host->clk_ipg);
-
-        return ret;
+        return 0;
 }
 
 static int mxcmci_resume(struct device *dev)
 {
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct mxcmci_host *host = mmc_priv(mmc);
-        int ret = 0;
 
         clk_prepare_enable(host->clk_per);
         clk_prepare_enable(host->clk_ipg);
-        if (mmc)
-                ret = mmc_resume_host(mmc);
-
-        return ret;
+        return 0;
 }
 
 static const struct dev_pm_ops mxcmci_pm_ops = {
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index e1fa3ef735e0..50fc9df791b2 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -724,13 +724,9 @@ static int mxs_mmc_suspend(struct device *dev)
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct mxs_mmc_host *host = mmc_priv(mmc);
         struct mxs_ssp *ssp = &host->ssp;
-        int ret = 0;
-
-        ret = mmc_suspend_host(mmc);
 
         clk_disable_unprepare(ssp->clk);
-
-        return ret;
+        return 0;
 }
 
 static int mxs_mmc_resume(struct device *dev)
@@ -738,13 +734,9 @@ static int mxs_mmc_resume(struct device *dev)
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct mxs_mmc_host *host = mmc_priv(mmc);
         struct mxs_ssp *ssp = &host->ssp;
-        int ret = 0;
 
         clk_prepare_enable(ssp->clk);
-
-        ret = mmc_resume_host(mmc);
-
-        return ret;
+        return 0;
 }
 
 static const struct dev_pm_ops mxs_mmc_pm_ops = {
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index b94f38ec2a83..0b10a9030f4e 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -128,7 +128,6 @@ struct mmc_omap_slot {
 
 struct mmc_omap_host {
         int                     initialized;
-        int                     suspended;
         struct mmc_request *    mrq;
         struct mmc_command *    cmd;
         struct mmc_data *       data;
@@ -1513,61 +1512,9 @@ static int mmc_omap_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int mmc_omap_suspend(struct platform_device *pdev, pm_message_t mesg)
-{
-        int i, ret = 0;
-        struct mmc_omap_host *host = platform_get_drvdata(pdev);
-
-        if (host == NULL || host->suspended)
-                return 0;
-
-        for (i = 0; i < host->nr_slots; i++) {
-                struct mmc_omap_slot *slot;
-
-                slot = host->slots[i];
-                ret = mmc_suspend_host(slot->mmc);
-                if (ret < 0) {
-                        while (--i >= 0) {
-                                slot = host->slots[i];
-                                mmc_resume_host(slot->mmc);
-                        }
-                        return ret;
-                }
-        }
-        host->suspended = 1;
-        return 0;
-}
-
-static int mmc_omap_resume(struct platform_device *pdev)
-{
-        int i, ret = 0;
-        struct mmc_omap_host *host = platform_get_drvdata(pdev);
-
-        if (host == NULL || !host->suspended)
-                return 0;
-
-        for (i = 0; i < host->nr_slots; i++) {
-                struct mmc_omap_slot *slot;
-                slot = host->slots[i];
-                ret = mmc_resume_host(slot->mmc);
-                if (ret < 0)
-                        return ret;
-
-                host->suspended = 0;
-        }
-        return 0;
-}
-#else
-#define mmc_omap_suspend        NULL
-#define mmc_omap_resume         NULL
-#endif
-
 static struct platform_driver mmc_omap_driver = {
         .probe          = mmc_omap_probe,
         .remove         = mmc_omap_remove,
-        .suspend        = mmc_omap_suspend,
-        .resume         = mmc_omap_resume,
         .driver         = {
                 .name   = DRIVER_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6ac63df645c4..dbd32ad3b749 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -75,6 +75,7 @@
 #define ICE                     0x1
 #define ICS                     0x2
 #define CEN                     (1 << 2)
+#define CLKD_MAX                0x3FF           /* max clock divisor: 1023 */
 #define CLKD_MASK               0x0000FFC0
 #define CLKD_SHIFT              6
 #define DTO_MASK                0x000F0000
@@ -119,7 +120,8 @@
                 BRR_EN | BWR_EN | TC_EN | CC_EN)
 
 #define MMC_AUTOSUSPEND_DELAY   100
-#define MMC_TIMEOUT_MS          20
+#define MMC_TIMEOUT_MS          20              /* 20 mSec */
+#define MMC_TIMEOUT_US          20000           /* 20000 micro Sec */
 #define OMAP_MMC_MIN_CLOCK      400000
 #define OMAP_MMC_MAX_CLOCK      52000000
 #define DRIVER_NAME             "omap_hsmmc"
@@ -171,6 +173,10 @@ struct omap_hsmmc_host {
         unsigned char           bus_mode;
         unsigned char           power_mode;
         int                     suspended;
+        u32                     con;
+        u32                     hctl;
+        u32                     sysctl;
+        u32                     capa;
         int                     irq;
         int                     use_dma, dma_ch;
         struct dma_chan         *tx_chan;
@@ -183,7 +189,6 @@ struct omap_hsmmc_host {
         int                     use_reg;
         int                     req_in_progress;
         struct omap_hsmmc_next  next_data;
-
         struct  omap_mmc_platform_data  *pdata;
 };
 
@@ -493,8 +498,8 @@ static u16 calc_divisor(struct omap_hsmmc_host *host, struct mmc_ios *ios)
 
         if (ios->clock) {
                 dsor = DIV_ROUND_UP(clk_get_rate(host->fclk), ios->clock);
-                if (dsor > 250)
-                        dsor = 250;
+                if (dsor > CLKD_MAX)
+                        dsor = CLKD_MAX;
         }
 
         return dsor;
@@ -597,25 +602,20 @@ static void omap_hsmmc_set_bus_mode(struct omap_hsmmc_host *host)
 static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
 {
         struct mmc_ios *ios = &host->mmc->ios;
-        struct omap_mmc_platform_data *pdata = host->pdata;
-        int context_loss = 0;
         u32 hctl, capa;
         unsigned long timeout;
 
-        if (pdata->get_context_loss_count) {
-                context_loss = pdata->get_context_loss_count(host->dev);
-                if (context_loss < 0)
-                        return 1;
-        }
-
-        dev_dbg(mmc_dev(host->mmc), "context was %slost\n",
-                context_loss == host->context_loss ? "not " : "");
-        if (host->context_loss == context_loss)
-                return 1;
-
         if (!OMAP_HSMMC_READ(host->base, SYSSTATUS) & RESETDONE)
                 return 1;
 
+        if (host->con == OMAP_HSMMC_READ(host->base, CON) &&
+            host->hctl == OMAP_HSMMC_READ(host->base, HCTL) &&
+            host->sysctl == OMAP_HSMMC_READ(host->base, SYSCTL) &&
+            host->capa == OMAP_HSMMC_READ(host->base, CAPA))
+                return 0;
+
+        host->context_loss++;
+
         if (host->pdata->controller_flags & OMAP_HSMMC_SUPPORTS_DUAL_VOLT) {
                 if (host->power_mode != MMC_POWER_OFF &&
                     (1 << ios->vdd) <= MMC_VDD_23_24)
@@ -655,9 +655,8 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
         omap_hsmmc_set_bus_mode(host);
 
 out:
-        host->context_loss = context_loss;
-
-        dev_dbg(mmc_dev(host->mmc), "context is restored\n");
+        dev_dbg(mmc_dev(host->mmc), "context is restored: restore count %d\n",
+                host->context_loss);
         return 0;
 }
 
@@ -666,15 +665,10 @@ out:
  */
 static void omap_hsmmc_context_save(struct omap_hsmmc_host *host)
 {
-        struct omap_mmc_platform_data *pdata = host->pdata;
-        int context_loss;
-
-        if (pdata->get_context_loss_count) {
-                context_loss = pdata->get_context_loss_count(host->dev);
-                if (context_loss < 0)
-                        return;
-                host->context_loss = context_loss;
-        }
+        host->con =  OMAP_HSMMC_READ(host->base, CON);
+        host->hctl = OMAP_HSMMC_READ(host->base, HCTL);
+        host->sysctl =  OMAP_HSMMC_READ(host->base, SYSCTL);
+        host->capa = OMAP_HSMMC_READ(host->base, CAPA);
 }
 
 #else
@@ -975,8 +969,7 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host *host,
                                                    unsigned long bit)
 {
         unsigned long i = 0;
-        unsigned long limit = (loops_per_jiffy *
-                                msecs_to_jiffies(MMC_TIMEOUT_MS));
+        unsigned long limit = MMC_TIMEOUT_US;
 
         OMAP_HSMMC_WRITE(host->base, SYSCTL,
                          OMAP_HSMMC_READ(host->base, SYSCTL) | bit);
@@ -988,13 +981,13 @@ static inline void omap_hsmmc_reset_controller_fsm(struct omap_hsmmc_host *host,
         if (mmc_slot(host).features & HSMMC_HAS_UPDATED_RESET) {
                 while ((!(OMAP_HSMMC_READ(host->base, SYSCTL) & bit))
                                         && (i++ < limit))
-                        cpu_relax();
+                        udelay(1);
         }
         i = 0;
 
         while ((OMAP_HSMMC_READ(host->base, SYSCTL) & bit) &&
                 (i++ < limit))
-                cpu_relax();
+                udelay(1);
 
         if (OMAP_HSMMC_READ(host->base, SYSCTL) & bit)
                 dev_err(mmc_dev(host->mmc),
@@ -1178,9 +1171,6 @@ static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id)
         struct omap_mmc_slot_data *slot = &mmc_slot(host);
         int carddetect;
 
-        if (host->suspended)
-                return IRQ_HANDLED;
-
         sysfs_notify(&host->mmc->class_dev.kobj, NULL, "cover_switch");
 
         if (slot->card_detect)
@@ -1635,18 +1625,9 @@ static int omap_hsmmc_regs_show(struct seq_file *s, void *data)
 {
         struct mmc_host *mmc = s->private;
         struct omap_hsmmc_host *host = mmc_priv(mmc);
-        int context_loss = 0;
-
-        if (host->pdata->get_context_loss_count)
-                context_loss = host->pdata->get_context_loss_count(host->dev);
 
-        seq_printf(s, "mmc%d:\n ctx_loss:\t%d:%d\n\nregs:\n",
-                        mmc->index, host->context_loss, context_loss);
-
-        if (host->suspended) {
-                seq_printf(s, "host suspended, can't read registers\n");
-                return 0;
-        }
+        seq_printf(s, "mmc%d:\n ctx_loss:\t%d\n\nregs:\n",
+                        mmc->index, host->context_loss);
 
         pm_runtime_get_sync(host->dev);
 
@@ -1838,13 +1819,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
 
         mmc->ops        = &omap_hsmmc_ops;
 
-        /*
-         * If regulator_disable can only put vcc_aux to sleep then there is
-         * no off state.
-         */
-        if (mmc_slot(host).vcc_aux_disable_is_sleep)
-                mmc_slot(host).no_off = 1;
-
         mmc->f_min = OMAP_MMC_MIN_CLOCK;
 
         if (pdata->max_freq > 0)
@@ -1874,7 +1848,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
         omap_hsmmc_context_save(host);
 
         /* This can be removed once we support PBIAS with DT */
-        if (host->dev->of_node && host->mapbase == 0x4809c000)
+        if (host->dev->of_node && res->start == 0x4809c000)
                 host->pbias_disable = 1;
 
         host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck");
@@ -2119,23 +2093,12 @@ static void omap_hsmmc_complete(struct device *dev)
 
 static int omap_hsmmc_suspend(struct device *dev)
 {
-        int ret = 0;
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
 
         if (!host)
                 return 0;
 
-        if (host && host->suspended)
-                return 0;
-
         pm_runtime_get_sync(host->dev);
-        host->suspended = 1;
-        ret = mmc_suspend_host(host->mmc);
-
-        if (ret) {
-                host->suspended = 0;
-                goto err;
-        }
 
         if (!(host->mmc->pm_flags & MMC_PM_KEEP_POWER)) {
                 omap_hsmmc_disable_irq(host);
@@ -2145,23 +2108,19 @@ static int omap_hsmmc_suspend(struct device *dev)
 
         if (host->dbclk)
                 clk_disable_unprepare(host->dbclk);
-err:
+
         pm_runtime_put_sync(host->dev);
-        return ret;
+        return 0;
 }
 
 /* Routine to resume the MMC device */
 static int omap_hsmmc_resume(struct device *dev)
 {
-        int ret = 0;
         struct omap_hsmmc_host *host = dev_get_drvdata(dev);
 
         if (!host)
                 return 0;
 
-        if (host && !host->suspended)
-                return 0;
-
         pm_runtime_get_sync(host->dev);
 
         if (host->dbclk)
@@ -2172,16 +2131,9 @@ static int omap_hsmmc_resume(struct device *dev)
 
         omap_hsmmc_protect_card(host);
 
-        /* Notify the core to resume the host */
-        ret = mmc_resume_host(host->mmc);
-        if (ret == 0)
-                host->suspended = 0;
-
         pm_runtime_mark_last_busy(host->dev);
         pm_runtime_put_autosuspend(host->dev);
-
-        return ret;
-
+        return 0;
 }
 
 #else
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index 1956a3df7cf3..32fe11323f39 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -880,35 +880,6 @@ static int pxamci_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
-static int pxamci_suspend(struct device *dev)
-{
-        struct mmc_host *mmc = dev_get_drvdata(dev);
-        int ret = 0;
-
-        if (mmc)
-                ret = mmc_suspend_host(mmc);
-
-        return ret;
-}
-
-static int pxamci_resume(struct device *dev)
-{
-        struct mmc_host *mmc = dev_get_drvdata(dev);
-        int ret = 0;
-
-        if (mmc)
-                ret = mmc_resume_host(mmc);
-
-        return ret;
-}
-
-static const struct dev_pm_ops pxamci_pm_ops = {
-        .suspend        = pxamci_suspend,
-        .resume         = pxamci_resume,
-};
-#endif
-
 static struct platform_driver pxamci_driver = {
         .probe          = pxamci_probe,
         .remove         = pxamci_remove,
@@ -916,9 +887,6 @@ static struct platform_driver pxamci_driver = {
                 .name   = DRIVER_NAME,
                 .owner  = THIS_MODULE,
                 .of_match_table = of_match_ptr(pxa_mmc_dt_ids),
-#ifdef CONFIG_PM
-                .pm     = &pxamci_pm_ops,
-#endif
         },
 };
 
diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c
index 375a880e0c5f..c46feda07d56 100644
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@ -364,7 +364,7 @@ static int sd_rw_multi(struct realtek_pci_sdmmc *host, struct mmc_request *mrq)
         struct mmc_host *mmc = host->mmc;
         struct mmc_card *card = mmc->card;
         struct mmc_data *data = mrq->data;
-        int uhs = mmc_sd_card_uhs(card);
+        int uhs = mmc_card_uhs(card);
         int read = (data->flags & MMC_DATA_READ) ? 1 : 0;
         u8 cfg2, trans_mode;
         int err;
@@ -1197,37 +1197,6 @@ static const struct mmc_host_ops realtek_pci_sdmmc_ops = {
         .execute_tuning = sdmmc_execute_tuning,
 };
 
-#ifdef CONFIG_PM
-static int rtsx_pci_sdmmc_suspend(struct platform_device *pdev,
-                pm_message_t state)
-{
-        struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
-        struct mmc_host *mmc = host->mmc;
-        int err;
-
-        dev_dbg(sdmmc_dev(host), "--> %s\n", __func__);
-
-        err = mmc_suspend_host(mmc);
-        if (err)
-                return err;
-
-        return 0;
-}
-
-static int rtsx_pci_sdmmc_resume(struct platform_device *pdev)
-{
-        struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev);
-        struct mmc_host *mmc = host->mmc;
-
-        dev_dbg(sdmmc_dev(host), "--> %s\n", __func__);
-
-        return mmc_resume_host(mmc);
-}
-#else /* CONFIG_PM */
-#define rtsx_pci_sdmmc_suspend NULL
-#define rtsx_pci_sdmmc_resume NULL
-#endif /* CONFIG_PM */
-
 static void init_extra_caps(struct realtek_pci_sdmmc *host)
 {
         struct mmc_host *mmc = host->mmc;
@@ -1367,8 +1336,6 @@ static struct platform_driver rtsx_pci_sdmmc_driver = {
         .probe          = rtsx_pci_sdmmc_drv_probe,
         .remove         = rtsx_pci_sdmmc_drv_remove,
         .id_table       = rtsx_pci_sdmmc_ids,
-        .suspend        = rtsx_pci_sdmmc_suspend,
-        .resume         = rtsx_pci_sdmmc_resume,
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = DRV_NAME_RTSX_PCI_SDMMC,
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 8d6794cdf899..2fce5ea5eb39 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1949,39 +1949,10 @@ static struct platform_device_id s3cmci_driver_ids[] = {
 
 MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids);
 
-
-#ifdef CONFIG_PM
-
-static int s3cmci_suspend(struct device *dev)
-{
-        struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
-
-        return mmc_suspend_host(mmc);
-}
-
-static int s3cmci_resume(struct device *dev)
-{
-        struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev));
-
-        return mmc_resume_host(mmc);
-}
-
-static const struct dev_pm_ops s3cmci_pm = {
-        .suspend        = s3cmci_suspend,
-        .resume         = s3cmci_resume,
-};
-
-#define s3cmci_pm_ops &s3cmci_pm
-#else /* CONFIG_PM */
-#define s3cmci_pm_ops NULL
-#endif /* CONFIG_PM */
-
-
 static struct platform_driver s3cmci_driver = {
         .driver = {
                 .name   = "s3c-sdi",
                 .owner  = THIS_MODULE,
-                .pm     = s3cmci_pm_ops,
         },
         .id_table       = s3cmci_driver_ids,
         .probe          = s3cmci_probe,
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 85472d3fd37f..7a190fe4dff1 100644
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -316,19 +316,7 @@ err_pltfm_free:
 
 static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev)
 {
-        struct sdhci_host *host = platform_get_drvdata(pdev);
-        int dead;
-        u32 scratch;
-
-        dead = 0;
-        scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
-        if (scratch == (u32)-1)
-                dead = 1;
-        sdhci_remove_host(host, dead);
-
-        sdhci_free_host(host);
-
-        return 0;
+        return sdhci_pltfm_unregister(pdev);
 }
 
 static struct platform_driver sdhci_bcm_kona_driver = {
diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index 36fa2df04660..f6d8d67c545f 100644
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -178,13 +178,7 @@ err:
 
 static int bcm2835_sdhci_remove(struct platform_device *pdev)
 {
-        struct sdhci_host *host = platform_get_drvdata(pdev);
-        int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
-
-        sdhci_remove_host(host, dead);
-        sdhci_pltfm_free(pdev);
-
-        return 0;
+        return sdhci_pltfm_unregister(pdev);
 }
 
 static const struct of_device_id bcm2835_sdhci_of_match[] = {
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index abc8cf01e6e3..461a4c3f4ef7 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -34,12 +34,40 @@
 /* VENDOR SPEC register */
 #define ESDHC_VENDOR_SPEC               0xc0
 #define  ESDHC_VENDOR_SPEC_SDIO_QUIRK   (1 << 1)
+#define  ESDHC_VENDOR_SPEC_VSELECT      (1 << 1)
+#define  ESDHC_VENDOR_SPEC_FRC_SDCLK_ON (1 << 8)
 #define ESDHC_WTMK_LVL                  0x44
 #define ESDHC_MIX_CTRL                  0x48
+#define  ESDHC_MIX_CTRL_DDREN           (1 << 3)
 #define  ESDHC_MIX_CTRL_AC23EN          (1 << 7)
+#define  ESDHC_MIX_CTRL_EXE_TUNE        (1 << 22)
+#define  ESDHC_MIX_CTRL_SMPCLK_SEL      (1 << 23)
+#define  ESDHC_MIX_CTRL_FBCLK_SEL       (1 << 25)
 /* Bits 3 and 6 are not SDHCI standard definitions */
 #define  ESDHC_MIX_CTRL_SDHCI_MASK      0xb7
 
+/* dll control register */
+#define ESDHC_DLL_CTRL                  0x60
+#define ESDHC_DLL_OVERRIDE_VAL_SHIFT    9
+#define ESDHC_DLL_OVERRIDE_EN_SHIFT     8
+
+/* tune control register */
+#define ESDHC_TUNE_CTRL_STATUS          0x68
+#define  ESDHC_TUNE_CTRL_STEP           1
+#define  ESDHC_TUNE_CTRL_MIN            0
+#define  ESDHC_TUNE_CTRL_MAX            ((1 << 7) - 1)
+
+#define ESDHC_TUNING_CTRL               0xcc
+#define ESDHC_STD_TUNING_EN             (1 << 24)
+/* NOTE: the minimum valid tuning start tap for mx6sl is 1 */
+#define ESDHC_TUNING_START_TAP          0x1
+
+#define ESDHC_TUNING_BLOCK_PATTERN_LEN  64
+
+/* pinctrl state */
+#define ESDHC_PINCTRL_STATE_100MHZ      "state_100mhz"
+#define ESDHC_PINCTRL_STATE_200MHZ      "state_200mhz"
+
 /*
  * Our interpretation of the SDHCI_HOST_CONTROL register
  */
@@ -66,21 +94,60 @@
  * As a result, the TC flag is not asserted and SW  received timeout
  * exeception. Bit1 of Vendor Spec registor is used to fix it.
  */
-#define ESDHC_FLAG_MULTIBLK_NO_INT      (1 << 1)
-
-enum imx_esdhc_type {
-        IMX25_ESDHC,
-        IMX35_ESDHC,
-        IMX51_ESDHC,
-        IMX53_ESDHC,
-        IMX6Q_USDHC,
+#define ESDHC_FLAG_MULTIBLK_NO_INT      BIT(1)
+/*
+ * The flag enables the workaround for ESDHC errata ENGcm07207 which
+ * affects i.MX25 and i.MX35.
+ */
+#define ESDHC_FLAG_ENGCM07207           BIT(2)
+/*
+ * The flag tells that the ESDHC controller is an USDHC block that is
+ * integrated on the i.MX6 series.
+ */
+#define ESDHC_FLAG_USDHC                BIT(3)
+/* The IP supports manual tuning process */
+#define ESDHC_FLAG_MAN_TUNING           BIT(4)
+/* The IP supports standard tuning process */
+#define ESDHC_FLAG_STD_TUNING           BIT(5)
+/* The IP has SDHCI_CAPABILITIES_1 register */
+#define ESDHC_FLAG_HAVE_CAP1            BIT(6)
+
+struct esdhc_soc_data {
+        u32 flags;
+};
+
+static struct esdhc_soc_data esdhc_imx25_data = {
+        .flags = ESDHC_FLAG_ENGCM07207,
+};
+
+static struct esdhc_soc_data esdhc_imx35_data = {
+        .flags = ESDHC_FLAG_ENGCM07207,
+};
+
+static struct esdhc_soc_data esdhc_imx51_data = {
+        .flags = 0,
+};
+
+static struct esdhc_soc_data esdhc_imx53_data = {
+        .flags = ESDHC_FLAG_MULTIBLK_NO_INT,
+};
+
+static struct esdhc_soc_data usdhc_imx6q_data = {
+        .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_MAN_TUNING,
+};
+
+static struct esdhc_soc_data usdhc_imx6sl_data = {
+        .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING
+                        | ESDHC_FLAG_HAVE_CAP1,
 };
 
 struct pltfm_imx_data {
-        int flags;
         u32 scratchpad;
-        enum imx_esdhc_type devtype;
         struct pinctrl *pinctrl;
+        struct pinctrl_state *pins_default;
+        struct pinctrl_state *pins_100mhz;
+        struct pinctrl_state *pins_200mhz;
+        const struct esdhc_soc_data *socdata;
         struct esdhc_platform_data boarddata;
         struct clk *clk_ipg;
         struct clk *clk_ahb;
@@ -90,25 +157,20 @@ struct pltfm_imx_data {
                 MULTIBLK_IN_PROCESS, /* exact multiblock cmd in process */
                 WAIT_FOR_INT,        /* sent CMD12, waiting for response INT */
         } multiblock_status;
-
+        u32 uhs_mode;
+        u32 is_ddr;
 };
 
 static struct platform_device_id imx_esdhc_devtype[] = {
         {
                 .name = "sdhci-esdhc-imx25",
-                .driver_data = IMX25_ESDHC,
+                .driver_data = (kernel_ulong_t) &esdhc_imx25_data,
         }, {
                 .name = "sdhci-esdhc-imx35",
-                .driver_data = IMX35_ESDHC,
+                .driver_data = (kernel_ulong_t) &esdhc_imx35_data,
         }, {
                 .name = "sdhci-esdhc-imx51",
-                .driver_data = IMX51_ESDHC,
-        }, {
-                .name = "sdhci-esdhc-imx53",
-                .driver_data = IMX53_ESDHC,
-        }, {
-                .name = "sdhci-usdhc-imx6q",
-                .driver_data = IMX6Q_USDHC,
+                .driver_data = (kernel_ulong_t) &esdhc_imx51_data,
         }, {
                 /* sentinel */
         }
@@ -116,38 +178,34 @@ static struct platform_device_id imx_esdhc_devtype[] = {
 MODULE_DEVICE_TABLE(platform, imx_esdhc_devtype);
 
 static const struct of_device_id imx_esdhc_dt_ids[] = {
-        { .compatible = "fsl,imx25-esdhc", .data = &imx_esdhc_devtype[IMX25_ESDHC], },
-        { .compatible = "fsl,imx35-esdhc", .data = &imx_esdhc_devtype[IMX35_ESDHC], },
-        { .compatible = "fsl,imx51-esdhc", .data = &imx_esdhc_devtype[IMX51_ESDHC], },
-        { .compatible = "fsl,imx53-esdhc", .data = &imx_esdhc_devtype[IMX53_ESDHC], },
-        { .compatible = "fsl,imx6q-usdhc", .data = &imx_esdhc_devtype[IMX6Q_USDHC], },
+        { .compatible = "fsl,imx25-esdhc", .data = &esdhc_imx25_data, },
+        { .compatible = "fsl,imx35-esdhc", .data = &esdhc_imx35_data, },
+        { .compatible = "fsl,imx51-esdhc", .data = &esdhc_imx51_data, },
+        { .compatible = "fsl,imx53-esdhc", .data = &esdhc_imx53_data, },
+        { .compatible = "fsl,imx6sl-usdhc", .data = &usdhc_imx6sl_data, },
+        { .compatible = "fsl,imx6q-usdhc", .data = &usdhc_imx6q_data, },
         { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_esdhc_dt_ids);
 
 static inline int is_imx25_esdhc(struct pltfm_imx_data *data)
 {
-        return data->devtype == IMX25_ESDHC;
-}
-
-static inline int is_imx35_esdhc(struct pltfm_imx_data *data)
-{
-        return data->devtype == IMX35_ESDHC;
+        return data->socdata == &esdhc_imx25_data;
 }
 
-static inline int is_imx51_esdhc(struct pltfm_imx_data *data)
+static inline int is_imx53_esdhc(struct pltfm_imx_data *data)
 {
-        return data->devtype == IMX51_ESDHC;
+        return data->socdata == &esdhc_imx53_data;
 }
 
-static inline int is_imx53_esdhc(struct pltfm_imx_data *data)
+static inline int is_imx6q_usdhc(struct pltfm_imx_data *data)
 {
-        return data->devtype == IMX53_ESDHC;
+        return data->socdata == &usdhc_imx6q_data;
 }
 
-static inline int is_imx6q_usdhc(struct pltfm_imx_data *data)
+static inline int esdhc_is_usdhc(struct pltfm_imx_data *data)
 {
-        return data->devtype == IMX6Q_USDHC;
+        return !!(data->socdata->flags & ESDHC_FLAG_USDHC);
 }
 
 static inline void esdhc_clrset_le(struct sdhci_host *host, u32 mask, u32 val, int reg)
@@ -164,7 +222,21 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
         struct pltfm_imx_data *imx_data = pltfm_host->priv;
         u32 val = readl(host->ioaddr + reg);
 
+        if (unlikely(reg == SDHCI_PRESENT_STATE)) {
+                u32 fsl_prss = val;
+                /* save the least 20 bits */
+                val = fsl_prss & 0x000FFFFF;
+                /* move dat[0-3] bits */
+                val |= (fsl_prss & 0x0F000000) >> 4;
+                /* move cmd line bit */
+                val |= (fsl_prss & 0x00800000) << 1;
+        }
+
         if (unlikely(reg == SDHCI_CAPABILITIES)) {
+                /* ignore bit[0-15] as it stores cap_1 register val for mx6sl */
+                if (imx_data->socdata->flags & ESDHC_FLAG_HAVE_CAP1)
+                        val &= 0xffff0000;
+
                 /* In FSL esdhc IC module, only bit20 is used to indicate the
                  * ADMA2 capability of esdhc, but this bit is messed up on
                  * some SOCs (e.g. on MX25, MX35 this bit is set, but they
@@ -178,6 +250,25 @@ static u32 esdhc_readl_le(struct sdhci_host *host, int reg)
                 }
         }
 
+        if (unlikely(reg == SDHCI_CAPABILITIES_1)) {
+                if (esdhc_is_usdhc(imx_data)) {
+                        if (imx_data->socdata->flags & ESDHC_FLAG_HAVE_CAP1)
+                                val = readl(host->ioaddr + SDHCI_CAPABILITIES) & 0xFFFF;
+                        else
+                                /* imx6q/dl does not have cap_1 register, fake one */
+                                val = SDHCI_SUPPORT_DDR50 | SDHCI_SUPPORT_SDR104
+                                        | SDHCI_SUPPORT_SDR50
+                                        | SDHCI_USE_SDR50_TUNING;
+                }
+        }
+
+        if (unlikely(reg == SDHCI_MAX_CURRENT) && esdhc_is_usdhc(imx_data)) {
+                val = 0;
+                val |= 0xFF << SDHCI_MAX_CURRENT_330_SHIFT;
+                val |= 0xFF << SDHCI_MAX_CURRENT_300_SHIFT;
+                val |= 0xFF << SDHCI_MAX_CURRENT_180_SHIFT;
+        }
+
         if (unlikely(reg == SDHCI_INT_STATUS)) {
                 if (val & ESDHC_INT_VENDOR_SPEC_DMA_ERR) {
                         val &= ~ESDHC_INT_VENDOR_SPEC_DMA_ERR;
@@ -224,7 +315,7 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
                 }
         }
 
-        if (unlikely((imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
+        if (unlikely((imx_data->socdata->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
                                 && (reg == SDHCI_INT_STATUS)
                                 && (val & SDHCI_INT_DATA_END))) {
                         u32 v;
@@ -256,10 +347,12 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
 {
         struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
         struct pltfm_imx_data *imx_data = pltfm_host->priv;
+        u16 ret = 0;
+        u32 val;
 
         if (unlikely(reg == SDHCI_HOST_VERSION)) {
                 reg ^= 2;
-                if (is_imx6q_usdhc(imx_data)) {
+                if (esdhc_is_usdhc(imx_data)) {
                         /*
                          * The usdhc register returns a wrong host version.
                          * Correct it here.
@@ -268,6 +361,30 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
                 }
         }
 
+        if (unlikely(reg == SDHCI_HOST_CONTROL2)) {
+                val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);
+                if (val & ESDHC_VENDOR_SPEC_VSELECT)
+                        ret |= SDHCI_CTRL_VDD_180;
+
+                if (esdhc_is_usdhc(imx_data)) {
+                        if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
+                                val = readl(host->ioaddr + ESDHC_MIX_CTRL);
+                        else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
+                                /* the std tuning bits is in ACMD12_ERR for imx6sl */
+                                val = readl(host->ioaddr + SDHCI_ACMD12_ERR);
+                }
+
+                if (val & ESDHC_MIX_CTRL_EXE_TUNE)
+                        ret |= SDHCI_CTRL_EXEC_TUNING;
+                if (val & ESDHC_MIX_CTRL_SMPCLK_SEL)
+                        ret |= SDHCI_CTRL_TUNED_CLK;
+
+                ret |= (imx_data->uhs_mode & SDHCI_CTRL_UHS_MASK);
+                ret &= ~SDHCI_CTRL_PRESET_VAL_ENABLE;
+
+                return ret;
+        }
+
         return readw(host->ioaddr + reg);
 }
 
@@ -275,10 +392,59 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
 {
         struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
         struct pltfm_imx_data *imx_data = pltfm_host->priv;
+        u32 new_val = 0;
 
         switch (reg) {
+        case SDHCI_CLOCK_CONTROL:
+                new_val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);
+                if (val & SDHCI_CLOCK_CARD_EN)
+                        new_val |= ESDHC_VENDOR_SPEC_FRC_SDCLK_ON;
+                else
+                        new_val &= ~ESDHC_VENDOR_SPEC_FRC_SDCLK_ON;
+                        writel(new_val, host->ioaddr + ESDHC_VENDOR_SPEC);
+                return;
+        case SDHCI_HOST_CONTROL2:
+                new_val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);
+                if (val & SDHCI_CTRL_VDD_180)
+                        new_val |= ESDHC_VENDOR_SPEC_VSELECT;
+                else
+                        new_val &= ~ESDHC_VENDOR_SPEC_VSELECT;
+                writel(new_val, host->ioaddr + ESDHC_VENDOR_SPEC);
+                imx_data->uhs_mode = val & SDHCI_CTRL_UHS_MASK;
+                if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
+                        new_val = readl(host->ioaddr + ESDHC_MIX_CTRL);
+                        if (val & SDHCI_CTRL_TUNED_CLK)
+                                new_val |= ESDHC_MIX_CTRL_SMPCLK_SEL;
+                        else
+                                new_val &= ~ESDHC_MIX_CTRL_SMPCLK_SEL;
+                        writel(new_val , host->ioaddr + ESDHC_MIX_CTRL);
+                } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
+                        u32 v = readl(host->ioaddr + SDHCI_ACMD12_ERR);
+                        u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
+                        new_val = readl(host->ioaddr + ESDHC_TUNING_CTRL);
+                        if (val & SDHCI_CTRL_EXEC_TUNING) {
+                                new_val |= ESDHC_STD_TUNING_EN |
+                                                ESDHC_TUNING_START_TAP;
+                                v |= ESDHC_MIX_CTRL_EXE_TUNE;
+                                m |= ESDHC_MIX_CTRL_FBCLK_SEL;
+                        } else {
+                                new_val &= ~ESDHC_STD_TUNING_EN;
+                                v &= ~ESDHC_MIX_CTRL_EXE_TUNE;
+                                m &= ~ESDHC_MIX_CTRL_FBCLK_SEL;
+                        }
+
+                        if (val & SDHCI_CTRL_TUNED_CLK)
+                                v |= ESDHC_MIX_CTRL_SMPCLK_SEL;
+                        else
+                                v &= ~ESDHC_MIX_CTRL_SMPCLK_SEL;
+
+                        writel(new_val, host->ioaddr + ESDHC_TUNING_CTRL);
+                        writel(v, host->ioaddr + SDHCI_ACMD12_ERR);
+                        writel(m, host->ioaddr + ESDHC_MIX_CTRL);
+                }
+                return;
         case SDHCI_TRANSFER_MODE:
-                if ((imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
+                if ((imx_data->socdata->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
                                 && (host->cmd->opcode == SD_IO_RW_EXTENDED)
                                 && (host->cmd->data->blocks > 1)
                                 && (host->cmd->data->flags & MMC_DATA_READ)) {
@@ -288,7 +454,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                         writel(v, host->ioaddr + ESDHC_VENDOR_SPEC);
                 }
 
-                if (is_imx6q_usdhc(imx_data)) {
+                if (esdhc_is_usdhc(imx_data)) {
                         u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
                         /* Swap AC23 bit */
                         if (val & SDHCI_TRNS_AUTO_CMD23) {
@@ -310,10 +476,10 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                         val |= SDHCI_CMD_ABORTCMD;
 
                 if ((host->cmd->opcode == MMC_SET_BLOCK_COUNT) &&
-                    (imx_data->flags & ESDHC_FLAG_MULTIBLK_NO_INT))
+                    (imx_data->socdata->flags & ESDHC_FLAG_MULTIBLK_NO_INT))
                         imx_data->multiblock_status = MULTIBLK_IN_PROCESS;
 
-                if (is_imx6q_usdhc(imx_data))
+                if (esdhc_is_usdhc(imx_data))
                         writel(val << 16,
                                host->ioaddr + SDHCI_TRANSFER_MODE);
                 else
@@ -379,8 +545,10 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg)
                  * The reset on usdhc fails to clear MIX_CTRL register.
                  * Do it manually here.
                  */
-                if (is_imx6q_usdhc(imx_data))
+                if (esdhc_is_usdhc(imx_data)) {
                         writel(0, host->ioaddr + ESDHC_MIX_CTRL);
+                        imx_data->is_ddr = 0;
+                }
         }
 }
 
@@ -409,8 +577,60 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
                                          unsigned int clock)
 {
         struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+        struct pltfm_imx_data *imx_data = pltfm_host->priv;
+        unsigned int host_clock = clk_get_rate(pltfm_host->clk);
+        int pre_div = 2;
+        int div = 1;
+        u32 temp, val;
+
+        if (clock == 0) {
+                if (esdhc_is_usdhc(imx_data)) {
+                        val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);
+                        writel(val & ~ESDHC_VENDOR_SPEC_FRC_SDCLK_ON,
+                                        host->ioaddr + ESDHC_VENDOR_SPEC);
+                }
+                goto out;
+        }
+
+        if (esdhc_is_usdhc(imx_data) && !imx_data->is_ddr)
+                pre_div = 1;
+
+        temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+        temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN
+                | ESDHC_CLOCK_MASK);
+        sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+
+        while (host_clock / pre_div / 16 > clock && pre_div < 256)
+                pre_div *= 2;
+
+        while (host_clock / pre_div / div > clock && div < 16)
+                div++;
 
-        esdhc_set_clock(host, clock, clk_get_rate(pltfm_host->clk));
+        host->mmc->actual_clock = host_clock / pre_div / div;
+        dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
+                clock, host->mmc->actual_clock);
+
+        if (imx_data->is_ddr)
+                pre_div >>= 2;
+        else
+                pre_div >>= 1;
+        div--;
+
+        temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+        temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN
+                | (div << ESDHC_DIVIDER_SHIFT)
+                | (pre_div << ESDHC_PREDIV_SHIFT));
+        sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+
+        if (esdhc_is_usdhc(imx_data)) {
+                val = readl(host->ioaddr + ESDHC_VENDOR_SPEC);
+                writel(val | ESDHC_VENDOR_SPEC_FRC_SDCLK_ON,
+                host->ioaddr + ESDHC_VENDOR_SPEC);
+        }
+
+        mdelay(1);
+out:
+        host->clock = clock;
 }
 
 static unsigned int esdhc_pltfm_get_ro(struct sdhci_host *host)
@@ -454,7 +674,192 @@ static int esdhc_pltfm_bus_width(struct sdhci_host *host, int width)
         return 0;
 }
 
-static const struct sdhci_ops sdhci_esdhc_ops = {
+static void esdhc_prepare_tuning(struct sdhci_host *host, u32 val)
+{
+        u32 reg;
+
+        /* FIXME: delay a bit for card to be ready for next tuning due to errors */
+        mdelay(1);
+
+        reg = readl(host->ioaddr + ESDHC_MIX_CTRL);
+        reg |= ESDHC_MIX_CTRL_EXE_TUNE | ESDHC_MIX_CTRL_SMPCLK_SEL |
+                        ESDHC_MIX_CTRL_FBCLK_SEL;
+        writel(reg, host->ioaddr + ESDHC_MIX_CTRL);
+        writel(val << 8, host->ioaddr + ESDHC_TUNE_CTRL_STATUS);
+        dev_dbg(mmc_dev(host->mmc),
+                "tunning with delay 0x%x ESDHC_TUNE_CTRL_STATUS 0x%x\n",
+                        val, readl(host->ioaddr + ESDHC_TUNE_CTRL_STATUS));
+}
+
+static void esdhc_request_done(struct mmc_request *mrq)
+{
+        complete(&mrq->completion);
+}
+
+static int esdhc_send_tuning_cmd(struct sdhci_host *host, u32 opcode)
+{
+        struct mmc_command cmd = {0};
+        struct mmc_request mrq = {0};
+        struct mmc_data data = {0};
+        struct scatterlist sg;
+        char tuning_pattern[ESDHC_TUNING_BLOCK_PATTERN_LEN];
+
+        cmd.opcode = opcode;
+        cmd.arg = 0;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+
+        data.blksz = ESDHC_TUNING_BLOCK_PATTERN_LEN;
+        data.blocks = 1;
+        data.flags = MMC_DATA_READ;
+        data.sg = &sg;
+        data.sg_len = 1;
+
+        sg_init_one(&sg, tuning_pattern, sizeof(tuning_pattern));
+
+        mrq.cmd = &cmd;
+        mrq.cmd->mrq = &mrq;
+        mrq.data = &data;
+        mrq.data->mrq = &mrq;
+        mrq.cmd->data = mrq.data;
+
+        mrq.done = esdhc_request_done;
+        init_completion(&(mrq.completion));
+
+        disable_irq(host->irq);
+        spin_lock(&host->lock);
+        host->mrq = &mrq;
+
+        sdhci_send_command(host, mrq.cmd);
+
+        spin_unlock(&host->lock);
+        enable_irq(host->irq);
+
+        wait_for_completion(&mrq.completion);
+
+        if (cmd.error)
+                return cmd.error;
+        if (data.error)
+                return data.error;
+
+        return 0;
+}
+
+static void esdhc_post_tuning(struct sdhci_host *host)
+{
+        u32 reg;
+
+        reg = readl(host->ioaddr + ESDHC_MIX_CTRL);
+        reg &= ~ESDHC_MIX_CTRL_EXE_TUNE;
+        writel(reg, host->ioaddr + ESDHC_MIX_CTRL);
+}
+
+static int esdhc_executing_tuning(struct sdhci_host *host, u32 opcode)
+{
+        int min, max, avg, ret;
+
+        /* find the mininum delay first which can pass tuning */
+        min = ESDHC_TUNE_CTRL_MIN;
+        while (min < ESDHC_TUNE_CTRL_MAX) {
+                esdhc_prepare_tuning(host, min);
+                if (!esdhc_send_tuning_cmd(host, opcode))
+                        break;
+                min += ESDHC_TUNE_CTRL_STEP;
+        }
+
+        /* find the maxinum delay which can not pass tuning */
+        max = min + ESDHC_TUNE_CTRL_STEP;
+        while (max < ESDHC_TUNE_CTRL_MAX) {
+                esdhc_prepare_tuning(host, max);
+                if (esdhc_send_tuning_cmd(host, opcode)) {
+                        max -= ESDHC_TUNE_CTRL_STEP;
+                        break;
+                }
+                max += ESDHC_TUNE_CTRL_STEP;
+        }
+
+        /* use average delay to get the best timing */
+        avg = (min + max) / 2;
+        esdhc_prepare_tuning(host, avg);
+        ret = esdhc_send_tuning_cmd(host, opcode);
+        esdhc_post_tuning(host);
+
+        dev_dbg(mmc_dev(host->mmc), "tunning %s at 0x%x ret %d\n",
+                ret ? "failed" : "passed", avg, ret);
+
+        return ret;
+}
+
+static int esdhc_change_pinstate(struct sdhci_host *host,
+                                                unsigned int uhs)
+{
+        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+        struct pltfm_imx_data *imx_data = pltfm_host->priv;
+        struct pinctrl_state *pinctrl;
+
+        dev_dbg(mmc_dev(host->mmc), "change pinctrl state for uhs %d\n", uhs);
+
+        if (IS_ERR(imx_data->pinctrl) ||
+                IS_ERR(imx_data->pins_default) ||
+                IS_ERR(imx_data->pins_100mhz) ||
+                IS_ERR(imx_data->pins_200mhz))
+                return -EINVAL;
+
+        switch (uhs) {
+        case MMC_TIMING_UHS_SDR50:
+                pinctrl = imx_data->pins_100mhz;
+                break;
+        case MMC_TIMING_UHS_SDR104:
+                pinctrl = imx_data->pins_200mhz;
+                break;
+        default:
+                /* back to default state for other legacy timing */
+                pinctrl = imx_data->pins_default;
+        }
+
+        return pinctrl_select_state(imx_data->pinctrl, pinctrl);
+}
+
+static int esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
+{
+        struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+        struct pltfm_imx_data *imx_data = pltfm_host->priv;
+        struct esdhc_platform_data *boarddata = &imx_data->boarddata;
+
+        switch (uhs) {
+        case MMC_TIMING_UHS_SDR12:
+                imx_data->uhs_mode = SDHCI_CTRL_UHS_SDR12;
+                break;
+        case MMC_TIMING_UHS_SDR25:
+                imx_data->uhs_mode = SDHCI_CTRL_UHS_SDR25;
+                break;
+        case MMC_TIMING_UHS_SDR50:
+                imx_data->uhs_mode = SDHCI_CTRL_UHS_SDR50;
+                break;
+        case MMC_TIMING_UHS_SDR104:
+                imx_data->uhs_mode = SDHCI_CTRL_UHS_SDR104;
+                break;
+        case MMC_TIMING_UHS_DDR50:
+                imx_data->uhs_mode = SDHCI_CTRL_UHS_DDR50;
+                writel(readl(host->ioaddr + ESDHC_MIX_CTRL) |
+                                ESDHC_MIX_CTRL_DDREN,
+                                host->ioaddr + ESDHC_MIX_CTRL);
+                imx_data->is_ddr = 1;
+                if (boarddata->delay_line) {
+                        u32 v;
+                        v = boarddata->delay_line <<
+                                ESDHC_DLL_OVERRIDE_VAL_SHIFT |
+                                (1 << ESDHC_DLL_OVERRIDE_EN_SHIFT);
+                        if (is_imx53_esdhc(imx_data))
+                                v <<= 1;
+                        writel(v, host->ioaddr + ESDHC_DLL_CTRL);
+                }
+                break;
+        }
+
+        return esdhc_change_pinstate(host, uhs);
+}
+
+static struct sdhci_ops sdhci_esdhc_ops = {
         .read_l = esdhc_readl_le,
         .read_w = esdhc_readw_le,
         .write_l = esdhc_writel_le,
@@ -465,6 +870,7 @@ static const struct sdhci_ops sdhci_esdhc_ops = {
         .get_min_clock = esdhc_pltfm_get_min_clock,
         .get_ro = esdhc_pltfm_get_ro,
         .platform_bus_width = esdhc_pltfm_bus_width,
+        .set_uhs_signaling = esdhc_set_uhs_signaling,
 };
 
 static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
@@ -506,6 +912,14 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 
         of_property_read_u32(np, "max-frequency", &boarddata->f_max);
 
+        if (of_find_property(np, "no-1-8-v", NULL))
+                boarddata->support_vsel = false;
+        else
+                boarddata->support_vsel = true;
+
+        if (of_property_read_u32(np, "fsl,delay-line", &boarddata->delay_line))
+                boarddata->delay_line = 0;
+
         return 0;
 }
 #else
@@ -539,9 +953,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
                 goto free_sdhci;
         }
 
-        if (of_id)
-                pdev->id_entry = of_id->data;
-        imx_data->devtype = pdev->id_entry->driver_data;
+        imx_data->socdata = of_id ? of_id->data : (struct esdhc_soc_data *)
+                                                  pdev->id_entry->driver_data;
         pltfm_host->priv = imx_data;
 
         imx_data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
@@ -568,29 +981,39 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
         clk_prepare_enable(imx_data->clk_ipg);
         clk_prepare_enable(imx_data->clk_ahb);
 
-        imx_data->pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        imx_data->pinctrl = devm_pinctrl_get(&pdev->dev);
         if (IS_ERR(imx_data->pinctrl)) {
                 err = PTR_ERR(imx_data->pinctrl);
                 goto disable_clk;
         }
 
+        imx_data->pins_default = pinctrl_lookup_state(imx_data->pinctrl,
+                                                PINCTRL_STATE_DEFAULT);
+        if (IS_ERR(imx_data->pins_default)) {
+                err = PTR_ERR(imx_data->pins_default);
+                dev_err(mmc_dev(host->mmc), "could not get default state\n");
+                goto disable_clk;
+        }
+
         host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
 
-        if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
+        if (imx_data->socdata->flags & ESDHC_FLAG_ENGCM07207)
                 /* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */
                 host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK
                         | SDHCI_QUIRK_BROKEN_ADMA;
 
-        if (is_imx53_esdhc(imx_data))
-                imx_data->flags |= ESDHC_FLAG_MULTIBLK_NO_INT;
-
         /*
          * The imx6q ROM code will change the default watermark level setting
          * to something insane.  Change it back here.
          */
-        if (is_imx6q_usdhc(imx_data))
+        if (esdhc_is_usdhc(imx_data)) {
                 writel(0x08100810, host->ioaddr + ESDHC_WTMK_LVL);
+                host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
+        }
 
+        if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
+                sdhci_esdhc_ops.platform_execute_tuning =
+                                        esdhc_executing_tuning;
         boarddata = &imx_data->boarddata;
         if (sdhci_esdhc_imx_probe_dt(pdev, boarddata) < 0) {
                 if (!host->mmc->parent->platform_data) {
@@ -650,6 +1073,23 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
                 break;
         }
 
+        /* sdr50 and sdr104 needs work on 1.8v signal voltage */
+        if ((boarddata->support_vsel) && esdhc_is_usdhc(imx_data)) {
+                imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl,
+                                                ESDHC_PINCTRL_STATE_100MHZ);
+                imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,
+                                                ESDHC_PINCTRL_STATE_200MHZ);
+                if (IS_ERR(imx_data->pins_100mhz) ||
+                                IS_ERR(imx_data->pins_200mhz)) {
+                        dev_warn(mmc_dev(host->mmc),
+                                "could not get ultra high speed state, work on normal mode\n");
+                        /* fall back to not support uhs by specify no 1.8v quirk */
+                        host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
+                }
+        } else {
+                host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
+        }
+
         err = sdhci_add_host(host);
         if (err)
                 goto disable_clk;
diff --git a/drivers/mmc/host/sdhci-esdhc.h b/drivers/mmc/host/sdhci-esdhc.h
index a2a06420e463..a7d9f95a7b03 100644
--- a/drivers/mmc/host/sdhci-esdhc.h
+++ b/drivers/mmc/host/sdhci-esdhc.h
@@ -49,41 +49,4 @@
 
 #define ESDHC_HOST_CONTROL_RES  0x05
 
-static inline void esdhc_set_clock(struct sdhci_host *host, unsigned int clock,
-                                   unsigned int host_clock)
-{
-        int pre_div = 2;
-        int div = 1;
-        u32 temp;
-
-        if (clock == 0)
-                goto out;
-
-        temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
-        temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN
-                | ESDHC_CLOCK_MASK);
-        sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
-
-        while (host_clock / pre_div / 16 > clock && pre_div < 256)
-                pre_div *= 2;
-
-        while (host_clock / pre_div / div > clock && div < 16)
-                div++;
-
-        dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
-                clock, host_clock / pre_div / div);
-
-        pre_div >>= 1;
-        div--;
-
-        temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
-        temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN
-                | (div << ESDHC_DIVIDER_SHIFT)
-                | (pre_div << ESDHC_PREDIV_SHIFT));
-        sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
-        mdelay(1);
-out:
-        host->clock = clock;
-}
-
 #endif /* _DRIVERS_MMC_SDHCI_ESDHC_H */
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index e328252ebf2a..0b249970b119 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -199,6 +199,14 @@ static unsigned int esdhc_of_get_min_clock(struct sdhci_host *host)
 
 static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
 {
+
+        int pre_div = 2;
+        int div = 1;
+        u32 temp;
+
+        if (clock == 0)
+                goto out;
+
         /* Workaround to reduce the clock frequency for p1010 esdhc */
         if (of_find_compatible_node(NULL, NULL, "fsl,p1010-esdhc")) {
                 if (clock > 20000000)
@@ -207,8 +215,31 @@ static void esdhc_of_set_clock(struct sdhci_host *host, unsigned int clock)
                         clock -= 5000000;
         }
 
-        /* Set the clock */
-        esdhc_set_clock(host, clock, host->max_clk);
+        temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+        temp &= ~(ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN
+                | ESDHC_CLOCK_MASK);
+        sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+
+        while (host->max_clk / pre_div / 16 > clock && pre_div < 256)
+                pre_div *= 2;
+
+        while (host->max_clk / pre_div / div > clock && div < 16)
+                div++;
+
+        dev_dbg(mmc_dev(host->mmc), "desired SD clock: %d, actual: %d\n",
+                clock, host->max_clk / pre_div / div);
+
+        pre_div >>= 1;
+        div--;
+
+        temp = sdhci_readl(host, ESDHC_SYSTEM_CONTROL);
+        temp |= (ESDHC_CLOCK_IPGEN | ESDHC_CLOCK_HCKEN | ESDHC_CLOCK_PEREN
+                | (div << ESDHC_DIVIDER_SHIFT)
+                | (pre_div << ESDHC_PREDIV_SHIFT));
+        sdhci_writel(host, temp, ESDHC_SYSTEM_CONTROL);
+        mdelay(1);
+out:
+        host->clock = clock;
 }
 
 #ifdef CONFIG_PM
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index d7d6bc8968d2..8f753811fc7a 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -37,6 +37,12 @@
 #define PCI_DEVICE_ID_INTEL_BYT_SDIO    0x0f15
 #define PCI_DEVICE_ID_INTEL_BYT_SD      0x0f16
 #define PCI_DEVICE_ID_INTEL_BYT_EMMC2   0x0f50
+#define PCI_DEVICE_ID_INTEL_MRFL_MMC    0x1190
+#define PCI_DEVICE_ID_INTEL_CLV_SDIO0   0x08f9
+#define PCI_DEVICE_ID_INTEL_CLV_SDIO1   0x08fa
+#define PCI_DEVICE_ID_INTEL_CLV_SDIO2   0x08fb
+#define PCI_DEVICE_ID_INTEL_CLV_EMMC0   0x08e5
+#define PCI_DEVICE_ID_INTEL_CLV_EMMC1   0x08e6
 
 /*
  * PCI registers
@@ -356,6 +362,28 @@ static const struct sdhci_pci_fixes sdhci_intel_byt_sd = {
         .allow_runtime_pm = true,
 };
 
+/* Define Host controllers for Intel Merrifield platform */
+#define INTEL_MRFL_EMMC_0       0
+#define INTEL_MRFL_EMMC_1       1
+
+static int intel_mrfl_mmc_probe_slot(struct sdhci_pci_slot *slot)
+{
+        if ((PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFL_EMMC_0) &&
+            (PCI_FUNC(slot->chip->pdev->devfn) != INTEL_MRFL_EMMC_1))
+                /* SD support is not ready yet */
+                return -ENODEV;
+
+        slot->host->mmc->caps |= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE |
+                                 MMC_CAP_1_8V_DDR;
+
+        return 0;
+}
+
+static const struct sdhci_pci_fixes sdhci_intel_mrfl_mmc = {
+        .quirks         = SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC,
+        .probe_slot     = intel_mrfl_mmc_probe_slot,
+};
+
 /* O2Micro extra registers */
 #define O2_SD_LOCK_WP           0xD3
 #define O2_SD_MULTI_VCC3V       0xEE
@@ -939,6 +967,54 @@ static const struct pci_device_id pci_ids[] = {
                 .driver_data    = (kernel_ulong_t)&sdhci_intel_byt_emmc,
         },
 
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_CLV_SDIO0,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_mfd_sd,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_CLV_SDIO1,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_mfd_sdio,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_CLV_SDIO2,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_mfd_sdio,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_CLV_EMMC0,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_mfd_emmc,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_CLV_EMMC1,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_mfd_emmc,
+        },
+
+        {
+                .vendor         = PCI_VENDOR_ID_INTEL,
+                .device         = PCI_DEVICE_ID_INTEL_MRFL_MMC,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_intel_mrfl_mmc,
+        },
         {
                 .vendor         = PCI_VENDOR_ID_O2,
                 .device         = PCI_DEVICE_ID_O2_8120,
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 7a7fb4f0d5a4..bd8a0982aec3 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -49,7 +49,6 @@ static unsigned int debug_quirks2;
 
 static void sdhci_finish_data(struct sdhci_host *);
 
-static void sdhci_send_command(struct sdhci_host *, struct mmc_command *);
 static void sdhci_finish_command(struct sdhci_host *);
 static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode);
 static void sdhci_tuning_timer(unsigned long data);
@@ -981,7 +980,7 @@ static void sdhci_finish_data(struct sdhci_host *host)
                 tasklet_schedule(&host->finish_tasklet);
 }
 
-static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
+void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
 {
         int flags;
         u32 mask;
@@ -1053,6 +1052,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
 
         sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND);
 }
+EXPORT_SYMBOL_GPL(sdhci_send_command);
 
 static void sdhci_finish_command(struct sdhci_host *host)
 {
@@ -1435,7 +1435,8 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
         }
 
         if (host->version >= SDHCI_SPEC_300 &&
-                (ios->power_mode == MMC_POWER_UP))
+                (ios->power_mode == MMC_POWER_UP) &&
+                !(host->quirks2 & SDHCI_QUIRK2_PRESET_VALUE_BROKEN))
                 sdhci_enable_preset_value(host, false);
 
         sdhci_set_clock(host, ios->clock);
@@ -1875,6 +1876,14 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
                 return 0;
         }
 
+        if (host->ops->platform_execute_tuning) {
+                spin_unlock(&host->lock);
+                enable_irq(host->irq);
+                err = host->ops->platform_execute_tuning(host, opcode);
+                sdhci_runtime_pm_put(host);
+                return err;
+        }
+
         sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
 
         /*
@@ -1981,6 +1990,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
         if (!tuning_loop_counter || !timeout) {
                 ctrl &= ~SDHCI_CTRL_TUNED_CLK;
                 sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
+                err = -EIO;
         } else {
                 if (!(ctrl & SDHCI_CTRL_TUNED_CLK)) {
                         pr_info(DRIVER_NAME ": Tuning procedure"
@@ -2491,6 +2501,14 @@ again:
         result = IRQ_HANDLED;
 
         intmask = sdhci_readl(host, SDHCI_INT_STATUS);
+
+        /*
+         * If we know we'll call the driver to signal SDIO IRQ, disregard
+         * further indications of Card Interrupt in the status to avoid a
+         * needless loop.
+         */
+        if (cardint)
+                intmask &= ~SDHCI_INT_CARD_INT;
         if (intmask && --max_loops)
                 goto again;
 out:
@@ -2546,8 +2564,6 @@ EXPORT_SYMBOL_GPL(sdhci_disable_irq_wakeups);
 
 int sdhci_suspend_host(struct sdhci_host *host)
 {
-        int ret;
-
         if (host->ops->platform_suspend)
                 host->ops->platform_suspend(host);
 
@@ -2559,19 +2575,6 @@ int sdhci_suspend_host(struct sdhci_host *host)
                 host->flags &= ~SDHCI_NEEDS_RETUNING;
         }
 
-        ret = mmc_suspend_host(host->mmc);
-        if (ret) {
-                if (host->flags & SDHCI_USING_RETUNING_TIMER) {
-                        host->flags |= SDHCI_NEEDS_RETUNING;
-                        mod_timer(&host->tuning_timer, jiffies +
-                                        host->tuning_count * HZ);
-                }
-
-                sdhci_enable_card_detection(host);
-
-                return ret;
-        }
-
         if (!device_may_wakeup(mmc_dev(host->mmc))) {
                 sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK);
                 free_irq(host->irq, host);
@@ -2579,14 +2582,14 @@ int sdhci_suspend_host(struct sdhci_host *host)
                 sdhci_enable_irq_wakeups(host);
                 enable_irq_wake(host->irq);
         }
-        return ret;
+        return 0;
 }
 
 EXPORT_SYMBOL_GPL(sdhci_suspend_host);
 
 int sdhci_resume_host(struct sdhci_host *host)
 {
-        int ret;
+        int ret = 0;
 
         if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
                 if (host->ops->enable_dma)
@@ -2615,7 +2618,6 @@ int sdhci_resume_host(struct sdhci_host *host)
                 mmiowb();
         }
 
-        ret = mmc_resume_host(host->mmc);
         sdhci_enable_card_detection(host);
 
         if (host->ops->platform_resume)
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index b037f188fe44..0a3ed01887db 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -288,6 +288,7 @@ struct sdhci_ops {
         unsigned int    (*get_ro)(struct sdhci_host *host);
         void    (*platform_reset_enter)(struct sdhci_host *host, u8 mask);
         void    (*platform_reset_exit)(struct sdhci_host *host, u8 mask);
+        int     (*platform_execute_tuning)(struct sdhci_host *host, u32 opcode);
         int     (*set_uhs_signaling)(struct sdhci_host *host, unsigned int uhs);
         void    (*hw_reset)(struct sdhci_host *host);
         void    (*platform_suspend)(struct sdhci_host *host);
@@ -393,6 +394,8 @@ static inline void *sdhci_priv(struct sdhci_host *host)
 extern void sdhci_card_detect(struct sdhci_host *host);
 extern int sdhci_add_host(struct sdhci_host *host);
 extern void sdhci_remove_host(struct sdhci_host *host, int dead);
+extern void sdhci_send_command(struct sdhci_host *host,
+                                struct mmc_command *cmd);
 
 #ifdef CONFIG_PM
 extern int sdhci_suspend_host(struct sdhci_host *host);
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index 50adbd155f35..b7e305775314 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -516,9 +516,7 @@ static void sdricoh_pcmcia_detach(struct pcmcia_device *link)
 #ifdef CONFIG_PM
 static int sdricoh_pcmcia_suspend(struct pcmcia_device *link)
 {
-        struct mmc_host *mmc = link->priv;
         dev_dbg(&link->dev, "suspend\n");
-        mmc_suspend_host(mmc);
         return 0;
 }
 
@@ -527,7 +525,6 @@ static int sdricoh_pcmcia_resume(struct pcmcia_device *link)
         struct mmc_host *mmc = link->priv;
         dev_dbg(&link->dev, "resume\n");
         sdricoh_reset(mmc_priv(mmc));
-        mmc_resume_host(mmc);
         return 0;
 }
 #else
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 36629a024aa1..d032b080ac4d 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -964,7 +964,7 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
 static int sh_mmcif_clk_update(struct sh_mmcif_host *host)
 {
-        int ret = clk_enable(host->hclk);
+        int ret = clk_prepare_enable(host->hclk);
 
         if (!ret) {
                 host->clk = clk_get_rate(host->hclk);
@@ -1018,7 +1018,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 }
                 if (host->power) {
                         pm_runtime_put_sync(&host->pd->dev);
-                        clk_disable(host->hclk);
+                        clk_disable_unprepare(host->hclk);
                         host->power = false;
                         if (ios->power_mode == MMC_POWER_OFF)
                                 sh_mmcif_set_power(host, ios);
@@ -1466,7 +1466,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 
         mutex_init(&host->thread_lock);
 
-        clk_disable(host->hclk);
+        clk_disable_unprepare(host->hclk);
         ret = mmc_add_host(mmc);
         if (ret < 0)
                 goto emmcaddh;
@@ -1487,7 +1487,7 @@ ereqirq1:
 ereqirq0:
         pm_runtime_suspend(&pdev->dev);
 eresume:
-        clk_disable(host->hclk);
+        clk_disable_unprepare(host->hclk);
 eclkupdate:
         clk_put(host->hclk);
 eclkget:
@@ -1505,7 +1505,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
         int irq[2];
 
         host->dying = true;
-        clk_enable(host->hclk);
+        clk_prepare_enable(host->hclk);
         pm_runtime_get_sync(&pdev->dev);
 
         dev_pm_qos_hide_latency_limit(&pdev->dev);
@@ -1530,7 +1530,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
         if (irq[1] >= 0)
                 free_irq(irq[1], host);
 
-        clk_disable(host->hclk);
+        clk_disable_unprepare(host->hclk);
         mmc_free_host(host->mmc);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
@@ -1538,28 +1538,21 @@ static int sh_mmcif_remove(struct platform_device *pdev)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int sh_mmcif_suspend(struct device *dev)
 {
         struct sh_mmcif_host *host = dev_get_drvdata(dev);
-        int ret = mmc_suspend_host(host->mmc);
 
-        if (!ret)
-                sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
+        sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
 
-        return ret;
+        return 0;
 }
 
 static int sh_mmcif_resume(struct device *dev)
 {
-        struct sh_mmcif_host *host = dev_get_drvdata(dev);
-
-        return mmc_resume_host(host->mmc);
+        return 0;
 }
-#else
-#define sh_mmcif_suspend        NULL
-#define sh_mmcif_resume         NULL
-#endif  /* CONFIG_PM */
+#endif
 
 static const struct of_device_id mmcif_of_match[] = {
         { .compatible = "renesas,sh-mmcif" },
@@ -1568,8 +1561,7 @@ static const struct of_device_id mmcif_of_match[] = {
 MODULE_DEVICE_TABLE(of, mmcif_of_match);
 
 static const struct dev_pm_ops sh_mmcif_dev_pm_ops = {
-        .suspend = sh_mmcif_suspend,
-        .resume = sh_mmcif_resume,
+        SET_SYSTEM_SLEEP_PM_OPS(sh_mmcif_suspend, sh_mmcif_resume)
 };
 
 static struct platform_driver sh_mmcif_driver = {
diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index 43d962829f8e..d1760ebcac03 100644
--- a/drivers/mmc/host/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
@@ -1030,7 +1030,7 @@ static void tifm_sd_remove(struct tifm_dev *sock)
 
 static int tifm_sd_suspend(struct tifm_dev *sock, pm_message_t state)
 {
-        return mmc_suspend_host(tifm_get_drvdata(sock));
+        return 0;
 }
 
 static int tifm_sd_resume(struct tifm_dev *sock)
@@ -1044,8 +1044,6 @@ static int tifm_sd_resume(struct tifm_dev *sock)
 
         if (rc)
                 host->eject = 1;
-        else
-                rc = mmc_resume_host(mmc);
 
         return rc;
 }
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index b3802256f954..f3b2d8ca1eca 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -1145,12 +1145,9 @@ int tmio_mmc_host_suspend(struct device *dev)
 {
         struct mmc_host *mmc = dev_get_drvdata(dev);
         struct tmio_mmc_host *host = mmc_priv(mmc);
-        int ret = mmc_suspend_host(mmc);
 
-        if (!ret)
-                tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL);
-
-        return ret;
+        tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL);
+        return 0;
 }
 EXPORT_SYMBOL(tmio_mmc_host_suspend);
 
@@ -1163,7 +1160,7 @@ int tmio_mmc_host_resume(struct device *dev)
 
         /* The MMC core will perform the complete set up */
         host->resuming = true;
-        return mmc_resume_host(mmc);
+        return 0;
 }
 EXPORT_SYMBOL(tmio_mmc_host_resume);
 
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index 4f84586c6e9e..63fac78b3d46 100644
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -1269,21 +1269,18 @@ static void via_init_sdc_pm(struct via_crdr_mmc_host *host)
 static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state)
 {
         struct via_crdr_mmc_host *host;
-        int ret = 0;
 
         host = pci_get_drvdata(pcidev);
 
         via_save_pcictrlreg(host);
         via_save_sdcreg(host);
 
-        ret = mmc_suspend_host(host->mmc);
-
         pci_save_state(pcidev);
         pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0);
         pci_disable_device(pcidev);
         pci_set_power_state(pcidev, pci_choose_state(pcidev, state));
 
-        return ret;
+        return 0;
 }
 
 static int via_sd_resume(struct pci_dev *pcidev)
@@ -1316,8 +1313,6 @@ static int via_sd_resume(struct pci_dev *pcidev)
         via_restore_pcictrlreg(sdhost);
         via_init_sdc_pm(sdhost);
 
-        ret = mmc_resume_host(sdhost->mmc);
-
         return ret;
 }
 
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index e9028ad05ffb..4262296c12fa 100644
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -2392,26 +2392,12 @@ static void vub300_disconnect(struct usb_interface *interface)
 #ifdef CONFIG_PM
 static int vub300_suspend(struct usb_interface *intf, pm_message_t message)
 {
-        struct vub300_mmc_host *vub300 = usb_get_intfdata(intf);
-        if (!vub300 || !vub300->mmc) {
-                return 0;
-        } else {
-                struct mmc_host *mmc = vub300->mmc;
-                mmc_suspend_host(mmc);
-                return 0;
-        }
+        return 0;
 }
 
 static int vub300_resume(struct usb_interface *intf)
 {
-        struct vub300_mmc_host *vub300 = usb_get_intfdata(intf);
-        if (!vub300 || !vub300->mmc) {
-                return 0;
-        } else {
-                struct mmc_host *mmc = vub300->mmc;
-                mmc_resume_host(mmc);
-                return 0;
-        }
+        return 0;
 }
 #else
 #define vub300_suspend NULL
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c
index e954b7758876..1defd5ed3236 100644
--- a/drivers/mmc/host/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
@@ -1814,28 +1814,11 @@ static void wbsd_pnp_remove(struct pnp_dev *dev)
 
 #ifdef CONFIG_PM
 
-static int wbsd_suspend(struct wbsd_host *host, pm_message_t state)
-{
-        BUG_ON(host == NULL);
-
-        return mmc_suspend_host(host->mmc);
-}
-
-static int wbsd_resume(struct wbsd_host *host)
-{
-        BUG_ON(host == NULL);
-
-        wbsd_init_device(host);
-
-        return mmc_resume_host(host->mmc);
-}
-
 static int wbsd_platform_suspend(struct platform_device *dev,
                                  pm_message_t state)
 {
         struct mmc_host *mmc = platform_get_drvdata(dev);
         struct wbsd_host *host;
-        int ret;
 
         if (mmc == NULL)
                 return 0;
@@ -1844,12 +1827,7 @@ static int wbsd_platform_suspend(struct platform_device *dev,
 
         host = mmc_priv(mmc);
 
-        ret = wbsd_suspend(host, state);
-        if (ret)
-                return ret;
-
         wbsd_chip_poweroff(host);
-
         return 0;
 }
 
@@ -1872,7 +1850,8 @@ static int wbsd_platform_resume(struct platform_device *dev)
          */
         mdelay(5);
 
-        return wbsd_resume(host);
+        wbsd_init_device(host);
+        return 0;
 }
 
 #ifdef CONFIG_PNP
@@ -1880,16 +1859,12 @@ static int wbsd_platform_resume(struct platform_device *dev)
 static int wbsd_pnp_suspend(struct pnp_dev *pnp_dev, pm_message_t state)
 {
         struct mmc_host *mmc = dev_get_drvdata(&pnp_dev->dev);
-        struct wbsd_host *host;
 
         if (mmc == NULL)
                 return 0;
 
         DBGF("Suspending...\n");
-
-        host = mmc_priv(mmc);
-
-        return wbsd_suspend(host, state);
+        return 0;
 }
 
 static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
@@ -1922,7 +1897,8 @@ static int wbsd_pnp_resume(struct pnp_dev *pnp_dev)
          */
         mdelay(5);
 
-        return wbsd_resume(host);
+        wbsd_init_device(host);
+        return 0;
 }
 
 #endif /* CONFIG_PNP */
diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c
index 34231d5168fc..e902ed7846b0 100644
--- a/drivers/mmc/host/wmt-sdmmc.c
+++ b/drivers/mmc/host/wmt-sdmmc.c
@@ -212,28 +212,14 @@ struct wmt_mci_priv {
 
 static void wmt_set_sd_power(struct wmt_mci_priv *priv, int enable)
 {
-        u32 reg_tmp;
-        if (enable) {
-                if (priv->power_inverted) {
-                        reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
-                        writeb(reg_tmp | BM_SD_OFF,
-                               priv->sdmmc_base + SDMMC_BUSMODE);
-                } else {
-                        reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
-                        writeb(reg_tmp & (~BM_SD_OFF),
-                               priv->sdmmc_base + SDMMC_BUSMODE);
-                }
-        } else {
-                if (priv->power_inverted) {
-                        reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
-                        writeb(reg_tmp & (~BM_SD_OFF),
-                               priv->sdmmc_base + SDMMC_BUSMODE);
-                } else {
-                        reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
-                        writeb(reg_tmp | BM_SD_OFF,
-                               priv->sdmmc_base + SDMMC_BUSMODE);
-                }
-        }
+        u32 reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
+
+        if (enable ^ priv->power_inverted)
+                reg_tmp &= ~BM_SD_OFF;
+        else
+                reg_tmp |= BM_SD_OFF;
+
+        writeb(reg_tmp, priv->sdmmc_base + SDMMC_BUSMODE);
 }
 
 static void wmt_mci_read_response(struct mmc_host *mmc)
@@ -939,28 +925,23 @@ static int wmt_mci_suspend(struct device *dev)
         struct platform_device *pdev = to_platform_device(dev);
         struct mmc_host *mmc = platform_get_drvdata(pdev);
         struct wmt_mci_priv *priv;
-        int ret;
 
         if (!mmc)
                 return 0;
 
         priv = mmc_priv(mmc);
-        ret = mmc_suspend_host(mmc);
-
-        if (!ret) {
-                reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
-                writeb(reg_tmp | BM_SOFT_RESET, priv->sdmmc_base +
-                       SDMMC_BUSMODE);
+        reg_tmp = readb(priv->sdmmc_base + SDMMC_BUSMODE);
+        writeb(reg_tmp | BM_SOFT_RESET, priv->sdmmc_base +
+               SDMMC_BUSMODE);
 
-                reg_tmp = readw(priv->sdmmc_base + SDMMC_BLKLEN);
-                writew(reg_tmp & 0x5FFF, priv->sdmmc_base + SDMMC_BLKLEN);
+        reg_tmp = readw(priv->sdmmc_base + SDMMC_BLKLEN);
+        writew(reg_tmp & 0x5FFF, priv->sdmmc_base + SDMMC_BLKLEN);
 
-                writeb(0xFF, priv->sdmmc_base + SDMMC_STS0);
-                writeb(0xFF, priv->sdmmc_base + SDMMC_STS1);
+        writeb(0xFF, priv->sdmmc_base + SDMMC_STS0);
+        writeb(0xFF, priv->sdmmc_base + SDMMC_STS1);
 
-                clk_disable(priv->clk_sdmmc);
-        }
-        return ret;
+        clk_disable(priv->clk_sdmmc);
+        return 0;
 }
 
 static int wmt_mci_resume(struct device *dev)
@@ -969,7 +950,6 @@ static int wmt_mci_resume(struct device *dev)
         struct platform_device *pdev = to_platform_device(dev);
         struct mmc_host *mmc = platform_get_drvdata(pdev);
         struct wmt_mci_priv *priv;
-        int ret = 0;
 
         if (mmc) {
                 priv = mmc_priv(mmc);
@@ -987,10 +967,9 @@ static int wmt_mci_resume(struct device *dev)
                 writeb(reg_tmp | INT0_DI_INT_EN, priv->sdmmc_base +
                        SDMMC_INTMASK0);
 
-                ret = mmc_resume_host(mmc);
         }
 
-        return ret;
+        return 0;
 }
 
 static const struct dev_pm_ops wmt_mci_pm = {
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index 6ca30739625f..8675d26a678b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -98,6 +98,7 @@ enum {
 static struct mlx5_cmd_work_ent *alloc_cmd(struct mlx5_cmd *cmd,
                                            struct mlx5_cmd_msg *in,
                                            struct mlx5_cmd_msg *out,
+                                           void *uout, int uout_size,
                                            mlx5_cmd_cbk_t cbk,
                                            void *context, int page_queue)
 {
@@ -110,6 +111,8 @@ static struct mlx5_cmd_work_ent *alloc_cmd(struct mlx5_cmd *cmd,
 
         ent->in         = in;
         ent->out        = out;
+        ent->uout       = uout;
+        ent->uout_size  = uout_size;
         ent->callback   = cbk;
         ent->context    = context;
         ent->cmd        = cmd;
@@ -534,6 +537,7 @@ static void cmd_work_handler(struct work_struct *work)
         ent->lay = lay;
         memset(lay, 0, sizeof(*lay));
         memcpy(lay->in, ent->in->first.data, sizeof(lay->in));
+        ent->op = be32_to_cpu(lay->in[0]) >> 16;
         if (ent->in->next)
                 lay->in_ptr = cpu_to_be64(ent->in->next->dma);
         lay->inlen = cpu_to_be32(ent->in->len);
@@ -628,7 +632,8 @@ static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)
  *    2. page queue commands do not support asynchrous completion
  */
 static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in,
-                           struct mlx5_cmd_msg *out, mlx5_cmd_cbk_t callback,
+                           struct mlx5_cmd_msg *out, void *uout, int uout_size,
+                           mlx5_cmd_cbk_t callback,
                            void *context, int page_queue, u8 *status)
 {
         struct mlx5_cmd *cmd = &dev->cmd;
@@ -642,7 +647,8 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in,
         if (callback && page_queue)
                 return -EINVAL;
 
-        ent = alloc_cmd(cmd, in, out, callback, context, page_queue);
+        ent = alloc_cmd(cmd, in, out, uout, uout_size, callback, context,
+                        page_queue);
         if (IS_ERR(ent))
                 return PTR_ERR(ent);
 
@@ -670,10 +676,10 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in,
                 op = be16_to_cpu(((struct mlx5_inbox_hdr *)in->first.data)->opcode);
                 if (op < ARRAY_SIZE(cmd->stats)) {
                         stats = &cmd->stats[op];
-                        spin_lock(&stats->lock);
+                        spin_lock_irq(&stats->lock);
                         stats->sum += ds;
                         ++stats->n;
-                        spin_unlock(&stats->lock);
+                        spin_unlock_irq(&stats->lock);
                 }
                 mlx5_core_dbg_mask(dev, 1 << MLX5_CMD_TIME,
                                    "fw exec time for %s is %lld nsec\n",
@@ -826,7 +832,7 @@ static struct mlx5_cmd_msg *mlx5_alloc_cmd_msg(struct mlx5_core_dev *dev,
         int n;
         int i;
 
-        msg = kzalloc(sizeof(*msg), GFP_KERNEL);
+        msg = kzalloc(sizeof(*msg), flags);
         if (!msg)
                 return ERR_PTR(-ENOMEM);
 
@@ -1109,6 +1115,19 @@ void mlx5_cmd_use_polling(struct mlx5_core_dev *dev)
                 up(&cmd->sem);
 }
 
+static void free_msg(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *msg)
+{
+        unsigned long flags;
+
+        if (msg->cache) {
+                spin_lock_irqsave(&msg->cache->lock, flags);
+                list_add_tail(&msg->list, &msg->cache->head);
+                spin_unlock_irqrestore(&msg->cache->lock, flags);
+        } else {
+                mlx5_free_cmd_msg(dev, msg);
+        }
+}
+
 void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, unsigned long vector)
 {
         struct mlx5_cmd *cmd = &dev->cmd;
@@ -1117,6 +1136,10 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, unsigned long vector)
         void *context;
         int err;
         int i;
+        ktime_t t1, t2, delta;
+        s64 ds;
+        struct mlx5_cmd_stats *stats;
+        unsigned long flags;
 
         for (i = 0; i < (1 << cmd->log_sz); i++) {
                 if (test_bit(i, &vector)) {
@@ -1141,9 +1164,29 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, unsigned long vector)
                         }
                         free_ent(cmd, ent->idx);
                         if (ent->callback) {
+                                t1 = timespec_to_ktime(ent->ts1);
+                                t2 = timespec_to_ktime(ent->ts2);
+                                delta = ktime_sub(t2, t1);
+                                ds = ktime_to_ns(delta);
+                                if (ent->op < ARRAY_SIZE(cmd->stats)) {
+                                        stats = &cmd->stats[ent->op];
+                                        spin_lock_irqsave(&stats->lock, flags);
+                                        stats->sum += ds;
+                                        ++stats->n;
+                                        spin_unlock_irqrestore(&stats->lock, flags);
+                                }
+
                                 callback = ent->callback;
                                 context = ent->context;
                                 err = ent->ret;
+                                if (!err)
+                                        err = mlx5_copy_from_msg(ent->uout,
+                                                                 ent->out,
+                                                                 ent->uout_size);
+
+                                mlx5_free_cmd_msg(dev, ent->out);
+                                free_msg(dev, ent->in);
+
                                 free_cmd(ent);
                                 callback(err, context);
                         } else {
@@ -1160,7 +1203,8 @@ static int status_to_err(u8 status)
         return status ? -1 : 0; /* TBD more meaningful codes */
 }
 
-static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size)
+static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size,
+                                      gfp_t gfp)
 {
         struct mlx5_cmd_msg *msg = ERR_PTR(-ENOMEM);
         struct mlx5_cmd *cmd = &dev->cmd;
@@ -1172,7 +1216,7 @@ static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size)
                 ent = &cmd->cache.med;
 
         if (ent) {
-                spin_lock(&ent->lock);
+                spin_lock_irq(&ent->lock);
                 if (!list_empty(&ent->head)) {
                         msg = list_entry(ent->head.next, typeof(*msg), list);
                         /* For cached lists, we must explicitly state what is
@@ -1181,43 +1225,34 @@ static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size)
                         msg->len = in_size;
                         list_del(&msg->list);
                 }
-                spin_unlock(&ent->lock);
+                spin_unlock_irq(&ent->lock);
         }
 
         if (IS_ERR(msg))
-                msg = mlx5_alloc_cmd_msg(dev, GFP_KERNEL, in_size);
+                msg = mlx5_alloc_cmd_msg(dev, gfp, in_size);
 
         return msg;
 }
 
-static void free_msg(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *msg)
-{
-        if (msg->cache) {
-                spin_lock(&msg->cache->lock);
-                list_add_tail(&msg->list, &msg->cache->head);
-                spin_unlock(&msg->cache->lock);
-        } else {
-                mlx5_free_cmd_msg(dev, msg);
-        }
-}
-
 static int is_manage_pages(struct mlx5_inbox_hdr *in)
 {
         return be16_to_cpu(in->opcode) == MLX5_CMD_OP_MANAGE_PAGES;
 }
 
-int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
-                  int out_size)
+static int cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
+                    int out_size, mlx5_cmd_cbk_t callback, void *context)
 {
         struct mlx5_cmd_msg *inb;
         struct mlx5_cmd_msg *outb;
         int pages_queue;
+        gfp_t gfp;
         int err;
         u8 status = 0;
 
         pages_queue = is_manage_pages(in);
+        gfp = callback ? GFP_ATOMIC : GFP_KERNEL;
 
-        inb = alloc_msg(dev, in_size);
+        inb = alloc_msg(dev, in_size, gfp);
         if (IS_ERR(inb)) {
                 err = PTR_ERR(inb);
                 return err;
@@ -1229,13 +1264,14 @@ int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
                 goto out_in;
         }
 
-        outb = mlx5_alloc_cmd_msg(dev, GFP_KERNEL, out_size);
+        outb = mlx5_alloc_cmd_msg(dev, gfp, out_size);
         if (IS_ERR(outb)) {
                 err = PTR_ERR(outb);
                 goto out_in;
         }
 
-        err = mlx5_cmd_invoke(dev, inb, outb, NULL, NULL, pages_queue, &status);
+        err = mlx5_cmd_invoke(dev, inb, outb, out, out_size, callback, context,
+                              pages_queue, &status);
         if (err)
                 goto out_out;
 
@@ -1248,14 +1284,30 @@ int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
         err = mlx5_copy_from_msg(out, outb, out_size);
 
 out_out:
-        mlx5_free_cmd_msg(dev, outb);
+        if (!callback)
+                mlx5_free_cmd_msg(dev, outb);
 
 out_in:
-        free_msg(dev, inb);
+        if (!callback)
+                free_msg(dev, inb);
         return err;
 }
+
+int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
+                  int out_size)
+{
+        return cmd_exec(dev, in, in_size, out, out_size, NULL, NULL);
+}
 EXPORT_SYMBOL(mlx5_cmd_exec);
 
+int mlx5_cmd_exec_cb(struct mlx5_core_dev *dev, void *in, int in_size,
+                     void *out, int out_size, mlx5_cmd_cbk_t callback,
+                     void *context)
+{
+        return cmd_exec(dev, in, in_size, out, out_size, callback, context);
+}
+EXPORT_SYMBOL(mlx5_cmd_exec_cb);
+
 static void destroy_msg_cache(struct mlx5_core_dev *dev)
 {
         struct mlx5_cmd *cmd = &dev->cmd;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
index 9c7194b26ee2..80f6d127257a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
@@ -154,10 +154,10 @@ static ssize_t average_read(struct file *filp, char __user *buf, size_t count,
                 return 0;
 
         stats = filp->private_data;
-        spin_lock(&stats->lock);
+        spin_lock_irq(&stats->lock);
         if (stats->n)
                 field = div64_u64(stats->sum, stats->n);
-        spin_unlock(&stats->lock);
+        spin_unlock_irq(&stats->lock);
         ret = snprintf(tbuf, sizeof(tbuf), "%llu\n", field);
         if (ret > 0) {
                 if (copy_to_user(buf, tbuf, ret))
@@ -175,10 +175,10 @@ static ssize_t average_write(struct file *filp, const char __user *buf,
         struct mlx5_cmd_stats *stats;
 
         stats = filp->private_data;
-        spin_lock(&stats->lock);
+        spin_lock_irq(&stats->lock);
         stats->sum = 0;
         stats->n = 0;
-        spin_unlock(&stats->lock);
+        spin_unlock_irq(&stats->lock);
 
         *pos += count;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 2231d93cc7ad..64a61b286b2c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -354,7 +354,7 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
         in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_CREATE_EQ);
         in->ctx.log_sz_usr_page = cpu_to_be32(ilog2(eq->nent) << 24 | uar->index);
         in->ctx.intr = vecidx;
-        in->ctx.log_page_size = PAGE_SHIFT - 12;
+        in->ctx.log_page_size = eq->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT;
         in->events_mask = cpu_to_be64(mask);
 
         err = mlx5_cmd_exec(dev, in, inlen, &out, sizeof(out));
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index bc0f5fb66e24..40a9f5ed814d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -159,6 +159,36 @@ struct mlx5_reg_host_endianess {
         u8      rsvd[15];
 };
 
+
+#define CAP_MASK(pos, size) ((u64)((1 << (size)) - 1) << (pos))
+
+enum {
+        MLX5_CAP_BITS_RW_MASK   = CAP_MASK(MLX5_CAP_OFF_CMDIF_CSUM, 2) |
+                                  CAP_MASK(MLX5_CAP_OFF_DCT, 1),
+};
+
+/* selectively copy writable fields clearing any reserved area
+ */
+static void copy_rw_fields(struct mlx5_hca_cap *to, struct mlx5_hca_cap *from)
+{
+        u64 v64;
+
+        to->log_max_qp = from->log_max_qp & 0x1f;
+        to->log_max_ra_req_dc = from->log_max_ra_req_dc & 0x3f;
+        to->log_max_ra_res_dc = from->log_max_ra_res_dc & 0x3f;
+        to->log_max_ra_req_qp = from->log_max_ra_req_qp & 0x3f;
+        to->log_max_ra_res_qp = from->log_max_ra_res_qp & 0x3f;
+        to->log_max_atomic_size_qp = from->log_max_atomic_size_qp;
+        to->log_max_atomic_size_dc = from->log_max_atomic_size_dc;
+        v64 = be64_to_cpu(from->flags) & MLX5_CAP_BITS_RW_MASK;
+        to->flags = cpu_to_be64(v64);
+}
+
+enum {
+        HCA_CAP_OPMOD_GET_MAX   = 0,
+        HCA_CAP_OPMOD_GET_CUR   = 1,
+};
+
 static int handle_hca_cap(struct mlx5_core_dev *dev)
 {
         struct mlx5_cmd_query_hca_cap_mbox_out *query_out = NULL;
@@ -180,7 +210,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)
         }
 
         query_ctx.hdr.opcode = cpu_to_be16(MLX5_CMD_OP_QUERY_HCA_CAP);
-        query_ctx.hdr.opmod  = cpu_to_be16(0x1);
+        query_ctx.hdr.opmod  = cpu_to_be16(HCA_CAP_OPMOD_GET_CUR);
         err = mlx5_cmd_exec(dev, &query_ctx, sizeof(query_ctx),
                                  query_out, sizeof(*query_out));
         if (err)
@@ -192,8 +222,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)
                 goto query_ex;
         }
 
-        memcpy(&set_ctx->hca_cap, &query_out->hca_cap,
-               sizeof(set_ctx->hca_cap));
+        copy_rw_fields(&set_ctx->hca_cap, &query_out->hca_cap);
 
         if (dev->profile->mask & MLX5_PROF_MASK_QP_SIZE)
                 set_ctx->hca_cap.log_max_qp = dev->profile->log_max_qp;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mr.c b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
index 5b44e2e46daf..35e514dc7b7d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mr.c
@@ -37,31 +37,41 @@
 #include "mlx5_core.h"
 
 int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
-                          struct mlx5_create_mkey_mbox_in *in, int inlen)
+                          struct mlx5_create_mkey_mbox_in *in, int inlen,
+                          mlx5_cmd_cbk_t callback, void *context,
+                          struct mlx5_create_mkey_mbox_out *out)
 {
-        struct mlx5_create_mkey_mbox_out out;
+        struct mlx5_create_mkey_mbox_out lout;
         int err;
         u8 key;
 
-        memset(&out, 0, sizeof(out));
-        spin_lock(&dev->priv.mkey_lock);
+        memset(&lout, 0, sizeof(lout));
+        spin_lock_irq(&dev->priv.mkey_lock);
         key = dev->priv.mkey_key++;
-        spin_unlock(&dev->priv.mkey_lock);
+        spin_unlock_irq(&dev->priv.mkey_lock);
         in->seg.qpn_mkey7_0 |= cpu_to_be32(key);
         in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_CREATE_MKEY);
-        err = mlx5_cmd_exec(dev, in, inlen, &out, sizeof(out));
+        if (callback) {
+                err = mlx5_cmd_exec_cb(dev, in, inlen, out, sizeof(*out),
+                                       callback, context);
+                return err;
+        } else {
+                err = mlx5_cmd_exec(dev, in, inlen, &lout, sizeof(lout));
+        }
+
         if (err) {
                 mlx5_core_dbg(dev, "cmd exec faile %d\n", err);
                 return err;
         }
 
-        if (out.hdr.status) {
-                mlx5_core_dbg(dev, "status %d\n", out.hdr.status);
-                return mlx5_cmd_status_to_err(&out.hdr);
+        if (lout.hdr.status) {
+                mlx5_core_dbg(dev, "status %d\n", lout.hdr.status);
+                return mlx5_cmd_status_to_err(&lout.hdr);
         }
 
-        mr->key = mlx5_idx_to_mkey(be32_to_cpu(out.mkey) & 0xffffff) | key;
-        mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n", be32_to_cpu(out.mkey), key, mr->key);
+        mr->key = mlx5_idx_to_mkey(be32_to_cpu(lout.mkey) & 0xffffff) | key;
+        mlx5_core_dbg(dev, "out 0x%x, key 0x%x, mkey 0x%x\n",
+                      be32_to_cpu(lout.mkey), key, mr->key);
 
         return err;
 }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index 7b12acf210f8..37b6ad1f9a1b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -57,10 +57,13 @@ struct mlx5_pages_req {
 };
 
 struct fw_page {
-        struct rb_node  rb_node;
-        u64             addr;
-        struct page     *page;
-        u16             func_id;
+        struct rb_node          rb_node;
+        u64                     addr;
+        struct page            *page;
+        u16                     func_id;
+        unsigned long           bitmask;
+        struct list_head        list;
+        unsigned                free_count;
 };
 
 struct mlx5_query_pages_inbox {
@@ -94,6 +97,11 @@ enum {
         MAX_RECLAIM_TIME_MSECS  = 5000,
 };
 
+enum {
+        MLX5_MAX_RECLAIM_TIME_MILI      = 5000,
+        MLX5_NUM_4K_IN_PAGE             = PAGE_SIZE / 4096,
+};
+
 static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u16 func_id)
 {
         struct rb_root *root = &dev->priv.page_root;
@@ -101,6 +109,7 @@ static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u
         struct rb_node *parent = NULL;
         struct fw_page *nfp;
         struct fw_page *tfp;
+        int i;
 
         while (*new) {
                 parent = *new;
@@ -113,25 +122,29 @@ static int insert_page(struct mlx5_core_dev *dev, u64 addr, struct page *page, u
                         return -EEXIST;
         }
 
-        nfp = kmalloc(sizeof(*nfp), GFP_KERNEL);
+        nfp = kzalloc(sizeof(*nfp), GFP_KERNEL);
         if (!nfp)
                 return -ENOMEM;
 
         nfp->addr = addr;
         nfp->page = page;
         nfp->func_id = func_id;
+        nfp->free_count = MLX5_NUM_4K_IN_PAGE;
+        for (i = 0; i < MLX5_NUM_4K_IN_PAGE; i++)
+                set_bit(i, &nfp->bitmask);
 
         rb_link_node(&nfp->rb_node, parent, new);
         rb_insert_color(&nfp->rb_node, root);
+        list_add(&nfp->list, &dev->priv.free_list);
 
         return 0;
 }
 
-static struct page *remove_page(struct mlx5_core_dev *dev, u64 addr)
+static struct fw_page *find_fw_page(struct mlx5_core_dev *dev, u64 addr)
 {
         struct rb_root *root = &dev->priv.page_root;
         struct rb_node *tmp = root->rb_node;
-        struct page *result = NULL;
+        struct fw_page *result = NULL;
         struct fw_page *tfp;
 
         while (tmp) {
@@ -141,9 +154,7 @@ static struct page *remove_page(struct mlx5_core_dev *dev, u64 addr)
                 } else if (tfp->addr > addr) {
                         tmp = tmp->rb_right;
                 } else {
-                        rb_erase(&tfp->rb_node, root);
-                        result = tfp->page;
-                        kfree(tfp);
+                        result = tfp;
                         break;
                 }
         }
@@ -176,12 +187,98 @@ static int mlx5_cmd_query_pages(struct mlx5_core_dev *dev, u16 *func_id,
         return err;
 }
 
+static int alloc_4k(struct mlx5_core_dev *dev, u64 *addr)
+{
+        struct fw_page *fp;
+        unsigned n;
+
+        if (list_empty(&dev->priv.free_list)) {
+                return -ENOMEM;
+                mlx5_core_warn(dev, "\n");
+        }
+
+        fp = list_entry(dev->priv.free_list.next, struct fw_page, list);
+        n = find_first_bit(&fp->bitmask, 8 * sizeof(fp->bitmask));
+        if (n >= MLX5_NUM_4K_IN_PAGE) {
+                mlx5_core_warn(dev, "alloc 4k bug\n");
+                return -ENOENT;
+        }
+        clear_bit(n, &fp->bitmask);
+        fp->free_count--;
+        if (!fp->free_count)
+                list_del(&fp->list);
+
+        *addr = fp->addr + n * 4096;
+
+        return 0;
+}
+
+static void free_4k(struct mlx5_core_dev *dev, u64 addr)
+{
+        struct fw_page *fwp;
+        int n;
+
+        fwp = find_fw_page(dev, addr & PAGE_MASK);
+        if (!fwp) {
+                mlx5_core_warn(dev, "page not found\n");
+                return;
+        }
+
+        n = (addr & ~PAGE_MASK) % 4096;
+        fwp->free_count++;
+        set_bit(n, &fwp->bitmask);
+        if (fwp->free_count == MLX5_NUM_4K_IN_PAGE) {
+                rb_erase(&fwp->rb_node, &dev->priv.page_root);
+                if (fwp->free_count != 1)
+                        list_del(&fwp->list);
+                dma_unmap_page(&dev->pdev->dev, addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
+                __free_page(fwp->page);
+                kfree(fwp);
+        } else if (fwp->free_count == 1) {
+                list_add(&fwp->list, &dev->priv.free_list);
+        }
+}
+
+static int alloc_system_page(struct mlx5_core_dev *dev, u16 func_id)
+{
+        struct page *page;
+        u64 addr;
+        int err;
+
+        page = alloc_page(GFP_HIGHUSER);
+        if (!page) {
+                mlx5_core_warn(dev, "failed to allocate page\n");
+                return -ENOMEM;
+        }
+        addr = dma_map_page(&dev->pdev->dev, page, 0,
+                            PAGE_SIZE, DMA_BIDIRECTIONAL);
+        if (dma_mapping_error(&dev->pdev->dev, addr)) {
+                mlx5_core_warn(dev, "failed dma mapping page\n");
+                err = -ENOMEM;
+                goto out_alloc;
+        }
+        err = insert_page(dev, addr, page, func_id);
+        if (err) {
+                mlx5_core_err(dev, "failed to track allocated page\n");
+                goto out_mapping;
+        }
+
+        return 0;
+
+out_mapping:
+        dma_unmap_page(&dev->pdev->dev, addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
+
+out_alloc:
+        __free_page(page);
+
+        return err;
+}
 static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
                       int notify_fail)
 {
         struct mlx5_manage_pages_inbox *in;
         struct mlx5_manage_pages_outbox out;
-        struct page *page;
+        struct mlx5_manage_pages_inbox *nin;
         int inlen;
         u64 addr;
         int err;
@@ -196,27 +293,15 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
         memset(&out, 0, sizeof(out));
 
         for (i = 0; i < npages; i++) {
-                page = alloc_page(GFP_HIGHUSER);
-                if (!page) {
-                        err = -ENOMEM;
-                        mlx5_core_warn(dev, "failed to allocate page\n");
-                        goto out_alloc;
-                }
-                addr = dma_map_page(&dev->pdev->dev, page, 0,
-                                    PAGE_SIZE, DMA_BIDIRECTIONAL);
-                if (dma_mapping_error(&dev->pdev->dev, addr)) {
-                        mlx5_core_warn(dev, "failed dma mapping page\n");
-                        __free_page(page);
-                        err = -ENOMEM;
-                        goto out_alloc;
-                }
-                err = insert_page(dev, addr, page, func_id);
+retry:
+                err = alloc_4k(dev, &addr);
                 if (err) {
-                        mlx5_core_err(dev, "failed to track allocated page\n");
-                        dma_unmap_page(&dev->pdev->dev, addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
-                        __free_page(page);
-                        err = -ENOMEM;
-                        goto out_alloc;
+                        if (err == -ENOMEM)
+                                err = alloc_system_page(dev, func_id);
+                        if (err)
+                                goto out_4k;
+
+                        goto retry;
                 }
                 in->pas[i] = cpu_to_be64(addr);
         }
@@ -226,7 +311,6 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
         in->func_id = cpu_to_be16(func_id);
         in->num_entries = cpu_to_be32(npages);
         err = mlx5_cmd_exec(dev, in, inlen, &out, sizeof(out));
-        mlx5_core_dbg(dev, "err %d\n", err);
         if (err) {
                 mlx5_core_warn(dev, "func_id 0x%x, npages %d, err %d\n", func_id, npages, err);
                 goto out_alloc;
@@ -247,25 +331,22 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages,
 
 out_alloc:
         if (notify_fail) {
-                memset(in, 0, inlen);
-                memset(&out, 0, sizeof(out));
-                in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_MANAGE_PAGES);
-                in->hdr.opmod = cpu_to_be16(MLX5_PAGES_CANT_GIVE);
-                if (mlx5_cmd_exec(dev, in, sizeof(*in), &out, sizeof(out)))
-                        mlx5_core_warn(dev, "\n");
-        }
-        for (i--; i >= 0; i--) {
-                addr = be64_to_cpu(in->pas[i]);
-                page = remove_page(dev, addr);
-                if (!page) {
-                        mlx5_core_err(dev, "BUG: can't remove page at addr 0x%llx\n",
-                                      addr);
-                        continue;
+                nin = kzalloc(sizeof(*nin), GFP_KERNEL);
+                if (!nin) {
+                        mlx5_core_warn(dev, "allocation failed\n");
+                        goto out_4k;
                 }
-                dma_unmap_page(&dev->pdev->dev, addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
-                __free_page(page);
+                memset(&out, 0, sizeof(out));
+                nin->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_MANAGE_PAGES);
+                nin->hdr.opmod = cpu_to_be16(MLX5_PAGES_CANT_GIVE);
+                if (mlx5_cmd_exec(dev, nin, sizeof(*nin), &out, sizeof(out)))
+                        mlx5_core_warn(dev, "page notify failed\n");
+                kfree(nin);
         }
 
+out_4k:
+        for (i--; i >= 0; i--)
+                free_4k(dev, be64_to_cpu(in->pas[i]));
 out_free:
         mlx5_vfree(in);
         return err;
@@ -276,7 +357,6 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages,
 {
         struct mlx5_manage_pages_inbox   in;
         struct mlx5_manage_pages_outbox *out;
-        struct page *page;
         int num_claimed;
         int outlen;
         u64 addr;
@@ -315,13 +395,7 @@ static int reclaim_pages(struct mlx5_core_dev *dev, u32 func_id, int npages,
 
         for (i = 0; i < num_claimed; i++) {
                 addr = be64_to_cpu(out->pas[i]);
-                page = remove_page(dev, addr);
-                if (!page) {
-                        mlx5_core_warn(dev, "FW reported unknown DMA address 0x%llx\n", addr);
-                } else {
-                        dma_unmap_page(&dev->pdev->dev, addr, PAGE_SIZE, DMA_BIDIRECTIONAL);
-                        __free_page(page);
-                }
+                free_4k(dev, addr);
         }
 
 out_free:
@@ -381,14 +455,19 @@ int mlx5_satisfy_startup_pages(struct mlx5_core_dev *dev, int boot)
         return give_pages(dev, func_id, npages, 0);
 }
 
+enum {
+        MLX5_BLKS_FOR_RECLAIM_PAGES = 12
+};
+
 static int optimal_reclaimed_pages(void)
 {
         struct mlx5_cmd_prot_block *block;
         struct mlx5_cmd_layout *lay;
         int ret;
 
-        ret = (sizeof(lay->in) + sizeof(block->data) -
-               sizeof(struct mlx5_manage_pages_outbox)) / 8;
+        ret = (sizeof(lay->out) + MLX5_BLKS_FOR_RECLAIM_PAGES * sizeof(block->data) -
+               sizeof(struct mlx5_manage_pages_outbox)) /
+               FIELD_SIZEOF(struct mlx5_manage_pages_outbox, pas[0]);
 
         return ret;
 }
@@ -427,6 +506,7 @@ int mlx5_reclaim_startup_pages(struct mlx5_core_dev *dev)
 void mlx5_pagealloc_init(struct mlx5_core_dev *dev)
 {
         dev->priv.page_root = RB_ROOT;
+        INIT_LIST_HEAD(&dev->priv.free_list);
 }
 
 void mlx5_pagealloc_cleanup(struct mlx5_core_dev *dev)
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index e6f92b450913..5e2054afe840 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -346,6 +346,12 @@ config CHARGER_BQ24190
         help
           Say Y to enable support for the TI BQ24190 battery charger.
 
+config CHARGER_BQ24735
+        tristate "TI BQ24735 battery charger support"
+        depends on I2C && GPIOLIB
+        help
+          Say Y to enable support for the TI BQ24735 battery charger.
+
 config CHARGER_SMB347
         tristate "Summit Microelectronics SMB347 Battery Charger"
         depends on I2C
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index a4b74177706f..372b4e8ab598 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
 obj-$(CONFIG_CHARGER_MAX8998)   += max8998_charger.o
 obj-$(CONFIG_CHARGER_BQ2415X)   += bq2415x_charger.o
 obj-$(CONFIG_CHARGER_BQ24190)   += bq24190_charger.o
+obj-$(CONFIG_CHARGER_BQ24735)   += bq24735-charger.o
 obj-$(CONFIG_POWER_AVS)         += avs/
 obj-$(CONFIG_CHARGER_SMB347)    += smb347-charger.o
 obj-$(CONFIG_CHARGER_TPS65090)  += tps65090-charger.o
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index a4c4a10b3a41..19110aa613a1 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -766,7 +766,6 @@ static int ab8500_charger_max_usb_curr(struct ab8500_charger *di,
                         ret = -ENXIO;
                         break;
                 }
-                break;
         case USB_STAT_CARKIT_1:
         case USB_STAT_CARKIT_2:
         case USB_STAT_ACA_DOCK_CHARGER:
@@ -1387,8 +1386,12 @@ static int ab8500_charger_ac_en(struct ux500_charger *charger,
                  * the GPADC module independant of the AB8500 chargers
                  */
                 if (!di->vddadc_en_ac) {
-                        regulator_enable(di->regu);
-                        di->vddadc_en_ac = true;
+                        ret = regulator_enable(di->regu);
+                        if (ret)
+                                dev_warn(di->dev,
+                                        "Failed to enable regulator\n");
+                        else
+                                di->vddadc_en_ac = true;
                 }
 
                 /* Check if the requested voltage or current is valid */
@@ -1556,8 +1559,12 @@ static int ab8500_charger_usb_en(struct ux500_charger *charger,
                  * the GPADC module independant of the AB8500 chargers
                  */
                 if (!di->vddadc_en_usb) {
-                        regulator_enable(di->regu);
-                        di->vddadc_en_usb = true;
+                        ret = regulator_enable(di->regu);
+                        if (ret)
+                                dev_warn(di->dev,
+                                        "Failed to enable regulator\n");
+                        else
+                                di->vddadc_en_usb = true;
                 }
 
                 /* Enable USB charging */
diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c
index 0727f9256138..df893dd1447d 100644
--- a/drivers/power/bq2415x_charger.c
+++ b/drivers/power/bq2415x_charger.c
@@ -605,9 +605,13 @@ static int bq2415x_set_battery_regulation_voltage(struct bq2415x_device *bq,
 {
         int val = (mV/10 - 350) / 2;
 
+        /*
+         * According to datasheet, maximum battery regulation voltage is
+         * 4440mV which is b101111 = 47.
+         */
         if (val < 0)
                 val = 0;
-        else if (val > 94) /* FIXME: Max is 94 or 122 ? Set max value ? */
+        else if (val > 47)
                 return -EINVAL;
 
         return bq2415x_i2c_write_mask(bq, BQ2415X_REG_VOLTAGE, val,
diff --git a/drivers/power/bq24735-charger.c b/drivers/power/bq24735-charger.c
new file mode 100644
index 000000000000..d022b823305b
--- /dev/null
+++ b/drivers/power/bq24735-charger.c
@@ -0,0 +1,419 @@
+/*
+ * Battery charger driver for TI BQ24735
+ *
+ * Copyright (c) 2013, NVIDIA CORPORATION.  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;
+ *
+ * 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/err.h>
+#include <linux/gpio.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/power_supply.h>
+#include <linux/slab.h>
+
+#include <linux/power/bq24735-charger.h>
+
+#define BQ24735_CHG_OPT                 0x12
+#define BQ24735_CHG_OPT_CHARGE_DISABLE  (1 << 0)
+#define BQ24735_CHG_OPT_AC_PRESENT      (1 << 4)
+#define BQ24735_CHARGE_CURRENT          0x14
+#define BQ24735_CHARGE_CURRENT_MASK     0x1fc0
+#define BQ24735_CHARGE_VOLTAGE          0x15
+#define BQ24735_CHARGE_VOLTAGE_MASK     0x7ff0
+#define BQ24735_INPUT_CURRENT           0x3f
+#define BQ24735_INPUT_CURRENT_MASK      0x1f80
+#define BQ24735_MANUFACTURER_ID         0xfe
+#define BQ24735_DEVICE_ID               0xff
+
+struct bq24735 {
+        struct power_supply     charger;
+        struct i2c_client       *client;
+        struct bq24735_platform *pdata;
+};
+
+static inline struct bq24735 *to_bq24735(struct power_supply *psy)
+{
+        return container_of(psy, struct bq24735, charger);
+}
+
+static enum power_supply_property bq24735_charger_properties[] = {
+        POWER_SUPPLY_PROP_ONLINE,
+};
+
+static inline int bq24735_write_word(struct i2c_client *client, u8 reg,
+                                     u16 value)
+{
+        return i2c_smbus_write_word_data(client, reg, le16_to_cpu(value));
+}
+
+static inline int bq24735_read_word(struct i2c_client *client, u8 reg)
+{
+        s32 ret = i2c_smbus_read_word_data(client, reg);
+
+        return ret < 0 ? ret : le16_to_cpu(ret);
+}
+
+static int bq24735_update_word(struct i2c_client *client, u8 reg,
+                               u16 mask, u16 value)
+{
+        unsigned int tmp;
+        int ret;
+
+        ret = bq24735_read_word(client, reg);
+        if (ret < 0)
+                return ret;
+
+        tmp = ret & ~mask;
+        tmp |= value & mask;
+
+        return bq24735_write_word(client, reg, tmp);
+}
+
+static inline int bq24735_enable_charging(struct bq24735 *charger)
+{
+        return bq24735_update_word(charger->client, BQ24735_CHG_OPT,
+                                   BQ24735_CHG_OPT_CHARGE_DISABLE,
+                                   ~BQ24735_CHG_OPT_CHARGE_DISABLE);
+}
+
+static inline int bq24735_disable_charging(struct bq24735 *charger)
+{
+        return bq24735_update_word(charger->client, BQ24735_CHG_OPT,
+                                   BQ24735_CHG_OPT_CHARGE_DISABLE,
+                                   BQ24735_CHG_OPT_CHARGE_DISABLE);
+}
+
+static int bq24735_config_charger(struct bq24735 *charger)
+{
+        struct bq24735_platform *pdata = charger->pdata;
+        int ret;
+        u16 value;
+
+        if (pdata->charge_current) {
+                value = pdata->charge_current & BQ24735_CHARGE_CURRENT_MASK;
+
+                ret = bq24735_write_word(charger->client,
+                                         BQ24735_CHARGE_CURRENT, value);
+                if (ret < 0) {
+                        dev_err(&charger->client->dev,
+                                "Failed to write charger current : %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
+        if (pdata->charge_voltage) {
+                value = pdata->charge_voltage & BQ24735_CHARGE_VOLTAGE_MASK;
+
+                ret = bq24735_write_word(charger->client,
+                                         BQ24735_CHARGE_VOLTAGE, value);
+                if (ret < 0) {
+                        dev_err(&charger->client->dev,
+                                "Failed to write charger voltage : %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
+        if (pdata->input_current) {
+                value = pdata->input_current & BQ24735_INPUT_CURRENT_MASK;
+
+                ret = bq24735_write_word(charger->client,
+                                         BQ24735_INPUT_CURRENT, value);
+                if (ret < 0) {
+                        dev_err(&charger->client->dev,
+                                "Failed to write input current : %d\n",
+                                ret);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+static bool bq24735_charger_is_present(struct bq24735 *charger)
+{
+        struct bq24735_platform *pdata = charger->pdata;
+        int ret;
+
+        if (pdata->status_gpio_valid) {
+                ret = gpio_get_value_cansleep(pdata->status_gpio);
+                return ret ^= pdata->status_gpio_active_low == 0;
+        } else {
+                int ac = 0;
+
+                ac = bq24735_read_word(charger->client, BQ24735_CHG_OPT);
+                if (ac < 0) {
+                        dev_err(&charger->client->dev,
+                                "Failed to read charger options : %d\n",
+                                ac);
+                        return false;
+                }
+                return (ac & BQ24735_CHG_OPT_AC_PRESENT) ? true : false;
+        }
+
+        return false;
+}
+
+static irqreturn_t bq24735_charger_isr(int irq, void *devid)
+{
+        struct power_supply *psy = devid;
+        struct bq24735 *charger = to_bq24735(psy);
+
+        if (bq24735_charger_is_present(charger))
+                bq24735_enable_charging(charger);
+        else
+                bq24735_disable_charging(charger);
+
+        power_supply_changed(psy);
+
+        return IRQ_HANDLED;
+}
+
+static int bq24735_charger_get_property(struct power_supply *psy,
+                                        enum power_supply_property psp,
+                                        union power_supply_propval *val)
+{
+        struct bq24735 *charger;
+
+        charger = container_of(psy, struct bq24735, charger);
+
+        switch (psp) {
+        case POWER_SUPPLY_PROP_ONLINE:
+                val->intval = bq24735_charger_is_present(charger) ? 1 : 0;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static struct bq24735_platform *bq24735_parse_dt_data(struct i2c_client *client)
+{
+        struct bq24735_platform *pdata;
+        struct device_node *np = client->dev.of_node;
+        u32 val;
+        int ret;
+        enum of_gpio_flags flags;
+
+        pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata) {
+                dev_err(&client->dev,
+                        "Memory alloc for bq24735 pdata failed\n");
+                return NULL;
+        }
+
+        pdata->status_gpio = of_get_named_gpio_flags(np, "ti,ac-detect-gpios",
+                                                     0, &flags);
+
+        if (flags & OF_GPIO_ACTIVE_LOW)
+                pdata->status_gpio_active_low = 1;
+
+        ret = of_property_read_u32(np, "ti,charge-current", &val);
+        if (!ret)
+                pdata->charge_current = val;
+
+        ret = of_property_read_u32(np, "ti,charge-voltage", &val);
+        if (!ret)
+                pdata->charge_voltage = val;
+
+        ret = of_property_read_u32(np, "ti,input-current", &val);
+        if (!ret)
+                pdata->input_current = val;
+
+        return pdata;
+}
+
+static int bq24735_charger_probe(struct i2c_client *client,
+                                 const struct i2c_device_id *id)
+{
+        int ret;
+        struct bq24735 *charger;
+        struct power_supply *supply;
+        char *name;
+
+        charger = devm_kzalloc(&client->dev, sizeof(*charger), GFP_KERNEL);
+        if (!charger)
+                return -ENOMEM;
+
+        charger->pdata = client->dev.platform_data;
+
+        if (IS_ENABLED(CONFIG_OF) && !charger->pdata && client->dev.of_node)
+                charger->pdata = bq24735_parse_dt_data(client);
+
+        if (!charger->pdata) {
+                dev_err(&client->dev, "no platform data provided\n");
+                return -EINVAL;
+        }
+
+        name = (char *)charger->pdata->name;
+        if (!name) {
+                name = kasprintf(GFP_KERNEL, "bq24735@%s",
+                                 dev_name(&client->dev));
+                if (!name) {
+                        dev_err(&client->dev, "Failed to alloc device name\n");
+                        return -ENOMEM;
+                }
+        }
+
+        charger->client = client;
+
+        supply = &charger->charger;
+
+        supply->name = name;
+        supply->type = POWER_SUPPLY_TYPE_MAINS;
+        supply->properties = bq24735_charger_properties;
+        supply->num_properties = ARRAY_SIZE(bq24735_charger_properties);
+        supply->get_property = bq24735_charger_get_property;
+        supply->supplied_to = charger->pdata->supplied_to;
+        supply->num_supplicants = charger->pdata->num_supplicants;
+        supply->of_node = client->dev.of_node;
+
+        i2c_set_clientdata(client, charger);
+
+        ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID);
+        if (ret < 0) {
+                dev_err(&client->dev, "Failed to read manufacturer id : %d\n",
+                        ret);
+                goto err_free_name;
+        } else if (ret != 0x0040) {
+                dev_err(&client->dev,
+                        "manufacturer id mismatch. 0x0040 != 0x%04x\n", ret);
+                ret = -ENODEV;
+                goto err_free_name;
+        }
+
+        ret = bq24735_read_word(client, BQ24735_DEVICE_ID);
+        if (ret < 0) {
+                dev_err(&client->dev, "Failed to read device id : %d\n", ret);
+                goto err_free_name;
+        } else if (ret != 0x000B) {
+                dev_err(&client->dev,
+                        "device id mismatch. 0x000b != 0x%04x\n", ret);
+                ret = -ENODEV;
+                goto err_free_name;
+        }
+
+        if (gpio_is_valid(charger->pdata->status_gpio)) {
+                ret = devm_gpio_request(&client->dev,
+                                        charger->pdata->status_gpio,
+                                        name);
+                if (ret) {
+                        dev_err(&client->dev,
+                                "Failed GPIO request for GPIO %d: %d\n",
+                                charger->pdata->status_gpio, ret);
+                }
+
+                charger->pdata->status_gpio_valid = !ret;
+        }
+
+        ret = bq24735_config_charger(charger);
+        if (ret < 0) {
+                dev_err(&client->dev, "failed in configuring charger");
+                goto err_free_name;
+        }
+
+        /* check for AC adapter presence */
+        if (bq24735_charger_is_present(charger)) {
+                ret = bq24735_enable_charging(charger);
+                if (ret < 0) {
+                        dev_err(&client->dev, "Failed to enable charging\n");
+                        goto err_free_name;
+                }
+        }
+
+        ret = power_supply_register(&client->dev, supply);
+        if (ret < 0) {
+                dev_err(&client->dev, "Failed to register power supply: %d\n",
+                        ret);
+                goto err_free_name;
+        }
+
+        if (client->irq) {
+                ret = devm_request_threaded_irq(&client->dev, client->irq,
+                                                NULL, bq24735_charger_isr,
+                                                IRQF_TRIGGER_RISING |
+                                                IRQF_TRIGGER_FALLING |
+                                                IRQF_ONESHOT,
+                                                supply->name, supply);
+                if (ret) {
+                        dev_err(&client->dev,
+                                "Unable to register IRQ %d err %d\n",
+                                client->irq, ret);
+                        goto err_unregister_supply;
+                }
+        }
+
+        return 0;
+err_unregister_supply:
+        power_supply_unregister(supply);
+err_free_name:
+        if (name != charger->pdata->name)
+                kfree(name);
+
+        return ret;
+}
+
+static int bq24735_charger_remove(struct i2c_client *client)
+{
+        struct bq24735 *charger = i2c_get_clientdata(client);
+
+        if (charger->client->irq)
+                devm_free_irq(&charger->client->dev, charger->client->irq,
+                              &charger->charger);
+
+        power_supply_unregister(&charger->charger);
+
+        if (charger->charger.name != charger->pdata->name)
+                kfree(charger->charger.name);
+
+        return 0;
+}
+
+static const struct i2c_device_id bq24735_charger_id[] = {
+        { "bq24735-charger", 0 },
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, bq24735_charger_id);
+
+static const struct of_device_id bq24735_match_ids[] = {
+        { .compatible = "ti,bq24735", },
+        { /* end */ }
+};
+MODULE_DEVICE_TABLE(of, bq24735_match_ids);
+
+static struct i2c_driver bq24735_charger_driver = {
+        .driver = {
+                .name = "bq24735-charger",
+                .owner = THIS_MODULE,
+                .of_match_table = bq24735_match_ids,
+        },
+        .probe = bq24735_charger_probe,
+        .remove = bq24735_charger_remove,
+        .id_table = bq24735_charger_id,
+};
+
+module_i2c_driver(bq24735_charger_driver);
+
+MODULE_DESCRIPTION("bq24735 battery charging driver");
+MODULE_AUTHOR("Darbha Sriharsha <dsriharsha@nvidia.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index e30e847600bb..7287c0efd6bf 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -1378,7 +1378,8 @@ static int charger_manager_register_sysfs(struct charger_manager *cm)
                 charger = &desc->charger_regulators[i];
 
                 snprintf(buf, 10, "charger.%d", i);
-                str = kzalloc(sizeof(char) * (strlen(buf) + 1), GFP_KERNEL);
+                str = devm_kzalloc(cm->dev,
+                                sizeof(char) * (strlen(buf) + 1), GFP_KERNEL);
                 if (!str) {
                         ret = -ENOMEM;
                         goto err;
@@ -1452,30 +1453,23 @@ static int charger_manager_probe(struct platform_device *pdev)
                         rtc_dev = NULL;
                         dev_err(&pdev->dev, "Cannot get RTC %s\n",
                                 g_desc->rtc_name);
-                        ret = -ENODEV;
-                        goto err_alloc;
+                        return -ENODEV;
                 }
         }
 
         if (!desc) {
                 dev_err(&pdev->dev, "No platform data (desc) found\n");
-                ret = -ENODEV;
-                goto err_alloc;
+                return -ENODEV;
         }
 
-        cm = kzalloc(sizeof(struct charger_manager), GFP_KERNEL);
-        if (!cm) {
-                ret = -ENOMEM;
-                goto err_alloc;
-        }
+        cm = devm_kzalloc(&pdev->dev,
+                        sizeof(struct charger_manager), GFP_KERNEL);
+        if (!cm)
+                return -ENOMEM;
 
         /* Basic Values. Unspecified are Null or 0 */
         cm->dev = &pdev->dev;
-        cm->desc = kmemdup(desc, sizeof(struct charger_desc), GFP_KERNEL);
-        if (!cm->desc) {
-                ret = -ENOMEM;
-                goto err_alloc_desc;
-        }
+        cm->desc = desc;
         cm->last_temp_mC = INT_MIN; /* denotes "unmeasured, yet" */
 
         /*
@@ -1498,27 +1492,23 @@ static int charger_manager_probe(struct platform_device *pdev)
         }
 
         if (!desc->charger_regulators || desc->num_charger_regulators < 1) {
-                ret = -EINVAL;
                 dev_err(&pdev->dev, "charger_regulators undefined\n");
-                goto err_no_charger;
+                return -EINVAL;
         }
 
         if (!desc->psy_charger_stat || !desc->psy_charger_stat[0]) {
                 dev_err(&pdev->dev, "No power supply defined\n");
-                ret = -EINVAL;
-                goto err_no_charger_stat;
+                return -EINVAL;
         }
 
         /* Counting index only */
         while (desc->psy_charger_stat[i])
                 i++;
 
-        cm->charger_stat = kzalloc(sizeof(struct power_supply *) * (i + 1),
-                                   GFP_KERNEL);
-        if (!cm->charger_stat) {
-                ret = -ENOMEM;
-                goto err_no_charger_stat;
-        }
+        cm->charger_stat = devm_kzalloc(&pdev->dev,
+                                sizeof(struct power_supply *) * i, GFP_KERNEL);
+        if (!cm->charger_stat)
+                return -ENOMEM;
 
         for (i = 0; desc->psy_charger_stat[i]; i++) {
                 cm->charger_stat[i] = power_supply_get_by_name(
@@ -1526,8 +1516,7 @@ static int charger_manager_probe(struct platform_device *pdev)
                 if (!cm->charger_stat[i]) {
                         dev_err(&pdev->dev, "Cannot find power supply \"%s\"\n",
                                 desc->psy_charger_stat[i]);
-                        ret = -ENODEV;
-                        goto err_chg_stat;
+                        return -ENODEV;
                 }
         }
 
@@ -1535,21 +1524,18 @@ static int charger_manager_probe(struct platform_device *pdev)
         if (!cm->fuel_gauge) {
                 dev_err(&pdev->dev, "Cannot find power supply \"%s\"\n",
                         desc->psy_fuel_gauge);
-                ret = -ENODEV;
-                goto err_chg_stat;
+                return -ENODEV;
         }
 
         if (desc->polling_interval_ms == 0 ||
             msecs_to_jiffies(desc->polling_interval_ms) <= CM_JIFFIES_SMALL) {
                 dev_err(&pdev->dev, "polling_interval_ms is too small\n");
-                ret = -EINVAL;
-                goto err_chg_stat;
+                return -EINVAL;
         }
 
         if (!desc->temperature_out_of_range) {
                 dev_err(&pdev->dev, "there is no temperature_out_of_range\n");
-                ret = -EINVAL;
-                goto err_chg_stat;
+                return -EINVAL;
         }
 
         if (!desc->charging_max_duration_ms ||
@@ -1570,14 +1556,13 @@ static int charger_manager_probe(struct platform_device *pdev)
         cm->charger_psy.name = cm->psy_name_buf;
 
         /* Allocate for psy properties because they may vary */
-        cm->charger_psy.properties = kzalloc(sizeof(enum power_supply_property)
+        cm->charger_psy.properties = devm_kzalloc(&pdev->dev,
+                                sizeof(enum power_supply_property)
                                 * (ARRAY_SIZE(default_charger_props) +
-                                NUM_CHARGER_PSY_OPTIONAL),
-                                GFP_KERNEL);
-        if (!cm->charger_psy.properties) {
-                ret = -ENOMEM;
-                goto err_chg_stat;
-        }
+                                NUM_CHARGER_PSY_OPTIONAL), GFP_KERNEL);
+        if (!cm->charger_psy.properties)
+                return -ENOMEM;
+
         memcpy(cm->charger_psy.properties, default_charger_props,
                 sizeof(enum power_supply_property) *
                 ARRAY_SIZE(default_charger_props));
@@ -1614,7 +1599,7 @@ static int charger_manager_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(&pdev->dev, "Cannot register charger-manager with name \"%s\"\n",
                         cm->charger_psy.name);
-                goto err_register;
+                return ret;
         }
 
         /* Register extcon device for charger cable */
@@ -1655,8 +1640,6 @@ err_reg_sysfs:
                 charger = &desc->charger_regulators[i];
                 sysfs_remove_group(&cm->charger_psy.dev->kobj,
                                 &charger->attr_g);
-
-                kfree(charger->attr_g.name);
         }
 err_reg_extcon:
         for (i = 0; i < desc->num_charger_regulators; i++) {
@@ -1674,16 +1657,7 @@ err_reg_extcon:
         }
 
         power_supply_unregister(&cm->charger_psy);
-err_register:
-        kfree(cm->charger_psy.properties);
-err_chg_stat:
-        kfree(cm->charger_stat);
-err_no_charger_stat:
-err_no_charger:
-        kfree(cm->desc);
-err_alloc_desc:
-        kfree(cm);
-err_alloc:
+
         return ret;
 }
 
@@ -1718,11 +1692,6 @@ static int charger_manager_remove(struct platform_device *pdev)
 
         try_charger_enable(cm, false);
 
-        kfree(cm->charger_psy.properties);
-        kfree(cm->charger_stat);
-        kfree(cm->desc);
-        kfree(cm);
-
         return 0;
 }
 
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index fc04d191579b..1bb3a91b1acc 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -2,6 +2,7 @@
  * ISP1704 USB Charger Detection driver
  *
  * Copyright (C) 2010 Nokia Corporation
+ * Copyright (C) 2012 - 2013 Pali Rohár <pali.rohar@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
@@ -65,10 +66,6 @@ struct isp1704_charger {
         unsigned                present:1;
         unsigned                online:1;
         unsigned                current_max;
-
-        /* temp storage variables */
-        unsigned long           event;
-        unsigned                max_power;
 };
 
 static inline int isp1704_read(struct isp1704_charger *isp, u32 reg)
@@ -231,56 +228,59 @@ static inline int isp1704_charger_detect(struct isp1704_charger *isp)
         return ret;
 }
 
+static inline int isp1704_charger_detect_dcp(struct isp1704_charger *isp)
+{
+        if (isp1704_charger_detect(isp) &&
+                        isp1704_charger_type(isp) == POWER_SUPPLY_TYPE_USB_DCP)
+                return true;
+        else
+                return false;
+}
+
 static void isp1704_charger_work(struct work_struct *data)
 {
-        int                     detect;
-        unsigned long           event;
-        unsigned                power;
         struct isp1704_charger  *isp =
                 container_of(data, struct isp1704_charger, work);
         static DEFINE_MUTEX(lock);
 
-        event = isp->event;
-        power = isp->max_power;
-
         mutex_lock(&lock);
 
-        if (event != USB_EVENT_NONE)
-                isp1704_charger_set_power(isp, 1);
-
-        switch (event) {
+        switch (isp->phy->last_event) {
         case USB_EVENT_VBUS:
-                isp->online = true;
+                /* do not call wall charger detection more times */
+                if (!isp->present) {
+                        isp->online = true;
+                        isp->present = 1;
+                        isp1704_charger_set_power(isp, 1);
+
+                        /* detect wall charger */
+                        if (isp1704_charger_detect_dcp(isp)) {
+                                isp->psy.type = POWER_SUPPLY_TYPE_USB_DCP;
+                                isp->current_max = 1800;
+                        } else {
+                                isp->psy.type = POWER_SUPPLY_TYPE_USB;
+                                isp->current_max = 500;
+                        }
 
-                /* detect charger */
-                detect = isp1704_charger_detect(isp);
-
-                if (detect) {
-                        isp->present = detect;
-                        isp->psy.type = isp1704_charger_type(isp);
+                        /* enable data pullups */
+                        if (isp->phy->otg->gadget)
+                                usb_gadget_connect(isp->phy->otg->gadget);
                 }
 
-                switch (isp->psy.type) {
-                case POWER_SUPPLY_TYPE_USB_DCP:
-                        isp->current_max = 1800;
-                        break;
-                case POWER_SUPPLY_TYPE_USB_CDP:
+                if (isp->psy.type != POWER_SUPPLY_TYPE_USB_DCP) {
                         /*
                          * Only 500mA here or high speed chirp
                          * handshaking may break
                          */
-                        isp->current_max = 500;
-                        /* FALLTHROUGH */
-                case POWER_SUPPLY_TYPE_USB:
-                default:
-                        /* enable data pullups */
-                        if (isp->phy->otg->gadget)
-                                usb_gadget_connect(isp->phy->otg->gadget);
+                        if (isp->current_max > 500)
+                                isp->current_max = 500;
+
+                        if (isp->current_max > 100)
+                                isp->psy.type = POWER_SUPPLY_TYPE_USB_CDP;
                 }
                 break;
         case USB_EVENT_NONE:
                 isp->online = false;
-                isp->current_max = 0;
                 isp->present = 0;
                 isp->current_max = 0;
                 isp->psy.type = POWER_SUPPLY_TYPE_USB;
@@ -298,12 +298,6 @@ static void isp1704_charger_work(struct work_struct *data)
 
                 isp1704_charger_set_power(isp, 0);
                 break;
-        case USB_EVENT_ENUMERATED:
-                if (isp->present)
-                        isp->current_max = 1800;
-                else
-                        isp->current_max = power;
-                break;
         default:
                 goto out;
         }
@@ -314,16 +308,11 @@ out:
 }
 
 static int isp1704_notifier_call(struct notifier_block *nb,
-                unsigned long event, void *power)
+                unsigned long val, void *v)
 {
         struct isp1704_charger *isp =
                 container_of(nb, struct isp1704_charger, nb);
 
-        isp->event = event;
-
-        if (power)
-                isp->max_power = *((unsigned *)power);
-
         schedule_work(&isp->work);
 
         return NOTIFY_OK;
@@ -462,13 +451,13 @@ static int isp1704_charger_probe(struct platform_device *pdev)
         if (isp->phy->otg->gadget)
                 usb_gadget_disconnect(isp->phy->otg->gadget);
 
+        if (isp->phy->last_event == USB_EVENT_NONE)
+                isp1704_charger_set_power(isp, 0);
+
         /* Detect charger if VBUS is valid (the cable was already plugged). */
-        ret = isp1704_read(isp, ULPI_USB_INT_STS);
-        isp1704_charger_set_power(isp, 0);
-        if ((ret & ULPI_INT_VBUS_VALID) && !isp->phy->otg->default_a) {
-                isp->event = USB_EVENT_VBUS;
+        if (isp->phy->last_event == USB_EVENT_VBUS &&
+                        !isp->phy->otg->default_a)
                 schedule_work(&isp->work);
-        }
 
         return 0;
 fail2:
diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index d664ef58afa7..e0b22f9b6fdd 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -33,6 +33,7 @@
 #include <linux/power_supply.h>
 #include <linux/power/max17042_battery.h>
 #include <linux/of.h>
+#include <linux/regmap.h>
 
 /* Status register bits */
 #define STATUS_POR_BIT         (1 << 1)
@@ -67,6 +68,7 @@
 
 struct max17042_chip {
         struct i2c_client *client;
+        struct regmap *regmap;
         struct power_supply battery;
         enum max170xx_chip_type chip_type;
         struct max17042_platform_data *pdata;
@@ -74,35 +76,6 @@ struct max17042_chip {
         int    init_complete;
 };
 
-static int max17042_write_reg(struct i2c_client *client, u8 reg, u16 value)
-{
-        int ret = i2c_smbus_write_word_data(client, reg, value);
-
-        if (ret < 0)
-                dev_err(&client->dev, "%s: err %d\n", __func__, ret);
-
-        return ret;
-}
-
-static int max17042_read_reg(struct i2c_client *client, u8 reg)
-{
-        int ret = i2c_smbus_read_word_data(client, reg);
-
-        if (ret < 0)
-                dev_err(&client->dev, "%s: err %d\n", __func__, ret);
-
-        return ret;
-}
-
-static void max17042_set_reg(struct i2c_client *client,
-                             struct max17042_reg_data *data, int size)
-{
-        int i;
-
-        for (i = 0; i < size; i++)
-                max17042_write_reg(client, data[i].addr, data[i].data);
-}
-
 static enum power_supply_property max17042_battery_props[] = {
         POWER_SUPPLY_PROP_PRESENT,
         POWER_SUPPLY_PROP_CYCLE_COUNT,
@@ -125,96 +98,98 @@ static int max17042_get_property(struct power_supply *psy,
 {
         struct max17042_chip *chip = container_of(psy,
                                 struct max17042_chip, battery);
+        struct regmap *map = chip->regmap;
         int ret;
+        u32 data;
 
         if (!chip->init_complete)
                 return -EAGAIN;
 
         switch (psp) {
         case POWER_SUPPLY_PROP_PRESENT:
-                ret = max17042_read_reg(chip->client, MAX17042_STATUS);
+                ret = regmap_read(map, MAX17042_STATUS, &data);
                 if (ret < 0)
                         return ret;
 
-                if (ret & MAX17042_STATUS_BattAbsent)
+                if (data & MAX17042_STATUS_BattAbsent)
                         val->intval = 0;
                 else
                         val->intval = 1;
                 break;
         case POWER_SUPPLY_PROP_CYCLE_COUNT:
-                ret = max17042_read_reg(chip->client, MAX17042_Cycles);
+                ret = regmap_read(map, MAX17042_Cycles, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret;
+                val->intval = data;
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_MAX:
-                ret = max17042_read_reg(chip->client, MAX17042_MinMaxVolt);
+                ret = regmap_read(map, MAX17042_MinMaxVolt, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret >> 8;
+                val->intval = data >> 8;
                 val->intval *= 20000; /* Units of LSB = 20mV */
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
                 if (chip->chip_type == MAX17042)
-                        ret = max17042_read_reg(chip->client, MAX17042_V_empty);
+                        ret = regmap_read(map, MAX17042_V_empty, &data);
                 else
-                        ret = max17042_read_reg(chip->client, MAX17047_V_empty);
+                        ret = regmap_read(map, MAX17047_V_empty, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret >> 7;
+                val->intval = data >> 7;
                 val->intval *= 10000; /* Units of LSB = 10mV */
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-                ret = max17042_read_reg(chip->client, MAX17042_VCELL);
+                ret = regmap_read(map, MAX17042_VCELL, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret * 625 / 8;
+                val->intval = data * 625 / 8;
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_AVG:
-                ret = max17042_read_reg(chip->client, MAX17042_AvgVCELL);
+                ret = regmap_read(map, MAX17042_AvgVCELL, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret * 625 / 8;
+                val->intval = data * 625 / 8;
                 break;
         case POWER_SUPPLY_PROP_VOLTAGE_OCV:
-                ret = max17042_read_reg(chip->client, MAX17042_OCVInternal);
+                ret = regmap_read(map, MAX17042_OCVInternal, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret * 625 / 8;
+                val->intval = data * 625 / 8;
                 break;
         case POWER_SUPPLY_PROP_CAPACITY:
-                ret = max17042_read_reg(chip->client, MAX17042_RepSOC);
+                ret = regmap_read(map, MAX17042_RepSOC, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret >> 8;
+                val->intval = data >> 8;
                 break;
         case POWER_SUPPLY_PROP_CHARGE_FULL:
-                ret = max17042_read_reg(chip->client, MAX17042_FullCAP);
+                ret = regmap_read(map, MAX17042_FullCAP, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret * 1000 / 2;
+                val->intval = data * 1000 / 2;
                 break;
         case POWER_SUPPLY_PROP_CHARGE_COUNTER:
-                ret = max17042_read_reg(chip->client, MAX17042_QH);
+                ret = regmap_read(map, MAX17042_QH, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret * 1000 / 2;
+                val->intval = data * 1000 / 2;
                 break;
         case POWER_SUPPLY_PROP_TEMP:
-                ret = max17042_read_reg(chip->client, MAX17042_TEMP);
+                ret = regmap_read(map, MAX17042_TEMP, &data);
                 if (ret < 0)
                         return ret;
 
-                val->intval = ret;
+                val->intval = data;
                 /* The value is signed. */
                 if (val->intval & 0x8000) {
                         val->intval = (0x7fff & ~val->intval) + 1;
@@ -226,11 +201,11 @@ static int max17042_get_property(struct power_supply *psy,
                 break;
         case POWER_SUPPLY_PROP_CURRENT_NOW:
                 if (chip->pdata->enable_current_sense) {
-                        ret = max17042_read_reg(chip->client, MAX17042_Current);
+                        ret = regmap_read(map, MAX17042_Current, &data);
                         if (ret < 0)
                                 return ret;
 
-                        val->intval = ret;
+                        val->intval = data;
                         if (val->intval & 0x8000) {
                                 /* Negative */
                                 val->intval = ~val->intval & 0x7fff;
@@ -244,12 +219,11 @@ static int max17042_get_property(struct power_supply *psy,
                 break;
         case POWER_SUPPLY_PROP_CURRENT_AVG:
                 if (chip->pdata->enable_current_sense) {
-                        ret = max17042_read_reg(chip->client,
-                                                MAX17042_AvgCurrent);
+                        ret = regmap_read(map, MAX17042_AvgCurrent, &data);
                         if (ret < 0)
                                 return ret;
 
-                        val->intval = ret;
+                        val->intval = data;
                         if (val->intval & 0x8000) {
                                 /* Negative */
                                 val->intval = ~val->intval & 0x7fff;
@@ -267,16 +241,15 @@ static int max17042_get_property(struct power_supply *psy,
         return 0;
 }
 
-static int max17042_write_verify_reg(struct i2c_client *client,
-                                u8 reg, u16 value)
+static int max17042_write_verify_reg(struct regmap *map, u8 reg, u32 value)
 {
         int retries = 8;
         int ret;
-        u16 read_value;
+        u32 read_value;
 
         do {
-                ret = i2c_smbus_write_word_data(client, reg, value);
-                read_value =  max17042_read_reg(client, reg);
+                ret = regmap_write(map, reg, value);
+                regmap_read(map, reg, &read_value);
                 if (read_value != value) {
                         ret = -EIO;
                         retries--;
@@ -284,50 +257,51 @@ static int max17042_write_verify_reg(struct i2c_client *client,
         } while (retries && read_value != value);
 
         if (ret < 0)
-                dev_err(&client->dev, "%s: err %d\n", __func__, ret);
+                pr_err("%s: err %d\n", __func__, ret);
 
         return ret;
 }
 
-static inline void max17042_override_por(
-        struct i2c_client *client, u8 reg, u16 value)
+static inline void max17042_override_por(struct regmap *map,
+                                         u8 reg, u16 value)
 {
         if (value)
-                max17042_write_reg(client, reg, value);
+                regmap_write(map, reg, value);
 }
 
 static inline void max10742_unlock_model(struct max17042_chip *chip)
 {
-        struct i2c_client *client = chip->client;
-        max17042_write_reg(client, MAX17042_MLOCKReg1, MODEL_UNLOCK1);
-        max17042_write_reg(client, MAX17042_MLOCKReg2, MODEL_UNLOCK2);
+        struct regmap *map = chip->regmap;
+        regmap_write(map, MAX17042_MLOCKReg1, MODEL_UNLOCK1);
+        regmap_write(map, MAX17042_MLOCKReg2, MODEL_UNLOCK2);
 }
 
 static inline void max10742_lock_model(struct max17042_chip *chip)
 {
-        struct i2c_client *client = chip->client;
-        max17042_write_reg(client, MAX17042_MLOCKReg1, MODEL_LOCK1);
-        max17042_write_reg(client, MAX17042_MLOCKReg2, MODEL_LOCK2);
+        struct regmap *map = chip->regmap;
+
+        regmap_write(map, MAX17042_MLOCKReg1, MODEL_LOCK1);
+        regmap_write(map, MAX17042_MLOCKReg2, MODEL_LOCK2);
 }
 
 static inline void max17042_write_model_data(struct max17042_chip *chip,
                                         u8 addr, int size)
 {
-        struct i2c_client *client = chip->client;
+        struct regmap *map = chip->regmap;
         int i;
         for (i = 0; i < size; i++)
-                max17042_write_reg(client, addr + i,
-                                chip->pdata->config_data->cell_char_tbl[i]);
+                regmap_write(map, addr + i,
+                        chip->pdata->config_data->cell_char_tbl[i]);
 }
 
 static inline void max17042_read_model_data(struct max17042_chip *chip,
-                                        u8 addr, u16 *data, int size)
+                                        u8 addr, u32 *data, int size)
 {
-        struct i2c_client *client = chip->client;
+        struct regmap *map = chip->regmap;
         int i;
 
         for (i = 0; i < size; i++)
-                data[i] = max17042_read_reg(client, addr + i);
+                regmap_read(map, addr + i, &data[i]);
 }
 
 static inline int max17042_model_data_compare(struct max17042_chip *chip,
@@ -350,7 +324,7 @@ static int max17042_init_model(struct max17042_chip *chip)
 {
         int ret;
         int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
-        u16 *temp_data;
+        u32 *temp_data;
 
         temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
         if (!temp_data)
@@ -365,7 +339,7 @@ static int max17042_init_model(struct max17042_chip *chip)
         ret = max17042_model_data_compare(
                 chip,
                 chip->pdata->config_data->cell_char_tbl,
-                temp_data,
+                (u16 *)temp_data,
                 table_size);
 
         max10742_lock_model(chip);
@@ -378,7 +352,7 @@ static int max17042_verify_model_lock(struct max17042_chip *chip)
 {
         int i;
         int table_size = ARRAY_SIZE(chip->pdata->config_data->cell_char_tbl);
-        u16 *temp_data;
+        u32 *temp_data;
         int ret = 0;
 
         temp_data = kcalloc(table_size, sizeof(*temp_data), GFP_KERNEL);
@@ -398,40 +372,38 @@ static int max17042_verify_model_lock(struct max17042_chip *chip)
 static void max17042_write_config_regs(struct max17042_chip *chip)
 {
         struct max17042_config_data *config = chip->pdata->config_data;
+        struct regmap *map = chip->regmap;
 
-        max17042_write_reg(chip->client, MAX17042_CONFIG, config->config);
-        max17042_write_reg(chip->client, MAX17042_LearnCFG, config->learn_cfg);
-        max17042_write_reg(chip->client, MAX17042_FilterCFG,
+        regmap_write(map, MAX17042_CONFIG, config->config);
+        regmap_write(map, MAX17042_LearnCFG, config->learn_cfg);
+        regmap_write(map, MAX17042_FilterCFG,
                         config->filter_cfg);
-        max17042_write_reg(chip->client, MAX17042_RelaxCFG, config->relax_cfg);
+        regmap_write(map, MAX17042_RelaxCFG, config->relax_cfg);
         if (chip->chip_type == MAX17047)
-                max17042_write_reg(chip->client, MAX17047_FullSOCThr,
+                regmap_write(map, MAX17047_FullSOCThr,
                                                 config->full_soc_thresh);
 }
 
 static void  max17042_write_custom_regs(struct max17042_chip *chip)
 {
         struct max17042_config_data *config = chip->pdata->config_data;
+        struct regmap *map = chip->regmap;
 
-        max17042_write_verify_reg(chip->client, MAX17042_RCOMP0,
-                                config->rcomp0);
-        max17042_write_verify_reg(chip->client, MAX17042_TempCo,
-                                config->tcompc0);
-        max17042_write_verify_reg(chip->client, MAX17042_ICHGTerm,
-                                config->ichgt_term);
+        max17042_write_verify_reg(map, MAX17042_RCOMP0, config->rcomp0);
+        max17042_write_verify_reg(map, MAX17042_TempCo, config->tcompc0);
+        max17042_write_verify_reg(map, MAX17042_ICHGTerm, config->ichgt_term);
         if (chip->chip_type == MAX17042) {
-                max17042_write_reg(chip->client, MAX17042_EmptyTempCo,
-                                        config->empty_tempco);
-                max17042_write_verify_reg(chip->client, MAX17042_K_empty0,
+                regmap_write(map, MAX17042_EmptyTempCo, config->empty_tempco);
+                max17042_write_verify_reg(map, MAX17042_K_empty0,
                                         config->kempty0);
         } else {
-                max17042_write_verify_reg(chip->client, MAX17047_QRTbl00,
+                max17042_write_verify_reg(map, MAX17047_QRTbl00,
                                                 config->qrtbl00);
-                max17042_write_verify_reg(chip->client, MAX17047_QRTbl10,
+                max17042_write_verify_reg(map, MAX17047_QRTbl10,
                                                 config->qrtbl10);
-                max17042_write_verify_reg(chip->client, MAX17047_QRTbl20,
+                max17042_write_verify_reg(map, MAX17047_QRTbl20,
                                                 config->qrtbl20);
-                max17042_write_verify_reg(chip->client, MAX17047_QRTbl30,
+                max17042_write_verify_reg(map, MAX17047_QRTbl30,
                                                 config->qrtbl30);
         }
 }
@@ -439,58 +411,60 @@ static void  max17042_write_custom_regs(struct max17042_chip *chip)
 static void max17042_update_capacity_regs(struct max17042_chip *chip)
 {
         struct max17042_config_data *config = chip->pdata->config_data;
+        struct regmap *map = chip->regmap;
 
-        max17042_write_verify_reg(chip->client, MAX17042_FullCAP,
+        max17042_write_verify_reg(map, MAX17042_FullCAP,
                                 config->fullcap);
-        max17042_write_reg(chip->client, MAX17042_DesignCap,
-                        config->design_cap);
-        max17042_write_verify_reg(chip->client, MAX17042_FullCAPNom,
+        regmap_write(map, MAX17042_DesignCap, config->design_cap);
+        max17042_write_verify_reg(map, MAX17042_FullCAPNom,
                                 config->fullcapnom);
 }
 
 static void max17042_reset_vfsoc0_reg(struct max17042_chip *chip)
 {
-        u16 vfSoc;
+        unsigned int vfSoc;
+        struct regmap *map = chip->regmap;
 
-        vfSoc = max17042_read_reg(chip->client, MAX17042_VFSOC);
-        max17042_write_reg(chip->client, MAX17042_VFSOC0Enable, VFSOC0_UNLOCK);
-        max17042_write_verify_reg(chip->client, MAX17042_VFSOC0, vfSoc);
-        max17042_write_reg(chip->client, MAX17042_VFSOC0Enable, VFSOC0_LOCK);
+        regmap_read(map, MAX17042_VFSOC, &vfSoc);
+        regmap_write(map, MAX17042_VFSOC0Enable, VFSOC0_UNLOCK);
+        max17042_write_verify_reg(map, MAX17042_VFSOC0, vfSoc);
+        regmap_write(map, MAX17042_VFSOC0Enable, VFSOC0_LOCK);
 }
 
 static void max17042_load_new_capacity_params(struct max17042_chip *chip)
 {
-        u16 full_cap0, rep_cap, dq_acc, vfSoc;
+        u32 full_cap0, rep_cap, dq_acc, vfSoc;
         u32 rem_cap;
 
         struct max17042_config_data *config = chip->pdata->config_data;
+        struct regmap *map = chip->regmap;
 
-        full_cap0 = max17042_read_reg(chip->client, MAX17042_FullCAP0);
-        vfSoc = max17042_read_reg(chip->client, MAX17042_VFSOC);
+        regmap_read(map, MAX17042_FullCAP0, &full_cap0);
+        regmap_read(map, MAX17042_VFSOC, &vfSoc);
 
         /* fg_vfSoc needs to shifted by 8 bits to get the
          * perc in 1% accuracy, to get the right rem_cap multiply
          * full_cap0, fg_vfSoc and devide by 100
          */
         rem_cap = ((vfSoc >> 8) * full_cap0) / 100;
-        max17042_write_verify_reg(chip->client, MAX17042_RemCap, (u16)rem_cap);
+        max17042_write_verify_reg(map, MAX17042_RemCap, rem_cap);
 
-        rep_cap = (u16)rem_cap;
-        max17042_write_verify_reg(chip->client, MAX17042_RepCap, rep_cap);
+        rep_cap = rem_cap;
+        max17042_write_verify_reg(map, MAX17042_RepCap, rep_cap);
 
         /* Write dQ_acc to 200% of Capacity and dP_acc to 200% */
         dq_acc = config->fullcap / dQ_ACC_DIV;
-        max17042_write_verify_reg(chip->client, MAX17042_dQacc, dq_acc);
-        max17042_write_verify_reg(chip->client, MAX17042_dPacc, dP_ACC_200);
+        max17042_write_verify_reg(map, MAX17042_dQacc, dq_acc);
+        max17042_write_verify_reg(map, MAX17042_dPacc, dP_ACC_200);
 
-        max17042_write_verify_reg(chip->client, MAX17042_FullCAP,
+        max17042_write_verify_reg(map, MAX17042_FullCAP,
                         config->fullcap);
-        max17042_write_reg(chip->client, MAX17042_DesignCap,
+        regmap_write(map, MAX17042_DesignCap,
                         config->design_cap);
-        max17042_write_verify_reg(chip->client, MAX17042_FullCAPNom,
+        max17042_write_verify_reg(map, MAX17042_FullCAPNom,
                         config->fullcapnom);
         /* Update SOC register with new SOC */
-        max17042_write_reg(chip->client, MAX17042_RepSOC, vfSoc);
+        regmap_write(map, MAX17042_RepSOC, vfSoc);
 }
 
 /*
@@ -500,59 +474,60 @@ static void max17042_load_new_capacity_params(struct max17042_chip *chip)
  */
 static inline void max17042_override_por_values(struct max17042_chip *chip)
 {
-        struct i2c_client *client = chip->client;
+        struct regmap *map = chip->regmap;
         struct max17042_config_data *config = chip->pdata->config_data;
 
-        max17042_override_por(client, MAX17042_TGAIN, config->tgain);
-        max17042_override_por(client, MAx17042_TOFF, config->toff);
-        max17042_override_por(client, MAX17042_CGAIN, config->cgain);
-        max17042_override_por(client, MAX17042_COFF, config->coff);
-
-        max17042_override_por(client, MAX17042_VALRT_Th, config->valrt_thresh);
-        max17042_override_por(client, MAX17042_TALRT_Th, config->talrt_thresh);
-        max17042_override_por(client, MAX17042_SALRT_Th,
-                        config->soc_alrt_thresh);
-        max17042_override_por(client, MAX17042_CONFIG, config->config);
-        max17042_override_por(client, MAX17042_SHDNTIMER, config->shdntimer);
-
-        max17042_override_por(client, MAX17042_DesignCap, config->design_cap);
-        max17042_override_por(client, MAX17042_ICHGTerm, config->ichgt_term);
-
-        max17042_override_por(client, MAX17042_AtRate, config->at_rate);
-        max17042_override_por(client, MAX17042_LearnCFG, config->learn_cfg);
-        max17042_override_por(client, MAX17042_FilterCFG, config->filter_cfg);
-        max17042_override_por(client, MAX17042_RelaxCFG, config->relax_cfg);
-        max17042_override_por(client, MAX17042_MiscCFG, config->misc_cfg);
-        max17042_override_por(client, MAX17042_MaskSOC, config->masksoc);
-
-        max17042_override_por(client, MAX17042_FullCAP, config->fullcap);
-        max17042_override_por(client, MAX17042_FullCAPNom, config->fullcapnom);
+        max17042_override_por(map, MAX17042_TGAIN, config->tgain);
+        max17042_override_por(map, MAx17042_TOFF, config->toff);
+        max17042_override_por(map, MAX17042_CGAIN, config->cgain);
+        max17042_override_por(map, MAX17042_COFF, config->coff);
+
+        max17042_override_por(map, MAX17042_VALRT_Th, config->valrt_thresh);
+        max17042_override_por(map, MAX17042_TALRT_Th, config->talrt_thresh);
+        max17042_override_por(map, MAX17042_SALRT_Th,
+                                                config->soc_alrt_thresh);
+        max17042_override_por(map, MAX17042_CONFIG, config->config);
+        max17042_override_por(map, MAX17042_SHDNTIMER, config->shdntimer);
+
+        max17042_override_por(map, MAX17042_DesignCap, config->design_cap);
+        max17042_override_por(map, MAX17042_ICHGTerm, config->ichgt_term);
+
+        max17042_override_por(map, MAX17042_AtRate, config->at_rate);
+        max17042_override_por(map, MAX17042_LearnCFG, config->learn_cfg);
+        max17042_override_por(map, MAX17042_FilterCFG, config->filter_cfg);
+        max17042_override_por(map, MAX17042_RelaxCFG, config->relax_cfg);
+        max17042_override_por(map, MAX17042_MiscCFG, config->misc_cfg);
+        max17042_override_por(map, MAX17042_MaskSOC, config->masksoc);
+
+        max17042_override_por(map, MAX17042_FullCAP, config->fullcap);
+        max17042_override_por(map, MAX17042_FullCAPNom, config->fullcapnom);
         if (chip->chip_type == MAX17042)
-                max17042_override_por(client, MAX17042_SOC_empty,
+                max17042_override_por(map, MAX17042_SOC_empty,
                                                 config->socempty);
-        max17042_override_por(client, MAX17042_LAvg_empty, config->lavg_empty);
-        max17042_override_por(client, MAX17042_dQacc, config->dqacc);
-        max17042_override_por(client, MAX17042_dPacc, config->dpacc);
+        max17042_override_por(map, MAX17042_LAvg_empty, config->lavg_empty);
+        max17042_override_por(map, MAX17042_dQacc, config->dqacc);
+        max17042_override_por(map, MAX17042_dPacc, config->dpacc);
 
         if (chip->chip_type == MAX17042)
-                max17042_override_por(client, MAX17042_V_empty, config->vempty);
+                max17042_override_por(map, MAX17042_V_empty, config->vempty);
         else
-                max17042_override_por(client, MAX17047_V_empty, config->vempty);
-        max17042_override_por(client, MAX17042_TempNom, config->temp_nom);
-        max17042_override_por(client, MAX17042_TempLim, config->temp_lim);
-        max17042_override_por(client, MAX17042_FCTC, config->fctc);
-        max17042_override_por(client, MAX17042_RCOMP0, config->rcomp0);
-        max17042_override_por(client, MAX17042_TempCo, config->tcompc0);
+                max17042_override_por(map, MAX17047_V_empty, config->vempty);
+        max17042_override_por(map, MAX17042_TempNom, config->temp_nom);
+        max17042_override_por(map, MAX17042_TempLim, config->temp_lim);
+        max17042_override_por(map, MAX17042_FCTC, config->fctc);
+        max17042_override_por(map, MAX17042_RCOMP0, config->rcomp0);
+        max17042_override_por(map, MAX17042_TempCo, config->tcompc0);
         if (chip->chip_type) {
-                max17042_override_por(client, MAX17042_EmptyTempCo,
-                                        config->empty_tempco);
-                max17042_override_por(client, MAX17042_K_empty0,
-                                        config->kempty0);
+                max17042_override_por(map, MAX17042_EmptyTempCo,
+                                                config->empty_tempco);
+                max17042_override_por(map, MAX17042_K_empty0,
+                                                config->kempty0);
         }
 }
 
 static int max17042_init_chip(struct max17042_chip *chip)
 {
+        struct regmap *map = chip->regmap;
         int ret;
         int val;
 
@@ -597,31 +572,32 @@ static int max17042_init_chip(struct max17042_chip *chip)
         max17042_load_new_capacity_params(chip);
 
         /* Init complete, Clear the POR bit */
-        val = max17042_read_reg(chip->client, MAX17042_STATUS);
-        max17042_write_reg(chip->client, MAX17042_STATUS,
-                        val & (~STATUS_POR_BIT));
+        regmap_read(map, MAX17042_STATUS, &val);
+        regmap_write(map, MAX17042_STATUS, val & (~STATUS_POR_BIT));
         return 0;
 }
 
 static void max17042_set_soc_threshold(struct max17042_chip *chip, u16 off)
 {
-        u16 soc, soc_tr;
+        struct regmap *map = chip->regmap;
+        u32 soc, soc_tr;
 
         /* program interrupt thesholds such that we should
          * get interrupt for every 'off' perc change in the soc
          */
-        soc = max17042_read_reg(chip->client, MAX17042_RepSOC) >> 8;
+        regmap_read(map, MAX17042_RepSOC, &soc);
+        soc >>= 8;
         soc_tr = (soc + off) << 8;
         soc_tr |= (soc - off);
-        max17042_write_reg(chip->client, MAX17042_SALRT_Th, soc_tr);
+        regmap_write(map, MAX17042_SALRT_Th, soc_tr);
 }
 
 static irqreturn_t max17042_thread_handler(int id, void *dev)
 {
         struct max17042_chip *chip = dev;
-        u16 val;
+        u32 val;
 
-        val = max17042_read_reg(chip->client, MAX17042_STATUS);
+        regmap_read(chip->regmap, MAX17042_STATUS, &val);
         if ((val & STATUS_INTR_SOCMIN_BIT) ||
                 (val & STATUS_INTR_SOCMAX_BIT)) {
                 dev_info(&chip->client->dev, "SOC threshold INTR\n");
@@ -682,13 +658,20 @@ max17042_get_pdata(struct device *dev)
 }
 #endif
 
+static struct regmap_config max17042_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 16,
+        .val_format_endian = REGMAP_ENDIAN_NATIVE,
+};
+
 static int max17042_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
         struct max17042_chip *chip;
         int ret;
-        int reg;
+        int i;
+        u32 val;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA))
                 return -EIO;
@@ -698,6 +681,12 @@ static int max17042_probe(struct i2c_client *client,
                 return -ENOMEM;
 
         chip->client = client;
+        chip->regmap = devm_regmap_init_i2c(client, &max17042_regmap_config);
+        if (IS_ERR(chip->regmap)) {
+                dev_err(&client->dev, "Failed to initialize regmap\n");
+                return -EINVAL;
+        }
+
         chip->pdata = max17042_get_pdata(&client->dev);
         if (!chip->pdata) {
                 dev_err(&client->dev, "no platform data provided\n");
@@ -706,15 +695,15 @@ static int max17042_probe(struct i2c_client *client,
 
         i2c_set_clientdata(client, chip);
 
-        ret = max17042_read_reg(chip->client, MAX17042_DevName);
-        if (ret == MAX17042_IC_VERSION) {
+        regmap_read(chip->regmap, MAX17042_DevName, &val);
+        if (val == MAX17042_IC_VERSION) {
                 dev_dbg(&client->dev, "chip type max17042 detected\n");
                 chip->chip_type = MAX17042;
-        } else if (ret == MAX17047_IC_VERSION) {
+        } else if (val == MAX17047_IC_VERSION) {
                 dev_dbg(&client->dev, "chip type max17047/50 detected\n");
                 chip->chip_type = MAX17047;
         } else {
-                dev_err(&client->dev, "device version mismatch: %x\n", ret);
+                dev_err(&client->dev, "device version mismatch: %x\n", val);
                 return -EIO;
         }
 
@@ -733,13 +722,15 @@ static int max17042_probe(struct i2c_client *client,
                 chip->pdata->r_sns = MAX17042_DEFAULT_SNS_RESISTOR;
 
         if (chip->pdata->init_data)
-                max17042_set_reg(client, chip->pdata->init_data,
-                                chip->pdata->num_init_data);
+                for (i = 0; i < chip->pdata->num_init_data; i++)
+                        regmap_write(chip->regmap,
+                                        chip->pdata->init_data[i].addr,
+                                        chip->pdata->init_data[i].data);
 
         if (!chip->pdata->enable_current_sense) {
-                max17042_write_reg(client, MAX17042_CGAIN, 0x0000);
-                max17042_write_reg(client, MAX17042_MiscCFG, 0x0003);
-                max17042_write_reg(client, MAX17042_LearnCFG, 0x0007);
+                regmap_write(chip->regmap, MAX17042_CGAIN, 0x0000);
+                regmap_write(chip->regmap, MAX17042_MiscCFG, 0x0003);
+                regmap_write(chip->regmap, MAX17042_LearnCFG, 0x0007);
         }
 
         ret = power_supply_register(&client->dev, &chip->battery);
@@ -754,9 +745,9 @@ static int max17042_probe(struct i2c_client *client,
                                                 IRQF_TRIGGER_FALLING,
                                                 chip->battery.name, chip);
                 if (!ret) {
-                        reg =  max17042_read_reg(client, MAX17042_CONFIG);
-                        reg |= CONFIG_ALRT_BIT_ENBL;
-                        max17042_write_reg(client, MAX17042_CONFIG, reg);
+                        regmap_read(chip->regmap, MAX17042_CONFIG, &val);
+                        val |= CONFIG_ALRT_BIT_ENBL;
+                        regmap_write(chip->regmap, MAX17042_CONFIG, val);
                         max17042_set_soc_threshold(chip, 1);
                 } else {
                         client->irq = 0;
@@ -765,8 +756,8 @@ static int max17042_probe(struct i2c_client *client,
                 }
         }
 
-        reg = max17042_read_reg(chip->client, MAX17042_STATUS);
-        if (reg & STATUS_POR_BIT) {
+        regmap_read(chip->regmap, MAX17042_STATUS, &val);
+        if (val & STATUS_POR_BIT) {
                 INIT_WORK(&chip->work, max17042_init_worker);
                 schedule_work(&chip->work);
         } else {
@@ -786,7 +777,7 @@ static int max17042_remove(struct i2c_client *client)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int max17042_suspend(struct device *dev)
 {
         struct max17042_chip *chip = dev_get_drvdata(dev);
@@ -816,17 +807,11 @@ static int max17042_resume(struct device *dev)
 
         return 0;
 }
-
-static const struct dev_pm_ops max17042_pm_ops = {
-        .suspend        = max17042_suspend,
-        .resume         = max17042_resume,
-};
-
-#define MAX17042_PM_OPS (&max17042_pm_ops)
-#else
-#define MAX17042_PM_OPS NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(max17042_pm_ops, max17042_suspend,
+                        max17042_resume);
+
 #ifdef CONFIG_OF
 static const struct of_device_id max17042_dt_match[] = {
         { .compatible = "maxim,max17042" },
@@ -849,7 +834,7 @@ static struct i2c_driver max17042_i2c_driver = {
         .driver = {
                 .name   = "max17042",
                 .of_match_table = of_match_ptr(max17042_dt_match),
-                .pm     = MAX17042_PM_OPS,
+                .pm     = &max17042_pm_ops,
         },
         .probe          = max17042_probe,
         .remove         = max17042_remove,
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index ffa10ed83eb1..62c15af58c9a 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -205,7 +205,7 @@ static int pm2xxx_charger_batt_therm_mngt(struct pm2xxx_charger *pm2, int val)
 }
 
 
-int pm2xxx_charger_die_therm_mngt(struct pm2xxx_charger *pm2, int val)
+static int pm2xxx_charger_die_therm_mngt(struct pm2xxx_charger *pm2, int val)
 {
         queue_work(pm2->charger_wq, &pm2->check_main_thermal_prot_work);
 
@@ -722,8 +722,12 @@ static int pm2xxx_charger_ac_en(struct ux500_charger *charger,
 
                 dev_dbg(pm2->dev, "Enable AC: %dmV %dmA\n", vset, iset);
                 if (!pm2->vddadc_en_ac) {
-                        regulator_enable(pm2->regu);
-                        pm2->vddadc_en_ac = true;
+                        ret = regulator_enable(pm2->regu);
+                        if (ret)
+                                dev_warn(pm2->dev,
+                                        "Failed to enable vddadc regulator\n");
+                        else
+                                pm2->vddadc_en_ac = true;
                 }
 
                 ret = pm2xxx_charging_init(pm2);
@@ -953,37 +957,24 @@ static int  pm2xxx_runtime_suspend(struct device *dev)
 {
         struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
         struct pm2xxx_charger *pm2;
-        int ret = 0;
 
         pm2 = (struct pm2xxx_charger *)i2c_get_clientdata(pm2xxx_i2c_client);
-        if (!pm2) {
-                dev_err(pm2->dev, "no pm2xxx_charger data supplied\n");
-                ret = -EINVAL;
-                return ret;
-        }
-
         clear_lpn_pin(pm2);
 
-        return ret;
+        return 0;
 }
 
 static int  pm2xxx_runtime_resume(struct device *dev)
 {
         struct i2c_client *pm2xxx_i2c_client = to_i2c_client(dev);
         struct pm2xxx_charger *pm2;
-        int ret = 0;
 
         pm2 = (struct pm2xxx_charger *)i2c_get_clientdata(pm2xxx_i2c_client);
-        if (!pm2) {
-                dev_err(pm2->dev, "no pm2xxx_charger data supplied\n");
-                ret = -EINVAL;
-                return ret;
-        }
 
         if (gpio_is_valid(pm2->lpn_pin) && gpio_get_value(pm2->lpn_pin) == 0)
                 set_lpn_pin(pm2);
 
-        return ret;
+        return 0;
 }
 
 #endif
diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index bdd7b9b2546a..8fc9d6df87f6 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -15,15 +15,17 @@
  * 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/delay.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
+#include <linux/slab.h>
+
 #include <linux/mfd/tps65090.h>
 
 #define TPS65090_REG_INTR_STS   0x00
@@ -185,10 +187,6 @@ static irqreturn_t tps65090_charger_isr(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-#if defined(CONFIG_OF)
-
-#include <linux/of_device.h>
-
 static struct tps65090_platform_data *
                 tps65090_parse_dt_charger_data(struct platform_device *pdev)
 {
@@ -210,13 +208,6 @@ static struct tps65090_platform_data *
         return pdata;
 
 }
-#else
-static struct tps65090_platform_data *
-                tps65090_parse_dt_charger_data(struct platform_device *pdev)
-{
-        return NULL;
-}
-#endif
 
 static int tps65090_charger_probe(struct platform_device *pdev)
 {
@@ -228,7 +219,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
 
         pdata = dev_get_platdata(pdev->dev.parent);
 
-        if (!pdata && pdev->dev.of_node)
+        if (IS_ENABLED(CONFIG_OF) && !pdata && pdev->dev.of_node)
                 pdata = tps65090_parse_dt_charger_data(pdev);
 
         if (!pdata) {
@@ -277,13 +268,13 @@ static int tps65090_charger_probe(struct platform_device *pdev)
         if (ret) {
                 dev_err(cdata->dev, "Unable to register irq %d err %d\n", irq,
                         ret);
-                goto fail_free_irq;
+                goto fail_unregister_supply;
         }
 
         ret = tps65090_config_charger(cdata);
         if (ret < 0) {
                 dev_err(&pdev->dev, "charger config failed, err %d\n", ret);
-                goto fail_free_irq;
+                goto fail_unregister_supply;
         }
 
         /* Check for charger presence */
@@ -292,14 +283,14 @@ static int tps65090_charger_probe(struct platform_device *pdev)
         if (ret < 0) {
                 dev_err(cdata->dev, "%s(): Error in reading reg 0x%x", __func__,
                         TPS65090_REG_CG_STATUS1);
-                goto fail_free_irq;
+                goto fail_unregister_supply;
         }
 
         if (status1 != 0) {
                 ret = tps65090_enable_charging(cdata);
                 if (ret < 0) {
                         dev_err(cdata->dev, "error enabling charger\n");
-                        goto fail_free_irq;
+                        goto fail_unregister_supply;
                 }
                 cdata->ac_online = 1;
                 power_supply_changed(&cdata->ac);
@@ -307,8 +298,6 @@ static int tps65090_charger_probe(struct platform_device *pdev)
 
         return 0;
 
-fail_free_irq:
-        devm_free_irq(cdata->dev, irq, cdata);
 fail_unregister_supply:
         power_supply_unregister(&cdata->ac);
 
@@ -319,7 +308,6 @@ static int tps65090_charger_remove(struct platform_device *pdev)
 {
         struct tps65090_charger *cdata = platform_get_drvdata(pdev);
 
-        devm_free_irq(cdata->dev, cdata->irq, cdata);
         power_supply_unregister(&cdata->ac);
 
         return 0;
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index d98abe911e37..f14108844e1a 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -495,10 +495,38 @@ static enum power_supply_property twl4030_charger_props[] = {
         POWER_SUPPLY_PROP_CURRENT_NOW,
 };
 
+#ifdef CONFIG_OF
+static const struct twl4030_bci_platform_data *
+twl4030_bci_parse_dt(struct device *dev)
+{
+        struct device_node *np = dev->of_node;
+        struct twl4030_bci_platform_data *pdata;
+        u32 num;
+
+        if (!np)
+                return NULL;
+        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
+        if (!pdata)
+                return pdata;
+
+        if (of_property_read_u32(np, "ti,bb-uvolt", &num) == 0)
+                pdata->bb_uvolt = num;
+        if (of_property_read_u32(np, "ti,bb-uamp", &num) == 0)
+                pdata->bb_uamp = num;
+        return pdata;
+}
+#else
+static inline const struct twl4030_bci_platform_data *
+twl4030_bci_parse_dt(struct device *dev)
+{
+        return NULL;
+}
+#endif
+
 static int __init twl4030_bci_probe(struct platform_device *pdev)
 {
         struct twl4030_bci *bci;
-        struct twl4030_bci_platform_data *pdata = pdev->dev.platform_data;
+        const struct twl4030_bci_platform_data *pdata = pdev->dev.platform_data;
         int ret;
         u32 reg;
 
@@ -506,6 +534,9 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
         if (bci == NULL)
                 return -ENOMEM;
 
+        if (!pdata)
+                pdata = twl4030_bci_parse_dt(&pdev->dev);
+
         bci->dev = &pdev->dev;
         bci->irq_chg = platform_get_irq(pdev, 0);
         bci->irq_bci = platform_get_irq(pdev, 1);
@@ -581,8 +612,11 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
 
         twl4030_charger_enable_ac(true);
         twl4030_charger_enable_usb(bci, true);
-        twl4030_charger_enable_backup(pdata->bb_uvolt,
-                                      pdata->bb_uamp);
+        if (pdata)
+                twl4030_charger_enable_backup(pdata->bb_uvolt,
+                                              pdata->bb_uamp);
+        else
+                twl4030_charger_enable_backup(0, 0);
 
         return 0;
 
@@ -631,10 +665,17 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
         return 0;
 }
 
+static const struct of_device_id twl_bci_of_match[] = {
+        {.compatible = "ti,twl4030-bci", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, twl_bci_of_match);
+
 static struct platform_driver twl4030_bci_driver = {
         .driver = {
                 .name   = "twl4030_bci",
                 .owner  = THIS_MODULE,
+                .of_match_table = of_match_ptr(twl_bci_of_match),
         },
         .remove = __exit_p(twl4030_bci_remove),
 };
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
index 548209a9c43c..d0ab5019d885 100644
--- a/drivers/s390/block/scm_blk.c
+++ b/drivers/s390/block/scm_blk.c
@@ -118,22 +118,6 @@ static void scm_request_done(struct scm_request *scmrq)
         spin_unlock_irqrestore(&list_lock, flags);
 }
 
-static int scm_open(struct block_device *blkdev, fmode_t mode)
-{
-        return scm_get_ref();
-}
-
-static void scm_release(struct gendisk *gendisk, fmode_t mode)
-{
-        scm_put_ref();
-}
-
-static const struct block_device_operations scm_blk_devops = {
-        .owner = THIS_MODULE,
-        .open = scm_open,
-        .release = scm_release,
-};
-
 static bool scm_permit_request(struct scm_blk_dev *bdev, struct request *req)
 {
         return rq_data_dir(req) != WRITE || bdev->state != SCM_WR_PROHIBIT;
@@ -256,7 +240,7 @@ static void scm_blk_request(struct request_queue *rq)
                 atomic_inc(&bdev->queued_reqs);
                 blk_start_request(req);
 
-                ret = scm_start_aob(scmrq->aob);
+                ret = eadm_start_aob(scmrq->aob);
                 if (ret) {
                         SCM_LOG(5, "no subchannel");
                         scm_request_requeue(scmrq);
@@ -320,7 +304,7 @@ static void scm_blk_handle_error(struct scm_request *scmrq)
         }
 
 restart:
-        if (!scm_start_aob(scmrq->aob))
+        if (!eadm_start_aob(scmrq->aob))
                 return;
 
 requeue:
@@ -363,6 +347,10 @@ static void scm_blk_tasklet(struct scm_blk_dev *bdev)
         blk_run_queue(bdev->rq);
 }
 
+static const struct block_device_operations scm_blk_devops = {
+        .owner = THIS_MODULE,
+};
+
 int scm_blk_dev_setup(struct scm_blk_dev *bdev, struct scm_device *scmdev)
 {
         struct request_queue *rq;
diff --git a/drivers/s390/block/scm_blk_cluster.c b/drivers/s390/block/scm_blk_cluster.c
index c0d102e3a48b..27f930cd657f 100644
--- a/drivers/s390/block/scm_blk_cluster.c
+++ b/drivers/s390/block/scm_blk_cluster.c
@@ -187,7 +187,7 @@ bool scm_need_cluster_request(struct scm_request *scmrq)
 void scm_initiate_cluster_request(struct scm_request *scmrq)
 {
         scm_prepare_cluster_request(scmrq);
-        if (scm_start_aob(scmrq->aob))
+        if (eadm_start_aob(scmrq->aob))
                 scm_request_requeue(scmrq);
 }
 
diff --git a/drivers/s390/char/Makefile b/drivers/s390/char/Makefile
index 17821a026c9c..b69ab17f13fa 100644
--- a/drivers/s390/char/Makefile
+++ b/drivers/s390/char/Makefile
@@ -3,7 +3,8 @@
 #
 
 obj-y += ctrlchar.o keyboard.o defkeymap.o sclp.o sclp_rw.o sclp_quiesce.o \
-         sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o sclp_ctl.o
+         sclp_cmd.o sclp_config.o sclp_cpi_sys.o sclp_ocf.o sclp_ctl.o \
+         sclp_early.o
 
 obj-$(CONFIG_TN3270) += raw3270.o
 obj-$(CONFIG_TN3270_CONSOLE) += con3270.o
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index f93cc32eb818..71e974738014 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -564,6 +564,7 @@ static void __exit
 fs3270_exit(void)
 {
         raw3270_unregister_notifier(&fs3270_notifier);
+        device_destroy(class3270, MKDEV(IBM_FS3270_MAJOR, 0));
         __unregister_chrdev(IBM_FS3270_MAJOR, 0, 1, "fs3270");
 }
 
diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h
index 40d1406289ed..6fbe09686d18 100644
--- a/drivers/s390/char/sclp.h
+++ b/drivers/s390/char/sclp.h
@@ -99,6 +99,7 @@ struct init_sccb {
 } __attribute__((packed));
 
 extern u64 sclp_facilities;
+
 #define SCLP_HAS_CHP_INFO       (sclp_facilities & 0x8000000000000000ULL)
 #define SCLP_HAS_CHP_RECONFIG   (sclp_facilities & 0x2000000000000000ULL)
 #define SCLP_HAS_CPU_INFO       (sclp_facilities & 0x0800000000000000ULL)
@@ -179,6 +180,10 @@ void sclp_sdias_exit(void);
 extern int sclp_console_pages;
 extern int sclp_console_drop;
 extern unsigned long sclp_console_full;
+extern u8 sclp_fac84;
+extern unsigned long long sclp_rzm;
+extern unsigned long long sclp_rnmax;
+extern __initdata int sclp_early_read_info_sccb_valid;
 
 /* useful inlines */
 
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c
index 77df9cb00688..eaa21d542c5c 100644
--- a/drivers/s390/char/sclp_cmd.c
+++ b/drivers/s390/char/sclp_cmd.c
@@ -28,168 +28,6 @@
 
 #include "sclp.h"
 
-#define SCLP_CMDW_READ_SCP_INFO         0x00020001
-#define SCLP_CMDW_READ_SCP_INFO_FORCED  0x00120001
-
-struct read_info_sccb {
-        struct  sccb_header header;     /* 0-7 */
-        u16     rnmax;                  /* 8-9 */
-        u8      rnsize;                 /* 10 */
-        u8      _reserved0[24 - 11];    /* 11-15 */
-        u8      loadparm[8];            /* 24-31 */
-        u8      _reserved1[48 - 32];    /* 32-47 */
-        u64     facilities;             /* 48-55 */
-        u8      _reserved2[84 - 56];    /* 56-83 */
-        u8      fac84;                  /* 84 */
-        u8      fac85;                  /* 85 */
-        u8      _reserved3[91 - 86];    /* 86-90 */
-        u8      flags;                  /* 91 */
-        u8      _reserved4[100 - 92];   /* 92-99 */
-        u32     rnsize2;                /* 100-103 */
-        u64     rnmax2;                 /* 104-111 */
-        u8      _reserved5[4096 - 112]; /* 112-4095 */
-} __attribute__((packed, aligned(PAGE_SIZE)));
-
-static struct init_sccb __initdata early_event_mask_sccb __aligned(PAGE_SIZE);
-static struct read_info_sccb __initdata early_read_info_sccb;
-static int __initdata early_read_info_sccb_valid;
-
-u64 sclp_facilities;
-static u8 sclp_fac84;
-static unsigned long long rzm;
-static unsigned long long rnmax;
-
-static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
-{
-        int rc;
-
-        __ctl_set_bit(0, 9);
-        rc = sclp_service_call(cmd, sccb);
-        if (rc)
-                goto out;
-        __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
-                        PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
-        local_irq_disable();
-out:
-        /* Contents of the sccb might have changed. */
-        barrier();
-        __ctl_clear_bit(0, 9);
-        return rc;
-}
-
-static void __init sclp_read_info_early(void)
-{
-        int rc;
-        int i;
-        struct read_info_sccb *sccb;
-        sclp_cmdw_t commands[] = {SCLP_CMDW_READ_SCP_INFO_FORCED,
-                                  SCLP_CMDW_READ_SCP_INFO};
-
-        sccb = &early_read_info_sccb;
-        for (i = 0; i < ARRAY_SIZE(commands); i++) {
-                do {
-                        memset(sccb, 0, sizeof(*sccb));
-                        sccb->header.length = sizeof(*sccb);
-                        sccb->header.function_code = 0x80;
-                        sccb->header.control_mask[2] = 0x80;
-                        rc = sclp_cmd_sync_early(commands[i], sccb);
-                } while (rc == -EBUSY);
-
-                if (rc)
-                        break;
-                if (sccb->header.response_code == 0x10) {
-                        early_read_info_sccb_valid = 1;
-                        break;
-                }
-                if (sccb->header.response_code != 0x1f0)
-                        break;
-        }
-}
-
-static void __init sclp_event_mask_early(void)
-{
-        struct init_sccb *sccb = &early_event_mask_sccb;
-        int rc;
-
-        do {
-                memset(sccb, 0, sizeof(*sccb));
-                sccb->header.length = sizeof(*sccb);
-                sccb->mask_length = sizeof(sccb_mask_t);
-                rc = sclp_cmd_sync_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb);
-        } while (rc == -EBUSY);
-}
-
-void __init sclp_facilities_detect(void)
-{
-        struct read_info_sccb *sccb;
-
-        sclp_read_info_early();
-        if (!early_read_info_sccb_valid)
-                return;
-
-        sccb = &early_read_info_sccb;
-        sclp_facilities = sccb->facilities;
-        sclp_fac84 = sccb->fac84;
-        if (sccb->fac85 & 0x02)
-                S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
-        rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
-        rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
-        rzm <<= 20;
-
-        sclp_event_mask_early();
-}
-
-bool __init sclp_has_linemode(void)
-{
-        struct init_sccb *sccb = &early_event_mask_sccb;
-
-        if (sccb->header.response_code != 0x20)
-                return 0;
-        if (!(sccb->sclp_send_mask & (EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK)))
-                return 0;
-        if (!(sccb->sclp_receive_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK)))
-                return 0;
-        return 1;
-}
-
-bool __init sclp_has_vt220(void)
-{
-        struct init_sccb *sccb = &early_event_mask_sccb;
-
-        if (sccb->header.response_code != 0x20)
-                return 0;
-        if (sccb->sclp_send_mask & EVTYP_VT220MSG_MASK)
-                return 1;
-        return 0;
-}
-
-unsigned long long sclp_get_rnmax(void)
-{
-        return rnmax;
-}
-
-unsigned long long sclp_get_rzm(void)
-{
-        return rzm;
-}
-
-/*
- * This function will be called after sclp_facilities_detect(), which gets
- * called from early.c code. Therefore the sccb should have valid contents.
- */
-void __init sclp_get_ipl_info(struct sclp_ipl_info *info)
-{
-        struct read_info_sccb *sccb;
-
-        if (!early_read_info_sccb_valid)
-                return;
-        sccb = &early_read_info_sccb;
-        info->is_valid = 1;
-        if (sccb->flags & 0x2)
-                info->has_dump = 1;
-        memcpy(&info->loadparm, &sccb->loadparm, LOADPARM_LEN);
-}
-
 static void sclp_sync_callback(struct sclp_req *req, void *data)
 {
         struct completion *completion = data;
@@ -356,14 +194,14 @@ struct assign_storage_sccb {
 
 int arch_get_memory_phys_device(unsigned long start_pfn)
 {
-        if (!rzm)
+        if (!sclp_rzm)
                 return 0;
-        return PFN_PHYS(start_pfn) >> ilog2(rzm);
+        return PFN_PHYS(start_pfn) >> ilog2(sclp_rzm);
 }
 
 static unsigned long long rn2addr(u16 rn)
 {
-        return (unsigned long long) (rn - 1) * rzm;
+        return (unsigned long long) (rn - 1) * sclp_rzm;
 }
 
 static int do_assign_storage(sclp_cmdw_t cmd, u16 rn)
@@ -404,7 +242,7 @@ static int sclp_assign_storage(u16 rn)
         if (rc)
                 return rc;
         start = rn2addr(rn);
-        storage_key_init_range(start, start + rzm);
+        storage_key_init_range(start, start + sclp_rzm);
         return 0;
 }
 
@@ -462,7 +300,7 @@ static int sclp_mem_change_state(unsigned long start, unsigned long size,
                 istart = rn2addr(incr->rn);
                 if (start + size - 1 < istart)
                         break;
-                if (start > istart + rzm - 1)
+                if (start > istart + sclp_rzm - 1)
                         continue;
                 if (online)
                         rc |= sclp_assign_storage(incr->rn);
@@ -526,7 +364,7 @@ static void __init add_memory_merged(u16 rn)
         if (!first_rn)
                 goto skip_add;
         start = rn2addr(first_rn);
-        size = (unsigned long long ) num * rzm;
+        size = (unsigned long long) num * sclp_rzm;
         if (start >= VMEM_MAX_PHYS)
                 goto skip_add;
         if (start + size > VMEM_MAX_PHYS)
@@ -574,7 +412,7 @@ static void __init insert_increment(u16 rn, int standby, int assigned)
         }
         if (!assigned)
                 new_incr->rn = last_rn + 1;
-        if (new_incr->rn > rnmax) {
+        if (new_incr->rn > sclp_rnmax) {
                 kfree(new_incr);
                 return;
         }
@@ -617,7 +455,7 @@ static int __init sclp_detect_standby_memory(void)
 
         if (OLDMEM_BASE) /* No standby memory in kdump mode */
                 return 0;
-        if (!early_read_info_sccb_valid)
+        if (!sclp_early_read_info_sccb_valid)
                 return 0;
         if ((sclp_facilities & 0xe00000000000ULL) != 0xe00000000000ULL)
                 return 0;
@@ -661,7 +499,7 @@ static int __init sclp_detect_standby_memory(void)
         }
         if (rc || list_empty(&sclp_mem_list))
                 goto out;
-        for (i = 1; i <= rnmax - assigned; i++)
+        for (i = 1; i <= sclp_rnmax - assigned; i++)
                 insert_increment(0, 1, 0);
         rc = register_memory_notifier(&sclp_mem_nb);
         if (rc)
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
new file mode 100644
index 000000000000..f7aa080e9b28
--- /dev/null
+++ b/drivers/s390/char/sclp_early.c
@@ -0,0 +1,264 @@
+/*
+ * SCLP early driver
+ *
+ * Copyright IBM Corp. 2013
+ */
+
+#define KMSG_COMPONENT "sclp_early"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
+#include <asm/ctl_reg.h>
+#include <asm/sclp.h>
+#include <asm/ipl.h>
+#include "sclp_sdias.h"
+#include "sclp.h"
+
+#define SCLP_CMDW_READ_SCP_INFO         0x00020001
+#define SCLP_CMDW_READ_SCP_INFO_FORCED  0x00120001
+
+struct read_info_sccb {
+        struct  sccb_header header;     /* 0-7 */
+        u16     rnmax;                  /* 8-9 */
+        u8      rnsize;                 /* 10 */
+        u8      _reserved0[24 - 11];    /* 11-15 */
+        u8      loadparm[8];            /* 24-31 */
+        u8      _reserved1[48 - 32];    /* 32-47 */
+        u64     facilities;             /* 48-55 */
+        u8      _reserved2[84 - 56];    /* 56-83 */
+        u8      fac84;                  /* 84 */
+        u8      fac85;                  /* 85 */
+        u8      _reserved3[91 - 86];    /* 86-90 */
+        u8      flags;                  /* 91 */
+        u8      _reserved4[100 - 92];   /* 92-99 */
+        u32     rnsize2;                /* 100-103 */
+        u64     rnmax2;                 /* 104-111 */
+        u8      _reserved5[4096 - 112]; /* 112-4095 */
+} __packed __aligned(PAGE_SIZE);
+
+static __initdata struct init_sccb early_event_mask_sccb __aligned(PAGE_SIZE);
+static __initdata struct read_info_sccb early_read_info_sccb;
+static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE);
+static unsigned long sclp_hsa_size;
+
+__initdata int sclp_early_read_info_sccb_valid;
+u64 sclp_facilities;
+u8 sclp_fac84;
+unsigned long long sclp_rzm;
+unsigned long long sclp_rnmax;
+
+static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb)
+{
+        int rc;
+
+        __ctl_set_bit(0, 9);
+        rc = sclp_service_call(cmd, sccb);
+        if (rc)
+                goto out;
+        __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
+                        PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
+        local_irq_disable();
+out:
+        /* Contents of the sccb might have changed. */
+        barrier();
+        __ctl_clear_bit(0, 9);
+        return rc;
+}
+
+static void __init sclp_read_info_early(void)
+{
+        int rc;
+        int i;
+        struct read_info_sccb *sccb;
+        sclp_cmdw_t commands[] = {SCLP_CMDW_READ_SCP_INFO_FORCED,
+                                  SCLP_CMDW_READ_SCP_INFO};
+
+        sccb = &early_read_info_sccb;
+        for (i = 0; i < ARRAY_SIZE(commands); i++) {
+                do {
+                        memset(sccb, 0, sizeof(*sccb));
+                        sccb->header.length = sizeof(*sccb);
+                        sccb->header.function_code = 0x80;
+                        sccb->header.control_mask[2] = 0x80;
+                        rc = sclp_cmd_sync_early(commands[i], sccb);
+                } while (rc == -EBUSY);
+
+                if (rc)
+                        break;
+                if (sccb->header.response_code == 0x10) {
+                        sclp_early_read_info_sccb_valid = 1;
+                        break;
+                }
+                if (sccb->header.response_code != 0x1f0)
+                        break;
+        }
+}
+
+static void __init sclp_facilities_detect(void)
+{
+        struct read_info_sccb *sccb;
+
+        sclp_read_info_early();
+        if (!sclp_early_read_info_sccb_valid)
+                return;
+
+        sccb = &early_read_info_sccb;
+        sclp_facilities = sccb->facilities;
+        sclp_fac84 = sccb->fac84;
+        if (sccb->fac85 & 0x02)
+                S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
+        sclp_rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;
+        sclp_rzm = sccb->rnsize ? sccb->rnsize : sccb->rnsize2;
+        sclp_rzm <<= 20;
+}
+
+bool __init sclp_has_linemode(void)
+{
+        struct init_sccb *sccb = &early_event_mask_sccb;
+
+        if (sccb->header.response_code != 0x20)
+                return 0;
+        if (!(sccb->sclp_send_mask & (EVTYP_OPCMD_MASK | EVTYP_PMSGCMD_MASK)))
+                return 0;
+        if (!(sccb->sclp_receive_mask & (EVTYP_MSG_MASK | EVTYP_PMSGCMD_MASK)))
+                return 0;
+        return 1;
+}
+
+bool __init sclp_has_vt220(void)
+{
+        struct init_sccb *sccb = &early_event_mask_sccb;
+
+        if (sccb->header.response_code != 0x20)
+                return 0;
+        if (sccb->sclp_send_mask & EVTYP_VT220MSG_MASK)
+                return 1;
+        return 0;
+}
+
+unsigned long long sclp_get_rnmax(void)
+{
+        return sclp_rnmax;
+}
+
+unsigned long long sclp_get_rzm(void)
+{
+        return sclp_rzm;
+}
+
+/*
+ * This function will be called after sclp_facilities_detect(), which gets
+ * called from early.c code. Therefore the sccb should have valid contents.
+ */
+void __init sclp_get_ipl_info(struct sclp_ipl_info *info)
+{
+        struct read_info_sccb *sccb;
+
+        if (!sclp_early_read_info_sccb_valid)
+                return;
+        sccb = &early_read_info_sccb;
+        info->is_valid = 1;
+        if (sccb->flags & 0x2)
+                info->has_dump = 1;
+        memcpy(&info->loadparm, &sccb->loadparm, LOADPARM_LEN);
+}
+
+static int __init sclp_cmd_early(sclp_cmdw_t cmd, void *sccb)
+{
+        int rc;
+
+        do {
+                rc = sclp_cmd_sync_early(cmd, sccb);
+        } while (rc == -EBUSY);
+
+        if (rc)
+                return -EIO;
+        if (((struct sccb_header *) sccb)->response_code != 0x0020)
+                return -EIO;
+        return 0;
+}
+
+static void __init sccb_init_eq_size(struct sdias_sccb *sccb)
+{
+        memset(sccb, 0, sizeof(*sccb));
+
+        sccb->hdr.length = sizeof(*sccb);
+        sccb->evbuf.hdr.length = sizeof(struct sdias_evbuf);
+        sccb->evbuf.hdr.type = EVTYP_SDIAS;
+        sccb->evbuf.event_qual = SDIAS_EQ_SIZE;
+        sccb->evbuf.data_id = SDIAS_DI_FCP_DUMP;
+        sccb->evbuf.event_id = 4712;
+        sccb->evbuf.dbs = 1;
+}
+
+static int __init sclp_set_event_mask(unsigned long receive_mask,
+                                      unsigned long send_mask)
+{
+        struct init_sccb *sccb = (void *) &sccb_early;
+
+        memset(sccb, 0, sizeof(*sccb));
+        sccb->header.length = sizeof(*sccb);
+        sccb->mask_length = sizeof(sccb_mask_t);
+        sccb->receive_mask = receive_mask;
+        sccb->send_mask = send_mask;
+        return sclp_cmd_early(SCLP_CMDW_WRITE_EVENT_MASK, sccb);
+}
+
+static long __init sclp_hsa_size_init(void)
+{
+        struct sdias_sccb *sccb = (void *) &sccb_early;
+
+        sccb_init_eq_size(sccb);
+        if (sclp_cmd_early(SCLP_CMDW_WRITE_EVENT_DATA, sccb))
+                return -EIO;
+        if (sccb->evbuf.blk_cnt != 0)
+                return (sccb->evbuf.blk_cnt - 1) * PAGE_SIZE;
+        return 0;
+}
+
+static long __init sclp_hsa_copy_wait(void)
+{
+        struct sccb_header *sccb = (void *) &sccb_early;
+
+        memset(sccb, 0, PAGE_SIZE);
+        sccb->length = PAGE_SIZE;
+        if (sclp_cmd_early(SCLP_CMDW_READ_EVENT_DATA, sccb))
+                return -EIO;
+        return (((struct sdias_sccb *) sccb)->evbuf.blk_cnt - 1) * PAGE_SIZE;
+}
+
+unsigned long sclp_get_hsa_size(void)
+{
+        return sclp_hsa_size;
+}
+
+static void __init sclp_hsa_size_detect(void)
+{
+        long size;
+
+        /* First try synchronous interface (LPAR) */
+        if (sclp_set_event_mask(0, 0x40000010))
+                return;
+        size = sclp_hsa_size_init();
+        if (size < 0)
+                return;
+        if (size != 0)
+                goto out;
+        /* Then try asynchronous interface (z/VM) */
+        if (sclp_set_event_mask(0x00000010, 0x40000010))
+                return;
+        size = sclp_hsa_size_init();
+        if (size < 0)
+                return;
+        size = sclp_hsa_copy_wait();
+        if (size < 0)
+                return;
+out:
+        sclp_hsa_size = size;
+}
+
+void __init sclp_early_detect(void)
+{
+        sclp_facilities_detect();
+        sclp_hsa_size_detect();
+        sclp_set_event_mask(0, 0);
+}
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c
index b1032931a1c4..561a0414b352 100644
--- a/drivers/s390/char/sclp_sdias.c
+++ b/drivers/s390/char/sclp_sdias.c
@@ -1,7 +1,7 @@
 /*
- * Sclp "store data in absolut storage"
+ * SCLP "store data in absolute storage"
  *
- * Copyright IBM Corp. 2003, 2007
+ * Copyright IBM Corp. 2003, 2013
  * Author(s): Michael Holzheu
  */
 
@@ -14,6 +14,7 @@
 #include <asm/debug.h>
 #include <asm/ipl.h>
 
+#include "sclp_sdias.h"
 #include "sclp.h"
 #include "sclp_rw.h"
 
@@ -22,46 +23,12 @@
 #define SDIAS_RETRIES 300
 #define SDIAS_SLEEP_TICKS 50
 
-#define EQ_STORE_DATA   0x0
-#define EQ_SIZE         0x1
-#define DI_FCP_DUMP     0x0
-#define ASA_SIZE_32     0x0
-#define ASA_SIZE_64     0x1
-#define EVSTATE_ALL_STORED      0x0
-#define EVSTATE_NO_DATA         0x3
-#define EVSTATE_PART_STORED     0x10
-
 static struct debug_info *sdias_dbf;
 
 static struct sclp_register sclp_sdias_register = {
         .send_mask = EVTYP_SDIAS_MASK,
 };
 
-struct sdias_evbuf {
-        struct  evbuf_header hdr;
-        u8      event_qual;
-        u8      data_id;
-        u64     reserved2;
-        u32     event_id;
-        u16     reserved3;
-        u8      asa_size;
-        u8      event_status;
-        u32     reserved4;
-        u32     blk_cnt;
-        u64     asa;
-        u32     reserved5;
-        u32     fbn;
-        u32     reserved6;
-        u32     lbn;
-        u16     reserved7;
-        u16     dbs;
-} __attribute__((packed));
-
-struct sdias_sccb {
-        struct sccb_header  hdr;
-        struct sdias_evbuf  evbuf;
-} __attribute__((packed));
-
 static struct sdias_sccb sccb __attribute__((aligned(4096)));
 static struct sdias_evbuf sdias_evbuf;
 
@@ -148,8 +115,8 @@ int sclp_sdias_blk_count(void)
         sccb.hdr.length = sizeof(sccb);
         sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);
         sccb.evbuf.hdr.type = EVTYP_SDIAS;
-        sccb.evbuf.event_qual = EQ_SIZE;
-        sccb.evbuf.data_id = DI_FCP_DUMP;
+        sccb.evbuf.event_qual = SDIAS_EQ_SIZE;
+        sccb.evbuf.data_id = SDIAS_DI_FCP_DUMP;
         sccb.evbuf.event_id = 4712;
         sccb.evbuf.dbs = 1;
 
@@ -208,13 +175,13 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
         sccb.evbuf.hdr.length = sizeof(struct sdias_evbuf);
         sccb.evbuf.hdr.type = EVTYP_SDIAS;
         sccb.evbuf.hdr.flags = 0;
-        sccb.evbuf.event_qual = EQ_STORE_DATA;
-        sccb.evbuf.data_id = DI_FCP_DUMP;
+        sccb.evbuf.event_qual = SDIAS_EQ_STORE_DATA;
+        sccb.evbuf.data_id = SDIAS_DI_FCP_DUMP;
         sccb.evbuf.event_id = 4712;
 #ifdef CONFIG_64BIT
-        sccb.evbuf.asa_size = ASA_SIZE_64;
+        sccb.evbuf.asa_size = SDIAS_ASA_SIZE_64;
 #else
-        sccb.evbuf.asa_size = ASA_SIZE_32;
+        sccb.evbuf.asa_size = SDIAS_ASA_SIZE_32;
 #endif
         sccb.evbuf.event_status = 0;
         sccb.evbuf.blk_cnt = nr_blks;
@@ -240,20 +207,19 @@ int sclp_sdias_copy(void *dest, int start_blk, int nr_blks)
         }
 
         switch (sdias_evbuf.event_status) {
-                case EVSTATE_ALL_STORED:
-                        TRACE("all stored\n");
-                        break;
-                case EVSTATE_PART_STORED:
-                        TRACE("part stored: %i\n", sdias_evbuf.blk_cnt);
-                        break;
-                case EVSTATE_NO_DATA:
-                        TRACE("no data\n");
-                        /* fall through */
-                default:
-                        pr_err("Error from SCLP while copying hsa. "
-                               "Event status = %x\n",
-                               sdias_evbuf.event_status);
-                        rc = -EIO;
+        case SDIAS_EVSTATE_ALL_STORED:
+                TRACE("all stored\n");
+                break;
+        case SDIAS_EVSTATE_PART_STORED:
+                TRACE("part stored: %i\n", sdias_evbuf.blk_cnt);
+                break;
+        case SDIAS_EVSTATE_NO_DATA:
+                TRACE("no data\n");
+                /* fall through */
+        default:
+                pr_err("Error from SCLP while copying hsa. Event status = %x\n",
+                       sdias_evbuf.event_status);
+                rc = -EIO;
         }
 out:
         mutex_unlock(&sdias_mutex);
diff --git a/drivers/s390/char/sclp_sdias.h b/drivers/s390/char/sclp_sdias.h
new file mode 100644
index 000000000000..f2431c414150
--- /dev/null
+++ b/drivers/s390/char/sclp_sdias.h
@@ -0,0 +1,46 @@
+/*
+ * SCLP "store data in absolute storage"
+ *
+ * Copyright IBM Corp. 2003, 2013
+ */
+
+#ifndef SCLP_SDIAS_H
+#define SCLP_SDIAS_H
+
+#include "sclp.h"
+
+#define SDIAS_EQ_STORE_DATA             0x0
+#define SDIAS_EQ_SIZE                   0x1
+#define SDIAS_DI_FCP_DUMP               0x0
+#define SDIAS_ASA_SIZE_32               0x0
+#define SDIAS_ASA_SIZE_64               0x1
+#define SDIAS_EVSTATE_ALL_STORED        0x0
+#define SDIAS_EVSTATE_NO_DATA           0x3
+#define SDIAS_EVSTATE_PART_STORED       0x10
+
+struct sdias_evbuf {
+        struct  evbuf_header hdr;
+        u8      event_qual;
+        u8      data_id;
+        u64     reserved2;
+        u32     event_id;
+        u16     reserved3;
+        u8      asa_size;
+        u8      event_status;
+        u32     reserved4;
+        u32     blk_cnt;
+        u64     asa;
+        u32     reserved5;
+        u32     fbn;
+        u32     reserved6;
+        u32     lbn;
+        u16     reserved7;
+        u16     dbs;
+} __packed;
+
+struct sdias_sccb {
+        struct sccb_header      hdr;
+        struct sdias_evbuf      evbuf;
+} __packed;
+
+#endif /* SCLP_SDIAS_H */
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index ffb1fcf0bf5b..3d8e4d63f514 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -328,9 +328,9 @@ static ssize_t zcore_read(struct file *file, char __user *buf, size_t count,
         mem_offs = 0;
 
         /* Copy from HSA data */
-        if (*ppos < (ZFCPDUMP_HSA_SIZE + HEADER_SIZE)) {
-                size = min((count - hdr_count), (size_t) (ZFCPDUMP_HSA_SIZE
-                           - mem_start));
+        if (*ppos < sclp_get_hsa_size() + HEADER_SIZE) {
+                size = min((count - hdr_count),
+                           (size_t) (sclp_get_hsa_size() - mem_start));
                 rc = memcpy_hsa_user(buf + hdr_count, mem_start, size);
                 if (rc)
                         goto fail;
@@ -490,7 +490,7 @@ static ssize_t zcore_hsa_read(struct file *filp, char __user *buf,
         static char str[18];
 
         if (hsa_available)
-                snprintf(str, sizeof(str), "%lx\n", ZFCPDUMP_HSA_SIZE);
+                snprintf(str, sizeof(str), "%lx\n", sclp_get_hsa_size());
         else
                 snprintf(str, sizeof(str), "0\n");
         return simple_read_from_buffer(buf, count, ppos, str, strlen(str));
@@ -584,17 +584,9 @@ static int __init sys_info_init(enum arch_id arch, unsigned long mem_end)
 
 static int __init check_sdias(void)
 {
-        int rc, act_hsa_size;
-
-        rc = sclp_sdias_blk_count();
-        if (rc < 0) {
+        if (!sclp_get_hsa_size()) {
                 TRACE("Could not determine HSA size\n");
-                return rc;
-        }
-        act_hsa_size = (rc - 1) * PAGE_SIZE;
-        if (act_hsa_size < ZFCPDUMP_HSA_SIZE) {
-                TRACE("HSA size too small: %i\n", act_hsa_size);
-                return -EINVAL;
+                return -ENODEV;
         }
         return 0;
 }
@@ -662,7 +654,7 @@ static int __init zcore_reipl_init(void)
         ipl_block = (void *) __get_free_page(GFP_KERNEL);
         if (!ipl_block)
                 return -ENOMEM;
-        if (ipib_info.ipib < ZFCPDUMP_HSA_SIZE)
+        if (ipib_info.ipib < sclp_get_hsa_size())
                 rc = memcpy_hsa_kernel(ipl_block, ipib_info.ipib, PAGE_SIZE);
         else
                 rc = memcpy_real(ipl_block, (void *) ipib_info.ipib, PAGE_SIZE);
diff --git a/drivers/s390/cio/eadm_sch.c b/drivers/s390/cio/eadm_sch.c
index aca7bfc113aa..3a2ee4a740b4 100644
--- a/drivers/s390/cio/eadm_sch.c
+++ b/drivers/s390/cio/eadm_sch.c
@@ -190,7 +190,7 @@ static struct subchannel *eadm_get_idle_sch(void)
         return NULL;
 }
 
-static int eadm_start_aob(struct aob *aob)
+int eadm_start_aob(struct aob *aob)
 {
         struct eadm_private *private;
         struct subchannel *sch;
@@ -218,6 +218,7 @@ out_unlock:
 
         return ret;
 }
+EXPORT_SYMBOL_GPL(eadm_start_aob);
 
 static int eadm_subchannel_probe(struct subchannel *sch)
 {
@@ -380,11 +381,6 @@ static struct css_driver eadm_subchannel_driver = {
         .restore = eadm_subchannel_restore,
 };
 
-static struct eadm_ops eadm_ops = {
-        .eadm_start = eadm_start_aob,
-        .owner = THIS_MODULE,
-};
-
 static int __init eadm_sch_init(void)
 {
         int ret;
@@ -404,7 +400,6 @@ static int __init eadm_sch_init(void)
         if (ret)
                 goto cleanup;
 
-        register_eadm_ops(&eadm_ops);
         return ret;
 
 cleanup:
@@ -415,7 +410,6 @@ cleanup:
 
 static void __exit eadm_sch_exit(void)
 {
-        unregister_eadm_ops(&eadm_ops);
         css_driver_unregister(&eadm_subchannel_driver);
         isc_unregister(EADM_SCH_ISC);
         debug_unregister(eadm_debug);
diff --git a/drivers/s390/cio/scm.c b/drivers/s390/cio/scm.c
index 46ec25632e8b..15268edc54ae 100644
--- a/drivers/s390/cio/scm.c
+++ b/drivers/s390/cio/scm.c
@@ -15,8 +15,6 @@
 #include "chsc.h"
 
 static struct device *scm_root;
-static struct eadm_ops *eadm_ops;
-static DEFINE_MUTEX(eadm_ops_mutex);
 
 #define to_scm_dev(n) container_of(n, struct scm_device, dev)
 #define to_scm_drv(d) container_of(d, struct scm_driver, drv)
@@ -73,49 +71,6 @@ void scm_driver_unregister(struct scm_driver *scmdrv)
 }
 EXPORT_SYMBOL_GPL(scm_driver_unregister);
 
-int scm_get_ref(void)
-{
-        int ret = 0;
-
-        mutex_lock(&eadm_ops_mutex);
-        if (!eadm_ops || !try_module_get(eadm_ops->owner))
-                ret = -ENOENT;
-        mutex_unlock(&eadm_ops_mutex);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(scm_get_ref);
-
-void scm_put_ref(void)
-{
-        mutex_lock(&eadm_ops_mutex);
-        module_put(eadm_ops->owner);
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(scm_put_ref);
-
-void register_eadm_ops(struct eadm_ops *ops)
-{
-        mutex_lock(&eadm_ops_mutex);
-        eadm_ops = ops;
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(register_eadm_ops);
-
-void unregister_eadm_ops(struct eadm_ops *ops)
-{
-        mutex_lock(&eadm_ops_mutex);
-        eadm_ops = NULL;
-        mutex_unlock(&eadm_ops_mutex);
-}
-EXPORT_SYMBOL_GPL(unregister_eadm_ops);
-
-int scm_start_aob(struct aob *aob)
-{
-        return eadm_ops->eadm_start(aob);
-}
-EXPORT_SYMBOL_GPL(scm_start_aob);
-
 void scm_irq_handler(struct aob *aob, int error)
 {
         struct aob_rq_header *aobrq = (void *) aob->request.data;
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index f379c7f3034c..2700a5a09bd4 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -24,12 +24,15 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/delay.h>
 
 #include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_srp.h>
+#include "scsi_priv.h"
 #include "scsi_transport_srp_internal.h"
 
 struct srp_host_attrs {
@@ -38,7 +41,7 @@ struct srp_host_attrs {
 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
 
 #define SRP_HOST_ATTRS 0
-#define SRP_RPORT_ATTRS 3
+#define SRP_RPORT_ATTRS 8
 
 struct srp_internal {
         struct scsi_transport_template t;
@@ -54,6 +57,36 @@ struct srp_internal {
 
 #define dev_to_rport(d) container_of(d, struct srp_rport, dev)
 #define transport_class_to_srp_rport(dev) dev_to_rport((dev)->parent)
+static inline struct Scsi_Host *rport_to_shost(struct srp_rport *r)
+{
+        return dev_to_shost(r->dev.parent);
+}
+
+/**
+ * srp_tmo_valid() - check timeout combination validity
+ *
+ * The combination of the timeout parameters must be such that SCSI commands
+ * are finished in a reasonable time. Hence do not allow the fast I/O fail
+ * timeout to exceed SCSI_DEVICE_BLOCK_MAX_TIMEOUT. Furthermore, these
+ * parameters must be such that multipath can detect failed paths timely.
+ * Hence do not allow all three parameters to be disabled simultaneously.
+ */
+int srp_tmo_valid(int reconnect_delay, int fast_io_fail_tmo, int dev_loss_tmo)
+{
+        if (reconnect_delay < 0 && fast_io_fail_tmo < 0 && dev_loss_tmo < 0)
+                return -EINVAL;
+        if (reconnect_delay == 0)
+                return -EINVAL;
+        if (fast_io_fail_tmo > SCSI_DEVICE_BLOCK_MAX_TIMEOUT)
+                return -EINVAL;
+        if (dev_loss_tmo >= LONG_MAX / HZ)
+                return -EINVAL;
+        if (fast_io_fail_tmo >= 0 && dev_loss_tmo >= 0 &&
+            fast_io_fail_tmo >= dev_loss_tmo)
+                return -EINVAL;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(srp_tmo_valid);
 
 static int srp_host_setup(struct transport_container *tc, struct device *dev,
                           struct device *cdev)
@@ -134,10 +167,465 @@ static ssize_t store_srp_rport_delete(struct device *dev,
 
 static DEVICE_ATTR(delete, S_IWUSR, NULL, store_srp_rport_delete);
 
+static ssize_t show_srp_rport_state(struct device *dev,
+                                    struct device_attribute *attr,
+                                    char *buf)
+{
+        static const char *const state_name[] = {
+                [SRP_RPORT_RUNNING]     = "running",
+                [SRP_RPORT_BLOCKED]     = "blocked",
+                [SRP_RPORT_FAIL_FAST]   = "fail-fast",
+                [SRP_RPORT_LOST]        = "lost",
+        };
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+        enum srp_rport_state state = rport->state;
+
+        return sprintf(buf, "%s\n",
+                       (unsigned)state < ARRAY_SIZE(state_name) ?
+                       state_name[state] : "???");
+}
+
+static DEVICE_ATTR(state, S_IRUGO, show_srp_rport_state, NULL);
+
+static ssize_t srp_show_tmo(char *buf, int tmo)
+{
+        return tmo >= 0 ? sprintf(buf, "%d\n", tmo) : sprintf(buf, "off\n");
+}
+
+static int srp_parse_tmo(int *tmo, const char *buf)
+{
+        int res = 0;
+
+        if (strncmp(buf, "off", 3) != 0)
+                res = kstrtoint(buf, 0, tmo);
+        else
+                *tmo = -1;
+
+        return res;
+}
+
+static ssize_t show_reconnect_delay(struct device *dev,
+                                    struct device_attribute *attr, char *buf)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+
+        return srp_show_tmo(buf, rport->reconnect_delay);
+}
+
+static ssize_t store_reconnect_delay(struct device *dev,
+                                     struct device_attribute *attr,
+                                     const char *buf, const size_t count)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+        int res, delay;
+
+        res = srp_parse_tmo(&delay, buf);
+        if (res)
+                goto out;
+        res = srp_tmo_valid(delay, rport->fast_io_fail_tmo,
+                            rport->dev_loss_tmo);
+        if (res)
+                goto out;
+
+        if (rport->reconnect_delay <= 0 && delay > 0 &&
+            rport->state != SRP_RPORT_RUNNING) {
+                queue_delayed_work(system_long_wq, &rport->reconnect_work,
+                                   delay * HZ);
+        } else if (delay <= 0) {
+                cancel_delayed_work(&rport->reconnect_work);
+        }
+        rport->reconnect_delay = delay;
+        res = count;
+
+out:
+        return res;
+}
+
+static DEVICE_ATTR(reconnect_delay, S_IRUGO | S_IWUSR, show_reconnect_delay,
+                   store_reconnect_delay);
+
+static ssize_t show_failed_reconnects(struct device *dev,
+                                      struct device_attribute *attr, char *buf)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+
+        return sprintf(buf, "%d\n", rport->failed_reconnects);
+}
+
+static DEVICE_ATTR(failed_reconnects, S_IRUGO, show_failed_reconnects, NULL);
+
+static ssize_t show_srp_rport_fast_io_fail_tmo(struct device *dev,
+                                               struct device_attribute *attr,
+                                               char *buf)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+
+        return srp_show_tmo(buf, rport->fast_io_fail_tmo);
+}
+
+static ssize_t store_srp_rport_fast_io_fail_tmo(struct device *dev,
+                                                struct device_attribute *attr,
+                                                const char *buf, size_t count)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+        int res;
+        int fast_io_fail_tmo;
+
+        res = srp_parse_tmo(&fast_io_fail_tmo, buf);
+        if (res)
+                goto out;
+        res = srp_tmo_valid(rport->reconnect_delay, fast_io_fail_tmo,
+                            rport->dev_loss_tmo);
+        if (res)
+                goto out;
+        rport->fast_io_fail_tmo = fast_io_fail_tmo;
+        res = count;
+
+out:
+        return res;
+}
+
+static DEVICE_ATTR(fast_io_fail_tmo, S_IRUGO | S_IWUSR,
+                   show_srp_rport_fast_io_fail_tmo,
+                   store_srp_rport_fast_io_fail_tmo);
+
+static ssize_t show_srp_rport_dev_loss_tmo(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+
+        return srp_show_tmo(buf, rport->dev_loss_tmo);
+}
+
+static ssize_t store_srp_rport_dev_loss_tmo(struct device *dev,
+                                            struct device_attribute *attr,
+                                            const char *buf, size_t count)
+{
+        struct srp_rport *rport = transport_class_to_srp_rport(dev);
+        int res;
+        int dev_loss_tmo;
+
+        res = srp_parse_tmo(&dev_loss_tmo, buf);
+        if (res)
+                goto out;
+        res = srp_tmo_valid(rport->reconnect_delay, rport->fast_io_fail_tmo,
+                            dev_loss_tmo);
+        if (res)
+                goto out;
+        rport->dev_loss_tmo = dev_loss_tmo;
+        res = count;
+
+out:
+        return res;
+}
+
+static DEVICE_ATTR(dev_loss_tmo, S_IRUGO | S_IWUSR,
+                   show_srp_rport_dev_loss_tmo,
+                   store_srp_rport_dev_loss_tmo);
+
+static int srp_rport_set_state(struct srp_rport *rport,
+                               enum srp_rport_state new_state)
+{
+        enum srp_rport_state old_state = rport->state;
+
+        lockdep_assert_held(&rport->mutex);
+
+        switch (new_state) {
+        case SRP_RPORT_RUNNING:
+                switch (old_state) {
+                case SRP_RPORT_LOST:
+                        goto invalid;
+                default:
+                        break;
+                }
+                break;
+        case SRP_RPORT_BLOCKED:
+                switch (old_state) {
+                case SRP_RPORT_RUNNING:
+                        break;
+                default:
+                        goto invalid;
+                }
+                break;
+        case SRP_RPORT_FAIL_FAST:
+                switch (old_state) {
+                case SRP_RPORT_LOST:
+                        goto invalid;
+                default:
+                        break;
+                }
+                break;
+        case SRP_RPORT_LOST:
+                break;
+        }
+        rport->state = new_state;
+        return 0;
+
+invalid:
+        return -EINVAL;
+}
+
+/**
+ * srp_reconnect_work() - reconnect and schedule a new attempt if necessary
+ */
+static void srp_reconnect_work(struct work_struct *work)
+{
+        struct srp_rport *rport = container_of(to_delayed_work(work),
+                                        struct srp_rport, reconnect_work);
+        struct Scsi_Host *shost = rport_to_shost(rport);
+        int delay, res;
+
+        res = srp_reconnect_rport(rport);
+        if (res != 0) {
+                shost_printk(KERN_ERR, shost,
+                             "reconnect attempt %d failed (%d)\n",
+                             ++rport->failed_reconnects, res);
+                delay = rport->reconnect_delay *
+                        min(100, max(1, rport->failed_reconnects - 10));
+                if (delay > 0)
+                        queue_delayed_work(system_long_wq,
+                                           &rport->reconnect_work, delay * HZ);
+        }
+}
+
+static void __rport_fail_io_fast(struct srp_rport *rport)
+{
+        struct Scsi_Host *shost = rport_to_shost(rport);
+        struct srp_internal *i;
+
+        lockdep_assert_held(&rport->mutex);
+
+        if (srp_rport_set_state(rport, SRP_RPORT_FAIL_FAST))
+                return;
+        scsi_target_unblock(rport->dev.parent, SDEV_TRANSPORT_OFFLINE);
+
+        /* Involve the LLD if possible to terminate all I/O on the rport. */
+        i = to_srp_internal(shost->transportt);
+        if (i->f->terminate_rport_io)
+                i->f->terminate_rport_io(rport);
+}
+
+/**
+ * rport_fast_io_fail_timedout() - fast I/O failure timeout handler
+ */
+static void rport_fast_io_fail_timedout(struct work_struct *work)
+{
+        struct srp_rport *rport = container_of(to_delayed_work(work),
+                                        struct srp_rport, fast_io_fail_work);
+        struct Scsi_Host *shost = rport_to_shost(rport);
+
+        pr_info("fast_io_fail_tmo expired for SRP %s / %s.\n",
+                dev_name(&rport->dev), dev_name(&shost->shost_gendev));
+
+        mutex_lock(&rport->mutex);
+        if (rport->state == SRP_RPORT_BLOCKED)
+                __rport_fail_io_fast(rport);
+        mutex_unlock(&rport->mutex);
+}
+
+/**
+ * rport_dev_loss_timedout() - device loss timeout handler
+ */
+static void rport_dev_loss_timedout(struct work_struct *work)
+{
+        struct srp_rport *rport = container_of(to_delayed_work(work),
+                                        struct srp_rport, dev_loss_work);
+        struct Scsi_Host *shost = rport_to_shost(rport);
+        struct srp_internal *i = to_srp_internal(shost->transportt);
+
+        pr_info("dev_loss_tmo expired for SRP %s / %s.\n",
+                dev_name(&rport->dev), dev_name(&shost->shost_gendev));
+
+        mutex_lock(&rport->mutex);
+        WARN_ON(srp_rport_set_state(rport, SRP_RPORT_LOST) != 0);
+        scsi_target_unblock(rport->dev.parent, SDEV_TRANSPORT_OFFLINE);
+        mutex_unlock(&rport->mutex);
+
+        i->f->rport_delete(rport);
+}
+
+static void __srp_start_tl_fail_timers(struct srp_rport *rport)
+{
+        struct Scsi_Host *shost = rport_to_shost(rport);
+        int delay, fast_io_fail_tmo, dev_loss_tmo;
+
+        lockdep_assert_held(&rport->mutex);
+
+        if (!rport->deleted) {
+                delay = rport->reconnect_delay;
+                fast_io_fail_tmo = rport->fast_io_fail_tmo;
+                dev_loss_tmo = rport->dev_loss_tmo;
+                pr_debug("%s current state: %d\n",
+                         dev_name(&shost->shost_gendev), rport->state);
+
+                if (delay > 0)
+                        queue_delayed_work(system_long_wq,
+                                           &rport->reconnect_work,
+                                           1UL * delay * HZ);
+                if (fast_io_fail_tmo >= 0 &&
+                    srp_rport_set_state(rport, SRP_RPORT_BLOCKED) == 0) {
+                        pr_debug("%s new state: %d\n",
+                                 dev_name(&shost->shost_gendev),
+                                 rport->state);
+                        scsi_target_block(&shost->shost_gendev);
+                        queue_delayed_work(system_long_wq,
+                                           &rport->fast_io_fail_work,
+                                           1UL * fast_io_fail_tmo * HZ);
+                }
+                if (dev_loss_tmo >= 0)
+                        queue_delayed_work(system_long_wq,
+                                           &rport->dev_loss_work,
+                                           1UL * dev_loss_tmo * HZ);
+        } else {
+                pr_debug("%s has already been deleted\n",
+                         dev_name(&shost->shost_gendev));
+                srp_rport_set_state(rport, SRP_RPORT_FAIL_FAST);
+                scsi_target_unblock(&shost->shost_gendev,
+                                    SDEV_TRANSPORT_OFFLINE);
+        }
+}
+
+/**
+ * srp_start_tl_fail_timers() - start the transport layer failure timers
+ *
+ * Start the transport layer fast I/O failure and device loss timers. Do not
+ * modify a timer that was already started.
+ */
+void srp_start_tl_fail_timers(struct srp_rport *rport)
+{
+        mutex_lock(&rport->mutex);
+        __srp_start_tl_fail_timers(rport);
+        mutex_unlock(&rport->mutex);
+}
+EXPORT_SYMBOL(srp_start_tl_fail_timers);
+
+/**
+ * scsi_request_fn_active() - number of kernel threads inside scsi_request_fn()
+ */
+static int scsi_request_fn_active(struct Scsi_Host *shost)
+{
+        struct scsi_device *sdev;
+        struct request_queue *q;
+        int request_fn_active = 0;
+
+        shost_for_each_device(sdev, shost) {
+                q = sdev->request_queue;
+
+                spin_lock_irq(q->queue_lock);
+                request_fn_active += q->request_fn_active;
+                spin_unlock_irq(q->queue_lock);
+        }
+
+        return request_fn_active;
+}
+
+/**
+ * srp_reconnect_rport() - reconnect to an SRP target port
+ *
+ * Blocks SCSI command queueing before invoking reconnect() such that
+ * queuecommand() won't be invoked concurrently with reconnect() from outside
+ * the SCSI EH. This is important since a reconnect() implementation may
+ * reallocate resources needed by queuecommand().
+ *
+ * Notes:
+ * - This function neither waits until outstanding requests have finished nor
+ *   tries to abort these. It is the responsibility of the reconnect()
+ *   function to finish outstanding commands before reconnecting to the target
+ *   port.
+ * - It is the responsibility of the caller to ensure that the resources
+ *   reallocated by the reconnect() function won't be used while this function
+ *   is in progress. One possible strategy is to invoke this function from
+ *   the context of the SCSI EH thread only. Another possible strategy is to
+ *   lock the rport mutex inside each SCSI LLD callback that can be invoked by
+ *   the SCSI EH (the scsi_host_template.eh_*() functions and also the
+ *   scsi_host_template.queuecommand() function).
+ */
+int srp_reconnect_rport(struct srp_rport *rport)
+{
+        struct Scsi_Host *shost = rport_to_shost(rport);
+        struct srp_internal *i = to_srp_internal(shost->transportt);
+        struct scsi_device *sdev;
+        int res;
+
+        pr_debug("SCSI host %s\n", dev_name(&shost->shost_gendev));
+
+        res = mutex_lock_interruptible(&rport->mutex);
+        if (res)
+                goto out;
+        scsi_target_block(&shost->shost_gendev);
+        while (scsi_request_fn_active(shost))
+                msleep(20);
+        res = i->f->reconnect(rport);
+        pr_debug("%s (state %d): transport.reconnect() returned %d\n",
+                 dev_name(&shost->shost_gendev), rport->state, res);
+        if (res == 0) {
+                cancel_delayed_work(&rport->fast_io_fail_work);
+                cancel_delayed_work(&rport->dev_loss_work);
+
+                rport->failed_reconnects = 0;
+                srp_rport_set_state(rport, SRP_RPORT_RUNNING);
+                scsi_target_unblock(&shost->shost_gendev, SDEV_RUNNING);
+                /*
+                 * If the SCSI error handler has offlined one or more devices,
+                 * invoking scsi_target_unblock() won't change the state of
+                 * these devices into running so do that explicitly.
+                 */
+                spin_lock_irq(shost->host_lock);
+                __shost_for_each_device(sdev, shost)
+                        if (sdev->sdev_state == SDEV_OFFLINE)
+                                sdev->sdev_state = SDEV_RUNNING;
+                spin_unlock_irq(shost->host_lock);
+        } else if (rport->state == SRP_RPORT_RUNNING) {
+                /*
+                 * srp_reconnect_rport() was invoked with fast_io_fail
+                 * off. Mark the port as failed and start the TL failure
+                 * timers if these had not yet been started.
+                 */
+                __rport_fail_io_fast(rport);
+                scsi_target_unblock(&shost->shost_gendev,
+                                    SDEV_TRANSPORT_OFFLINE);
+                __srp_start_tl_fail_timers(rport);
+        } else if (rport->state != SRP_RPORT_BLOCKED) {
+                scsi_target_unblock(&shost->shost_gendev,
+                                    SDEV_TRANSPORT_OFFLINE);
+        }
+        mutex_unlock(&rport->mutex);
+
+out:
+        return res;
+}
+EXPORT_SYMBOL(srp_reconnect_rport);
+
+/**
+ * srp_timed_out() - SRP transport intercept of the SCSI timeout EH
+ *
+ * If a timeout occurs while an rport is in the blocked state, ask the SCSI
+ * EH to continue waiting (BLK_EH_RESET_TIMER). Otherwise let the SCSI core
+ * handle the timeout (BLK_EH_NOT_HANDLED).
+ *
+ * Note: This function is called from soft-IRQ context and with the request
+ * queue lock held.
+ */
+static enum blk_eh_timer_return srp_timed_out(struct scsi_cmnd *scmd)
+{
+        struct scsi_device *sdev = scmd->device;
+        struct Scsi_Host *shost = sdev->host;
+        struct srp_internal *i = to_srp_internal(shost->transportt);
+
+        pr_debug("timeout for sdev %s\n", dev_name(&sdev->sdev_gendev));
+        return i->f->reset_timer_if_blocked && scsi_device_blocked(sdev) ?
+                BLK_EH_RESET_TIMER : BLK_EH_NOT_HANDLED;
+}
+
 static void srp_rport_release(struct device *dev)
 {
         struct srp_rport *rport = dev_to_rport(dev);
 
+        cancel_delayed_work_sync(&rport->reconnect_work);
+        cancel_delayed_work_sync(&rport->fast_io_fail_work);
+        cancel_delayed_work_sync(&rport->dev_loss_work);
+
         put_device(dev->parent);
         kfree(rport);
 }
@@ -185,6 +673,24 @@ static int srp_host_match(struct attribute_container *cont, struct device *dev)
 }
 
 /**
+ * srp_rport_get() - increment rport reference count
+ */
+void srp_rport_get(struct srp_rport *rport)
+{
+        get_device(&rport->dev);
+}
+EXPORT_SYMBOL(srp_rport_get);
+
+/**
+ * srp_rport_put() - decrement rport reference count
+ */
+void srp_rport_put(struct srp_rport *rport)
+{
+        put_device(&rport->dev);
+}
+EXPORT_SYMBOL(srp_rport_put);
+
+/**
  * srp_rport_add - add a SRP remote port to the device hierarchy
  * @shost:      scsi host the remote port is connected to.
  * @ids:        The port id for the remote port.
@@ -196,12 +702,15 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
 {
         struct srp_rport *rport;
         struct device *parent = &shost->shost_gendev;
+        struct srp_internal *i = to_srp_internal(shost->transportt);
         int id, ret;
 
         rport = kzalloc(sizeof(*rport), GFP_KERNEL);
         if (!rport)
                 return ERR_PTR(-ENOMEM);
 
+        mutex_init(&rport->mutex);
+
         device_initialize(&rport->dev);
 
         rport->dev.parent = get_device(parent);
@@ -210,6 +719,17 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
         memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
         rport->roles = ids->roles;
 
+        if (i->f->reconnect)
+                rport->reconnect_delay = i->f->reconnect_delay ?
+                        *i->f->reconnect_delay : 10;
+        INIT_DELAYED_WORK(&rport->reconnect_work, srp_reconnect_work);
+        rport->fast_io_fail_tmo = i->f->fast_io_fail_tmo ?
+                *i->f->fast_io_fail_tmo : 15;
+        rport->dev_loss_tmo = i->f->dev_loss_tmo ? *i->f->dev_loss_tmo : 60;
+        INIT_DELAYED_WORK(&rport->fast_io_fail_work,
+                          rport_fast_io_fail_timedout);
+        INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
+
         id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
         dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
 
@@ -259,6 +779,13 @@ void srp_rport_del(struct srp_rport *rport)
         transport_remove_device(dev);
         device_del(dev);
         transport_destroy_device(dev);
+
+        mutex_lock(&rport->mutex);
+        if (rport->state == SRP_RPORT_BLOCKED)
+                __rport_fail_io_fast(rport);
+        rport->deleted = true;
+        mutex_unlock(&rport->mutex);
+
         put_device(dev);
 }
 EXPORT_SYMBOL_GPL(srp_rport_del);
@@ -310,6 +837,8 @@ srp_attach_transport(struct srp_function_template *ft)
         if (!i)
                 return NULL;
 
+        i->t.eh_timed_out = srp_timed_out;
+
         i->t.tsk_mgmt_response = srp_tsk_mgmt_response;
         i->t.it_nexus_response = srp_it_nexus_response;
 
@@ -327,6 +856,15 @@ srp_attach_transport(struct srp_function_template *ft)
         count = 0;
         i->rport_attrs[count++] = &dev_attr_port_id;
         i->rport_attrs[count++] = &dev_attr_roles;
+        if (ft->has_rport_state) {
+                i->rport_attrs[count++] = &dev_attr_state;
+                i->rport_attrs[count++] = &dev_attr_fast_io_fail_tmo;
+                i->rport_attrs[count++] = &dev_attr_dev_loss_tmo;
+        }
+        if (ft->reconnect) {
+                i->rport_attrs[count++] = &dev_attr_reconnect_delay;
+                i->rport_attrs[count++] = &dev_attr_failed_reconnects;
+        }
         if (ft->rport_delete)
                 i->rport_attrs[count++] = &dev_attr_delete;
         i->rport_attrs[count++] = NULL;
diff --git a/drivers/staging/media/lirc/TODO b/drivers/staging/media/lirc/TODO
index b6cb593f55c6..cbea5d84fed3 100644
--- a/drivers/staging/media/lirc/TODO
+++ b/drivers/staging/media/lirc/TODO
@@ -2,6 +2,11 @@
   (see drivers/media/IR/mceusb.c vs. lirc_mceusb.c in lirc cvs for an
   example of a previously completed port).
 
+- lirc_bt829 uses registers on a Mach64 VT, which has a separate kernel
+  framebuffer driver (atyfb) and userland X driver (mach64).  It can't
+  simply be converted to a normal PCI driver, but ideally it should be
+  coordinated with the other drivers.
+
 Please send patches to:
 Jarod Wilson <jarod@wilsonet.com>
 Greg Kroah-Hartman <greg@kroah.com>
diff --git a/drivers/staging/media/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c
index fbbdce4c119f..30edc740ac25 100644
--- a/drivers/staging/media/lirc/lirc_bt829.c
+++ b/drivers/staging/media/lirc/lirc_bt829.c
@@ -63,7 +63,7 @@ static bool debug;
         } while (0)
 
 static int atir_minor;
-static unsigned long pci_addr_phys;
+static phys_addr_t pci_addr_phys;
 static unsigned char *pci_addr_lin;
 
 static struct lirc_driver atir_driver;
@@ -78,11 +78,11 @@ static struct pci_dev *do_pci_probe(void)
                 pci_addr_phys = 0;
                 if (my_dev->resource[0].flags & IORESOURCE_MEM) {
                         pci_addr_phys = my_dev->resource[0].start;
-                        pr_info("memory at 0x%08X\n",
-                               (unsigned int)pci_addr_phys);
+                        pr_info("memory at %pa\n", &pci_addr_phys);
                 }
                 if (pci_addr_phys == 0) {
                         pr_err("no memory resource ?\n");
+                        pci_dev_put(my_dev);
                         return NULL;
                 }
         } else {
@@ -120,13 +120,20 @@ static void atir_set_use_dec(void *data)
 int init_module(void)
 {
         struct pci_dev *pdev;
+        int rc;
 
         pdev = do_pci_probe();
         if (pdev == NULL)
                 return -ENODEV;
 
-        if (!atir_init_start())
-                return -ENODEV;
+        rc = pci_enable_device(pdev);
+        if (rc)
+                goto err_put_dev;
+
+        if (!atir_init_start()) {
+                rc = -ENODEV;
+                goto err_disable;
+        }
 
         strcpy(atir_driver.name, "ATIR");
         atir_driver.minor       = -1;
@@ -142,17 +149,31 @@ int init_module(void)
         atir_minor = lirc_register_driver(&atir_driver);
         if (atir_minor < 0) {
                 pr_err("failed to register driver!\n");
-                return atir_minor;
+                rc = atir_minor;
+                goto err_unmap;
         }
         dprintk("driver is registered on minor %d\n", atir_minor);
 
         return 0;
+
+err_unmap:
+        iounmap(pci_addr_lin);
+err_disable:
+        pci_disable_device(pdev);
+err_put_dev:
+        pci_dev_put(pdev);
+        return rc;
 }
 
 
 void cleanup_module(void)
 {
+        struct pci_dev *pdev = to_pci_dev(atir_driver.dev);
+
         lirc_unregister_driver(atir_minor);
+        iounmap(pci_addr_lin);
+        pci_disable_device(pdev);
+        pci_dev_put(pdev);
 }
 
 
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index f6bc4c91ab35..2e3a98575d47 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -707,7 +707,8 @@ static irqreturn_t irq_handler(int i, void *blah)
                                 pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n",
                                         dcd, sense,
                                         tv.tv_sec, lasttv.tv_sec,
-                                        tv.tv_usec, lasttv.tv_usec);
+                                        (unsigned long)tv.tv_usec,
+                                        (unsigned long)lasttv.tv_usec);
                                 continue;
                         }
 
@@ -719,7 +720,8 @@ static irqreturn_t irq_handler(int i, void *blah)
                                 pr_warn("%d %d %lx %lx %lx %lx\n",
                                         dcd, sense,
                                         tv.tv_sec, lasttv.tv_sec,
-                                        tv.tv_usec, lasttv.tv_usec);
+                                        (unsigned long)tv.tv_usec,
+                                        (unsigned long)lasttv.tv_usec);
                                 data = PULSE_MASK;
                         } else if (deltv > 15) {
                                 data = PULSE_MASK; /* really long time */
@@ -728,7 +730,8 @@ static irqreturn_t irq_handler(int i, void *blah)
                                         pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n",
                                                 dcd, sense,
                                                 tv.tv_sec, lasttv.tv_sec,
-                                                tv.tv_usec, lasttv.tv_usec);
+                                                (unsigned long)tv.tv_usec,
+                                                (unsigned long)lasttv.tv_usec);
                                         /*
                                          * detecting pulse while this
                                          * MUST be a space!
diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 11d5338b4f2f..0feeaadf29dc 100644
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -61,6 +61,9 @@
 #include <media/lirc_dev.h>
 #include <media/lirc.h>
 
+/* Max transfer size done by I2C transfer functions */
+#define MAX_XFER_SIZE  64
+
 struct IR;
 
 struct IR_rx {
@@ -941,7 +944,14 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
                         schedule();
                         set_current_state(TASK_INTERRUPTIBLE);
                 } else {
-                        unsigned char buf[rbuf->chunk_size];
+                        unsigned char buf[MAX_XFER_SIZE];
+
+                        if (rbuf->chunk_size > sizeof(buf)) {
+                                zilog_error("chunk_size is too big (%d)!\n",
+                                            rbuf->chunk_size);
+                                ret = -EINVAL;
+                                break;
+                        }
                         m = lirc_buffer_read(rbuf, buf);
                         if (m == rbuf->chunk_size) {
                                 ret = copy_to_user((void *)outbuf+written, buf,
diff --git a/drivers/staging/media/msi3101/Kconfig b/drivers/staging/media/msi3101/Kconfig
index 76d5bbd4d93c..0c349c8595e4 100644
--- a/drivers/staging/media/msi3101/Kconfig
+++ b/drivers/staging/media/msi3101/Kconfig
@@ -1,4 +1,5 @@
 config USB_MSI3101
         tristate "Mirics MSi3101 SDR Dongle"
         depends on USB && VIDEO_DEV && VIDEO_V4L2
-        select VIDEOBUF2_VMALLOC
+        select VIDEOBUF2_CORE
+        select VIDEOBUF2_VMALLOC
diff --git a/drivers/staging/media/solo6x10/solo6x10-disp.c b/drivers/staging/media/solo6x10/solo6x10-disp.c
index 32d9953bc36e..145295a5db72 100644
--- a/drivers/staging/media/solo6x10/solo6x10-disp.c
+++ b/drivers/staging/media/solo6x10/solo6x10-disp.c
@@ -176,18 +176,27 @@ static void solo_vout_config(struct solo_dev *solo_dev)
 static int solo_dma_vin_region(struct solo_dev *solo_dev, u32 off,
                                u16 val, int reg_size)
 {
-        u16 buf[64];
-        int i;
-        int ret = 0;
+        u16 *buf;
+        const int n = 64, size = n * sizeof(*buf);
+        int i, ret = 0;
+
+        buf = kmalloc(size, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
 
-        for (i = 0; i < sizeof(buf) >> 1; i++)
+        for (i = 0; i < n; i++)
                 buf[i] = cpu_to_le16(val);
 
-        for (i = 0; i < reg_size; i += sizeof(buf))
-                ret |= solo_p2m_dma(solo_dev, 1, buf,
-                                    SOLO_MOTION_EXT_ADDR(solo_dev) + off + i,
-                                    sizeof(buf), 0, 0);
+        for (i = 0; i < reg_size; i += size) {
+                ret = solo_p2m_dma(solo_dev, 1, buf,
+                                   SOLO_MOTION_EXT_ADDR(solo_dev) + off + i,
+                                   size, 0, 0);
+
+                if (ret)
+                        break;
+        }
 
+        kfree(buf);
         return ret;
 }
 
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
index a4c589604b02..d582c5b84c14 100644
--- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c
@@ -95,38 +95,11 @@ static unsigned char vop_6110_pal_cif[] = {
         0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
 };
 
-struct vop_header {
-        /* VE_STATUS0 */
-        u32 mpeg_size:20, sad_motion_flag:1, video_motion_flag:1, vop_type:2,
-                channel:5, source_fl:1, interlace:1, progressive:1;
-
-        /* VE_STATUS1 */
-        u32 vsize:8, hsize:8, last_queue:4, nop0:8, scale:4;
-
-        /* VE_STATUS2 */
-        u32 mpeg_off;
-
-        /* VE_STATUS3 */
-        u32 jpeg_off;
-
-        /* VE_STATUS4 */
-        u32 jpeg_size:20, interval:10, nop1:2;
-
-        /* VE_STATUS5/6 */
-        u32 sec, usec;
-
-        /* VE_STATUS7/8/9 */
-        u32 nop2[3];
-
-        /* VE_STATUS10 */
-        u32 mpeg_size_alt:20, nop3:12;
-
-        u32 end_nops[5];
-} __packed;
+typedef __le32 vop_header[16];
 
 struct solo_enc_buf {
         enum solo_enc_types     type;
-        struct vop_header       *vh;
+        const vop_header        *vh;
         int                     motion;
 };
 
@@ -346,7 +319,7 @@ static int enc_get_mpeg_dma(struct solo_dev *solo_dev, dma_addr_t dma,
 /* Build a descriptor queue out of an SG list and send it to the P2M for
  * processing. */
 static int solo_send_desc(struct solo_enc_dev *solo_enc, int skip,
-                          struct vb2_dma_sg_desc *vbuf, int off, int size,
+                          struct sg_table *vbuf, int off, int size,
                           unsigned int base, unsigned int base_size)
 {
         struct solo_dev *solo_dev = solo_enc->solo_dev;
@@ -359,7 +332,7 @@ static int solo_send_desc(struct solo_enc_dev *solo_enc, int skip,
 
         solo_enc->desc_count = 1;
 
-        for_each_sg(vbuf->sglist, sg, vbuf->num_pages, i) {
+        for_each_sg(vbuf->sgl, sg, vbuf->nents, i) {
                 struct solo_p2m_desc *desc;
                 dma_addr_t dma;
                 int len;
@@ -430,84 +403,145 @@ static int solo_send_desc(struct solo_enc_dev *solo_enc, int skip,
                                  solo_enc->desc_count - 1);
 }
 
+/* Extract values from VOP header - VE_STATUSxx */
+static inline int vop_interlaced(const vop_header *vh)
+{
+        return (__le32_to_cpu((*vh)[0]) >> 30) & 1;
+}
+
+static inline u8 vop_channel(const vop_header *vh)
+{
+        return (__le32_to_cpu((*vh)[0]) >> 24) & 0x1F;
+}
+
+static inline u8 vop_type(const vop_header *vh)
+{
+        return (__le32_to_cpu((*vh)[0]) >> 22) & 3;
+}
+
+static inline u32 vop_mpeg_size(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[0]) & 0xFFFFF;
+}
+
+static inline u8 vop_hsize(const vop_header *vh)
+{
+        return (__le32_to_cpu((*vh)[1]) >> 8) & 0xFF;
+}
+
+static inline u8 vop_vsize(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[1]) & 0xFF;
+}
+
+static inline u32 vop_mpeg_offset(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[2]);
+}
+
+static inline u32 vop_jpeg_offset(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[3]);
+}
+
+static inline u32 vop_jpeg_size(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[4]) & 0xFFFFF;
+}
+
+static inline u32 vop_sec(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[5]);
+}
+
+static inline u32 vop_usec(const vop_header *vh)
+{
+        return __le32_to_cpu((*vh)[6]);
+}
+
 static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
-                struct vb2_buffer *vb, struct vop_header *vh)
+                          struct vb2_buffer *vb, const vop_header *vh)
 {
         struct solo_dev *solo_dev = solo_enc->solo_dev;
-        struct vb2_dma_sg_desc *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
         int frame_size;
         int ret;
 
         vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
 
-        if (vb2_plane_size(vb, 0) < vh->jpeg_size + solo_enc->jpeg_len)
+        if (vb2_plane_size(vb, 0) < vop_jpeg_size(vh) + solo_enc->jpeg_len)
                 return -EIO;
 
-        sg_copy_from_buffer(vbuf->sglist, vbuf->num_pages,
-                        solo_enc->jpeg_header,
-                        solo_enc->jpeg_len);
-
-        frame_size = (vh->jpeg_size + solo_enc->jpeg_len + (DMA_ALIGN - 1))
+        frame_size = (vop_jpeg_size(vh) + solo_enc->jpeg_len + (DMA_ALIGN - 1))
                 & ~(DMA_ALIGN - 1);
-        vb2_set_plane_payload(vb, 0, vh->jpeg_size + solo_enc->jpeg_len);
+        vb2_set_plane_payload(vb, 0, vop_jpeg_size(vh) + solo_enc->jpeg_len);
 
-        dma_map_sg(&solo_dev->pdev->dev, vbuf->sglist, vbuf->num_pages,
+        /* may discard all previous data in vbuf->sgl */
+        dma_map_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
                         DMA_FROM_DEVICE);
-        ret = solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf, vh->jpeg_off,
-                        frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
-                        SOLO_JPEG_EXT_SIZE(solo_dev));
-        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sglist, vbuf->num_pages,
+        ret = solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf,
+                             vop_jpeg_offset(vh) - SOLO_JPEG_EXT_ADDR(solo_dev),
+                             frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
+                             SOLO_JPEG_EXT_SIZE(solo_dev));
+        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
                         DMA_FROM_DEVICE);
+
+        /* add the header only after dma_unmap_sg() */
+        sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                            solo_enc->jpeg_header, solo_enc->jpeg_len);
+
         return ret;
 }
 
 static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
-                struct vb2_buffer *vb, struct vop_header *vh)
+                struct vb2_buffer *vb, const vop_header *vh)
 {
         struct solo_dev *solo_dev = solo_enc->solo_dev;
-        struct vb2_dma_sg_desc *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
         int frame_off, frame_size;
         int skip = 0;
         int ret;
 
-        if (vb2_plane_size(vb, 0) < vh->mpeg_size)
+        if (vb2_plane_size(vb, 0) < vop_mpeg_size(vh))
                 return -EIO;
 
         /* If this is a key frame, add extra header */
-        if (!vh->vop_type) {
-                sg_copy_from_buffer(vbuf->sglist, vbuf->num_pages,
-                                solo_enc->vop,
-                                solo_enc->vop_len);
-
+        vb->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME);
+        if (!vop_type(vh)) {
                 skip = solo_enc->vop_len;
-
                 vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
-                vb2_set_plane_payload(vb, 0, vh->mpeg_size + solo_enc->vop_len);
+                vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh) + solo_enc->vop_len);
         } else {
                 vb->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME;
-                vb2_set_plane_payload(vb, 0, vh->mpeg_size);
+                vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh));
         }
 
         /* Now get the actual mpeg payload */
-        frame_off = (vh->mpeg_off + sizeof(*vh))
+        frame_off = (vop_mpeg_offset(vh) - SOLO_MP4E_EXT_ADDR(solo_dev) + sizeof(*vh))
                 % SOLO_MP4E_EXT_SIZE(solo_dev);
-        frame_size = (vh->mpeg_size + skip + (DMA_ALIGN - 1))
+        frame_size = (vop_mpeg_size(vh) + skip + (DMA_ALIGN - 1))
                 & ~(DMA_ALIGN - 1);
 
-        dma_map_sg(&solo_dev->pdev->dev, vbuf->sglist, vbuf->num_pages,
+        /* may discard all previous data in vbuf->sgl */
+        dma_map_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
                         DMA_FROM_DEVICE);
         ret = solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size,
                         SOLO_MP4E_EXT_ADDR(solo_dev),
                         SOLO_MP4E_EXT_SIZE(solo_dev));
-        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sglist, vbuf->num_pages,
+        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
                         DMA_FROM_DEVICE);
+
+        /* add the header only after dma_unmap_sg() */
+        if (!vop_type(vh))
+                sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                                    solo_enc->vop, solo_enc->vop_len);
         return ret;
 }
 
 static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
                             struct vb2_buffer *vb, struct solo_enc_buf *enc_buf)
 {
-        struct vop_header *vh = enc_buf->vh;
+        const vop_header *vh = enc_buf->vh;
         int ret;
 
         /* Check for motion flags */
@@ -531,8 +565,8 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
 
         if (!ret) {
                 vb->v4l2_buf.sequence = solo_enc->sequence++;
-                vb->v4l2_buf.timestamp.tv_sec = vh->sec;
-                vb->v4l2_buf.timestamp.tv_usec = vh->usec;
+                vb->v4l2_buf.timestamp.tv_sec = vop_sec(vh);
+                vb->v4l2_buf.timestamp.tv_usec = vop_usec(vh);
         }
 
         vb2_buffer_done(vb, ret ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
@@ -605,15 +639,13 @@ static void solo_handle_ring(struct solo_dev *solo_dev)
 
                 /* FAIL... */
                 if (enc_get_mpeg_dma(solo_dev, solo_dev->vh_dma, off,
-                                     sizeof(struct vop_header)))
+                                     sizeof(vop_header)))
                         continue;
 
-                enc_buf.vh = (struct vop_header *)solo_dev->vh_buf;
-                enc_buf.vh->mpeg_off -= SOLO_MP4E_EXT_ADDR(solo_dev);
-                enc_buf.vh->jpeg_off -= SOLO_JPEG_EXT_ADDR(solo_dev);
+                enc_buf.vh = solo_dev->vh_buf;
 
                 /* Sanity check */
-                if (enc_buf.vh->mpeg_off != off)
+                if (vop_mpeg_offset(enc_buf.vh) != SOLO_MP4E_EXT_ADDR(solo_dev) + off)
                         continue;
 
                 if (solo_motion_detected(solo_enc))
@@ -1329,7 +1361,7 @@ int solo_enc_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
 
         init_waitqueue_head(&solo_dev->ring_thread_wait);
 
-        solo_dev->vh_size = sizeof(struct vop_header);
+        solo_dev->vh_size = sizeof(vop_header);
         solo_dev->vh_buf = pci_alloc_consistent(solo_dev->pdev,
                                                 solo_dev->vh_size,
                                                 &solo_dev->vh_dma);
diff --git a/drivers/staging/media/solo6x10/solo6x10.h b/drivers/staging/media/solo6x10/solo6x10.h
index 6f91d2e34b2a..f1bbb8cb74e6 100644
--- a/drivers/staging/media/solo6x10/solo6x10.h
+++ b/drivers/staging/media/solo6x10/solo6x10.h
@@ -94,7 +94,6 @@
 #define SOLO_ENC_MODE_HD1               1
 #define SOLO_ENC_MODE_D1                9
 
-#define SOLO_DEFAULT_GOP                30
 #define SOLO_DEFAULT_QP                 3
 
 #ifndef V4L2_BUF_FLAG_MOTION_ON
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 6df632e0bb55..5be6e919f785 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -392,6 +392,25 @@ config RETU_WATCHDOG
           To compile this driver as a module, choose M here: the
           module will be called retu_wdt.
 
+config MOXART_WDT
+        tristate "MOXART watchdog"
+        depends on ARCH_MOXART
+        help
+          Say Y here to include Watchdog timer support for the watchdog
+          existing on the MOXA ART SoC series platforms.
+
+          To compile this driver as a module, choose M here: the
+          module will be called moxart_wdt.
+
+config SIRFSOC_WATCHDOG
+        tristate "SiRFSOC watchdog"
+        depends on ARCH_SIRF
+        select WATCHDOG_CORE
+        default y
+        help
+          Support for CSR SiRFprimaII and SiRFatlasVI watchdog. When
+          the watchdog triggers the system will be reset.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT
@@ -866,6 +885,7 @@ config VIA_WDT
 config W83627HF_WDT
         tristate "W83627HF/W83627DHG Watchdog Timer"
         depends on X86
+        select WATCHDOG_CORE
         ---help---
           This is the driver for the hardware watchdog on the W83627HF chipset
           as used in Advantech PC-9578 and Tyan S2721-533 motherboards
@@ -1125,6 +1145,13 @@ config LANTIQ_WDT
         help
           Hardware driver for the Lantiq SoC Watchdog Timer.
 
+config RALINK_WDT
+        tristate "Ralink SoC watchdog"
+        select WATCHDOG_CORE
+        depends on RALINK
+        help
+          Hardware driver for the Ralink SoC Watchdog Timer.
+
 # PARISC Architecture
 
 # POWERPC Architecture
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 8c7b8bcbbdc5..91bd95a64baf 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -55,6 +55,8 @@ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
 obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
 obj-$(CONFIG_RETU_WATCHDOG) += retu_wdt.o
 obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o
+obj-$(CONFIG_MOXART_WDT) += moxart_wdt.o
+obj-$(CONFIG_SIRFSOC_WATCHDOG) += sirfsoc_wdt.o
 
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
@@ -134,6 +136,7 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
 obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
 octeon-wdt-y := octeon-wdt-main.o octeon-wdt-nmi.o
 obj-$(CONFIG_LANTIQ_WDT) += lantiq_wdt.o
+obj-$(CONFIG_RALINK_WDT) += rt2880_wdt.o
 
 # PARISC Architecture
 
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 24a517777fa0..5cf1621def9c 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -60,8 +60,7 @@
 #include <linux/types.h>                /* For standard types (like size_t) */
 #include <linux/errno.h>                /* For the -ENODEV/... values */
 #include <linux/kernel.h>               /* For printk/panic/... */
-#include <linux/miscdevice.h>           /* For MODULE_ALIAS_MISCDEV
-                                                        (WATCHDOG_MINOR) */
+#include <linux/miscdevice.h>           /* For struct miscdevice */
 #include <linux/watchdog.h>             /* For the watchdog specific items */
 #include <linux/fs.h>                   /* For file operations */
 #include <linux/ioport.h>               /* For io-port access */
@@ -337,4 +336,3 @@ module_exit(acq_exit);
 MODULE_AUTHOR("David Woodhouse");
 MODULE_DESCRIPTION("Acquire Inc. Single Board Computer Watchdog Timer driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index cc6702fc5268..a8961addc59c 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -345,4 +345,3 @@ module_exit(advwdt_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marek Michalkiewicz <marekm@linux.org.pl>");
 MODULE_DESCRIPTION("Advantech Single Board Computer WDT driver");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/alim1535_wdt.c b/drivers/watchdog/alim1535_wdt.c
index 41b84936a521..fbb7b94cabfd 100644
--- a/drivers/watchdog/alim1535_wdt.c
+++ b/drivers/watchdog/alim1535_wdt.c
@@ -452,4 +452,3 @@ module_exit(watchdog_exit);
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("ALi M1535 PMU Watchdog Timer driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/alim7101_wdt.c b/drivers/watchdog/alim7101_wdt.c
index 5eee55012e33..12f0b762b528 100644
--- a/drivers/watchdog/alim7101_wdt.c
+++ b/drivers/watchdog/alim7101_wdt.c
@@ -425,4 +425,3 @@ MODULE_DEVICE_TABLE(pci, alim7101_pci_tbl);
 MODULE_AUTHOR("Steve Hill");
 MODULE_DESCRIPTION("ALi M7101 PMU Computer Watchdog Timer driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index b3709f9cf5be..3a996576343a 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -46,7 +46,6 @@
 MODULE_AUTHOR("Nicolas Thill <nico@openwrt.org>");
 MODULE_DESCRIPTION(LONGNAME);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 static int margin = 60;
 module_param(margin, int, 0);
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index b178e717ef09..afe7d17e6776 100644
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -434,4 +434,3 @@ module_platform_driver_probe(at32_wdt_driver, at32_wdt_probe);
 MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
 MODULE_DESCRIPTION("Watchdog driver for Atmel AT32AP700X");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 1c75260b987c..dee6cc21d270 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -269,7 +269,7 @@ static struct platform_driver at91wdt_driver = {
         .driver         = {
                 .name   = "at91_wdt",
                 .owner  = THIS_MODULE,
-                .of_match_table = of_match_ptr(at91_wdt_dt_ids),
+                .of_match_table = at91_wdt_dt_ids,
         },
 };
 
@@ -297,5 +297,4 @@ module_exit(at91_wdt_exit);
 MODULE_AUTHOR("Andrew Victor");
 MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:at91_wdt");
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 37cb09b27b63..9fa1f69dac13 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -329,4 +329,3 @@ MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");
 MODULE_AUTHOR("Imre Kaloz <kaloz@openwrt.org");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 61566fc47f84..a6a2cebb2587 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -186,4 +186,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 MODULE_AUTHOR("Lubomir Rintel <lkundrak@v3.sk>");
 MODULE_DESCRIPTION("Driver for Broadcom BCM2835 watchdog timer");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index a14a58d9d110..4eb188b87f8e 100644
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -317,5 +317,4 @@ MODULE_AUTHOR("Miguel Gaio <miguel.gaio@efixo.com>");
 MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
 MODULE_DESCRIPTION("Driver for the Broadcom BCM63xx SoC watchdog");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:bcm63xx-wdt");
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 5d36d6fb4969..a3b6a5b30f9f 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -465,7 +465,6 @@ module_exit(bfin_wdt_exit);
 MODULE_AUTHOR("Michele d'Amico, Mike Frysinger <vapier@gentoo.org>");
 MODULE_DESCRIPTION("Blackfin Watchdog Device Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(timeout, uint, 0);
 MODULE_PARM_DESC(timeout,
diff --git a/drivers/watchdog/cpu5wdt.c b/drivers/watchdog/cpu5wdt.c
index f270bb7bc456..f7ae49edb518 100644
--- a/drivers/watchdog/cpu5wdt.c
+++ b/drivers/watchdog/cpu5wdt.c
@@ -289,7 +289,6 @@ MODULE_AUTHOR("Heiko Ronsdorf <hero@ihg.uni-duisburg.de>");
 MODULE_DESCRIPTION("sma cpu5 watchdog driver");
 MODULE_SUPPORTED_DEVICE("sma cpu5 watchdog");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(port, int, 0);
 MODULE_PARM_DESC(port, "base address of watchdog card, default is 0x91");
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index bead7740c86a..dd625cca1ae5 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -267,5 +267,4 @@ MODULE_PARM_DESC(heartbeat,
                  __MODULE_STRING(DEFAULT_HEARTBEAT));
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:watchdog");
diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index e621098bf663..a46f5c7ee7ff 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -29,6 +29,7 @@
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/of.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
@@ -203,12 +204,12 @@ static long dw_wdt_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
-                return copy_to_user((struct watchdog_info *)arg, &dw_wdt_ident,
+                return copy_to_user((void __user *)arg, &dw_wdt_ident,
                                     sizeof(dw_wdt_ident)) ? -EFAULT : 0;
 
         case WDIOC_GETSTATUS:
         case WDIOC_GETBOOTSTATUS:
-                return put_user(0, (int *)arg);
+                return put_user(0, (int __user *)arg);
 
         case WDIOC_KEEPALIVE:
                 dw_wdt_set_next_heartbeat();
@@ -252,17 +253,17 @@ static int dw_wdt_release(struct inode *inode, struct file *filp)
         return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int dw_wdt_suspend(struct device *dev)
 {
-        clk_disable(dw_wdt.clk);
+        clk_disable_unprepare(dw_wdt.clk);
 
         return 0;
 }
 
 static int dw_wdt_resume(struct device *dev)
 {
-        int err = clk_enable(dw_wdt.clk);
+        int err = clk_prepare_enable(dw_wdt.clk);
 
         if (err)
                 return err;
@@ -271,12 +272,9 @@ static int dw_wdt_resume(struct device *dev)
 
         return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
-static const struct dev_pm_ops dw_wdt_pm_ops = {
-        .suspend        = dw_wdt_suspend,
-        .resume         = dw_wdt_resume,
-};
-#endif /* CONFIG_PM */
+static SIMPLE_DEV_PM_OPS(dw_wdt_pm_ops, dw_wdt_suspend, dw_wdt_resume);
 
 static const struct file_operations wdt_fops = {
         .owner          = THIS_MODULE,
@@ -309,7 +307,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
         if (IS_ERR(dw_wdt.clk))
                 return PTR_ERR(dw_wdt.clk);
 
-        ret = clk_enable(dw_wdt.clk);
+        ret = clk_prepare_enable(dw_wdt.clk);
         if (ret)
                 return ret;
 
@@ -326,7 +324,7 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
         return 0;
 
 out_disable_clk:
-        clk_disable(dw_wdt.clk);
+        clk_disable_unprepare(dw_wdt.clk);
 
         return ret;
 }
@@ -335,20 +333,27 @@ static int dw_wdt_drv_remove(struct platform_device *pdev)
 {
         misc_deregister(&dw_wdt_miscdev);
 
-        clk_disable(dw_wdt.clk);
+        clk_disable_unprepare(dw_wdt.clk);
 
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id dw_wdt_of_match[] = {
+        { .compatible = "snps,dw-wdt", },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, dw_wdt_of_match);
+#endif
+
 static struct platform_driver dw_wdt_driver = {
         .probe          = dw_wdt_drv_probe,
         .remove         = dw_wdt_drv_remove,
         .driver         = {
                 .name   = "dw_wdt",
                 .owner  = THIS_MODULE,
-#ifdef CONFIG_PM
+                .of_match_table = of_match_ptr(dw_wdt_of_match),
                 .pm     = &dw_wdt_pm_ops,
-#endif /* CONFIG_PM */
         },
 };
 
@@ -357,4 +362,3 @@ module_platform_driver(dw_wdt_driver);
 MODULE_AUTHOR("Jamie Iles");
 MODULE_DESCRIPTION("Synopsys DesignWare Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index e0574844c313..833e81311848 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -179,4 +179,3 @@ MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>,"
 MODULE_DESCRIPTION("EP93xx Watchdog");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(WDT_VERSION);
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index cd31b8a2a729..23ee53240c4c 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -477,4 +477,3 @@ module_exit(eurwdt_exit);
 MODULE_AUTHOR("Rodolfo Giometti");
 MODULE_DESCRIPTION("Driver for Eurotech CPU-1220/1410 on board watchdog");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index 3755833430dc..25beb30878d7 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -331,5 +331,4 @@ module_exit(gef_wdt_exit);
 MODULE_AUTHOR("Martyn Welch <martyn.welch@ge.com>");
 MODULE_DESCRIPTION("GE watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:gef_wdt");
diff --git a/drivers/watchdog/geodewdt.c b/drivers/watchdog/geodewdt.c
index fcd599d4e225..4a6ae84b42bc 100644
--- a/drivers/watchdog/geodewdt.c
+++ b/drivers/watchdog/geodewdt.c
@@ -297,4 +297,3 @@ module_exit(geodewdt_exit);
 MODULE_AUTHOR("Advanced Micro Devices, Inc");
 MODULE_DESCRIPTION("Geode GX/LX Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 19f3c3fc65f4..45b979d9dd13 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -881,7 +881,6 @@ MODULE_AUTHOR("Tom Mingarelli");
 MODULE_DESCRIPTION("hp watchdog driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HPWDT_VERSION);
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(soft_margin, int, 0);
 MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index 2b2ea13d03ea..a72fe9361ddf 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -497,4 +497,3 @@ module_pci_driver(esb_driver);
 MODULE_AUTHOR("Ross Biro and David Härdeman");
 MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index 6130321da387..04f8af65acfd 100644
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -56,8 +56,6 @@
 #include <linux/types.h>                /* For standard types (like size_t) */
 #include <linux/errno.h>                /* For the -ENODEV/... values */
 #include <linux/kernel.h>               /* For printk/panic/... */
-#include <linux/miscdevice.h>           /* For MODULE_ALIAS_MISCDEV
-                                                        (WATCHDOG_MINOR) */
 #include <linux/watchdog.h>             /* For the watchdog specific items */
 #include <linux/init.h>                 /* For __init/__exit/... */
 #include <linux/fs.h>                   /* For file operations */
@@ -394,7 +392,7 @@ static int iTCO_wdt_probe(struct platform_device *dev)
 {
         int ret = -ENODEV;
         unsigned long val32;
-        struct lpc_ich_info *ich_info = dev->dev.platform_data;
+        struct lpc_ich_info *ich_info = dev_get_platdata(&dev->dev);
 
         if (!ich_info)
                 goto out;
@@ -582,5 +580,4 @@ MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>");
 MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver");
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index eb6b5cc98ec6..7ae36690c449 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -382,6 +382,5 @@ module_exit(ibwdt_exit);
 MODULE_AUTHOR("Charles Howes <chowes@vsol.net>");
 MODULE_DESCRIPTION("IB700 SBC watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 /* end of ib700wdt.c */
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c
index bc3fb8fe89ab..db0a34460e57 100644
--- a/drivers/watchdog/ibmasr.c
+++ b/drivers/watchdog/ibmasr.c
@@ -419,4 +419,3 @@ MODULE_PARM_DESC(nowayout,
 MODULE_DESCRIPTION("IBM Automatic Server Restart driver");
 MODULE_AUTHOR("Andrey Panin");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/ie6xx_wdt.c b/drivers/watchdog/ie6xx_wdt.c
index e24ef6a6e064..70a240297c6d 100644
--- a/drivers/watchdog/ie6xx_wdt.c
+++ b/drivers/watchdog/ie6xx_wdt.c
@@ -344,5 +344,4 @@ module_exit(ie6xx_wdt_exit);
 MODULE_AUTHOR("Alexander Stein <alexander.stein@systec-electronic.com>");
 MODULE_DESCRIPTION("Intel Atom E6xx Watchdog Device Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 693ac3f4de5a..b4786bccc42c 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -322,6 +322,7 @@ static const struct of_device_id imx2_wdt_dt_ids[] = {
         { .compatible = "fsl,imx21-wdt", },
         { /* sentinel */ }
 };
+MODULE_DEVICE_TABLE(of, imx2_wdt_dt_ids);
 
 static struct platform_driver imx2_wdt_driver = {
         .remove         = __exit_p(imx2_wdt_remove),
@@ -338,5 +339,4 @@ module_platform_driver_probe(imx2_wdt_driver, imx2_wdt_probe);
 MODULE_AUTHOR("Wolfram Sang");
 MODULE_DESCRIPTION("Watchdog driver for IMX2 and later");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 6d90f7a2ce22..1b5c25a47b87 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -214,4 +214,3 @@ module_exit(watchdog_exit);
 MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>");
 MODULE_DESCRIPTION("Hardware Watchdog Device for SGI IP22");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c
index 8ced25613956..e13e65e996aa 100644
--- a/drivers/watchdog/intel_scu_watchdog.c
+++ b/drivers/watchdog/intel_scu_watchdog.c
@@ -564,5 +564,4 @@ module_exit(intel_scu_watchdog_exit);
 MODULE_AUTHOR("Intel Corporation");
 MODULE_DESCRIPTION("Intel SCU Watchdog Device Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_VERSION(WDT_VER);
diff --git a/drivers/watchdog/iop_wdt.c b/drivers/watchdog/iop_wdt.c
index d964faf1a250..b16013ffacc2 100644
--- a/drivers/watchdog/iop_wdt.c
+++ b/drivers/watchdog/iop_wdt.c
@@ -259,4 +259,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
 MODULE_AUTHOR("Curt E Bruns <curt.e.bruns@intel.com>");
 MODULE_DESCRIPTION("iop watchdog timer driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index f4cce6d66a55..41b3979a9d87 100644
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -41,7 +41,6 @@
 MODULE_AUTHOR("Jorge Boncompte - DTI2 <jorge@dti2.net>");
 MODULE_DESCRIPTION("IT8712F Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 static int max_units = 255;
 static int margin = 60;         /* in seconds */
diff --git a/drivers/watchdog/it87_wdt.c b/drivers/watchdog/it87_wdt.c
index d3dcc6988b5f..e2bba68ae71e 100644
--- a/drivers/watchdog/it87_wdt.c
+++ b/drivers/watchdog/it87_wdt.c
@@ -772,4 +772,3 @@ module_exit(it87_wdt_exit);
 MODULE_AUTHOR("Oliver Schuster");
 MODULE_DESCRIPTION("Hardware Watchdog Device Driver for IT87xx EC-LPC I/O");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/ixp4xx_wdt.c b/drivers/watchdog/ixp4xx_wdt.c
index 5580b4fff7fe..f20cc53ff719 100644
--- a/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@ -208,5 +208,3 @@ module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index d1afdf684c18..2de486a7eea1 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -222,5 +222,4 @@ module_platform_driver(jz4740_wdt_driver);
 MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>");
 MODULE_DESCRIPTION("jz4740 Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:jz4740-wdt");
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c
index 5c3d4df63e68..a1a3638c579c 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -67,7 +67,7 @@ enum {
         PRESCALER_12,
 };
 
-const u32 kempld_prescaler[] = {
+static const u32 kempld_prescaler[] = {
         [PRESCALER_21] = (1 << 21) - 1,
         [PRESCALER_17] = (1 << 17) - 1,
         [PRESCALER_12] = (1 << 12) - 1,
@@ -361,7 +361,7 @@ static long kempld_wdt_ioctl(struct watchdog_device *wdd, unsigned int cmd,
                 ret = kempld_wdt_keepalive(wdd);
                 break;
         case WDIOC_GETPRETIMEOUT:
-                ret = put_user(wdt_data->pretimeout, (int *)arg);
+                ret = put_user(wdt_data->pretimeout, (int __user *)arg);
                 break;
         }
 
@@ -578,4 +578,3 @@ module_platform_driver(kempld_wdt_driver);
 MODULE_DESCRIPTION("KEM PLD Watchdog Driver");
 MODULE_AUTHOR("Michael Brunner <michael.brunner@kontron.com>");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index dce9ecffd44a..40ca5594a336 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -323,5 +323,4 @@ module_exit(ks8695_wdt_exit);
 MODULE_AUTHOR("Andrew Victor");
 MODULE_DESCRIPTION("Watchdog driver for KS8695");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:ks8695_wdt");
diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
index 088fd0c9d888..3b3148c764a3 100644
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
@@ -249,4 +249,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
 MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
 MODULE_DESCRIPTION("Lantiq SoC Watchdog");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index 173494a681e6..da6fa2b68074 100644
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -223,4 +223,3 @@ module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/machzwd.c b/drivers/watchdog/machzwd.c
index bf84f788e592..9826b59ef734 100644
--- a/drivers/watchdog/machzwd.c
+++ b/drivers/watchdog/machzwd.c
@@ -92,7 +92,6 @@ static unsigned short zf_readw(unsigned char port)
 MODULE_AUTHOR("Fernando Fuganti <fuganti@conectiva.com.br>");
 MODULE_DESCRIPTION("MachZ ZF-Logic Watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c
index cc9d328086ed..6d4f3998e1f6 100644
--- a/drivers/watchdog/max63xx_wdt.c
+++ b/drivers/watchdog/max63xx_wdt.c
@@ -258,4 +258,3 @@ MODULE_PARM_DESC(nodelay,
                  "(max6373/74 only, default=0)");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/mixcomwd.c b/drivers/watchdog/mixcomwd.c
index 97d62ee50341..be86ea359eee 100644
--- a/drivers/watchdog/mixcomwd.c
+++ b/drivers/watchdog/mixcomwd.c
@@ -315,4 +315,3 @@ MODULE_AUTHOR("Gergely Madarasz <gorgo@itc.hu>");
 MODULE_DESCRIPTION("MixCom Watchdog driver");
 MODULE_VERSION(VERSION);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/moxart_wdt.c b/drivers/watchdog/moxart_wdt.c
new file mode 100644
index 000000000000..4166e4d116a8
--- /dev/null
+++ b/drivers/watchdog/moxart_wdt.c
@@ -0,0 +1,165 @@
+/*
+ * MOXA ART SoCs watchdog driver.
+ *
+ * Copyright (C) 2013 Jonas Jensen
+ *
+ * Jonas Jensen <jonas.jensen@gmail.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 <linux/clk.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/watchdog.h>
+#include <linux/moduleparam.h>
+
+#define REG_COUNT                       0x4
+#define REG_MODE                        0x8
+#define REG_ENABLE                      0xC
+
+struct moxart_wdt_dev {
+        struct watchdog_device dev;
+        void __iomem *base;
+        unsigned int clock_frequency;
+};
+
+static int heartbeat;
+
+static int moxart_wdt_stop(struct watchdog_device *wdt_dev)
+{
+        struct moxart_wdt_dev *moxart_wdt = watchdog_get_drvdata(wdt_dev);
+
+        writel(0, moxart_wdt->base + REG_ENABLE);
+
+        return 0;
+}
+
+static int moxart_wdt_start(struct watchdog_device *wdt_dev)
+{
+        struct moxart_wdt_dev *moxart_wdt = watchdog_get_drvdata(wdt_dev);
+
+        writel(moxart_wdt->clock_frequency * wdt_dev->timeout,
+               moxart_wdt->base + REG_COUNT);
+        writel(0x5ab9, moxart_wdt->base + REG_MODE);
+        writel(0x03, moxart_wdt->base + REG_ENABLE);
+
+        return 0;
+}
+
+static int moxart_wdt_set_timeout(struct watchdog_device *wdt_dev,
+                                  unsigned int timeout)
+{
+        wdt_dev->timeout = timeout;
+
+        return 0;
+}
+
+static const struct watchdog_info moxart_wdt_info = {
+        .identity       = "moxart-wdt",
+        .options        = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING |
+                          WDIOF_MAGICCLOSE,
+};
+
+static const struct watchdog_ops moxart_wdt_ops = {
+        .owner          = THIS_MODULE,
+        .start          = moxart_wdt_start,
+        .stop           = moxart_wdt_stop,
+        .set_timeout    = moxart_wdt_set_timeout,
+};
+
+static int moxart_wdt_probe(struct platform_device *pdev)
+{
+        struct moxart_wdt_dev *moxart_wdt;
+        struct device *dev = &pdev->dev;
+        struct device_node *node = dev->of_node;
+        struct resource *res;
+        struct clk *clk;
+        int err;
+        unsigned int max_timeout;
+        bool nowayout = WATCHDOG_NOWAYOUT;
+
+        moxart_wdt = devm_kzalloc(dev, sizeof(*moxart_wdt), GFP_KERNEL);
+        if (!moxart_wdt)
+                return -ENOMEM;
+
+        platform_set_drvdata(pdev, moxart_wdt);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        moxart_wdt->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(moxart_wdt->base))
+                return PTR_ERR(moxart_wdt->base);
+
+        clk = of_clk_get(node, 0);
+        if (IS_ERR(clk)) {
+                pr_err("%s: of_clk_get failed\n", __func__);
+                return PTR_ERR(clk);
+        }
+
+        moxart_wdt->clock_frequency = clk_get_rate(clk);
+        if (moxart_wdt->clock_frequency == 0) {
+                pr_err("%s: incorrect clock frequency\n", __func__);
+                return -EINVAL;
+        }
+
+        max_timeout = UINT_MAX / moxart_wdt->clock_frequency;
+
+        moxart_wdt->dev.info = &moxart_wdt_info;
+        moxart_wdt->dev.ops = &moxart_wdt_ops;
+        moxart_wdt->dev.timeout = max_timeout;
+        moxart_wdt->dev.min_timeout = 1;
+        moxart_wdt->dev.max_timeout = max_timeout;
+        moxart_wdt->dev.parent = dev;
+
+        watchdog_init_timeout(&moxart_wdt->dev, heartbeat, dev);
+        watchdog_set_nowayout(&moxart_wdt->dev, nowayout);
+
+        watchdog_set_drvdata(&moxart_wdt->dev, moxart_wdt);
+
+        err = watchdog_register_device(&moxart_wdt->dev);
+        if (err)
+                return err;
+
+        dev_dbg(dev, "Watchdog enabled (heartbeat=%d sec, nowayout=%d)\n",
+                moxart_wdt->dev.timeout, nowayout);
+
+        return 0;
+}
+
+static int moxart_wdt_remove(struct platform_device *pdev)
+{
+        struct moxart_wdt_dev *moxart_wdt = platform_get_drvdata(pdev);
+
+        moxart_wdt_stop(&moxart_wdt->dev);
+        watchdog_unregister_device(&moxart_wdt->dev);
+
+        return 0;
+}
+
+static const struct of_device_id moxart_watchdog_match[] = {
+        { .compatible = "moxa,moxart-watchdog" },
+        { },
+};
+
+static struct platform_driver moxart_wdt_driver = {
+        .probe      = moxart_wdt_probe,
+        .remove     = moxart_wdt_remove,
+        .driver     = {
+                .name           = "moxart-watchdog",
+                .owner          = THIS_MODULE,
+                .of_match_table = moxart_watchdog_match,
+        },
+};
+module_platform_driver(moxart_wdt_driver);
+
+module_param(heartbeat, int, 0);
+MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds");
+
+MODULE_DESCRIPTION("MOXART watchdog driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jonas Jensen <jonas.jensen@gmail.com>");
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index d0ebebae607c..d82152077fd9 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -330,4 +330,3 @@ MODULE_AUTHOR("Dave Updegraff, Kumar Gala");
 MODULE_DESCRIPTION("Driver for watchdog timer in MPC8xx/MPC83xx/MPC86xx "
                    "uProcessors");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index b4341110ad4f..edb31ffd7927 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -257,5 +257,4 @@ module_platform_driver(mtx1_wdt_driver);
 MODULE_AUTHOR("Michael Stickel, Florian Fainelli");
 MODULE_DESCRIPTION("Driver for the MTX-1 watchdog");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:mtx1-wdt");
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index e4cf98019265..f9fa58409396 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -255,7 +255,7 @@ static struct miscdevice mv64x60_wdt_miscdev = {
 
 static int mv64x60_wdt_probe(struct platform_device *dev)
 {
-        struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
+        struct mv64x60_wdt_pdata *pdata = dev_get_platdata(&dev->dev);
         struct resource *r;
         int timeout = 10;
 
@@ -323,5 +323,4 @@ module_exit(mv64x60_wdt_exit);
 MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
 MODULE_DESCRIPTION("MV64x60 watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:" MV64x60_WDT_NAME);
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c
index b15b6efd91a1..a0d893b0930e 100644
--- a/drivers/watchdog/nuc900_wdt.c
+++ b/drivers/watchdog/nuc900_wdt.c
@@ -307,5 +307,4 @@ module_platform_driver(nuc900wdt_driver);
 MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
 MODULE_DESCRIPTION("Watchdog driver for NUC900");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:nuc900-wdt");
diff --git a/drivers/watchdog/nv_tco.c b/drivers/watchdog/nv_tco.c
index 59cf19eeea07..231e5b9d5c8e 100644
--- a/drivers/watchdog/nv_tco.c
+++ b/drivers/watchdog/nv_tco.c
@@ -513,4 +513,3 @@ module_exit(nv_tco_cleanup_module);
 MODULE_AUTHOR("Mike Waychison");
 MODULE_DESCRIPTION("TCO timer driver for NV chipsets");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c
index 4dd281f2c33f..fb57103c8ebc 100644
--- a/drivers/watchdog/of_xilinx_wdt.c
+++ b/drivers/watchdog/of_xilinx_wdt.c
@@ -405,4 +405,3 @@ module_platform_driver(xwdt_driver);
 MODULE_AUTHOR("Alejandro Cabrera <aldaya@gmail.com>");
 MODULE_DESCRIPTION("Xilinx Watchdog driver");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index af88ffd1068f..09cf0135e8ac 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -68,14 +68,14 @@ static void omap_wdt_reload(struct omap_wdt_dev *wdev)
         void __iomem    *base = wdev->base;
 
         /* wait for posted write to complete */
-        while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
+        while ((readl_relaxed(base + OMAP_WATCHDOG_WPS)) & 0x08)
                 cpu_relax();
 
         wdev->wdt_trgr_pattern = ~wdev->wdt_trgr_pattern;
-        __raw_writel(wdev->wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
+        writel_relaxed(wdev->wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
 
         /* wait for posted write to complete */
-        while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
+        while ((readl_relaxed(base + OMAP_WATCHDOG_WPS)) & 0x08)
                 cpu_relax();
         /* reloaded WCRR from WLDR */
 }
@@ -85,12 +85,12 @@ static void omap_wdt_enable(struct omap_wdt_dev *wdev)
         void __iomem *base = wdev->base;
 
         /* Sequence to enable the watchdog */
-        __raw_writel(0xBBBB, base + OMAP_WATCHDOG_SPR);
-        while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
+        writel_relaxed(0xBBBB, base + OMAP_WATCHDOG_SPR);
+        while ((readl_relaxed(base + OMAP_WATCHDOG_WPS)) & 0x10)
                 cpu_relax();
 
-        __raw_writel(0x4444, base + OMAP_WATCHDOG_SPR);
-        while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
+        writel_relaxed(0x4444, base + OMAP_WATCHDOG_SPR);
+        while ((readl_relaxed(base + OMAP_WATCHDOG_WPS)) & 0x10)
                 cpu_relax();
 }
 
@@ -99,12 +99,12 @@ static void omap_wdt_disable(struct omap_wdt_dev *wdev)
         void __iomem *base = wdev->base;
 
         /* sequence required to disable watchdog */
-        __raw_writel(0xAAAA, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
-        while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
+        writel_relaxed(0xAAAA, base + OMAP_WATCHDOG_SPR);       /* TIMER_MODE */
+        while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x10)
                 cpu_relax();
 
-        __raw_writel(0x5555, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
-        while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
+        writel_relaxed(0x5555, base + OMAP_WATCHDOG_SPR);       /* TIMER_MODE */
+        while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x10)
                 cpu_relax();
 }
 
@@ -115,11 +115,11 @@ static void omap_wdt_set_timer(struct omap_wdt_dev *wdev,
         void __iomem *base = wdev->base;
 
         /* just count up at 32 KHz */
-        while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
+        while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x04)
                 cpu_relax();
 
-        __raw_writel(pre_margin, base + OMAP_WATCHDOG_LDR);
-        while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
+        writel_relaxed(pre_margin, base + OMAP_WATCHDOG_LDR);
+        while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x04)
                 cpu_relax();
 }
 
@@ -135,11 +135,11 @@ static int omap_wdt_start(struct watchdog_device *wdog)
         pm_runtime_get_sync(wdev->dev);
 
         /* initialize prescaler */
-        while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
+        while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x01)
                 cpu_relax();
 
-        __raw_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
-        while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
+        writel_relaxed((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
+        while (readl_relaxed(base + OMAP_WATCHDOG_WPS) & 0x01)
                 cpu_relax();
 
         omap_wdt_set_timer(wdev, wdog->timeout);
@@ -205,7 +205,7 @@ static const struct watchdog_ops omap_wdt_ops = {
 
 static int omap_wdt_probe(struct platform_device *pdev)
 {
-        struct omap_wd_timer_platform_data *pdata = pdev->dev.platform_data;
+        struct omap_wd_timer_platform_data *pdata = dev_get_platdata(&pdev->dev);
         struct watchdog_device *omap_wdt;
         struct resource *res, *mem;
         struct omap_wdt_dev *wdev;
@@ -275,7 +275,7 @@ static int omap_wdt_probe(struct platform_device *pdev)
         }
 
         pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",
-                __raw_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
+                readl_relaxed(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
                 omap_wdt->timeout);
 
         pm_runtime_put_sync(wdev->dev);
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index 4ea5fcccac02..44edca66d564 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -207,7 +207,7 @@ static struct platform_driver orion_wdt_driver = {
         .driver         = {
                 .owner  = THIS_MODULE,
                 .name   = "orion_wdt",
-                .of_match_table = of_match_ptr(orion_wdt_of_match_table),
+                .of_match_table = orion_wdt_of_match_table,
         },
 };
 
@@ -225,4 +225,3 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
 
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:orion_wdt");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index 5afb89b48650..5211d56b3681 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -580,8 +580,6 @@ MODULE_AUTHOR("Sven Anders <anders@anduras.de>, "
 MODULE_DESCRIPTION("PC87413 WDT driver");
 MODULE_LICENSE("GPL");
 
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
 module_param(io, int, 0);
 MODULE_PARM_DESC(io, MODNAME " I/O port (default: "
                                         __MODULE_STRING(IO_DEFAULT) ").");
diff --git a/drivers/watchdog/pcwd.c b/drivers/watchdog/pcwd.c
index 33e49a7f889f..e936f15dc7c7 100644
--- a/drivers/watchdog/pcwd.c
+++ b/drivers/watchdog/pcwd.c
@@ -61,7 +61,7 @@
 #include <linux/delay.h>        /* For mdelay function */
 #include <linux/timer.h>        /* For timer related operations */
 #include <linux/jiffies.h>      /* For jiffies stuff */
-#include <linux/miscdevice.h>   /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */
+#include <linux/miscdevice.h>   /* For struct miscdevice */
 #include <linux/watchdog.h>     /* For the watchdog specific items */
 #include <linux/reboot.h>       /* For kernel_power_off() */
 #include <linux/init.h>         /* For __init/__exit/... */
@@ -1011,5 +1011,3 @@ MODULE_AUTHOR("Ken Hollis <kenji@bitgate.com>, "
 MODULE_DESCRIPTION("Berkshire ISA-PC Watchdog driver");
 MODULE_VERSION(WATCHDOG_VERSION);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS_MISCDEV(TEMP_MINOR);
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 7890f84edf76..b4864f254b48 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -40,7 +40,7 @@
 #include <linux/errno.h>        /* For the -ENODEV/... values */
 #include <linux/kernel.h>       /* For printk/panic/... */
 #include <linux/delay.h>        /* For mdelay function */
-#include <linux/miscdevice.h>   /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */
+#include <linux/miscdevice.h>   /* For struct miscdevice */
 #include <linux/watchdog.h>     /* For the watchdog specific items */
 #include <linux/notifier.h>     /* For notifier support */
 #include <linux/reboot.h>       /* For reboot_notifier stuff */
@@ -820,5 +820,3 @@ module_pci_driver(pcipcwd_driver);
 MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>");
 MODULE_DESCRIPTION("Berkshire PCI-PC Watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS_MISCDEV(TEMP_MINOR);
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 7b14d1847927..b731b5d129be 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -32,7 +32,7 @@
 #include <linux/errno.h>        /* For the -ENODEV/... values */
 #include <linux/kernel.h>       /* For printk/panic/... */
 #include <linux/delay.h>        /* For mdelay function */
-#include <linux/miscdevice.h>   /* For MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR) */
+#include <linux/miscdevice.h>   /* For struct miscdevice */
 #include <linux/watchdog.h>     /* For the watchdog specific items */
 #include <linux/notifier.h>     /* For notifier support */
 #include <linux/reboot.h>       /* For reboot_notifier stuff */
@@ -72,8 +72,6 @@ do {							\
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE(DRIVER_LICENSE);
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS_MISCDEV(TEMP_MINOR);
 
 /* Module Parameters */
 module_param(debug, int, 0);
@@ -235,13 +233,17 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd,
                 unsigned char cmd, unsigned char *msb, unsigned char *lsb)
 {
         int got_response, count;
-        unsigned char buf[6];
+        unsigned char *buf;
 
         /* We will not send any commands if the USB PCWD device does
          * not exist */
         if ((!usb_pcwd) || (!usb_pcwd->exists))
                 return -1;
 
+        buf = kmalloc(6, GFP_KERNEL);
+        if (buf == NULL)
+                return 0;
+
         /* The USB PC Watchdog uses a 6 byte report format.
          * The board currently uses only 3 of the six bytes of the report. */
         buf[0] = cmd;                   /* Byte 0 = CMD */
@@ -256,8 +258,8 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd,
 
         if (usb_control_msg(usb_pcwd->udev, usb_sndctrlpipe(usb_pcwd->udev, 0),
                         HID_REQ_SET_REPORT, HID_DT_REPORT,
-                        0x0200, usb_pcwd->interface_number, buf, sizeof(buf),
-                        USB_COMMAND_TIMEOUT) != sizeof(buf)) {
+                        0x0200, usb_pcwd->interface_number, buf, 6,
+                        USB_COMMAND_TIMEOUT) != 6) {
                 dbg("usb_pcwd_send_command: error in usb_control_msg for "
                                 "cmd 0x%x 0x%x 0x%x\n", cmd, *msb, *lsb);
         }
@@ -277,6 +279,8 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd,
                 *lsb = usb_pcwd->cmd_data_lsb;
         }
 
+        kfree(buf);
+
         return got_response;
 }
 
diff --git a/drivers/watchdog/pika_wdt.c b/drivers/watchdog/pika_wdt.c
index 329bc60ad7a2..0cdfee266690 100644
--- a/drivers/watchdog/pika_wdt.c
+++ b/drivers/watchdog/pika_wdt.c
@@ -299,5 +299,3 @@ module_exit(pikawdt_exit);
 MODULE_AUTHOR("Sean MacLennan <smaclennan@pikatech.com>");
 MODULE_DESCRIPTION("PIKA FPGA based Watchdog Timer");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index b30bd430f591..1bdcc313e1d9 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -233,5 +233,4 @@ MODULE_PARM_DESC(nowayout,
                  "Set to 1 to keep watchdog running after device release");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:pnx4008-watchdog");
diff --git a/drivers/watchdog/pnx833x_wdt.c b/drivers/watchdog/pnx833x_wdt.c
index 1b62a7dfcc95..882fdcb46ad1 100644
--- a/drivers/watchdog/pnx833x_wdt.c
+++ b/drivers/watchdog/pnx833x_wdt.c
@@ -278,4 +278,3 @@ module_exit(watchdog_exit);
 MODULE_AUTHOR("Daniel Laird/Andre McCurdy");
 MODULE_DESCRIPTION("Hardware Watchdog Device for PNX833x");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index 9cf6bc7a234f..71e78ef4b736 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -25,8 +25,7 @@
 #include <linux/errno.h>                /* For the -ENODEV/... values */
 #include <linux/kernel.h>               /* For printk/panic/... */
 #include <linux/fs.h>                   /* For file operations */
-#include <linux/miscdevice.h>           /* For MODULE_ALIAS_MISCDEV
-                                                        (WATCHDOG_MINOR) */
+#include <linux/miscdevice.h>           /* For struct miscdevice */
 #include <linux/watchdog.h>             /* For the watchdog specific items */
 #include <linux/init.h>                 /* For __init/__exit/... */
 #include <linux/platform_device.h>      /* For platform_driver framework */
@@ -329,4 +328,3 @@ MODULE_AUTHOR("Ondrej Zajicek <santiago@crfreenet.org>,"
                 "Florian Fainelli <florian@openwrt.org>");
 MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index b0f116c2fd53..082d06262959 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -231,7 +231,7 @@ static int rdc321x_wdt_probe(struct platform_device *pdev)
         struct resource *r;
         struct rdc321x_wdt_pdata *pdata;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 return -ENODEV;
@@ -298,4 +298,3 @@ module_platform_driver(rdc321x_wdt_driver);
 MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
 MODULE_DESCRIPTION("RDC321x watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/rt2880_wdt.c b/drivers/watchdog/rt2880_wdt.c
new file mode 100644
index 000000000000..53d37fea183e
--- /dev/null
+++ b/drivers/watchdog/rt2880_wdt.c
@@ -0,0 +1,207 @@
+/*
+ * Ralink RT288x/RT3xxx/MT76xx built-in hardware watchdog timer
+ *
+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ *
+ * This driver was based on: drivers/watchdog/softdog.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/clk.h>
+#include <linux/reset.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/watchdog.h>
+#include <linux/miscdevice.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ralink/ralink_regs.h>
+
+#define SYSC_RSTSTAT                    0x38
+#define WDT_RST_CAUSE                   BIT(1)
+
+#define RALINK_WDT_TIMEOUT              30
+#define RALINK_WDT_PRESCALE             65536
+
+#define TIMER_REG_TMR1LOAD              0x00
+#define TIMER_REG_TMR1CTL               0x08
+
+#define TMRSTAT_TMR1RST                 BIT(5)
+
+#define TMR1CTL_ENABLE                  BIT(7)
+#define TMR1CTL_MODE_SHIFT              4
+#define TMR1CTL_MODE_MASK               0x3
+#define TMR1CTL_MODE_FREE_RUNNING       0x0
+#define TMR1CTL_MODE_PERIODIC           0x1
+#define TMR1CTL_MODE_TIMEOUT            0x2
+#define TMR1CTL_MODE_WDT                0x3
+#define TMR1CTL_PRESCALE_MASK           0xf
+#define TMR1CTL_PRESCALE_65536          0xf
+
+static struct clk *rt288x_wdt_clk;
+static unsigned long rt288x_wdt_freq;
+static void __iomem *rt288x_wdt_base;
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout,
+                "Watchdog cannot be stopped once started (default="
+                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+static inline void rt_wdt_w32(unsigned reg, u32 val)
+{
+        iowrite32(val, rt288x_wdt_base + reg);
+}
+
+static inline u32 rt_wdt_r32(unsigned reg)
+{
+        return ioread32(rt288x_wdt_base + reg);
+}
+
+static int rt288x_wdt_ping(struct watchdog_device *w)
+{
+        rt_wdt_w32(TIMER_REG_TMR1LOAD, w->timeout * rt288x_wdt_freq);
+
+        return 0;
+}
+
+static int rt288x_wdt_start(struct watchdog_device *w)
+{
+        u32 t;
+
+        t = rt_wdt_r32(TIMER_REG_TMR1CTL);
+        t &= ~(TMR1CTL_MODE_MASK << TMR1CTL_MODE_SHIFT |
+                TMR1CTL_PRESCALE_MASK);
+        t |= (TMR1CTL_MODE_WDT << TMR1CTL_MODE_SHIFT |
+                TMR1CTL_PRESCALE_65536);
+        rt_wdt_w32(TIMER_REG_TMR1CTL, t);
+
+        rt288x_wdt_ping(w);
+
+        t = rt_wdt_r32(TIMER_REG_TMR1CTL);
+        t |= TMR1CTL_ENABLE;
+        rt_wdt_w32(TIMER_REG_TMR1CTL, t);
+
+        return 0;
+}
+
+static int rt288x_wdt_stop(struct watchdog_device *w)
+{
+        u32 t;
+
+        rt288x_wdt_ping(w);
+
+        t = rt_wdt_r32(TIMER_REG_TMR1CTL);
+        t &= ~TMR1CTL_ENABLE;
+        rt_wdt_w32(TIMER_REG_TMR1CTL, t);
+
+        return 0;
+}
+
+static int rt288x_wdt_set_timeout(struct watchdog_device *w, unsigned int t)
+{
+        w->timeout = t;
+        rt288x_wdt_ping(w);
+
+        return 0;
+}
+
+static int rt288x_wdt_bootcause(void)
+{
+        if (rt_sysc_r32(SYSC_RSTSTAT) & WDT_RST_CAUSE)
+                return WDIOF_CARDRESET;
+
+        return 0;
+}
+
+static struct watchdog_info rt288x_wdt_info = {
+        .identity = "Ralink Watchdog",
+        .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
+};
+
+static struct watchdog_ops rt288x_wdt_ops = {
+        .owner = THIS_MODULE,
+        .start = rt288x_wdt_start,
+        .stop = rt288x_wdt_stop,
+        .ping = rt288x_wdt_ping,
+        .set_timeout = rt288x_wdt_set_timeout,
+};
+
+static struct watchdog_device rt288x_wdt_dev = {
+        .info = &rt288x_wdt_info,
+        .ops = &rt288x_wdt_ops,
+        .min_timeout = 1,
+};
+
+static int rt288x_wdt_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        int ret;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        rt288x_wdt_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(rt288x_wdt_base))
+                return PTR_ERR(rt288x_wdt_base);
+
+        rt288x_wdt_clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(rt288x_wdt_clk))
+                return PTR_ERR(rt288x_wdt_clk);
+
+        device_reset(&pdev->dev);
+
+        rt288x_wdt_freq = clk_get_rate(rt288x_wdt_clk) / RALINK_WDT_PRESCALE;
+
+        rt288x_wdt_dev.dev = &pdev->dev;
+        rt288x_wdt_dev.bootstatus = rt288x_wdt_bootcause();
+
+        rt288x_wdt_dev.max_timeout = (0xfffful / rt288x_wdt_freq);
+        rt288x_wdt_dev.timeout = rt288x_wdt_dev.max_timeout;
+
+        watchdog_set_nowayout(&rt288x_wdt_dev, nowayout);
+
+        ret = watchdog_register_device(&rt288x_wdt_dev);
+        if (!ret)
+                dev_info(&pdev->dev, "Initialized\n");
+
+        return 0;
+}
+
+static int rt288x_wdt_remove(struct platform_device *pdev)
+{
+        watchdog_unregister_device(&rt288x_wdt_dev);
+
+        return 0;
+}
+
+static void rt288x_wdt_shutdown(struct platform_device *pdev)
+{
+        rt288x_wdt_stop(&rt288x_wdt_dev);
+}
+
+static const struct of_device_id rt288x_wdt_match[] = {
+        { .compatible = "ralink,rt2880-wdt" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
+
+static struct platform_driver rt288x_wdt_driver = {
+        .probe          = rt288x_wdt_probe,
+        .remove         = rt288x_wdt_remove,
+        .shutdown       = rt288x_wdt_shutdown,
+        .driver         = {
+                .name           = KBUILD_MODNAME,
+                .owner          = THIS_MODULE,
+                .of_match_table = rt288x_wdt_match,
+        },
+};
+
+module_platform_driver(rt288x_wdt_driver);
+
+MODULE_DESCRIPTION("MediaTek/Ralink RT288x/RT3xxx hardware watchdog driver");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 23aad7c6bf5d..7d8fd041ee25 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -29,7 +29,6 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/timer.h>
-#include <linux/miscdevice.h> /* for MODULE_ALIAS_MISCDEV */
 #include <linux/watchdog.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -539,5 +538,4 @@ MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>, "
               "Dimitry Andric <dimitry.andric@tomtom.com>");
 MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:s3c2410-wdt");
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index ccd6b29e21bf..e1d39a1e9628 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -193,4 +193,3 @@ module_param(margin, int, 0);
 MODULE_PARM_DESC(margin, "Watchdog margin in seconds (default 60s)");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index ea5d84a1fdad..3abae50773b8 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -341,7 +341,6 @@ MODULE_PARM_DESC(timeout,
       "Watchdog timeout in microseconds (max/default 8388607 or 8.3ish secs)");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 /*
  * example code that can be put in a platform code area to utilize the
diff --git a/drivers/watchdog/sbc60xxwdt.c b/drivers/watchdog/sbc60xxwdt.c
index 63632ec87c7e..2eef58a0cf05 100644
--- a/drivers/watchdog/sbc60xxwdt.c
+++ b/drivers/watchdog/sbc60xxwdt.c
@@ -387,4 +387,3 @@ module_exit(sbc60xxwdt_unload);
 MODULE_AUTHOR("Jakob Oestergaard <jakob@unthought.net>");
 MODULE_DESCRIPTION("60xx Single Board Computer Watchdog Timer driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sbc7240_wdt.c b/drivers/watchdog/sbc7240_wdt.c
index 719edc8fdeb3..5f268add17ce 100644
--- a/drivers/watchdog/sbc7240_wdt.c
+++ b/drivers/watchdog/sbc7240_wdt.c
@@ -309,5 +309,3 @@ MODULE_AUTHOR("Gilles Gigan");
 MODULE_DESCRIPTION("Watchdog device driver for single board"
                    " computers EPIC Nano 7240 from iEi");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index d4781e05f017..da60560ca446 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -404,6 +404,5 @@ MODULE_AUTHOR("Ian E. Morgan <imorgan@webcon.ca>");
 MODULE_DESCRIPTION("SBC8360 watchdog driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("1.01");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 /* end of sbc8360.c */
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index 0c3e9f66ef77..a1c502e0d8ec 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -220,4 +220,3 @@ MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC.  "
         "so only use it if you are *sure* you are running on this specific "
         "SBC system from Winsystems!  It writes to IO ports 0x1ee and 0x1ef!");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sbc_fitpc2_wdt.c b/drivers/watchdog/sbc_fitpc2_wdt.c
index 90d5527ca886..a517d8bae757 100644
--- a/drivers/watchdog/sbc_fitpc2_wdt.c
+++ b/drivers/watchdog/sbc_fitpc2_wdt.c
@@ -263,5 +263,3 @@ module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
diff --git a/drivers/watchdog/sc1200wdt.c b/drivers/watchdog/sc1200wdt.c
index 3fb83b0c28c2..3b9fff9dcf65 100644
--- a/drivers/watchdog/sc1200wdt.c
+++ b/drivers/watchdog/sc1200wdt.c
@@ -476,4 +476,3 @@ MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
 MODULE_DESCRIPTION(
         "Driver for National Semiconductor PC87307/PC97307 watchdog component");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sc520_wdt.c b/drivers/watchdog/sc520_wdt.c
index 707e027e5002..f353e18b1a82 100644
--- a/drivers/watchdog/sc520_wdt.c
+++ b/drivers/watchdog/sc520_wdt.c
@@ -433,4 +433,3 @@ MODULE_AUTHOR("Scott and Bill Jennings");
 MODULE_DESCRIPTION(
         "Driver for watchdog timer in AMD \"Elan\" SC520 uProcessor");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c
index af7b136b1874..b96127ea3de1 100644
--- a/drivers/watchdog/sch311x_wdt.c
+++ b/drivers/watchdog/sch311x_wdt.c
@@ -26,8 +26,7 @@
 #include <linux/types.h>                /* For standard types (like size_t) */
 #include <linux/errno.h>                /* For the -ENODEV/... values */
 #include <linux/kernel.h>               /* For printk/... */
-#include <linux/miscdevice.h>           /* For MODULE_ALIAS_MISCDEV
-                                                        (WATCHDOG_MINOR) */
+#include <linux/miscdevice.h>           /* For struct miscdevice */
 #include <linux/watchdog.h>             /* For the watchdog specific items */
 #include <linux/init.h>                 /* For __init/__exit/... */
 #include <linux/fs.h>                   /* For file operations */
@@ -545,5 +544,3 @@ module_exit(sch311x_wdt_exit);
 MODULE_AUTHOR("Wim Van Sebroeck <wim@iguana.be>");
 MODULE_DESCRIPTION("SMSC SCH311x WatchDog Timer Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
diff --git a/drivers/watchdog/scx200_wdt.c b/drivers/watchdog/scx200_wdt.c
index 8ae7c282d465..836377cf9271 100644
--- a/drivers/watchdog/scx200_wdt.c
+++ b/drivers/watchdog/scx200_wdt.c
@@ -37,7 +37,6 @@
 MODULE_AUTHOR("Christer Weinigel <wingel@nano-system.com>");
 MODULE_DESCRIPTION("NatSemi SCx200 Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 static int margin = 60;         /* in seconds */
 module_param(margin, int, 0);
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 5bca79457768..f9b8e06f3558 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -343,7 +343,6 @@ MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
 MODULE_DESCRIPTION("SuperH watchdog driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRV_NAME);
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(clock_division_ratio, int, 0);
 MODULE_PARM_DESC(clock_division_ratio,
diff --git a/drivers/watchdog/sirfsoc_wdt.c b/drivers/watchdog/sirfsoc_wdt.c
new file mode 100644
index 000000000000..ced3edc95957
--- /dev/null
+++ b/drivers/watchdog/sirfsoc_wdt.c
@@ -0,0 +1,226 @@
+/*
+ * Watchdog driver for CSR SiRFprimaII and SiRFatlasVI
+ *
+ * Copyright (c) 2013 Cambridge Silicon Radio Limited, a CSR plc group company.
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+#include <linux/module.h>
+#include <linux/watchdog.h>
+#include <linux/platform_device.h>
+#include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+
+#define CLOCK_FREQ      1000000
+
+#define SIRFSOC_TIMER_COUNTER_LO        0x0000
+#define SIRFSOC_TIMER_MATCH_0           0x0008
+#define SIRFSOC_TIMER_INT_EN            0x0024
+#define SIRFSOC_TIMER_WATCHDOG_EN       0x0028
+#define SIRFSOC_TIMER_LATCH             0x0030
+#define SIRFSOC_TIMER_LATCHED_LO        0x0034
+
+#define SIRFSOC_TIMER_WDT_INDEX         5
+
+#define SIRFSOC_WDT_MIN_TIMEOUT         30              /* 30 secs */
+#define SIRFSOC_WDT_MAX_TIMEOUT         (10 * 60)       /* 10 mins */
+#define SIRFSOC_WDT_DEFAULT_TIMEOUT     30              /* 30 secs */
+
+static unsigned int timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT;
+static bool nowayout = WATCHDOG_NOWAYOUT;
+
+module_param(timeout, uint, 0);
+module_param(nowayout, bool, 0);
+
+MODULE_PARM_DESC(timeout, "Default watchdog timeout (in seconds)");
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+                        __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+static unsigned int sirfsoc_wdt_gettimeleft(struct watchdog_device *wdd)
+{
+        u32 counter, match;
+        void __iomem *wdt_base;
+        int time_left;
+
+        wdt_base = watchdog_get_drvdata(wdd);
+        counter = readl(wdt_base + SIRFSOC_TIMER_COUNTER_LO);
+        match = readl(wdt_base +
+                SIRFSOC_TIMER_MATCH_0 + (SIRFSOC_TIMER_WDT_INDEX << 2));
+
+        time_left = match - counter;
+
+        return time_left / CLOCK_FREQ;
+}
+
+static int sirfsoc_wdt_updatetimeout(struct watchdog_device *wdd)
+{
+        u32 counter, timeout_ticks;
+        void __iomem *wdt_base;
+
+        timeout_ticks = wdd->timeout * CLOCK_FREQ;
+        wdt_base = watchdog_get_drvdata(wdd);
+
+        /* Enable the latch before reading the LATCH_LO register */
+        writel(1, wdt_base + SIRFSOC_TIMER_LATCH);
+
+        /* Set the TO value */
+        counter = readl(wdt_base + SIRFSOC_TIMER_LATCHED_LO);
+
+        counter += timeout_ticks;
+
+        writel(counter, wdt_base +
+                SIRFSOC_TIMER_MATCH_0 + (SIRFSOC_TIMER_WDT_INDEX << 2));
+
+        return 0;
+}
+
+static int sirfsoc_wdt_enable(struct watchdog_device *wdd)
+{
+        void __iomem *wdt_base = watchdog_get_drvdata(wdd);
+        sirfsoc_wdt_updatetimeout(wdd);
+
+        /*
+         * NOTE: If interrupt is not enabled
+         * then WD-Reset doesn't get generated at all.
+         */
+        writel(readl(wdt_base + SIRFSOC_TIMER_INT_EN)
+                | (1 << SIRFSOC_TIMER_WDT_INDEX),
+                wdt_base + SIRFSOC_TIMER_INT_EN);
+        writel(1, wdt_base + SIRFSOC_TIMER_WATCHDOG_EN);
+
+        return 0;
+}
+
+static int sirfsoc_wdt_disable(struct watchdog_device *wdd)
+{
+        void __iomem *wdt_base = watchdog_get_drvdata(wdd);
+
+        writel(0, wdt_base + SIRFSOC_TIMER_WATCHDOG_EN);
+        writel(readl(wdt_base + SIRFSOC_TIMER_INT_EN)
+                & (~(1 << SIRFSOC_TIMER_WDT_INDEX)),
+                wdt_base + SIRFSOC_TIMER_INT_EN);
+
+        return 0;
+}
+
+static int sirfsoc_wdt_settimeout(struct watchdog_device *wdd, unsigned int to)
+{
+        wdd->timeout = to;
+        sirfsoc_wdt_updatetimeout(wdd);
+
+        return 0;
+}
+
+#define OPTIONS (WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE)
+
+static const struct watchdog_info sirfsoc_wdt_ident = {
+        .options          =     OPTIONS,
+        .firmware_version =     0,
+        .identity         =     "SiRFSOC Watchdog",
+};
+
+static struct watchdog_ops sirfsoc_wdt_ops = {
+        .owner = THIS_MODULE,
+        .start = sirfsoc_wdt_enable,
+        .stop = sirfsoc_wdt_disable,
+        .get_timeleft = sirfsoc_wdt_gettimeleft,
+        .ping = sirfsoc_wdt_updatetimeout,
+        .set_timeout = sirfsoc_wdt_settimeout,
+};
+
+static struct watchdog_device sirfsoc_wdd = {
+        .info = &sirfsoc_wdt_ident,
+        .ops = &sirfsoc_wdt_ops,
+        .timeout = SIRFSOC_WDT_DEFAULT_TIMEOUT,
+        .min_timeout = SIRFSOC_WDT_MIN_TIMEOUT,
+        .max_timeout = SIRFSOC_WDT_MAX_TIMEOUT,
+};
+
+static int sirfsoc_wdt_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+        int ret;
+        void __iomem *base;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(base))
+                return PTR_ERR(base);
+
+        watchdog_set_drvdata(&sirfsoc_wdd, base);
+
+        watchdog_init_timeout(&sirfsoc_wdd, timeout, &pdev->dev);
+        watchdog_set_nowayout(&sirfsoc_wdd, nowayout);
+
+        ret = watchdog_register_device(&sirfsoc_wdd);
+        if (ret)
+                return ret;
+
+        platform_set_drvdata(pdev, &sirfsoc_wdd);
+
+        return 0;
+}
+
+static void sirfsoc_wdt_shutdown(struct platform_device *pdev)
+{
+        struct watchdog_device *wdd = platform_get_drvdata(pdev);
+
+        sirfsoc_wdt_disable(wdd);
+}
+
+static int sirfsoc_wdt_remove(struct platform_device *pdev)
+{
+        sirfsoc_wdt_shutdown(pdev);
+        return 0;
+}
+
+#ifdef  CONFIG_PM_SLEEP
+static int sirfsoc_wdt_suspend(struct device *dev)
+{
+        return 0;
+}
+
+static int sirfsoc_wdt_resume(struct device *dev)
+{
+        struct watchdog_device *wdd = dev_get_drvdata(dev);
+
+        /*
+         * NOTE: Since timer controller registers settings are saved
+         * and restored back by the timer-prima2.c, so we need not
+         * update WD settings except refreshing timeout.
+         */
+        sirfsoc_wdt_updatetimeout(wdd);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(sirfsoc_wdt_pm_ops,
+                sirfsoc_wdt_suspend, sirfsoc_wdt_resume);
+
+static const struct of_device_id sirfsoc_wdt_of_match[] = {
+        { .compatible = "sirf,prima2-tick"},
+        {},
+};
+MODULE_DEVICE_TABLE(of, sirfsoc_wdt_of_match);
+
+static struct platform_driver sirfsoc_wdt_driver = {
+        .driver = {
+                .name = "sirfsoc-wdt",
+                .owner = THIS_MODULE,
+                .pm = &sirfsoc_wdt_pm_ops,
+                .of_match_table = of_match_ptr(sirfsoc_wdt_of_match),
+        },
+        .probe = sirfsoc_wdt_probe,
+        .remove = sirfsoc_wdt_remove,
+        .shutdown = sirfsoc_wdt_shutdown,
+};
+module_platform_driver(sirfsoc_wdt_driver);
+
+MODULE_DESCRIPTION("SiRF SoC watchdog driver");
+MODULE_AUTHOR("Xianglong Du <Xianglong.Du@csr.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:sirfsoc-wdt");
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 6d665f9c1d58..445ea1ad1fa9 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -603,8 +603,6 @@ MODULE_DESCRIPTION("Driver for SMsC 37B787 watchdog component (Version "
                                                                 VERSION ")");
 MODULE_LICENSE("GPL");
 
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-
 #ifdef SMSC_SUPPORT_MINUTES
 module_param(unit, int, 0);
 MODULE_PARM_DESC(unit,
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index b68b1e519d53..ef2638fee4a8 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -207,4 +207,3 @@ module_exit(watchdog_exit);
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("Software Watchdog Device Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
index 0e9d8c479c35..ce63a1bbf395 100644
--- a/drivers/watchdog/sp5100_tco.c
+++ b/drivers/watchdog/sp5100_tco.c
@@ -580,4 +580,3 @@ module_exit(sp5100_tco_cleanup_module);
 MODULE_AUTHOR("Priyanka Gupta");
 MODULE_DESCRIPTION("TCO timer driver for SP5100/SB800 chipset");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 58df98aec122..3f786ce0a6f2 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -268,7 +268,6 @@ static int sp805_wdt_remove(struct amba_device *adev)
         struct sp805_wdt *wdt = amba_get_drvdata(adev);
 
         watchdog_unregister_device(&wdt->wdd);
-        amba_set_drvdata(adev, NULL);
         watchdog_set_drvdata(&wdt->wdd, NULL);
 
         return 0;
diff --git a/drivers/watchdog/stmp3xxx_rtc_wdt.c b/drivers/watchdog/stmp3xxx_rtc_wdt.c
index c97e98dcde62..d667f6b51d35 100644
--- a/drivers/watchdog/stmp3xxx_rtc_wdt.c
+++ b/drivers/watchdog/stmp3xxx_rtc_wdt.c
@@ -30,7 +30,7 @@ MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat period in seconds from 1 to "
 static int wdt_start(struct watchdog_device *wdd)
 {
         struct device *dev = watchdog_get_drvdata(wdd);
-        struct stmp3xxx_wdt_pdata *pdata = dev->platform_data;
+        struct stmp3xxx_wdt_pdata *pdata = dev_get_platdata(dev);
 
         pdata->wdt_set_timeout(dev->parent, wdd->timeout * WDOG_TICK_RATE);
         return 0;
@@ -39,7 +39,7 @@ static int wdt_start(struct watchdog_device *wdd)
 static int wdt_stop(struct watchdog_device *wdd)
 {
         struct device *dev = watchdog_get_drvdata(wdd);
-        struct stmp3xxx_wdt_pdata *pdata = dev->platform_data;
+        struct stmp3xxx_wdt_pdata *pdata = dev_get_platdata(dev);
 
         pdata->wdt_set_timeout(dev->parent, 0);
         return 0;
@@ -108,4 +108,3 @@ module_platform_driver(stmp3xxx_wdt_driver);
 MODULE_DESCRIPTION("STMP3XXX RTC Watchdog Driver");
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Wolfram Sang <w.sang@pengutronix.de>");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
index f6caa77151c7..76332d893e12 100644
--- a/drivers/watchdog/sunxi_wdt.c
+++ b/drivers/watchdog/sunxi_wdt.c
@@ -217,7 +217,7 @@ static struct platform_driver sunxi_wdt_driver = {
         .driver         = {
                 .owner          = THIS_MODULE,
                 .name           = DRV_NAME,
-                .of_match_table = of_match_ptr(sunxi_wdt_dt_ids)
+                .of_match_table = sunxi_wdt_dt_ids,
         },
 };
 
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index c9b0c627fe7e..09d4831aa61f 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -192,7 +192,7 @@ static int ts72xx_wdt_open(struct inode *inode, struct file *file)
                 dev_err(&wdt->pdev->dev,
                         "failed to convert timeout (%d) to register value\n",
                         timeout);
-                return -EINVAL;
+                return regval;
         }
 
         if (mutex_lock_interruptible(&wdt->lock))
@@ -305,7 +305,8 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd,
 
         switch (cmd) {
         case WDIOC_GETSUPPORT:
-                error = copy_to_user(argp, &winfo, sizeof(winfo));
+                if (copy_to_user(argp, &winfo, sizeof(winfo)))
+                        error = -EFAULT;
                 break;
 
         case WDIOC_GETSTATUS:
@@ -320,10 +321,9 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd,
         case WDIOC_SETOPTIONS: {
                 int options;
 
-                if (get_user(options, p)) {
-                        error = -EFAULT;
+                error = get_user(options, p);
+                if (error)
                         break;
-                }
 
                 error = -EINVAL;
 
@@ -341,30 +341,26 @@ static long ts72xx_wdt_ioctl(struct file *file, unsigned int cmd,
 
         case WDIOC_SETTIMEOUT: {
                 int new_timeout;
+                int regval;
 
-                if (get_user(new_timeout, p)) {
-                        error = -EFAULT;
-                } else {
-                        int regval;
-
-                        regval = timeout_to_regval(new_timeout);
-                        if (regval < 0) {
-                                error = -EINVAL;
-                        } else {
-                                ts72xx_wdt_stop(wdt);
-                                wdt->regval = regval;
-                                ts72xx_wdt_start(wdt);
-                        }
-                }
+                error = get_user(new_timeout, p);
                 if (error)
                         break;
 
+                regval = timeout_to_regval(new_timeout);
+                if (regval < 0) {
+                        error = regval;
+                        break;
+                }
+                ts72xx_wdt_stop(wdt);
+                wdt->regval = regval;
+                ts72xx_wdt_start(wdt);
+
                 /*FALLTHROUGH*/
         }
 
         case WDIOC_GETTIMEOUT:
-                if (put_user(regval_to_timeout(wdt->regval), p))
-                        error = -EFAULT;
+                error = put_user(regval_to_timeout(wdt->regval), p);
                 break;
 
         default:
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 88f23c5cfddb..0fd0e8ae62a8 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -176,5 +176,4 @@ module_platform_driver_probe(txx9wdt_driver, txx9wdt_probe);
 
 MODULE_DESCRIPTION("TXx9 Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:txx9wdt");
diff --git a/drivers/watchdog/ux500_wdt.c b/drivers/watchdog/ux500_wdt.c
index a614d84121c3..e029b5768f2c 100644
--- a/drivers/watchdog/ux500_wdt.c
+++ b/drivers/watchdog/ux500_wdt.c
@@ -88,7 +88,7 @@ static struct watchdog_device ux500_wdt = {
 static int ux500_wdt_probe(struct platform_device *pdev)
 {
         int ret;
-        struct ux500_wdt_data *pdata = pdev->dev.platform_data;
+        struct ux500_wdt_data *pdata = dev_get_platdata(&pdev->dev);
 
         if (pdata) {
                 if (pdata->timeout > 0)
@@ -167,5 +167,4 @@ module_platform_driver(ux500_wdt_driver);
 MODULE_AUTHOR("Jonas Aaberg <jonas.aberg@stericsson.com>");
 MODULE_DESCRIPTION("Ux500 Watchdog Driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 MODULE_ALIAS("platform:ux500_wdt");
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 92f1326f0cfc..e24b21082874 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -1,6 +1,9 @@
 /*
  *      w83627hf/thf WDT driver
  *
+ *      (c) Copyright 2013 Guenter Roeck
+ *              converted to watchdog infrastructure
+ *
  *      (c) Copyright 2007 Vlad Drukker <vlad@storewiz.com>
  *              added support for W83627THF.
  *
@@ -31,31 +34,22 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/types.h>
-#include <linux/miscdevice.h>
 #include <linux/watchdog.h>
-#include <linux/fs.h>
 #include <linux/ioport.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
-#include <linux/spinlock.h>
 #include <linux/io.h>
-#include <linux/uaccess.h>
-
 
 #define WATCHDOG_NAME "w83627hf/thf/hg/dhg WDT"
 #define WATCHDOG_TIMEOUT 60             /* 60 sec default timeout */
 
-static unsigned long wdt_is_open;
-static char expect_close;
-static DEFINE_SPINLOCK(io_lock);
-
 /* You must set this - there is no sane way to probe for this board. */
 static int wdt_io = 0x2E;
 module_param(wdt_io, int, 0);
 MODULE_PARM_DESC(wdt_io, "w83627hf/thf WDT io port (default 0x2E)");
 
-static int timeout = WATCHDOG_TIMEOUT;  /* in seconds */
+static int timeout;                     /* in seconds */
 module_param(timeout, int, 0);
 MODULE_PARM_DESC(timeout,
                 "Watchdog timeout in seconds. 1 <= timeout <= 255, default="
@@ -76,236 +70,147 @@ MODULE_PARM_DESC(nowayout,
                                                         (same as EFER) */
 #define WDT_EFDR (WDT_EFIR+1) /* Extended Function Data Register */
 
-static void w83627hf_select_wd_register(void)
+#define W83627HF_LD_WDT         0x08
+
+static void superio_outb(int reg, int val)
 {
-        unsigned char c;
+        outb(reg, WDT_EFER);
+        outb(val, WDT_EFDR);
+}
+
+static inline int superio_inb(int reg)
+{
+        outb(reg, WDT_EFER);
+        return inb(WDT_EFDR);
+}
+
+static int superio_enter(void)
+{
+        if (!request_muxed_region(wdt_io, 2, WATCHDOG_NAME))
+                return -EBUSY;
+
         outb_p(0x87, WDT_EFER); /* Enter extended function mode */
         outb_p(0x87, WDT_EFER); /* Again according to manual */
 
-        outb(0x20, WDT_EFER);   /* check chip version   */
-        c = inb(WDT_EFDR);
-        if (c == 0x82) {        /* W83627THF            */
-                outb_p(0x2b, WDT_EFER); /* select GPIO3 */
-                c = ((inb_p(WDT_EFDR) & 0xf7) | 0x04); /* select WDT0 */
-                outb_p(0x2b, WDT_EFER);
-                outb_p(c, WDT_EFDR);    /* set GPIO3 to WDT0 */
-        } else if (c == 0x88 || c == 0xa0) {    /* W83627EHF / W83627DHG */
-                outb_p(0x2d, WDT_EFER); /* select GPIO5 */
-                c = inb_p(WDT_EFDR) & ~0x01; /* PIN77 -> WDT0# */
-                outb_p(0x2d, WDT_EFER);
-                outb_p(c, WDT_EFDR); /* set GPIO5 to WDT0 */
-        }
+        return 0;
+}
 
-        outb_p(0x07, WDT_EFER); /* point to logical device number reg */
-        outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */
-        outb_p(0x30, WDT_EFER); /* select CR30 */
-        outb_p(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
+static void superio_select(int ld)
+{
+        superio_outb(0x07, ld);
 }
 
-static void w83627hf_unselect_wd_register(void)
+static void superio_exit(void)
 {
         outb_p(0xAA, WDT_EFER); /* Leave extended function mode */
+        release_region(wdt_io, 2);
 }
 
 /* tyan motherboards seem to set F5 to 0x4C ?
  * So explicitly init to appropriate value. */
 
-static void w83627hf_init(void)
+static int w83627hf_init(struct watchdog_device *wdog)
 {
+        int ret;
         unsigned char t;
 
-        w83627hf_select_wd_register();
+        ret = superio_enter();
+        if (ret)
+                return ret;
+
+        superio_select(W83627HF_LD_WDT);
+        t = superio_inb(0x20);  /* check chip version   */
+        if (t == 0x82) {        /* W83627THF            */
+                t = (superio_inb(0x2b) & 0xf7);
+                superio_outb(0x2b, t | 0x04); /* set GPIO3 to WDT0 */
+        } else if (t == 0x88 || t == 0xa0) {    /* W83627EHF / W83627DHG */
+                t = superio_inb(0x2d);
+                superio_outb(0x2d, t & ~0x01);  /* set GPIO5 to WDT0 */
+        }
+
+        /* set CR30 bit 0 to activate GPIO2 */
+        t = superio_inb(0x30);
+        if (!(t & 0x01))
+                superio_outb(0x30, t | 0x01);
 
-        outb_p(0xF6, WDT_EFER); /* Select CRF6 */
-        t = inb_p(WDT_EFDR);      /* read CRF6 */
+        t = superio_inb(0xF6);
         if (t != 0) {
                 pr_info("Watchdog already running. Resetting timeout to %d sec\n",
-                        timeout);
-                outb_p(timeout, WDT_EFDR);    /* Write back to CRF6 */
+                        wdog->timeout);
+                superio_outb(0xF6, wdog->timeout);
         }
 
-        outb_p(0xF5, WDT_EFER); /* Select CRF5 */
-        t = inb_p(WDT_EFDR);      /* read CRF5 */
-        t &= ~0x0C;               /* set second mode & disable keyboard
-                                    turning off watchdog */
-        t |= 0x02;                /* enable the WDTO# output low pulse
-                                    to the KBRST# pin (PIN60) */
-        outb_p(t, WDT_EFDR);    /* Write back to CRF5 */
-
-        outb_p(0xF7, WDT_EFER); /* Select CRF7 */
-        t = inb_p(WDT_EFDR);      /* read CRF7 */
-        t &= ~0xC0;               /* disable keyboard & mouse turning off
-                                    watchdog */
-        outb_p(t, WDT_EFDR);    /* Write back to CRF7 */
-
-        w83627hf_unselect_wd_register();
-}
-
-static void wdt_set_time(int timeout)
-{
-        spin_lock(&io_lock);
-
-        w83627hf_select_wd_register();
+        /* set second mode & disable keyboard turning off watchdog */
+        t = superio_inb(0xF5) & ~0x0C;
+        /* enable the WDTO# output low pulse to the KBRST# pin */
+        t |= 0x02;
+        superio_outb(0xF5, t);
 
-        outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
-        outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF6 */
+        /* disable keyboard & mouse turning off watchdog */
+        t = superio_inb(0xF7) & ~0xC0;
+        superio_outb(0xF7, t);
 
-        w83627hf_unselect_wd_register();
+        superio_exit();
 
-        spin_unlock(&io_lock);
-}
-
-static int wdt_ping(void)
-{
-        wdt_set_time(timeout);
         return 0;
 }
 
-static int wdt_disable(void)
+static int wdt_set_time(unsigned int timeout)
 {
-        wdt_set_time(0);
-        return 0;
-}
+        int ret;
+
+        ret = superio_enter();
+        if (ret)
+                return ret;
+
+        superio_select(W83627HF_LD_WDT);
+        superio_outb(0xF6, timeout);
+        superio_exit();
 
-static int wdt_set_heartbeat(int t)
-{
-        if (t < 1 || t > 255)
-                return -EINVAL;
-        timeout = t;
         return 0;
 }
 
-static int wdt_get_time(void)
+static int wdt_start(struct watchdog_device *wdog)
 {
-        int timeleft;
-
-        spin_lock(&io_lock);
-
-        w83627hf_select_wd_register();
-
-        outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
-        timeleft = inb_p(WDT_EFDR); /* Read Timeout counter to CRF6 */
-
-        w83627hf_unselect_wd_register();
-
-        spin_unlock(&io_lock);
-
-        return timeleft;
+        return wdt_set_time(wdog->timeout);
 }
 
-static ssize_t wdt_write(struct file *file, const char __user *buf,
-                                                size_t count, loff_t *ppos)
+static int wdt_stop(struct watchdog_device *wdog)
 {
-        if (count) {
-                if (!nowayout) {
-                        size_t i;
-
-                        expect_close = 0;
-
-                        for (i = 0; i != count; i++) {
-                                char c;
-                                if (get_user(c, buf + i))
-                                        return -EFAULT;
-                                if (c == 'V')
-                                        expect_close = 42;
-                        }
-                }
-                wdt_ping();
-        }
-        return count;
+        return wdt_set_time(0);
 }
 
-static long wdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int wdt_set_timeout(struct watchdog_device *wdog, unsigned int timeout)
 {
-        void __user *argp = (void __user *)arg;
-        int __user *p = argp;
-        int timeval;
-        static const struct watchdog_info ident = {
-                .options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT |
-                                                        WDIOF_MAGICCLOSE,
-                .firmware_version = 1,
-                .identity = "W83627HF WDT",
-        };
-
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                if (copy_to_user(argp, &ident, sizeof(ident)))
-                        return -EFAULT;
-                break;
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                return put_user(0, p);
-        case WDIOC_SETOPTIONS:
-        {
-                int options, retval = -EINVAL;
-
-                if (get_user(options, p))
-                        return -EFAULT;
-                if (options & WDIOS_DISABLECARD) {
-                        wdt_disable();
-                        retval = 0;
-                }
-                if (options & WDIOS_ENABLECARD) {
-                        wdt_ping();
-                        retval = 0;
-                }
-                return retval;
-        }
-        case WDIOC_KEEPALIVE:
-                wdt_ping();
-                break;
-        case WDIOC_SETTIMEOUT:
-                if (get_user(timeval, p))
-                        return -EFAULT;
-                if (wdt_set_heartbeat(timeval))
-                        return -EINVAL;
-                wdt_ping();
-                /* Fall */
-        case WDIOC_GETTIMEOUT:
-                return put_user(timeout, p);
-        case WDIOC_GETTIMELEFT:
-                timeval = wdt_get_time();
-                return put_user(timeval, p);
-        default:
-                return -ENOTTY;
-        }
+        wdog->timeout = timeout;
+
         return 0;
 }
 
-static int wdt_open(struct inode *inode, struct file *file)
+static unsigned int wdt_get_time(struct watchdog_device *wdog)
 {
-        if (test_and_set_bit(0, &wdt_is_open))
-                return -EBUSY;
-        /*
-         *      Activate
-         */
+        unsigned int timeleft;
+        int ret;
 
-        wdt_ping();
-        return nonseekable_open(inode, file);
-}
+        ret = superio_enter();
+        if (ret)
+                return 0;
 
-static int wdt_close(struct inode *inode, struct file *file)
-{
-        if (expect_close == 42)
-                wdt_disable();
-        else {
-                pr_crit("Unexpected close, not stopping watchdog!\n");
-                wdt_ping();
-        }
-        expect_close = 0;
-        clear_bit(0, &wdt_is_open);
-        return 0;
+        superio_select(W83627HF_LD_WDT);
+        timeleft = superio_inb(0xF6);
+        superio_exit();
+
+        return timeleft;
 }
 
 /*
  *      Notifier for system down
  */
-
 static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
         void *unused)
 {
         if (code == SYS_DOWN || code == SYS_HALT)
-                wdt_disable();  /* Turn the WDT off */
+                wdt_set_time(0);        /* Turn the WDT off */
 
         return NOTIFY_DONE;
 }
@@ -314,19 +219,25 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
  *      Kernel Interfaces
  */
 
-static const struct file_operations wdt_fops = {
-        .owner          = THIS_MODULE,
-        .llseek         = no_llseek,
-        .write          = wdt_write,
-        .unlocked_ioctl = wdt_ioctl,
-        .open           = wdt_open,
-        .release        = wdt_close,
+static struct watchdog_info wdt_info = {
+        .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
+        .identity = "W83627HF Watchdog",
 };
 
-static struct miscdevice wdt_miscdev = {
-        .minor = WATCHDOG_MINOR,
-        .name = "watchdog",
-        .fops = &wdt_fops,
+static struct watchdog_ops wdt_ops = {
+        .owner = THIS_MODULE,
+        .start = wdt_start,
+        .stop = wdt_stop,
+        .set_timeout = wdt_set_timeout,
+        .get_timeleft = wdt_get_time,
+};
+
+static struct watchdog_device wdt_dev = {
+        .info = &wdt_info,
+        .ops = &wdt_ops,
+        .timeout = WATCHDOG_TIMEOUT,
+        .min_timeout = 1,
+        .max_timeout = 255,
 };
 
 /*
@@ -344,50 +255,39 @@ static int __init wdt_init(void)
 
         pr_info("WDT driver for the Winbond(TM) W83627HF/THF/HG/DHG Super I/O chip initialising\n");
 
-        if (wdt_set_heartbeat(timeout)) {
-                wdt_set_heartbeat(WATCHDOG_TIMEOUT);
-                pr_info("timeout value must be 1 <= timeout <= 255, using %d\n",
-                        WATCHDOG_TIMEOUT);
-        }
+        watchdog_init_timeout(&wdt_dev, timeout, NULL);
+        watchdog_set_nowayout(&wdt_dev, nowayout);
 
-        if (!request_region(wdt_io, 1, WATCHDOG_NAME)) {
-                pr_err("I/O address 0x%04x already in use\n", wdt_io);
-                ret = -EIO;
-                goto out;
+        ret = w83627hf_init(&wdt_dev);
+        if (ret) {
+                pr_err("failed to initialize watchdog (err=%d)\n", ret);
+                return ret;
         }
 
-        w83627hf_init();
-
         ret = register_reboot_notifier(&wdt_notifier);
         if (ret != 0) {
                 pr_err("cannot register reboot notifier (err=%d)\n", ret);
-                goto unreg_regions;
+                return ret;
         }
 
-        ret = misc_register(&wdt_miscdev);
-        if (ret != 0) {
-                pr_err("cannot register miscdev on minor=%d (err=%d)\n",
-                       WATCHDOG_MINOR, ret);
+        ret = watchdog_register_device(&wdt_dev);
+        if (ret)
                 goto unreg_reboot;
-        }
 
         pr_info("initialized. timeout=%d sec (nowayout=%d)\n",
-                timeout, nowayout);
+                wdt_dev.timeout, nowayout);
 
-out:
         return ret;
+
 unreg_reboot:
         unregister_reboot_notifier(&wdt_notifier);
-unreg_regions:
-        release_region(wdt_io, 1);
-        goto out;
+        return ret;
 }
 
 static void __exit wdt_exit(void)
 {
-        misc_deregister(&wdt_miscdev);
+        watchdog_unregister_device(&wdt_dev);
         unregister_reboot_notifier(&wdt_notifier);
-        release_region(wdt_io, 1);
 }
 
 module_init(wdt_init);
@@ -396,4 +296,3 @@ module_exit(wdt_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Pádraig  Brady <P@draigBrady.com>");
 MODULE_DESCRIPTION("w83627hf/thf WDT driver");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index cd9f3c1e1af4..aaf2995d37f4 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -458,4 +458,3 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Marcus Junker <junker@anduras.de>, "
                 "Samuel Tardieu <sam@rfc1149.net>");
 MODULE_DESCRIPTION("w83697hf/hg WDT driver");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c
index 274be0bfaf24..ff58cb74671f 100644
--- a/drivers/watchdog/w83697ug_wdt.c
+++ b/drivers/watchdog/w83697ug_wdt.c
@@ -395,4 +395,3 @@ module_exit(wdt_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Flemming Frandsen <ff@nrvissing.net>");
 MODULE_DESCRIPTION("w83697ug/uf WDT driver");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/w83877f_wdt.c b/drivers/watchdog/w83877f_wdt.c
index 7874ae06232b..f0483c75ed32 100644
--- a/drivers/watchdog/w83877f_wdt.c
+++ b/drivers/watchdog/w83877f_wdt.c
@@ -406,4 +406,3 @@ module_exit(w83877f_wdt_unload);
 MODULE_AUTHOR("Scott and Bill Jennings");
 MODULE_DESCRIPTION("Driver for watchdog timer in w83877f chip");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/w83977f_wdt.c b/drivers/watchdog/w83977f_wdt.c
index 5d2c902825c2..91bf55a20024 100644
--- a/drivers/watchdog/w83977f_wdt.c
+++ b/drivers/watchdog/w83977f_wdt.c
@@ -527,4 +527,3 @@ module_exit(w83977f_wdt_exit);
 MODULE_AUTHOR("Jose Goncalves <jose.goncalves@inov.pt>");
 MODULE_DESCRIPTION("Driver for watchdog timer in W83977F I/O chip");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 25aba6e00a23..db0da7ea4fd8 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -322,6 +322,5 @@ module_exit(wafwdt_exit);
 MODULE_AUTHOR("Justin Cormack");
 MODULE_DESCRIPTION("ICP Wafer 5823 Single Board Computer WDT driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 /* end of wafer5823wdt.c */
diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index 05d18b4c661b..461336c4519f 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -77,7 +77,7 @@ int watchdog_init_timeout(struct watchdog_device *wdd,
 
         watchdog_check_min_max_timeout(wdd);
 
-        /* try to get the tiemout module parameter first */
+        /* try to get the timeout module parameter first */
         if (!watchdog_timeout_invalid(wdd, timeout_parm)) {
                 wdd->timeout = timeout_parm;
                 return ret;
diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c
index 3045debd5411..0240c60d14e3 100644
--- a/drivers/watchdog/wdrtas.c
+++ b/drivers/watchdog/wdrtas.c
@@ -48,8 +48,6 @@
 MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com>");
 MODULE_DESCRIPTION("RTAS watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS_MISCDEV(TEMP_MINOR);
 
 static bool wdrtas_nowayout = WATCHDOG_NOWAYOUT;
 static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0);
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index ee4333c01109..e0206b5b7d89 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -664,6 +664,4 @@ module_exit(wdt_exit);
 
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("Driver for ISA ICS watchdog cards (WDT500/501)");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS_MISCDEV(TEMP_MINOR);
 MODULE_LICENSE("GPL");
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 5eec74053882..7355ddd0b207 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -224,7 +224,6 @@ static void __exit footbridge_watchdog_exit(void)
 MODULE_AUTHOR("Phil Blundell <pb@nexus.co.uk>");
 MODULE_DESCRIPTION("Footbridge watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(soft_margin, int, 0);
 MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
diff --git a/drivers/watchdog/wdt977.c b/drivers/watchdog/wdt977.c
index 65a402344933..a8e6f87f60c9 100644
--- a/drivers/watchdog/wdt977.c
+++ b/drivers/watchdog/wdt977.c
@@ -507,4 +507,3 @@ module_exit(wd977_exit);
 MODULE_AUTHOR("Woody Suwalski <woodys@xandros.com>");
 MODULE_DESCRIPTION("W83977AF Watchdog driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index 36a54c0e32dd..ee89ba4dea63 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -744,5 +744,3 @@ module_pci_driver(wdtpci_driver);
 MODULE_AUTHOR("JP Nollmann, Alan Cox");
 MODULE_DESCRIPTION("Driver for the ICS PCI-WDT500/501 watchdog cards");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS_MISCDEV(TEMP_MINOR);
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index d4e47eda4182..e243bd01c774 100644
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -184,7 +184,7 @@ static const struct watchdog_ops wm831x_wdt_ops = {
 static int wm831x_wdt_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
-        struct wm831x_pdata *chip_pdata;
+        struct wm831x_pdata *chip_pdata = dev_get_platdata(pdev->dev.parent);
         struct wm831x_watchdog_pdata *pdata;
         struct wm831x_wdt_drvdata *driver_data;
         struct watchdog_device *wm831x_wdt;
@@ -231,12 +231,10 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
                 wm831x_wdt->timeout = wm831x_wdt_cfgs[i].time;
 
         /* Apply any configuration */
-        if (pdev->dev.parent->platform_data) {
-                chip_pdata = pdev->dev.parent->platform_data;
+        if (chip_pdata)
                 pdata = chip_pdata->watchdog;
-        } else {
+        else
                 pdata = NULL;
-        }
 
         if (pdata) {
                 reg &= ~(WM831X_WDOG_SECACT_MASK | WM831X_WDOG_PRIMACT_MASK |
diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c
index 92ad33d0cb71..7a42dffd39e5 100644
--- a/drivers/watchdog/xen_wdt.c
+++ b/drivers/watchdog/xen_wdt.c
@@ -362,4 +362,3 @@ MODULE_AUTHOR("Jan Beulich <jbeulich@novell.com>");
 MODULE_DESCRIPTION("Xen WatchDog Timer Driver");
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 1cd2388ca5bd..1d641bb108d2 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -136,6 +136,7 @@ static int traverse(struct seq_file *m, loff_t offset)
 Eoverflow:
         m->op->stop(m, p);
         kfree(m->buf);
+        m->count = 0;
         m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
         return !m->buf ? -ENOMEM : -EAGAIN;
 }
@@ -232,10 +233,10 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
                         goto Fill;
                 m->op->stop(m, p);
                 kfree(m->buf);
+                m->count = 0;
                 m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
                 if (!m->buf)
                         goto Enomem;
-                m->count = 0;
                 m->version = 0;
                 pos = m->index;
                 p = m->op->start(m, &pos);
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 2ab11dc38077..eff50e062be8 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -205,7 +205,6 @@ struct i2c_driver {
  * @name: Indicates the type of the device, usually a chip name that's
  *      generic enough to hide second-sourcing and compatible revisions.
  * @adapter: manages the bus segment hosting this I2C device
- * @driver: device's driver, hence pointer to access routines
  * @dev: Driver model device node for the slave.
  * @irq: indicates the IRQ generated by this device (if any)
  * @detected: member of an i2c_driver.clients list or i2c-core's
@@ -222,7 +221,6 @@ struct i2c_client {
                                         /* _LOWER_ 7 bits               */
         char name[I2C_NAME_SIZE];
         struct i2c_adapter *adapter;    /* the adapter we sit on        */
-        struct i2c_driver *driver;      /* and our access routines      */
         struct device dev;              /* the device structure         */
         int irq;                        /* irq issued by device         */
         struct list_head detected;
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 56bb0dc8b7d4..7dc10036eff5 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -70,6 +70,9 @@ typedef	void (*irq_preflow_handler_t)(struct irq_data *data);
  * IRQ_MOVE_PCNTXT              - Interrupt can be migrated from process context
  * IRQ_NESTED_TRHEAD            - Interrupt nests into another thread
  * IRQ_PER_CPU_DEVID            - Dev_id is a per-cpu variable
+ * IRQ_IS_POLLED                - Always polled by another interrupt. Exclude
+ *                                it from the spurious interrupt detection
+ *                                mechanism and from core side polling.
  */
 enum {
         IRQ_TYPE_NONE           = 0x00000000,
@@ -94,12 +97,14 @@ enum {
         IRQ_NESTED_THREAD       = (1 << 15),
         IRQ_NOTHREAD            = (1 << 16),
         IRQ_PER_CPU_DEVID       = (1 << 17),
+        IRQ_IS_POLLED           = (1 << 18),
 };
 
 #define IRQF_MODIFY_MASK        \
         (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
          IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
-         IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID)
+         IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
+         IRQ_IS_POLLED)
 
 #define IRQ_NO_BALANCING_MASK   (IRQ_PER_CPU | IRQ_NO_BALANCING)
 
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 5eb4e31af22b..da78875807fc 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -230,6 +230,15 @@ enum {
         MLX5_MAX_PAGE_SHIFT             = 31
 };
 
+enum {
+        MLX5_ADAPTER_PAGE_SHIFT         = 12
+};
+
+enum {
+        MLX5_CAP_OFF_DCT                = 41,
+        MLX5_CAP_OFF_CMDIF_CSUM         = 46,
+};
+
 struct mlx5_inbox_hdr {
         __be16          opcode;
         u8              rsvd[4];
@@ -319,9 +328,9 @@ struct mlx5_hca_cap {
         u8      rsvd25[42];
         __be16  log_uar_page_sz;
         u8      rsvd26[28];
-        u8      log_msx_atomic_size_qp;
+        u8      log_max_atomic_size_qp;
         u8      rsvd27[2];
-        u8      log_msx_atomic_size_dc;
+        u8      log_max_atomic_size_dc;
         u8      rsvd28[76];
 };
 
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 6b8c496572c8..554548cd3dd4 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -483,6 +483,7 @@ struct mlx5_priv {
         struct rb_root          page_root;
         int                     fw_pages;
         int                     reg_pages;
+        struct list_head        free_list;
 
         struct mlx5_core_health health;
 
@@ -557,9 +558,11 @@ typedef void (*mlx5_cmd_cbk_t)(int status, void *context);
 struct mlx5_cmd_work_ent {
         struct mlx5_cmd_msg    *in;
         struct mlx5_cmd_msg    *out;
+        void                   *uout;
+        int                     uout_size;
         mlx5_cmd_cbk_t          callback;
         void                   *context;
-        int idx;
+        int                     idx;
         struct completion       done;
         struct mlx5_cmd        *cmd;
         struct work_struct      work;
@@ -570,6 +573,7 @@ struct mlx5_cmd_work_ent {
         u8                      token;
         struct timespec         ts1;
         struct timespec         ts2;
+        u16                     op;
 };
 
 struct mlx5_pas {
@@ -653,6 +657,9 @@ void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);
 int mlx5_cmd_status_to_err(struct mlx5_outbox_hdr *hdr);
 int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
                   int out_size);
+int mlx5_cmd_exec_cb(struct mlx5_core_dev *dev, void *in, int in_size,
+                     void *out, int out_size, mlx5_cmd_cbk_t callback,
+                     void *context);
 int mlx5_cmd_alloc_uar(struct mlx5_core_dev *dev, u32 *uarn);
 int mlx5_cmd_free_uar(struct mlx5_core_dev *dev, u32 uarn);
 int mlx5_alloc_uuars(struct mlx5_core_dev *dev, struct mlx5_uuar_info *uuari);
@@ -676,7 +683,9 @@ int mlx5_core_query_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
 int mlx5_core_arm_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
                       u16 lwm, int is_srq);
 int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
-                          struct mlx5_create_mkey_mbox_in *in, int inlen);
+                          struct mlx5_create_mkey_mbox_in *in, int inlen,
+                          mlx5_cmd_cbk_t callback, void *context,
+                          struct mlx5_create_mkey_mbox_out *out);
 int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr);
 int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
                          struct mlx5_query_mkey_mbox_out *out, int outlen);
@@ -745,6 +754,11 @@ static inline u32 mlx5_idx_to_mkey(u32 mkey_idx)
         return mkey_idx << 8;
 }
 
+static inline u8 mlx5_mkey_variant(u32 mkey)
+{
+        return mkey & 0xff;
+}
+
 enum {
         MLX5_PROF_MASK_QP_SIZE          = (u64)1 << 0,
         MLX5_PROF_MASK_MR_CACHE         = (u64)1 << 1,
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 842de3e21e70..176fdf824b14 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -240,6 +240,7 @@ struct mmc_part {
 struct mmc_card {
         struct mmc_host         *host;          /* the host this device belongs to */
         struct device           dev;            /* the device */
+        u32                     ocr;            /* the current OCR setting */
         unsigned int            rca;            /* relative card address of device */
         unsigned int            type;           /* card type */
 #define MMC_TYPE_MMC            0               /* MMC card */
@@ -257,6 +258,7 @@ struct mmc_card {
 #define MMC_CARD_REMOVED        (1<<7)          /* card has been removed */
 #define MMC_STATE_HIGHSPEED_200 (1<<8)          /* card is in HS200 mode */
 #define MMC_STATE_DOING_BKOPS   (1<<10)         /* card is doing BKOPS */
+#define MMC_STATE_SUSPENDED     (1<<11)         /* card is suspended */
         unsigned int            quirks;         /* card quirks */
 #define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)    /* use func->cur_blksize */
@@ -420,10 +422,10 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_card_blockaddr(c)   ((c)->state & MMC_STATE_BLOCKADDR)
 #define mmc_card_ddr_mode(c)    ((c)->state & MMC_STATE_HIGHSPEED_DDR)
 #define mmc_card_uhs(c)         ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
-#define mmc_sd_card_uhs(c)      ((c)->state & MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_ext_capacity(c) ((c)->state & MMC_CARD_SDXC)
 #define mmc_card_removed(c)     ((c) && ((c)->state & MMC_CARD_REMOVED))
 #define mmc_card_doing_bkops(c) ((c)->state & MMC_STATE_DOING_BKOPS)
+#define mmc_card_suspended(c)   ((c)->state & MMC_STATE_SUSPENDED)
 
 #define mmc_card_set_present(c) ((c)->state |= MMC_STATE_PRESENT)
 #define mmc_card_set_readonly(c) ((c)->state |= MMC_STATE_READONLY)
@@ -432,11 +434,12 @@ static inline void __maybe_unused remove_quirk(struct mmc_card *card, int data)
 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
 #define mmc_card_set_ddr_mode(c) ((c)->state |= MMC_STATE_HIGHSPEED_DDR)
 #define mmc_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
-#define mmc_sd_card_set_uhs(c) ((c)->state |= MMC_STATE_ULTRAHIGHSPEED)
 #define mmc_card_set_ext_capacity(c) ((c)->state |= MMC_CARD_SDXC)
 #define mmc_card_set_removed(c) ((c)->state |= MMC_CARD_REMOVED)
 #define mmc_card_set_doing_bkops(c)     ((c)->state |= MMC_STATE_DOING_BKOPS)
 #define mmc_card_clr_doing_bkops(c)     ((c)->state &= ~MMC_STATE_DOING_BKOPS)
+#define mmc_card_set_suspended(c) ((c)->state |= MMC_STATE_SUSPENDED)
+#define mmc_card_clr_suspended(c) ((c)->state &= ~MMC_STATE_SUSPENDED)
 
 /*
  * Quirk add/remove for MMC products.
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index da51bec578c3..87079fc38011 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -151,7 +151,8 @@ extern int mmc_app_cmd(struct mmc_host *, struct mmc_card *);
 extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
         struct mmc_command *, int);
 extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);
-extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool);
+extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool,
+                        bool);
 extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);
 extern int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);
 
@@ -188,7 +189,6 @@ extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
 
 extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);
-extern int mmc_try_claim_host(struct mmc_host *host);
 
 extern void mmc_get_card(struct mmc_card *card);
 extern void mmc_put_card(struct mmc_card *card);
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h
index 198f0fa44e9f..6ce7d2cd3c7a 100644
--- a/include/linux/mmc/dw_mmc.h
+++ b/include/linux/mmc/dw_mmc.h
@@ -15,6 +15,7 @@
 #define LINUX_MMC_DW_MMC_H
 
 #include <linux/scatterlist.h>
+#include <linux/mmc/core.h>
 
 #define MAX_MCI_SLOTS   2
 
@@ -129,6 +130,9 @@ struct dw_mci {
         struct mmc_request      *mrq;
         struct mmc_command      *cmd;
         struct mmc_data         *data;
+        struct mmc_command      stop_abort;
+        unsigned int            prev_blksz;
+        unsigned char           timing;
         struct workqueue_struct *card_workqueue;
 
         /* DMA interface members*/
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 3b0c33ae13e1..99f5709ac343 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -254,6 +254,7 @@ struct mmc_host {
 #define MMC_CAP_UHS_SDR50       (1 << 17)       /* Host supports UHS SDR50 mode */
 #define MMC_CAP_UHS_SDR104      (1 << 18)       /* Host supports UHS SDR104 mode */
 #define MMC_CAP_UHS_DDR50       (1 << 19)       /* Host supports UHS DDR50 mode */
+#define MMC_CAP_RUNTIME_RESUME  (1 << 20)       /* Resume at runtime_resume. */
 #define MMC_CAP_DRIVER_TYPE_A   (1 << 23)       /* Host supports Driver Type A */
 #define MMC_CAP_DRIVER_TYPE_C   (1 << 24)       /* Host supports Driver Type C */
 #define MMC_CAP_DRIVER_TYPE_D   (1 << 25)       /* Host supports Driver Type D */
@@ -309,7 +310,6 @@ struct mmc_host {
         spinlock_t              lock;           /* lock for claim and bus ops */
 
         struct mmc_ios          ios;            /* current io bus settings */
-        u32                     ocr;            /* the current OCR setting */
 
         /* group bitfields together to minimize padding */
         unsigned int            use_spi_crc:1;
@@ -382,9 +382,6 @@ static inline void *mmc_priv(struct mmc_host *host)
 #define mmc_classdev(x) (&(x)->class_dev)
 #define mmc_hostname(x) (dev_name(&(x)->class_dev))
 
-int mmc_suspend_host(struct mmc_host *);
-int mmc_resume_host(struct mmc_host *);
-
 int mmc_power_save_host(struct mmc_host *host);
 int mmc_power_restore_host(struct mmc_host *host);
 
diff --git a/include/linux/i2c/at24.h b/include/linux/platform_data/at24.h
index 285025a9cdc9..c42aa89d34ee 100644
--- a/include/linux/i2c/at24.h
+++ b/include/linux/platform_data/at24.h
@@ -28,7 +28,7 @@
  *
  * void get_mac_addr(struct memory_accessor *mem_acc, void *context)
  * {
- *      u8 *mac_addr = ethernet_pdata->mac_addr;
+ *      u8 *mac_addr = ethernet_pdata->mac_addr;
  *      off_t offset = context;
  *
  *      // Read MAC addr from EEPROM
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
index d44912d81578..75f70f6ac137 100644
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ b/include/linux/platform_data/mmc-esdhc-imx.h
@@ -10,6 +10,8 @@
 #ifndef __ASM_ARCH_IMX_ESDHC_H
 #define __ASM_ARCH_IMX_ESDHC_H
 
+#include <linux/types.h>
+
 enum wp_types {
         ESDHC_WP_NONE,          /* no WP, neither controller nor gpio */
         ESDHC_WP_CONTROLLER,    /* mmc controller internal WP */
@@ -32,6 +34,7 @@ enum cd_types {
  * @cd_gpio:    gpio for card_detect interrupt
  * @wp_type:    type of write_protect method (see wp_types enum above)
  * @cd_type:    type of card_detect method (see cd_types enum above)
+ * @support_vsel:  indicate it supports 1.8v switching
  */
 
 struct esdhc_platform_data {
@@ -41,5 +44,7 @@ struct esdhc_platform_data {
         enum cd_types cd_type;
         int max_bus_width;
         unsigned int f_max;
+        bool support_vsel;
+        unsigned int delay_line;
 };
 #endif /* __ASM_ARCH_IMX_ESDHC_H */
diff --git a/include/linux/power/bq24735-charger.h b/include/linux/power/bq24735-charger.h
new file mode 100644
index 000000000000..f536164a6069
--- /dev/null
+++ b/include/linux/power/bq24735-charger.h
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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 __CHARGER_BQ24735_H_
+#define __CHARGER_BQ24735_H_
+
+#include <linux/types.h>
+#include <linux/power_supply.h>
+
+struct bq24735_platform {
+        uint32_t charge_current;
+        uint32_t charge_voltage;
+        uint32_t input_current;
+
+        const char *name;
+
+        int status_gpio;
+        int status_gpio_active_low;
+        bool status_gpio_valid;
+
+        char **supplied_to;
+        size_t num_supplicants;
+};
+
+#endif /* __CHARGER_BQ24735_H_ */
diff --git a/include/linux/preempt_mask.h b/include/linux/preempt_mask.h
index 931bc616219f..d169820203dd 100644
--- a/include/linux/preempt_mask.h
+++ b/include/linux/preempt_mask.h
@@ -11,36 +11,23 @@
  * - bits 0-7 are the preemption count (max preemption depth: 256)
  * - bits 8-15 are the softirq count (max # of softirqs: 256)
  *
- * The hardirq count can in theory reach the same as NR_IRQS.
- * In reality, the number of nested IRQS is limited to the stack
- * size as well. For archs with over 1000 IRQS it is not practical
- * to expect that they will all nest. We give a max of 10 bits for
- * hardirq nesting. An arch may choose to give less than 10 bits.
- * m68k expects it to be 8.
+ * The hardirq count could in theory be the same as the number of
+ * interrupts in the system, but we run all interrupt handlers with
+ * interrupts disabled, so we cannot have nesting interrupts. Though
+ * there are a few palaeontologic drivers which reenable interrupts in
+ * the handler, so we need more than one bit here.
  *
- * - bits 16-25 are the hardirq count (max # of nested hardirqs: 1024)
- * - bit 26 is the NMI_MASK
- * - bit 27 is the PREEMPT_ACTIVE flag
- *
- * PREEMPT_MASK: 0x000000ff
- * SOFTIRQ_MASK: 0x0000ff00
- * HARDIRQ_MASK: 0x03ff0000
- *     NMI_MASK: 0x04000000
+ * PREEMPT_MASK:        0x000000ff
+ * SOFTIRQ_MASK:        0x0000ff00
+ * HARDIRQ_MASK:        0x000f0000
+ *     NMI_MASK:        0x00100000
+ * PREEMPT_ACTIVE:      0x00200000
  */
 #define PREEMPT_BITS    8
 #define SOFTIRQ_BITS    8
+#define HARDIRQ_BITS    4
 #define NMI_BITS        1
 
-#define MAX_HARDIRQ_BITS 10
-
-#ifndef HARDIRQ_BITS
-# define HARDIRQ_BITS   MAX_HARDIRQ_BITS
-#endif
-
-#if HARDIRQ_BITS > MAX_HARDIRQ_BITS
-#error HARDIRQ_BITS too high!
-#endif
-
 #define PREEMPT_SHIFT   0
 #define SOFTIRQ_SHIFT   (PREEMPT_SHIFT + PREEMPT_BITS)
 #define HARDIRQ_SHIFT   (SOFTIRQ_SHIFT + SOFTIRQ_BITS)
@@ -60,15 +47,9 @@
 
 #define SOFTIRQ_DISABLE_OFFSET  (2 * SOFTIRQ_OFFSET)
 
-#ifndef PREEMPT_ACTIVE
 #define PREEMPT_ACTIVE_BITS     1
 #define PREEMPT_ACTIVE_SHIFT    (NMI_SHIFT + NMI_BITS)
 #define PREEMPT_ACTIVE  (__IRQ_MASK(PREEMPT_ACTIVE_BITS) << PREEMPT_ACTIVE_SHIFT)
-#endif
-
-#if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))
-#error PREEMPT_ACTIVE is too low!
-#endif
 
 #define hardirq_count() (preempt_count() & HARDIRQ_MASK)
 #define softirq_count() (preempt_count() & SOFTIRQ_MASK)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 6f7ffa460089..7e35d4b9e14a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -22,7 +22,7 @@ struct sched_param {
 #include <linux/errno.h>
 #include <linux/nodemask.h>
 #include <linux/mm_types.h>
-#include <linux/preempt.h>
+#include <linux/preempt_mask.h>
 
 #include <asm/page.h>
 #include <asm/ptrace.h>
diff --git a/include/media/lm3560.h b/include/media/lm3560.h
new file mode 100644
index 000000000000..46670706d6f8
--- /dev/null
+++ b/include/media/lm3560.h
@@ -0,0 +1,97 @@
+/*
+ * include/media/lm3560.h
+ *
+ * Copyright (C) 2013 Texas Instruments
+ *
+ * Contact: Daniel Jeong <gshark.jeong@gmail.com>
+ *                      Ldd-Mlp <ldd-mlp@list.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., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __LM3560_H__
+#define __LM3560_H__
+
+#include <media/v4l2-subdev.h>
+
+#define LM3560_NAME     "lm3560"
+#define LM3560_I2C_ADDR (0x53)
+
+/*  FLASH Brightness
+ *      min 62500uA, step 62500uA, max 1000000uA
+ */
+#define LM3560_FLASH_BRT_MIN 62500
+#define LM3560_FLASH_BRT_STEP 62500
+#define LM3560_FLASH_BRT_MAX 1000000
+#define LM3560_FLASH_BRT_uA_TO_REG(a)   \
+        ((a) < LM3560_FLASH_BRT_MIN ? 0 :       \
+         (((a) - LM3560_FLASH_BRT_MIN) / LM3560_FLASH_BRT_STEP))
+#define LM3560_FLASH_BRT_REG_TO_uA(a)           \
+        ((a) * LM3560_FLASH_BRT_STEP + LM3560_FLASH_BRT_MIN)
+
+/*  FLASH TIMEOUT DURATION
+ *      min 32ms, step 32ms, max 1024ms
+ */
+#define LM3560_FLASH_TOUT_MIN 32
+#define LM3560_FLASH_TOUT_STEP 32
+#define LM3560_FLASH_TOUT_MAX 1024
+#define LM3560_FLASH_TOUT_ms_TO_REG(a)  \
+        ((a) < LM3560_FLASH_TOUT_MIN ? 0 :      \
+         (((a) - LM3560_FLASH_TOUT_MIN) / LM3560_FLASH_TOUT_STEP))
+#define LM3560_FLASH_TOUT_REG_TO_ms(a)          \
+        ((a) * LM3560_FLASH_TOUT_STEP + LM3560_FLASH_TOUT_MIN)
+
+/*  TORCH BRT
+ *      min 31250uA, step 31250uA, max 250000uA
+ */
+#define LM3560_TORCH_BRT_MIN 31250
+#define LM3560_TORCH_BRT_STEP 31250
+#define LM3560_TORCH_BRT_MAX 250000
+#define LM3560_TORCH_BRT_uA_TO_REG(a)   \
+        ((a) < LM3560_TORCH_BRT_MIN ? 0 :       \
+         (((a) - LM3560_TORCH_BRT_MIN) / LM3560_TORCH_BRT_STEP))
+#define LM3560_TORCH_BRT_REG_TO_uA(a)           \
+        ((a) * LM3560_TORCH_BRT_STEP + LM3560_TORCH_BRT_MIN)
+
+enum lm3560_led_id {
+        LM3560_LED0 = 0,
+        LM3560_LED1,
+        LM3560_LED_MAX
+};
+
+enum lm3560_peak_current {
+        LM3560_PEAK_1600mA = 0x00,
+        LM3560_PEAK_2300mA = 0x20,
+        LM3560_PEAK_3000mA = 0x40,
+        LM3560_PEAK_3600mA = 0x60
+};
+
+/* struct lm3560_platform_data
+ *
+ * @peak :  peak current
+ * @max_flash_timeout: flash timeout
+ * @max_flash_brt: flash mode led brightness
+ * @max_torch_brt: torch mode led brightness
+ */
+struct lm3560_platform_data {
+        enum lm3560_peak_current peak;
+
+        u32 max_flash_timeout;
+        u32 max_flash_brt[LM3560_LED_MAX];
+        u32 max_torch_brt[LM3560_LED_MAX];
+};
+
+#endif /* __LM3560_H__ */
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 34d2414f2b8c..865246b00127 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -146,9 +146,14 @@ struct soc_camera_subdev_desc {
         /* sensor driver private platform data */
         void *drv_priv;
 
-        /* Optional regulators that have to be managed on power on/off events */
-        struct regulator_bulk_data *regulators;
-        int num_regulators;
+        /*
+         * Set unbalanced_power to true to deal with legacy drivers, failing to
+         * balance their calls to subdevice's .s_power() method. clock_state is
+         * then used internally by helper functions, it shouldn't be touched by
+         * drivers or the platform code.
+         */
+        bool unbalanced_power;
+        unsigned long clock_state;
 
         /* Optional callbacks to power on or off and reset the sensor */
         int (*power)(struct device *, int);
@@ -162,6 +167,9 @@ struct soc_camera_subdev_desc {
         int (*set_bus_param)(struct soc_camera_subdev_desc *, unsigned long flags);
         unsigned long (*query_bus_param)(struct soc_camera_subdev_desc *);
         void (*free_bus)(struct soc_camera_subdev_desc *);
+
+        /* Optional regulators that have to be managed on power on/off events */
+        struct v4l2_subdev_platform_data sd_pdata;
 };
 
 struct soc_camera_host_desc {
@@ -202,9 +210,10 @@ struct soc_camera_link {
 
         void *priv;
 
-        /* Optional regulators that have to be managed on power on/off events */
-        struct regulator_bulk_data *regulators;
-        int num_regulators;
+        /* Set by platforms to handle misbehaving drivers */
+        bool unbalanced_power;
+        /* Used by soc-camera helper functions */
+        unsigned long clock_state;
 
         /* Optional callbacks to power on or off and reset the sensor */
         int (*power)(struct device *, int);
@@ -218,6 +227,12 @@ struct soc_camera_link {
         unsigned long (*query_bus_param)(struct soc_camera_link *);
         void (*free_bus)(struct soc_camera_link *);
 
+        /* Optional regulators that have to be managed on power on/off events */
+        struct regulator_bulk_data *regulators;
+        int num_regulators;
+
+        void *host_priv;
+
         /*
          * Host part - keep at bottom and compatible to
          * struct soc_camera_host_desc
diff --git a/include/media/v4l2-clk.h b/include/media/v4l2-clk.h
index 0503a90b48bb..0b36cc138304 100644
--- a/include/media/v4l2-clk.h
+++ b/include/media/v4l2-clk.h
@@ -15,6 +15,7 @@
 #define MEDIA_V4L2_CLK_H
 
 #include <linux/atomic.h>
+#include <linux/export.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
 
@@ -51,4 +52,20 @@ void v4l2_clk_disable(struct v4l2_clk *clk);
 unsigned long v4l2_clk_get_rate(struct v4l2_clk *clk);
 int v4l2_clk_set_rate(struct v4l2_clk *clk, unsigned long rate);
 
+struct module;
+
+struct v4l2_clk *__v4l2_clk_register_fixed(const char *dev_id,
+                const char *id, unsigned long rate, struct module *owner);
+void v4l2_clk_unregister_fixed(struct v4l2_clk *clk);
+
+static inline struct v4l2_clk *v4l2_clk_register_fixed(const char *dev_id,
+                                                        const char *id,
+                                                        unsigned long rate)
+{
+        return __v4l2_clk_register_fixed(dev_id, id, rate, THIS_MODULE);
+}
+
+#define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \
+                          "%d-%04x", adap, client)
+
 #endif
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 16550c439008..48f974866f13 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -35,7 +35,7 @@
         printk(level "%s %d-%04x: " fmt, name, i2c_adapter_id(adapter), addr , ## arg)
 
 #define v4l_client_printk(level, client, fmt, arg...)                       \
-        v4l_printk(level, (client)->driver->driver.name, (client)->adapter, \
+        v4l_printk(level, (client)->dev.driver->name, (client)->adapter, \
                    (client)->addr, fmt , ## arg)
 
 #define v4l_err(client, fmt, arg...) \
@@ -86,7 +86,7 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
                 const char * const *menu_items);
 const char *v4l2_ctrl_get_name(u32 id);
 const char * const *v4l2_ctrl_get_menu(u32 id);
-const s64 const *v4l2_ctrl_get_int_menu(u32 id, u32 *len);
+const s64 *v4l2_ctrl_get_int_menu(u32 id, u32 *len);
 int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def);
 int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu,
                 struct v4l2_queryctrl *qctrl, const char * const *menu_items);
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index 47ada23345a1..16f7f2606516 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -571,7 +571,7 @@ static inline void v4l2_ctrl_lock(struct v4l2_ctrl *ctrl)
         mutex_lock(ctrl->handler->lock);
 }
 
-/** v4l2_ctrl_lock() - Helper function to unlock the handler
+/** v4l2_ctrl_unlock() - Helper function to unlock the handler
   * associated with the control.
   * @ctrl:      The control to unlock.
   */
diff --git a/include/media/v4l2-fh.h b/include/media/v4l2-fh.h
index a62ee18cb7b7..528cdaf622e1 100644
--- a/include/media/v4l2-fh.h
+++ b/include/media/v4l2-fh.h
@@ -26,7 +26,9 @@
 #ifndef V4L2_FH_H
 #define V4L2_FH_H
 
+#include <linux/fs.h>
 #include <linux/list.h>
+#include <linux/videodev2.h>
 
 struct video_device;
 struct v4l2_ctrl_handler;
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index bfda0fe9aeb0..d67210a37ef3 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -559,6 +559,17 @@ struct v4l2_subdev_internal_ops {
 /* Set this flag if this subdev generates events. */
 #define V4L2_SUBDEV_FL_HAS_EVENTS               (1U << 3)
 
+struct regulator_bulk_data;
+
+struct v4l2_subdev_platform_data {
+        /* Optional regulators uset to power on/off the subdevice */
+        struct regulator_bulk_data *regulators;
+        int num_regulators;
+
+        /* Per-subdevice data, specific for a certain video host device */
+        void *host_priv;
+};
+
 /* Each instance of a subdev driver should create this struct, either
    stand-alone or embedded in a larger struct.
  */
@@ -592,6 +603,8 @@ struct v4l2_subdev {
         struct v4l2_async_subdev *asd;
         /* Pointer to the managing notifier. */
         struct v4l2_async_notifier *notifier;
+        /* common part of subdevice platform data */
+        struct v4l2_subdev_platform_data *pdata;
 };
 
 #define media_entity_to_v4l2_subdev(ent) \
@@ -622,13 +635,13 @@ struct v4l2_subdev_fh {
         v4l2_subdev_get_try_##fun_name(struct v4l2_subdev_fh *fh,       \
                                        unsigned int pad)                \
         {                                                               \
-                BUG_ON(unlikely(pad >= vdev_to_v4l2_subdev(             \
-                                        fh->vfh.vdev)->entity.num_pads)); \
+                BUG_ON(pad >= vdev_to_v4l2_subdev(                      \
+                                        fh->vfh.vdev)->entity.num_pads); \
                 return &fh->pad[pad].field_name;                        \
         }
 
 __V4L2_SUBDEV_MK_GET_TRY(v4l2_mbus_framefmt, format, try_fmt)
-__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, crop, try_compose)
+__V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, crop, try_crop)
 __V4L2_SUBDEV_MK_GET_TRY(v4l2_rect, compose, try_compose)
 #endif
 
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 6781258d0b67..bd8218b15009 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -391,7 +391,7 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
 unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait);
 size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
                 loff_t *ppos, int nonblock);
-size_t vb2_write(struct vb2_queue *q, char __user *data, size_t count,
+size_t vb2_write(struct vb2_queue *q, const char __user *data, size_t count,
                 loff_t *ppos, int nonblock);
 
 /**
@@ -491,7 +491,7 @@ int vb2_ioctl_expbuf(struct file *file, void *priv,
 
 int vb2_fop_mmap(struct file *file, struct vm_area_struct *vma);
 int vb2_fop_release(struct file *file);
-ssize_t vb2_fop_write(struct file *file, char __user *buf,
+ssize_t vb2_fop_write(struct file *file, const char __user *buf,
                 size_t count, loff_t *ppos);
 ssize_t vb2_fop_read(struct file *file, char __user *buf,
                 size_t count, loff_t *ppos);
diff --git a/include/media/videobuf2-dma-sg.h b/include/media/videobuf2-dma-sg.h
index 0038526b8ef7..7b89852779af 100644
--- a/include/media/videobuf2-dma-sg.h
+++ b/include/media/videobuf2-dma-sg.h
@@ -15,16 +15,10 @@
 
 #include <media/videobuf2-core.h>
 
-struct vb2_dma_sg_desc {
-        unsigned long           size;
-        unsigned int            num_pages;
-        struct scatterlist      *sglist;
-};
-
-static inline struct vb2_dma_sg_desc *vb2_dma_sg_plane_desc(
+static inline struct sg_table *vb2_dma_sg_plane_desc(
                 struct vb2_buffer *vb, unsigned int plane_no)
 {
-        return (struct vb2_dma_sg_desc *)vb2_plane_cookie(vb, plane_no);
+        return (struct sg_table *)vb2_plane_cookie(vb, plane_no);
 }
 
 extern const struct vb2_mem_ops vb2_dma_sg_memops;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e393171e2fac..979874c627ee 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -67,12 +67,14 @@ enum rdma_node_type {
         RDMA_NODE_IB_CA         = 1,
         RDMA_NODE_IB_SWITCH,
         RDMA_NODE_IB_ROUTER,
-        RDMA_NODE_RNIC
+        RDMA_NODE_RNIC,
+        RDMA_NODE_USNIC,
 };
 
 enum rdma_transport_type {
         RDMA_TRANSPORT_IB,
-        RDMA_TRANSPORT_IWARP
+        RDMA_TRANSPORT_IWARP,
+        RDMA_TRANSPORT_USNIC
 };
 
 enum rdma_transport_type
@@ -1436,6 +1438,7 @@ struct ib_device {
 
         int                          uverbs_abi_ver;
         u64                          uverbs_cmd_mask;
+        u64                          uverbs_ex_cmd_mask;
 
         char                         node_desc[64];
         __be64                       node_guid;
@@ -2384,4 +2387,17 @@ struct ib_flow *ib_create_flow(struct ib_qp *qp,
                                struct ib_flow_attr *flow_attr, int domain);
 int ib_destroy_flow(struct ib_flow *flow_id);
 
+static inline int ib_check_mr_access(int flags)
+{
+        /*
+         * Local write permission is required if remote write or
+         * remote atomic permission is also requested.
+         */
+        if (flags & (IB_ACCESS_REMOTE_ATOMIC | IB_ACCESS_REMOTE_WRITE) &&
+            !(flags & IB_ACCESS_LOCAL_WRITE))
+                return -EINVAL;
+
+        return 0;
+}
+
 #endif /* IB_VERBS_H */
diff --git a/include/scsi/scsi_transport_srp.h b/include/scsi/scsi_transport_srp.h
index ff0f04ac91aa..4ebf6913b7b2 100644
--- a/include/scsi/scsi_transport_srp.h
+++ b/include/scsi/scsi_transport_srp.h
@@ -13,6 +13,27 @@ struct srp_rport_identifiers {
         u8 roles;
 };
 
+/**
+ * enum srp_rport_state - SRP transport layer state
+ * @SRP_RPORT_RUNNING:   Transport layer operational.
+ * @SRP_RPORT_BLOCKED:   Transport layer not operational; fast I/O fail timer
+ *                       is running and I/O has been blocked.
+ * @SRP_RPORT_FAIL_FAST: Fast I/O fail timer has expired; fail I/O fast.
+ * @SRP_RPORT_LOST:      Device loss timer has expired; port is being removed.
+ */
+enum srp_rport_state {
+        SRP_RPORT_RUNNING,
+        SRP_RPORT_BLOCKED,
+        SRP_RPORT_FAIL_FAST,
+        SRP_RPORT_LOST,
+};
+
+/**
+ * struct srp_rport
+ * @lld_data: LLD private data.
+ * @mutex:    Protects against concurrent rport reconnect / fast_io_fail /
+ *   dev_loss_tmo activity.
+ */
 struct srp_rport {
         /* for initiator and target drivers */
 
@@ -23,11 +44,43 @@ struct srp_rport {
 
         /* for initiator drivers */
 
-        void *lld_data; /* LLD private data */
+        void                    *lld_data;
+
+        struct mutex            mutex;
+        enum srp_rport_state    state;
+        bool                    deleted;
+        int                     reconnect_delay;
+        int                     failed_reconnects;
+        struct delayed_work     reconnect_work;
+        int                     fast_io_fail_tmo;
+        int                     dev_loss_tmo;
+        struct delayed_work     fast_io_fail_work;
+        struct delayed_work     dev_loss_work;
 };
 
+/**
+ * struct srp_function_template
+ * @has_rport_state: Whether or not to create the state, fast_io_fail_tmo and
+ *     dev_loss_tmo sysfs attribute for an rport.
+ * @reset_timer_if_blocked: Whether or srp_timed_out() should reset the command
+ *     timer if the device on which it has been queued is blocked.
+ * @reconnect_delay: If not NULL, points to the default reconnect_delay value.
+ * @fast_io_fail_tmo: If not NULL, points to the default fast_io_fail_tmo value.
+ * @dev_loss_tmo: If not NULL, points to the default dev_loss_tmo value.
+ * @reconnect: Callback function for reconnecting to the target. See also
+ *     srp_reconnect_rport().
+ * @terminate_rport_io: Callback function for terminating all outstanding I/O
+ *     requests for an rport.
+ */
 struct srp_function_template {
         /* for initiator drivers */
+        bool has_rport_state;
+        bool reset_timer_if_blocked;
+        int *reconnect_delay;
+        int *fast_io_fail_tmo;
+        int *dev_loss_tmo;
+        int (*reconnect)(struct srp_rport *rport);
+        void (*terminate_rport_io)(struct srp_rport *rport);
         void (*rport_delete)(struct srp_rport *rport);
         /* for target drivers */
         int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
@@ -38,10 +91,36 @@ extern struct scsi_transport_template *
 srp_attach_transport(struct srp_function_template *);
 extern void srp_release_transport(struct scsi_transport_template *);
 
+extern void srp_rport_get(struct srp_rport *rport);
+extern void srp_rport_put(struct srp_rport *rport);
 extern struct srp_rport *srp_rport_add(struct Scsi_Host *,
                                        struct srp_rport_identifiers *);
 extern void srp_rport_del(struct srp_rport *);
-
+extern int srp_tmo_valid(int reconnect_delay, int fast_io_fail_tmo,
+                         int dev_loss_tmo);
+extern int srp_reconnect_rport(struct srp_rport *rport);
+extern void srp_start_tl_fail_timers(struct srp_rport *rport);
 extern void srp_remove_host(struct Scsi_Host *);
 
+/**
+ * srp_chkready() - evaluate the transport layer state before I/O
+ *
+ * Returns a SCSI result code that can be returned by the LLD queuecommand()
+ * implementation. The role of this function is similar to that of
+ * fc_remote_port_chkready().
+ */
+static inline int srp_chkready(struct srp_rport *rport)
+{
+        switch (rport->state) {
+        case SRP_RPORT_RUNNING:
+        case SRP_RPORT_BLOCKED:
+        default:
+                return 0;
+        case SRP_RPORT_FAIL_FAST:
+                return DID_TRANSPORT_FAILFAST << 16;
+        case SRP_RPORT_LOST:
+                return DID_NO_CONNECT << 16;
+        }
+}
+
 #endif
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 083bb5a5aae2..1666aabbbb86 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -160,6 +160,10 @@ enum v4l2_colorfx {
  * of controls. Total of 16 controls is reserved for this driver */
 #define V4L2_CID_USER_SI476X_BASE               (V4L2_CID_USER_BASE + 0x1040)
 
+/* The base for the TI VPE driver controls. Total of 16 controls is reserved for
+ * this driver */
+#define V4L2_CID_USER_TI_VPE_BASE               (V4L2_CID_USER_BASE + 0x1050)
+
 /* MPEG-class control IDs */
 /* The MPEG controls are applicable to all codec controls
  * and the 'MPEG' part of the define is historical */
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index e3ddd86c90a6..cbfdd4ca9510 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -87,10 +87,11 @@ enum {
         IB_USER_VERBS_CMD_CLOSE_XRCD,
         IB_USER_VERBS_CMD_CREATE_XSRQ,
         IB_USER_VERBS_CMD_OPEN_QP,
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-        IB_USER_VERBS_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
-        IB_USER_VERBS_CMD_DESTROY_FLOW
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
+};
+
+enum {
+        IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
+        IB_USER_VERBS_EX_CMD_DESTROY_FLOW
 };
 
 /*
@@ -122,22 +123,24 @@ struct ib_uverbs_comp_event_desc {
  * the rest of the command struct based on these value.
  */
 
+#define IB_USER_VERBS_CMD_COMMAND_MASK 0xff
+#define IB_USER_VERBS_CMD_FLAGS_MASK 0xff000000u
+#define IB_USER_VERBS_CMD_FLAGS_SHIFT 24
+
+#define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80
+
 struct ib_uverbs_cmd_hdr {
         __u32 command;
         __u16 in_words;
         __u16 out_words;
 };
 
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-struct ib_uverbs_cmd_hdr_ex {
-        __u32 command;
-        __u16 in_words;
-        __u16 out_words;
+struct ib_uverbs_ex_cmd_hdr {
+        __u64 response;
         __u16 provider_in_words;
         __u16 provider_out_words;
         __u32 cmd_hdr_reserved;
 };
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 struct ib_uverbs_get_context {
         __u64 response;
@@ -700,62 +703,71 @@ struct ib_uverbs_detach_mcast {
         __u64 driver_data[0];
 };
 
-#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-struct ib_kern_eth_filter {
+struct ib_uverbs_flow_spec_hdr {
+        __u32 type;
+        __u16 size;
+        __u16 reserved;
+        /* followed by flow_spec */
+        __u64 flow_spec_data[0];
+};
+
+struct ib_uverbs_flow_eth_filter {
         __u8  dst_mac[6];
         __u8  src_mac[6];
         __be16 ether_type;
         __be16 vlan_tag;
 };
 
-struct ib_kern_spec_eth {
-        __u32  type;
-        __u16  size;
-        __u16  reserved;
-        struct ib_kern_eth_filter val;
-        struct ib_kern_eth_filter mask;
+struct ib_uverbs_flow_spec_eth {
+        union {
+                struct ib_uverbs_flow_spec_hdr hdr;
+                struct {
+                        __u32 type;
+                        __u16 size;
+                        __u16 reserved;
+                };
+        };
+        struct ib_uverbs_flow_eth_filter val;
+        struct ib_uverbs_flow_eth_filter mask;
 };
 
-struct ib_kern_ipv4_filter {
+struct ib_uverbs_flow_ipv4_filter {
         __be32 src_ip;
         __be32 dst_ip;
 };
 
-struct ib_kern_spec_ipv4 {
-        __u32  type;
-        __u16  size;
-        __u16  reserved;
-        struct ib_kern_ipv4_filter val;
-        struct ib_kern_ipv4_filter mask;
+struct ib_uverbs_flow_spec_ipv4 {
+        union {
+                struct ib_uverbs_flow_spec_hdr hdr;
+                struct {
+                        __u32 type;
+                        __u16 size;
+                        __u16 reserved;
+                };
+        };
+        struct ib_uverbs_flow_ipv4_filter val;
+        struct ib_uverbs_flow_ipv4_filter mask;
 };
 
-struct ib_kern_tcp_udp_filter {
+struct ib_uverbs_flow_tcp_udp_filter {
         __be16 dst_port;
         __be16 src_port;
 };
 
-struct ib_kern_spec_tcp_udp {
-        __u32  type;
-        __u16  size;
-        __u16  reserved;
-        struct ib_kern_tcp_udp_filter val;
-        struct ib_kern_tcp_udp_filter mask;
-};
-
-struct ib_kern_spec {
+struct ib_uverbs_flow_spec_tcp_udp {
         union {
+                struct ib_uverbs_flow_spec_hdr hdr;
                 struct {
                         __u32 type;
                         __u16 size;
                         __u16 reserved;
                 };
-                struct ib_kern_spec_eth     eth;
-                struct ib_kern_spec_ipv4    ipv4;
-                struct ib_kern_spec_tcp_udp tcp_udp;
         };
+        struct ib_uverbs_flow_tcp_udp_filter val;
+        struct ib_uverbs_flow_tcp_udp_filter mask;
 };
 
-struct ib_kern_flow_attr {
+struct ib_uverbs_flow_attr {
         __u32 type;
         __u16 size;
         __u16 priority;
@@ -767,13 +779,13 @@ struct ib_kern_flow_attr {
          * struct ib_flow_spec_xxx
          * struct ib_flow_spec_yyy
          */
+        struct ib_uverbs_flow_spec_hdr flow_specs[0];
 };
 
 struct ib_uverbs_create_flow  {
         __u32 comp_mask;
-        __u64 response;
         __u32 qp_handle;
-        struct ib_kern_flow_attr flow_attr;
+        struct ib_uverbs_flow_attr flow_attr;
 };
 
 struct ib_uverbs_create_flow_resp {
@@ -785,7 +797,6 @@ struct ib_uverbs_destroy_flow  {
         __u32 comp_mask;
         __u32 flow_handle;
 };
-#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
 
 struct ib_uverbs_create_srq {
         __u64 response;
diff --git a/kernel/bounds.c b/kernel/bounds.c
index 578782ef6ae1..5253204afdca 100644
--- a/kernel/bounds.c
+++ b/kernel/bounds.c
@@ -11,7 +11,7 @@
 #include <linux/kbuild.h>
 #include <linux/page_cgroup.h>
 #include <linux/log2.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 
 void foo(void)
 {
diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
index 1162f1030f18..3320b84cc60f 100644
--- a/kernel/irq/settings.h
+++ b/kernel/irq/settings.h
@@ -14,6 +14,7 @@ enum {
         _IRQ_NO_BALANCING       = IRQ_NO_BALANCING,
         _IRQ_NESTED_THREAD      = IRQ_NESTED_THREAD,
         _IRQ_PER_CPU_DEVID      = IRQ_PER_CPU_DEVID,
+        _IRQ_IS_POLLED          = IRQ_IS_POLLED,
         _IRQF_MODIFY_MASK       = IRQF_MODIFY_MASK,
 };
 
@@ -26,6 +27,7 @@ enum {
 #define IRQ_NOAUTOEN            GOT_YOU_MORON
 #define IRQ_NESTED_THREAD       GOT_YOU_MORON
 #define IRQ_PER_CPU_DEVID       GOT_YOU_MORON
+#define IRQ_IS_POLLED           GOT_YOU_MORON
 #undef IRQF_MODIFY_MASK
 #define IRQF_MODIFY_MASK        GOT_YOU_MORON
 
@@ -147,3 +149,8 @@ static inline bool irq_settings_is_nested_thread(struct irq_desc *desc)
 {
         return desc->status_use_accessors & _IRQ_NESTED_THREAD;
 }
+
+static inline bool irq_settings_is_polled(struct irq_desc *desc)
+{
+        return desc->status_use_accessors & _IRQ_IS_POLLED;
+}
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 7b5f012bde9d..a1d8cc63b56e 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -67,8 +67,13 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
 
         raw_spin_lock(&desc->lock);
 
-        /* PER_CPU and nested thread interrupts are never polled */
-        if (irq_settings_is_per_cpu(desc) || irq_settings_is_nested_thread(desc))
+        /*
+         * PER_CPU, nested thread interrupts and interrupts explicitely
+         * marked polled are excluded from polling.
+         */
+        if (irq_settings_is_per_cpu(desc) ||
+            irq_settings_is_nested_thread(desc) ||
+            irq_settings_is_polled(desc))
                 goto out;
 
         /*
@@ -268,7 +273,8 @@ try_misrouted_irq(unsigned int irq, struct irq_desc *desc,
 void note_interrupt(unsigned int irq, struct irq_desc *desc,
                     irqreturn_t action_ret)
 {
-        if (desc->istate & IRQS_POLL_INPROGRESS)
+        if (desc->istate & IRQS_POLL_INPROGRESS ||
+            irq_settings_is_polled(desc))
                 return;
 
         /* we get here again via the threaded handler */
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 01aecc2b5073..0d1c27e911b8 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -65,7 +65,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
          * already bound. If not it means binding failed, and then there
          * is no point in keeping the device instantiated.
          */
-        if (!keywest_ctx->client->driver) {
+        if (!keywest_ctx->client->dev.driver) {
                 i2c_unregister_device(keywest_ctx->client);
                 keywest_ctx->client = NULL;
                 return -ENODEV;
@@ -76,7 +76,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter)
          * This is safe because i2c-core holds the core_lock mutex for us.
          */
         list_add_tail(&keywest_ctx->client->detected,
-                      &keywest_ctx->client->driver->clients);
+                      &to_i2c_driver(keywest_ctx->client->dev.driver)->clients);
         return 0;
 }
 
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 361f94f09b11..61e48852b9e8 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -215,7 +215,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
                 goto fail;
         }
         codec_dev = of_find_i2c_device_by_node(codec_np);
-        if (!codec_dev || !codec_dev->driver) {
+        if (!codec_dev || !codec_dev->dev.driver) {
                 dev_err(&pdev->dev, "failed to find codec platform device\n");
                 ret = -EINVAL;
                 goto fail;