Merge branch 'master' of git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / arch / x86 / dts / broadwell_som-6896.dts

diff --git a/arch/x86/dts/broadwell_som-6896.dts b/arch/x86/dts/broadwell_som-6896.dts
index a6b5d0f4a59d52b1fbf9dd07d1513275d02e9cd8..39661990853b32bea83095b2383cc9bdf602141b 100644 (file)
--- a/arch/x86/dts/broadwell_som-6896.dts
+++ b/arch/x86/dts/broadwell_som-6896.dts
@@ -3,13 +3,15 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
+/include/ "coreboot_fb.dtsi"
 
 / {
        model = "Advantech SOM-6896";
        compatible = "advantech,som-6896", "intel,broadwell";
 
        aliases {
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
@@ -28,16 +30,22 @@
                ranges = <0x02000000 0x0 0xe0000000 0xe0000000 0 0x10000000
                        0x42000000 0x0 0xd0000000 0xd0000000 0 0x10000000
                        0x01000000 0x0 0x2000 0x2000 0 0xe000>;
-       };
 
-       spi {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "intel,ich-spi";
-               spi-flash@0 {
-                       reg = <0>;
-                       compatible = "winbond,w25q128", "spi-flash";
-                       memory-map = <0xff000000 0x01000000>;
+               pch@1f,0 {
+                       reg = <0x0000f800 0 0 0 0>;
+                       compatible = "intel,pch9";
+
+                       spi: spi {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "intel,ich9-spi";
+                               spi-flash@0 {
+                                       reg = <0>;
+                                       compatible = "winbond,w25q128", "spi-flash";
+                                       memory-map = <0xff000000 0x01000000>;
+                               };
+                       };
                };
        };
+
 };