From 278ac6790bbc0b0d8b66a98929613ea42cd9951a Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Sat, 2 May 2009 06:16:59 +0400
Subject: [PATCH] --- yaml --- r: 149615 b: refs/heads/master c:
 bd78c33a096a73f09b1b998a481290e229382a8b h: refs/heads/master i:   149613:
 9b507aec8ae940b0fdfe7f064bdc15a375fe6401   149611:
 e49c2bd7d1da4b6d6e4d965894bd1b945a8f123f   149607:
 633db01a5dd8e464f6dc15dc90d9983f5166510f   149599:
 25e0f400bcbe39b62aab2e6e768420ede1fa02ba v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/powerpc/boot/dts/mpc8569mds.dts | 26 +++++++++++++++++++---
 trunk/drivers/of/base.c                    |  1 +
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 91c37e4d6728..1adf4e97c728 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e8306fe5de2ce0c3272abd4b8ab20323a8bf0ff
+refs/heads/master: bd78c33a096a73f09b1b998a481290e229382a8b
diff --git a/trunk/arch/powerpc/boot/dts/mpc8569mds.dts b/trunk/arch/powerpc/boot/dts/mpc8569mds.dts
index ece3b305cd06..23a102ea9143 100644
--- a/trunk/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/trunk/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -259,10 +259,21 @@
 		};
 
 		par_io@e0100 {
+			#address-cells = <1>;
+			#size-cells = <1>;
 			reg = <0xe0100 0x100>;
+			ranges = <0x0 0xe0100 0x100>;
 			device_type = "par_io";
 			num-ports = <7>;
 
+			qe_pio_e: gpio-controller@80 {
+				#gpio-cells = <2>;
+				compatible = "fsl,mpc8569-qe-pario-bank",
+					     "fsl,mpc8323-qe-pario-bank";
+				reg = <0x80 0x18>;
+				gpio-controller;
+			};
+
 			pio1: ucc_pin@01 {
 				pio-map = <
 			/* port  pin  dir  open_drain  assignment  has_irq */
@@ -368,12 +379,21 @@
 		};
 
 		spi@4c0 {
-			cell-index = <0>;
-			compatible = "fsl,spi";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "fsl,mpc8569-qe-spi", "fsl,spi";
 			reg = <0x4c0 0x40>;
+			cell-index = <0>;
 			interrupts = <2>;
 			interrupt-parent = <&qeic>;
-			mode = "cpu";
+			gpios = <&qe_pio_e 30 0>;
+			mode = "cpu-qe";
+
+			serial-flash@0 {
+				compatible = "stm,m25p40";
+				reg = <0>;
+				spi-max-frequency = <25000000>;
+			};
 		};
 
 		spi@500 {
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
index 41c5dfd85358..391f91c0bf55 100644
--- a/trunk/drivers/of/base.c
+++ b/trunk/drivers/of/base.c
@@ -447,6 +447,7 @@ struct of_modalias_table {
 static struct of_modalias_table of_modalias_table[] = {
 	{ "fsl,mcu-mpc8349emitx", "mcu-mpc8349emitx" },
 	{ "mmc-spi-slot", "mmc_spi" },
+	{ "stm,m25p40", "m25p80" },
 };
 
 /**