From: Bin Meng <bmeng.cn@gmail.com>
Date: Wed, 15 Apr 2015 04:00:11 +0000 (+0800)
Subject: x86: Add alias for SPI node in the board dts
X-Git-Tag: v2015.07-rc1~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9bb489bf02effd59443a497e5ad7d66509ea1d;p=pandora-u-boot.git

x86: Add alias for SPI node in the board dts

Since Intel ICH SPI driver has been converted to driver model, we need
add an alias for SPI node in the board dts files otherwise SPI flash
won't be detected due to 'invalid bus' error.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index e81054ebc53..fbdeade0474 100644
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -13,6 +13,10 @@
 	model = "Intel Crown Bay";
 	compatible = "intel,crownbay", "intel,queensbay";
 
+	aliases {
+		spi0 = "/spi";
+	};
+
 	config {
 		silent_console = <0>;
 	};
@@ -46,7 +50,7 @@
 	spi {
 		#address-cells = <1>;
 		#size-cells = <0>;
-		compatible = "intel,ich7";
+		compatible = "intel,ich-spi";
 		spi-flash@0 {
 			reg = <0>;
 			compatible = "sst,25vf016b", "spi-flash";
diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts
index 66af64abdaa..60dbc5f8a30 100644
--- a/arch/x86/dts/galileo.dts
+++ b/arch/x86/dts/galileo.dts
@@ -14,6 +14,10 @@
 	model = "Intel Galileo";
 	compatible = "intel,galileo", "intel,quark";
 
+	aliases {
+		spi0 = "/spi";
+	};
+
 	config {
 		silent_console = <0>;
 	};
diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts
index 8f34369753b..ecd4a892c0b 100644
--- a/arch/x86/dts/minnowmax.dts
+++ b/arch/x86/dts/minnowmax.dts
@@ -15,6 +15,7 @@
 
 	aliases {
 		serial0 = &serial;
+		spi0 = "/spi";
 	};
 
 	config {
@@ -28,7 +29,7 @@
 	spi {
 		#address-cells = <1>;
 		#size-cells = <0>;
-		compatible = "intel,ich";
+		compatible = "intel,ich-spi";
 		spi-flash@0 {
 			reg = <0>;
 			compatible = "sst,25vf016b", "spi-flash";