x86: Correct spi node alias

With recent changes spi node was moved to a place as a subnode under
pch, so update the alias to refer to its correct place as well.

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

diff --git a/arch/x86/dts/bayleybay.dts b/arch/x86/dts/bayleybay.dts
index 9bf707bf0e84bdd43c05d7f97d8fbafddcd2b5d7..fbca46762c55149ae601e41fc4edadbd4f3d37b8 100644 (file)
--- a/arch/x86/dts/bayleybay.dts
+++ b/arch/x86/dts/bayleybay.dts
@@ -21,7 +21,7 @@
 
        aliases {
                serial0 = &serial;
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -184,7 +184,7 @@
                                >;
                        };
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";

diff --git a/arch/x86/dts/broadwell_som-6896.dts b/arch/x86/dts/broadwell_som-6896.dts
index 4e9e410b706aac85ea31ad99e4f28904bc6a64f7..7b2c51504b1a9694289359c94a94414a42799af9 100644 (file)
--- a/arch/x86/dts/broadwell_som-6896.dts
+++ b/arch/x86/dts/broadwell_som-6896.dts
@@ -10,7 +10,7 @@
        compatible = "advantech,som-6896", "intel,broadwell";
 
        aliases {
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -34,7 +34,7 @@
                        reg = <0x0000f800 0 0 0 0>;
                        compatible = "intel,pch9";
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";

diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts
index d148d6e349cd87f0d8c06395834aca3f52909e5e..58072031df88e7c2fd536b1bb6fa6ac686d84d72 100644 (file)
--- a/arch/x86/dts/chromebook_link.dts
+++ b/arch/x86/dts/chromebook_link.dts
@@ -11,7 +11,7 @@
        compatible = "google,link", "intel,celeron-ivybridge";
 
        aliases {
-               spi0 = "/pci/pch/spi";
+               spi0 = &spi;
                usb0 = &usb_0;
                usb1 = &usb_1;
        };
@@ -252,7 +252,7 @@
                        /* Enable EC SMI source */
                        intel,alt-gp-smi-enable = <0x0100>;
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";

diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts
index 23027016e5746a51768974a2629f06ea906ceecc..48f0c77d45894b3efc2d7e3111426c62a11e574c 100644 (file)
--- a/arch/x86/dts/chromebox_panther.dts
+++ b/arch/x86/dts/chromebox_panther.dts
@@ -10,7 +10,7 @@
        compatible = "google,panther", "intel,haswell";
 
        aliases {
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -56,7 +56,7 @@
                        reg = <0x0000f800 0 0 0 0>;
                        compatible = "intel,pch9";
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";

diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index d6dd0b49f0fac3a64f9ec4192c3a2ed431d2610f..47fab0fda6758710d0cba172268f10a93c2790de 100644 (file)
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -19,7 +19,7 @@
        compatible = "intel,crownbay", "intel,queensbay";
 
        aliases {
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -227,7 +227,7 @@
                                >;
                        };
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";

diff --git a/arch/x86/dts/galileo.dts b/arch/x86/dts/galileo.dts
index a2f5a1f223427508c447225df87bdce965b91b4a..dd75fc4dc968725f627b7a89efa3d6cde77ce11f 100644 (file)
--- a/arch/x86/dts/galileo.dts
+++ b/arch/x86/dts/galileo.dts
@@ -18,7 +18,7 @@
        compatible = "intel,galileo", "intel,quark";
 
        aliases {
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -115,7 +115,7 @@
                                >;
                        };
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";

diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts
index e7ef7c987b6226b525a1d40be3299ec5787a0d6e..7afdf6c30ba015f134a12a55b0784daf0f188d19 100644 (file)
--- a/arch/x86/dts/minnowmax.dts
+++ b/arch/x86/dts/minnowmax.dts
@@ -20,7 +20,7 @@
 
        aliases {
                serial0 = &serial;
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -218,7 +218,7 @@
                                >;
                        };
 
-                       spi {
+                       spi: spi {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "intel,ich-spi";