Merge remote-tracking branch 'origin/master' into merge

Conflicts:
	arch/powerpc/boot/dts/b4qds.dts
	drivers/crypto/caam/Makefile

6 files changed, 9 insertions, 30 deletions

diff --git a/arch/powerpc/boot/dts/b4qds.dtsi b/arch/powerpc/boot/dts/b4qds.dtsi
index 6251f73..533d6a6 100644
--- a/arch/powerpc/boot/dts/b4qds.dtsi
+++ b/arch/powerpc/boot/dts/b4qds.dtsi
@@ -251,3 +251,4 @@
 
 /include/ "fsl/b4si-post.dtsi"
 /include/ "fsl/qoriq-dpaa-res3.dtsi"
+/include/ "fsl/qoriq-qman-ceetm0.dtsi"
diff --git a/arch/powerpc/boot/dts/bsc9132qds.dtsi b/arch/powerpc/boot/dts/bsc9132qds.dtsi
index 8fdc2e8..ac4a6af 100644
--- a/arch/powerpc/boot/dts/bsc9132qds.dtsi
+++ b/arch/powerpc/boot/dts/bsc9132qds.dtsi
@@ -40,33 +40,6 @@
 		reg = <0x0 0x0 0x8000000>;
 		bank-width = <2>;
 		device-width = <1>;
-
-		partition@40000 {
-			/* 256KB for DTB Image */
-			reg = <0x00040000 0x00040000>;
-			label = "NOR DTB Image";
-		};
-
-		partition@80000 {
-			/* 7MB for Linux Kernel Image */
-			reg = <0x00080000 0x00700000>;
-			label = "NAND Linux Kernel Image";
-		};
-
-		partition@800000 {
-			/* 55MB for Root file system */
-			reg = <0x00800000 0x03700000>;
-			label = "NOR RFS Image";
-		};
-
-		partition@3f00000 {
-			/* This location must not be altered  */
-			/* 512KB for u-boot Bootloader Image */
-			/* 512KB for u-boot Environment Variables */
-			reg = <0x03f00000 0x00100000>;
-			label = "NOR U-boot Image";
-			read-only;
-		};
 	};
 
 	nand@1,0 {
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
index 1f189a9..c907c8e 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
@@ -175,7 +175,7 @@
 
 /include/ "pq3-gpio-0.dtsi"
 
-	display@10000 {
+	display: display@10000 {
 		compatible = "fsl,diu", "fsl,p1022-diu";
 		reg = <0x10000 1000>;
 		interrupts = <64 2 0 0>;
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
index 1956dea..362ac51 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
@@ -50,6 +50,9 @@
 		pci0 = &pci0;
 		pci1 = &pci1;
 		pci2 = &pci2;
+		/*inaccurate vga name for U-Boot compatibility*/
+		vga = &display;
+		display = &display;
 	};
 
 	cpus {
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index 82ca5ab..08f838d 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -339,7 +339,7 @@
 
 	mdio-mux-emi1 {
 		compatible = "mdio-mux-gpio";
-		gpios = <&gpio0 0 0>, <&gpio0 1 0>;
+		gpios = <&gpio0 1 0>, <&gpio0 0 0>;
 		mdio-parent-bus = <&mdio0>;
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -414,7 +414,7 @@
 	};
 	mdio-mux-emi2 {
 		compatible = "mdio-mux-gpio";
-		gpios = <&gpio0 2 0>, <&gpio0 3 0>;
+		gpios = <&gpio0 3 0>, <&gpio0 2 0>;
 		mdio-parent-bus = <&xmdio0>;
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/arch/powerpc/boot/dts/t4240qds.dts b/arch/powerpc/boot/dts/t4240qds.dts
index bd1e091..618fa1e 100644
--- a/arch/powerpc/boot/dts/t4240qds.dts
+++ b/arch/powerpc/boot/dts/t4240qds.dts
@@ -653,3 +653,5 @@
 
 /include/ "fsl/t4240si-post.dtsi"
 /include/ "fsl/qoriq-dpaa-res3.dtsi"
+/include/ "fsl/qoriq-qman-ceetm0.dtsi"
+/include/ "fsl/qoriq-qman-ceetm1.dtsi"