188 files changed, 3989 insertions, 1844 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7980873525b2..e91c7cdc6fe5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1151,6 +1151,7 @@ config PLAT_ORION
         bool
         select CLKSRC_MMIO
         select GENERIC_IRQ_CHIP
+        select IRQ_DOMAIN
         select COMMON_CLK
 
 config PLAT_PXA
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index e1fa7e6edfe8..71d6b5d0daf1 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -12,7 +12,7 @@
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  *
- * Contains definitions specific to the Armada 370 SoC that are not
+ * Contains definitions specific to the Armada XP SoC that are not
  * common to all Armada SoCs.
  */
 
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index 9a33077130e8..5bb0bf39d3b8 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
+/include/ "kirkwood-dnskw.dtsi"
 
 / {
         model = "D-Link DNS-320 NAS (Rev A1)";
@@ -15,6 +15,31 @@
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
         };
 
+        gpio-leds {
+                compatible = "gpio-leds";
+                blue-power {
+                        label = "dns320:blue:power";
+                        gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
+                        linux,default-trigger = "default-on";
+                };
+                blue-usb {
+                        label = "dns320:blue:usb";
+                        gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */
+                };
+                orange-l_hdd {
+                        label = "dns320:orange:l_hdd";
+                        gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */
+                };
+                orange-r_hdd {
+                        label = "dns320:orange:r_hdd";
+                        gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */
+                };
+                orange-usb {
+                        label = "dns320:orange:usb";
+                        gpios = <&gpio1 3 1>; /* GPIO 35 Active Low */
+                };
+        };
+
         ocp@f1000000 {
                 serial@12000 {
                         clock-frequency = <166666667>;
@@ -25,40 +50,5 @@
                         clock-frequency = <166666667>;
                         status = "okay";
                 };
-
-                nand@3000000 {
-                        status = "okay";
-
-                        partition@0 {
-                                label = "u-boot";
-                                reg = <0x0000000 0x100000>;
-                                read-only;
-                        };
-
-                        partition@100000 {
-                                label = "uImage";
-                                reg = <0x0100000 0x500000>;
-                        };
-
-                        partition@600000 {
-                                label = "ramdisk";
-                                reg = <0x0600000 0x500000>;
-                        };
-
-                        partition@b00000 {
-                                label = "image";
-                                reg = <0x0b00000 0x6600000>;
-                        };
-
-                        partition@7100000 {
-                                label = "mini firmware";
-                                reg = <0x7100000 0xa00000>;
-                        };
-
-                        partition@7b00000 {
-                                label = "config";
-                                reg = <0x7b00000 0x500000>;
-                        };
-                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
index 16734c1b5dfe..d430713ea9b9 100644
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
+/include/ "kirkwood-dnskw.dtsi"
 
 / {
         model = "D-Link DNS-325 NAS (Rev A1)";
@@ -15,45 +15,43 @@
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
         };
 
-        ocp@f1000000 {
-                serial@12000 {
-                        clock-frequency = <200000000>;
-                        status = "okay";
+        gpio-leds {
+                compatible = "gpio-leds";
+                white-power {
+                        label = "dns325:white:power";
+                        gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
+                        linux,default-trigger = "default-on";
+                };
+                white-usb {
+                        label = "dns325:white:usb";
+                        gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */
+                };
+                red-l_hdd {
+                        label = "dns325:red:l_hdd";
+                        gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */
                 };
+                red-r_hdd {
+                        label = "dns325:red:r_hdd";
+                        gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */
+                };
+                red-usb {
+                        label = "dns325:red:usb";
+                        gpios = <&gpio0 29 1>; /* GPIO 29 Active Low */
+                };
+        };
 
-                nand@3000000 {
+        ocp@f1000000 {
+                i2c@11000 {
                         status = "okay";
 
-                        partition@0 {
-                                label = "u-boot";
-                                reg = <0x0000000 0x100000>;
-                                read-only;
-                        };
-
-                        partition@100000 {
-                                label = "uImage";
-                                reg = <0x0100000 0x500000>;
-                        };
-
-                        partition@600000 {
-                                label = "ramdisk";
-                                reg = <0x0600000 0x500000>;
-                        };
-
-                        partition@b00000 {
-                                label = "image";
-                                reg = <0x0b00000 0x6600000>;
-                        };
-
-                        partition@7100000 {
-                                label = "mini firmware";
-                                reg = <0x7100000 0xa00000>;
-                        };
-
-                        partition@7b00000 {
-                                label = "config";
-                                reg = <0x7b00000 0x500000>;
+                        lm75: lm75@48 {
+                                compatible = "national,lm75";
+                                reg = <0x48>;
                         };
                 };
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "okay";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
new file mode 100644
index 000000000000..7408655f91b5
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -0,0 +1,69 @@
+/include/ "kirkwood.dtsi"
+
+/ {
+        model = "D-Link DNS NASes (kirkwood-based)";
+        compatible = "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                button@1 {
+                        label = "Power button";
+                        linux,code = <116>;
+                        gpios = <&gpio1 2 1>;
+                };
+                button@2 {
+                        label = "USB unmount button";
+                        linux,code = <161>;
+                        gpios = <&gpio1 15 1>;
+                };
+                button@3 {
+                        label = "Reset button";
+                        linux,code = <0x198>;
+                        gpios = <&gpio1 16 1>;
+                };
+        };
+
+        ocp@f1000000 {
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+
+                nand@3000000 {
+                        status = "okay";
+
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x500000>;
+                        };
+
+                        partition@600000 {
+                                label = "ramdisk";
+                                reg = <0x0600000 0x500000>;
+                        };
+
+                        partition@b00000 {
+                                label = "image";
+                                reg = <0x0b00000 0x6600000>;
+                        };
+
+                        partition@7100000 {
+                                label = "mini firmware";
+                                reg = <0x7100000 0xa00000>;
+                        };
+
+                        partition@7b00000 {
+                                label = "config";
+                                reg = <0x7b00000 0x500000>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 78b0f06a09a2..26e281fbf6bc 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -20,5 +20,55 @@
                         clock-frequency = <200000000>;
                         status = "ok";
                 };
+
+                spi@10600 {
+                        status = "okay";
+
+                        m25p40@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "mx25l1606e";
+                                reg = <0>;
+                                spi-max-frequency = <50000000>;
+                                mode = <0>;
+
+                                partition@0 {
+                                        reg = <0x0 0x80000>;
+                                        label = "u-boot";
+                                };
+
+                                partition@100000 {
+                                        reg = <0x100000 0x10000>;
+                                        label = "u-boot env";
+                                };
+
+                                partition@180000 {
+                                        reg = <0x180000 0x10000>;
+                                        label = "dtb";
+                                };
+                        };
+                };
+
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <1>;
+                };
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                bluetooth {
+                        label = "dreamplug:blue:bluetooth";
+                        gpios = <&gpio1 15 1>;
+                };
+                wifi {
+                        label = "dreamplug:green:wifi";
+                        gpios = <&gpio1 16 1>;
+                };
+                wifi-ap {
+                        label = "dreamplug:green:wifi_ap";
+                        gpios = <&gpio1 17 1>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
new file mode 100644
index 000000000000..7c8238fbb6f9
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -0,0 +1,99 @@
+/dts-v1/;
+
+/include/ "kirkwood.dtsi"
+
+/ {
+        model = "Seagate GoFlex Net";
+        compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x8000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
+        };
+
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "ok";
+                };
+
+                nand@3000000 {
+                        status = "okay";
+
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x400000>;
+                        };
+
+                        partition@500000 {
+                                label = "pogoplug";
+                                reg = <0x0500000 0x2000000>;
+                        };
+
+                        partition@2500000 {
+                                label = "root";
+                                reg = <0x02500000 0xd800000>;
+                        };
+                };
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+
+        };
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                health {
+                        label = "status:green:health";
+                        gpios = <&gpio1 14 1>;
+                        linux,default-trigger = "default-on";
+                };
+                fault {
+                        label = "status:orange:fault";
+                        gpios = <&gpio1 15 1>;
+                };
+                left0 {
+                        label = "status:white:left0";
+                        gpios = <&gpio1 10 0>;
+                };
+                left1 {
+                        label = "status:white:left1";
+                        gpios = <&gpio1 11 0>;
+                };
+                left2 {
+                        label = "status:white:left2";
+                        gpios = <&gpio1 12 0>;
+                };
+                left3 {
+                        label = "status:white:left3";
+                        gpios = <&gpio1 13 0>;
+                };
+                right0 {
+                        label = "status:white:right0";
+                        gpios = <&gpio1 6 0>;
+                };
+                right1 {
+                        label = "status:white:right1";
+                        gpios = <&gpio1 7 0>;
+                };
+                right2 {
+                        label = "status:white:right2";
+                        gpios = <&gpio1 8 0>;
+                };
+                right3 {
+                        label = "status:white:right3";
+                        gpios = <&gpio1 9 0>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index f59dcf6dc45f..66794ed75ff1 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -21,6 +21,11 @@
                         status = "okay";
                 };
 
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+
                 nand@3000000 {
                         status = "okay";
 
@@ -41,4 +46,37 @@
 
                 };
         };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                button@1 {
+                        label = "USB Copy";
+                        linux,code = <133>;
+                        gpios = <&gpio0 29 1>;
+                };
+                button@2 {
+                        label = "Reset";
+                        linux,code = <0x198>;
+                        gpios = <&gpio0 28 1>;
+                };
+        };
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                green-os {
+                        label = "ib62x0:green:os";
+                        gpios = <&gpio0 25 0>;
+                        linux,default-trigger = "default-on";
+                };
+                red-os {
+                        label = "ib62x0:red:os";
+                        gpios = <&gpio0 22 0>;
+                };
+                usb-copy {
+                        label = "ib62x0:red:usb_copy";
+                        gpios = <&gpio0 27 0>;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 026a1f82d813..52d947045106 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -18,9 +18,51 @@
         };
 
         ocp@f1000000 {
+                i2c@11000 {
+                        status = "okay";
+
+                        lm63: lm63@4c {
+                                compatible = "national,lm63";
+                                reg = <0x4c>;
+                        };
+                };
                 serial@12000 {
                         clock-frequency = <200000000>;
                         status = "ok";
                 };
         };
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                led-level {
+                        label = "led_level";
+                        gpios = <&gpio1 9 0>;
+                        linux,default-trigger = "default-on";
+                };
+                power-blue {
+                        label = "power:blue";
+                        gpios = <&gpio1 11 0>;
+                        linux,default-trigger = "timer";
+                };
+                usb1 {
+                        label = "usb1:blue";
+                        gpios = <&gpio1 12 0>;
+                };
+                usb2 {
+                        label = "usb2:blue";
+                        gpios = <&gpio1 13 0>;
+                };
+                usb3 {
+                        label = "usb3:blue";
+                        gpios = <&gpio1 14 0>;
+                };
+                usb4 {
+                        label = "usb4:blue";
+                        gpios = <&gpio1 15 0>;
+                };
+                otb {
+                        label = "otb:blue";
+                        gpios = <&gpio1 16 0>;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/kirkwood-lschlv2.dts b/arch/arm/boot/dts/kirkwood-lschlv2.dts
new file mode 100644
index 000000000000..9510c9ea666c
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+
+/include/ "kirkwood-lsxl.dtsi"
+
+/ {
+        model = "Buffalo Linkstation LS-CHLv2";
+        compatible = "buffalo,lschlv2", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x4000000>;
+        };
+
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <166666667>;
+                        status = "okay";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-lsxhl.dts b/arch/arm/boot/dts/kirkwood-lsxhl.dts
new file mode 100644
index 000000000000..739019c4cba9
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts
@@ -0,0 +1,20 @@
+/dts-v1/;
+
+/include/ "kirkwood-lsxl.dtsi"
+
+/ {
+        model = "Buffalo Linkstation LS-XHL";
+        compatible = "buffalo,lsxhl", "buffalo,lsxl", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        ocp@f1000000 {
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "okay";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
new file mode 100644
index 000000000000..8ac51c08269d
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -0,0 +1,95 @@
+/include/ "kirkwood.dtsi"
+
+/ {
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk";
+        };
+
+        ocp@f1000000 {
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <1>;
+                };
+
+                spi@10600 {
+                        status = "okay";
+
+                        m25p40@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "m25p40";
+                                reg = <0>;
+                                spi-max-frequency = <25000000>;
+                                mode = <0>;
+
+                                partition@0 {
+                                        reg = <0x0 0x60000>;
+                                        label = "uboot";
+                                        read-only;
+                                };
+
+                                partition@60000 {
+                                        reg = <0x60000 0x10000>;
+                                        label = "dtb";
+                                        read-only;
+                                };
+
+                                partition@70000 {
+                                        reg = <0x70000 0x10000>;
+                                        label = "uboot_env";
+                                };
+                        };
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                button@1 {
+                        label = "Function Button";
+                        linux,code = <132>;
+                        gpios = <&gpio1 9 1>;
+                };
+                button@2 {
+                        label = "Power-on Switch";
+                        linux,code = <116>;
+                        gpios = <&gpio1 10 1>;
+                };
+                button@3 {
+                        label = "Power-auto Switch";
+                        linux,code = <142>;
+                        gpios = <&gpio1 11 1>;
+                };
+        };
+
+        gpio_leds {
+                compatible = "gpio-leds";
+
+                led@1 {
+                        label = "lschlv2:blue:func";
+                        gpios = <&gpio1 4 1>;
+                };
+
+                led@2 {
+                        label = "lschlv2:red:alarm";
+                        gpios = <&gpio1 5 1>;
+                };
+
+                led@3 {
+                        label = "lschlv2:amber:info";
+                        gpios = <&gpio1 6 1>;
+                };
+
+                led@4 {
+                        label = "lschlv2:blue:power";
+                        gpios = <&gpio1 7 1>;
+                        linux,default-trigger = "default-on";
+                };
+
+                led@5 {
+                        label = "lschlv2:red:func";
+                        gpios = <&gpio1 16 1>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
new file mode 100644
index 000000000000..ccbf32757800
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -0,0 +1,21 @@
+/dts-v1/;
+
+/include/ "kirkwood-ts219.dtsi"
+
+/ {
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                button@1 {
+                        label = "USB Copy";
+                        linux,code = <133>;
+                        gpios = <&gpio0 15 1>;
+                };
+                button@2 {
+                        label = "Reset";
+                        linux,code = <0x198>;
+                        gpios = <&gpio0 16 1>;
+                };
+        };
+};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
new file mode 100644
index 000000000000..fbe9932161a1
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -0,0 +1,21 @@
+/dts-v1/;
+
+/include/ "kirkwood-ts219.dtsi"
+
+/ {
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                button@1 {
+                        label = "USB Copy";
+                        linux,code = <133>;
+                        gpios = <&gpio1 11 1>;
+                };
+                button@2 {
+                        label = "Reset";
+                        linux,code = <0x198>;
+                        gpios = <&gpio1 5 1>;
+                };
+        };
+};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
new file mode 100644
index 000000000000..64ea27cb3298
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -0,0 +1,78 @@
+/include/ "kirkwood.dtsi"
+
+/ {
+        model = "QNAP TS219 family";
+        compatible = "qnap,ts219", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+        };
+
+        ocp@f1000000 {
+                i2c@11000 {
+                        status = "okay";
+                        clock-frequency = <400000>;
+
+                        s35390a: s35390a@30 {
+                                compatible = "s35390a";
+                                reg = <0x30>;
+                        };
+                };
+                serial@12000 {
+                        clock-frequency = <200000000>;
+                        status = "okay";
+                };
+                serial@12100 {
+                        clock-frequency = <200000000>;
+                        status = "okay";
+                };
+                spi@10600 {
+                        status = "okay";
+
+                        m25p128@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "m25p128";
+                                reg = <0>;
+                                spi-max-frequency = <20000000>;
+                                mode = <0>;
+
+                                partition@0000000 {
+                                        reg = <0x00000000 0x00080000>;
+                                        label = "U-Boot";
+                                };
+
+                                partition@00200000 {
+                                        reg = <0x00200000 0x00200000>;
+                                        label = "Kernel";
+                                };
+
+                                partition@00400000 {
+                                        reg = <0x00400000 0x00900000>;
+                                        label = "RootFS1";
+                                };
+                                partition@00d00000 {
+                                        reg = <0x00d00000 0x00300000>;
+                                        label = "RootFS2";
+                                };
+                                partition@00040000 {
+                                        reg = <0x00080000 0x00040000>;
+                                        label = "U-Boot Config";
+                                };
+                                partition@000c0000 {
+                                        reg = <0x000c0000 0x00140000>;
+                                        label = "NAS Config";
+                                };
+                        };
+                };
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index f95dbc190ab6..cef9616f330a 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -2,6 +2,15 @@
 
 / {
         compatible = "marvell,kirkwood";
+        interrupt-parent = <&intc>;
+
+        intc: interrupt-controller {
+                compatible = "marvell,orion-intc", "marvell,intc";
+                interrupt-controller;
+                #interrupt-cells = <1>;
+                reg = <0xf1020204 0x04>,
+                      <0xf1020214 0x04>;
+        };
 
         ocp@f1000000 {
                 compatible = "simple-bus";
@@ -9,6 +18,24 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
 
+                gpio0: gpio@10100 {
+                        compatible = "marvell,orion-gpio";
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        reg = <0x10100 0x40>;
+                        ngpio = <32>;
+                        interrupts = <35>, <36>, <37>, <38>;
+                };
+
+                gpio1: gpio@10140 {
+                        compatible = "marvell,orion-gpio";
+                        #gpio-cells = <2>;
+                        gpio-controller;
+                        reg = <0x10140 0x40>;
+                        ngpio = <18>;
+                        interrupts = <39>, <40>, <41>;
+                };
+
                 serial@12000 {
                         compatible = "ns16550a";
                         reg = <0x12000 0x100>;
@@ -33,6 +60,29 @@
                         interrupts = <53>;
                 };
 
+                spi@10600 {
+                        compatible = "marvell,orion-spi";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        interrupts = <23>;
+                        reg = <0x10600 0x28>;
+                        status = "disabled";
+                };
+
+                wdt@20300 {
+                        compatible = "marvell,orion-wdt";
+                        reg = <0x20300 0x28>;
+                        status = "okay";
+                };
+
+                sata@80000 {
+                        compatible = "marvell,orion-sata";
+                        reg = <0x80000 0x5000>;
+                        interrupts = <21>;
+                        status = "disabled";
+                };
+
                 nand@3000000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -45,5 +95,15 @@
                         /* set partition map and/or chip-delay in board dts */
                         status = "disabled";
                 };
+
+                i2c@11000 {
+                        compatible = "marvell,mv64xxx-i2c";
+                        reg = <0x11000 0x20>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupts = <29>;
+                        clock-frequency = <100000>;
+                        status = "disabled";
+                };
         };
 };
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index b152de79fd95..e58edc36b406 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -193,6 +193,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_TWL92330=y
 CONFIG_RTC_DRV_TWL4030=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_OMAP=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 004c1bc95d2b..e4448e16046d 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -215,7 +215,9 @@ static inline void vivt_flush_cache_mm(struct mm_struct *mm)
 static inline void
 vivt_flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)
 {
-        if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)))
+        struct mm_struct *mm = vma->vm_mm;
+
+        if (!mm || cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm)))
                 __cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),
                                         vma->vm_flags);
 }
@@ -223,7 +225,9 @@ vivt_flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned
 static inline void
 vivt_flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)
 {
-        if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {
+        struct mm_struct *mm = vma->vm_mm;
+
+        if (!mm || cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm))) {
                 unsigned long addr = user_addr & PAGE_MASK;
                 __cpuc_flush_user_range(addr, addr + PAGE_SIZE, vma->vm_flags);
         }
diff --git a/arch/arm/include/asm/mutex.h b/arch/arm/include/asm/mutex.h
index 93226cf23ae0..b1479fd04a95 100644
--- a/arch/arm/include/asm/mutex.h
+++ b/arch/arm/include/asm/mutex.h
@@ -7,121 +7,10 @@
  */
 #ifndef _ASM_MUTEX_H
 #define _ASM_MUTEX_H
-
-#if __LINUX_ARM_ARCH__ < 6
-/* On pre-ARMv6 hardware the swp based implementation is the most efficient. */
-# include <asm-generic/mutex-xchg.h>
-#else
-
 /*
- * Attempting to lock a mutex on ARMv6+ can be done with a bastardized
- * atomic decrement (it is not a reliable atomic decrement but it satisfies
- * the defined semantics for our purpose, while being smaller and faster
- * than a real atomic decrement or atomic swap.  The idea is to attempt
- * decrementing the lock value only once.  If once decremented it isn't zero,
- * or if its store-back fails due to a dispute on the exclusive store, we
- * simply bail out immediately through the slow path where the lock will be
- * reattempted until it succeeds.
+ * On pre-ARMv6 hardware this results in a swp-based implementation,
+ * which is the most efficient. For ARMv6+, we emit a pair of exclusive
+ * accesses instead.
  */
-static inline void
-__mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))
-{
-        int __ex_flag, __res;
-
-        __asm__ (
-
-                "ldrex  %0, [%2]        \n\t"
-                "sub    %0, %0, #1      \n\t"
-                "strex  %1, %0, [%2]    "
-
-                : "=&r" (__res), "=&r" (__ex_flag)
-                : "r" (&(count)->counter)
-                : "cc","memory" );
-
-        __res |= __ex_flag;
-        if (unlikely(__res != 0))
-                fail_fn(count);
-}
-
-static inline int
-__mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
-{
-        int __ex_flag, __res;
-
-        __asm__ (
-
-                "ldrex  %0, [%2]        \n\t"
-                "sub    %0, %0, #1      \n\t"
-                "strex  %1, %0, [%2]    "
-
-                : "=&r" (__res), "=&r" (__ex_flag)
-                : "r" (&(count)->counter)
-                : "cc","memory" );
-
-        __res |= __ex_flag;
-        if (unlikely(__res != 0))
-                __res = fail_fn(count);
-        return __res;
-}
-
-/*
- * Same trick is used for the unlock fast path. However the original value,
- * rather than the result, is used to test for success in order to have
- * better generated assembly.
- */
-static inline void
-__mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))
-{
-        int __ex_flag, __res, __orig;
-
-        __asm__ (
-
-                "ldrex  %0, [%3]        \n\t"
-                "add    %1, %0, #1      \n\t"
-                "strex  %2, %1, [%3]    "
-
-                : "=&r" (__orig), "=&r" (__res), "=&r" (__ex_flag)
-                : "r" (&(count)->counter)
-                : "cc","memory" );
-
-        __orig |= __ex_flag;
-        if (unlikely(__orig != 0))
-                fail_fn(count);
-}
-
-/*
- * If the unlock was done on a contended lock, or if the unlock simply fails
- * then the mutex remains locked.
- */
-#define __mutex_slowpath_needs_to_unlock()      1
-
-/*
- * For __mutex_fastpath_trylock we use another construct which could be
- * described as a "single value cmpxchg".
- *
- * This provides the needed trylock semantics like cmpxchg would, but it is
- * lighter and less generic than a true cmpxchg implementation.
- */
-static inline int
-__mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *))
-{
-        int __ex_flag, __res, __orig;
-
-        __asm__ (
-
-                "1: ldrex       %0, [%3]        \n\t"
-                "subs           %1, %0, #1      \n\t"
-                "strexeq        %2, %1, [%3]    \n\t"
-                "movlt          %0, #0          \n\t"
-                "cmpeq          %2, #0          \n\t"
-                "bgt            1b              "
-
-                : "=&r" (__orig), "=&r" (__res), "=&r" (__ex_flag)
-                : "r" (&count->counter)
-                : "cc", "memory" );
-
-        return __orig;
-}
-
-#endif
+#include <asm-generic/mutex-xchg.h>
 #endif
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index 23ebc0c82a39..24d284a1bfc7 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -196,7 +196,7 @@ static const struct tagtable __tagtable_##fn __tag = { tag, fn }
 
 struct membank {
         phys_addr_t start;
-        unsigned long size;
+        phys_addr_t size;
         unsigned int highmem;
 };
 
@@ -217,7 +217,7 @@ extern struct meminfo meminfo;
 #define bank_phys_end(bank)     ((bank)->start + (bank)->size)
 #define bank_phys_size(bank)    (bank)->size
 
-extern int arm_add_memory(phys_addr_t start, unsigned long size);
+extern int arm_add_memory(phys_addr_t start, phys_addr_t size);
 extern void early_print(const char *str, ...);
 extern void dump_machine_table(void);
 
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 0d1851ca6eb9..0f82098c9bfe 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -244,6 +244,19 @@ svc_preempt:
         b       1b
 #endif
 
+__und_fault:
+        @ Correct the PC such that it is pointing at the instruction
+        @ which caused the fault.  If the faulting instruction was ARM
+        @ the PC will be pointing at the next instruction, and have to
+        @ subtract 4.  Otherwise, it is Thumb, and the PC will be
+        @ pointing at the second half of the Thumb instruction.  We
+        @ have to subtract 2.
+        ldr     r2, [r0, #S_PC]
+        sub     r2, r2, r1
+        str     r2, [r0, #S_PC]
+        b       do_undefinstr
+ENDPROC(__und_fault)
+
         .align  5
 __und_svc:
 #ifdef CONFIG_KPROBES
@@ -261,25 +274,32 @@ __und_svc:
         @
         @  r0 - instruction
         @
-#ifndef CONFIG_THUMB2_KERNEL
+#ifndef CONFIG_THUMB2_KERNEL
         ldr     r0, [r4, #-4]
 #else
+        mov     r1, #2
         ldrh    r0, [r4, #-2]                   @ Thumb instruction at LR - 2
         cmp     r0, #0xe800                     @ 32-bit instruction if xx >= 0
-        ldrhhs  r9, [r4]                        @ bottom 16 bits
-        orrhs   r0, r9, r0, lsl #16
+        blo     __und_svc_fault
+        ldrh    r9, [r4]                        @ bottom 16 bits
+        add     r4, r4, #2
+        str     r4, [sp, #S_PC]
+        orr     r0, r9, r0, lsl #16
 #endif
-        adr     r9, BSYM(1f)
+        adr     r9, BSYM(__und_svc_finish)
         mov     r2, r4
         bl      call_fpe
 
+        mov     r1, #4                          @ PC correction to apply
+__und_svc_fault:
         mov     r0, sp                          @ struct pt_regs *regs
-        bl      do_undefinstr
+        bl      __und_fault
 
         @
         @ IRQs off again before pulling preserved data off the stack
         @
-1:      disable_irq_notrace
+__und_svc_finish:
+        disable_irq_notrace
 
         @
         @ restore SPSR and restart the instruction
@@ -423,25 +443,33 @@ __und_usr:
         mov     r2, r4
         mov     r3, r5
 
+        @ r2 = regs->ARM_pc, which is either 2 or 4 bytes ahead of the
+        @      faulting instruction depending on Thumb mode.
+        @ r3 = regs->ARM_cpsr
         @
-        @ fall through to the emulation code, which returns using r9 if
-        @ it has emulated the instruction, or the more conventional lr
-        @ if we are to treat this as a real undefined instruction
-        @
-        @  r0 - instruction
+        @ The emulation code returns using r9 if it has emulated the
+        @ instruction, or the more conventional lr if we are to treat
+        @ this as a real undefined instruction
         @
         adr     r9, BSYM(ret_from_exception)
-        adr     lr, BSYM(__und_usr_unknown)
+
         tst     r3, #PSR_T_BIT                  @ Thumb mode?
-        itet    eq                              @ explicit IT needed for the 1f label
-        subeq   r4, r2, #4                      @ ARM instr at LR - 4
-        subne   r4, r2, #2                      @ Thumb instr at LR - 2
-1:      ldreqt  r0, [r4]
+        bne     __und_usr_thumb
+        sub     r4, r2, #4                      @ ARM instr at LR - 4
+1:      ldrt    r0, [r4]
 #ifdef CONFIG_CPU_ENDIAN_BE8
-        reveq   r0, r0                          @ little endian instruction
+        rev     r0, r0                          @ little endian instruction
 #endif
-        beq     call_fpe
+        @ r0 = 32-bit ARM instruction which caused the exception
+        @ r2 = PC value for the following instruction (:= regs->ARM_pc)
+        @ r4 = PC value for the faulting instruction
+        @ lr = 32-bit undefined instruction function
+        adr     lr, BSYM(__und_usr_fault_32)
+        b       call_fpe
+
+__und_usr_thumb:
         @ Thumb instruction
+        sub     r4, r2, #2                      @ First half of thumb instr at LR - 2
 #if CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7
 /*
  * Thumb-2 instruction handling.  Note that because pre-v6 and >= v6 platforms
@@ -455,7 +483,7 @@ __und_usr:
         ldr     r5, .LCcpu_architecture
         ldr     r5, [r5]
         cmp     r5, #CPU_ARCH_ARMv7
-        blo     __und_usr_unknown
+        blo     __und_usr_fault_16              @ 16bit undefined instruction
 /*
  * The following code won't get run unless the running CPU really is v7, so
  * coding round the lack of ldrht on older arches is pointless.  Temporarily
@@ -463,15 +491,18 @@ __und_usr:
  */
         .arch   armv6t2
 #endif
-2:
- ARM(   ldrht   r5, [r4], #2    )
- THUMB( ldrht   r5, [r4]        )
- THUMB( add     r4, r4, #2      )
+2:      ldrht   r5, [r4]
         cmp     r5, #0xe800                     @ 32bit instruction if xx != 0
-        blo     __und_usr_unknown
-3:      ldrht   r0, [r4]
+        blo     __und_usr_fault_16              @ 16bit undefined instruction
+3:      ldrht   r0, [r2]
         add     r2, r2, #2                      @ r2 is PC + 2, make it PC + 4
+        str     r2, [sp, #S_PC]                 @ it's a 2x16bit instr, update
         orr     r0, r0, r5, lsl #16
+        adr     lr, BSYM(__und_usr_fault_32)
+        @ r0 = the two 16-bit Thumb instructions which caused the exception
+        @ r2 = PC value for the following Thumb instruction (:= regs->ARM_pc)
+        @ r4 = PC value for the first 16-bit Thumb instruction
+        @ lr = 32bit undefined instruction function
 
 #if __LINUX_ARM_ARCH__ < 7
 /* If the target arch was overridden, change it back: */
@@ -482,17 +513,13 @@ __und_usr:
 #endif
 #endif /* __LINUX_ARM_ARCH__ < 7 */
 #else /* !(CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7) */
-        b       __und_usr_unknown
+        b       __und_usr_fault_16
 #endif
- UNWIND(.fnend          )
+ UNWIND(.fnend)
 ENDPROC(__und_usr)
 
-        @
-        @ fallthrough to call_fpe
-        @
-
 /*
- * The out of line fixup for the ldrt above.
+ * The out of line fixup for the ldrt instructions above.
  */
         .pushsection .fixup, "ax"
         .align  2
@@ -524,11 +551,12 @@ ENDPROC(__und_usr)
  * NEON handler code.
  *
  * Emulators may wish to make use of the following registers:
- *  r0  = instruction opcode.
- *  r2  = PC+4
+ *  r0  = instruction opcode (32-bit ARM or two 16-bit Thumb)
+ *  r2  = PC value to resume execution after successful emulation
  *  r9  = normal "successful" return address
- *  r10 = this threads thread_info structure.
+ *  r10 = this threads thread_info structure
  *  lr  = unrecognised instruction return address
+ * IRQs disabled, FIQs enabled.
  */
         @
         @ Fall-through from Thumb-2 __und_usr
@@ -659,12 +687,17 @@ ENTRY(no_fp)
         mov     pc, lr
 ENDPROC(no_fp)
 
-__und_usr_unknown:
-        enable_irq
+__und_usr_fault_32:
+        mov     r1, #4
+        b       1f
+__und_usr_fault_16:
+        mov     r1, #2
+1:      enable_irq
         mov     r0, sp
         adr     lr, BSYM(ret_from_exception)
-        b       do_undefinstr
-ENDPROC(__und_usr_unknown)
+        b       __und_fault
+ENDPROC(__und_usr_fault_32)
+ENDPROC(__und_usr_fault_16)
 
         .align  5
 __pabt_usr:
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 49d9f9305247..978eac57e04a 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -51,23 +51,15 @@ ret_fast_syscall:
 fast_work_pending:
         str     r0, [sp, #S_R0+S_OFF]!          @ returned r0
 work_pending:
-        tst     r1, #_TIF_NEED_RESCHED
-        bne     work_resched
-        /*
-         * TIF_SIGPENDING or TIF_NOTIFY_RESUME must've been set if we got here
-         */
-        ldr     r2, [sp, #S_PSR]
         mov     r0, sp                          @ 'regs'
-        tst     r2, #15                         @ are we returning to user mode?
-        bne     no_work_pending                 @ no?  just leave, then...
         mov     r2, why                         @ 'syscall'
-        tst     r1, #_TIF_SIGPENDING            @ delivering a signal?
-        movne   why, #0                         @ prevent further restarts
-        bl      do_notify_resume
-        b       ret_slow_syscall                @ Check work again
+        bl      do_work_pending
+        cmp     r0, #0
+        beq     no_work_pending
+        movlt   scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE)
+        ldmia   sp, {r0 - r6}                   @ have to reload r0 - r6
+        b       local_restart                   @ ... and off we go
 
-work_resched:
-        bl      schedule
 /*
  * "slow" syscall return path.  "why" tells us if this was a real syscall.
  */
@@ -409,6 +401,7 @@ ENTRY(vector_swi)
         eor     scno, scno, #__NR_SYSCALL_BASE  @ check OS number
 #endif
 
+local_restart:
         ldr     r10, [tsk, #TI_FLAGS]           @ check for syscall tracing
         stmdb   sp!, {r4, r5}                   @ push fifth and sixth args
 
@@ -450,7 +443,8 @@ __sys_trace:
         mov     scno, r0                        @ syscall number (possibly new)
         add     r1, sp, #S_R0 + S_OFF           @ pointer to regs
         cmp     scno, #NR_syscalls              @ check upper syscall limit
-        ldmccia r1, {r0 - r3}                   @ have to reload r0 - r3
+        ldmccia r1, {r0 - r6}                   @ have to reload r0 - r6
+        stmccia sp, {r4, r5}                    @ and update the stack args
         ldrcc   pc, [tbl, scno, lsl #2]         @ call sys_* routine
         b       2b
 
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index df0bf0c8cb79..34e56647dcee 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -179,19 +179,20 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
         old = *parent;
         *parent = return_hooker;
 
-        err = ftrace_push_return_trace(old, self_addr, &trace.depth,
-                                       frame_pointer);
-        if (err == -EBUSY) {
-                *parent = old;
-                return;
-        }
-
         trace.func = self_addr;
+        trace.depth = current->curr_ret_stack + 1;
 
         /* Only trace if the calling function expects to */
         if (!ftrace_graph_entry(&trace)) {
-                current->curr_ret_stack--;
                 *parent = old;
+                return;
+        }
+
+        err = ftrace_push_return_trace(old, self_addr, &trace.depth,
+                                       frame_pointer);
+        if (err == -EBUSY) {
+                *parent = old;
+                return;
         }
 }
 
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 19c95ea65b2f..693b744fd572 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -247,6 +247,7 @@ void machine_shutdown(void)
 void machine_halt(void)
 {
         machine_shutdown();
+        local_irq_disable();
         while (1);
 }
 
@@ -268,6 +269,7 @@ void machine_restart(char *cmd)
 
         /* Whoops - the platform was unable to reboot. Tell the user! */
         printk("Reboot failed -- System halted\n");
+        local_irq_disable();
         while (1);
 }
 
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index dab711e6e1ca..3e0fc5f7ed4b 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -25,6 +25,7 @@
 #include <linux/regset.h>
 #include <linux/audit.h>
 #include <linux/tracehook.h>
+#include <linux/unistd.h>
 
 #include <asm/pgtable.h>
 #include <asm/traps.h>
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index e15d83bb4ea3..a81dcecc7343 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -508,7 +508,7 @@ void __init dump_machine_table(void)
                 /* can't use cpu_relax() here as it may require MMU setup */;
 }
 
-int __init arm_add_memory(phys_addr_t start, unsigned long size)
+int __init arm_add_memory(phys_addr_t start, phys_addr_t size)
 {
         struct membank *bank = &meminfo.bank[meminfo.nr_banks];
 
@@ -538,7 +538,7 @@ int __init arm_add_memory(phys_addr_t start, unsigned long size)
         }
 #endif
 
-        bank->size = size & PAGE_MASK;
+        bank->size = size & ~(phys_addr_t)(PAGE_SIZE - 1);
 
         /*
          * Check whether this memory region has non-zero size or
@@ -558,7 +558,7 @@ int __init arm_add_memory(phys_addr_t start, unsigned long size)
 static int __init early_mem(char *p)
 {
         static int usermem __initdata = 0;
-        unsigned long size;
+        phys_addr_t size;
         phys_addr_t start;
         char *endp;
 
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 536c5d6b340b..f27789e4e38a 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -27,7 +27,6 @@
  */
 #define SWI_SYS_SIGRETURN       (0xef000000|(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE))
 #define SWI_SYS_RT_SIGRETURN    (0xef000000|(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE))
-#define SWI_SYS_RESTART         (0xef000000|__NR_restart_syscall|__NR_OABI_SYSCALL_BASE)
 
 /*
  * With EABI, the syscall number has to be loaded into r7.
@@ -48,18 +47,6 @@ const unsigned long sigreturn_codes[7] = {
 };
 
 /*
- * Either we support OABI only, or we have EABI with the OABI
- * compat layer enabled.  In the later case we don't know if
- * user space is EABI or not, and if not we must not clobber r7.
- * Always using the OABI syscall solves that issue and works for
- * all those cases.
- */
-const unsigned long syscall_restart_code[2] = {
-        SWI_SYS_RESTART,        /* swi  __NR_restart_syscall */
-        0xe49df004,             /* ldr  pc, [sp], #4 */
-};
-
-/*
  * atomically swap in the new signal mask, and wait for a signal.
  */
 asmlinkage int sys_sigsuspend(int restart, unsigned long oldmask, old_sigset_t mask)
@@ -582,12 +569,13 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
  * the kernel can handle, and then we build all the user-level signal handling
  * stack-frames in one go after that.
  */
-static void do_signal(struct pt_regs *regs, int syscall)
+static int do_signal(struct pt_regs *regs, int syscall)
 {
         unsigned int retval = 0, continue_addr = 0, restart_addr = 0;
         struct k_sigaction ka;
         siginfo_t info;
         int signr;
+        int restart = 0;
 
         /*
          * If we were from a system call, check for system call restarting...
@@ -602,15 +590,15 @@ static void do_signal(struct pt_regs *regs, int syscall)
                  * debugger will see the already changed PSW.
                  */
                 switch (retval) {
+                case -ERESTART_RESTARTBLOCK:
+                        restart -= 2;
                 case -ERESTARTNOHAND:
                 case -ERESTARTSYS:
                 case -ERESTARTNOINTR:
+                        restart++;
                         regs->ARM_r0 = regs->ARM_ORIG_r0;
                         regs->ARM_pc = restart_addr;
                         break;
-                case -ERESTART_RESTARTBLOCK:
-                        regs->ARM_r0 = -EINTR;
-                        break;
                 }
         }
 
@@ -619,14 +607,17 @@ static void do_signal(struct pt_regs *regs, int syscall)
          * point the debugger may change all our registers ...
          */
         signr = get_signal_to_deliver(&info, &ka, regs, NULL);
+        /*
+         * Depending on the signal settings we may need to revert the
+         * decision to restart the system call.  But skip this if a
+         * debugger has chosen to restart at a different PC.
+         */
+        if (regs->ARM_pc != restart_addr)
+                restart = 0;
         if (signr > 0) {
-                /*
-                 * Depending on the signal settings we may need to revert the
-                 * decision to restart the system call.  But skip this if a
-                 * debugger has chosen to restart at a different PC.
-                 */
-                if (regs->ARM_pc == restart_addr) {
-                        if (retval == -ERESTARTNOHAND
+                if (unlikely(restart)) {
+                        if (retval == -ERESTARTNOHAND ||
+                            retval == -ERESTART_RESTARTBLOCK
                             || (retval == -ERESTARTSYS
                                 && !(ka.sa.sa_flags & SA_RESTART))) {
                                 regs->ARM_r0 = -EINTR;
@@ -635,52 +626,43 @@ static void do_signal(struct pt_regs *regs, int syscall)
                 }
 
                 handle_signal(signr, &ka, &info, regs);
-                return;
-        }
-
-        if (syscall) {
-                /*
-                 * Handle restarting a different system call.  As above,
-                 * if a debugger has chosen to restart at a different PC,
-                 * ignore the restart.
-                 */
-                if (retval == -ERESTART_RESTARTBLOCK
-                    && regs->ARM_pc == continue_addr) {
-                        if (thumb_mode(regs)) {
-                                regs->ARM_r7 = __NR_restart_syscall - __NR_SYSCALL_BASE;
-                                regs->ARM_pc -= 2;
-                        } else {
-#if defined(CONFIG_AEABI) && !defined(CONFIG_OABI_COMPAT)
-                                regs->ARM_r7 = __NR_restart_syscall;
-                                regs->ARM_pc -= 4;
-#else
-                                u32 __user *usp;
-
-                                regs->ARM_sp -= 4;
-                                usp = (u32 __user *)regs->ARM_sp;
-
-                                if (put_user(regs->ARM_pc, usp) == 0) {
-                                        regs->ARM_pc = KERN_RESTART_CODE;
-                                } else {
-                                        regs->ARM_sp += 4;
-                                        force_sigsegv(0, current);
-                                }
-#endif
-                        }
-                }
+                return 0;
         }
 
         restore_saved_sigmask();
+        if (unlikely(restart))
+                regs->ARM_pc = continue_addr;
+        return restart;
 }
 
-asmlinkage void
-do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall)
+asmlinkage int
+do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
 {
-        if (thread_flags & _TIF_SIGPENDING)
-                do_signal(regs, syscall);
-
-        if (thread_flags & _TIF_NOTIFY_RESUME) {
-                clear_thread_flag(TIF_NOTIFY_RESUME);
-                tracehook_notify_resume(regs);
-        }
+        do {
+                if (likely(thread_flags & _TIF_NEED_RESCHED)) {
+                        schedule();
+                } else {
+                        if (unlikely(!user_mode(regs)))
+                                return 0;
+                        local_irq_enable();
+                        if (thread_flags & _TIF_SIGPENDING) {
+                                int restart = do_signal(regs, syscall);
+                                if (unlikely(restart)) {
+                                        /*
+                                         * Restart without handlers.
+                                         * Deal with it without leaving
+                                         * the kernel space.
+                                         */
+                                        return restart;
+                                }
+                                syscall = 0;
+                        } else {
+                                clear_thread_flag(TIF_NOTIFY_RESUME);
+                                tracehook_notify_resume(regs);
+                        }
+                }
+                local_irq_disable();
+                thread_flags = current_thread_info()->flags;
+        } while (thread_flags & _TIF_WORK_MASK);
+        return 0;
 }
diff --git a/arch/arm/kernel/signal.h b/arch/arm/kernel/signal.h
index 6fcfe8398aa4..5ff067b7c752 100644
--- a/arch/arm/kernel/signal.h
+++ b/arch/arm/kernel/signal.h
@@ -8,7 +8,5 @@
  * published by the Free Software Foundation.
  */
 #define KERN_SIGRETURN_CODE     (CONFIG_VECTORS_BASE + 0x00000500)
-#define KERN_RESTART_CODE       (KERN_SIGRETURN_CODE + sizeof(sigreturn_codes))
 
 extern const unsigned long sigreturn_codes[7];
-extern const unsigned long syscall_restart_code[2];
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index aea74f5bc34a..ebd8ad274d76 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -563,7 +563,8 @@ void smp_send_stop(void)
 
         cpumask_copy(&mask, cpu_online_mask);
         cpumask_clear_cpu(smp_processor_id(), &mask);
-        smp_cross_call(&mask, IPI_CPU_STOP);
+        if (!cpumask_empty(&mask))
+                smp_cross_call(&mask, IPI_CPU_STOP);
 
         /* Wait up to one second for other CPUs to stop */
         timeout = USEC_PER_SEC;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 8b97d739b17b..f7945218b8c6 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -402,18 +402,10 @@ static int call_undef_hook(struct pt_regs *regs, unsigned int instr)
 
 asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
 {
-        unsigned int correction = thumb_mode(regs) ? 2 : 4;
         unsigned int instr;
         siginfo_t info;
         void __user *pc;
 
-        /*
-         * According to the ARM ARM, PC is 2 or 4 bytes ahead,
-         * depending whether we're in Thumb mode or not.
-         * Correct this offset.
-         */
-        regs->ARM_pc -= correction;
-
         pc = (void __user *)instruction_pointer(regs);
 
         if (processor_mode(regs) == SVC_MODE) {
@@ -852,8 +844,6 @@ void __init early_trap_init(void *vectors_base)
          */
         memcpy((void *)(vectors + KERN_SIGRETURN_CODE - CONFIG_VECTORS_BASE),
                sigreturn_codes, sizeof(sigreturn_codes));
-        memcpy((void *)(vectors + KERN_RESTART_CODE - CONFIG_VECTORS_BASE),
-               syscall_restart_code, sizeof(syscall_restart_code));
 
         flush_icache_range(vectors, vectors + PAGE_SIZE);
         modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index d1624a315c9a..783eab6845c4 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -546,6 +546,7 @@ static struct lcd_ctrl_config lcd_cfg = {
         .sync_edge              = 0,
         .sync_ctrl              = 1,
         .raster_order           = 0,
+        .fifo_th                = 6,
 };
 
 struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata = {
diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-dove/irq.c
index f07fd16e0c9b..9bc97a5baaa8 100644
--- a/arch/arm/mach-dove/irq.c
+++ b/arch/arm/mach-dove/irq.c
@@ -20,22 +20,6 @@
 #include <mach/bridge-regs.h>
 #include "common.h"
 
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        int irqoff;
-        BUG_ON(irq < IRQ_DOVE_GPIO_0_7 || irq > IRQ_DOVE_HIGH_GPIO);
-
-        irqoff = irq <= IRQ_DOVE_GPIO_16_23 ? irq - IRQ_DOVE_GPIO_0_7 :
-                3 + irq - IRQ_DOVE_GPIO_24_31;
-
-        orion_gpio_irq_handler(irqoff << 3);
-        if (irq == IRQ_DOVE_HIGH_GPIO) {
-                orion_gpio_irq_handler(40);
-                orion_gpio_irq_handler(48);
-                orion_gpio_irq_handler(56);
-        }
-}
-
 static void pmu_irq_mask(struct irq_data *d)
 {
         int pin = irq_to_pmu(d->irq);
@@ -90,6 +74,27 @@ static void pmu_irq_handler(unsigned int irq, struct irq_desc *desc)
         }
 }
 
+static int __initdata gpio0_irqs[4] = {
+        IRQ_DOVE_GPIO_0_7,
+        IRQ_DOVE_GPIO_8_15,
+        IRQ_DOVE_GPIO_16_23,
+        IRQ_DOVE_GPIO_24_31,
+};
+
+static int __initdata gpio1_irqs[4] = {
+        IRQ_DOVE_HIGH_GPIO,
+        0,
+        0,
+        0,
+};
+
+static int __initdata gpio2_irqs[4] = {
+        0,
+        0,
+        0,
+        0,
+};
+
 void __init dove_init_irq(void)
 {
         int i;
@@ -100,19 +105,14 @@ void __init dove_init_irq(void)
         /*
          * Initialize gpiolib for GPIOs 0-71.
          */
-        orion_gpio_init(0, 32, DOVE_GPIO_LO_VIRT_BASE, 0,
-                        IRQ_DOVE_GPIO_START);
-        irq_set_chained_handler(IRQ_DOVE_GPIO_0_7, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_DOVE_GPIO_8_15, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_DOVE_GPIO_16_23, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_DOVE_GPIO_24_31, gpio_irq_handler);
-
-        orion_gpio_init(32, 32, DOVE_GPIO_HI_VIRT_BASE, 0,
-                        IRQ_DOVE_GPIO_START + 32);
-        irq_set_chained_handler(IRQ_DOVE_HIGH_GPIO, gpio_irq_handler);
-
-        orion_gpio_init(64, 8, DOVE_GPIO2_VIRT_BASE, 0,
-                        IRQ_DOVE_GPIO_START + 64);
+        orion_gpio_init(NULL, 0, 32, (void __iomem *)DOVE_GPIO_LO_VIRT_BASE, 0,
+                        IRQ_DOVE_GPIO_START, gpio0_irqs);
+
+        orion_gpio_init(NULL, 32, 32, (void __iomem *)DOVE_GPIO_HI_VIRT_BASE, 0,
+                        IRQ_DOVE_GPIO_START + 32, gpio1_irqs);
+
+        orion_gpio_init(NULL, 64, 8, (void __iomem *)DOVE_GPIO2_VIRT_BASE, 0,
+                        IRQ_DOVE_GPIO_START + 64, gpio2_irqs);
 
         /*
          * Mask and clear PMU interrupts
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 199764fe0fb0..ca5c15a4e626 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -80,6 +80,35 @@ config MACH_IB62X0_DT
           RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
           Flattened Device Tree.
 
+config MACH_TS219_DT
+        bool "Device Tree for QNAP TS-11X, TS-21X NAS"
+        select ARCH_KIRKWOOD_DT
+        select ARM_APPENDED_DTB
+        select ARM_ATAG_DTB_COMPAT
+        help
+          Say 'Y' here if you want your kernel to support the QNAP
+          TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
+          TS-219P+ Turbo NAS devices using Fattened Device Tree.
+          There are two different Device Tree descriptions, depending
+          on if the device is based on an if the board uses the MV6281
+          or MV6282. If you have the wrong one, the buttons will not
+          work.
+
+config MACH_GOFLEXNET_DT
+        bool "Seagate GoFlex Net (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the
+          Seagate GoFlex Net (Flattened Device Tree).
+
+config MACH_LSXL_DT
+        bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
+        select ARCH_KIRKWOOD_DT
+        help
+          Say 'Y' here if you want your kernel to support the
+          Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using
+          Flattened Device Tree.
+
 config MACH_TS219
         bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
         help
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index d2b05907b10e..055c85a1cc46 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -25,3 +25,6 @@ obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o
 obj-$(CONFIG_MACH_ICONNECT_DT)          += board-iconnect.o
 obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)    += board-dnskw.o
 obj-$(CONFIG_MACH_IB62X0_DT)            += board-ib62x0.o
+obj-$(CONFIG_MACH_TS219_DT)             += board-ts219.o tsx1x-common.o
+obj-$(CONFIG_MACH_GOFLEXNET_DT)         += board-goflexnet.o
+obj-$(CONFIG_MACH_LSXL_DT)              += board-lsxl.o
diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
index 02edbdf5b065..2a576abf409b 100644
--- a/arch/arm/mach-kirkwood/Makefile.boot
+++ b/arch/arm/mach-kirkwood/Makefile.boot
@@ -7,3 +7,7 @@ dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb
 dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
 dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
 dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
+dtb-$(CONFIG_MACH_TS219_DT)     += kirkwood-qnap-ts219.dtb
+dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
+dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
+dbt-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c
index 58c2d68f9443..4ab35065a144 100644
--- a/arch/arm/mach-kirkwood/board-dnskw.c
+++ b/arch/arm/mach-kirkwood/board-dnskw.c
@@ -14,13 +14,11 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/i2c.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/of.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
-#include <linux/gpio_keys.h>
 #include <linux/gpio-fan.h>
 #include <linux/leds.h>
 #include <asm/mach-types.h>
@@ -35,10 +33,6 @@ static struct mv643xx_eth_platform_data dnskw_ge00_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
 };
 
-static struct mv_sata_platform_data dnskw_sata_data = {
-        .n_ports        = 2,
-};
-
 static unsigned int dnskw_mpp_config[] __initdata = {
         MPP13_UART1_TXD,        /* Custom ... */
         MPP14_UART1_RXD,        /* ... Controller (DNS-320 only) */
@@ -73,132 +67,6 @@ static unsigned int dnskw_mpp_config[] __initdata = {
         0
 };
 
-static struct gpio_led dns325_led_pins[] = {
-        {
-                .name   = "dns325:white:power",
-                .gpio   = 26,
-                .active_low = 1,
-                .default_trigger = "default-on",
-        },
-        {
-                .name   = "dns325:white:usb",
-                .gpio   = 43,
-                .active_low = 1,
-        },
-        {
-                .name   = "dns325:red:l_hdd",
-                .gpio   = 28,
-                .active_low = 1,
-        },
-        {
-                .name   = "dns325:red:r_hdd",
-                .gpio   = 27,
-                .active_low = 1,
-        },
-        {
-                .name   = "dns325:red:usb",
-                .gpio   = 29,
-                .active_low = 1,
-        },
-};
-
-static struct gpio_led_platform_data dns325_led_data = {
-        .num_leds       = ARRAY_SIZE(dns325_led_pins),
-        .leds           = dns325_led_pins,
-};
-
-static struct platform_device dns325_led_device = {
-        .name           = "leds-gpio",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &dns325_led_data,
-        },
-};
-
-static struct gpio_led dns320_led_pins[] = {
-        {
-                .name   = "dns320:blue:power",
-                .gpio   = 26,
-                .active_low = 1,
-                .default_trigger = "default-on",
-        },
-        {
-                .name   = "dns320:blue:usb",
-                .gpio   = 43,
-                .active_low = 1,
-        },
-        {
-                .name   = "dns320:orange:l_hdd",
-                .gpio   = 28,
-                .active_low = 1,
-        },
-        {
-                .name   = "dns320:orange:r_hdd",
-                .gpio   = 27,
-                .active_low = 1,
-        },
-        {
-                .name   = "dns320:orange:usb",
-                .gpio   = 35,
-                .active_low = 1,
-        },
-};
-
-static struct gpio_led_platform_data dns320_led_data = {
-        .num_leds       = ARRAY_SIZE(dns320_led_pins),
-        .leds           = dns320_led_pins,
-};
-
-static struct platform_device dns320_led_device = {
-        .name           = "leds-gpio",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &dns320_led_data,
-        },
-};
-
-static struct i2c_board_info dns325_i2c_board_info[] __initdata = {
-        {
-                I2C_BOARD_INFO("lm75", 0x48),
-        },
-        /* Something at 0x0c also */
-};
-
-static struct gpio_keys_button dnskw_button_pins[] = {
-        {
-                .code           = KEY_POWER,
-                .gpio           = 34,
-                .desc           = "Power button",
-                .active_low     = 1,
-        },
-        {
-                .code           = KEY_EJECTCD,
-                .gpio           = 47,
-                .desc           = "USB unmount button",
-                .active_low     = 1,
-        },
-        {
-                .code           = KEY_RESTART,
-                .gpio           = 48,
-                .desc           = "Reset button",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data dnskw_button_data = {
-        .buttons        = dnskw_button_pins,
-        .nbuttons       = ARRAY_SIZE(dnskw_button_pins),
-};
-
-static struct platform_device dnskw_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &dnskw_button_data,
-        }
-};
-
 /* Fan: ADDA AD045HB-G73 40mm 6000rpm@5v */
 static struct gpio_fan_speed dnskw_fan_speed[] = {
         {    0,  0 },
@@ -245,20 +113,9 @@ void __init dnskw_init(void)
 
         kirkwood_ehci_init();
         kirkwood_ge00_init(&dnskw_ge00_data);
-        kirkwood_sata_init(&dnskw_sata_data);
-        kirkwood_i2c_init();
 
-        platform_device_register(&dnskw_button_device);
         platform_device_register(&dnskw_fan_device);
 
-        if (of_machine_is_compatible("dlink,dns-325")) {
-                i2c_register_board_info(0, dns325_i2c_board_info,
-                                        ARRAY_SIZE(dns325_i2c_board_info));
-                platform_device_register(&dns325_led_device);
-
-        } else if (of_machine_is_compatible("dlink,dns-320"))
-                platform_device_register(&dns320_led_device);
-
         /* Register power-off GPIO. */
         if (gpio_request(36, "dnskw:power:off") == 0
             && gpio_direction_output(36, 0) == 0)
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
index 55e357ab2923..aeb234d0d0e3 100644
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/partitions.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/of.h>
@@ -23,7 +22,6 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/gpio.h>
-#include <linux/leds.h>
 #include <linux/mtd/physmap.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
@@ -36,42 +34,6 @@
 #include "common.h"
 #include "mpp.h"
 
-struct mtd_partition dreamplug_partitions[] = {
-        {
-                .name   = "u-boot",
-                .size   = SZ_512K,
-                .offset = 0,
-        },
-        {
-                .name   = "u-boot env",
-                .size   = SZ_64K,
-                .offset = SZ_512K + SZ_512K,
-        },
-        {
-                .name   = "dtb",
-                .size   = SZ_64K,
-                .offset = SZ_512K + SZ_512K + SZ_512K,
-        },
-};
-
-static const struct flash_platform_data dreamplug_spi_slave_data = {
-        .type           = "mx25l1606e",
-        .name           = "spi_flash",
-        .parts          = dreamplug_partitions,
-        .nr_parts       = ARRAY_SIZE(dreamplug_partitions),
-};
-
-static struct spi_board_info __initdata dreamplug_spi_slave_info[] = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &dreamplug_spi_slave_data,
-                .irq            = -1,
-                .max_speed_hz   = 50000000,
-                .bus_num        = 0,
-                .chip_select    = 0,
-        },
-};
-
 static struct mv643xx_eth_platform_data dreamplug_ge00_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
 };
@@ -80,45 +42,10 @@ static struct mv643xx_eth_platform_data dreamplug_ge01_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(1),
 };
 
-static struct mv_sata_platform_data dreamplug_sata_data = {
-        .n_ports        = 1,
-};
-
 static struct mvsdio_platform_data dreamplug_mvsdio_data = {
         /* unfortunately the CD signal has not been connected */
 };
 
-static struct gpio_led dreamplug_led_pins[] = {
-        {
-                .name                   = "dreamplug:blue:bluetooth",
-                .gpio                   = 47,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "dreamplug:green:wifi",
-                .gpio                   = 48,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "dreamplug:green:wifi_ap",
-                .gpio                   = 49,
-                .active_low             = 1,
-        },
-};
-
-static struct gpio_led_platform_data dreamplug_led_data = {
-        .leds           = dreamplug_led_pins,
-        .num_leds       = ARRAY_SIZE(dreamplug_led_pins),
-};
-
-static struct platform_device dreamplug_leds = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &dreamplug_led_data,
-        }
-};
-
 static unsigned int dreamplug_mpp_config[] __initdata = {
         MPP0_SPI_SCn,
         MPP1_SPI_MOSI,
@@ -137,15 +64,8 @@ void __init dreamplug_init(void)
          */
         kirkwood_mpp_conf(dreamplug_mpp_config);
 
-        spi_register_board_info(dreamplug_spi_slave_info,
-                                ARRAY_SIZE(dreamplug_spi_slave_info));
-        kirkwood_spi_init();
-
         kirkwood_ehci_init();
         kirkwood_ge00_init(&dreamplug_ge00_data);
         kirkwood_ge01_init(&dreamplug_ge01_data);
-        kirkwood_sata_init(&dreamplug_sata_data);
         kirkwood_sdio_init(&dreamplug_mvsdio_data);
-
-        platform_device_register(&dreamplug_leds);
 }
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index edc3f8a9d45e..e4eb450de301 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -18,6 +18,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <mach/bridge-regs.h>
+#include <plat/irq.h>
 #include "common.h"
 
 static struct of_device_id kirkwood_dt_match_table[] __initdata = {
@@ -25,6 +26,16 @@ static struct of_device_id kirkwood_dt_match_table[] __initdata = {
         { }
 };
 
+struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = {
+        OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL),
+        OF_DEV_AUXDATA("marvell,mv64xxx-i2c", 0xf1011000, "mv64xxx_i2c.0",
+                       NULL),
+        OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),
+        OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),
+        OF_DEV_AUXDATA("marvell,orion-nand", 0xf4000000, "orion_nand", NULL),
+        {},
+};
+
 static void __init kirkwood_dt_init(void)
 {
         pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
@@ -47,7 +58,6 @@ static void __init kirkwood_dt_init(void)
         kirkwood_clk_init();
 
         /* internal devices that every board has */
-        kirkwood_wdt_init();
         kirkwood_xor0_init();
         kirkwood_xor1_init();
         kirkwood_crypto_init();
@@ -68,7 +78,17 @@ static void __init kirkwood_dt_init(void)
         if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
                 ib62x0_init();
 
-        of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
+        if (of_machine_is_compatible("qnap,ts219"))
+                qnap_dt_ts219_init();
+
+        if (of_machine_is_compatible("seagate,goflexnet"))
+                goflexnet_init();
+
+        if (of_machine_is_compatible("buffalo,lsxl"))
+                lsxl_init();
+
+        of_platform_populate(NULL, kirkwood_dt_match_table,
+                             kirkwood_auxdata_lookup, NULL);
 }
 
 static const char *kirkwood_dt_board_compat[] = {
@@ -77,6 +97,9 @@ static const char *kirkwood_dt_board_compat[] = {
         "dlink,dns-325",
         "iom,iconnect",
         "raidsonic,ib-nas62x0",
+        "qnap,ts219",
+        "seagate,goflexnet",
+        "buffalo,lsxl",
         NULL
 };
 
@@ -84,7 +107,7 @@ DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
         /* Maintainer: Jason Cooper <jason@lakedaemon.net> */
         .map_io         = kirkwood_map_io,
         .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
+        .init_irq       = orion_dt_init_irq,
         .timer          = &kirkwood_timer,
         .init_machine   = kirkwood_dt_init,
         .restart        = kirkwood_restart,
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
new file mode 100644
index 000000000000..413e2c8ef5fe
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
+ *
+ * arch/arm/mach-kirkwood/board-goflexnet.c
+ *
+ * Seagate GoFlext Net Board Init for drivers not converted to
+ * flattened device tree yet.
+ *
+ * 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.
+ *
+ * Copied and modified for Seagate GoFlex Net support by
+ * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
+ * GoFlex kernel patches.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_fdt.h>
+#include <linux/of_irq.h>
+#include <linux/of_platform.h>
+#include <linux/gpio.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <mach/kirkwood.h>
+#include <mach/bridge-regs.h>
+#include <plat/mvsdio.h>
+#include "common.h"
+#include "mpp.h"
+
+static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
+};
+
+static unsigned int goflexnet_mpp_config[] __initdata = {
+        MPP29_GPIO,     /* USB Power Enable */
+        MPP47_GPIO,     /* LED Orange */
+        MPP46_GPIO,     /* LED Green */
+        MPP45_GPIO,     /* LED Left Capacity 3 */
+        MPP44_GPIO,     /* LED Left Capacity 2 */
+        MPP43_GPIO,     /* LED Left Capacity 1 */
+        MPP42_GPIO,     /* LED Left Capacity 0 */
+        MPP41_GPIO,     /* LED Right Capacity 3 */
+        MPP40_GPIO,     /* LED Right Capacity 2 */
+        MPP39_GPIO,     /* LED Right Capacity 1 */
+        MPP38_GPIO,     /* LED Right Capacity 0 */
+        0
+};
+
+void __init goflexnet_init(void)
+{
+        /*
+         * Basic setup. Needs to be called early.
+         */
+        kirkwood_mpp_conf(goflexnet_mpp_config);
+
+        if (gpio_request(29, "USB Power Enable") != 0 ||
+            gpio_direction_output(29, 1) != 0)
+                pr_err("can't setup GPIO 29 (USB Power Enable)\n");
+        kirkwood_ehci_init();
+
+        kirkwood_ge00_init(&goflexnet_ge00_data);
+}
diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c
index eddf1df8891f..cfc47f80e734 100644
--- a/arch/arm/mach-kirkwood/board-ib62x0.c
+++ b/arch/arm/mach-kirkwood/board-ib62x0.c
@@ -18,9 +18,7 @@
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
-#include <linux/leds.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
@@ -33,10 +31,6 @@ static struct mv643xx_eth_platform_data ib62x0_ge00_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
 };
 
-static struct mv_sata_platform_data ib62x0_sata_data = {
-        .n_ports        = 2,
-};
-
 static unsigned int ib62x0_mpp_config[] __initdata = {
         MPP0_NF_IO2,
         MPP1_NF_IO3,
@@ -55,69 +49,6 @@ static unsigned int ib62x0_mpp_config[] __initdata = {
         0
 };
 
-static struct gpio_led ib62x0_led_pins[] = {
-        {
-                .name                   = "ib62x0:green:os",
-                .default_trigger        = "default-on",
-                .gpio                   = 25,
-                .active_low             = 0,
-        },
-        {
-                .name                   = "ib62x0:red:os",
-                .default_trigger        = "none",
-                .gpio                   = 22,
-                .active_low             = 0,
-        },
-        {
-                .name                   = "ib62x0:red:usb_copy",
-                .default_trigger        = "none",
-                .gpio                   = 27,
-                .active_low             = 0,
-        },
-};
-
-static struct gpio_led_platform_data ib62x0_led_data = {
-        .leds           = ib62x0_led_pins,
-        .num_leds       = ARRAY_SIZE(ib62x0_led_pins),
-};
-
-static struct platform_device ib62x0_led_device = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &ib62x0_led_data,
-        }
-};
-
-static struct gpio_keys_button ib62x0_button_pins[] = {
-        {
-                .code           = KEY_COPY,
-                .gpio           = 29,
-                .desc           = "USB Copy",
-                .active_low     = 1,
-        },
-        {
-                .code           = KEY_RESTART,
-                .gpio           = 28,
-                .desc           = "Reset",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data ib62x0_button_data = {
-        .buttons        = ib62x0_button_pins,
-        .nbuttons       = ARRAY_SIZE(ib62x0_button_pins),
-};
-
-static struct platform_device ib62x0_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &ib62x0_button_data,
-        }
-};
-
 static void ib62x0_power_off(void)
 {
         gpio_set_value(IB62X0_GPIO_POWER_OFF, 1);
@@ -132,9 +63,6 @@ void __init ib62x0_init(void)
 
         kirkwood_ehci_init();
         kirkwood_ge00_init(&ib62x0_ge00_data);
-        kirkwood_sata_init(&ib62x0_sata_data);
-        platform_device_register(&ib62x0_led_device);
-        platform_device_register(&ib62x0_button_device);
         if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 &&
             gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0)
                 pm_power_off = ib62x0_power_off;
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
index b0d3cc49269d..d7a9198ed300 100644
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@ -19,8 +19,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
-#include <linux/leds.h>
-#include <linux/i2c.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <asm/mach/arch.h>
@@ -32,50 +30,6 @@ static struct mv643xx_eth_platform_data iconnect_ge00_data = {
         .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
 };
 
-static struct gpio_led iconnect_led_pins[] = {
-        {
-                .name           = "led_level",
-                .gpio           = 41,
-                .default_trigger = "default-on",
-        }, {
-                .name           = "power:blue",
-                .gpio           = 42,
-                .default_trigger = "timer",
-        }, {
-                .name           = "power:red",
-                .gpio           = 43,
-        }, {
-                .name           = "usb1:blue",
-                .gpio           = 44,
-        }, {
-                .name           = "usb2:blue",
-                .gpio           = 45,
-        }, {
-                .name           = "usb3:blue",
-                .gpio           = 46,
-        }, {
-                .name           = "usb4:blue",
-                .gpio           = 47,
-        }, {
-                .name           = "otb:blue",
-                .gpio           = 48,
-        },
-};
-
-static struct gpio_led_platform_data iconnect_led_data = {
-        .leds           = iconnect_led_pins,
-        .num_leds       = ARRAY_SIZE(iconnect_led_pins),
-        .gpio_blink_set = orion_gpio_led_blink_set,
-};
-
-static struct platform_device iconnect_leds = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &iconnect_led_data,
-        }
-};
-
 static unsigned int iconnect_mpp_config[] __initdata = {
         MPP12_GPIO,
         MPP35_GPIO,
@@ -90,12 +44,6 @@ static unsigned int iconnect_mpp_config[] __initdata = {
         0
 };
 
-static struct i2c_board_info __initdata iconnect_board_info[] = {
-        {
-                I2C_BOARD_INFO("lm63", 0x4c),
-        },
-};
-
 static struct mtd_partition iconnect_nand_parts[] = {
         {
                 .name = "flash",
@@ -142,15 +90,11 @@ void __init iconnect_init(void)
 {
         kirkwood_mpp_conf(iconnect_mpp_config);
         kirkwood_nand_init(ARRAY_AND_SIZE(iconnect_nand_parts), 25);
-        kirkwood_i2c_init();
-        i2c_register_board_info(0, iconnect_board_info,
-                ARRAY_SIZE(iconnect_board_info));
 
         kirkwood_ehci_init();
         kirkwood_ge00_init(&iconnect_ge00_data);
 
         platform_device_register(&iconnect_button_device);
-        platform_device_register(&iconnect_leds);
 }
 
 static int __init iconnect_pci_init(void)
diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c
new file mode 100644
index 000000000000..83d8975592f8
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-lsxl.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2012 (C), Michael Walle <michael@walle.cc>
+ *
+ * arch/arm/mach-kirkwood/board-lsxl.c
+ *
+ * Buffalo Linkstation LS-XHL and LS-CHLv2 init for drivers not
+ * converted to flattened device tree yet.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/ata_platform.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/spi.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/gpio.h>
+#include <linux/gpio-fan.h>
+#include <linux/input.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include "common.h"
+#include "mpp.h"
+
+static struct mv643xx_eth_platform_data lsxl_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
+};
+
+static struct mv643xx_eth_platform_data lsxl_ge01_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
+};
+
+static unsigned int lsxl_mpp_config[] __initdata = {
+        MPP10_GPO,      /* HDD Power Enable */
+        MPP11_GPIO,     /* USB Vbus Enable */
+        MPP18_GPO,      /* FAN High Enable# */
+        MPP19_GPO,      /* FAN Low Enable# */
+        MPP36_GPIO,     /* Function Blue LED */
+        MPP37_GPIO,     /* Alarm LED */
+        MPP38_GPIO,     /* Info LED */
+        MPP39_GPIO,     /* Power LED */
+        MPP40_GPIO,     /* Fan Lock */
+        MPP41_GPIO,     /* Function Button */
+        MPP42_GPIO,     /* Power Switch */
+        MPP43_GPIO,     /* Power Auto Switch */
+        MPP48_GPIO,     /* Function Red LED */
+        0
+};
+
+#define LSXL_GPIO_FAN_HIGH      18
+#define LSXL_GPIO_FAN_LOW       19
+#define LSXL_GPIO_FAN_LOCK      40
+
+static struct gpio_fan_alarm lsxl_alarm = {
+        .gpio = LSXL_GPIO_FAN_LOCK,
+};
+
+static struct gpio_fan_speed lsxl_speeds[] = {
+        {
+                .rpm = 0,
+                .ctrl_val = 3,
+        }, {
+                .rpm = 1500,
+                .ctrl_val = 1,
+        }, {
+                .rpm = 3250,
+                .ctrl_val = 2,
+        }, {
+                .rpm = 5000,
+                .ctrl_val = 0,
+        }
+};
+
+static int lsxl_gpio_list[] = {
+        LSXL_GPIO_FAN_HIGH, LSXL_GPIO_FAN_LOW,
+};
+
+static struct gpio_fan_platform_data lsxl_fan_data = {
+        .num_ctrl = ARRAY_SIZE(lsxl_gpio_list),
+        .ctrl = lsxl_gpio_list,
+        .alarm = &lsxl_alarm,
+        .num_speed = ARRAY_SIZE(lsxl_speeds),
+        .speed = lsxl_speeds,
+};
+
+static struct platform_device lsxl_fan_device = {
+        .name = "gpio-fan",
+        .id = -1,
+        .num_resources = 0,
+        .dev = {
+                .platform_data = &lsxl_fan_data,
+        },
+};
+
+/*
+ * On the LS-XHL/LS-CHLv2, the shutdown process is following:
+ * - Userland monitors key events until the power switch goes to off position
+ * - The board reboots
+ * - U-boot starts and goes into an idle mode waiting for the user
+ *   to move the switch to ON position
+ *
+ */
+static void lsxl_power_off(void)
+{
+        kirkwood_restart('h', NULL);
+}
+
+#define LSXL_GPIO_HDD_POWER 10
+#define LSXL_GPIO_USB_POWER 11
+
+void __init lsxl_init(void)
+{
+        /*
+         * Basic setup. Needs to be called early.
+         */
+        kirkwood_mpp_conf(lsxl_mpp_config);
+
+        /* usb and sata power on */
+        gpio_set_value(LSXL_GPIO_USB_POWER, 1);
+        gpio_set_value(LSXL_GPIO_HDD_POWER, 1);
+
+        kirkwood_ehci_init();
+        kirkwood_ge00_init(&lsxl_ge00_data);
+        kirkwood_ge01_init(&lsxl_ge01_data);
+        platform_device_register(&lsxl_fan_device);
+
+        /* register power-off method */
+        pm_power_off = lsxl_power_off;
+}
diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
new file mode 100644
index 000000000000..1750e68506c1
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -0,0 +1,82 @@
+/*
+ *
+ * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
+ *
+ * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on the board file ts219-setup.c:
+ *
+ * Copyright (C) 2009  Martin Michlmayr <tbm@cyrius.com>
+ * Copyright (C) 2008  Byron Bradley <byron.bbradley@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/ata_platform.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include "common.h"
+#include "mpp.h"
+#include "tsx1x-common.h"
+
+static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
+};
+
+static unsigned int qnap_ts219_mpp_config[] __initdata = {
+        MPP0_SPI_SCn,
+        MPP1_SPI_MOSI,
+        MPP2_SPI_SCK,
+        MPP3_SPI_MISO,
+        MPP4_SATA1_ACTn,
+        MPP5_SATA0_ACTn,
+        MPP8_TW0_SDA,
+        MPP9_TW0_SCK,
+        MPP10_UART0_TXD,
+        MPP11_UART0_RXD,
+        MPP13_UART1_TXD,        /* PIC controller */
+        MPP14_UART1_RXD,        /* PIC controller */
+        MPP15_GPIO,             /* USB Copy button (on devices with 88F6281) */
+        MPP16_GPIO,             /* Reset button (on devices with 88F6281) */
+        MPP36_GPIO,             /* RAM: 0: 256 MB, 1: 512 MB */
+        MPP37_GPIO,             /* Reset button (on devices with 88F6282) */
+        MPP43_GPIO,             /* USB Copy button (on devices with 88F6282) */
+        MPP44_GPIO,             /* Board ID: 0: TS-11x, 1: TS-21x */
+        0
+};
+
+void __init qnap_dt_ts219_init(void)
+{
+        u32 dev, rev;
+
+        kirkwood_mpp_conf(qnap_ts219_mpp_config);
+
+        kirkwood_pcie_id(&dev, &rev);
+        if (dev == MV88F6282_DEV_ID)
+                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
+
+        kirkwood_ge00_init(&qnap_ts219_ge00_data);
+        kirkwood_ehci_init();
+
+        pm_power_off = qnap_tsx1x_power_off;
+}
+
+/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
+static int __init ts219_pci_init(void)
+{
+        if (machine_is_ts219())
+                kirkwood_pcie_init(KW_PCIE0);
+
+        return 0;
+}
+subsys_initcall(ts219_pci_init);
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c9201539ffbd..c4b64adcbfce 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -17,6 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/clk-provider.h>
 #include <linux/spinlock.h>
+#include <linux/mv643xx_i2c.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>
@@ -276,6 +277,7 @@ void __init kirkwood_clk_init(void)
         orion_clkdev_add("0", "pcie", pex0);
         orion_clkdev_add("1", "pcie", pex1);
         orion_clkdev_add(NULL, "kirkwood-i2s", audio);
+        orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", runit);
 
         /* Marvell says runit is used by SPI, UART, NAND, TWSI, ...,
          * so should never be gated.
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 9248fa2c165b..304dd1abfdca 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -58,6 +58,11 @@ void dreamplug_init(void);
 #else
 static inline void dreamplug_init(void) {};
 #endif
+#ifdef CONFIG_MACH_TS219_DT
+void qnap_dt_ts219_init(void);
+#else
+static inline void qnap_dt_ts219_init(void) {};
+#endif
 
 #ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
 void dnskw_init(void);
@@ -77,6 +82,18 @@ void ib62x0_init(void);
 static inline void ib62x0_init(void) {};
 #endif
 
+#ifdef CONFIG_MACH_GOFLEXNET_DT
+void goflexnet_init(void);
+#else
+static inline void goflexnet_init(void) {};
+#endif
+
+#ifdef CONFIG_MACH_LSXL_DT
+void lsxl_init(void);
+#else
+static inline void lsxl_init(void) {};
+#endif
+
 /* early init functions not converted to fdt yet */
 char *kirkwood_id(void);
 void kirkwood_l2_init(void);
diff --git a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
index c4c68e5b94f1..720063ffa19d 100644
--- a/arch/arm/mach-kirkwood/irq.c
+++ b/arch/arm/mach-kirkwood/irq.c
@@ -9,20 +9,23 @@
  */
 #include <linux/gpio.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/io.h>
 #include <mach/bridge-regs.h>
 #include <plat/irq.h>
-#include "common.h"
 
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        BUG_ON(irq < IRQ_KIRKWOOD_GPIO_LOW_0_7);
-        BUG_ON(irq > IRQ_KIRKWOOD_GPIO_HIGH_16_23);
+static int __initdata gpio0_irqs[4] = {
+        IRQ_KIRKWOOD_GPIO_LOW_0_7,
+        IRQ_KIRKWOOD_GPIO_LOW_8_15,
+        IRQ_KIRKWOOD_GPIO_LOW_16_23,
+        IRQ_KIRKWOOD_GPIO_LOW_24_31,
+};
 
-        orion_gpio_irq_handler((irq - IRQ_KIRKWOOD_GPIO_LOW_0_7) << 3);
-}
+static int __initdata gpio1_irqs[4] = {
+        IRQ_KIRKWOOD_GPIO_HIGH_0_7,
+        IRQ_KIRKWOOD_GPIO_HIGH_8_15,
+        IRQ_KIRKWOOD_GPIO_HIGH_16_23,
+        0,
+};
 
 void __init kirkwood_init_irq(void)
 {
@@ -32,17 +35,8 @@ void __init kirkwood_init_irq(void)
         /*
          * Initialize gpiolib for GPIOs 0-49.
          */
-        orion_gpio_init(0, 32, GPIO_LOW_VIRT_BASE, 0,
-                        IRQ_KIRKWOOD_GPIO_START);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_LOW_0_7, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_LOW_8_15, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_LOW_16_23, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_LOW_24_31, gpio_irq_handler);
-
-        orion_gpio_init(32, 18, GPIO_HIGH_VIRT_BASE, 0,
-                        IRQ_KIRKWOOD_GPIO_START + 32);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_HIGH_0_7, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_HIGH_8_15, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_KIRKWOOD_GPIO_HIGH_16_23,
-                                gpio_irq_handler);
+        orion_gpio_init(NULL, 0, 32, (void __iomem *)GPIO_LOW_VIRT_BASE, 0,
+                        IRQ_KIRKWOOD_GPIO_START, gpio0_irqs);
+        orion_gpio_init(NULL, 32, 18, (void __iomem *)GPIO_HIGH_VIRT_BASE, 0,
+                        IRQ_KIRKWOOD_GPIO_START + 32, gpio1_irqs);
 }
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c
index f516e74ce0d5..5c3d61ee729a 100644
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@ -14,6 +14,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
+#include <mach/irqs.h>
 #include <mach/pxa168.h>
 #include <mach/mfp-pxa168.h>
 
diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-mv78xx0/irq.c
index e421b701663b..eff9a750bbe2 100644
--- a/arch/arm/mach-mv78xx0/irq.c
+++ b/arch/arm/mach-mv78xx0/irq.c
@@ -9,19 +9,17 @@
  */
 #include <linux/gpio.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
 #include <linux/irq.h>
 #include <mach/bridge-regs.h>
 #include <plat/irq.h>
 #include "common.h"
 
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        BUG_ON(irq < IRQ_MV78XX0_GPIO_0_7 || irq > IRQ_MV78XX0_GPIO_24_31);
-
-        orion_gpio_irq_handler((irq - IRQ_MV78XX0_GPIO_0_7) << 3);
-}
+static int __initdata gpio0_irqs[4] = {
+        IRQ_MV78XX0_GPIO_0_7,
+        IRQ_MV78XX0_GPIO_8_15,
+        IRQ_MV78XX0_GPIO_16_23,
+        IRQ_MV78XX0_GPIO_24_31,
+};
 
 void __init mv78xx0_init_irq(void)
 {
@@ -34,11 +32,7 @@ void __init mv78xx0_init_irq(void)
          * registers for core #1 are at an offset of 0x18 from those of
          * core #0.)
          */
-        orion_gpio_init(0, 32, GPIO_VIRT_BASE,
+        orion_gpio_init(NULL, 0, 32, (void __iomem *)GPIO_VIRT_BASE,
                         mv78xx0_core_index() ? 0x18 : 0,
-                        IRQ_MV78XX0_GPIO_START);
-        irq_set_chained_handler(IRQ_MV78XX0_GPIO_0_7, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_MV78XX0_GPIO_8_15, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_MV78XX0_GPIO_16_23, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_MV78XX0_GPIO_24_31, gpio_irq_handler);
+                        IRQ_MV78XX0_GPIO_START, gpio0_irqs);
 }
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index da0e37d40823..e1362ce48497 100644
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -54,7 +54,6 @@ static struct omap_mmc_platform_data mmc1_data = {
         .nr_slots                       = 1,
         .init                           = mmc_late_init,
         .cleanup                        = mmc_cleanup,
-        .dma_mask                       = 0xffffffff,
         .slots[0]       = {
                 .set_power              = mmc_set_power,
                 .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
index f8242aa9b763..c74daace8cd6 100644
--- a/arch/arm/mach-omap1/board-h3-mmc.c
+++ b/arch/arm/mach-omap1/board-h3-mmc.c
@@ -36,7 +36,6 @@ static int mmc_set_power(struct device *dev, int slot, int power_on,
  */
 static struct omap_mmc_platform_data mmc1_data = {
         .nr_slots                       = 1,
-        .dma_mask                       = 0xffffffff,
         .slots[0]       = {
                 .set_power              = mmc_set_power,
                 .ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 4007a372481b..2c0ca8fc3380 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -185,7 +185,6 @@ static int nokia770_mmc_get_cover_state(struct device *dev, int slot)
 
 static struct omap_mmc_platform_data nokia770_mmc2_data = {
         .nr_slots                       = 1,
-        .dma_mask                       = 0xffffffff,
         .max_freq                       = 12000000,
         .slots[0]       = {
                 .set_power              = nokia770_mmc_set_power,
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index cc71a26723ef..355980321c2d 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -288,8 +288,7 @@ palmz71_gpio_setup(int early)
                 }
                 gpio_direction_input(PALMZ71_USBDETECT_GPIO);
                 if (request_irq(gpio_to_irq(PALMZ71_USBDETECT_GPIO),
-                                palmz71_powercable, IRQF_SAMPLE_RANDOM,
-                                "palmz71-cable", NULL))
+                                palmz71_powercable, 0, "palmz71-cable", NULL))
                         printk(KERN_ERR
                                         "IRQ request for power cable failed!\n");
                 palmz71_powercable(gpio_to_irq(PALMZ71_USBDETECT_GPIO), NULL);
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index dd0fbf76ac79..dd2db025f778 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -62,6 +62,7 @@ config ARCH_OMAP4
         select PM_OPP if PM
         select USB_ARCH_HAS_EHCI if USB_SUPPORT
         select ARM_CPU_SUSPEND if PM
+        select ARCH_NEEDS_CPU_IDLE_COUPLED
 
 config SOC_OMAP5
         bool "TI OMAP5"
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 2c5d0ed75285..677357ff61ac 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -468,7 +468,6 @@ static struct omap_mmc_platform_data mmc1_data = {
         .cleanup                        = n8x0_mmc_cleanup,
         .shutdown                       = n8x0_mmc_shutdown,
         .max_freq                       = 24000000,
-        .dma_mask                       = 0xffffffff,
         .slots[0] = {
                 .wires                  = 4,
                 .set_power              = n8x0_mmc_set_power,
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index 02d15bbd4e35..ee05e193fc61 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -21,6 +21,7 @@
 #include "common.h"
 #include "pm.h"
 #include "prm.h"
+#include "clockdomain.h"
 
 /* Machine specific information */
 struct omap4_idle_statedata {
@@ -47,10 +48,14 @@ static struct omap4_idle_statedata omap4_idle_data[] = {
         },
 };
 
-static struct powerdomain *mpu_pd, *cpu0_pd, *cpu1_pd;
+static struct powerdomain *mpu_pd, *cpu_pd[NR_CPUS];
+static struct clockdomain *cpu_clkdm[NR_CPUS];
+
+static atomic_t abort_barrier;
+static bool cpu_done[NR_CPUS];
 
 /**
- * omap4_enter_idle - Programs OMAP4 to enter the specified state
+ * omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions
  * @dev: cpuidle device
  * @drv: cpuidle driver
  * @index: the index of state to be entered
@@ -59,60 +64,84 @@ static struct powerdomain *mpu_pd, *cpu0_pd, *cpu1_pd;
  * specified low power state selected by the governor.
  * Returns the amount of time spent in the low power state.
  */
-static int omap4_enter_idle(struct cpuidle_device *dev,
+static int omap4_enter_idle_simple(struct cpuidle_device *dev,
+                        struct cpuidle_driver *drv,
+                        int index)
+{
+        local_fiq_disable();
+        omap_do_wfi();
+        local_fiq_enable();
+
+        return index;
+}
+
+static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
                         int index)
 {
         struct omap4_idle_statedata *cx = &omap4_idle_data[index];
-        u32 cpu1_state;
         int cpu_id = smp_processor_id();
 
         local_fiq_disable();
 
         /*
-         * CPU0 has to stay ON (i.e in C1) until CPU1 is OFF state.
+         * CPU0 has to wait and stay ON until CPU1 is OFF state.
          * This is necessary to honour hardware recommondation
          * of triggeing all the possible low power modes once CPU1 is
          * out of coherency and in OFF mode.
-         * Update dev->last_state so that governor stats reflects right
-         * data.
          */
-        cpu1_state = pwrdm_read_pwrst(cpu1_pd);
-        if (cpu1_state != PWRDM_POWER_OFF) {
-                index = drv->safe_state_index;
-                cx = &omap4_idle_data[index];
+        if (dev->cpu == 0 && cpumask_test_cpu(1, cpu_online_mask)) {
+                while (pwrdm_read_pwrst(cpu_pd[1]) != PWRDM_POWER_OFF) {
+                        cpu_relax();
+
+                        /*
+                         * CPU1 could have already entered & exited idle
+                         * without hitting off because of a wakeup
+                         * or a failed attempt to hit off mode.  Check for
+                         * that here, otherwise we could spin forever
+                         * waiting for CPU1 off.
+                         */
+                        if (cpu_done[1])
+                            goto fail;
+
+                }
         }
 
-        if (index > 0)
-                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu_id);
+        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu_id);
 
         /*
          * Call idle CPU PM enter notifier chain so that
          * VFP and per CPU interrupt context is saved.
          */
-        if (cx->cpu_state == PWRDM_POWER_OFF)
-                cpu_pm_enter();
-
-        pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state);
-        omap_set_pwrdm_state(mpu_pd, cx->mpu_state);
-
-        /*
-         * Call idle CPU cluster PM enter notifier chain
-         * to save GIC and wakeupgen context.
-         */
-        if ((cx->mpu_state == PWRDM_POWER_RET) &&
-                (cx->mpu_logic_state == PWRDM_POWER_OFF))
-                        cpu_cluster_pm_enter();
+        cpu_pm_enter();
+
+        if (dev->cpu == 0) {
+                pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state);
+                omap_set_pwrdm_state(mpu_pd, cx->mpu_state);
+
+                /*
+                 * Call idle CPU cluster PM enter notifier chain
+                 * to save GIC and wakeupgen context.
+                 */
+                if ((cx->mpu_state == PWRDM_POWER_RET) &&
+                        (cx->mpu_logic_state == PWRDM_POWER_OFF))
+                                cpu_cluster_pm_enter();
+        }
 
         omap4_enter_lowpower(dev->cpu, cx->cpu_state);
+        cpu_done[dev->cpu] = true;
+
+        /* Wakeup CPU1 only if it is not offlined */
+        if (dev->cpu == 0 && cpumask_test_cpu(1, cpu_online_mask)) {
+                clkdm_wakeup(cpu_clkdm[1]);
+                clkdm_allow_idle(cpu_clkdm[1]);
+        }
 
         /*
          * Call idle CPU PM exit notifier chain to restore
-         * VFP and per CPU IRQ context. Only CPU0 state is
-         * considered since CPU1 is managed by CPU hotplug.
+         * VFP and per CPU IRQ context.
          */
-        if (pwrdm_read_prev_pwrst(cpu0_pd) == PWRDM_POWER_OFF)
-                cpu_pm_exit();
+        cpu_pm_exit();
 
         /*
          * Call idle CPU cluster PM exit notifier chain
@@ -121,8 +150,11 @@ static int omap4_enter_idle(struct cpuidle_device *dev,
         if (omap4_mpuss_read_prev_context_state())
                 cpu_cluster_pm_exit();
 
-        if (index > 0)
-                clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id);
+        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id);
+
+fail:
+        cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
+        cpu_done[dev->cpu] = false;
 
         local_fiq_enable();
 
@@ -141,7 +173,7 @@ struct cpuidle_driver omap4_idle_driver = {
                         .exit_latency = 2 + 2,
                         .target_residency = 5,
                         .flags = CPUIDLE_FLAG_TIME_VALID,
-                        .enter = omap4_enter_idle,
+                        .enter = omap4_enter_idle_simple,
                         .name = "C1",
                         .desc = "MPUSS ON"
                 },
@@ -149,8 +181,8 @@ struct cpuidle_driver omap4_idle_driver = {
                         /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
                         .exit_latency = 328 + 440,
                         .target_residency = 960,
-                        .flags = CPUIDLE_FLAG_TIME_VALID,
-                        .enter = omap4_enter_idle,
+                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
+                        .enter = omap4_enter_idle_coupled,
                         .name = "C2",
                         .desc = "MPUSS CSWR",
                 },
@@ -158,8 +190,8 @@ struct cpuidle_driver omap4_idle_driver = {
                         /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
                         .exit_latency = 460 + 518,
                         .target_residency = 1100,
-                        .flags = CPUIDLE_FLAG_TIME_VALID,
-                        .enter = omap4_enter_idle,
+                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
+                        .enter = omap4_enter_idle_coupled,
                         .name = "C3",
                         .desc = "MPUSS OSWR",
                 },
@@ -168,6 +200,16 @@ struct cpuidle_driver omap4_idle_driver = {
         .safe_state_index = 0,
 };
 
+/*
+ * For each cpu, setup the broadcast timer because local timers
+ * stops for the states above C1.
+ */
+static void omap_setup_broadcast_timer(void *arg)
+{
+        int cpu = smp_processor_id();
+        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
+}
+
 /**
  * omap4_idle_init - Init routine for OMAP4 idle
  *
@@ -180,19 +222,30 @@ int __init omap4_idle_init(void)
         unsigned int cpu_id = 0;
 
         mpu_pd = pwrdm_lookup("mpu_pwrdm");
-        cpu0_pd = pwrdm_lookup("cpu0_pwrdm");
-        cpu1_pd = pwrdm_lookup("cpu1_pwrdm");
-        if ((!mpu_pd) || (!cpu0_pd) || (!cpu1_pd))
+        cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm");
+        cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm");
+        if ((!mpu_pd) || (!cpu_pd[0]) || (!cpu_pd[1]))
                 return -ENODEV;
 
-        dev = &per_cpu(omap4_idle_dev, cpu_id);
-        dev->cpu = cpu_id;
+        cpu_clkdm[0] = clkdm_lookup("mpu0_clkdm");
+        cpu_clkdm[1] = clkdm_lookup("mpu1_clkdm");
+        if (!cpu_clkdm[0] || !cpu_clkdm[1])
+                return -ENODEV;
+
+        /* Configure the broadcast timer on each cpu */
+        on_each_cpu(omap_setup_broadcast_timer, NULL, 1);
+
+        for_each_cpu(cpu_id, cpu_online_mask) {
+                dev = &per_cpu(omap4_idle_dev, cpu_id);
+                dev->cpu = cpu_id;
+                dev->coupled_cpus = *cpu_online_mask;
 
-        cpuidle_register_driver(&omap4_idle_driver);
+                cpuidle_register_driver(&omap4_idle_driver);
 
-        if (cpuidle_register_device(dev)) {
-                pr_err("%s: CPUidle register device failed\n", __func__);
-                return -EIO;
+                if (cpuidle_register_device(dev)) {
+                        pr_err("%s: CPUidle register failed\n", __func__);
+                        return -EIO;
+                }
         }
 
         return 0;
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 5fb47a14f4ba..af1ed7d24a1f 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -37,6 +37,7 @@
 
 #define DISPC_CONTROL           0x0040
 #define DISPC_CONTROL2          0x0238
+#define DISPC_CONTROL3          0x0848
 #define DISPC_IRQSTATUS         0x0018
 
 #define DSS_SYSCONFIG           0x10
@@ -52,6 +53,7 @@
 #define EVSYNC_EVEN_IRQ_SHIFT   2
 #define EVSYNC_ODD_IRQ_SHIFT    3
 #define FRAMEDONE2_IRQ_SHIFT    22
+#define FRAMEDONE3_IRQ_SHIFT    30
 #define FRAMEDONETV_IRQ_SHIFT   24
 
 /*
@@ -376,7 +378,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
 static void dispc_disable_outputs(void)
 {
         u32 v, irq_mask = 0;
-        bool lcd_en, digit_en, lcd2_en = false;
+        bool lcd_en, digit_en, lcd2_en = false, lcd3_en = false;
         int i;
         struct omap_dss_dispc_dev_attr *da;
         struct omap_hwmod *oh;
@@ -405,7 +407,13 @@ static void dispc_disable_outputs(void)
                 lcd2_en = v & LCD_EN_MASK;
         }
 
-        if (!(lcd_en | digit_en | lcd2_en))
+        /* store value of LCDENABLE for LCD3 */
+        if (da->manager_count > 3) {
+                v = omap_hwmod_read(oh, DISPC_CONTROL3);
+                lcd3_en = v & LCD_EN_MASK;
+        }
+
+        if (!(lcd_en | digit_en | lcd2_en | lcd3_en))
                 return; /* no managers currently enabled */
 
         /*
@@ -426,10 +434,12 @@ static void dispc_disable_outputs(void)
 
         if (lcd2_en)
                 irq_mask |= 1 << FRAMEDONE2_IRQ_SHIFT;
+        if (lcd3_en)
+                irq_mask |= 1 << FRAMEDONE3_IRQ_SHIFT;
 
         /*
          * clear any previous FRAMEDONE, FRAMEDONETV,
-         * EVSYNC_EVEN/ODD or FRAMEDONE2 interrupts
+         * EVSYNC_EVEN/ODD, FRAMEDONE2 or FRAMEDONE3 interrupts
          */
         omap_hwmod_write(irq_mask, oh, DISPC_IRQSTATUS);
 
@@ -445,12 +455,19 @@ static void dispc_disable_outputs(void)
                 omap_hwmod_write(v, oh, DISPC_CONTROL2);
         }
 
+        /* disable LCD3 manager */
+        if (da->manager_count > 3) {
+                v = omap_hwmod_read(oh, DISPC_CONTROL3);
+                v &= ~LCD_EN_MASK;
+                omap_hwmod_write(v, oh, DISPC_CONTROL3);
+        }
+
         i = 0;
         while ((omap_hwmod_read(oh, DISPC_IRQSTATUS) & irq_mask) !=
                irq_mask) {
                 i++;
                 if (i > FRAMEDONE_IRQ_TIMEOUT) {
-                        pr_err("didn't get FRAMEDONE1/2 or TV interrupt\n");
+                        pr_err("didn't get FRAMEDONE1/2/3 or TV interrupt\n");
                         break;
                 }
                 mdelay(1);
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index be697d4e0843..a9675d8d1822 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -315,7 +315,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
         mmc->slots[0].caps = c->caps;
         mmc->slots[0].pm_caps = c->pm_caps;
         mmc->slots[0].internal_clock = !c->ext_clock;
-        mmc->dma_mask = 0xffffffff;
         mmc->max_freq = c->max_freq;
         if (cpu_is_omap44xx())
                 mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 13d20c8a283d..2ff6d41ec6c6 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -130,6 +130,7 @@ static struct clock_event_device clockevent_gpt = {
         .name           = "gp_timer",
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .shift          = 32,
+        .rating         = 300,
         .set_next_event = omap2_gp_timer_set_next_event,
         .set_mode       = omap2_gp_timer_set_mode,
 };
@@ -223,7 +224,8 @@ static void __init omap2_gp_clockevent_init(int gptimer_id,
                 clockevent_delta2ns(3, &clockevent_gpt);
                 /* Timer internal resynch latency. */
 
-        clockevent_gpt.cpumask = cpumask_of(0);
+        clockevent_gpt.cpumask = cpu_possible_mask;
+        clockevent_gpt.irq = omap_dm_timer_get_irq(&clkev);
         clockevents_register_device(&clockevent_gpt);
 
         pr_info("OMAP clockevent source: GPTIMER%d at %lu Hz\n",
diff --git a/arch/arm/mach-orion5x/irq.c b/arch/arm/mach-orion5x/irq.c
index b1b45fff776e..17da7091d310 100644
--- a/arch/arm/mach-orion5x/irq.c
+++ b/arch/arm/mach-orion5x/irq.c
@@ -11,19 +11,16 @@
  */
 #include <linux/gpio.h>
 #include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/irq.h>
-#include <linux/io.h>
 #include <mach/bridge-regs.h>
 #include <plat/irq.h>
-#include "common.h"
 
-static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
-{
-        BUG_ON(irq < IRQ_ORION5X_GPIO_0_7 || irq > IRQ_ORION5X_GPIO_24_31);
-
-        orion_gpio_irq_handler((irq - IRQ_ORION5X_GPIO_0_7) << 3);
-}
+static int __initdata gpio0_irqs[4] = {
+        IRQ_ORION5X_GPIO_0_7,
+        IRQ_ORION5X_GPIO_8_15,
+        IRQ_ORION5X_GPIO_16_23,
+        IRQ_ORION5X_GPIO_24_31,
+};
 
 void __init orion5x_init_irq(void)
 {
@@ -32,9 +29,6 @@ void __init orion5x_init_irq(void)
         /*
          * Initialize gpiolib for GPIOs 0-31.
          */
-        orion_gpio_init(0, 32, GPIO_VIRT_BASE, 0, IRQ_ORION5X_GPIO_START);
-        irq_set_chained_handler(IRQ_ORION5X_GPIO_0_7, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_ORION5X_GPIO_8_15, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_ORION5X_GPIO_16_23, gpio_irq_handler);
-        irq_set_chained_handler(IRQ_ORION5X_GPIO_24_31, gpio_irq_handler);
+        orion_gpio_init(NULL, 0, 32, (void __iomem *)GPIO_VIRT_BASE, 0,
+                        IRQ_ORION5X_GPIO_START, gpio0_irqs);
 }
diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c
index 0d024b1e916d..f224107de7bc 100644
--- a/arch/arm/mach-prima2/timer.c
+++ b/arch/arm/mach-prima2/timer.c
@@ -132,11 +132,11 @@ static void sirfsoc_clocksource_resume(struct clocksource *cs)
 {
         int i;
 
-        for (i = 0; i < SIRFSOC_TIMER_REG_CNT; i++)
+        for (i = 0; i < SIRFSOC_TIMER_REG_CNT - 2; i++)
                 writel_relaxed(sirfsoc_timer_reg_val[i], sirfsoc_timer_base + sirfsoc_timer_reg_list[i]);
 
-        writel_relaxed(sirfsoc_timer_reg_val[i - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO);
-        writel_relaxed(sirfsoc_timer_reg_val[i - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI);
+        writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 2], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_LO);
+        writel_relaxed(sirfsoc_timer_reg_val[SIRFSOC_TIMER_REG_CNT - 1], sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI);
 }
 
 static struct clock_event_device sirfsoc_clockevent = {
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 6bb3f47b1f14..0ca0db787903 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -456,7 +456,7 @@ static int lubbock_mci_init(struct device *dev,
         init_timer(&mmc_timer);
         mmc_timer.data = (unsigned long) data;
         return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,
-                        IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);
+                           0, "lubbock-sd-detect", data);
 }
 
 static int lubbock_mci_get_ro(struct device *dev)
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 2db697cd2b4e..39561dcf65f2 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -633,9 +633,8 @@ static struct platform_device bq24022 = {
 static int magician_mci_init(struct device *dev,
                                 irq_handler_t detect_irq, void *data)
 {
-        return request_irq(IRQ_MAGICIAN_SD, detect_irq,
-                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
-                                "mmc card detect", data);
+        return request_irq(IRQ_MAGICIAN_SD, detect_irq, IRQF_DISABLED,
+                           "mmc card detect", data);
 }
 
 static void magician_mci_exit(struct device *dev, void *data)
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 2b6ac00b2cd9..166dd32cc1d3 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -332,8 +332,8 @@ static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int,
         int err;
 
         err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,
-                IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_SAMPLE_RANDOM,
-                "MMC card detect", data);
+                          IRQF_DISABLED | IRQF_TRIGGER_RISING,
+                          "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request"
                                                 "MMC card detect IRQ\n");
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 0f882ecb7d81..6ec300549960 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -120,182 +120,156 @@ struct pl08x_channel_data spear300_dma_info[] = {
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart0_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "irda",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "adc",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "to_jpeg",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "from_jpeg",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras0_rx",
                 .min_signal = 0,
                 .max_signal = 0,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras0_tx",
                 .min_signal = 1,
                 .max_signal = 1,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras1_rx",
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras1_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras2_rx",
                 .min_signal = 4,
                 .max_signal = 4,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras2_tx",
                 .min_signal = 5,
                 .max_signal = 5,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras3_rx",
                 .min_signal = 6,
                 .max_signal = 6,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras3_tx",
                 .min_signal = 7,
                 .max_signal = 7,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras4_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras4_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras5_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras5_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras6_rx",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras6_tx",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras7_rx",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras7_tx",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         },
 };
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c
index bbcf4571d361..1d0e435b9045 100644
--- a/arch/arm/mach-spear3xx/spear310.c
+++ b/arch/arm/mach-spear3xx/spear310.c
@@ -205,182 +205,156 @@ struct pl08x_channel_data spear310_dma_info[] = {
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart0_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "irda",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "adc",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "to_jpeg",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "from_jpeg",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart1_rx",
                 .min_signal = 0,
                 .max_signal = 0,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart1_tx",
                 .min_signal = 1,
                 .max_signal = 1,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart2_rx",
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart2_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart3_rx",
                 .min_signal = 4,
                 .max_signal = 4,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart3_tx",
                 .min_signal = 5,
                 .max_signal = 5,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart4_rx",
                 .min_signal = 6,
                 .max_signal = 6,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart4_tx",
                 .min_signal = 7,
                 .max_signal = 7,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart5_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart5_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras5_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras5_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras6_rx",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras6_tx",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras7_rx",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras7_tx",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         },
 };
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
index 88d483bcd66a..fd823c624575 100644
--- a/arch/arm/mach-spear3xx/spear320.c
+++ b/arch/arm/mach-spear3xx/spear320.c
@@ -213,182 +213,156 @@ struct pl08x_channel_data spear320_dma_info[] = {
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart0_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c0_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c0_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "irda",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "adc",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "to_jpeg",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "from_jpeg",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp1_rx",
                 .min_signal = 0,
                 .max_signal = 0,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ssp1_tx",
                 .min_signal = 1,
                 .max_signal = 1,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ssp2_rx",
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ssp2_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "uart1_rx",
                 .min_signal = 4,
                 .max_signal = 4,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "uart1_tx",
                 .min_signal = 5,
                 .max_signal = 5,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "uart2_rx",
                 .min_signal = 6,
                 .max_signal = 6,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "uart2_tx",
                 .min_signal = 7,
                 .max_signal = 7,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "i2c1_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "i2c1_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "i2c2_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "i2c2_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "i2s_rx",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "i2s_tx",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "rs485_rx",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "rs485_tx",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         },
 };
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index 66db5f13af84..98144baf8883 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -46,7 +46,8 @@ struct pl022_ssp_controller pl022_plat_data = {
 struct pl08x_platform_data pl080_plat_data = {
         .memcpy_channel = {
                 .bus_id = "memcpy",
-                .cctl = (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \
+                .cctl_memcpy =
+                        (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \
                         PL080_BSIZE_16 << PL080_CONTROL_DB_SIZE_SHIFT | \
                         PL080_WIDTH_32BIT << PL080_CONTROL_SWIDTH_SHIFT | \
                         PL080_WIDTH_32BIT << PL080_CONTROL_DWIDTH_SHIFT | \
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
index 9af67d003c62..5a5a52db252b 100644
--- a/arch/arm/mach-spear6xx/spear6xx.c
+++ b/arch/arm/mach-spear6xx/spear6xx.c
@@ -36,336 +36,288 @@ static struct pl08x_channel_data spear600_dma_info[] = {
                 .min_signal = 0,
                 .max_signal = 0,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp1_tx",
                 .min_signal = 1,
                 .max_signal = 1,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart0_rx",
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart0_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart1_rx",
                 .min_signal = 4,
                 .max_signal = 4,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "uart1_tx",
                 .min_signal = 5,
                 .max_signal = 5,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp2_rx",
                 .min_signal = 6,
                 .max_signal = 6,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ssp2_tx",
                 .min_signal = 7,
                 .max_signal = 7,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ssp0_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ssp0_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "i2c_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "irda",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "adc",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "to_jpeg",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "from_jpeg",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 0,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras0_rx",
                 .min_signal = 0,
                 .max_signal = 0,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras0_tx",
                 .min_signal = 1,
                 .max_signal = 1,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras1_rx",
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras1_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras2_rx",
                 .min_signal = 4,
                 .max_signal = 4,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras2_tx",
                 .min_signal = 5,
                 .max_signal = 5,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras3_rx",
                 .min_signal = 6,
                 .max_signal = 6,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras3_tx",
                 .min_signal = 7,
                 .max_signal = 7,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras4_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras4_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras5_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras5_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras6_rx",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras6_tx",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras7_rx",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ras7_tx",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 1,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB1,
         }, {
                 .bus_id = "ext0_rx",
                 .min_signal = 0,
                 .max_signal = 0,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext0_tx",
                 .min_signal = 1,
                 .max_signal = 1,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext1_rx",
                 .min_signal = 2,
                 .max_signal = 2,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext1_tx",
                 .min_signal = 3,
                 .max_signal = 3,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext2_rx",
                 .min_signal = 4,
                 .max_signal = 4,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext2_tx",
                 .min_signal = 5,
                 .max_signal = 5,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext3_rx",
                 .min_signal = 6,
                 .max_signal = 6,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext3_tx",
                 .min_signal = 7,
                 .max_signal = 7,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext4_rx",
                 .min_signal = 8,
                 .max_signal = 8,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext4_tx",
                 .min_signal = 9,
                 .max_signal = 9,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext5_rx",
                 .min_signal = 10,
                 .max_signal = 10,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext5_tx",
                 .min_signal = 11,
                 .max_signal = 11,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext6_rx",
                 .min_signal = 12,
                 .max_signal = 12,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext6_tx",
                 .min_signal = 13,
                 .max_signal = 13,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext7_rx",
                 .min_signal = 14,
                 .max_signal = 14,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         }, {
                 .bus_id = "ext7_tx",
                 .min_signal = 15,
                 .max_signal = 15,
                 .muxval = 2,
-                .cctl = 0,
                 .periph_buses = PL08X_AHB2,
         },
 };
@@ -373,7 +325,8 @@ static struct pl08x_channel_data spear600_dma_info[] = {
 struct pl08x_platform_data pl080_plat_data = {
         .memcpy_channel = {
                 .bus_id = "memcpy",
-                .cctl = (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \
+                .cctl_memcpy =
+                        (PL080_BSIZE_16 << PL080_CONTROL_SB_SIZE_SHIFT | \
                         PL080_BSIZE_16 << PL080_CONTROL_DB_SIZE_SHIFT | \
                         PL080_WIDTH_32BIT << PL080_CONTROL_SWIDTH_SHIFT | \
                         PL080_WIDTH_32BIT << PL080_CONTROL_DWIDTH_SHIFT | \
diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S
index 845f461f8ec1..c2021139cb56 100644
--- a/arch/arm/mm/tlb-v7.S
+++ b/arch/arm/mm/tlb-v7.S
@@ -38,11 +38,19 @@ ENTRY(v7wbi_flush_user_tlb_range)
         dsb
         mov     r0, r0, lsr #PAGE_SHIFT         @ align address
         mov     r1, r1, lsr #PAGE_SHIFT
+#ifdef CONFIG_ARM_ERRATA_720789
+        mov     r3, #0
+#else
         asid    r3, r3                          @ mask ASID
+#endif
         orr     r0, r3, r0, lsl #PAGE_SHIFT     @ Create initial MVA
         mov     r1, r1, lsl #PAGE_SHIFT
 1:
+#ifdef CONFIG_ARM_ERRATA_720789
+        ALT_SMP(mcr     p15, 0, r0, c8, c3, 3)  @ TLB invalidate U MVA all ASID (shareable)
+#else
         ALT_SMP(mcr     p15, 0, r0, c8, c3, 1)  @ TLB invalidate U MVA (shareable)
+#endif
         ALT_UP(mcr      p15, 0, r0, c8, c7, 1)  @ TLB invalidate U MVA
 
         add     r0, r0, #PAGE_SZ
@@ -67,7 +75,11 @@ ENTRY(v7wbi_flush_kern_tlb_range)
         mov     r0, r0, lsl #PAGE_SHIFT
         mov     r1, r1, lsl #PAGE_SHIFT
 1:
+#ifdef CONFIG_ARM_ERRATA_720789
+        ALT_SMP(mcr     p15, 0, r0, c8, c3, 3)  @ TLB invalidate U MVA all ASID (shareable)
+#else
         ALT_SMP(mcr     p15, 0, r0, c8, c3, 1)  @ TLB invalidate U MVA (shareable)
+#endif
         ALT_UP(mcr      p15, 0, r0, c8, c7, 1)  @ TLB invalidate U MVA
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index c2193178210b..3ed1adbc09f8 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -23,6 +23,7 @@
 
 #include <mach/hardware.h>
 #include <mach/common.h>
+#include <mach/irqs.h>
 
 #include "irq-common.h"
 
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index 5493bd95da5e..eb3e4d555343 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -81,8 +81,6 @@ struct omap_mmc_platform_data {
         /* Return context loss count due to PM states changing */
         int (*get_context_loss_count)(struct device *dev);
 
-        u64 dma_mask;
-
         /* Integrating attributes from the omap_hwmod layer */
         u8 controller_flags;
 
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index c1793786aea9..d245a87dc014 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -47,6 +47,7 @@ void __init orion_clkdev_init(struct clk *tclk)
         orion_clkdev_add(NULL, MV643XX_ETH_NAME ".2", tclk);
         orion_clkdev_add(NULL, MV643XX_ETH_NAME ".3", tclk);
         orion_clkdev_add(NULL, "orion_wdt", tclk);
+        orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", tclk);
 }
 
 /* Fill in the resources structure and link it into the platform
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index af95af257301..dfda74fae6f2 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -8,15 +8,22 @@
  * warranty of any kind, whether express or implied.
  */
 
+#define DEBUG
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_address.h>
+#include <plat/gpio.h>
 
 /*
  * GPIO unit register offsets.
@@ -38,6 +45,7 @@ struct orion_gpio_chip {
         unsigned long           valid_output;
         int                     mask_offset;
         int                     secondary_irq_base;
+        struct irq_domain       *domain;
 };
 
 static void __iomem *GPIO_OUT(struct orion_gpio_chip *ochip)
@@ -222,10 +230,10 @@ static int orion_gpio_to_irq(struct gpio_chip *chip, unsigned pin)
         struct orion_gpio_chip *ochip =
                 container_of(chip, struct orion_gpio_chip, chip);
 
-        return ochip->secondary_irq_base + pin;
+        return irq_create_mapping(ochip->domain,
+                                  ochip->secondary_irq_base + pin);
 }
 
-
 /*
  * Orion-specific GPIO API extensions.
  */
@@ -353,12 +361,10 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)
         int pin;
         u32 u;
 
-        pin = d->irq - gc->irq_base;
+        pin = d->hwirq - ochip->secondary_irq_base;
 
         u = readl(GPIO_IO_CONF(ochip)) & (1 << pin);
         if (!u) {
-                printk(KERN_ERR "orion gpio_irq_set_type failed "
-                                "(irq %d, pin %d).\n", d->irq, pin);
                 return -EINVAL;
         }
 
@@ -397,17 +403,53 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)
                         u &= ~(1 << pin);       /* rising */
                 writel(u, GPIO_IN_POL(ochip));
         }
-
         return 0;
 }
 
-void __init orion_gpio_init(int gpio_base, int ngpio,
-                            u32 base, int mask_offset, int secondary_irq_base)
+static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)
+{
+        struct orion_gpio_chip *ochip = irq_get_handler_data(irq);
+        u32 cause, type;
+        int i;
+
+        if (ochip == NULL)
+                return;
+
+        cause = readl(GPIO_DATA_IN(ochip)) & readl(GPIO_LEVEL_MASK(ochip));
+        cause |= readl(GPIO_EDGE_CAUSE(ochip)) & readl(GPIO_EDGE_MASK(ochip));
+
+        for (i = 0; i < ochip->chip.ngpio; i++) {
+                int irq;
+
+                irq = ochip->secondary_irq_base + i;
+
+                if (!(cause & (1 << i)))
+                        continue;
+
+                type = irqd_get_trigger_type(irq_get_irq_data(irq));
+                if ((type & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
+                        /* Swap polarity (race with GPIO line) */
+                        u32 polarity;
+
+                        polarity = readl(GPIO_IN_POL(ochip));
+                        polarity ^= 1 << i;
+                        writel(polarity, GPIO_IN_POL(ochip));
+                }
+                generic_handle_irq(irq);
+        }
+}
+
+void __init orion_gpio_init(struct device_node *np,
+                            int gpio_base, int ngpio,
+                            void __iomem *base, int mask_offset,
+                            int secondary_irq_base,
+                            int irqs[4])
 {
         struct orion_gpio_chip *ochip;
         struct irq_chip_generic *gc;
         struct irq_chip_type *ct;
         char gc_label[16];
+        int i;
 
         if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))
                 return;
@@ -426,6 +468,10 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
         ochip->chip.base = gpio_base;
         ochip->chip.ngpio = ngpio;
         ochip->chip.can_sleep = 0;
+#ifdef CONFIG_OF
+        ochip->chip.of_node = np;
+#endif
+
         spin_lock_init(&ochip->lock);
         ochip->base = (void __iomem *)base;
         ochip->valid_input = 0;
@@ -435,8 +481,6 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
 
         gpiochip_add(&ochip->chip);
 
-        orion_gpio_chip_count++;
-
         /*
          * Mask and clear GPIO interrupts.
          */
@@ -444,16 +488,28 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
         writel(0, GPIO_EDGE_MASK(ochip));
         writel(0, GPIO_LEVEL_MASK(ochip));
 
-        gc = irq_alloc_generic_chip("orion_gpio_irq", 2, secondary_irq_base,
+        /* Setup the interrupt handlers. Each chip can have up to 4
+         * interrupt handlers, with each handler dealing with 8 GPIO
+         * pins. */
+
+        for (i = 0; i < 4; i++) {
+                if (irqs[i]) {
+                        irq_set_handler_data(irqs[i], ochip);
+                        irq_set_chained_handler(irqs[i], gpio_irq_handler);
+                }
+        }
+
+        gc = irq_alloc_generic_chip("orion_gpio_irq", 2,
+                                    secondary_irq_base,
                                     ochip->base, handle_level_irq);
         gc->private = ochip;
-
         ct = gc->chip_types;
         ct->regs.mask = ochip->mask_offset + GPIO_LEVEL_MASK_OFF;
         ct->type = IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW;
         ct->chip.irq_mask = irq_gc_mask_clr_bit;
         ct->chip.irq_unmask = irq_gc_mask_set_bit;
         ct->chip.irq_set_type = gpio_irq_set_type;
+        ct->chip.name = ochip->chip.label;
 
         ct++;
         ct->regs.mask = ochip->mask_offset + GPIO_EDGE_MASK_OFF;
@@ -464,41 +520,69 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
         ct->chip.irq_unmask = irq_gc_mask_set_bit;
         ct->chip.irq_set_type = gpio_irq_set_type;
         ct->handler = handle_edge_irq;
+        ct->chip.name = ochip->chip.label;
 
         irq_setup_generic_chip(gc, IRQ_MSK(ngpio), IRQ_GC_INIT_MASK_CACHE,
                                IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
-}
 
-void orion_gpio_irq_handler(int pinoff)
-{
-        struct orion_gpio_chip *ochip;
-        u32 cause, type;
-        int i;
-
-        ochip = orion_gpio_chip_find(pinoff);
-        if (ochip == NULL)
-                return;
-
-        cause = readl(GPIO_DATA_IN(ochip)) & readl(GPIO_LEVEL_MASK(ochip));
-        cause |= readl(GPIO_EDGE_CAUSE(ochip)) & readl(GPIO_EDGE_MASK(ochip));
-
-        for (i = 0; i < ochip->chip.ngpio; i++) {
-                int irq;
+        /* Setup irq domain on top of the generic chip. */
+        ochip->domain = irq_domain_add_legacy(np,
+                                              ochip->chip.ngpio,
+                                              ochip->secondary_irq_base,
+                                              ochip->secondary_irq_base,
+                                              &irq_domain_simple_ops,
+                                              ochip);
+        if (!ochip->domain)
+                panic("%s: couldn't allocate irq domain (DT).\n",
+                      ochip->chip.label);
 
-                irq = ochip->secondary_irq_base + i;
+        orion_gpio_chip_count++;
+}
 
-                if (!(cause & (1 << i)))
-                        continue;
+#ifdef CONFIG_OF
+static void __init orion_gpio_of_init_one(struct device_node *np,
+                                          int irq_gpio_base)
+{
+        int ngpio, gpio_base, mask_offset;
+        void __iomem *base;
+        int ret, i;
+        int irqs[4];
+        int secondary_irq_base;
+
+        ret = of_property_read_u32(np, "ngpio", &ngpio);
+        if (ret)
+                goto out;
+        ret = of_property_read_u32(np, "mask-offset", &mask_offset);
+        if (ret == -EINVAL)
+                mask_offset = 0;
+        else
+                goto out;
+        base = of_iomap(np, 0);
+        if (!base)
+                goto out;
+
+        secondary_irq_base = irq_gpio_base + (32 * orion_gpio_chip_count);
+        gpio_base = 32 * orion_gpio_chip_count;
+
+        /* Get the interrupt numbers. Each chip can have up to 4
+         * interrupt handlers, with each handler dealing with 8 GPIO
+         * pins. */
+
+        for (i = 0; i < 4; i++)
+                irqs[i] = irq_of_parse_and_map(np, i);
+
+        orion_gpio_init(np, gpio_base, ngpio, base, mask_offset,
+                        secondary_irq_base, irqs);
+        return;
+out:
+        pr_err("%s: %s: missing mandatory property\n", __func__, np->name);
+}
 
-                type = irqd_get_trigger_type(irq_get_irq_data(irq));
-                if ((type & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
-                        /* Swap polarity (race with GPIO line) */
-                        u32 polarity;
+void __init orion_gpio_of_init(int irq_gpio_base)
+{
+        struct device_node *np;
 
-                        polarity = readl(GPIO_IN_POL(ochip));
-                        polarity ^= 1 << i;
-                        writel(polarity, GPIO_IN_POL(ochip));
-                }
-                generic_handle_irq(irq);
-        }
+        for_each_compatible_node(np, NULL, "marvell,orion-gpio")
+                orion_gpio_of_init_one(np, irq_gpio_base);
 }
+#endif
diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h
index bec0c98ce41f..81c6fc8a7b28 100644
--- a/arch/arm/plat-orion/include/plat/gpio.h
+++ b/arch/arm/plat-orion/include/plat/gpio.h
@@ -13,7 +13,7 @@
 
 #include <linux/init.h>
 #include <linux/types.h>
-
+#include <linux/irqdomain.h>
 /*
  * Orion-specific GPIO API extensions.
  */
@@ -27,13 +27,11 @@ int orion_gpio_led_blink_set(unsigned gpio, int state,
 void orion_gpio_set_valid(unsigned pin, int mode);
 
 /* Initialize gpiolib. */
-void __init orion_gpio_init(int gpio_base, int ngpio,
-                            u32 base, int mask_offset, int secondary_irq_base);
-
-/*
- * GPIO interrupt handling.
- */
-void orion_gpio_irq_handler(int irqoff);
-
+void __init orion_gpio_init(struct device_node *np,
+                            int gpio_base, int ngpio,
+                            void __iomem *base, int mask_offset,
+                            int secondary_irq_base,
+                            int irq[4]);
 
+void __init orion_gpio_of_init(int irq_gpio_base);
 #endif
diff --git a/arch/arm/plat-orion/include/plat/irq.h b/arch/arm/plat-orion/include/plat/irq.h
index f05eeab94968..50547e417936 100644
--- a/arch/arm/plat-orion/include/plat/irq.h
+++ b/arch/arm/plat-orion/include/plat/irq.h
@@ -12,6 +12,5 @@
 #define __PLAT_IRQ_H
 
 void orion_irq_init(unsigned int irq_start, void __iomem *maskaddr);
-
-
+void __init orion_dt_init_irq(void);
 #endif
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index 2d5b9c1ef389..d751964def4c 100644
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -11,8 +11,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <plat/irq.h>
+#include <plat/gpio.h>
 
 void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
 {
@@ -32,3 +36,39 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
         irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE,
                                IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
 }
+
+#ifdef CONFIG_OF
+static int __init orion_add_irq_domain(struct device_node *np,
+                                       struct device_node *interrupt_parent)
+{
+        int i = 0, irq_gpio;
+        void __iomem *base;
+
+        do {
+                base = of_iomap(np, i);
+                if (base) {
+                        orion_irq_init(i * 32, base);
+                        i++;
+                }
+        } while (base);
+
+        irq_domain_add_legacy(np, i * 32, 0, 0,
+                              &irq_domain_simple_ops, NULL);
+
+        irq_gpio = i * 32;
+        orion_gpio_of_init(irq_gpio);
+
+        return 0;
+}
+
+static const struct of_device_id orion_irq_match[] = {
+        { .compatible = "marvell,orion-intc",
+          .data = orion_add_irq_domain, },
+        {},
+};
+
+void __init orion_dt_init_irq(void)
+{
+        of_irq_init(orion_irq_match);
+}
+#endif
diff --git a/arch/arm/plat-spear/include/plat/pl080.h b/arch/arm/plat-spear/include/plat/pl080.h
index 2bc6b54460a8..eb6590ded40d 100644
--- a/arch/arm/plat-spear/include/plat/pl080.h
+++ b/arch/arm/plat-spear/include/plat/pl080.h
@@ -14,8 +14,8 @@
 #ifndef __PLAT_PL080_H
 #define __PLAT_PL080_H
 
-struct pl08x_dma_chan;
-int pl080_get_signal(struct pl08x_dma_chan *ch);
-void pl080_put_signal(struct pl08x_dma_chan *ch);
+struct pl08x_channel_data;
+int pl080_get_signal(const struct pl08x_channel_data *cd);
+void pl080_put_signal(const struct pl08x_channel_data *cd, int signal);
 
 #endif /* __PLAT_PL080_H */
diff --git a/arch/arm/plat-spear/pl080.c b/arch/arm/plat-spear/pl080.c
index 12cf27f935f9..cfa1199d0f4a 100644
--- a/arch/arm/plat-spear/pl080.c
+++ b/arch/arm/plat-spear/pl080.c
@@ -27,9 +27,8 @@ struct {
         unsigned char val;
 } signals[16] = {{0, 0}, };
 
-int pl080_get_signal(struct pl08x_dma_chan *ch)
+int pl080_get_signal(const struct pl08x_channel_data *cd)
 {
-        const struct pl08x_channel_data *cd = ch->cd;
         unsigned int signal = cd->min_signal, val;
         unsigned long flags;
 
@@ -63,18 +62,17 @@ int pl080_get_signal(struct pl08x_dma_chan *ch)
         return signal;
 }
 
-void pl080_put_signal(struct pl08x_dma_chan *ch)
+void pl080_put_signal(const struct pl08x_channel_data *cd, int signal)
 {
-        const struct pl08x_channel_data *cd = ch->cd;
         unsigned long flags;
 
         spin_lock_irqsave(&lock, flags);
 
         /* if signal is not used */
-        if (!signals[cd->min_signal].busy)
+        if (!signals[signal].busy)
                 BUG();
 
-        signals[cd->min_signal].busy--;
+        signals[signal].busy--;
 
         spin_unlock_irqrestore(&lock, flags);
 }
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index 4fa9903b83cf..cc926c985981 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -7,18 +7,20 @@
  * 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.
- *
- * Basic entry code, called from the kernel's undefined instruction trap.
- *  r0  = faulted instruction
- *  r5  = faulted PC+4
- *  r9  = successful return
- *  r10 = thread_info structure
- *  lr  = failure return
  */
 #include <asm/thread_info.h>
 #include <asm/vfpmacros.h>
 #include "../kernel/entry-header.S"
 
+@ VFP entry point.
+@
+@  r0  = instruction opcode (32-bit ARM or two 16-bit Thumb)
+@  r2  = PC value to resume execution after successful emulation
+@  r9  = normal "successful" return address
+@  r10 = this threads thread_info structure
+@  lr  = unrecognised instruction return address
+@  IRQs disabled.
+@
 ENTRY(do_vfp)
 #ifdef CONFIG_PREEMPT
         ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index d50f0e486cf2..ea0349f63586 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -62,13 +62,13 @@
 
 @ VFP hardware support entry point.
 @
-@  r0  = faulted instruction
-@  r2  = faulted PC+4
-@  r9  = successful return
+@  r0  = instruction opcode (32-bit ARM or two 16-bit Thumb)
+@  r2  = PC value to resume execution after successful emulation
+@  r9  = normal "successful" return address
 @  r10 = vfp_state union
 @  r11 = CPU number
-@  lr  = failure return
-
+@  lr  = unrecognised instruction return address
+@  IRQs enabled.
 ENTRY(vfp_support_entry)
         DBGSTR3 "instr %08x pc %08x state %p", r0, r2, r10
 
@@ -162,9 +162,12 @@ vfp_hw_state_valid:
                                         @ exception before retrying branch
                                         @ out before setting an FPEXC that
                                         @ stops us reading stuff
-        VFPFMXR FPEXC, r1               @ restore FPEXC last
-        sub     r2, r2, #4
-        str     r2, [sp, #S_PC]         @ retry the instruction
+        VFPFMXR FPEXC, r1               @ Restore FPEXC last
+        sub     r2, r2, #4              @ Retry current instruction - if Thumb
+        str     r2, [sp, #S_PC]         @ mode it's two 16-bit instructions,
+                                        @ else it's one 32-bit instruction, so
+                                        @ always subtract 4 from the following
+                                        @ instruction address.
 #ifdef CONFIG_PREEMPT
         get_thread_info r10
         ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 586961929e96..fb849d044bde 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -457,10 +457,16 @@ static int vfp_pm_suspend(void)
 
                 /* disable, just in case */
                 fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
+        } else if (vfp_current_hw_state[ti->cpu]) {
+#ifndef CONFIG_SMP
+                fmxr(FPEXC, fpexc | FPEXC_EN);
+                vfp_save_state(vfp_current_hw_state[ti->cpu], fpexc);
+                fmxr(FPEXC, fpexc);
+#endif
         }
 
         /* clear any information we had about last context state */
-        memset(vfp_current_hw_state, 0, sizeof(vfp_current_hw_state));
+        vfp_current_hw_state[ti->cpu] = NULL;
 
         return 0;
 }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 5c3e0888265a..1034884b77da 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -23,7 +23,6 @@
 #include <linux/ioport.h>
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
-#include <linux/random.h>       /* for rand_initialize_irq() */
 #include <linux/signal.h>
 #include <linux/smp.h>
 #include <linux/threads.h>
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index d7f558c1e711..3fa4bc536953 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -2353,7 +2353,6 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
          */
         insert_vm_struct(mm, vma);
 
-        mm->total_vm  += size >> PAGE_SHIFT;
         vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
                                                         vma_pages(vma));
         up_write(&task->mm->mmap_sem);
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e3efc06e6409..331d574df99c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -77,6 +77,7 @@ config AR7
         select SYS_SUPPORTS_ZBOOT_UART16550
         select ARCH_REQUIRE_GPIOLIB
         select VLYNQ
+        select HAVE_CLK
         help
           Support for the Texas Instruments AR7 System-on-a-Chip
           family: TNETD7100, 7200 and 7300.
@@ -124,6 +125,7 @@ config BCM63XX
         select SYS_HAS_EARLY_PRINTK
         select SWAP_IO_SPACE
         select ARCH_REQUIRE_GPIOLIB
+        select HAVE_CLK
         help
          Support for BCM63XX based boards
 
diff --git a/arch/mips/include/asm/clock.h b/arch/mips/include/asm/clock.h
index 83894aa7932c..c9456e7a7283 100644
--- a/arch/mips/include/asm/clock.h
+++ b/arch/mips/include/asm/clock.h
@@ -50,15 +50,4 @@ void clk_recalc_rate(struct clk *);
 int clk_register(struct clk *);
 void clk_unregister(struct clk *);
 
-/* the exported API, in addition to clk_set_rate */
-/**
- * clk_set_rate_ex - set the clock rate for a clock source, with additional parameter
- * @clk: clock source
- * @rate: desired clock rate in Hz
- * @algo_id: algorithm id to be passed down to ops->set_rate
- *
- * Returns success (0) or negative errno.
- */
-int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id);
-
 #endif                          /* __ASM_MIPS_CLOCK_H */
diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
index 06367c37e1b2..5222a007bc21 100644
--- a/arch/mips/include/asm/mach-loongson/loongson.h
+++ b/arch/mips/include/asm/mach-loongson/loongson.h
@@ -245,7 +245,6 @@ static inline void do_perfcnt_IRQ(void)
 
 #ifdef CONFIG_CPU_SUPPORTS_CPUFREQ
 #include <linux/cpufreq.h>
-extern void loongson2_cpu_wait(void);
 extern struct cpufreq_frequency_table loongson2_clockmod_table[];
 
 /* Chip Config */
diff --git a/arch/mips/kernel/cpufreq/Makefile b/arch/mips/kernel/cpufreq/Makefile
index c3479a432efe..05a5715ee38c 100644
--- a/arch/mips/kernel/cpufreq/Makefile
+++ b/arch/mips/kernel/cpufreq/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the Linux/MIPS cpufreq.
 #
 
-obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o loongson2_clock.o
+obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
diff --git a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c b/arch/mips/kernel/cpufreq/loongson2_cpufreq.c
index ae5db206347c..e7c98e2b78b6 100644
--- a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c
+++ b/arch/mips/kernel/cpufreq/loongson2_cpufreq.c
@@ -19,7 +19,7 @@
 
 #include <asm/clock.h>
 
-#include <loongson.h>
+#include <asm/mach-loongson/loongson.h>
 
 static uint nowait;
 
@@ -181,6 +181,25 @@ static struct platform_driver platform_driver = {
         .id_table = platform_device_ids,
 };
 
+/*
+ * This is the simple version of Loongson-2 wait, Maybe we need do this in
+ * interrupt disabled context.
+ */
+
+static DEFINE_SPINLOCK(loongson2_wait_lock);
+
+static void loongson2_cpu_wait(void)
+{
+        unsigned long flags;
+        u32 cpu_freq;
+
+        spin_lock_irqsave(&loongson2_wait_lock, flags);
+        cpu_freq = LOONGSON_CHIPCFG0;
+        LOONGSON_CHIPCFG0 &= ~0x7;      /* Put CPU into wait mode */
+        LOONGSON_CHIPCFG0 = cpu_freq;   /* Restore CPU state */
+        spin_unlock_irqrestore(&loongson2_wait_lock, flags);
+}
+
 static int __init cpufreq_init(void)
 {
         int ret;
diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
index d3bcc33f4699..ce2f129b081f 100644
--- a/arch/mips/lantiq/clk.c
+++ b/arch/mips/lantiq/clk.c
@@ -135,6 +135,11 @@ void clk_deactivate(struct clk *clk)
 }
 EXPORT_SYMBOL(clk_deactivate);
 
+struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec)
+{
+        return NULL;
+}
+
 static inline u32 get_counter_resolution(void)
 {
         u32 res;
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
index d185e8477fdf..6cfd6117fbfd 100644
--- a/arch/mips/lantiq/prom.c
+++ b/arch/mips/lantiq/prom.c
@@ -8,7 +8,10 @@
 
 #include <linux/export.h>
 #include <linux/clk.h>
+#include <linux/bootmem.h>
 #include <linux/of_platform.h>
+#include <linux/of_fdt.h>
+
 #include <asm/bootinfo.h>
 #include <asm/time.h>
 
@@ -70,6 +73,25 @@ void __init plat_mem_setup(void)
         __dt_setup_arch(&__dtb_start);
 }
 
+void __init device_tree_init(void)
+{
+        unsigned long base, size;
+
+        if (!initial_boot_params)
+                return;
+
+        base = virt_to_phys((void *)initial_boot_params);
+        size = be32_to_cpu(initial_boot_params->totalsize);
+
+        /* Before we do anything, lets reserve the dt blob */
+        reserve_bootmem(base, size, BOOTMEM_DEFAULT);
+
+        unflatten_device_tree();
+
+        /* free the space reserved for the dt blob */
+        free_bootmem(base, size);
+}
+
 void __init prom_init(void)
 {
         /* call the soc specific detetcion code and get it to fill soc_info */
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index 83780f7c842b..befbb760ab76 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -20,10 +20,12 @@
 
 /* clock control register */
 #define CGU_IFCCR       0x0018
+#define CGU_IFCCR_VR9   0x0024
 /* system clock register */
 #define CGU_SYS         0x0010
 /* pci control register */
 #define CGU_PCICR       0x0034
+#define CGU_PCICR_VR9   0x0038
 /* ephy configuration register */
 #define CGU_EPHY        0x10
 /* power control register */
@@ -80,6 +82,9 @@ static void __iomem *pmu_membase;
 void __iomem *ltq_cgu_membase;
 void __iomem *ltq_ebu_membase;
 
+static u32 ifccr = CGU_IFCCR;
+static u32 pcicr = CGU_PCICR;
+
 /* legacy function kept alive to ease clkdev transition */
 void ltq_pmu_enable(unsigned int module)
 {
@@ -103,14 +108,14 @@ EXPORT_SYMBOL(ltq_pmu_disable);
 /* enable a hw clock */
 static int cgu_enable(struct clk *clk)
 {
-        ltq_cgu_w32(ltq_cgu_r32(CGU_IFCCR) | clk->bits, CGU_IFCCR);
+        ltq_cgu_w32(ltq_cgu_r32(ifccr) | clk->bits, ifccr);
         return 0;
 }
 
 /* disable a hw clock */
 static void cgu_disable(struct clk *clk)
 {
-        ltq_cgu_w32(ltq_cgu_r32(CGU_IFCCR) & ~clk->bits, CGU_IFCCR);
+        ltq_cgu_w32(ltq_cgu_r32(ifccr) & ~clk->bits, ifccr);
 }
 
 /* enable a clock gate */
@@ -138,22 +143,22 @@ static void pmu_disable(struct clk *clk)
 /* the pci enable helper */
 static int pci_enable(struct clk *clk)
 {
-        unsigned int ifccr = ltq_cgu_r32(CGU_IFCCR);
+        unsigned int val = ltq_cgu_r32(ifccr);
         /* set bus clock speed */
         if (of_machine_is_compatible("lantiq,ar9")) {
-                ifccr &= ~0x1f00000;
+                val &= ~0x1f00000;
                 if (clk->rate == CLOCK_33M)
-                        ifccr |= 0xe00000;
+                        val |= 0xe00000;
                 else
-                        ifccr |= 0x700000; /* 62.5M */
+                        val |= 0x700000; /* 62.5M */
         } else {
-                ifccr &= ~0xf00000;
+                val &= ~0xf00000;
                 if (clk->rate == CLOCK_33M)
-                        ifccr |= 0x800000;
+                        val |= 0x800000;
                 else
-                        ifccr |= 0x400000; /* 62.5M */
+                        val |= 0x400000; /* 62.5M */
         }
-        ltq_cgu_w32(ifccr, CGU_IFCCR);
+        ltq_cgu_w32(val, ifccr);
         pmu_enable(clk);
         return 0;
 }
@@ -161,18 +166,16 @@ static int pci_enable(struct clk *clk)
 /* enable the external clock as a source */
 static int pci_ext_enable(struct clk *clk)
 {
-        ltq_cgu_w32(ltq_cgu_r32(CGU_IFCCR) & ~(1 << 16),
-                CGU_IFCCR);
-        ltq_cgu_w32((1 << 30), CGU_PCICR);
+        ltq_cgu_w32(ltq_cgu_r32(ifccr) & ~(1 << 16), ifccr);
+        ltq_cgu_w32((1 << 30), pcicr);
         return 0;
 }
 
 /* disable the external clock as a source */
 static void pci_ext_disable(struct clk *clk)
 {
-        ltq_cgu_w32(ltq_cgu_r32(CGU_IFCCR) | (1 << 16),
-                CGU_IFCCR);
-        ltq_cgu_w32((1 << 31) | (1 << 30), CGU_PCICR);
+        ltq_cgu_w32(ltq_cgu_r32(ifccr) | (1 << 16), ifccr);
+        ltq_cgu_w32((1 << 31) | (1 << 30), pcicr);
 }
 
 /* enable a clockout source */
@@ -184,11 +187,11 @@ static int clkout_enable(struct clk *clk)
         for (i = 0; i < 4; i++) {
                 if (clk->rates[i] == clk->rate) {
                         int shift = 14 - (2 * clk->module);
-                        unsigned int ifccr = ltq_cgu_r32(CGU_IFCCR);
+                        unsigned int val = ltq_cgu_r32(ifccr);
 
-                        ifccr &= ~(3 << shift);
-                        ifccr |= i << shift;
-                        ltq_cgu_w32(ifccr, CGU_IFCCR);
+                        val &= ~(3 << shift);
+                        val |= i << shift;
+                        ltq_cgu_w32(val, ifccr);
                         return 0;
                 }
         }
@@ -336,8 +339,12 @@ void __init ltq_soc_init(void)
         clkdev_add_clkout();
 
         /* add the soc dependent clocks */
-        if (!of_machine_is_compatible("lantiq,vr9"))
+        if (of_machine_is_compatible("lantiq,vr9")) {
+                ifccr = CGU_IFCCR_VR9;
+                pcicr = CGU_PCICR_VR9;
+        } else {
                 clkdev_add_pmu("1e180000.etop", NULL, 0, PMU_PPE);
+        }
 
         if (!of_machine_is_compatible("lantiq,ase")) {
                 clkdev_add_pmu("1e100c00.serial", NULL, 0, PMU_ASC1);
diff --git a/arch/mips/loongson/Kconfig b/arch/mips/loongson/Kconfig
index aca93eed8779..263beb9322a8 100644
--- a/arch/mips/loongson/Kconfig
+++ b/arch/mips/loongson/Kconfig
@@ -41,6 +41,7 @@ config LEMOTE_MACH2F
         select CSRC_R4K if ! MIPS_EXTERNAL_TIMER
         select DMA_NONCOHERENT
         select GENERIC_ISA_DMA_SUPPORT_BROKEN
+        select HAVE_CLK
         select HW_HAS_PCI
         select I8259
         select IRQ_CPU
diff --git a/arch/mips/loongson/lemote-2f/Makefile b/arch/mips/loongson/lemote-2f/Makefile
index 8699a53f0477..4f9eaa328a16 100644
--- a/arch/mips/loongson/lemote-2f/Makefile
+++ b/arch/mips/loongson/lemote-2f/Makefile
@@ -2,7 +2,7 @@
 # Makefile for lemote loongson2f family machines
 #
 
-obj-y += machtype.o irq.o reset.o ec_kb3310b.o
+obj-y += clock.o machtype.o irq.o reset.o ec_kb3310b.o
 
 #
 # Suspend Support
diff --git a/arch/mips/kernel/cpufreq/loongson2_clock.c b/arch/mips/loongson/lemote-2f/clock.c
index 5426779d9fdb..bc739d4bab2e 100644
--- a/arch/mips/kernel/cpufreq/loongson2_clock.c
+++ b/arch/mips/loongson/lemote-2f/clock.c
@@ -6,14 +6,17 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
-
-#include <linux/module.h>
+#include <linux/clk.h>
 #include <linux/cpufreq.h>
-#include <linux/platform_device.h>
+#include <linux/errno.h>
+#include <linux/export.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/mutex.h>
+#include <linux/spinlock.h>
 
 #include <asm/clock.h>
-
-#include <loongson.h>
+#include <asm/mach-loongson/loongson.h>
 
 static LIST_HEAD(clock_list);
 static DEFINE_SPINLOCK(clock_lock);
@@ -89,12 +92,6 @@ EXPORT_SYMBOL(clk_put);
 
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
-        return clk_set_rate_ex(clk, rate, 0);
-}
-EXPORT_SYMBOL_GPL(clk_set_rate);
-
-int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
-{
         int ret = 0;
         int regval;
         int i;
@@ -103,7 +100,7 @@ int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
                 unsigned long flags;
 
                 spin_lock_irqsave(&clock_lock, flags);
-                ret = clk->ops->set_rate(clk, rate, algo_id);
+                ret = clk->ops->set_rate(clk, rate, 0);
                 spin_unlock_irqrestore(&clock_lock, flags);
         }
 
@@ -129,7 +126,7 @@ int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id)
 
         return ret;
 }
-EXPORT_SYMBOL_GPL(clk_set_rate_ex);
+EXPORT_SYMBOL_GPL(clk_set_rate);
 
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
@@ -146,26 +143,3 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
         return rate;
 }
 EXPORT_SYMBOL_GPL(clk_round_rate);
-
-/*
- * This is the simple version of Loongson-2 wait, Maybe we need do this in
- * interrupt disabled content
- */
-
-DEFINE_SPINLOCK(loongson2_wait_lock);
-void loongson2_cpu_wait(void)
-{
-        u32 cpu_freq;
-        unsigned long flags;
-
-        spin_lock_irqsave(&loongson2_wait_lock, flags);
-        cpu_freq = LOONGSON_CHIPCFG0;
-        LOONGSON_CHIPCFG0 &= ~0x7;      /* Put CPU into wait mode */
-        LOONGSON_CHIPCFG0 = cpu_freq;   /* Restore CPU state */
-        spin_unlock_irqrestore(&loongson2_wait_lock, flags);
-}
-EXPORT_SYMBOL_GPL(loongson2_cpu_wait);
-
-MODULE_AUTHOR("Yanhua <yanh@lemote.com>");
-MODULE_DESCRIPTION("cpufreq driver for Loongson 2F");
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/loongson1/Kconfig b/arch/mips/loongson1/Kconfig
index 237fa214de9f..a9a14d6e81af 100644
--- a/arch/mips/loongson1/Kconfig
+++ b/arch/mips/loongson1/Kconfig
@@ -15,6 +15,7 @@ config LOONGSON1_LS1B
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_HIGHMEM
         select SYS_HAS_EARLY_PRINTK
+        select HAVE_CLK
 
 endchoice
 
diff --git a/arch/mips/loongson1/common/clock.c b/arch/mips/loongson1/common/clock.c
index 2d98fb030596..1bbbbec12085 100644
--- a/arch/mips/loongson1/common/clock.c
+++ b/arch/mips/loongson1/common/clock.c
@@ -38,12 +38,28 @@ struct clk *clk_get(struct device *dev, const char *name)
 }
 EXPORT_SYMBOL(clk_get);
 
+int clk_enable(struct clk *clk)
+{
+        return 0;
+}
+EXPORT_SYMBOL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_disable);
+
 unsigned long clk_get_rate(struct clk *clk)
 {
         return clk->rate;
 }
 EXPORT_SYMBOL(clk_get_rate);
 
+void clk_put(struct clk *clk)
+{
+}
+EXPORT_SYMBOL(clk_put);
+
 static void pll_clk_init(struct clk *clk)
 {
         u32 pll;
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index b105eca3c020..cd8fcab6b054 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -401,6 +401,7 @@ static void __init node_mem_init(cnodeid_t node)
          * Allocate the node data structures on the node first.
          */
         __node_data[node] = __va(slot_freepfn << PAGE_SHIFT);
+        memset(__node_data[node], 0, PAGE_SIZE);
 
         NODE_DATA(node)->bdata = &bootmem_node_data[node];
         NODE_DATA(node)->node_start_pfn = start_pfn;
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index 852ae4bb7a85..6d40bc783459 100644
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -20,6 +20,7 @@ config MACH_TXX9
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_SUPPORTS_BIG_ENDIAN
+        select HAVE_CLK
 
 config TOSHIBA_JMR3927
         bool "Toshiba JMR-TX3927 board"
diff --git a/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts b/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts
index 852e5b27485d..57573bd52caa 100644
--- a/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts
+++ b/arch/powerpc/boot/dts/p2020rdb-pc_32b.dts
@@ -56,7 +56,7 @@
                 ranges = <0x0 0x0 0xffe00000 0x100000>;
         };
 
-        pci0: pcie@ffe08000 {
+        pci2: pcie@ffe08000 {
                 reg = <0 0xffe08000 0 0x1000>;
                 status = "disabled";
         };
@@ -76,7 +76,7 @@
                 };
         };
 
-        pci2: pcie@ffe0a000 {
+        pci0: pcie@ffe0a000 {
                 reg = <0 0xffe0a000 0 0x1000>;
                 ranges = <0x2000000 0x0 0xe0000000 0 0x80000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
diff --git a/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts b/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts
index b5a56ca51cf7..470247ea68b4 100644
--- a/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts
+++ b/arch/powerpc/boot/dts/p2020rdb-pc_36b.dts
@@ -56,7 +56,7 @@
                 ranges = <0x0 0xf 0xffe00000 0x100000>;
         };
 
-        pci0: pcie@fffe08000 {
+        pci2: pcie@fffe08000 {
                 reg = <0xf 0xffe08000 0 0x1000>;
                 status = "disabled";
         };
@@ -76,7 +76,7 @@
                 };
         };
 
-        pci2: pcie@fffe0a000 {
+        pci0: pcie@fffe0a000 {
                 reg = <0xf 0xffe0a000 0 0x1000>;
                 ranges = <0x2000000 0x0 0xe0000000 0xc 0x00000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>;
diff --git a/arch/powerpc/boot/dts/p3041ds.dts b/arch/powerpc/boot/dts/p3041ds.dts
index 22a215e94162..6cdcadc80c30 100644
--- a/arch/powerpc/boot/dts/p3041ds.dts
+++ b/arch/powerpc/boot/dts/p3041ds.dts
@@ -58,7 +58,7 @@
                                 #size-cells = <1>;
                                 compatible = "spansion,s25sl12801";
                                 reg = <0>;
-                                spi-max-frequency = <40000000>; /* input clock */
+                                spi-max-frequency = <35000000>; /* input clock */
                                 partition@u-boot {
                                         label = "u-boot";
                                         reg = <0x00000000 0x00100000>;
diff --git a/arch/powerpc/configs/chroma_defconfig b/arch/powerpc/configs/chroma_defconfig
index b1f9597fe312..29bb11ec6c64 100644
--- a/arch/powerpc/configs/chroma_defconfig
+++ b/arch/powerpc/configs/chroma_defconfig
@@ -21,8 +21,8 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEMCG=y
+CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_NAMESPACES=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index ab523f3c1731..9ecf6e35cd8d 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -67,7 +67,6 @@ kvmppc_skip_Hinterrupt:
 #elif defined(CONFIG_PPC_BOOK3S_32)
 
 #define FUNC(name)              name
-#define MTMSR_EERI(reg)         mtmsr   (reg)
 
 .macro INTERRUPT_TRAMPOLINE intno
 
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 89ee02c54561..3c732acf331d 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -208,6 +208,7 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
         u8 __iomem *lbc_lcs0_ba = NULL;
         u8 __iomem *lbc_lcs1_ba = NULL;
         phys_addr_t cs0_addr, cs1_addr;
+        u32 br0, or0, br1, or1;
         const __be32 *iprop;
         unsigned int num_laws;
         u8 b;
@@ -256,11 +257,70 @@ static void p1022ds_set_monitor_port(enum fsl_diu_monitor_port port)
         }
         num_laws = be32_to_cpup(iprop);
 
-        cs0_addr = lbc_br_to_phys(ecm, num_laws, in_be32(&lbc->bank[0].br));
-        cs1_addr = lbc_br_to_phys(ecm, num_laws, in_be32(&lbc->bank[1].br));
+        /*
+         * Indirect mode requires both BR0 and BR1 to be set to "GPCM",
+         * otherwise writes to these addresses won't actually appear on the
+         * local bus, and so the PIXIS won't see them.
+         *
+         * In FCM mode, writes go to the NAND controller, which does not pass
+         * them to the localbus directly.  So we force BR0 and BR1 into GPCM
+         * mode, since we don't care about what's behind the localbus any
+         * more.
+         */
+        br0 = in_be32(&lbc->bank[0].br);
+        br1 = in_be32(&lbc->bank[1].br);
+        or0 = in_be32(&lbc->bank[0].or);
+        or1 = in_be32(&lbc->bank[1].or);
+
+        /* Make sure CS0 and CS1 are programmed */
+        if (!(br0 & BR_V) || !(br1 & BR_V)) {
+                pr_err("p1022ds: CS0 and/or CS1 is not programmed\n");
+                goto exit;
+        }
+
+        /*
+         * Use the existing BRx/ORx values if it's already GPCM. Otherwise,
+         * force the values to simple 32KB GPCM windows with the most
+         * conservative timing.
+         */
+        if ((br0 & BR_MSEL) != BR_MS_GPCM) {
+                br0 = (br0 & BR_BA) | BR_V;
+                or0 = 0xFFFF8000 | 0xFF7;
+                out_be32(&lbc->bank[0].br, br0);
+                out_be32(&lbc->bank[0].or, or0);
+        }
+        if ((br1 & BR_MSEL) != BR_MS_GPCM) {
+                br1 = (br1 & BR_BA) | BR_V;
+                or1 = 0xFFFF8000 | 0xFF7;
+                out_be32(&lbc->bank[1].br, br1);
+                out_be32(&lbc->bank[1].or, or1);
+        }
+
+        cs0_addr = lbc_br_to_phys(ecm, num_laws, br0);
+        if (!cs0_addr) {
+                pr_err("p1022ds: could not determine physical address for CS0"
+                       " (BR0=%08x)\n", br0);
+                goto exit;
+        }
+        cs1_addr = lbc_br_to_phys(ecm, num_laws, br1);
+        if (!cs0_addr) {
+                pr_err("p1022ds: could not determine physical address for CS1"
+                       " (BR1=%08x)\n", br1);
+                goto exit;
+        }
 
         lbc_lcs0_ba = ioremap(cs0_addr, 1);
+        if (!lbc_lcs0_ba) {
+                pr_err("p1022ds: could not ioremap CS0 address %llx\n",
+                       (unsigned long long)cs0_addr);
+                goto exit;
+        }
         lbc_lcs1_ba = ioremap(cs1_addr, 1);
+        if (!lbc_lcs1_ba) {
+                pr_err("p1022ds: could not ioremap CS1 address %llx\n",
+                       (unsigned long long)cs1_addr);
+                goto exit;
+        }
 
         /* Make sure we're in indirect mode first. */
         if ((in_be32(&guts->pmuxcr) & PMUXCR_ELBCDIU_MASK) !=
@@ -419,18 +479,6 @@ void __init p1022_ds_pic_init(void)
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
 
-/*
- * Disables a node in the device tree.
- *
- * This function is called before kmalloc() is available, so the 'new' object
- * should be allocated in the global area.  The easiest way is to do that is
- * to allocate one static local variable for each call to this function.
- */
-static void __init disable_one_node(struct device_node *np, struct property *new)
-{
-        prom_update_property(np, new);
-}
-
 /* TRUE if there is a "video=fslfb" command-line parameter. */
 static bool fslfb;
 
@@ -493,28 +541,58 @@ static void __init p1022_ds_setup_arch(void)
         diu_ops.valid_monitor_port      = p1022ds_valid_monitor_port;
 
         /*
-         * Disable the NOR flash node if there is video=fslfb... command-line
-         * parameter.  When the DIU is active, NOR flash is unavailable, so we
-         * have to disable the node before the MTD driver loads.
+         * Disable the NOR and NAND flash nodes if there is video=fslfb...
+         * command-line parameter.  When the DIU is active, the localbus is
+         * unavailable, so we have to disable these nodes before the MTD
+         * driver loads.
          */
         if (fslfb) {
                 struct device_node *np =
                         of_find_compatible_node(NULL, NULL, "fsl,p1022-elbc");
 
                 if (np) {
-                        np = of_find_compatible_node(np, NULL, "cfi-flash");
-                        if (np) {
+                        struct device_node *np2;
+
+                        of_node_get(np);
+                        np2 = of_find_compatible_node(np, NULL, "cfi-flash");
+                        if (np2) {
                                 static struct property nor_status = {
                                         .name = "status",
                                         .value = "disabled",
                                         .length = sizeof("disabled"),
                                 };
 
+                                /*
+                                 * prom_update_property() is called before
+                                 * kmalloc() is available, so the 'new' object
+                                 * should be allocated in the global area.
+                                 * The easiest way is to do that is to
+                                 * allocate one static local variable for each
+                                 * call to this function.
+                                 */
                                 pr_info("p1022ds: disabling %s node",
-                                        np->full_name);
-                                disable_one_node(np, &nor_status);
-                                of_node_put(np);
+                                        np2->full_name);
+                                prom_update_property(np2, &nor_status);
+                                of_node_put(np2);
                         }
+
+                        of_node_get(np);
+                        np2 = of_find_compatible_node(np, NULL,
+                                                      "fsl,elbc-fcm-nand");
+                        if (np2) {
+                                static struct property nand_status = {
+                                        .name = "status",
+                                        .value = "disabled",
+                                        .length = sizeof("disabled"),
+                                };
+
+                                pr_info("p1022ds: disabling %s node",
+                                        np2->full_name);
+                                prom_update_property(np2, &nand_status);
+                                of_node_put(np2);
+                        }
+
+                        of_node_put(np);
                 }
 
         }
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index d544d7816df3..dba1ce235da5 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -186,10 +186,13 @@ static void spufs_prune_dir(struct dentry *dir)
 static int spufs_rmdir(struct inode *parent, struct dentry *dir)
 {
         /* remove all entries */
+        int res;
         spufs_prune_dir(dir);
         d_drop(dir);
-
-        return simple_rmdir(parent, dir);
+        res = simple_rmdir(parent, dir);
+        /* We have to give up the mm_struct */
+        spu_forget(SPUFS_I(dir->d_inode)->i_ctx);
+        return res;
 }
 
 static int spufs_fill_dir(struct dentry *dir,
@@ -245,9 +248,6 @@ static int spufs_dir_close(struct inode *inode, struct file *file)
         mutex_unlock(&parent->i_mutex);
         WARN_ON(ret);
 
-        /* We have to give up the mm_struct */
-        spu_forget(ctx);
-
         return dcache_dir_close(inode, file);
 }
 
@@ -450,28 +450,24 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
         struct spu_context *neighbor;
         struct path path = {.mnt = mnt, .dentry = dentry};
 
-        ret = -EPERM;
         if ((flags & SPU_CREATE_NOSCHED) &&
             !capable(CAP_SYS_NICE))
-                goto out_unlock;
+                return -EPERM;
 
-        ret = -EINVAL;
         if ((flags & (SPU_CREATE_NOSCHED | SPU_CREATE_ISOLATE))
             == SPU_CREATE_ISOLATE)
-                goto out_unlock;
+                return -EINVAL;
 
-        ret = -ENODEV;
         if ((flags & SPU_CREATE_ISOLATE) && !isolated_loader)
-                goto out_unlock;
+                return -ENODEV;
 
         gang = NULL;
         neighbor = NULL;
         affinity = flags & (SPU_CREATE_AFFINITY_MEM | SPU_CREATE_AFFINITY_SPU);
         if (affinity) {
                 gang = SPUFS_I(inode)->i_gang;
-                ret = -EINVAL;
                 if (!gang)
-                        goto out_unlock;
+                        return -EINVAL;
                 mutex_lock(&gang->aff_mutex);
                 neighbor = spufs_assert_affinity(flags, gang, aff_filp);
                 if (IS_ERR(neighbor)) {
@@ -492,22 +488,12 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
         }
 
         ret = spufs_context_open(&path);
-        if (ret < 0) {
+        if (ret < 0)
                 WARN_ON(spufs_rmdir(inode, dentry));
-                if (affinity)
-                        mutex_unlock(&gang->aff_mutex);
-                mutex_unlock(&inode->i_mutex);
-                spu_forget(SPUFS_I(dentry->d_inode)->i_ctx);
-                goto out;
-        }
 
 out_aff_unlock:
         if (affinity)
                 mutex_unlock(&gang->aff_mutex);
-out_unlock:
-        mutex_unlock(&inode->i_mutex);
-out:
-        dput(dentry);
         return ret;
 }
 
@@ -580,18 +566,13 @@ static int spufs_create_gang(struct inode *inode,
         int ret;
 
         ret = spufs_mkgang(inode, dentry, mode & S_IRWXUGO);
-        if (ret)
-                goto out;
-
-        ret = spufs_gang_open(&path);
-        if (ret < 0) {
-                int err = simple_rmdir(inode, dentry);
-                WARN_ON(err);
+        if (!ret) {
+                ret = spufs_gang_open(&path);
+                if (ret < 0) {
+                        int err = simple_rmdir(inode, dentry);
+                        WARN_ON(err);
+                }
         }
-
-out:
-        mutex_unlock(&inode->i_mutex);
-        dput(dentry);
         return ret;
 }
 
@@ -601,40 +582,32 @@ static struct file_system_type spufs_type;
 long spufs_create(struct path *path, struct dentry *dentry,
                 unsigned int flags, umode_t mode, struct file *filp)
 {
+        struct inode *dir = path->dentry->d_inode;
         int ret;
 
-        ret = -EINVAL;
         /* check if we are on spufs */
         if (path->dentry->d_sb->s_type != &spufs_type)
-                goto out;
+                return -EINVAL;
 
         /* don't accept undefined flags */
         if (flags & (~SPU_CREATE_FLAG_ALL))
-                goto out;
+                return -EINVAL;
 
         /* only threads can be underneath a gang */
-        if (path->dentry != path->dentry->d_sb->s_root) {
-                if ((flags & SPU_CREATE_GANG) ||
-                    !SPUFS_I(path->dentry->d_inode)->i_gang)
-                        goto out;
-        }
+        if (path->dentry != path->dentry->d_sb->s_root)
+                if ((flags & SPU_CREATE_GANG) || !SPUFS_I(dir)->i_gang)
+                        return -EINVAL;
 
         mode &= ~current_umask();
 
         if (flags & SPU_CREATE_GANG)
-                ret = spufs_create_gang(path->dentry->d_inode,
-                                         dentry, path->mnt, mode);
+                ret = spufs_create_gang(dir, dentry, path->mnt, mode);
         else
-                ret = spufs_create_context(path->dentry->d_inode,
-                                            dentry, path->mnt, flags, mode,
+                ret = spufs_create_context(dir, dentry, path->mnt, flags, mode,
                                             filp);
         if (ret >= 0)
-                fsnotify_mkdir(path->dentry->d_inode, dentry);
-        return ret;
+                fsnotify_mkdir(dir, dentry);
 
-out:
-        mutex_unlock(&path->dentry->d_inode->i_mutex);
-        dput(dentry);
         return ret;
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 5665dcc382c7..5b7d8ffbf890 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -70,7 +70,7 @@ static long do_spu_create(const char __user *pathname, unsigned int flags,
         ret = PTR_ERR(dentry);
         if (!IS_ERR(dentry)) {
                 ret = spufs_create(&path, dentry, flags, mode, neighbor);
-                path_put(&path);
+                done_path_create(&path, dentry);
         }
 
         return ret;
diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h b/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
index 60c9c0bd5ba2..2aa97ddb7b78 100644
--- a/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
+++ b/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Freescale Semiconductor, Inc
+ * Copyright 2009-2010, 2012 Freescale Semiconductor, Inc
  *
  * QorIQ based Cache Controller Memory Mapped Registers
  *
@@ -91,7 +91,7 @@ struct mpc85xx_l2ctlr {
 
 struct sram_parameters {
         unsigned int sram_size;
-        uint64_t sram_offset;
+        phys_addr_t sram_offset;
 };
 
 extern int instantiate_cache_sram(struct platform_device *dev,
diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
index cedabd0f4bfe..68ac3aacb191 100644
--- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
+++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2010, 2012 Freescale Semiconductor, Inc.
  *
  * QorIQ (P1/P2) L2 controller init for Cache-SRAM instantiation
  *
@@ -31,24 +31,21 @@ static char *sram_size;
 static char *sram_offset;
 struct mpc85xx_l2ctlr __iomem *l2ctlr;
 
-static long get_cache_sram_size(void)
+static int get_cache_sram_params(struct sram_parameters *sram_params)
 {
-        unsigned long val;
+        unsigned long long addr;
+        unsigned int size;
 
-        if (!sram_size || (strict_strtoul(sram_size, 0, &val) < 0))
+        if (!sram_size || (kstrtouint(sram_size, 0, &size) < 0))
                 return -EINVAL;
 
-        return val;
-}
-
-static long get_cache_sram_offset(void)
-{
-        unsigned long val;
-
-        if (!sram_offset || (strict_strtoul(sram_offset, 0, &val) < 0))
+        if (!sram_offset || (kstrtoull(sram_offset, 0, &addr) < 0))
                 return -EINVAL;
 
-        return val;
+        sram_params->sram_offset = addr;
+        sram_params->sram_size = size;
+
+        return 0;
 }
 
 static int __init get_size_from_cmdline(char *str)
@@ -93,17 +90,9 @@ static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev)
         }
         l2cache_size = *prop;
 
-        sram_params.sram_size  = get_cache_sram_size();
-        if ((int)sram_params.sram_size <= 0) {
-                dev_err(&dev->dev,
-                        "Entire L2 as cache, Aborting Cache-SRAM stuff\n");
-                return -EINVAL;
-        }
-
-        sram_params.sram_offset  = get_cache_sram_offset();
-        if ((int64_t)sram_params.sram_offset <= 0) {
+        if (get_cache_sram_params(&sram_params)) {
                 dev_err(&dev->dev,
-                        "Entire L2 as cache, provide a valid sram offset\n");
+                        "Entire L2 as cache, provide valid sram offset and size\n");
                 return -EINVAL;
         }
 
@@ -125,14 +114,14 @@ static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev)
          * Write bits[0-17] to srbar0
          */
         out_be32(&l2ctlr->srbar0,
-                sram_params.sram_offset & L2SRAM_BAR_MSK_LO18);
+                lower_32_bits(sram_params.sram_offset) & L2SRAM_BAR_MSK_LO18);
 
         /*
          * Write bits[18-21] to srbare0
          */
 #ifdef CONFIG_PHYS_64BIT
         out_be32(&l2ctlr->srbarea0,
-                (sram_params.sram_offset >> 32) & L2SRAM_BARE_MSK_HI4);
+                upper_32_bits(sram_params.sram_offset) & L2SRAM_BARE_MSK_HI4);
 #endif
 
         clrsetbits_be32(&l2ctlr->ctl, L2CR_L2E, L2CR_L2FI);
diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c
index 253dce98c16e..14469cf9df68 100644
--- a/arch/powerpc/sysdev/xics/icp-hv.c
+++ b/arch/powerpc/sysdev/xics/icp-hv.c
@@ -111,7 +111,7 @@ static unsigned int icp_hv_get_irq(void)
         if (vec == XICS_IRQ_SPURIOUS)
                 return NO_IRQ;
 
-        irq = irq_radix_revmap_lookup(xics_host, vec);
+        irq = irq_find_mapping(xics_host, vec);
         if (likely(irq != NO_IRQ)) {
                 xics_push_cppr(vec);
                 return irq;
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index 4c79b6fbee1c..48861d3fcd07 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -119,7 +119,7 @@ static unsigned int icp_native_get_irq(void)
         if (vec == XICS_IRQ_SPURIOUS)
                 return NO_IRQ;
 
-        irq = irq_radix_revmap_lookup(xics_host, vec);
+        irq = irq_find_mapping(xics_host, vec);
         if (likely(irq != NO_IRQ)) {
                 xics_push_cppr(vec);
                 return irq;
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index cd1d18db92c6..9049d9f44485 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -329,9 +329,6 @@ static int xics_host_map(struct irq_domain *h, unsigned int virq,
 
         pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
 
-        /* Insert the interrupt mapping into the radix tree for fast lookup */
-        irq_radix_revmap_insert(xics_host, virq, hw);
-
         /* They aren't all level sensitive but we just don't really know */
         irq_set_status_flags(virq, IRQ_LEVEL);
 
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 296cd32466df..76de6b68487c 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -90,6 +90,7 @@ config S390
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_CMPXCHG_LOCAL
         select ARCH_DISCARD_MEMBLOCK
+        select BUILDTIME_EXTABLE_SORT
         select ARCH_INLINE_SPIN_TRYLOCK
         select ARCH_INLINE_SPIN_TRYLOCK_BH
         select ARCH_INLINE_SPIN_LOCK
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 37d2bf267964..f39cd710980b 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -7,13 +7,16 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEMCG=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@@ -35,8 +38,6 @@ CONFIG_MODVERSIONS=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
 CONFIG_DEFAULT_DEADLINE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 5c63615f1349..b749c5733657 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -11,7 +11,6 @@
 #include <asm/uaccess.h>
 #include <asm/tlbflush.h>
 #include <asm/ctl_reg.h>
-#include <asm-generic/mm_hooks.h>
 
 static inline int init_new_context(struct task_struct *tsk,
                                    struct mm_struct *mm)
@@ -58,7 +57,7 @@ static inline void update_mm(struct mm_struct *mm, struct task_struct *tsk)
         pgd_t *pgd = mm->pgd;
 
         S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd);
-        if (user_mode != HOME_SPACE_MODE) {
+        if (addressing_mode != HOME_SPACE_MODE) {
                 /* Load primary space page table origin. */
                 asm volatile(LCTL_OPCODE" 1,1,%0\n"
                              : : "m" (S390_lowcore.user_asce) );
@@ -91,4 +90,17 @@ static inline void activate_mm(struct mm_struct *prev,
         switch_mm(prev, next, current);
 }
 
+static inline void arch_dup_mmap(struct mm_struct *oldmm,
+                                 struct mm_struct *mm)
+{
+#ifdef CONFIG_64BIT
+        if (oldmm->context.asce_limit < mm->context.asce_limit)
+                crst_table_downgrade(mm, oldmm->context.asce_limit);
+#endif
+}
+
+static inline void arch_exit_mmap(struct mm_struct *mm)
+{
+}
+
 #endif /* __S390_MMU_CONTEXT_H */
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index c40fa91e38a8..11e4e3236937 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -120,7 +120,9 @@ struct stack_frame {
         regs->psw.mask  = psw_user_bits | PSW_MASK_BA;                  \
         regs->psw.addr  = new_psw | PSW_ADDR_AMODE;                     \
         regs->gprs[15]  = new_stackp;                                   \
+        __tlb_flush_mm(current->mm);                                    \
         crst_table_downgrade(current->mm, 1UL << 31);                   \
+        update_mm(current->mm, current);                                \
 } while (0)
 
 /* Forward declaration, a strange C thing */
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 57e80534375a..e6859d16ee2d 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -60,7 +60,7 @@ void create_mem_hole(struct mem_chunk memory_chunk[], unsigned long addr,
 #define SECONDARY_SPACE_MODE    2
 #define HOME_SPACE_MODE         3
 
-extern unsigned int user_mode;
+extern unsigned int addressing_mode;
 
 /*
  * Machine features detected in head.S
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index 21be961e8a43..ba500d8dc392 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -110,6 +110,7 @@ struct debug_view debug_raw_view = {
         NULL,
         NULL
 };
+EXPORT_SYMBOL(debug_raw_view);
 
 struct debug_view debug_hex_ascii_view = {
         "hex_ascii",
@@ -119,6 +120,7 @@ struct debug_view debug_hex_ascii_view = {
         NULL,
         NULL
 };
+EXPORT_SYMBOL(debug_hex_ascii_view);
 
 static struct debug_view debug_level_view = {
         "level",
@@ -155,6 +157,7 @@ struct debug_view debug_sprintf_view = {
         NULL,
         NULL
 };
+EXPORT_SYMBOL(debug_sprintf_view);
 
 /* used by dump analysis tools to determine version of debug feature */
 static unsigned int __used debug_feature_version = __DEBUG_FEATURE_VERSION;
@@ -730,6 +733,7 @@ debug_info_t *debug_register(const char *name, int pages_per_area,
         return debug_register_mode(name, pages_per_area, nr_areas, buf_size,
                                    S_IRUSR | S_IWUSR, 0, 0);
 }
+EXPORT_SYMBOL(debug_register);
 
 /*
  * debug_unregister:
@@ -748,6 +752,7 @@ debug_unregister(debug_info_t * id)
 out:
         return;
 }
+EXPORT_SYMBOL(debug_unregister);
 
 /*
  * debug_set_size:
@@ -810,7 +815,7 @@ debug_set_level(debug_info_t* id, int new_level)
         }
         spin_unlock_irqrestore(&id->lock,flags);
 }
-
+EXPORT_SYMBOL(debug_set_level);
 
 /*
  * proceed_active_entry:
@@ -930,7 +935,7 @@ debug_stop_all(void)
         if (debug_stoppable)
                 debug_active = 0;
 }
-
+EXPORT_SYMBOL(debug_stop_all);
 
 void debug_set_critical(void)
 {
@@ -963,6 +968,7 @@ debug_event_common(debug_info_t * id, int level, const void *buf, int len)
 
         return active;
 }
+EXPORT_SYMBOL(debug_event_common);
 
 /*
  * debug_exception_common:
@@ -990,6 +996,7 @@ debug_entry_t
 
         return active;
 }
+EXPORT_SYMBOL(debug_exception_common);
 
 /*
  * counts arguments in format string for sprintf view
@@ -1043,6 +1050,7 @@ debug_sprintf_event(debug_info_t* id, int level,char *string,...)
 
         return active;
 }
+EXPORT_SYMBOL(debug_sprintf_event);
 
 /*
  * debug_sprintf_exception:
@@ -1081,25 +1089,7 @@ debug_sprintf_exception(debug_info_t* id, int level,char *string,...)
 
         return active;
 }
-
-/*
- * debug_init:
- * - is called exactly once to initialize the debug feature
- */
-
-static int
-__init debug_init(void)
-{
-        int rc = 0;
-
-        s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table);
-        mutex_lock(&debug_mutex);
-        debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT,NULL);
-        initialized = 1;
-        mutex_unlock(&debug_mutex);
-
-        return rc;
-}
+EXPORT_SYMBOL(debug_sprintf_exception);
 
 /*
  * debug_register_view:
@@ -1147,6 +1137,7 @@ debug_register_view(debug_info_t * id, struct debug_view *view)
 out:
         return rc;
 }
+EXPORT_SYMBOL(debug_register_view);
 
 /*
  * debug_unregister_view:
@@ -1176,6 +1167,7 @@ debug_unregister_view(debug_info_t * id, struct debug_view *view)
 out:
         return rc;
 }
+EXPORT_SYMBOL(debug_unregister_view);
 
 static inline char *
 debug_get_user_string(const char __user *user_buf, size_t user_len)
@@ -1485,6 +1477,7 @@ debug_dflt_header_fn(debug_info_t * id, struct debug_view *view,
                       except_str, entry->id.fields.cpuid, (void *) caller);
         return rc;
 }
+EXPORT_SYMBOL(debug_dflt_header_fn);
 
 /*
  * prints debug data sprintf-formated:
@@ -1533,33 +1526,16 @@ out:
 }
 
 /*
- * clean up module
+ * debug_init:
+ * - is called exactly once to initialize the debug feature
  */
-static void __exit debug_exit(void)
+static int __init debug_init(void)
 {
-        debugfs_remove(debug_debugfs_root_entry);
-        unregister_sysctl_table(s390dbf_sysctl_header);
-        return;
+        s390dbf_sysctl_header = register_sysctl_table(s390dbf_dir_table);
+        mutex_lock(&debug_mutex);
+        debug_debugfs_root_entry = debugfs_create_dir(DEBUG_DIR_ROOT, NULL);
+        initialized = 1;
+        mutex_unlock(&debug_mutex);
+        return 0;
 }
-
-/*
- * module definitions
- */
 postcore_initcall(debug_init);
-module_exit(debug_exit);
-MODULE_LICENSE("GPL");
-
-EXPORT_SYMBOL(debug_register);
-EXPORT_SYMBOL(debug_unregister); 
-EXPORT_SYMBOL(debug_set_level);
-EXPORT_SYMBOL(debug_stop_all);
-EXPORT_SYMBOL(debug_register_view);
-EXPORT_SYMBOL(debug_unregister_view);
-EXPORT_SYMBOL(debug_event_common);
-EXPORT_SYMBOL(debug_exception_common);
-EXPORT_SYMBOL(debug_hex_ascii_view);
-EXPORT_SYMBOL(debug_raw_view);
-EXPORT_SYMBOL(debug_dflt_header_fn);
-EXPORT_SYMBOL(debug_sprintf_view);
-EXPORT_SYMBOL(debug_sprintf_exception);
-EXPORT_SYMBOL(debug_sprintf_event);
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 1f6b428e2762..619c5d350726 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1531,7 +1531,7 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
 
 void show_code(struct pt_regs *regs)
 {
-        char *mode = (regs->psw.mask & PSW_MASK_PSTATE) ? "User" : "Krnl";
+        char *mode = user_mode(regs) ? "User" : "Krnl";
         unsigned char code[64];
         char buffer[64], *ptr;
         mm_segment_t old_fs;
@@ -1540,7 +1540,7 @@ void show_code(struct pt_regs *regs)
 
         /* Get a snapshot of the 64 bytes surrounding the fault address. */
         old_fs = get_fs();
-        set_fs((regs->psw.mask & PSW_MASK_PSTATE) ? USER_DS : KERNEL_DS);
+        set_fs(user_mode(regs) ? USER_DS : KERNEL_DS);
         for (start = 32; start && regs->psw.addr >= 34 - start; start -= 2) {
                 addr = regs->psw.addr - 34 + start;
                 if (__copy_from_user(code + start - 2,
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index bc95a8ebd9cc..83c3271c442b 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -455,7 +455,6 @@ void __init startup_init(void)
         init_kernel_storage_key();
         lockdep_init();
         lockdep_off();
-        sort_main_extable();
         setup_lowcore_early();
         setup_facility_list();
         detect_machine_type();
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index e64d141555ce..6ffcd3203215 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -1583,7 +1583,7 @@ static struct kset *vmcmd_kset;
 
 static void vmcmd_run(struct shutdown_trigger *trigger)
 {
-        char *cmd, *next_cmd;
+        char *cmd;
 
         if (strcmp(trigger->name, ON_REIPL_STR) == 0)
                 cmd = vmcmd_on_reboot;
@@ -1600,15 +1600,7 @@ static void vmcmd_run(struct shutdown_trigger *trigger)
 
         if (strlen(cmd) == 0)
                 return;
-        do {
-                next_cmd = strchr(cmd, '\n');
-                if (next_cmd) {
-                        next_cmd[0] = 0;
-                        next_cmd += 1;
-                }
-                __cpcmd(cmd, NULL, 0, NULL);
-                cmd = next_cmd;
-        } while (cmd != NULL);
+        __cpcmd(cmd, NULL, 0, NULL);
 }
 
 static int vmcmd_init(void)
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 743c0f32fe3b..f86c81e13c37 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -302,8 +302,8 @@ static int __init parse_vmalloc(char *arg)
 }
 early_param("vmalloc", parse_vmalloc);
 
-unsigned int user_mode = HOME_SPACE_MODE;
-EXPORT_SYMBOL_GPL(user_mode);
+unsigned int addressing_mode = HOME_SPACE_MODE;
+EXPORT_SYMBOL_GPL(addressing_mode);
 
 static int set_amode_primary(void)
 {
@@ -328,7 +328,7 @@ static int set_amode_primary(void)
  */
 static int __init early_parse_switch_amode(char *p)
 {
-        user_mode = PRIMARY_SPACE_MODE;
+        addressing_mode = PRIMARY_SPACE_MODE;
         return 0;
 }
 early_param("switch_amode", early_parse_switch_amode);
@@ -336,9 +336,9 @@ early_param("switch_amode", early_parse_switch_amode);
 static int __init early_parse_user_mode(char *p)
 {
         if (p && strcmp(p, "primary") == 0)
-                user_mode = PRIMARY_SPACE_MODE;
+                addressing_mode = PRIMARY_SPACE_MODE;
         else if (!p || strcmp(p, "home") == 0)
-                user_mode = HOME_SPACE_MODE;
+                addressing_mode = HOME_SPACE_MODE;
         else
                 return 1;
         return 0;
@@ -347,7 +347,7 @@ early_param("user_mode", early_parse_user_mode);
 
 static void setup_addressing_mode(void)
 {
-        if (user_mode == PRIMARY_SPACE_MODE) {
+        if (addressing_mode == PRIMARY_SPACE_MODE) {
                 if (set_amode_primary())
                         pr_info("Address spaces switched, "
                                 "mvcos available\n");
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index af2421a0f315..01775c04a90e 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -185,7 +185,7 @@ void show_registers(struct pt_regs *regs)
 {
         char *mode;
 
-        mode = (regs->psw.mask & PSW_MASK_PSTATE) ? "User" : "Krnl";
+        mode = user_mode(regs) ? "User" : "Krnl";
         printk("%s PSW : %p %p",
                mode, (void *) regs->psw.mask,
                (void *) regs->psw.addr);
@@ -225,7 +225,7 @@ void show_regs(struct pt_regs *regs)
                (void *) current->thread.ksp);
         show_registers(regs);
         /* Show stack backtrace if pt_regs is from kernel mode */
-        if (!(regs->psw.mask & PSW_MASK_PSTATE))
+        if (!user_mode(regs))
                 show_trace(NULL, (unsigned long *) regs->gprs[15]);
         show_last_breaking_event(regs);
 }
@@ -300,7 +300,7 @@ static void __kprobes do_trap(struct pt_regs *regs,
                        regs->int_code, si_signo) == NOTIFY_STOP)
                 return;
 
-        if (regs->psw.mask & PSW_MASK_PSTATE) {
+        if (user_mode(regs)) {
                 info.si_signo = si_signo;
                 info.si_errno = 0;
                 info.si_code = si_code;
@@ -341,7 +341,7 @@ void __kprobes do_per_trap(struct pt_regs *regs)
 
 static void default_trap_handler(struct pt_regs *regs)
 {
-        if (regs->psw.mask & PSW_MASK_PSTATE) {
+        if (user_mode(regs)) {
                 report_user_fault(regs, SIGSEGV);
                 do_exit(SIGSEGV);
         } else
@@ -410,7 +410,7 @@ static void __kprobes illegal_op(struct pt_regs *regs)
 
         location = get_psw_address(regs);
 
-        if (regs->psw.mask & PSW_MASK_PSTATE) {
+        if (user_mode(regs)) {
                 if (get_user(*((__u16 *) opcode), (__u16 __user *) location))
                         return;
                 if (*((__u16 *) opcode) == S390_BREAKPOINT_U16) {
@@ -478,7 +478,7 @@ void specification_exception(struct pt_regs *regs)
 
         location = (__u16 __user *) get_psw_address(regs);
 
-        if (regs->psw.mask & PSW_MASK_PSTATE) {
+        if (user_mode(regs)) {
                 get_user(*((__u16 *) opcode), location);
                 switch (opcode[0]) {
                 case 0x28: /* LDR Rx,Ry   */
@@ -531,7 +531,7 @@ static void data_exception(struct pt_regs *regs)
                 asm volatile("stfpc %0" : "=m" (current->thread.fp_regs.fpc));
 
 #ifdef CONFIG_MATHEMU
-        else if (regs->psw.mask & PSW_MASK_PSTATE) {
+        else if (user_mode(regs)) {
                 __u8 opcode[6];
                 get_user(*((__u16 *) opcode), location);
                 switch (opcode[0]) {
@@ -598,7 +598,7 @@ static void data_exception(struct pt_regs *regs)
 static void space_switch_exception(struct pt_regs *regs)
 {
         /* Set user psw back to home space mode. */
-        if (regs->psw.mask & PSW_MASK_PSTATE)
+        if (user_mode(regs))
                 regs->psw.mask |= PSW_ASC_HOME;
         /* Send SIGILL. */
         do_trap(regs, SIGILL, ILL_PRVOPC, "space switch event");
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index ea5590fdca3b..9a19ca367c17 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -84,7 +84,8 @@ struct vdso_data *vdso_data = &vdso_data_store.data;
  */
 static void vdso_init_data(struct vdso_data *vd)
 {
-        vd->ectg_available = user_mode != HOME_SPACE_MODE && test_facility(31);
+        vd->ectg_available =
+                addressing_mode != HOME_SPACE_MODE && test_facility(31);
 }
 
 #ifdef CONFIG_64BIT
@@ -101,7 +102,7 @@ int vdso_alloc_per_cpu(struct _lowcore *lowcore)
 
         lowcore->vdso_per_cpu_data = __LC_PASTE;
 
-        if (user_mode == HOME_SPACE_MODE || !vdso_enabled)
+        if (addressing_mode == HOME_SPACE_MODE || !vdso_enabled)
                 return 0;
 
         segment_table = __get_free_pages(GFP_KERNEL, SEGMENT_ORDER);
@@ -146,7 +147,7 @@ void vdso_free_per_cpu(struct _lowcore *lowcore)
         unsigned long segment_table, page_table, page_frame;
         u32 *psal, *aste;
 
-        if (user_mode == HOME_SPACE_MODE || !vdso_enabled)
+        if (addressing_mode == HOME_SPACE_MODE || !vdso_enabled)
                 return;
 
         psal = (u32 *)(addr_t) lowcore->paste[4];
@@ -164,7 +165,7 @@ static void vdso_init_cr5(void)
 {
         unsigned long cr5;
 
-        if (user_mode == HOME_SPACE_MODE || !vdso_enabled)
+        if (addressing_mode == HOME_SPACE_MODE || !vdso_enabled)
                 return;
         cr5 = offsetof(struct _lowcore, paste);
         __ctl_load(cr5, 5, 5);
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 21109c63eb12..de8fa9bbd35e 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -45,7 +45,7 @@ SECTIONS
 
         .dummy : { *(.dummy) } :data
 
-        RODATA
+        RO_DATA_SECTION(PAGE_SIZE)
 
 #ifdef CONFIG_SHARED_KERNEL
         . = ALIGN(0x100000);    /* VM shared segments are 1MB aligned */
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 6a12d1bb6e09..6c013f544146 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -49,6 +49,7 @@
 #define VM_FAULT_BADCONTEXT     0x010000
 #define VM_FAULT_BADMAP         0x020000
 #define VM_FAULT_BADACCESS      0x040000
+#define VM_FAULT_SIGNAL 0x080000
 
 static unsigned long store_indication;
 
@@ -110,7 +111,7 @@ static inline int user_space_fault(unsigned long trans_exc_code)
         if (trans_exc_code == 2)
                 /* Access via secondary space, set_fs setting decides */
                 return current->thread.mm_segment.ar4;
-        if (user_mode == HOME_SPACE_MODE)
+        if (addressing_mode == HOME_SPACE_MODE)
                 /* User space if the access has been done via home space. */
                 return trans_exc_code == 3;
         /*
@@ -219,7 +220,7 @@ static noinline void do_fault_error(struct pt_regs *regs, int fault)
         case VM_FAULT_BADACCESS:
         case VM_FAULT_BADMAP:
                 /* Bad memory access. Check if it is kernel or user space. */
-                if (regs->psw.mask & PSW_MASK_PSTATE) {
+                if (user_mode(regs)) {
                         /* User mode accesses just cause a SIGSEGV */
                         si_code = (fault == VM_FAULT_BADMAP) ?
                                 SEGV_MAPERR : SEGV_ACCERR;
@@ -229,15 +230,19 @@ static noinline void do_fault_error(struct pt_regs *regs, int fault)
         case VM_FAULT_BADCONTEXT:
                 do_no_context(regs);
                 break;
+        case VM_FAULT_SIGNAL:
+                if (!user_mode(regs))
+                        do_no_context(regs);
+                break;
         default: /* fault & VM_FAULT_ERROR */
                 if (fault & VM_FAULT_OOM) {
-                        if (!(regs->psw.mask & PSW_MASK_PSTATE))
+                        if (!user_mode(regs))
                                 do_no_context(regs);
                         else
                                 pagefault_out_of_memory();
                 } else if (fault & VM_FAULT_SIGBUS) {
                         /* Kernel mode? Handle exceptions or die */
-                        if (!(regs->psw.mask & PSW_MASK_PSTATE))
+                        if (!user_mode(regs))
                                 do_no_context(regs);
                         else
                                 do_sigbus(regs);
@@ -286,7 +291,7 @@ static inline int do_exception(struct pt_regs *regs, int access)
 
         address = trans_exc_code & __FAIL_ADDR_MASK;
         perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
-        flags = FAULT_FLAG_ALLOW_RETRY;
+        flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
         if (access == VM_WRITE || (trans_exc_code & store_indication) == 0x400)
                 flags |= FAULT_FLAG_WRITE;
         down_read(&mm->mmap_sem);
@@ -335,6 +340,11 @@ retry:
          * the fault.
          */
         fault = handle_mm_fault(mm, vma, address, flags);
+        /* No reason to continue if interrupted by SIGKILL. */
+        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {
+                fault = VM_FAULT_SIGNAL;
+                goto out;
+        }
         if (unlikely(fault & VM_FAULT_ERROR))
                 goto out_up;
 
@@ -426,7 +436,7 @@ void __kprobes do_asce_exception(struct pt_regs *regs)
         }
 
         /* User mode accesses just cause a SIGSEGV */
-        if (regs->psw.mask & PSW_MASK_PSTATE) {
+        if (user_mode(regs)) {
                 do_sigsegv(regs, SEGV_MAPERR);
                 return;
         }
@@ -441,6 +451,7 @@ int __handle_fault(unsigned long uaddr, unsigned long pgm_int_code, int write)
         struct pt_regs regs;
         int access, fault;
 
+        /* Emulate a uaccess fault from kernel mode. */
         regs.psw.mask = psw_kernel_bits | PSW_MASK_DAT | PSW_MASK_MCHECK;
         if (!irqs_disabled())
                 regs.psw.mask |= PSW_MASK_IO | PSW_MASK_EXT;
@@ -450,12 +461,12 @@ int __handle_fault(unsigned long uaddr, unsigned long pgm_int_code, int write)
         regs.int_parm_long = (uaddr & PAGE_MASK) | 2;
         access = write ? VM_WRITE : VM_READ;
         fault = do_exception(&regs, access);
-        if (unlikely(fault)) {
-                if (fault & VM_FAULT_OOM)
-                        return -EFAULT;
-                else if (fault & VM_FAULT_SIGBUS)
-                        do_sigbus(&regs);
-        }
+        /*
+         * Since the fault happened in kernel mode while performing a uaccess
+         * all we need to do now is emulating a fixup in case "fault" is not
+         * zero.
+         * For the calling uaccess functions this results always in -EFAULT.
+         */
         return fault ? -EFAULT : 0;
 }
 
diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
index 573384256c5c..c59a5efa58b1 100644
--- a/arch/s390/mm/mmap.c
+++ b/arch/s390/mm/mmap.c
@@ -103,9 +103,15 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 
 int s390_mmap_check(unsigned long addr, unsigned long len)
 {
+        int rc;
+
         if (!is_compat_task() &&
-            len >= TASK_SIZE && TASK_SIZE < (1UL << 53))
-                return crst_table_upgrade(current->mm, 1UL << 53);
+            len >= TASK_SIZE && TASK_SIZE < (1UL << 53)) {
+                rc = crst_table_upgrade(current->mm, 1UL << 53);
+                if (rc)
+                        return rc;
+                update_mm(current->mm, current);
+        }
         return 0;
 }
 
@@ -125,6 +131,7 @@ s390_get_unmapped_area(struct file *filp, unsigned long addr,
                 rc = crst_table_upgrade(mm, 1UL << 53);
                 if (rc)
                         return (unsigned long) rc;
+                update_mm(mm, current);
                 area = arch_get_unmapped_area(filp, addr, len, pgoff, flags);
         }
         return area;
@@ -147,6 +154,7 @@ s390_get_unmapped_area_topdown(struct file *filp, const unsigned long addr,
                 rc = crst_table_upgrade(mm, 1UL << 53);
                 if (rc)
                         return (unsigned long) rc;
+                update_mm(mm, current);
                 area = arch_get_unmapped_area_topdown(filp, addr, len,
                                                       pgoff, flags);
         }
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 1cab221077cc..18df31d1f2c9 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -85,7 +85,6 @@ repeat:
                 crst_table_free(mm, table);
         if (mm->context.asce_limit < limit)
                 goto repeat;
-        update_mm(mm, current);
         return 0;
 }
 
@@ -93,9 +92,6 @@ void crst_table_downgrade(struct mm_struct *mm, unsigned long limit)
 {
         pgd_t *pgd;
 
-        if (mm->context.asce_limit <= limit)
-                return;
-        __tlb_flush_mm(mm);
         while (mm->context.asce_limit > limit) {
                 pgd = mm->pgd;
                 switch (pgd_val(*pgd) & _REGION_ENTRY_TYPE_MASK) {
@@ -118,7 +114,6 @@ void crst_table_downgrade(struct mm_struct *mm, unsigned long limit)
                 mm->task_size = mm->context.asce_limit;
                 crst_table_free(mm, (unsigned long *) pgd);
         }
-        update_mm(mm, current);
 }
 #endif
 
@@ -801,7 +796,7 @@ int s390_enable_sie(void)
         struct mm_struct *mm, *old_mm;
 
         /* Do we have switched amode? If no, we cannot do sie */
-        if (user_mode == HOME_SPACE_MODE)
+        if (addressing_mode == HOME_SPACE_MODE)
                 return -EINVAL;
 
         /* Do we have pgstes? if yes, we are done */
diff --git a/arch/s390/oprofile/backtrace.c b/arch/s390/oprofile/backtrace.c
index c82f62fb9c28..8a6811b2cdb9 100644
--- a/arch/s390/oprofile/backtrace.c
+++ b/arch/s390/oprofile/backtrace.c
@@ -58,7 +58,7 @@ void s390_backtrace(struct pt_regs * const regs, unsigned int depth)
         unsigned long head;
         struct stack_frame* head_sf;
 
-        if (user_mode (regs))
+        if (user_mode(regs))
                 return;
 
         head = regs->gprs[15];
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 7048c03490d9..fb5805745ace 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -57,6 +57,7 @@ config SH_7724_SOLUTION_ENGINE
         depends on CPU_SUBTYPE_SH7724
         select ARCH_REQUIRE_GPIOLIB
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           Select 7724 SolutionEngine if configuring for a Hitachi SH7724
           evaluation board.
@@ -140,6 +141,7 @@ config SH_RSK
         bool "Renesas Starter Kit"
         depends on CPU_SUBTYPE_SH7201 || CPU_SUBTYPE_SH7203 || \
           CPU_SUBTYPE_SH7264 || CPU_SUBTYPE_SH7269
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
          Select this option if configuring for any of the RSK+ MCU
          evaluation platforms.
@@ -159,6 +161,7 @@ config SH_SDK7786
         select NO_IOPORT if !PCI
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select HAVE_SRAM_POOL
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           Select SDK7786 if configuring for a Renesas Technology Europe
           SH7786-65nm board.
@@ -173,6 +176,7 @@ config SH_SH7757LCR
         bool "SH7757LCR"
         depends on CPU_SUBTYPE_SH7757
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
 config SH_SH7785LCR
         bool "SH7785LCR"
@@ -206,6 +210,7 @@ config SH_MIGOR
         bool "Migo-R"
         depends on CPU_SUBTYPE_SH7722
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           Select Migo-R if configuring for the SH7722 Migo-R platform
           by Renesas System Solutions Asia Pte. Ltd.
@@ -214,6 +219,7 @@ config SH_AP325RXA
         bool "AP-325RXA"
         depends on CPU_SUBTYPE_SH7723
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           Renesas "AP-325RXA" support.
           Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
@@ -222,6 +228,7 @@ config SH_KFR2R09
         bool "KFR2R09"
         depends on CPU_SUBTYPE_SH7724
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           "Kit For R2R for 2009" support.
 
@@ -230,6 +237,7 @@ config SH_ECOVEC
         depends on CPU_SUBTYPE_SH7724
         select ARCH_REQUIRE_GPIOLIB
         select SND_SOC_DA7210 if SND_SIMPLE_CARD
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           Renesas "R0P7724LC0011/21RL (EcoVec)" support.
 
@@ -305,6 +313,7 @@ config SH_MAGIC_PANEL_R2
         bool "Magic Panel R2"
         depends on CPU_SUBTYPE_SH7720
         select ARCH_REQUIRE_GPIOLIB
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
           Select Magic Panel R2 if configuring for Magic Panel R2.
 
@@ -316,6 +325,7 @@ config SH_CAYMAN
 config SH_POLARIS
         bool "SMSC Polaris"
         select CPU_HAS_IPR_IRQ
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         depends on CPU_SUBTYPE_SH7709
         help
           Select if configuring for an SMSC Polaris development board
@@ -323,6 +333,7 @@ config SH_POLARIS
 config SH_SH2007
         bool "SH-2007 board"
         select NO_IOPORT
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         depends on CPU_SUBTYPE_SH7780
         help
           SH-2007 is a single-board computer based around SH7780 chip
@@ -334,6 +345,7 @@ config SH_SH2007
 config SH_APSH4A3A
         bool "AP-SH4A-3A"
         select SH_ALPHA_BOARD
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         depends on CPU_SUBTYPE_SH7785
         help
           Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A.
@@ -342,6 +354,7 @@ config SH_APSH4AD0A
         bool "AP-SH4AD-0A"
         select SH_ALPHA_BOARD
         select SYS_SUPPORTS_PCI
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         depends on CPU_SUBTYPE_SH7786
         help
           Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.
diff --git a/arch/sh/boards/board-apsh4a3a.c b/arch/sh/boards/board-apsh4a3a.c
index 2823619c6006..0a39c241628a 100644
--- a/arch/sh/boards/board-apsh4a3a.c
+++ b/arch/sh/boards/board-apsh4a3a.c
@@ -13,6 +13,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/physmap.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/irq.h>
 #include <linux/clk.h>
@@ -66,6 +68,12 @@ static struct platform_device nor_flash_device = {
         .resource       = nor_flash_resources,
 };
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+};
+
 static struct resource smsc911x_resources[] = {
         [0] = {
                 .name           = "smsc911x-memory",
@@ -105,6 +113,8 @@ static struct platform_device *apsh4a3a_devices[] __initdata = {
 
 static int __init apsh4a3a_devices_setup(void)
 {
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         return platform_add_devices(apsh4a3a_devices,
                                     ARRAY_SIZE(apsh4a3a_devices));
 }
diff --git a/arch/sh/boards/board-apsh4ad0a.c b/arch/sh/boards/board-apsh4ad0a.c
index b4d6292a9247..92eac3a99187 100644
--- a/arch/sh/boards/board-apsh4ad0a.c
+++ b/arch/sh/boards/board-apsh4ad0a.c
@@ -12,12 +12,20 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/irq.h>
 #include <linux/clk.h>
 #include <asm/machvec.h>
 #include <asm/sizes.h>
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+};
+
 static struct resource smsc911x_resources[] = {
         [0] = {
                 .name           = "smsc911x-memory",
@@ -56,6 +64,8 @@ static struct platform_device *apsh4ad0a_devices[] __initdata = {
 
 static int __init apsh4ad0a_devices_setup(void)
 {
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         return platform_add_devices(apsh4ad0a_devices,
                                     ARRAY_SIZE(apsh4ad0a_devices));
 }
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c
index 90568f9de3a4..20500858b56c 100644
--- a/arch/sh/boards/board-magicpanelr2.c
+++ b/arch/sh/boards/board-magicpanelr2.c
@@ -14,6 +14,8 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -24,6 +26,12 @@
 #include <asm/heartbeat.h>
 #include <cpu/sh7720.h>
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+};
+
 #define LAN9115_READY   (__raw_readl(0xA8000084UL) & 0x00000001UL)
 
 /* Wait until reset finished. Timeout is 100ms. */
@@ -348,6 +356,8 @@ static struct platform_device *mpr2_devices[] __initdata = {
 
 static int __init mpr2_devices_setup(void)
 {
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices));
 }
 device_initcall(mpr2_devices_setup);
diff --git a/arch/sh/boards/board-polaris.c b/arch/sh/boards/board-polaris.c
index 0978ae2e4847..37a08d094727 100644
--- a/arch/sh/boards/board-polaris.c
+++ b/arch/sh/boards/board-polaris.c
@@ -9,6 +9,8 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/io.h>
 #include <asm/irq.h>
@@ -22,6 +24,12 @@
 #define AREA5_WAIT_CTRL (0x1C00)
 #define WAIT_STATES_10  (0x7)
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),
+};
+
 static struct resource smsc911x_resources[] = {
         [0] = {
                 .name           = "smsc911x-memory",
@@ -88,6 +96,8 @@ static int __init polaris_initialise(void)
 
         printk(KERN_INFO "Configuring Polaris external bus\n");
 
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         /* Configure area 5 with 2 wait states */
         wcr = __raw_readw(WCR2);
         wcr &= (~AREA5_WAIT_CTRL);
diff --git a/arch/sh/boards/board-sh2007.c b/arch/sh/boards/board-sh2007.c
index b90b78f6a829..1980bb7e5780 100644
--- a/arch/sh/boards/board-sh2007.c
+++ b/arch/sh/boards/board-sh2007.c
@@ -6,6 +6,8 @@
  */
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
@@ -13,6 +15,14 @@
 #include <asm/machvec.h>
 #include <mach/sh2007.h>
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x.0"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),
+        REGULATOR_SUPPLY("vddvario", "smsc911x.1"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x.1"),
+};
+
 struct smsc911x_platform_config smc911x_info = {
         .flags          = SMSC911X_USE_32BIT,
         .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
@@ -98,6 +108,8 @@ static struct platform_device *sh2007_devices[] __initdata = {
 
 static int __init sh2007_io_init(void)
 {
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         platform_add_devices(sh2007_devices, ARRAY_SIZE(sh2007_devices));
         return 0;
 }
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 5087f8bb4cff..41f86702eb9f 100644
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -12,6 +12,8 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/irq.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/io.h>
@@ -199,6 +201,15 @@ static struct platform_device sh7757_eth_giga1_device = {
         },
 };
 
+/* Fixed 3.3V regulator to be used by SDHI0, MMCIF */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"),
+};
+
 /* SH_MMCIF */
 static struct resource sh_mmcif_resources[] = {
         [0] = {
@@ -329,6 +340,9 @@ static struct spi_board_info spi_board_info[] = {
 
 static int __init sh7757lcr_devices_setup(void)
 {
+        regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+
         /* RGMII (PTA) */
         gpio_request(GPIO_FN_ET0_MDC, NULL);
         gpio_request(GPIO_FN_ET0_MDIO, NULL);
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index f33ebf447073..9e963c1d1447 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -20,6 +20,8 @@
 #include <linux/mtd/sh_flctl.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/gpio.h>
 #include <linux/videodev2.h>
@@ -34,6 +36,12 @@
 #include <asm/suspend.h>
 #include <cpu/sh7723.h>
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+};
+
 static struct smsc911x_platform_config smsc911x_config = {
         .phy_interface  = PHY_INTERFACE_MODE_MII,
         .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
@@ -423,6 +431,15 @@ static struct platform_device ceu_device = {
         },
 };
 
+/* Fixed 3.3V regulators to be used by SDHI0, SDHI1 */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),
+};
+
 static struct resource sdhi0_cn3_resources[] = {
         [0] = {
                 .name   = "SDHI0",
@@ -544,6 +561,10 @@ static int __init ap325rxa_devices_setup(void)
                                         &ap325rxa_sdram_leave_start,
                                         &ap325rxa_sdram_leave_end);
 
+        regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+        regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         /* LD3 and LD4 LEDs */
         gpio_request(GPIO_PTX5, NULL); /* RUN */
         gpio_direction_output(GPIO_PTX5, 1);
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 4158d70c0dea..64559e8af14b 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -19,6 +19,8 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/delay.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/i2c.h>
@@ -242,9 +244,17 @@ static int usbhs_get_id(struct platform_device *pdev)
         return gpio_get_value(GPIO_PTB3);
 }
 
+static void usbhs_phy_reset(struct platform_device *pdev)
+{
+        /* enable vbus if HOST */
+        if (!gpio_get_value(GPIO_PTB3))
+                gpio_set_value(GPIO_PTB5, 1);
+}
+
 static struct renesas_usbhs_platform_info usbhs_info = {
         .platform_callback = {
                 .get_id         = usbhs_get_id,
+                .phy_reset      = usbhs_phy_reset,
         },
         .driver_param = {
                 .buswait_bwait          = 4,
@@ -518,10 +528,86 @@ static struct i2c_board_info ts_i2c_clients = {
         .irq            = IRQ0,
 };
 
+static struct regulator_consumer_supply cn12_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"),
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),
+};
+
+static struct regulator_init_data cn12_power_init_data = {
+        .constraints = {
+                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(cn12_power_consumers),
+        .consumer_supplies      = cn12_power_consumers,
+};
+
+static struct fixed_voltage_config cn12_power_info = {
+        .supply_name = "CN12 SD/MMC Vdd",
+        .microvolts = 3300000,
+        .gpio = GPIO_PTB7,
+        .enable_high = 1,
+        .init_data = &cn12_power_init_data,
+};
+
+static struct platform_device cn12_power = {
+        .name = "reg-fixed-voltage",
+        .id   = 0,
+        .dev  = {
+                .platform_data = &cn12_power_info,
+        },
+};
+
 #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 /* SDHI0 */
+static struct regulator_consumer_supply sdhi0_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+};
+
+static struct regulator_init_data sdhi0_power_init_data = {
+        .constraints = {
+                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+        },
+        .num_consumer_supplies  = ARRAY_SIZE(sdhi0_power_consumers),
+        .consumer_supplies      = sdhi0_power_consumers,
+};
+
+static struct fixed_voltage_config sdhi0_power_info = {
+        .supply_name = "CN11 SD/MMC Vdd",
+        .microvolts = 3300000,
+        .gpio = GPIO_PTB6,
+        .enable_high = 1,
+        .init_data = &sdhi0_power_init_data,
+};
+
+static struct platform_device sdhi0_power = {
+        .name = "reg-fixed-voltage",
+        .id   = 1,
+        .dev  = {
+                .platform_data = &sdhi0_power_info,
+        },
+};
+
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
+        static int power_gpio = -EINVAL;
+
+        if (power_gpio < 0) {
+                int ret = gpio_request(GPIO_PTB6, NULL);
+                if (!ret) {
+                        power_gpio = GPIO_PTB6;
+                        gpio_direction_output(power_gpio, 0);
+                }
+        }
+
+        /*
+         * Toggle the GPIO regardless, whether we managed to grab it above or
+         * the fixed regulator driver did.
+         */
         gpio_set_value(GPIO_PTB6, state);
 }
 
@@ -562,13 +648,27 @@ static struct platform_device sdhi0_device = {
         },
 };
 
-#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
-/* SDHI1 */
-static void sdhi1_set_pwr(struct platform_device *pdev, int state)
+static void cn12_set_pwr(struct platform_device *pdev, int state)
 {
+        static int power_gpio = -EINVAL;
+
+        if (power_gpio < 0) {
+                int ret = gpio_request(GPIO_PTB7, NULL);
+                if (!ret) {
+                        power_gpio = GPIO_PTB7;
+                        gpio_direction_output(power_gpio, 0);
+                }
+        }
+
+        /*
+         * Toggle the GPIO regardless, whether we managed to grab it above or
+         * the fixed regulator driver did.
+         */
         gpio_set_value(GPIO_PTB7, state);
 }
 
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
+/* SDHI1 */
 static int sdhi1_get_cd(struct platform_device *pdev)
 {
         return !gpio_get_value(GPIO_PTW7);
@@ -579,7 +679,7 @@ static struct sh_mobile_sdhi_info sdhi1_info = {
         .dma_slave_rx   = SHDMA_SLAVE_SDHI1_RX,
         .tmio_caps      = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD |
                           MMC_CAP_NEEDS_POLL,
-        .set_pwr        = sdhi1_set_pwr,
+        .set_pwr        = cn12_set_pwr,
         .get_cd         = sdhi1_get_cd,
 };
 
@@ -899,14 +999,9 @@ static struct platform_device vou_device = {
 
 #if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SH_MMCIF */
-static void mmcif_set_pwr(struct platform_device *pdev, int state)
-{
-        gpio_set_value(GPIO_PTB7, state);
-}
-
 static void mmcif_down_pwr(struct platform_device *pdev)
 {
-        gpio_set_value(GPIO_PTB7, 0);
+        cn12_set_pwr(pdev, 0);
 }
 
 static struct resource sh_mmcif_resources[] = {
@@ -929,7 +1024,7 @@ static struct resource sh_mmcif_resources[] = {
 };
 
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
-        .set_pwr        = mmcif_set_pwr,
+        .set_pwr        = cn12_set_pwr,
         .down_pwr       = mmcif_down_pwr,
         .sup_pclk       = 0, /* SH7724: Max Pclk/2 */
         .caps           = MMC_CAP_4_BIT_DATA |
@@ -960,7 +1055,9 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &ceu0_device,
         &ceu1_device,
         &keysc_device,
+        &cn12_power,
 #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
+        &sdhi0_power,
         &sdhi0_device,
 #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
         &sdhi1_device,
@@ -1258,8 +1355,6 @@ static int __init arch_setup(void)
         gpio_request(GPIO_FN_SDHI0D2,  NULL);
         gpio_request(GPIO_FN_SDHI0D1,  NULL);
         gpio_request(GPIO_FN_SDHI0D0,  NULL);
-        gpio_request(GPIO_PTB6, NULL);
-        gpio_direction_output(GPIO_PTB6, 0);
 #else
         /* enable MSIOF0 on CN11 (needs DS2.4 set to OFF) */
         gpio_request(GPIO_FN_MSIOF0_TXD, NULL);
@@ -1288,8 +1383,6 @@ static int __init arch_setup(void)
         gpio_request(GPIO_FN_MMC_D0, NULL);
         gpio_request(GPIO_FN_MMC_CLK, NULL);
         gpio_request(GPIO_FN_MMC_CMD, NULL);
-        gpio_request(GPIO_PTB7, NULL);
-        gpio_direction_output(GPIO_PTB7, 0);
 
         cn12_enabled = true;
 #elif defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
@@ -1301,8 +1394,6 @@ static int __init arch_setup(void)
         gpio_request(GPIO_FN_SDHI1D2,  NULL);
         gpio_request(GPIO_FN_SDHI1D1,  NULL);
         gpio_request(GPIO_FN_SDHI1D0,  NULL);
-        gpio_request(GPIO_PTB7, NULL);
-        gpio_direction_output(GPIO_PTB7, 0);
 
         /* Card-detect, used on CN12 with SDHI1 */
         gpio_request(GPIO_PTW7, NULL);
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 43a179ce9afc..f2a4304fbe23 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -21,6 +21,8 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/i2c.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/videodev2.h>
 #include <linux/sh_intc.h>
@@ -341,6 +343,13 @@ static struct platform_device kfr2r09_camera = {
         },
 };
 
+/* Fixed 3.3V regulator to be used by SDHI0 */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+};
+
 static struct resource kfr2r09_sh_sdhi0_resources[] = {
         [0] = {
                 .name   = "SDHI0",
@@ -523,6 +532,9 @@ static int __init kfr2r09_devices_setup(void)
                                         &kfr2r09_sdram_leave_start,
                                         &kfr2r09_sdram_leave_end);
 
+        regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+
         /* enable SCIF1 serial port for YC401 console support */
         gpio_request(GPIO_FN_SCIF1_RXD, NULL);
         gpio_request(GPIO_FN_SCIF1_TXD, NULL);
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index a8a1ca741c85..8b73194ed2ce 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -17,6 +17,8 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/nand.h>
 #include <linux/i2c.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smc91x.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
@@ -386,6 +388,13 @@ static struct platform_device migor_ceu_device = {
         },
 };
 
+/* Fixed 3.3V regulator to be used by SDHI0 */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+};
+
 static struct resource sdhi_cn9_resources[] = {
         [0] = {
                 .name   = "SDHI",
@@ -498,6 +507,10 @@ static int __init migor_devices_setup(void)
                                         &migor_sdram_enter_end,
                                         &migor_sdram_leave_start,
                                         &migor_sdram_leave_end);
+
+        regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+
         /* Let D11 LED show STATUS0 */
         gpio_request(GPIO_FN_STATUS0, NULL);
 
diff --git a/arch/sh/boards/mach-rsk/setup.c b/arch/sh/boards/mach-rsk/setup.c
index 895f030070d3..2685ea03b064 100644
--- a/arch/sh/boards/mach-rsk/setup.c
+++ b/arch/sh/boards/mach-rsk/setup.c
@@ -16,9 +16,17 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/map.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+};
+
 static const char *part_probes[] = { "cmdlinepart", NULL };
 
 static struct mtd_partition rsk_partitions[] = {
@@ -67,6 +75,8 @@ static struct platform_device *rsk_devices[] __initdata = {
 
 static int __init rsk_devices_setup(void)
 {
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         return platform_add_devices(rsk_devices,
                                     ARRAY_SIZE(rsk_devices));
 }
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c
index 27a2314f50ac..c29268bfd34a 100644
--- a/arch/sh/boards/mach-sdk7786/setup.c
+++ b/arch/sh/boards/mach-sdk7786/setup.c
@@ -11,6 +11,8 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/i2c.h>
 #include <linux/irq.h>
@@ -38,6 +40,12 @@ static struct platform_device heartbeat_device = {
         .resource       = &heartbeat_resource,
 };
 
+/* Dummy supplies, where voltage doesn't matter */
+static struct regulator_consumer_supply dummy_supplies[] = {
+        REGULATOR_SUPPLY("vddvario", "smsc911x"),
+        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
+};
+
 static struct resource smsc911x_resources[] = {
         [0] = {
                 .name           = "smsc911x-memory",
@@ -236,6 +244,8 @@ static void __init sdk7786_setup(char **cmdline_p)
 {
         pr_info("Renesas Technology Europe SDK7786 support:\n");
 
+        regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
+
         sdk7786_fpga_init();
         sdk7786_nmi_init();
 
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index ffbf5bc7366b..35f6efa3ac0e 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -18,6 +18,8 @@
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
 #include <linux/delay.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/smc91x.h>
 #include <linux/gpio.h>
 #include <linux/input.h>
@@ -454,6 +456,15 @@ static struct platform_device sh7724_usb1_gadget_device = {
         .resource       = sh7724_usb1_gadget_resources,
 };
 
+/* Fixed 3.3V regulator to be used by SDHI0, SDHI1 */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),
+};
+
 static struct resource sdhi0_cn7_resources[] = {
         [0] = {
                 .name   = "SDHI0",
@@ -684,6 +695,10 @@ static int __init devices_setup(void)
                                         &ms7724se_sdram_enter_end,
                                         &ms7724se_sdram_leave_start,
                                         &ms7724se_sdram_leave_end);
+
+        regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+
         /* Reset Release */
         fpga_out = __raw_readw(FPGA_OUT);
         /* bit4: NTSC_PDN, bit5: NTSC_RESET */
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig
index e7583484cc07..95ae23fcfdd6 100644
--- a/arch/sh/configs/apsh4ad0a_defconfig
+++ b/arch/sh/configs/apsh4ad0a_defconfig
@@ -11,7 +11,7 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_NAMESPACES=y
 CONFIG_BLK_DEV_INITRD=y
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index 8a7dd7b59c5c..76a76a295d74 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_defconfig
@@ -18,8 +18,8 @@ CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEMCG=y
+CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 72c3fad7383f..6bc30ab9fd18 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -11,7 +11,7 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEMCG=y
 CONFIG_RELAY=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index 6bb413036892..cd6c519f8fad 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -13,7 +13,7 @@ CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEMCG=y
 CONFIG_RELAY=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index 8bfa4d056d7a..d7f89be9f474 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_defconfig
@@ -15,8 +15,8 @@ CONFIG_CPUSETS=y
 # CONFIG_PROC_PID_CPUSET is not set
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEMCG=y
+CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_DEV_INITRD=y
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7757.h b/arch/sh/include/cpu-sh4/cpu/sh7757.h
index 41f9f8b9db73..5340f3bc1863 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7757.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7757.h
@@ -283,5 +283,7 @@ enum {
         SHDMA_SLAVE_RIIC8_RX,
         SHDMA_SLAVE_RIIC9_TX,
         SHDMA_SLAVE_RIIC9_RX,
+        SHDMA_SLAVE_RSPI_TX,
+        SHDMA_SLAVE_RSPI_RX,
 };
 #endif /* __ASM_SH7757_H__ */
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
index c87e78f73234..5f30f805d2f2 100644
--- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
+++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
@@ -334,8 +334,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("tpu0", &mstp_clks[HWBLK_TPU]),
         CLKDEV_CON_ID("irda0", &mstp_clks[HWBLK_IRDA]),
         CLKDEV_CON_ID("tsif0", &mstp_clks[HWBLK_TSIF]),
-        CLKDEV_CON_ID("usb1", &mstp_clks[HWBLK_USB1]),
-        CLKDEV_CON_ID("usb0", &mstp_clks[HWBLK_USB0]),
+        CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[HWBLK_USB1]),
+        CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[HWBLK_USB0]),
         CLKDEV_CON_ID("2dg0", &mstp_clks[HWBLK_2DG]),
         CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[HWBLK_SDHI0]),
         CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[HWBLK_SDHI1]),
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index 65786c7f5ded..6a868b091c2d 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -12,6 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial.h>
 #include <linux/serial_sci.h>
+#include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
 #include <linux/sh_intc.h>
 #include <linux/uio_driver.h>
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
index a7708425afa9..4a2f357f4df8 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7757.c
@@ -216,6 +216,20 @@ static const struct sh_dmae_slave_config sh7757_dmae1_slaves[] = {
                                   TS_INDEX2VAL(XMIT_SZ_8BIT),
                 .mid_rid        = 0x42,
         },
+        {
+                .slave_id       = SHDMA_SLAVE_RSPI_TX,
+                .addr           = 0xfe480004,
+                .chcr           = SM_INC | 0x800 | 0x40000000 |
+                                  TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .mid_rid        = 0xc1,
+        },
+        {
+                .slave_id       = SHDMA_SLAVE_RSPI_RX,
+                .addr           = 0xfe480004,
+                .chcr           = DM_INC | 0x800 | 0x40000000 |
+                                  TS_INDEX2VAL(XMIT_SZ_16BIT),
+                .mid_rid        = 0xc2,
+        },
 };
 
 static const struct sh_dmae_slave_config sh7757_dmae2_slaves[] = {
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 1fc25d85e515..3bdc1ad9a341 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -58,11 +58,15 @@ static void show_pte(struct mm_struct *mm, unsigned long addr)
 {
         pgd_t *pgd;
 
-        if (mm)
+        if (mm) {
                 pgd = mm->pgd;
-        else
+        } else {
                 pgd = get_TTB();
 
+                if (unlikely(!pgd))
+                        pgd = swapper_pg_dir;
+        }
+
         printk(KERN_ALERT "pgd = %p\n", pgd);
         pgd += pgd_index(addr);
         printk(KERN_ALERT "[%08lx] *pgd=%0*Lx", addr,
diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 435e406fdec3..81d92fc9983b 100644
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1250,14 +1250,12 @@ int ldc_bind(struct ldc_channel *lp, const char *name)
         snprintf(lp->rx_irq_name, LDC_IRQ_NAME_MAX, "%s RX", name);
         snprintf(lp->tx_irq_name, LDC_IRQ_NAME_MAX, "%s TX", name);
 
-        err = request_irq(lp->cfg.rx_irq, ldc_rx,
-                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
+        err = request_irq(lp->cfg.rx_irq, ldc_rx, IRQF_DISABLED,
                           lp->rx_irq_name, lp);
         if (err)
                 return err;
 
-        err = request_irq(lp->cfg.tx_irq, ldc_tx,
-                          IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
+        err = request_irq(lp->cfg.tx_irq, ldc_tx, IRQF_DISABLED,
                           lp->tx_irq_name, lp);
         if (err) {
                 free_irq(lp->cfg.rx_irq, lp);
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index b8d99aca5431..0270620a1692 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -18,8 +18,8 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEMCG=y
+CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 2b1fd31894f1..c11de27a9bcb 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -17,8 +17,8 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEMCG=y
+CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
diff --git a/arch/um/defconfig b/arch/um/defconfig
index 7823ab12e6a4..08107a795062 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -155,15 +155,15 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-# CONFIG_CGROUP_MEM_RES_CTLR_KMEM is not set
+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=m
+CONFIG_BLK_CGROUP=y
 # CONFIG_DEBUG_BLK_CGROUP is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
 CONFIG_NAMESPACES=y
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 45e248c2f43c..87eebfe03c61 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -150,9 +150,11 @@ void chan_enable_winch(struct chan *chan, struct tty_struct *tty)
 static void line_timer_cb(struct work_struct *work)
 {
         struct line *line = container_of(work, struct line, task.work);
+        struct tty_struct *tty = tty_port_tty_get(&line->port);
 
         if (!line->throttled)
-                chan_interrupt(line, line->tty, line->driver->read_irq);
+                chan_interrupt(line, tty, line->driver->read_irq);
+        tty_kref_put(tty);
 }
 
 int enable_chan(struct line *line)
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index acfd0e0fd0c9..bbaf2c59830a 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -19,9 +19,11 @@ static irqreturn_t line_interrupt(int irq, void *data)
 {
         struct chan *chan = data;
         struct line *line = chan->line;
+        struct tty_struct *tty = tty_port_tty_get(&line->port);
 
         if (line)
-                chan_interrupt(line, line->tty, irq);
+                chan_interrupt(line, tty, irq);
+        tty_kref_put(tty);
         return IRQ_HANDLED;
 }
 
@@ -219,92 +221,6 @@ void line_set_termios(struct tty_struct *tty, struct ktermios * old)
         /* nothing */
 }
 
-static const struct {
-        int  cmd;
-        char *level;
-        char *name;
-} tty_ioctls[] = {
-        /* don't print these, they flood the log ... */
-        { TCGETS,      NULL,       "TCGETS"      },
-        { TCSETS,      NULL,       "TCSETS"      },
-        { TCSETSW,     NULL,       "TCSETSW"     },
-        { TCFLSH,      NULL,       "TCFLSH"      },
-        { TCSBRK,      NULL,       "TCSBRK"      },
-
-        /* general tty stuff */
-        { TCSETSF,     KERN_DEBUG, "TCSETSF"     },
-        { TCGETA,      KERN_DEBUG, "TCGETA"      },
-        { TIOCMGET,    KERN_DEBUG, "TIOCMGET"    },
-        { TCSBRKP,     KERN_DEBUG, "TCSBRKP"     },
-        { TIOCMSET,    KERN_DEBUG, "TIOCMSET"    },
-
-        /* linux-specific ones */
-        { TIOCLINUX,   KERN_INFO,  "TIOCLINUX"   },
-        { KDGKBMODE,   KERN_INFO,  "KDGKBMODE"   },
-        { KDGKBTYPE,   KERN_INFO,  "KDGKBTYPE"   },
-        { KDSIGACCEPT, KERN_INFO,  "KDSIGACCEPT" },
-};
-
-int line_ioctl(struct tty_struct *tty, unsigned int cmd,
-                                unsigned long arg)
-{
-        int ret;
-        int i;
-
-        ret = 0;
-        switch(cmd) {
-#ifdef TIOCGETP
-        case TIOCGETP:
-        case TIOCSETP:
-        case TIOCSETN:
-#endif
-#ifdef TIOCGETC
-        case TIOCGETC:
-        case TIOCSETC:
-#endif
-#ifdef TIOCGLTC
-        case TIOCGLTC:
-        case TIOCSLTC:
-#endif
-        /* Note: these are out of date as we now have TCGETS2 etc but this
-           whole lot should probably go away */
-        case TCGETS:
-        case TCSETSF:
-        case TCSETSW:
-        case TCSETS:
-        case TCGETA:
-        case TCSETAF:
-        case TCSETAW:
-        case TCSETA:
-        case TCXONC:
-        case TCFLSH:
-        case TIOCOUTQ:
-        case TIOCINQ:
-        case TIOCGLCKTRMIOS:
-        case TIOCSLCKTRMIOS:
-        case TIOCPKT:
-        case TIOCGSOFTCAR:
-        case TIOCSSOFTCAR:
-                return -ENOIOCTLCMD;
-#if 0
-        case TCwhatever:
-                /* do something */
-                break;
-#endif
-        default:
-                for (i = 0; i < ARRAY_SIZE(tty_ioctls); i++)
-                        if (cmd == tty_ioctls[i].cmd)
-                                break;
-                if (i == ARRAY_SIZE(tty_ioctls)) {
-                        printk(KERN_ERR "%s: %s: unknown ioctl: 0x%x\n",
-                               __func__, tty->name, cmd);
-                }
-                ret = -ENOIOCTLCMD;
-                break;
-        }
-        return ret;
-}
-
 void line_throttle(struct tty_struct *tty)
 {
         struct line *line = tty->driver_data;
@@ -333,7 +249,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
 {
         struct chan *chan = data;
         struct line *line = chan->line;
-        struct tty_struct *tty = line->tty;
+        struct tty_struct *tty;
         int err;
 
         /*
@@ -352,68 +268,42 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
         }
         spin_unlock(&line->lock);
 
+        tty = tty_port_tty_get(&line->port);
         if (tty == NULL)
                 return IRQ_NONE;
 
         tty_wakeup(tty);
+        tty_kref_put(tty);
+
         return IRQ_HANDLED;
 }
 
 int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
 {
         const struct line_driver *driver = line->driver;
-        int err = 0, flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
+        int err = 0;
 
         if (input)
                 err = um_request_irq(driver->read_irq, fd, IRQ_READ,
-                                       line_interrupt, flags,
-                                       driver->read_irq_name, data);
+                                     line_interrupt, IRQF_SHARED,
+                                     driver->read_irq_name, data);
         if (err)
                 return err;
         if (output)
                 err = um_request_irq(driver->write_irq, fd, IRQ_WRITE,
-                                        line_write_interrupt, flags,
-                                        driver->write_irq_name, data);
+                                     line_write_interrupt, IRQF_SHARED,
+                                     driver->write_irq_name, data);
         return err;
 }
 
-/*
- * Normally, a driver like this can rely mostly on the tty layer
- * locking, particularly when it comes to the driver structure.
- * However, in this case, mconsole requests can come in "from the
- * side", and race with opens and closes.
- *
- * mconsole config requests will want to be sure the device isn't in
- * use, and get_config, open, and close will want a stable
- * configuration.  The checking and modification of the configuration
- * is done under a spinlock.  Checking whether the device is in use is
- * line->tty->count > 1, also under the spinlock.
- *
- * line->count serves to decide whether the device should be enabled or
- * disabled on the host.  If it's equal to 0, then we are doing the
- * first open or last close.  Otherwise, open and close just return.
- */
-
-int line_open(struct line *lines, struct tty_struct *tty)
+static int line_activate(struct tty_port *port, struct tty_struct *tty)
 {
-        struct line *line = &lines[tty->index];
-        int err = -ENODEV;
-
-        mutex_lock(&line->count_lock);
-        if (!line->valid)
-                goto out_unlock;
-
-        err = 0;
-        if (line->count++)
-                goto out_unlock;
-
-        BUG_ON(tty->driver_data);
-        tty->driver_data = line;
-        line->tty = tty;
+        int ret;
+        struct line *line = tty->driver_data;
 
-        err = enable_chan(line);
-        if (err) /* line_close() will be called by our caller */
-                goto out_unlock;
+        ret = enable_chan(line);
+        if (ret)
+                return ret;
 
         if (!line->sigio) {
                 chan_enable_winch(line->chan_out, tty);
@@ -421,44 +311,60 @@ int line_open(struct line *lines, struct tty_struct *tty)
         }
 
         chan_window_size(line, &tty->winsize.ws_row,
-                         &tty->winsize.ws_col);
-out_unlock:
-        mutex_unlock(&line->count_lock);
-        return err;
+                &tty->winsize.ws_col);
+
+        return 0;
 }
 
-static void unregister_winch(struct tty_struct *tty);
+static const struct tty_port_operations line_port_ops = {
+        .activate = line_activate,
+};
 
-void line_close(struct tty_struct *tty, struct file * filp)
+int line_open(struct tty_struct *tty, struct file *filp)
 {
         struct line *line = tty->driver_data;
 
-        /*
-         * If line_open fails (and tty->driver_data is never set),
-         * tty_open will call line_close.  So just return in this case.
-         */
-        if (line == NULL)
-                return;
+        return tty_port_open(&line->port, tty, filp);
+}
 
-        /* We ignore the error anyway! */
-        flush_buffer(line);
+int line_install(struct tty_driver *driver, struct tty_struct *tty,
+                 struct line *line)
+{
+        int ret;
 
-        mutex_lock(&line->count_lock);
-        BUG_ON(!line->valid);
+        ret = tty_standard_install(driver, tty);
+        if (ret)
+                return ret;
 
-        if (--line->count)
-                goto out_unlock;
+        tty->driver_data = line;
 
-        line->tty = NULL;
-        tty->driver_data = NULL;
+        return 0;
+}
+
+static void unregister_winch(struct tty_struct *tty);
+
+void line_cleanup(struct tty_struct *tty)
+{
+        struct line *line = tty->driver_data;
 
         if (line->sigio) {
                 unregister_winch(tty);
                 line->sigio = 0;
         }
+}
+
+void line_close(struct tty_struct *tty, struct file * filp)
+{
+        struct line *line = tty->driver_data;
 
-out_unlock:
-        mutex_unlock(&line->count_lock);
+        tty_port_close(&line->port, tty, filp);
+}
+
+void line_hangup(struct tty_struct *tty)
+{
+        struct line *line = tty->driver_data;
+
+        tty_port_hangup(&line->port);
 }
 
 void close_lines(struct line *lines, int nlines)
@@ -476,9 +382,7 @@ int setup_one_line(struct line *lines, int n, char *init,
         struct tty_driver *driver = line->driver->driver;
         int err = -EINVAL;
 
-        mutex_lock(&line->count_lock);
-
-        if (line->count) {
+        if (line->port.count) {
                 *error_out = "Device is already open";
                 goto out;
         }
@@ -519,7 +423,6 @@ int setup_one_line(struct line *lines, int n, char *init,
                 }
         }
 out:
-        mutex_unlock(&line->count_lock);
         return err;
 }
 
@@ -607,13 +510,17 @@ int line_get_config(char *name, struct line *lines, unsigned int num, char *str,
 
         line = &lines[dev];
 
-        mutex_lock(&line->count_lock);
         if (!line->valid)
                 CONFIG_CHUNK(str, size, n, "none", 1);
-        else if (line->tty == NULL)
-                CONFIG_CHUNK(str, size, n, line->init_str, 1);
-        else n = chan_config_string(line, str, size, error_out);
-        mutex_unlock(&line->count_lock);
+        else {
+                struct tty_struct *tty = tty_port_tty_get(&line->port);
+                if (tty == NULL) {
+                        CONFIG_CHUNK(str, size, n, line->init_str, 1);
+                } else {
+                        n = chan_config_string(line, str, size, error_out);
+                        tty_kref_put(tty);
+                }
+        }
 
         return n;
 }
@@ -663,8 +570,9 @@ int register_lines(struct line_driver *line_driver,
         driver->init_termios = tty_std_termios;
         
         for (i = 0; i < nlines; i++) {
+                tty_port_init(&lines[i].port);
+                lines[i].port.ops = &line_port_ops;
                 spin_lock_init(&lines[i].lock);
-                mutex_init(&lines[i].count_lock);
                 lines[i].driver = line_driver;
                 INIT_LIST_HEAD(&lines[i].chan_list);
         }
@@ -779,8 +687,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty,
                                    .stack       = stack });
 
         if (um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
-                           IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                           "winch", winch) < 0) {
+                           IRQF_SHARED, "winch", winch) < 0) {
                 printk(KERN_ERR "register_winch_irq - failed to register "
                        "IRQ\n");
                 goto out_free;
diff --git a/arch/um/drivers/line.h b/arch/um/drivers/line.h
index 0a1834719dba..bae95611e7ab 100644
--- a/arch/um/drivers/line.h
+++ b/arch/um/drivers/line.h
@@ -32,9 +32,7 @@ struct line_driver {
 };
 
 struct line {
-        struct tty_struct *tty;
-        struct mutex count_lock;
-        unsigned long count;
+        struct tty_port port;
         int valid;
 
         char *init_str;
@@ -59,7 +57,11 @@ struct line {
 };
 
 extern void line_close(struct tty_struct *tty, struct file * filp);
-extern int line_open(struct line *lines, struct tty_struct *tty);
+extern int line_open(struct tty_struct *tty, struct file *filp);
+extern int line_install(struct tty_driver *driver, struct tty_struct *tty,
+        struct line *line);
+extern void line_cleanup(struct tty_struct *tty);
+extern void line_hangup(struct tty_struct *tty);
 extern int line_setup(char **conf, unsigned nlines, char **def,
                       char *init, char *name);
 extern int line_write(struct tty_struct *tty, const unsigned char *buf,
@@ -70,8 +72,6 @@ extern int line_chars_in_buffer(struct tty_struct *tty);
 extern void line_flush_buffer(struct tty_struct *tty);
 extern void line_flush_chars(struct tty_struct *tty);
 extern int line_write_room(struct tty_struct *tty);
-extern int line_ioctl(struct tty_struct *tty, unsigned int cmd,
-                                unsigned long arg);
 extern void line_throttle(struct tty_struct *tty);
 extern void line_unthrottle(struct tty_struct *tty);
 
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 43b39d61b538..664a60e8dfb4 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -774,8 +774,7 @@ static int __init mconsole_init(void)
         register_reboot_notifier(&reboot_notifier);
 
         err = um_request_irq(MCONSOLE_IRQ, sock, IRQ_READ, mconsole_interrupt,
-                             IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                             "mconsole", (void *)sock);
+                             IRQF_SHARED, "mconsole", (void *)sock);
         if (err) {
                 printk(KERN_ERR "Failed to get IRQ for management console\n");
                 goto out;
diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
index 11866ffd45a9..1d83d50236e1 100644
--- a/arch/um/drivers/port_kern.c
+++ b/arch/um/drivers/port_kern.c
@@ -100,8 +100,7 @@ static int port_accept(struct port_list *port)
                   .port         = port });
 
         if (um_request_irq(TELNETD_IRQ, socket[0], IRQ_READ, pipe_interrupt,
-                          IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                          "telnetd", conn)) {
+                          IRQF_SHARED, "telnetd", conn)) {
                 printk(KERN_ERR "port_accept : failed to get IRQ for "
                        "telnetd\n");
                 goto out_free;
@@ -184,8 +183,7 @@ void *port_data(int port_num)
         }
 
         if (um_request_irq(ACCEPT_IRQ, fd, IRQ_READ, port_interrupt,
-                          IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                          "port", port)) {
+                          IRQF_SHARED, "port", port)) {
                 printk(KERN_ERR "Failed to get IRQ for port %d\n", port_num);
                 goto out_close;
         }
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c
index b25296e6218a..e32c6aa6396f 100644
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
@@ -131,8 +131,7 @@ static int __init rng_init (void)
         random_fd = err;
 
         err = um_request_irq(RANDOM_IRQ, random_fd, IRQ_READ, random_interrupt,
-                             IRQF_SAMPLE_RANDOM, "random",
-                             NULL);
+                             0, "random", NULL);
         if (err)
                 goto err_out_cleanup_hw;
 
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
index e09801a1327b..7e86f0070123 100644
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
@@ -87,40 +87,13 @@ static int ssl_remove(int n, char **error_out)
                            error_out);
 }
 
-static int ssl_open(struct tty_struct *tty, struct file *filp)
-{
-        int err = line_open(serial_lines, tty);
-
-        if (err)
-                printk(KERN_ERR "Failed to open serial line %d, err = %d\n",
-                       tty->index, err);
-
-        return err;
-}
-
-#if 0
-static void ssl_flush_buffer(struct tty_struct *tty)
-{
-        return;
-}
-
-static void ssl_stop(struct tty_struct *tty)
-{
-        printk(KERN_ERR "Someone should implement ssl_stop\n");
-}
-
-static void ssl_start(struct tty_struct *tty)
-{
-        printk(KERN_ERR "Someone should implement ssl_start\n");
-}
-
-void ssl_hangup(struct tty_struct *tty)
+static int ssl_install(struct tty_driver *driver, struct tty_struct *tty)
 {
+        return line_install(driver, tty, &serial_lines[tty->index]);
 }
-#endif
 
 static const struct tty_operations ssl_ops = {
-        .open                   = ssl_open,
+        .open                   = line_open,
         .close                  = line_close,
         .write                  = line_write,
         .put_char               = line_put_char,
@@ -129,14 +102,11 @@ static const struct tty_operations ssl_ops = {
         .flush_buffer           = line_flush_buffer,
         .flush_chars            = line_flush_chars,
         .set_termios            = line_set_termios,
-        .ioctl                  = line_ioctl,
         .throttle               = line_throttle,
         .unthrottle             = line_unthrottle,
-#if 0
-        .stop                   = ssl_stop,
-        .start                  = ssl_start,
-        .hangup                 = ssl_hangup,
-#endif
+        .install                = ssl_install,
+        .cleanup                = line_cleanup,
+        .hangup                 = line_hangup,
 };
 
 /* Changed by ssl_init and referenced by ssl_exit, which are both serialized
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 7663541c372e..929b99a261f3 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -89,21 +89,17 @@ static int con_remove(int n, char **error_out)
         return line_remove(vts, ARRAY_SIZE(vts), n, error_out);
 }
 
-static int con_open(struct tty_struct *tty, struct file *filp)
-{
-        int err = line_open(vts, tty);
-        if (err)
-                printk(KERN_ERR "Failed to open console %d, err = %d\n",
-                       tty->index, err);
-
-        return err;
-}
-
 /* Set in an initcall, checked in an exitcall */
 static int con_init_done = 0;
 
+static int con_install(struct tty_driver *driver, struct tty_struct *tty)
+{
+        return line_install(driver, tty, &vts[tty->index]);
+}
+
 static const struct tty_operations console_ops = {
-        .open                   = con_open,
+        .open                   = line_open,
+        .install                = con_install,
         .close                  = line_close,
         .write                  = line_write,
         .put_char               = line_put_char,
@@ -112,9 +108,10 @@ static const struct tty_operations console_ops = {
         .flush_buffer           = line_flush_buffer,
         .flush_chars            = line_flush_chars,
         .set_termios            = line_set_termios,
-        .ioctl                  = line_ioctl,
         .throttle               = line_throttle,
         .unthrottle             = line_unthrottle,
+        .cleanup                = line_cleanup,
+        .hangup                 = line_hangup,
 };
 
 static void uml_console_write(struct console *console, const char *string,
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 20505cafa299..0643e5bc9f41 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -514,7 +514,7 @@ static inline int ubd_file_size(struct ubd *ubd_dev, __u64 *size_out)
                 goto out;
         }
 
-        fd = os_open_file(ubd_dev->file, global_openflags, 0);
+        fd = os_open_file(ubd_dev->file, of_read(OPENFLAGS()), 0);
         if (fd < 0)
                 return fd;
 
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index b68bbe269e01..e3031e69445d 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -50,8 +50,7 @@ int xterm_fd(int socket, int *pid_out)
         init_completion(&data->ready);
 
         err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
-                             IRQF_SHARED | IRQF_SAMPLE_RANDOM,
-                             "xterm", data);
+                             IRQF_SHARED, "xterm", data);
         if (err) {
                 printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
                        "err = %d\n",  err);
diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h
index e786a6a3ec5e..442f1d025dc2 100644
--- a/arch/um/include/asm/ptrace-generic.h
+++ b/arch/um/include/asm/ptrace-generic.h
@@ -37,6 +37,8 @@ extern int putreg(struct task_struct *child, int regno, unsigned long value);
 
 extern int arch_copy_tls(struct task_struct *new);
 extern void clear_flushed_tls(struct task_struct *task);
+extern void syscall_trace_enter(struct pt_regs *regs);
+extern void syscall_trace_leave(struct pt_regs *regs);
 
 #endif
 
diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h
index 896e16602176..86daa5461815 100644
--- a/arch/um/include/shared/as-layout.h
+++ b/arch/um/include/shared/as-layout.h
@@ -60,7 +60,8 @@ extern unsigned long host_task_size;
 
 extern int linux_main(int argc, char **argv);
 
-extern void (*sig_info[])(int, struct uml_pt_regs *);
+struct siginfo;
+extern void (*sig_info[])(int, struct siginfo *si, struct uml_pt_regs *);
 
 #endif
 
diff --git a/arch/um/include/shared/irq_user.h b/arch/um/include/shared/irq_user.h
index c6c784df2673..2b6d703925b5 100644
--- a/arch/um/include/shared/irq_user.h
+++ b/arch/um/include/shared/irq_user.h
@@ -20,7 +20,8 @@ struct irq_fd {
 
 enum { IRQ_READ, IRQ_WRITE };
 
-extern void sigio_handler(int sig, struct uml_pt_regs *regs);
+struct siginfo;
+extern void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
 extern void free_irq_by_fd(int fd);
 extern void reactivate_fd(int fd, int irqnum);
 extern void deactivate_fd(int fd, int irqnum);
diff --git a/arch/um/include/shared/kern_util.h b/arch/um/include/shared/kern_util.h
index 00965d06d2ca..af6b6dc868ba 100644
--- a/arch/um/include/shared/kern_util.h
+++ b/arch/um/include/shared/kern_util.h
@@ -9,6 +9,8 @@
 #include "sysdep/ptrace.h"
 #include "sysdep/faultinfo.h"
 
+struct siginfo;
+
 extern int uml_exitcode;
 
 extern int ncpus;
@@ -22,7 +24,7 @@ extern void free_stack(unsigned long stack, int order);
 
 extern int do_signal(void);
 extern void interrupt_end(void);
-extern void relay_signal(int sig, struct uml_pt_regs *regs);
+extern void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs);
 
 extern unsigned long segv(struct faultinfo fi, unsigned long ip,
                           int is_user, struct uml_pt_regs *regs);
@@ -33,9 +35,8 @@ extern unsigned int do_IRQ(int irq, struct uml_pt_regs *regs);
 extern int smp_sigio_handler(void);
 extern void initial_thread_cb(void (*proc)(void *), void *arg);
 extern int is_syscall(unsigned long addr);
-extern void timer_handler(int sig, struct uml_pt_regs *regs);
 
-extern void timer_handler(int sig, struct uml_pt_regs *regs);
+extern void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
 
 extern int start_uml(void);
 extern void paging_init(void);
@@ -59,9 +60,9 @@ extern unsigned long from_irq_stack(int nested);
 extern void syscall_trace(struct uml_pt_regs *regs, int entryexit);
 extern int singlestepping(void *t);
 
-extern void segv_handler(int sig, struct uml_pt_regs *regs);
-extern void bus_handler(int sig, struct uml_pt_regs *regs);
-extern void winch(int sig, struct uml_pt_regs *regs);
+extern void segv_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
+extern void bus_handler(int sig, struct siginfo *si, struct uml_pt_regs *regs);
+extern void winch(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs);
 extern void fatal_sigsegv(void) __attribute__ ((noreturn));
 
 
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 00506c3d5d6e..9883026f0730 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -30,7 +30,7 @@ static struct irq_fd **last_irq_ptr = &active_fds;
 
 extern void free_irqs(void);
 
-void sigio_handler(int sig, struct uml_pt_regs *regs)
+void sigio_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
 {
         struct irq_fd *irq_fd;
         int n;
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index ccb9a9d283f1..57fc7028714a 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -151,12 +151,10 @@ void new_thread_handler(void)
          * 0 if it just exits
          */
         n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
-        if (n == 1) {
-                /* Handle any immediate reschedules or signals */
-                interrupt_end();
+        if (n == 1)
                 userspace(&current->thread.regs.regs);
-        }
-        else do_exit(0);
+        else
+                do_exit(0);
 }
 
 /* Called magically, see new_thread_handler above */
@@ -175,9 +173,6 @@ void fork_handler(void)
 
         current->thread.prev_sched = NULL;
 
-        /* Handle any immediate reschedules or signals */
-        interrupt_end();
-
         userspace(&current->thread.regs.regs);
 }
 
@@ -193,7 +188,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
         if (current->thread.forking) {
                 memcpy(&p->thread.regs.regs, &regs->regs,
                        sizeof(p->thread.regs.regs));
-                UPT_SET_SYSCALL_RETURN(&p->thread.regs.regs, 0);
+                PT_REGS_SET_SYSCALL_RETURN(&p->thread.regs, 0);
                 if (sp != 0)
                         REGS_SP(p->thread.regs.regs.gp) = sp;
 
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 06b190390505..694d551c8899 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -3,11 +3,12 @@
  * Licensed under the GPL
  */
 
-#include "linux/audit.h"
-#include "linux/ptrace.h"
-#include "linux/sched.h"
-#include "asm/uaccess.h"
-#include "skas_ptrace.h"
+#include <linux/audit.h>
+#include <linux/ptrace.h>
+#include <linux/sched.h>
+#include <linux/tracehook.h>
+#include <asm/uaccess.h>
+#include <skas_ptrace.h>
 
 
 
@@ -162,48 +163,36 @@ static void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs,
  * XXX Check PT_DTRACE vs TIF_SINGLESTEP for singlestepping check and
  * PT_PTRACED vs TIF_SYSCALL_TRACE for syscall tracing check
  */
-void syscall_trace(struct uml_pt_regs *regs, int entryexit)
+void syscall_trace_enter(struct pt_regs *regs)
 {
-        int is_singlestep = (current->ptrace & PT_DTRACE) && entryexit;
-        int tracesysgood;
-
-        if (!entryexit)
-                audit_syscall_entry(HOST_AUDIT_ARCH,
-                                    UPT_SYSCALL_NR(regs),
-                                    UPT_SYSCALL_ARG1(regs),
-                                    UPT_SYSCALL_ARG2(regs),
-                                    UPT_SYSCALL_ARG3(regs),
-                                    UPT_SYSCALL_ARG4(regs));
-        else
-                audit_syscall_exit(regs);
-
-        /* Fake a debug trap */
-        if (is_singlestep)
-                send_sigtrap(current, regs, 0);
+        audit_syscall_entry(HOST_AUDIT_ARCH,
+                            UPT_SYSCALL_NR(&regs->regs),
+                            UPT_SYSCALL_ARG1(&regs->regs),
+                            UPT_SYSCALL_ARG2(&regs->regs),
+                            UPT_SYSCALL_ARG3(&regs->regs),
+                            UPT_SYSCALL_ARG4(&regs->regs));
 
         if (!test_thread_flag(TIF_SYSCALL_TRACE))
                 return;
 
-        if (!(current->ptrace & PT_PTRACED))
-                return;
+        tracehook_report_syscall_entry(regs);
+}
 
-        /*
-         * the 0x80 provides a way for the tracing parent to distinguish
-         * between a syscall stop and SIGTRAP delivery
-         */
-        tracesysgood = (current->ptrace & PT_TRACESYSGOOD);
-        ptrace_notify(SIGTRAP | (tracesysgood ? 0x80 : 0));
+void syscall_trace_leave(struct pt_regs *regs)
+{
+        int ptraced = current->ptrace;
 
-        if (entryexit) /* force do_signal() --> is_syscall() */
-                set_thread_flag(TIF_SIGPENDING);
+        audit_syscall_exit(regs);
 
-        /*
-         * this isn't the same as continuing with a signal, but it will do
-         * for normal use.  strace only continues with a signal if the
-         * stopping signal is not SIGTRAP.  -brl
-         */
-        if (current->exit_code) {
-                send_sig(current->exit_code, current, 1);
-                current->exit_code = 0;
-        }
+        /* Fake a debug trap */
+        if (ptraced & PT_DTRACE)
+                send_sigtrap(current, &regs->regs, 0);
+
+        if (!test_thread_flag(TIF_SYSCALL_TRACE))
+                return;
+
+        tracehook_report_syscall_exit(regs, 0);
+        /* force do_signal() --> is_syscall() */
+        if (ptraced & PT_PTRACED)
+                set_thread_flag(TIF_SIGPENDING);
 }
diff --git a/arch/um/kernel/sigio.c b/arch/um/kernel/sigio.c
index 2a1639255763..c88211139a51 100644
--- a/arch/um/kernel/sigio.c
+++ b/arch/um/kernel/sigio.c
@@ -25,8 +25,7 @@ int write_sigio_irq(int fd)
         int err;
 
         err = um_request_irq(SIGIO_WRITE_IRQ, fd, IRQ_READ, sigio_interrupt,
-                             IRQF_SAMPLE_RANDOM, "write sigio",
-                             NULL);
+                             0, "write sigio", NULL);
         if (err) {
                 printk(KERN_ERR "write_sigio_irq : um_request_irq failed, "
                        "err = %d\n", err);
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index 05fbeb480e0b..86368a025a96 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -18,7 +18,7 @@ void handle_syscall(struct uml_pt_regs *r)
         long result;
         int syscall;
 
-        syscall_trace(r, 0);
+        syscall_trace_enter(regs);
 
         /*
          * This should go in the declaration of syscall, but when I do that,
@@ -34,7 +34,7 @@ void handle_syscall(struct uml_pt_regs *r)
                 result = -ENOSYS;
         else result = EXECUTE_SYSCALL(syscall, regs);
 
-        UPT_SET_SYSCALL_RETURN(r, result);
+        PT_REGS_SET_SYSCALL_RETURN(regs, result);
 
-        syscall_trace(r, 1);
+        syscall_trace_leave(regs);
 }
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index d1a23fb3190d..5f76d4ba151c 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -13,7 +13,7 @@
 #include "kern_util.h"
 #include "os.h"
 
-void timer_handler(int sig, struct uml_pt_regs *regs)
+void timer_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
 {
         unsigned long flags;
 
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 3be60765c0e2..0353b98ae35a 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -172,7 +172,7 @@ void fatal_sigsegv(void)
         os_dump_core();
 }
 
-void segv_handler(int sig, struct uml_pt_regs *regs)
+void segv_handler(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
 {
         struct faultinfo * fi = UPT_FAULTINFO(regs);
 
@@ -258,8 +258,11 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
         return 0;
 }
 
-void relay_signal(int sig, struct uml_pt_regs *regs)
+void relay_signal(int sig, struct siginfo *si, struct uml_pt_regs *regs)
 {
+        struct faultinfo *fi;
+        struct siginfo clean_si;
+
         if (!UPT_IS_USER(regs)) {
                 if (sig == SIGBUS)
                         printk(KERN_ERR "Bus error - the host /dev/shm or /tmp "
@@ -269,18 +272,40 @@ void relay_signal(int sig, struct uml_pt_regs *regs)
 
         arch_examine_signal(sig, regs);
 
-        current->thread.arch.faultinfo = *UPT_FAULTINFO(regs);
-        force_sig(sig, current);
+        memset(&clean_si, 0, sizeof(clean_si));
+        clean_si.si_signo = si->si_signo;
+        clean_si.si_errno = si->si_errno;
+        clean_si.si_code = si->si_code;
+        switch (sig) {
+        case SIGILL:
+        case SIGFPE:
+        case SIGSEGV:
+        case SIGBUS:
+        case SIGTRAP:
+                fi = UPT_FAULTINFO(regs);
+                clean_si.si_addr = (void __user *) FAULT_ADDRESS(*fi);
+                current->thread.arch.faultinfo = *fi;
+#ifdef __ARCH_SI_TRAPNO
+                clean_si.si_trapno = si->si_trapno;
+#endif
+                break;
+        default:
+                printk(KERN_ERR "Attempted to relay unknown signal %d (si_code = %d)\n",
+                        sig, si->si_code);
+        }
+
+        force_sig_info(sig, &clean_si, current);
 }
 
-void bus_handler(int sig, struct uml_pt_regs *regs)
+void bus_handler(int sig, struct siginfo *si, struct uml_pt_regs *regs)
 {
         if (current->thread.fault_catcher != NULL)
                 UML_LONGJMP(current->thread.fault_catcher, 1);
-        else relay_signal(sig, regs);
+        else
+                relay_signal(sig, si, regs);
 }
 
-void winch(int sig, struct uml_pt_regs *regs)
+void winch(int sig, struct siginfo *unused_si, struct uml_pt_regs *regs)
 {
         do_IRQ(WINCH_IRQ, regs);
 }
diff --git a/arch/um/os-Linux/internal.h b/arch/um/os-Linux/internal.h
index 2c3c3ecd8c01..0dc2c9f135f6 100644
--- a/arch/um/os-Linux/internal.h
+++ b/arch/um/os-Linux/internal.h
@@ -1 +1 @@
-void alarm_handler(int, mcontext_t *);
+void alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc);
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 2d22f1fcd8e2..6366ce904b9b 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -13,8 +13,9 @@
 #include "kern_util.h"
 #include "os.h"
 #include "sysdep/mcontext.h"
+#include "internal.h"
 
-void (*sig_info[NSIG])(int, struct uml_pt_regs *) = {
+void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = {
         [SIGTRAP]       = relay_signal,
         [SIGFPE]        = relay_signal,
         [SIGILL]        = relay_signal,
@@ -24,7 +25,7 @@ void (*sig_info[NSIG])(int, struct uml_pt_regs *) = {
         [SIGIO]         = sigio_handler,
         [SIGVTALRM]     = timer_handler };
 
-static void sig_handler_common(int sig, mcontext_t *mc)
+static void sig_handler_common(int sig, siginfo_t *si, mcontext_t *mc)
 {
         struct uml_pt_regs r;
         int save_errno = errno;
@@ -40,7 +41,7 @@ static void sig_handler_common(int sig, mcontext_t *mc)
         if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGVTALRM))
                 unblock_signals();
 
-        (*sig_info[sig])(sig, &r);
+        (*sig_info[sig])(sig, si, &r);
 
         errno = save_errno;
 }
@@ -60,7 +61,7 @@ static void sig_handler_common(int sig, mcontext_t *mc)
 static int signals_enabled;
 static unsigned int signals_pending;
 
-void sig_handler(int sig, mcontext_t *mc)
+void sig_handler(int sig, siginfo_t *si, mcontext_t *mc)
 {
         int enabled;
 
@@ -72,7 +73,7 @@ void sig_handler(int sig, mcontext_t *mc)
 
         block_signals();
 
-        sig_handler_common(sig, mc);
+        sig_handler_common(sig, si, mc);
 
         set_signals(enabled);
 }
@@ -85,10 +86,10 @@ static void real_alarm_handler(mcontext_t *mc)
                 get_regs_from_mc(&regs, mc);
         regs.is_user = 0;
         unblock_signals();
-        timer_handler(SIGVTALRM, &regs);
+        timer_handler(SIGVTALRM, NULL, &regs);
 }
 
-void alarm_handler(int sig, mcontext_t *mc)
+void alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc)
 {
         int enabled;
 
@@ -119,7 +120,7 @@ void set_sigstack(void *sig_stack, int size)
                 panic("enabling signal stack failed, errno = %d\n", errno);
 }
 
-static void (*handlers[_NSIG])(int sig, mcontext_t *mc) = {
+static void (*handlers[_NSIG])(int sig, siginfo_t *si, mcontext_t *mc) = {
         [SIGSEGV] = sig_handler,
         [SIGBUS] = sig_handler,
         [SIGILL] = sig_handler,
@@ -132,7 +133,7 @@ static void (*handlers[_NSIG])(int sig, mcontext_t *mc) = {
 };
 
 
-static void hard_handler(int sig, siginfo_t *info, void *p)
+static void hard_handler(int sig, siginfo_t *si, void *p)
 {
         struct ucontext *uc = p;
         mcontext_t *mc = &uc->uc_mcontext;
@@ -161,7 +162,7 @@ static void hard_handler(int sig, siginfo_t *info, void *p)
                 while ((sig = ffs(pending)) != 0){
                         sig--;
                         pending &= ~(1 << sig);
-                        (*handlers[sig])(sig, mc);
+                        (*handlers[sig])(sig, si, mc);
                 }
 
                 /*
@@ -273,9 +274,12 @@ void unblock_signals(void)
                  * Deal with SIGIO first because the alarm handler might
                  * schedule, leaving the pending SIGIO stranded until we come
                  * back here.
+                 *
+                 * SIGIO's handler doesn't use siginfo or mcontext,
+                 * so they can be NULL.
                  */
                 if (save_pending & SIGIO_MASK)
-                        sig_handler_common(SIGIO, NULL);
+                        sig_handler_common(SIGIO, NULL, NULL);
 
                 if (save_pending & SIGVTALRM_MASK)
                         real_alarm_handler(NULL);
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index cd65727854eb..d93bb40499f7 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -346,6 +346,10 @@ void userspace(struct uml_pt_regs *regs)
         int err, status, op, pid = userspace_pid[0];
         /* To prevent races if using_sysemu changes under us.*/
         int local_using_sysemu;
+        siginfo_t si;
+
+        /* Handle any immediate reschedules or signals */
+        interrupt_end();
 
         if (getitimer(ITIMER_VIRTUAL, &timer))
                 printk(UM_KERN_ERR "Failed to get itimer, errno = %d\n", errno);
@@ -404,13 +408,17 @@ void userspace(struct uml_pt_regs *regs)
 
                 if (WIFSTOPPED(status)) {
                         int sig = WSTOPSIG(status);
+
+                        ptrace(PTRACE_GETSIGINFO, pid, 0, &si);
+
                         switch (sig) {
                         case SIGSEGV:
                                 if (PTRACE_FULL_FAULTINFO ||
                                     !ptrace_faultinfo) {
                                         get_skas_faultinfo(pid,
                                                            &regs->faultinfo);
-                                        (*sig_info[SIGSEGV])(SIGSEGV, regs);
+                                        (*sig_info[SIGSEGV])(SIGSEGV, &si,
+                                                             regs);
                                 }
                                 else handle_segv(pid, regs);
                                 break;
@@ -418,14 +426,14 @@ void userspace(struct uml_pt_regs *regs)
                                 handle_trap(pid, regs, local_using_sysemu);
                                 break;
                         case SIGTRAP:
-                                relay_signal(SIGTRAP, regs);
+                                relay_signal(SIGTRAP, &si, regs);
                                 break;
                         case SIGVTALRM:
                                 now = os_nsecs();
                                 if (now < nsecs)
                                         break;
                                 block_signals();
-                                (*sig_info[sig])(sig, regs);
+                                (*sig_info[sig])(sig, &si, regs);
                                 unblock_signals();
                                 nsecs = timer.it_value.tv_sec *
                                         UM_NSEC_PER_SEC +
@@ -439,7 +447,7 @@ void userspace(struct uml_pt_regs *regs)
                         case SIGFPE:
                         case SIGWINCH:
                                 block_signals();
-                                (*sig_info[sig])(sig, regs);
+                                (*sig_info[sig])(sig, &si, regs);
                                 unblock_signals();
                                 break;
                         default:
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 910499d76a67..f60238559af3 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -87,7 +87,7 @@ static int after_sleep_interval(struct timespec *ts)
 
 static void deliver_alarm(void)
 {
-        alarm_handler(SIGVTALRM, NULL);
+        alarm_handler(SIGVTALRM, NULL, NULL);
 }
 
 static unsigned long long sleep_time(unsigned long long nsecs)
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h
index c78f14a0df00..dab39350e51e 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -234,7 +234,7 @@ extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr);
 extern void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap);
 extern void perf_check_microcode(void);
 #else
-static inline perf_guest_switch_msr *perf_guest_get_msrs(int *nr)
+static inline struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr)
 {
         *nr = 0;
         return NULL;
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index a15df4be151f..821d53b696d1 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -374,7 +374,7 @@ struct x86_pmu {
         /*
          * Intel DebugStore bits
          */
-        int             bts             :1,
+        unsigned int    bts             :1,
                         bts_active      :1,
                         pebs            :1,
                         pebs_active     :1,
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 7a8b9d0abcaa..382366977d4c 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -138,6 +138,84 @@ static u64 intel_pmu_event_map(int hw_event)
         return intel_perfmon_event_map[hw_event];
 }
 
+#define SNB_DMND_DATA_RD        (1ULL << 0)
+#define SNB_DMND_RFO            (1ULL << 1)
+#define SNB_DMND_IFETCH         (1ULL << 2)
+#define SNB_DMND_WB             (1ULL << 3)
+#define SNB_PF_DATA_RD          (1ULL << 4)
+#define SNB_PF_RFO              (1ULL << 5)
+#define SNB_PF_IFETCH           (1ULL << 6)
+#define SNB_LLC_DATA_RD         (1ULL << 7)
+#define SNB_LLC_RFO             (1ULL << 8)
+#define SNB_LLC_IFETCH          (1ULL << 9)
+#define SNB_BUS_LOCKS           (1ULL << 10)
+#define SNB_STRM_ST             (1ULL << 11)
+#define SNB_OTHER               (1ULL << 15)
+#define SNB_RESP_ANY            (1ULL << 16)
+#define SNB_NO_SUPP             (1ULL << 17)
+#define SNB_LLC_HITM            (1ULL << 18)
+#define SNB_LLC_HITE            (1ULL << 19)
+#define SNB_LLC_HITS            (1ULL << 20)
+#define SNB_LLC_HITF            (1ULL << 21)
+#define SNB_LOCAL               (1ULL << 22)
+#define SNB_REMOTE              (0xffULL << 23)
+#define SNB_SNP_NONE            (1ULL << 31)
+#define SNB_SNP_NOT_NEEDED      (1ULL << 32)
+#define SNB_SNP_MISS            (1ULL << 33)
+#define SNB_NO_FWD              (1ULL << 34)
+#define SNB_SNP_FWD             (1ULL << 35)
+#define SNB_HITM                (1ULL << 36)
+#define SNB_NON_DRAM            (1ULL << 37)
+
+#define SNB_DMND_READ           (SNB_DMND_DATA_RD|SNB_LLC_DATA_RD)
+#define SNB_DMND_WRITE          (SNB_DMND_RFO|SNB_LLC_RFO)
+#define SNB_DMND_PREFETCH       (SNB_PF_DATA_RD|SNB_PF_RFO)
+
+#define SNB_SNP_ANY             (SNB_SNP_NONE|SNB_SNP_NOT_NEEDED| \
+                                 SNB_SNP_MISS|SNB_NO_FWD|SNB_SNP_FWD| \
+                                 SNB_HITM)
+
+#define SNB_DRAM_ANY            (SNB_LOCAL|SNB_REMOTE|SNB_SNP_ANY)
+#define SNB_DRAM_REMOTE         (SNB_REMOTE|SNB_SNP_ANY)
+
+#define SNB_L3_ACCESS           SNB_RESP_ANY
+#define SNB_L3_MISS             (SNB_DRAM_ANY|SNB_NON_DRAM)
+
+static __initconst const u64 snb_hw_cache_extra_regs
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(LL  ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = SNB_DMND_READ|SNB_L3_ACCESS,
+                [ C(RESULT_MISS)   ] = SNB_DMND_READ|SNB_L3_MISS,
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = SNB_DMND_WRITE|SNB_L3_ACCESS,
+                [ C(RESULT_MISS)   ] = SNB_DMND_WRITE|SNB_L3_MISS,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = SNB_DMND_PREFETCH|SNB_L3_ACCESS,
+                [ C(RESULT_MISS)   ] = SNB_DMND_PREFETCH|SNB_L3_MISS,
+        },
+ },
+ [ C(NODE) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = SNB_DMND_READ|SNB_DRAM_ANY,
+                [ C(RESULT_MISS)   ] = SNB_DMND_READ|SNB_DRAM_REMOTE,
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = SNB_DMND_WRITE|SNB_DRAM_ANY,
+                [ C(RESULT_MISS)   ] = SNB_DMND_WRITE|SNB_DRAM_REMOTE,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = SNB_DMND_PREFETCH|SNB_DRAM_ANY,
+                [ C(RESULT_MISS)   ] = SNB_DMND_PREFETCH|SNB_DRAM_REMOTE,
+        },
+ },
+};
+
 static __initconst const u64 snb_hw_cache_event_ids
                                 [PERF_COUNT_HW_CACHE_MAX]
                                 [PERF_COUNT_HW_CACHE_OP_MAX]
@@ -235,16 +313,16 @@ static __initconst const u64 snb_hw_cache_event_ids
  },
  [ C(NODE) ] = {
         [ C(OP_READ) ] = {
-                [ C(RESULT_ACCESS) ] = -1,
-                [ C(RESULT_MISS)   ] = -1,
+                [ C(RESULT_ACCESS) ] = 0x01b7,
+                [ C(RESULT_MISS)   ] = 0x01b7,
         },
         [ C(OP_WRITE) ] = {
-                [ C(RESULT_ACCESS) ] = -1,
-                [ C(RESULT_MISS)   ] = -1,
+                [ C(RESULT_ACCESS) ] = 0x01b7,
+                [ C(RESULT_MISS)   ] = 0x01b7,
         },
         [ C(OP_PREFETCH) ] = {
-                [ C(RESULT_ACCESS) ] = -1,
-                [ C(RESULT_MISS)   ] = -1,
+                [ C(RESULT_ACCESS) ] = 0x01b7,
+                [ C(RESULT_MISS)   ] = 0x01b7,
         },
  },
 
@@ -1964,6 +2042,8 @@ __init int intel_pmu_init(void)
         case 58: /* IvyBridge */
                 memcpy(hw_cache_event_ids, snb_hw_cache_event_ids,
                        sizeof(hw_cache_event_ids));
+                memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs,
+                       sizeof(hw_cache_extra_regs));
 
                 intel_pmu_lbr_init_snb();
 
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 19faffc60886..7563fda9f033 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -18,6 +18,7 @@ static struct event_constraint constraint_empty =
         EVENT_CONSTRAINT(0, 0, 0);
 
 DEFINE_UNCORE_FORMAT_ATTR(event, event, "config:0-7");
+DEFINE_UNCORE_FORMAT_ATTR(event_ext, event, "config:0-7,21");
 DEFINE_UNCORE_FORMAT_ATTR(umask, umask, "config:8-15");
 DEFINE_UNCORE_FORMAT_ATTR(edge, edge, "config:18");
 DEFINE_UNCORE_FORMAT_ATTR(tid_en, tid_en, "config:19");
@@ -33,10 +34,81 @@ DEFINE_UNCORE_FORMAT_ATTR(filter_tid, filter_tid, "config1:0-4");
 DEFINE_UNCORE_FORMAT_ATTR(filter_nid, filter_nid, "config1:10-17");
 DEFINE_UNCORE_FORMAT_ATTR(filter_state, filter_state, "config1:18-22");
 DEFINE_UNCORE_FORMAT_ATTR(filter_opc, filter_opc, "config1:23-31");
-DEFINE_UNCORE_FORMAT_ATTR(filter_brand0, filter_brand0, "config1:0-7");
-DEFINE_UNCORE_FORMAT_ATTR(filter_brand1, filter_brand1, "config1:8-15");
-DEFINE_UNCORE_FORMAT_ATTR(filter_brand2, filter_brand2, "config1:16-23");
-DEFINE_UNCORE_FORMAT_ATTR(filter_brand3, filter_brand3, "config1:24-31");
+DEFINE_UNCORE_FORMAT_ATTR(filter_band0, filter_band0, "config1:0-7");
+DEFINE_UNCORE_FORMAT_ATTR(filter_band1, filter_band1, "config1:8-15");
+DEFINE_UNCORE_FORMAT_ATTR(filter_band2, filter_band2, "config1:16-23");
+DEFINE_UNCORE_FORMAT_ATTR(filter_band3, filter_band3, "config1:24-31");
+
+static u64 uncore_msr_read_counter(struct intel_uncore_box *box, struct perf_event *event)
+{
+        u64 count;
+
+        rdmsrl(event->hw.event_base, count);
+
+        return count;
+}
+
+/*
+ * generic get constraint function for shared match/mask registers.
+ */
+static struct event_constraint *
+uncore_get_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct intel_uncore_extra_reg *er;
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct hw_perf_event_extra *reg2 = &event->hw.branch_reg;
+        unsigned long flags;
+        bool ok = false;
+
+        /*
+         * reg->alloc can be set due to existing state, so for fake box we
+         * need to ignore this, otherwise we might fail to allocate proper
+         * fake state for this extra reg constraint.
+         */
+        if (reg1->idx == EXTRA_REG_NONE ||
+            (!uncore_box_is_fake(box) && reg1->alloc))
+                return NULL;
+
+        er = &box->shared_regs[reg1->idx];
+        raw_spin_lock_irqsave(&er->lock, flags);
+        if (!atomic_read(&er->ref) ||
+            (er->config1 == reg1->config && er->config2 == reg2->config)) {
+                atomic_inc(&er->ref);
+                er->config1 = reg1->config;
+                er->config2 = reg2->config;
+                ok = true;
+        }
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+
+        if (ok) {
+                if (!uncore_box_is_fake(box))
+                        reg1->alloc = 1;
+                return NULL;
+        }
+
+        return &constraint_empty;
+}
+
+static void uncore_put_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct intel_uncore_extra_reg *er;
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+
+        /*
+         * Only put constraint if extra reg was actually allocated. Also
+         * takes care of event which do not use an extra shared reg.
+         *
+         * Also, if this is a fake box we shouldn't touch any event state
+         * (reg->alloc) and we don't care about leaving inconsistent box
+         * state either since it will be thrown out.
+         */
+        if (uncore_box_is_fake(box) || !reg1->alloc)
+                return;
+
+        er = &box->shared_regs[reg1->idx];
+        atomic_dec(&er->ref);
+        reg1->alloc = 0;
+}
 
 /* Sandy Bridge-EP uncore support */
 static struct intel_uncore_type snbep_uncore_cbox;
@@ -64,18 +136,15 @@ static void snbep_uncore_pci_enable_box(struct intel_uncore_box *box)
         pci_write_config_dword(pdev, box_ctl, config);
 }
 
-static void snbep_uncore_pci_enable_event(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void snbep_uncore_pci_enable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct pci_dev *pdev = box->pci_dev;
         struct hw_perf_event *hwc = &event->hw;
 
-        pci_write_config_dword(pdev, hwc->config_base, hwc->config |
-                                SNBEP_PMON_CTL_EN);
+        pci_write_config_dword(pdev, hwc->config_base, hwc->config | SNBEP_PMON_CTL_EN);
 }
 
-static void snbep_uncore_pci_disable_event(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void snbep_uncore_pci_disable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct pci_dev *pdev = box->pci_dev;
         struct hw_perf_event *hwc = &event->hw;
@@ -83,8 +152,7 @@ static void snbep_uncore_pci_disable_event(struct intel_uncore_box *box,
         pci_write_config_dword(pdev, hwc->config_base, hwc->config);
 }
 
-static u64 snbep_uncore_pci_read_counter(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static u64 snbep_uncore_pci_read_counter(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct pci_dev *pdev = box->pci_dev;
         struct hw_perf_event *hwc = &event->hw;
@@ -92,14 +160,15 @@ static u64 snbep_uncore_pci_read_counter(struct intel_uncore_box *box,
 
         pci_read_config_dword(pdev, hwc->event_base, (u32 *)&count);
         pci_read_config_dword(pdev, hwc->event_base + 4, (u32 *)&count + 1);
+
         return count;
 }
 
 static void snbep_uncore_pci_init_box(struct intel_uncore_box *box)
 {
         struct pci_dev *pdev = box->pci_dev;
-        pci_write_config_dword(pdev, SNBEP_PCI_PMON_BOX_CTL,
-                                SNBEP_PMON_BOX_CTL_INT);
+
+        pci_write_config_dword(pdev, SNBEP_PCI_PMON_BOX_CTL, SNBEP_PMON_BOX_CTL_INT);
 }
 
 static void snbep_uncore_msr_disable_box(struct intel_uncore_box *box)
@@ -112,7 +181,6 @@ static void snbep_uncore_msr_disable_box(struct intel_uncore_box *box)
                 rdmsrl(msr, config);
                 config |= SNBEP_PMON_BOX_CTL_FRZ;
                 wrmsrl(msr, config);
-                return;
         }
 }
 
@@ -126,12 +194,10 @@ static void snbep_uncore_msr_enable_box(struct intel_uncore_box *box)
                 rdmsrl(msr, config);
                 config &= ~SNBEP_PMON_BOX_CTL_FRZ;
                 wrmsrl(msr, config);
-                return;
         }
 }
 
-static void snbep_uncore_msr_enable_event(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void snbep_uncore_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct hw_perf_event *hwc = &event->hw;
         struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
@@ -150,68 +216,15 @@ static void snbep_uncore_msr_disable_event(struct intel_uncore_box *box,
         wrmsrl(hwc->config_base, hwc->config);
 }
 
-static u64 snbep_uncore_msr_read_counter(struct intel_uncore_box *box,
-                                        struct perf_event *event)
-{
-        struct hw_perf_event *hwc = &event->hw;
-        u64 count;
-
-        rdmsrl(hwc->event_base, count);
-        return count;
-}
-
 static void snbep_uncore_msr_init_box(struct intel_uncore_box *box)
 {
         unsigned msr = uncore_msr_box_ctl(box);
+
         if (msr)
                 wrmsrl(msr, SNBEP_PMON_BOX_CTL_INT);
 }
 
-static struct event_constraint *
-snbep_uncore_get_constraint(struct intel_uncore_box *box,
-                            struct perf_event *event)
-{
-        struct intel_uncore_extra_reg *er;
-        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
-        unsigned long flags;
-        bool ok = false;
-
-        if (reg1->idx == EXTRA_REG_NONE || (box->phys_id >= 0 && reg1->alloc))
-                return NULL;
-
-        er = &box->shared_regs[reg1->idx];
-        raw_spin_lock_irqsave(&er->lock, flags);
-        if (!atomic_read(&er->ref) || er->config1 == reg1->config) {
-                atomic_inc(&er->ref);
-                er->config1 = reg1->config;
-                ok = true;
-        }
-        raw_spin_unlock_irqrestore(&er->lock, flags);
-
-        if (ok) {
-                if (box->phys_id >= 0)
-                        reg1->alloc = 1;
-                return NULL;
-        }
-        return &constraint_empty;
-}
-
-static void snbep_uncore_put_constraint(struct intel_uncore_box *box,
-                                        struct perf_event *event)
-{
-        struct intel_uncore_extra_reg *er;
-        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
-
-        if (box->phys_id < 0 || !reg1->alloc)
-                return;
-
-        er = &box->shared_regs[reg1->idx];
-        atomic_dec(&er->ref);
-        reg1->alloc = 0;
-}
-
-static int snbep_uncore_hw_config(struct intel_uncore_box *box,
-                                  struct perf_event *event)
+static int snbep_uncore_hw_config(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct hw_perf_event *hwc = &event->hw;
         struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
@@ -221,14 +234,16 @@ static int snbep_uncore_hw_config(struct intel_uncore_box *box,
                         SNBEP_CBO_MSR_OFFSET * box->pmu->pmu_idx;
                 reg1->config = event->attr.config1 &
                         SNBEP_CB0_MSR_PMON_BOX_FILTER_MASK;
-        } else if (box->pmu->type == &snbep_uncore_pcu) {
-                reg1->reg = SNBEP_PCU_MSR_PMON_BOX_FILTER;
-                reg1->config = event->attr.config1 &
-                        SNBEP_PCU_MSR_PMON_BOX_FILTER_MASK;
         } else {
-                return 0;
+                if (box->pmu->type == &snbep_uncore_pcu) {
+                        reg1->reg = SNBEP_PCU_MSR_PMON_BOX_FILTER;
+                        reg1->config = event->attr.config1 & SNBEP_PCU_MSR_PMON_BOX_FILTER_MASK;
+                } else {
+                        return 0;
+                }
         }
         reg1->idx = 0;
+
         return 0;
 }
 
@@ -272,10 +287,19 @@ static struct attribute *snbep_uncore_pcu_formats_attr[] = {
         &format_attr_thresh5.attr,
         &format_attr_occ_invert.attr,
         &format_attr_occ_edge.attr,
-        &format_attr_filter_brand0.attr,
-        &format_attr_filter_brand1.attr,
-        &format_attr_filter_brand2.attr,
-        &format_attr_filter_brand3.attr,
+        &format_attr_filter_band0.attr,
+        &format_attr_filter_band1.attr,
+        &format_attr_filter_band2.attr,
+        &format_attr_filter_band3.attr,
+        NULL,
+};
+
+static struct attribute *snbep_uncore_qpi_formats_attr[] = {
+        &format_attr_event_ext.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_inv.attr,
+        &format_attr_thresh8.attr,
         NULL,
 };
 
@@ -314,15 +338,20 @@ static struct attribute_group snbep_uncore_pcu_format_group = {
         .attrs = snbep_uncore_pcu_formats_attr,
 };
 
+static struct attribute_group snbep_uncore_qpi_format_group = {
+        .name = "format",
+        .attrs = snbep_uncore_qpi_formats_attr,
+};
+
 static struct intel_uncore_ops snbep_uncore_msr_ops = {
         .init_box       = snbep_uncore_msr_init_box,
         .disable_box    = snbep_uncore_msr_disable_box,
         .enable_box     = snbep_uncore_msr_enable_box,
         .disable_event  = snbep_uncore_msr_disable_event,
         .enable_event   = snbep_uncore_msr_enable_event,
-        .read_counter   = snbep_uncore_msr_read_counter,
-        .get_constraint = snbep_uncore_get_constraint,
-        .put_constraint = snbep_uncore_put_constraint,
+        .read_counter   = uncore_msr_read_counter,
+        .get_constraint = uncore_get_constraint,
+        .put_constraint = uncore_put_constraint,
         .hw_config      = snbep_uncore_hw_config,
 };
 
@@ -485,8 +514,13 @@ static struct intel_uncore_type snbep_uncore_qpi = {
         .num_counters   = 4,
         .num_boxes      = 2,
         .perf_ctr_bits  = 48,
+        .perf_ctr       = SNBEP_PCI_PMON_CTR0,
+        .event_ctl      = SNBEP_PCI_PMON_CTL0,
+        .event_mask     = SNBEP_QPI_PCI_PMON_RAW_EVENT_MASK,
+        .box_ctl        = SNBEP_PCI_PMON_BOX_CTL,
+        .ops            = &snbep_uncore_pci_ops,
         .event_descs    = snbep_uncore_qpi_events,
-        SNBEP_UNCORE_PCI_COMMON_INIT(),
+        .format_group   = &snbep_uncore_qpi_format_group,
 };
 
 
@@ -603,10 +637,8 @@ static void snbep_pci2phy_map_init(void)
 }
 /* end of Sandy Bridge-EP uncore support */
 
-
 /* Sandy Bridge uncore support */
-static void snb_uncore_msr_enable_event(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void snb_uncore_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct hw_perf_event *hwc = &event->hw;
 
@@ -616,20 +648,11 @@ static void snb_uncore_msr_enable_event(struct intel_uncore_box *box,
                 wrmsrl(hwc->config_base, SNB_UNC_CTL_EN);
 }
 
-static void snb_uncore_msr_disable_event(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void snb_uncore_msr_disable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         wrmsrl(event->hw.config_base, 0);
 }
 
-static u64 snb_uncore_msr_read_counter(struct intel_uncore_box *box,
-                                        struct perf_event *event)
-{
-        u64 count;
-        rdmsrl(event->hw.event_base, count);
-        return count;
-}
-
 static void snb_uncore_msr_init_box(struct intel_uncore_box *box)
 {
         if (box->pmu->pmu_idx == 0) {
@@ -648,15 +671,15 @@ static struct attribute *snb_uncore_formats_attr[] = {
 };
 
 static struct attribute_group snb_uncore_format_group = {
-        .name = "format",
-        .attrs = snb_uncore_formats_attr,
+        .name           = "format",
+        .attrs          = snb_uncore_formats_attr,
 };
 
 static struct intel_uncore_ops snb_uncore_msr_ops = {
         .init_box       = snb_uncore_msr_init_box,
         .disable_event  = snb_uncore_msr_disable_event,
         .enable_event   = snb_uncore_msr_enable_event,
-        .read_counter   = snb_uncore_msr_read_counter,
+        .read_counter   = uncore_msr_read_counter,
 };
 
 static struct event_constraint snb_uncore_cbox_constraints[] = {
@@ -697,12 +720,10 @@ static void nhm_uncore_msr_disable_box(struct intel_uncore_box *box)
 
 static void nhm_uncore_msr_enable_box(struct intel_uncore_box *box)
 {
-        wrmsrl(NHM_UNC_PERF_GLOBAL_CTL,
-                NHM_UNC_GLOBAL_CTL_EN_PC_ALL | NHM_UNC_GLOBAL_CTL_EN_FC);
+        wrmsrl(NHM_UNC_PERF_GLOBAL_CTL, NHM_UNC_GLOBAL_CTL_EN_PC_ALL | NHM_UNC_GLOBAL_CTL_EN_FC);
 }
 
-static void nhm_uncore_msr_enable_event(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void nhm_uncore_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct hw_perf_event *hwc = &event->hw;
 
@@ -744,7 +765,7 @@ static struct intel_uncore_ops nhm_uncore_msr_ops = {
         .enable_box     = nhm_uncore_msr_enable_box,
         .disable_event  = snb_uncore_msr_disable_event,
         .enable_event   = nhm_uncore_msr_enable_event,
-        .read_counter   = snb_uncore_msr_read_counter,
+        .read_counter   = uncore_msr_read_counter,
 };
 
 static struct intel_uncore_type nhm_uncore = {
@@ -769,8 +790,1041 @@ static struct intel_uncore_type *nhm_msr_uncores[] = {
 };
 /* end of Nehalem uncore support */
 
-static void uncore_assign_hw_event(struct intel_uncore_box *box,
-                                struct perf_event *event, int idx)
+/* Nehalem-EX uncore support */
+#define __BITS_VALUE(x, i, n)  ((typeof(x))(((x) >> ((i) * (n))) & \
+                                ((1ULL << (n)) - 1)))
+
+DEFINE_UNCORE_FORMAT_ATTR(event5, event, "config:1-5");
+DEFINE_UNCORE_FORMAT_ATTR(counter, counter, "config:6-7");
+DEFINE_UNCORE_FORMAT_ATTR(mm_cfg, mm_cfg, "config:63");
+DEFINE_UNCORE_FORMAT_ATTR(match, match, "config1:0-63");
+DEFINE_UNCORE_FORMAT_ATTR(mask, mask, "config2:0-63");
+
+static void nhmex_uncore_msr_init_box(struct intel_uncore_box *box)
+{
+        wrmsrl(NHMEX_U_MSR_PMON_GLOBAL_CTL, NHMEX_U_PMON_GLOBAL_EN_ALL);
+}
+
+static void nhmex_uncore_msr_disable_box(struct intel_uncore_box *box)
+{
+        unsigned msr = uncore_msr_box_ctl(box);
+        u64 config;
+
+        if (msr) {
+                rdmsrl(msr, config);
+                config &= ~((1ULL << uncore_num_counters(box)) - 1);
+                /* WBox has a fixed counter */
+                if (uncore_msr_fixed_ctl(box))
+                        config &= ~NHMEX_W_PMON_GLOBAL_FIXED_EN;
+                wrmsrl(msr, config);
+        }
+}
+
+static void nhmex_uncore_msr_enable_box(struct intel_uncore_box *box)
+{
+        unsigned msr = uncore_msr_box_ctl(box);
+        u64 config;
+
+        if (msr) {
+                rdmsrl(msr, config);
+                config |= (1ULL << uncore_num_counters(box)) - 1;
+                /* WBox has a fixed counter */
+                if (uncore_msr_fixed_ctl(box))
+                        config |= NHMEX_W_PMON_GLOBAL_FIXED_EN;
+                wrmsrl(msr, config);
+        }
+}
+
+static void nhmex_uncore_msr_disable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        wrmsrl(event->hw.config_base, 0);
+}
+
+static void nhmex_uncore_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+
+        if (hwc->idx >= UNCORE_PMC_IDX_FIXED)
+                wrmsrl(hwc->config_base, NHMEX_PMON_CTL_EN_BIT0);
+        else if (box->pmu->type->event_mask & NHMEX_PMON_CTL_EN_BIT0)
+                wrmsrl(hwc->config_base, hwc->config | NHMEX_PMON_CTL_EN_BIT22);
+        else
+                wrmsrl(hwc->config_base, hwc->config | NHMEX_PMON_CTL_EN_BIT0);
+}
+
+#define NHMEX_UNCORE_OPS_COMMON_INIT()                          \
+        .init_box       = nhmex_uncore_msr_init_box,            \
+        .disable_box    = nhmex_uncore_msr_disable_box,         \
+        .enable_box     = nhmex_uncore_msr_enable_box,          \
+        .disable_event  = nhmex_uncore_msr_disable_event,       \
+        .read_counter   = uncore_msr_read_counter
+
+static struct intel_uncore_ops nhmex_uncore_ops = {
+        NHMEX_UNCORE_OPS_COMMON_INIT(),
+        .enable_event   = nhmex_uncore_msr_enable_event,
+};
+
+static struct attribute *nhmex_uncore_ubox_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_edge.attr,
+        NULL,
+};
+
+static struct attribute_group nhmex_uncore_ubox_format_group = {
+        .name           = "format",
+        .attrs          = nhmex_uncore_ubox_formats_attr,
+};
+
+static struct intel_uncore_type nhmex_uncore_ubox = {
+        .name           = "ubox",
+        .num_counters   = 1,
+        .num_boxes      = 1,
+        .perf_ctr_bits  = 48,
+        .event_ctl      = NHMEX_U_MSR_PMON_EV_SEL,
+        .perf_ctr       = NHMEX_U_MSR_PMON_CTR,
+        .event_mask     = NHMEX_U_PMON_RAW_EVENT_MASK,
+        .box_ctl        = NHMEX_U_MSR_PMON_GLOBAL_CTL,
+        .ops            = &nhmex_uncore_ops,
+        .format_group   = &nhmex_uncore_ubox_format_group
+};
+
+static struct attribute *nhmex_uncore_cbox_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_inv.attr,
+        &format_attr_thresh8.attr,
+        NULL,
+};
+
+static struct attribute_group nhmex_uncore_cbox_format_group = {
+        .name = "format",
+        .attrs = nhmex_uncore_cbox_formats_attr,
+};
+
+static struct intel_uncore_type nhmex_uncore_cbox = {
+        .name                   = "cbox",
+        .num_counters           = 6,
+        .num_boxes              = 8,
+        .perf_ctr_bits          = 48,
+        .event_ctl              = NHMEX_C0_MSR_PMON_EV_SEL0,
+        .perf_ctr               = NHMEX_C0_MSR_PMON_CTR0,
+        .event_mask             = NHMEX_PMON_RAW_EVENT_MASK,
+        .box_ctl                = NHMEX_C0_MSR_PMON_GLOBAL_CTL,
+        .msr_offset             = NHMEX_C_MSR_OFFSET,
+        .pair_ctr_ctl           = 1,
+        .ops                    = &nhmex_uncore_ops,
+        .format_group           = &nhmex_uncore_cbox_format_group
+};
+
+static struct uncore_event_desc nhmex_uncore_wbox_events[] = {
+        INTEL_UNCORE_EVENT_DESC(clockticks, "event=0xff,umask=0"),
+        { /* end: all zeroes */ },
+};
+
+static struct intel_uncore_type nhmex_uncore_wbox = {
+        .name                   = "wbox",
+        .num_counters           = 4,
+        .num_boxes              = 1,
+        .perf_ctr_bits          = 48,
+        .event_ctl              = NHMEX_W_MSR_PMON_CNT0,
+        .perf_ctr               = NHMEX_W_MSR_PMON_EVT_SEL0,
+        .fixed_ctr              = NHMEX_W_MSR_PMON_FIXED_CTR,
+        .fixed_ctl              = NHMEX_W_MSR_PMON_FIXED_CTL,
+        .event_mask             = NHMEX_PMON_RAW_EVENT_MASK,
+        .box_ctl                = NHMEX_W_MSR_GLOBAL_CTL,
+        .pair_ctr_ctl           = 1,
+        .event_descs            = nhmex_uncore_wbox_events,
+        .ops                    = &nhmex_uncore_ops,
+        .format_group           = &nhmex_uncore_cbox_format_group
+};
+
+static int nhmex_bbox_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+        int ctr, ev_sel;
+
+        ctr = (hwc->config & NHMEX_B_PMON_CTR_MASK) >>
+                NHMEX_B_PMON_CTR_SHIFT;
+        ev_sel = (hwc->config & NHMEX_B_PMON_CTL_EV_SEL_MASK) >>
+                  NHMEX_B_PMON_CTL_EV_SEL_SHIFT;
+
+        /* events that do not use the match/mask registers */
+        if ((ctr == 0 && ev_sel > 0x3) || (ctr == 1 && ev_sel > 0x6) ||
+            (ctr == 2 && ev_sel != 0x4) || ctr == 3)
+                return 0;
+
+        if (box->pmu->pmu_idx == 0)
+                reg1->reg = NHMEX_B0_MSR_MATCH;
+        else
+                reg1->reg = NHMEX_B1_MSR_MATCH;
+        reg1->idx = 0;
+        reg1->config = event->attr.config1;
+        reg2->config = event->attr.config2;
+        return 0;
+}
+
+static void nhmex_bbox_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+
+        if (reg1->idx != EXTRA_REG_NONE) {
+                wrmsrl(reg1->reg, reg1->config);
+                wrmsrl(reg1->reg + 1, reg2->config);
+        }
+        wrmsrl(hwc->config_base, NHMEX_PMON_CTL_EN_BIT0 |
+                (hwc->config & NHMEX_B_PMON_CTL_EV_SEL_MASK));
+}
+
+/*
+ * The Bbox has 4 counters, but each counter monitors different events.
+ * Use bits 6-7 in the event config to select counter.
+ */
+static struct event_constraint nhmex_uncore_bbox_constraints[] = {
+        EVENT_CONSTRAINT(0 , 1, 0xc0),
+        EVENT_CONSTRAINT(0x40, 2, 0xc0),
+        EVENT_CONSTRAINT(0x80, 4, 0xc0),
+        EVENT_CONSTRAINT(0xc0, 8, 0xc0),
+        EVENT_CONSTRAINT_END,
+};
+
+static struct attribute *nhmex_uncore_bbox_formats_attr[] = {
+        &format_attr_event5.attr,
+        &format_attr_counter.attr,
+        &format_attr_match.attr,
+        &format_attr_mask.attr,
+        NULL,
+};
+
+static struct attribute_group nhmex_uncore_bbox_format_group = {
+        .name = "format",
+        .attrs = nhmex_uncore_bbox_formats_attr,
+};
+
+static struct intel_uncore_ops nhmex_uncore_bbox_ops = {
+        NHMEX_UNCORE_OPS_COMMON_INIT(),
+        .enable_event           = nhmex_bbox_msr_enable_event,
+        .hw_config              = nhmex_bbox_hw_config,
+        .get_constraint         = uncore_get_constraint,
+        .put_constraint         = uncore_put_constraint,
+};
+
+static struct intel_uncore_type nhmex_uncore_bbox = {
+        .name                   = "bbox",
+        .num_counters           = 4,
+        .num_boxes              = 2,
+        .perf_ctr_bits          = 48,
+        .event_ctl              = NHMEX_B0_MSR_PMON_CTL0,
+        .perf_ctr               = NHMEX_B0_MSR_PMON_CTR0,
+        .event_mask             = NHMEX_B_PMON_RAW_EVENT_MASK,
+        .box_ctl                = NHMEX_B0_MSR_PMON_GLOBAL_CTL,
+        .msr_offset             = NHMEX_B_MSR_OFFSET,
+        .pair_ctr_ctl           = 1,
+        .num_shared_regs        = 1,
+        .constraints            = nhmex_uncore_bbox_constraints,
+        .ops                    = &nhmex_uncore_bbox_ops,
+        .format_group           = &nhmex_uncore_bbox_format_group
+};
+
+static int nhmex_sbox_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct hw_perf_event_extra *reg2 = &event->hw.branch_reg;
+
+        if (event->attr.config & NHMEX_S_PMON_MM_CFG_EN) {
+                reg1->config = event->attr.config1;
+                reg2->config = event->attr.config2;
+        } else {
+                reg1->config = ~0ULL;
+                reg2->config = ~0ULL;
+        }
+
+        if (box->pmu->pmu_idx == 0)
+                reg1->reg = NHMEX_S0_MSR_MM_CFG;
+        else
+                reg1->reg = NHMEX_S1_MSR_MM_CFG;
+
+        reg1->idx = 0;
+
+        return 0;
+}
+
+static void nhmex_sbox_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+
+        wrmsrl(reg1->reg, 0);
+        if (reg1->config != ~0ULL || reg2->config != ~0ULL) {
+                wrmsrl(reg1->reg + 1, reg1->config);
+                wrmsrl(reg1->reg + 2, reg2->config);
+                wrmsrl(reg1->reg, NHMEX_S_PMON_MM_CFG_EN);
+        }
+        wrmsrl(hwc->config_base, hwc->config | NHMEX_PMON_CTL_EN_BIT22);
+}
+
+static struct attribute *nhmex_uncore_sbox_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_inv.attr,
+        &format_attr_thresh8.attr,
+        &format_attr_mm_cfg.attr,
+        &format_attr_match.attr,
+        &format_attr_mask.attr,
+        NULL,
+};
+
+static struct attribute_group nhmex_uncore_sbox_format_group = {
+        .name                   = "format",
+        .attrs                  = nhmex_uncore_sbox_formats_attr,
+};
+
+static struct intel_uncore_ops nhmex_uncore_sbox_ops = {
+        NHMEX_UNCORE_OPS_COMMON_INIT(),
+        .enable_event           = nhmex_sbox_msr_enable_event,
+        .hw_config              = nhmex_sbox_hw_config,
+        .get_constraint         = uncore_get_constraint,
+        .put_constraint         = uncore_put_constraint,
+};
+
+static struct intel_uncore_type nhmex_uncore_sbox = {
+        .name                   = "sbox",
+        .num_counters           = 4,
+        .num_boxes              = 2,
+        .perf_ctr_bits          = 48,
+        .event_ctl              = NHMEX_S0_MSR_PMON_CTL0,
+        .perf_ctr               = NHMEX_S0_MSR_PMON_CTR0,
+        .event_mask             = NHMEX_PMON_RAW_EVENT_MASK,
+        .box_ctl                = NHMEX_S0_MSR_PMON_GLOBAL_CTL,
+        .msr_offset             = NHMEX_S_MSR_OFFSET,
+        .pair_ctr_ctl           = 1,
+        .num_shared_regs        = 1,
+        .ops                    = &nhmex_uncore_sbox_ops,
+        .format_group           = &nhmex_uncore_sbox_format_group
+};
+
+enum {
+        EXTRA_REG_NHMEX_M_FILTER,
+        EXTRA_REG_NHMEX_M_DSP,
+        EXTRA_REG_NHMEX_M_ISS,
+        EXTRA_REG_NHMEX_M_MAP,
+        EXTRA_REG_NHMEX_M_MSC_THR,
+        EXTRA_REG_NHMEX_M_PGT,
+        EXTRA_REG_NHMEX_M_PLD,
+        EXTRA_REG_NHMEX_M_ZDP_CTL_FVC,
+};
+
+static struct extra_reg nhmex_uncore_mbox_extra_regs[] = {
+        MBOX_INC_SEL_EXTAR_REG(0x0, DSP),
+        MBOX_INC_SEL_EXTAR_REG(0x4, MSC_THR),
+        MBOX_INC_SEL_EXTAR_REG(0x5, MSC_THR),
+        MBOX_INC_SEL_EXTAR_REG(0x9, ISS),
+        /* event 0xa uses two extra registers */
+        MBOX_INC_SEL_EXTAR_REG(0xa, ISS),
+        MBOX_INC_SEL_EXTAR_REG(0xa, PLD),
+        MBOX_INC_SEL_EXTAR_REG(0xb, PLD),
+        /* events 0xd ~ 0x10 use the same extra register */
+        MBOX_INC_SEL_EXTAR_REG(0xd, ZDP_CTL_FVC),
+        MBOX_INC_SEL_EXTAR_REG(0xe, ZDP_CTL_FVC),
+        MBOX_INC_SEL_EXTAR_REG(0xf, ZDP_CTL_FVC),
+        MBOX_INC_SEL_EXTAR_REG(0x10, ZDP_CTL_FVC),
+        MBOX_INC_SEL_EXTAR_REG(0x16, PGT),
+        MBOX_SET_FLAG_SEL_EXTRA_REG(0x0, DSP),
+        MBOX_SET_FLAG_SEL_EXTRA_REG(0x1, ISS),
+        MBOX_SET_FLAG_SEL_EXTRA_REG(0x5, PGT),
+        MBOX_SET_FLAG_SEL_EXTRA_REG(0x6, MAP),
+        EVENT_EXTRA_END
+};
+
+static bool nhmex_mbox_get_shared_reg(struct intel_uncore_box *box, int idx, u64 config)
+{
+        struct intel_uncore_extra_reg *er;
+        unsigned long flags;
+        bool ret = false;
+        u64 mask;
+
+        if (idx < EXTRA_REG_NHMEX_M_ZDP_CTL_FVC) {
+                er = &box->shared_regs[idx];
+                raw_spin_lock_irqsave(&er->lock, flags);
+                if (!atomic_read(&er->ref) || er->config == config) {
+                        atomic_inc(&er->ref);
+                        er->config = config;
+                        ret = true;
+                }
+                raw_spin_unlock_irqrestore(&er->lock, flags);
+
+                return ret;
+        }
+        /*
+         * The ZDP_CTL_FVC MSR has 4 fields which are used to control
+         * events 0xd ~ 0x10. Besides these 4 fields, there are additional
+         * fields which are shared.
+         */
+        idx -= EXTRA_REG_NHMEX_M_ZDP_CTL_FVC;
+        if (WARN_ON_ONCE(idx >= 4))
+                return false;
+
+        /* mask of the shared fields */
+        mask = NHMEX_M_PMON_ZDP_CTL_FVC_MASK;
+        er = &box->shared_regs[EXTRA_REG_NHMEX_M_ZDP_CTL_FVC];
+
+        raw_spin_lock_irqsave(&er->lock, flags);
+        /* add mask of the non-shared field if it's in use */
+        if (__BITS_VALUE(atomic_read(&er->ref), idx, 8))
+                mask |= NHMEX_M_PMON_ZDP_CTL_FVC_EVENT_MASK(idx);
+
+        if (!atomic_read(&er->ref) || !((er->config ^ config) & mask)) {
+                atomic_add(1 << (idx * 8), &er->ref);
+                mask = NHMEX_M_PMON_ZDP_CTL_FVC_MASK |
+                        NHMEX_M_PMON_ZDP_CTL_FVC_EVENT_MASK(idx);
+                er->config &= ~mask;
+                er->config |= (config & mask);
+                ret = true;
+        }
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+
+        return ret;
+}
+
+static void nhmex_mbox_put_shared_reg(struct intel_uncore_box *box, int idx)
+{
+        struct intel_uncore_extra_reg *er;
+
+        if (idx < EXTRA_REG_NHMEX_M_ZDP_CTL_FVC) {
+                er = &box->shared_regs[idx];
+                atomic_dec(&er->ref);
+                return;
+        }
+
+        idx -= EXTRA_REG_NHMEX_M_ZDP_CTL_FVC;
+        er = &box->shared_regs[EXTRA_REG_NHMEX_M_ZDP_CTL_FVC];
+        atomic_sub(1 << (idx * 8), &er->ref);
+}
+
+u64 nhmex_mbox_alter_er(struct perf_event *event, int new_idx, bool modify)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        int idx, orig_idx = __BITS_VALUE(reg1->idx, 0, 8);
+        u64 config = reg1->config;
+
+        /* get the non-shared control bits and shift them */
+        idx = orig_idx - EXTRA_REG_NHMEX_M_ZDP_CTL_FVC;
+        config &= NHMEX_M_PMON_ZDP_CTL_FVC_EVENT_MASK(idx);
+        if (new_idx > orig_idx) {
+                idx = new_idx - orig_idx;
+                config <<= 3 * idx;
+        } else {
+                idx = orig_idx - new_idx;
+                config >>= 3 * idx;
+        }
+
+        /* add the shared control bits back */
+        config |= NHMEX_M_PMON_ZDP_CTL_FVC_MASK & reg1->config;
+        if (modify) {
+                /* adjust the main event selector */
+                if (new_idx > orig_idx)
+                        hwc->config += idx << NHMEX_M_PMON_CTL_INC_SEL_SHIFT;
+                else
+                        hwc->config -= idx << NHMEX_M_PMON_CTL_INC_SEL_SHIFT;
+                reg1->config = config;
+                reg1->idx = ~0xff | new_idx;
+        }
+        return config;
+}
+
+static struct event_constraint *
+nhmex_mbox_get_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct hw_perf_event_extra *reg2 = &event->hw.branch_reg;
+        int i, idx[2], alloc = 0;
+        u64 config1 = reg1->config;
+
+        idx[0] = __BITS_VALUE(reg1->idx, 0, 8);
+        idx[1] = __BITS_VALUE(reg1->idx, 1, 8);
+again:
+        for (i = 0; i < 2; i++) {
+                if (!uncore_box_is_fake(box) && (reg1->alloc & (0x1 << i)))
+                        idx[i] = 0xff;
+
+                if (idx[i] == 0xff)
+                        continue;
+
+                if (!nhmex_mbox_get_shared_reg(box, idx[i],
+                                __BITS_VALUE(config1, i, 32)))
+                        goto fail;
+                alloc |= (0x1 << i);
+        }
+
+        /* for the match/mask registers */
+        if ((uncore_box_is_fake(box) || !reg2->alloc) &&
+            !nhmex_mbox_get_shared_reg(box, reg2->idx, reg2->config))
+                goto fail;
+
+        /*
+         * If it's a fake box -- as per validate_{group,event}() we
+         * shouldn't touch event state and we can avoid doing so
+         * since both will only call get_event_constraints() once
+         * on each event, this avoids the need for reg->alloc.
+         */
+        if (!uncore_box_is_fake(box)) {
+                if (idx[0] != 0xff && idx[0] != __BITS_VALUE(reg1->idx, 0, 8))
+                        nhmex_mbox_alter_er(event, idx[0], true);
+                reg1->alloc |= alloc;
+                reg2->alloc = 1;
+        }
+        return NULL;
+fail:
+        if (idx[0] != 0xff && !(alloc & 0x1) &&
+            idx[0] >= EXTRA_REG_NHMEX_M_ZDP_CTL_FVC) {
+                /*
+                 * events 0xd ~ 0x10 are functional identical, but are
+                 * controlled by different fields in the ZDP_CTL_FVC
+                 * register. If we failed to take one field, try the
+                 * rest 3 choices.
+                 */
+                BUG_ON(__BITS_VALUE(reg1->idx, 1, 8) != 0xff);
+                idx[0] -= EXTRA_REG_NHMEX_M_ZDP_CTL_FVC;
+                idx[0] = (idx[0] + 1) % 4;
+                idx[0] += EXTRA_REG_NHMEX_M_ZDP_CTL_FVC;
+                if (idx[0] != __BITS_VALUE(reg1->idx, 0, 8)) {
+                        config1 = nhmex_mbox_alter_er(event, idx[0], false);
+                        goto again;
+                }
+        }
+
+        if (alloc & 0x1)
+                nhmex_mbox_put_shared_reg(box, idx[0]);
+        if (alloc & 0x2)
+                nhmex_mbox_put_shared_reg(box, idx[1]);
+        return &constraint_empty;
+}
+
+static void nhmex_mbox_put_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct hw_perf_event_extra *reg2 = &event->hw.branch_reg;
+
+        if (uncore_box_is_fake(box))
+                return;
+
+        if (reg1->alloc & 0x1)
+                nhmex_mbox_put_shared_reg(box, __BITS_VALUE(reg1->idx, 0, 8));
+        if (reg1->alloc & 0x2)
+                nhmex_mbox_put_shared_reg(box, __BITS_VALUE(reg1->idx, 1, 8));
+        reg1->alloc = 0;
+
+        if (reg2->alloc) {
+                nhmex_mbox_put_shared_reg(box, reg2->idx);
+                reg2->alloc = 0;
+        }
+}
+
+static int nhmex_mbox_extra_reg_idx(struct extra_reg *er)
+{
+        if (er->idx < EXTRA_REG_NHMEX_M_ZDP_CTL_FVC)
+                return er->idx;
+        return er->idx + (er->event >> NHMEX_M_PMON_CTL_INC_SEL_SHIFT) - 0xd;
+}
+
+static int nhmex_mbox_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct intel_uncore_type *type = box->pmu->type;
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct hw_perf_event_extra *reg2 = &event->hw.branch_reg;
+        struct extra_reg *er;
+        unsigned msr;
+        int reg_idx = 0;
+
+        if (WARN_ON_ONCE(reg1->idx != -1))
+                return -EINVAL;
+        /*
+         * The mbox events may require 2 extra MSRs at the most. But only
+         * the lower 32 bits in these MSRs are significant, so we can use
+         * config1 to pass two MSRs' config.
+         */
+        for (er = nhmex_uncore_mbox_extra_regs; er->msr; er++) {
+                if (er->event != (event->hw.config & er->config_mask))
+                        continue;
+                if (event->attr.config1 & ~er->valid_mask)
+                        return -EINVAL;
+                if (er->idx == __BITS_VALUE(reg1->idx, 0, 8) ||
+                    er->idx == __BITS_VALUE(reg1->idx, 1, 8))
+                        continue;
+                if (WARN_ON_ONCE(reg_idx >= 2))
+                        return -EINVAL;
+
+                msr = er->msr + type->msr_offset * box->pmu->pmu_idx;
+                if (WARN_ON_ONCE(msr >= 0xffff || er->idx >= 0xff))
+                        return -EINVAL;
+
+                /* always use the 32~63 bits to pass the PLD config */
+                if (er->idx == EXTRA_REG_NHMEX_M_PLD)
+                        reg_idx = 1;
+
+                reg1->idx &= ~(0xff << (reg_idx * 8));
+                reg1->reg &= ~(0xffff << (reg_idx * 16));
+                reg1->idx |= nhmex_mbox_extra_reg_idx(er) << (reg_idx * 8);
+                reg1->reg |= msr << (reg_idx * 16);
+                reg1->config = event->attr.config1;
+                reg_idx++;
+        }
+        /* use config2 to pass the filter config */
+        reg2->idx = EXTRA_REG_NHMEX_M_FILTER;
+        if (event->attr.config2 & NHMEX_M_PMON_MM_CFG_EN)
+                reg2->config = event->attr.config2;
+        else
+                reg2->config = ~0ULL;
+        if (box->pmu->pmu_idx == 0)
+                reg2->reg = NHMEX_M0_MSR_PMU_MM_CFG;
+        else
+                reg2->reg = NHMEX_M1_MSR_PMU_MM_CFG;
+
+        return 0;
+}
+
+static u64 nhmex_mbox_shared_reg_config(struct intel_uncore_box *box, int idx)
+{
+        struct intel_uncore_extra_reg *er;
+        unsigned long flags;
+        u64 config;
+
+        if (idx < EXTRA_REG_NHMEX_M_ZDP_CTL_FVC)
+                return box->shared_regs[idx].config;
+
+        er = &box->shared_regs[EXTRA_REG_NHMEX_M_ZDP_CTL_FVC];
+        raw_spin_lock_irqsave(&er->lock, flags);
+        config = er->config;
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+        return config;
+}
+
+static void nhmex_mbox_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+        int idx;
+
+        idx = __BITS_VALUE(reg1->idx, 0, 8);
+        if (idx != 0xff)
+                wrmsrl(__BITS_VALUE(reg1->reg, 0, 16),
+                        nhmex_mbox_shared_reg_config(box, idx));
+        idx = __BITS_VALUE(reg1->idx, 1, 8);
+        if (idx != 0xff)
+                wrmsrl(__BITS_VALUE(reg1->reg, 1, 16),
+                        nhmex_mbox_shared_reg_config(box, idx));
+
+        wrmsrl(reg2->reg, 0);
+        if (reg2->config != ~0ULL) {
+                wrmsrl(reg2->reg + 1,
+                        reg2->config & NHMEX_M_PMON_ADDR_MATCH_MASK);
+                wrmsrl(reg2->reg + 2, NHMEX_M_PMON_ADDR_MASK_MASK &
+                        (reg2->config >> NHMEX_M_PMON_ADDR_MASK_SHIFT));
+                wrmsrl(reg2->reg, NHMEX_M_PMON_MM_CFG_EN);
+        }
+
+        wrmsrl(hwc->config_base, hwc->config | NHMEX_PMON_CTL_EN_BIT0);
+}
+
+DEFINE_UNCORE_FORMAT_ATTR(count_mode,   count_mode,     "config:2-3");
+DEFINE_UNCORE_FORMAT_ATTR(storage_mode, storage_mode,   "config:4-5");
+DEFINE_UNCORE_FORMAT_ATTR(wrap_mode,    wrap_mode,      "config:6");
+DEFINE_UNCORE_FORMAT_ATTR(flag_mode,    flag_mode,      "config:7");
+DEFINE_UNCORE_FORMAT_ATTR(inc_sel,      inc_sel,        "config:9-13");
+DEFINE_UNCORE_FORMAT_ATTR(set_flag_sel, set_flag_sel,   "config:19-21");
+DEFINE_UNCORE_FORMAT_ATTR(filter_cfg,   filter_cfg,     "config2:63");
+DEFINE_UNCORE_FORMAT_ATTR(filter_match, filter_match,   "config2:0-33");
+DEFINE_UNCORE_FORMAT_ATTR(filter_mask,  filter_mask,    "config2:34-61");
+DEFINE_UNCORE_FORMAT_ATTR(dsp,          dsp,            "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(thr,          thr,            "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(fvc,          fvc,            "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(pgt,          pgt,            "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(map,          map,            "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(iss,          iss,            "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(pld,          pld,            "config1:32-63");
+
+static struct attribute *nhmex_uncore_mbox_formats_attr[] = {
+        &format_attr_count_mode.attr,
+        &format_attr_storage_mode.attr,
+        &format_attr_wrap_mode.attr,
+        &format_attr_flag_mode.attr,
+        &format_attr_inc_sel.attr,
+        &format_attr_set_flag_sel.attr,
+        &format_attr_filter_cfg.attr,
+        &format_attr_filter_match.attr,
+        &format_attr_filter_mask.attr,
+        &format_attr_dsp.attr,
+        &format_attr_thr.attr,
+        &format_attr_fvc.attr,
+        &format_attr_pgt.attr,
+        &format_attr_map.attr,
+        &format_attr_iss.attr,
+        &format_attr_pld.attr,
+        NULL,
+};
+
+static struct attribute_group nhmex_uncore_mbox_format_group = {
+        .name           = "format",
+        .attrs          = nhmex_uncore_mbox_formats_attr,
+};
+
+static struct uncore_event_desc nhmex_uncore_mbox_events[] = {
+        INTEL_UNCORE_EVENT_DESC(bbox_cmds_read, "inc_sel=0xd,fvc=0x2800"),
+        INTEL_UNCORE_EVENT_DESC(bbox_cmds_write, "inc_sel=0xd,fvc=0x2820"),
+        { /* end: all zeroes */ },
+};
+
+static struct intel_uncore_ops nhmex_uncore_mbox_ops = {
+        NHMEX_UNCORE_OPS_COMMON_INIT(),
+        .enable_event   = nhmex_mbox_msr_enable_event,
+        .hw_config      = nhmex_mbox_hw_config,
+        .get_constraint = nhmex_mbox_get_constraint,
+        .put_constraint = nhmex_mbox_put_constraint,
+};
+
+static struct intel_uncore_type nhmex_uncore_mbox = {
+        .name                   = "mbox",
+        .num_counters           = 6,
+        .num_boxes              = 2,
+        .perf_ctr_bits          = 48,
+        .event_ctl              = NHMEX_M0_MSR_PMU_CTL0,
+        .perf_ctr               = NHMEX_M0_MSR_PMU_CNT0,
+        .event_mask             = NHMEX_M_PMON_RAW_EVENT_MASK,
+        .box_ctl                = NHMEX_M0_MSR_GLOBAL_CTL,
+        .msr_offset             = NHMEX_M_MSR_OFFSET,
+        .pair_ctr_ctl           = 1,
+        .num_shared_regs        = 8,
+        .event_descs            = nhmex_uncore_mbox_events,
+        .ops                    = &nhmex_uncore_mbox_ops,
+        .format_group           = &nhmex_uncore_mbox_format_group,
+};
+
+void nhmex_rbox_alter_er(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        int port;
+
+        /* adjust the main event selector */
+        if (reg1->idx % 2) {
+                reg1->idx--;
+                hwc->config -= 1 << NHMEX_R_PMON_CTL_EV_SEL_SHIFT;
+        } else {
+                reg1->idx++;
+                hwc->config += 1 << NHMEX_R_PMON_CTL_EV_SEL_SHIFT;
+        }
+
+        /* adjust address or config of extra register */
+        port = reg1->idx / 6 + box->pmu->pmu_idx * 4;
+        switch (reg1->idx % 6) {
+        case 0:
+                reg1->reg = NHMEX_R_MSR_PORTN_IPERF_CFG0(port);
+                break;
+        case 1:
+                reg1->reg = NHMEX_R_MSR_PORTN_IPERF_CFG1(port);
+                break;
+        case 2:
+                /* the 8~15 bits to the 0~7 bits */
+                reg1->config >>= 8;
+                break;
+        case 3:
+                /* the 0~7 bits to the 8~15 bits */
+                reg1->config <<= 8;
+                break;
+        case 4:
+                reg1->reg = NHMEX_R_MSR_PORTN_XBR_SET1_MM_CFG(port);
+                break;
+        case 5:
+                reg1->reg = NHMEX_R_MSR_PORTN_XBR_SET2_MM_CFG(port);
+                break;
+        };
+}
+
+/*
+ * Each rbox has 4 event set which monitor PQI port 0~3 or 4~7.
+ * An event set consists of 6 events, the 3rd and 4th events in
+ * an event set use the same extra register. So an event set uses
+ * 5 extra registers.
+ */
+static struct event_constraint *
+nhmex_rbox_get_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+        struct intel_uncore_extra_reg *er;
+        unsigned long flags;
+        int idx, er_idx;
+        u64 config1;
+        bool ok = false;
+
+        if (!uncore_box_is_fake(box) && reg1->alloc)
+                return NULL;
+
+        idx = reg1->idx % 6;
+        config1 = reg1->config;
+again:
+        er_idx = idx;
+        /* the 3rd and 4th events use the same extra register */
+        if (er_idx > 2)
+                er_idx--;
+        er_idx += (reg1->idx / 6) * 5;
+
+        er = &box->shared_regs[er_idx];
+        raw_spin_lock_irqsave(&er->lock, flags);
+        if (idx < 2) {
+                if (!atomic_read(&er->ref) || er->config == reg1->config) {
+                        atomic_inc(&er->ref);
+                        er->config = reg1->config;
+                        ok = true;
+                }
+        } else if (idx == 2 || idx == 3) {
+                /*
+                 * these two events use different fields in a extra register,
+                 * the 0~7 bits and the 8~15 bits respectively.
+                 */
+                u64 mask = 0xff << ((idx - 2) * 8);
+                if (!__BITS_VALUE(atomic_read(&er->ref), idx - 2, 8) ||
+                                !((er->config ^ config1) & mask)) {
+                        atomic_add(1 << ((idx - 2) * 8), &er->ref);
+                        er->config &= ~mask;
+                        er->config |= config1 & mask;
+                        ok = true;
+                }
+        } else {
+                if (!atomic_read(&er->ref) ||
+                                (er->config == (hwc->config >> 32) &&
+                                 er->config1 == reg1->config &&
+                                 er->config2 == reg2->config)) {
+                        atomic_inc(&er->ref);
+                        er->config = (hwc->config >> 32);
+                        er->config1 = reg1->config;
+                        er->config2 = reg2->config;
+                        ok = true;
+                }
+        }
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+
+        if (!ok) {
+                /*
+                 * The Rbox events are always in pairs. The paired
+                 * events are functional identical, but use different
+                 * extra registers. If we failed to take an extra
+                 * register, try the alternative.
+                 */
+                if (idx % 2)
+                        idx--;
+                else
+                        idx++;
+                if (idx != reg1->idx % 6) {
+                        if (idx == 2)
+                                config1 >>= 8;
+                        else if (idx == 3)
+                                config1 <<= 8;
+                        goto again;
+                }
+        } else {
+                if (!uncore_box_is_fake(box)) {
+                        if (idx != reg1->idx % 6)
+                                nhmex_rbox_alter_er(box, event);
+                        reg1->alloc = 1;
+                }
+                return NULL;
+        }
+        return &constraint_empty;
+}
+
+static void nhmex_rbox_put_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct intel_uncore_extra_reg *er;
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        int idx, er_idx;
+
+        if (uncore_box_is_fake(box) || !reg1->alloc)
+                return;
+
+        idx = reg1->idx % 6;
+        er_idx = idx;
+        if (er_idx > 2)
+                er_idx--;
+        er_idx += (reg1->idx / 6) * 5;
+
+        er = &box->shared_regs[er_idx];
+        if (idx == 2 || idx == 3)
+                atomic_sub(1 << ((idx - 2) * 8), &er->ref);
+        else
+                atomic_dec(&er->ref);
+
+        reg1->alloc = 0;
+}
+
+static int nhmex_rbox_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct hw_perf_event_extra *reg2 = &event->hw.branch_reg;
+        int port, idx;
+
+        idx = (event->hw.config & NHMEX_R_PMON_CTL_EV_SEL_MASK) >>
+                NHMEX_R_PMON_CTL_EV_SEL_SHIFT;
+        if (idx >= 0x18)
+                return -EINVAL;
+
+        reg1->idx = idx;
+        reg1->config = event->attr.config1;
+
+        port = idx / 6 + box->pmu->pmu_idx * 4;
+        idx %= 6;
+        switch (idx) {
+        case 0:
+                reg1->reg = NHMEX_R_MSR_PORTN_IPERF_CFG0(port);
+                break;
+        case 1:
+                reg1->reg = NHMEX_R_MSR_PORTN_IPERF_CFG1(port);
+                break;
+        case 2:
+        case 3:
+                reg1->reg = NHMEX_R_MSR_PORTN_QLX_CFG(port);
+                break;
+        case 4:
+        case 5:
+                if (idx == 4)
+                        reg1->reg = NHMEX_R_MSR_PORTN_XBR_SET1_MM_CFG(port);
+                else
+                        reg1->reg = NHMEX_R_MSR_PORTN_XBR_SET2_MM_CFG(port);
+                reg2->config = event->attr.config2;
+                hwc->config |= event->attr.config & (~0ULL << 32);
+                break;
+        };
+        return 0;
+}
+
+static u64 nhmex_rbox_shared_reg_config(struct intel_uncore_box *box, int idx)
+{
+        struct intel_uncore_extra_reg *er;
+        unsigned long flags;
+        u64 config;
+
+        er = &box->shared_regs[idx];
+
+        raw_spin_lock_irqsave(&er->lock, flags);
+        config = er->config;
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+
+        return config;
+}
+
+static void nhmex_rbox_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+        int idx, er_idx;
+
+        idx = reg1->idx % 6;
+        er_idx = idx;
+        if (er_idx > 2)
+                er_idx--;
+        er_idx += (reg1->idx / 6) * 5;
+
+        switch (idx) {
+        case 0:
+        case 1:
+                wrmsrl(reg1->reg, reg1->config);
+                break;
+        case 2:
+        case 3:
+                wrmsrl(reg1->reg, nhmex_rbox_shared_reg_config(box, er_idx));
+                break;
+        case 4:
+        case 5:
+                wrmsrl(reg1->reg, reg1->config);
+                wrmsrl(reg1->reg + 1, hwc->config >> 32);
+                wrmsrl(reg1->reg + 2, reg2->config);
+                break;
+        };
+
+        wrmsrl(hwc->config_base, NHMEX_PMON_CTL_EN_BIT0 |
+                (hwc->config & NHMEX_R_PMON_CTL_EV_SEL_MASK));
+}
+
+DEFINE_UNCORE_FORMAT_ATTR(xbr_match, xbr_match, "config:32-63");
+DEFINE_UNCORE_FORMAT_ATTR(xbr_mm_cfg, xbr_mm_cfg, "config1:0-63");
+DEFINE_UNCORE_FORMAT_ATTR(xbr_mask, xbr_mask, "config2:0-63");
+DEFINE_UNCORE_FORMAT_ATTR(qlx_cfg, qlx_cfg, "config1:0-15");
+DEFINE_UNCORE_FORMAT_ATTR(iperf_cfg, iperf_cfg, "config1:0-31");
+
+static struct attribute *nhmex_uncore_rbox_formats_attr[] = {
+        &format_attr_event5.attr,
+        &format_attr_xbr_mm_cfg.attr,
+        &format_attr_xbr_match.attr,
+        &format_attr_xbr_mask.attr,
+        &format_attr_qlx_cfg.attr,
+        &format_attr_iperf_cfg.attr,
+        NULL,
+};
+
+static struct attribute_group nhmex_uncore_rbox_format_group = {
+        .name = "format",
+        .attrs = nhmex_uncore_rbox_formats_attr,
+};
+
+static struct uncore_event_desc nhmex_uncore_rbox_events[] = {
+        INTEL_UNCORE_EVENT_DESC(qpi0_flit_send,         "event=0x0,iperf_cfg=0x80000000"),
+        INTEL_UNCORE_EVENT_DESC(qpi1_filt_send,         "event=0x6,iperf_cfg=0x80000000"),
+        INTEL_UNCORE_EVENT_DESC(qpi0_idle_filt,         "event=0x0,iperf_cfg=0x40000000"),
+        INTEL_UNCORE_EVENT_DESC(qpi1_idle_filt,         "event=0x6,iperf_cfg=0x40000000"),
+        INTEL_UNCORE_EVENT_DESC(qpi0_date_response,     "event=0x0,iperf_cfg=0xc4"),
+        INTEL_UNCORE_EVENT_DESC(qpi1_date_response,     "event=0x6,iperf_cfg=0xc4"),
+        { /* end: all zeroes */ },
+};
+
+static struct intel_uncore_ops nhmex_uncore_rbox_ops = {
+        NHMEX_UNCORE_OPS_COMMON_INIT(),
+        .enable_event           = nhmex_rbox_msr_enable_event,
+        .hw_config              = nhmex_rbox_hw_config,
+        .get_constraint         = nhmex_rbox_get_constraint,
+        .put_constraint         = nhmex_rbox_put_constraint,
+};
+
+static struct intel_uncore_type nhmex_uncore_rbox = {
+        .name                   = "rbox",
+        .num_counters           = 8,
+        .num_boxes              = 2,
+        .perf_ctr_bits          = 48,
+        .event_ctl              = NHMEX_R_MSR_PMON_CTL0,
+        .perf_ctr               = NHMEX_R_MSR_PMON_CNT0,
+        .event_mask             = NHMEX_R_PMON_RAW_EVENT_MASK,
+        .box_ctl                = NHMEX_R_MSR_GLOBAL_CTL,
+        .msr_offset             = NHMEX_R_MSR_OFFSET,
+        .pair_ctr_ctl           = 1,
+        .num_shared_regs        = 20,
+        .event_descs            = nhmex_uncore_rbox_events,
+        .ops                    = &nhmex_uncore_rbox_ops,
+        .format_group           = &nhmex_uncore_rbox_format_group
+};
+
+static struct intel_uncore_type *nhmex_msr_uncores[] = {
+        &nhmex_uncore_ubox,
+        &nhmex_uncore_cbox,
+        &nhmex_uncore_bbox,
+        &nhmex_uncore_sbox,
+        &nhmex_uncore_mbox,
+        &nhmex_uncore_rbox,
+        &nhmex_uncore_wbox,
+        NULL,
+};
+/* end of Nehalem-EX uncore support */
+
+static void uncore_assign_hw_event(struct intel_uncore_box *box, struct perf_event *event, int idx)
 {
         struct hw_perf_event *hwc = &event->hw;
 
@@ -787,8 +1841,7 @@ static void uncore_assign_hw_event(struct intel_uncore_box *box,
         hwc->event_base  = uncore_perf_ctr(box, hwc->idx);
 }
 
-static void uncore_perf_event_update(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void uncore_perf_event_update(struct intel_uncore_box *box, struct perf_event *event)
 {
         u64 prev_count, new_count, delta;
         int shift;
@@ -858,14 +1911,12 @@ static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box)
         box->hrtimer.function = uncore_pmu_hrtimer;
 }
 
-struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type,
-                                          int cpu)
+struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cpu)
 {
         struct intel_uncore_box *box;
         int i, size;
 
-        size = sizeof(*box) + type->num_shared_regs *
-                sizeof(struct intel_uncore_extra_reg);
+        size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);
 
         box = kmalloc_node(size, GFP_KERNEL | __GFP_ZERO, cpu_to_node(cpu));
         if (!box)
@@ -915,12 +1966,11 @@ static struct intel_uncore_box *uncore_event_to_box(struct perf_event *event)
          * perf core schedules event on the basis of cpu, uncore events are
          * collected by one of the cpus inside a physical package.
          */
-        return uncore_pmu_to_box(uncore_event_to_pmu(event),
-                                 smp_processor_id());
+        return uncore_pmu_to_box(uncore_event_to_pmu(event), smp_processor_id());
 }
 
-static int uncore_collect_events(struct intel_uncore_box *box,
-                                struct perf_event *leader, bool dogrp)
+static int
+uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader, bool dogrp)
 {
         struct perf_event *event;
         int n, max_count;
@@ -952,8 +2002,7 @@ static int uncore_collect_events(struct intel_uncore_box *box,
 }
 
 static struct event_constraint *
-uncore_get_event_constraint(struct intel_uncore_box *box,
-                            struct perf_event *event)
+uncore_get_event_constraint(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct intel_uncore_type *type = box->pmu->type;
         struct event_constraint *c;
@@ -977,15 +2026,13 @@ uncore_get_event_constraint(struct intel_uncore_box *box,
         return &type->unconstrainted;
 }
 
-static void uncore_put_event_constraint(struct intel_uncore_box *box,
-                                        struct perf_event *event)
+static void uncore_put_event_constraint(struct intel_uncore_box *box, struct perf_event *event)
 {
         if (box->pmu->type->ops->put_constraint)
                 box->pmu->type->ops->put_constraint(box, event);
 }
 
-static int uncore_assign_events(struct intel_uncore_box *box,
-                                int assign[], int n)
+static int uncore_assign_events(struct intel_uncore_box *box, int assign[], int n)
 {
         unsigned long used_mask[BITS_TO_LONGS(UNCORE_PMC_IDX_MAX)];
         struct event_constraint *c, *constraints[UNCORE_PMC_IDX_MAX];
@@ -1407,8 +2454,7 @@ static bool pcidrv_registered;
 /*
  * add a pci uncore device
  */
-static int __devinit uncore_pci_add(struct intel_uncore_type *type,
-                                    struct pci_dev *pdev)
+static int __devinit uncore_pci_add(struct intel_uncore_type *type, struct pci_dev *pdev)
 {
         struct intel_uncore_pmu *pmu;
         struct intel_uncore_box *box;
@@ -1485,6 +2531,7 @@ static int __devinit uncore_pci_probe(struct pci_dev *pdev,
         struct intel_uncore_type *type;
 
         type = (struct intel_uncore_type *)id->driver_data;
+
         return uncore_pci_add(type, pdev);
 }
 
@@ -1612,8 +2659,8 @@ static int __cpuinit uncore_cpu_prepare(int cpu, int phys_id)
         return 0;
 }
 
-static void __cpuinit uncore_change_context(struct intel_uncore_type **uncores,
-                                            int old_cpu, int new_cpu)
+static void __cpuinit
+uncore_change_context(struct intel_uncore_type **uncores, int old_cpu, int new_cpu)
 {
         struct intel_uncore_type *type;
         struct intel_uncore_pmu *pmu;
@@ -1694,8 +2741,8 @@ static void __cpuinit uncore_event_init_cpu(int cpu)
         uncore_change_context(pci_uncores, -1, cpu);
 }
 
-static int __cpuinit uncore_cpu_notifier(struct notifier_block *self,
-                                         unsigned long action, void *hcpu)
+static int
+ __cpuinit uncore_cpu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
 {
         unsigned int cpu = (long)hcpu;
 
@@ -1732,12 +2779,12 @@ static int __cpuinit uncore_cpu_notifier(struct notifier_block *self,
 }
 
 static struct notifier_block uncore_cpu_nb __cpuinitdata = {
-        .notifier_call = uncore_cpu_notifier,
+        .notifier_call  = uncore_cpu_notifier,
         /*
          * to migrate uncore events, our notifier should be executed
          * before perf core's notifier.
          */
-        .priority = CPU_PRI_PERF + 1,
+        .priority       = CPU_PRI_PERF + 1,
 };
 
 static void __init uncore_cpu_setup(void *dummy)
@@ -1767,6 +2814,9 @@ static int __init uncore_cpu_init(void)
                         snbep_uncore_cbox.num_boxes = max_cores;
                 msr_uncores = snbep_msr_uncores;
                 break;
+        case 46:
+                msr_uncores = nhmex_msr_uncores;
+                break;
         default:
                 return 0;
         }
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index b13e9ea81def..f3851892e077 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -5,8 +5,6 @@
 #include "perf_event.h"
 
 #define UNCORE_PMU_NAME_LEN             32
-#define UNCORE_BOX_HASH_SIZE            8
-
 #define UNCORE_PMU_HRTIMER_INTERVAL     (60 * NSEC_PER_SEC)
 
 #define UNCORE_FIXED_EVENT              0xff
@@ -115,6 +113,10 @@
                                  SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
                                  SNBEP_PCU_MSR_PMON_CTL_OCC_EDGE_DET)
 
+#define SNBEP_QPI_PCI_PMON_RAW_EVENT_MASK       \
+                                (SNBEP_PMON_RAW_EVENT_MASK | \
+                                 SNBEP_PMON_CTL_EV_SEL_EXT)
+
 /* SNB-EP pci control register */
 #define SNBEP_PCI_PMON_BOX_CTL                  0xf4
 #define SNBEP_PCI_PMON_CTL0                     0xd8
@@ -158,6 +160,193 @@
 #define SNBEP_PCU_MSR_CORE_C3_CTR               0x3fc
 #define SNBEP_PCU_MSR_CORE_C6_CTR               0x3fd
 
+/* NHM-EX event control */
+#define NHMEX_PMON_CTL_EV_SEL_MASK      0x000000ff
+#define NHMEX_PMON_CTL_UMASK_MASK       0x0000ff00
+#define NHMEX_PMON_CTL_EN_BIT0          (1 << 0)
+#define NHMEX_PMON_CTL_EDGE_DET         (1 << 18)
+#define NHMEX_PMON_CTL_PMI_EN           (1 << 20)
+#define NHMEX_PMON_CTL_EN_BIT22         (1 << 22)
+#define NHMEX_PMON_CTL_INVERT           (1 << 23)
+#define NHMEX_PMON_CTL_TRESH_MASK       0xff000000
+#define NHMEX_PMON_RAW_EVENT_MASK       (NHMEX_PMON_CTL_EV_SEL_MASK | \
+                                         NHMEX_PMON_CTL_UMASK_MASK | \
+                                         NHMEX_PMON_CTL_EDGE_DET | \
+                                         NHMEX_PMON_CTL_INVERT | \
+                                         NHMEX_PMON_CTL_TRESH_MASK)
+
+/* NHM-EX Ubox */
+#define NHMEX_U_MSR_PMON_GLOBAL_CTL             0xc00
+#define NHMEX_U_MSR_PMON_CTR                    0xc11
+#define NHMEX_U_MSR_PMON_EV_SEL                 0xc10
+
+#define NHMEX_U_PMON_GLOBAL_EN                  (1 << 0)
+#define NHMEX_U_PMON_GLOBAL_PMI_CORE_SEL        0x0000001e
+#define NHMEX_U_PMON_GLOBAL_EN_ALL              (1 << 28)
+#define NHMEX_U_PMON_GLOBAL_RST_ALL             (1 << 29)
+#define NHMEX_U_PMON_GLOBAL_FRZ_ALL             (1 << 31)
+
+#define NHMEX_U_PMON_RAW_EVENT_MASK             \
+                (NHMEX_PMON_CTL_EV_SEL_MASK |   \
+                 NHMEX_PMON_CTL_EDGE_DET)
+
+/* NHM-EX Cbox */
+#define NHMEX_C0_MSR_PMON_GLOBAL_CTL            0xd00
+#define NHMEX_C0_MSR_PMON_CTR0                  0xd11
+#define NHMEX_C0_MSR_PMON_EV_SEL0               0xd10
+#define NHMEX_C_MSR_OFFSET                      0x20
+
+/* NHM-EX Bbox */
+#define NHMEX_B0_MSR_PMON_GLOBAL_CTL            0xc20
+#define NHMEX_B0_MSR_PMON_CTR0                  0xc31
+#define NHMEX_B0_MSR_PMON_CTL0                  0xc30
+#define NHMEX_B_MSR_OFFSET                      0x40
+#define NHMEX_B0_MSR_MATCH                      0xe45
+#define NHMEX_B0_MSR_MASK                       0xe46
+#define NHMEX_B1_MSR_MATCH                      0xe4d
+#define NHMEX_B1_MSR_MASK                       0xe4e
+
+#define NHMEX_B_PMON_CTL_EN                     (1 << 0)
+#define NHMEX_B_PMON_CTL_EV_SEL_SHIFT           1
+#define NHMEX_B_PMON_CTL_EV_SEL_MASK            \
+                (0x1f << NHMEX_B_PMON_CTL_EV_SEL_SHIFT)
+#define NHMEX_B_PMON_CTR_SHIFT          6
+#define NHMEX_B_PMON_CTR_MASK           \
+                (0x3 << NHMEX_B_PMON_CTR_SHIFT)
+#define NHMEX_B_PMON_RAW_EVENT_MASK             \
+                (NHMEX_B_PMON_CTL_EV_SEL_MASK | \
+                 NHMEX_B_PMON_CTR_MASK)
+
+/* NHM-EX Sbox */
+#define NHMEX_S0_MSR_PMON_GLOBAL_CTL            0xc40
+#define NHMEX_S0_MSR_PMON_CTR0                  0xc51
+#define NHMEX_S0_MSR_PMON_CTL0                  0xc50
+#define NHMEX_S_MSR_OFFSET                      0x80
+#define NHMEX_S0_MSR_MM_CFG                     0xe48
+#define NHMEX_S0_MSR_MATCH                      0xe49
+#define NHMEX_S0_MSR_MASK                       0xe4a
+#define NHMEX_S1_MSR_MM_CFG                     0xe58
+#define NHMEX_S1_MSR_MATCH                      0xe59
+#define NHMEX_S1_MSR_MASK                       0xe5a
+
+#define NHMEX_S_PMON_MM_CFG_EN                  (0x1ULL << 63)
+
+/* NHM-EX Mbox */
+#define NHMEX_M0_MSR_GLOBAL_CTL                 0xca0
+#define NHMEX_M0_MSR_PMU_DSP                    0xca5
+#define NHMEX_M0_MSR_PMU_ISS                    0xca6
+#define NHMEX_M0_MSR_PMU_MAP                    0xca7
+#define NHMEX_M0_MSR_PMU_MSC_THR                0xca8
+#define NHMEX_M0_MSR_PMU_PGT                    0xca9
+#define NHMEX_M0_MSR_PMU_PLD                    0xcaa
+#define NHMEX_M0_MSR_PMU_ZDP_CTL_FVC            0xcab
+#define NHMEX_M0_MSR_PMU_CTL0                   0xcb0
+#define NHMEX_M0_MSR_PMU_CNT0                   0xcb1
+#define NHMEX_M_MSR_OFFSET                      0x40
+#define NHMEX_M0_MSR_PMU_MM_CFG                 0xe54
+#define NHMEX_M1_MSR_PMU_MM_CFG                 0xe5c
+
+#define NHMEX_M_PMON_MM_CFG_EN                  (1ULL << 63)
+#define NHMEX_M_PMON_ADDR_MATCH_MASK            0x3ffffffffULL
+#define NHMEX_M_PMON_ADDR_MASK_MASK             0x7ffffffULL
+#define NHMEX_M_PMON_ADDR_MASK_SHIFT            34
+
+#define NHMEX_M_PMON_CTL_EN                     (1 << 0)
+#define NHMEX_M_PMON_CTL_PMI_EN                 (1 << 1)
+#define NHMEX_M_PMON_CTL_COUNT_MODE_SHIFT       2
+#define NHMEX_M_PMON_CTL_COUNT_MODE_MASK        \
+        (0x3 << NHMEX_M_PMON_CTL_COUNT_MODE_SHIFT)
+#define NHMEX_M_PMON_CTL_STORAGE_MODE_SHIFT     4
+#define NHMEX_M_PMON_CTL_STORAGE_MODE_MASK      \
+        (0x3 << NHMEX_M_PMON_CTL_STORAGE_MODE_SHIFT)
+#define NHMEX_M_PMON_CTL_WRAP_MODE              (1 << 6)
+#define NHMEX_M_PMON_CTL_FLAG_MODE              (1 << 7)
+#define NHMEX_M_PMON_CTL_INC_SEL_SHIFT          9
+#define NHMEX_M_PMON_CTL_INC_SEL_MASK           \
+        (0x1f << NHMEX_M_PMON_CTL_INC_SEL_SHIFT)
+#define NHMEX_M_PMON_CTL_SET_FLAG_SEL_SHIFT     19
+#define NHMEX_M_PMON_CTL_SET_FLAG_SEL_MASK      \
+        (0x7 << NHMEX_M_PMON_CTL_SET_FLAG_SEL_SHIFT)
+#define NHMEX_M_PMON_RAW_EVENT_MASK                     \
+                (NHMEX_M_PMON_CTL_COUNT_MODE_MASK |     \
+                 NHMEX_M_PMON_CTL_STORAGE_MODE_MASK |   \
+                 NHMEX_M_PMON_CTL_WRAP_MODE |           \
+                 NHMEX_M_PMON_CTL_FLAG_MODE |           \
+                 NHMEX_M_PMON_CTL_INC_SEL_MASK |        \
+                 NHMEX_M_PMON_CTL_SET_FLAG_SEL_MASK)
+
+
+#define NHMEX_M_PMON_ZDP_CTL_FVC_FVID_MASK      0x1f
+#define NHMEX_M_PMON_ZDP_CTL_FVC_BCMD_MASK      (0x7 << 5)
+#define NHMEX_M_PMON_ZDP_CTL_FVC_RSP_MASK       (0x7 << 8)
+#define NHMEX_M_PMON_ZDP_CTL_FVC_PBOX_INIT_ERR  (1 << 23)
+#define NHMEX_M_PMON_ZDP_CTL_FVC_MASK                   \
+                (NHMEX_M_PMON_ZDP_CTL_FVC_FVID_MASK |   \
+                 NHMEX_M_PMON_ZDP_CTL_FVC_BCMD_MASK |   \
+                 NHMEX_M_PMON_ZDP_CTL_FVC_RSP_MASK  |   \
+                 NHMEX_M_PMON_ZDP_CTL_FVC_PBOX_INIT_ERR)
+#define NHMEX_M_PMON_ZDP_CTL_FVC_EVENT_MASK(n)  (0x7 << (11 + 3 * (n)))
+
+/*
+ * use the 9~13 bits to select event If the 7th bit is not set,
+ * otherwise use the 19~21 bits to select event.
+ */
+#define MBOX_INC_SEL(x) ((x) << NHMEX_M_PMON_CTL_INC_SEL_SHIFT)
+#define MBOX_SET_FLAG_SEL(x) (((x) << NHMEX_M_PMON_CTL_SET_FLAG_SEL_SHIFT) | \
+                                NHMEX_M_PMON_CTL_FLAG_MODE)
+#define MBOX_INC_SEL_MASK (NHMEX_M_PMON_CTL_INC_SEL_MASK | \
+                           NHMEX_M_PMON_CTL_FLAG_MODE)
+#define MBOX_SET_FLAG_SEL_MASK (NHMEX_M_PMON_CTL_SET_FLAG_SEL_MASK | \
+                                NHMEX_M_PMON_CTL_FLAG_MODE)
+#define MBOX_INC_SEL_EXTAR_REG(c, r) \
+                EVENT_EXTRA_REG(MBOX_INC_SEL(c), NHMEX_M0_MSR_PMU_##r, \
+                                MBOX_INC_SEL_MASK, (u64)-1, NHMEX_M_##r)
+#define MBOX_SET_FLAG_SEL_EXTRA_REG(c, r) \
+                EVENT_EXTRA_REG(MBOX_SET_FLAG_SEL(c), NHMEX_M0_MSR_PMU_##r, \
+                                MBOX_SET_FLAG_SEL_MASK, \
+                                (u64)-1, NHMEX_M_##r)
+
+/* NHM-EX Rbox */
+#define NHMEX_R_MSR_GLOBAL_CTL                  0xe00
+#define NHMEX_R_MSR_PMON_CTL0                   0xe10
+#define NHMEX_R_MSR_PMON_CNT0                   0xe11
+#define NHMEX_R_MSR_OFFSET                      0x20
+
+#define NHMEX_R_MSR_PORTN_QLX_CFG(n)            \
+                ((n) < 4 ? (0xe0c + (n)) : (0xe2c + (n) - 4))
+#define NHMEX_R_MSR_PORTN_IPERF_CFG0(n)         (0xe04 + (n))
+#define NHMEX_R_MSR_PORTN_IPERF_CFG1(n)         (0xe24 + (n))
+#define NHMEX_R_MSR_PORTN_XBR_OFFSET(n)         \
+                (((n) < 4 ? 0 : 0x10) + (n) * 4)
+#define NHMEX_R_MSR_PORTN_XBR_SET1_MM_CFG(n)    \
+                (0xe60 + NHMEX_R_MSR_PORTN_XBR_OFFSET(n))
+#define NHMEX_R_MSR_PORTN_XBR_SET1_MATCH(n)     \
+                (NHMEX_R_MSR_PORTN_XBR_SET1_MM_CFG(n) + 1)
+#define NHMEX_R_MSR_PORTN_XBR_SET1_MASK(n)      \
+                (NHMEX_R_MSR_PORTN_XBR_SET1_MM_CFG(n) + 2)
+#define NHMEX_R_MSR_PORTN_XBR_SET2_MM_CFG(n)    \
+                (0xe70 + NHMEX_R_MSR_PORTN_XBR_OFFSET(n))
+#define NHMEX_R_MSR_PORTN_XBR_SET2_MATCH(n)     \
+                (NHMEX_R_MSR_PORTN_XBR_SET2_MM_CFG(n) + 1)
+#define NHMEX_R_MSR_PORTN_XBR_SET2_MASK(n)      \
+                (NHMEX_R_MSR_PORTN_XBR_SET2_MM_CFG(n) + 2)
+
+#define NHMEX_R_PMON_CTL_EN                     (1 << 0)
+#define NHMEX_R_PMON_CTL_EV_SEL_SHIFT           1
+#define NHMEX_R_PMON_CTL_EV_SEL_MASK            \
+                (0x1f << NHMEX_R_PMON_CTL_EV_SEL_SHIFT)
+#define NHMEX_R_PMON_CTL_PMI_EN                 (1 << 6)
+#define NHMEX_R_PMON_RAW_EVENT_MASK             NHMEX_R_PMON_CTL_EV_SEL_MASK
+
+/* NHM-EX Wbox */
+#define NHMEX_W_MSR_GLOBAL_CTL                  0xc80
+#define NHMEX_W_MSR_PMON_CNT0                   0xc90
+#define NHMEX_W_MSR_PMON_EVT_SEL0               0xc91
+#define NHMEX_W_MSR_PMON_FIXED_CTR              0x394
+#define NHMEX_W_MSR_PMON_FIXED_CTL              0x395
+
+#define NHMEX_W_PMON_GLOBAL_FIXED_EN            (1ULL << 31)
+
 struct intel_uncore_ops;
 struct intel_uncore_pmu;
 struct intel_uncore_box;
@@ -178,6 +367,7 @@ struct intel_uncore_type {
         unsigned msr_offset;
         unsigned num_shared_regs:8;
         unsigned single_fixed:1;
+        unsigned pair_ctr_ctl:1;
         struct event_constraint unconstrainted;
         struct event_constraint *constraints;
         struct intel_uncore_pmu *pmus;
@@ -213,7 +403,7 @@ struct intel_uncore_pmu {
 
 struct intel_uncore_extra_reg {
         raw_spinlock_t lock;
-        u64 config1;
+        u64 config, config1, config2;
         atomic_t ref;
 };
 
@@ -323,14 +513,16 @@ unsigned uncore_msr_fixed_ctr(struct intel_uncore_box *box)
 static inline
 unsigned uncore_msr_event_ctl(struct intel_uncore_box *box, int idx)
 {
-        return idx + box->pmu->type->event_ctl +
+        return box->pmu->type->event_ctl +
+                (box->pmu->type->pair_ctr_ctl ? 2 * idx : idx) +
                 box->pmu->type->msr_offset * box->pmu->pmu_idx;
 }
 
 static inline
 unsigned uncore_msr_perf_ctr(struct intel_uncore_box *box, int idx)
 {
-        return idx + box->pmu->type->perf_ctr +
+        return box->pmu->type->perf_ctr +
+                (box->pmu->type->pair_ctr_ctl ? 2 * idx : idx) +
                 box->pmu->type->msr_offset * box->pmu->pmu_idx;
 }
 
@@ -422,3 +614,8 @@ static inline void uncore_box_init(struct intel_uncore_box *box)
                         box->pmu->type->ops->init_box(box);
         }
 }
+
+static inline bool uncore_box_is_fake(struct intel_uncore_box *box)
+{
+        return (box->phys_id < 0);
+}
diff --git a/arch/x86/um/asm/ptrace.h b/arch/x86/um/asm/ptrace.h
index 950dfb7b8417..e72cd0df5ba3 100644
--- a/arch/x86/um/asm/ptrace.h
+++ b/arch/x86/um/asm/ptrace.h
@@ -30,10 +30,10 @@
 #define profile_pc(regs) PT_REGS_IP(regs)
 
 #define UPT_RESTART_SYSCALL(r) (UPT_IP(r) -= 2)
-#define UPT_SET_SYSCALL_RETURN(r, res) (UPT_AX(r) = (res))
+#define PT_REGS_SET_SYSCALL_RETURN(r, res) (PT_REGS_AX(r) = (res))
 
-static inline long regs_return_value(struct uml_pt_regs *regs)
+static inline long regs_return_value(struct pt_regs *regs)
 {
-        return UPT_AX(regs);
+        return PT_REGS_AX(regs);
 }
 #endif /* __UM_X86_PTRACE_H */
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 8a3f8351f438..8ed64cfae4ff 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -7,6 +7,7 @@ config ZONE_DMA
 config XTENSA
         def_bool y
         select HAVE_IDE
+        select GENERIC_ATOMIC64
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
         select GENERIC_CPU_DEVICES