summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-04-15 12:00:11 +0800
committerSimon Glass <sjg@chromium.org>2015-04-29 18:51:48 -0600
commit0a9bb489bf02effd59443a497e5ad7d66509ea1d (patch)
treeb060ab1cc8cf0e3fe34aec7af524465136d9ce58
parent19268834fb208a7deb43f9a00b034e0c6abab3cd (diff)
downloadtalos-obmc-uboot-0a9bb489bf02effd59443a497e5ad7d66509ea1d.tar.gz
talos-obmc-uboot-0a9bb489bf02effd59443a497e5ad7d66509ea1d.zip
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>
-rw-r--r--arch/x86/dts/crownbay.dts6
-rw-r--r--arch/x86/dts/galileo.dts4
-rw-r--r--arch/x86/dts/minnowmax.dts3
3 files changed, 11 insertions, 2 deletions
diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index e81054ebc5..fbdeade047 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 66af64abda..60dbc5f8a3 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 8f34369753..ecd4a892c0 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";
OpenPOWER on IntegriCloud