Merge branch 'master' into next

[platform/kernel/u-boot.git] / arch / x86 / dts / minnowmax.dts

diff --git a/arch/x86/dts/minnowmax.dts b/arch/x86/dts/minnowmax.dts
index 6c65fb9..f44b9bb 100644 (file)
--- a/arch/x86/dts/minnowmax.dts
+++ b/arch/x86/dts/minnowmax.dts
@@ -13,7 +13,9 @@
 /include/ "serial.dtsi"
 /include/ "reset.dtsi"
 /include/ "rtc.dtsi"
-/include/ "tsc_timer.dtsi"
+
+#include "tsc_timer.dtsi"
+#include "smbios.dtsi"
 
 / {
        model = "Intel Minnowboard Max";
@@ -114,7 +116,7 @@
                compatible = "intel,pci-baytrail", "pci-x86";
                #address-cells = <3>;
                #size-cells = <2>;
-               u-boot,dm-pre-reloc;
+               bootph-all;
                ranges = <0x02000000 0x0 0x80000000 0x80000000 0 0x40000000
                          0x42000000 0x0 0xc0000000 0xc0000000 0 0x20000000
                          0x01000000 0x0 0x2000 0x2000 0 0xe000>;
@@ -198,19 +200,20 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        reg = <0>;
+                                       m25p,fast-read;
                                        compatible = "stmicro,n25q064a",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                        rw-mrc-cache {
                                                label = "rw-mrc-cache";
-                                               reg = <0x006f0000 0x00010000>;
+                                               reg = <0x005f0000 0x00010000>;
                                        };
                                };
                        };
 
                        gpioa {
                                compatible = "intel,ich6-gpio";
-                               u-boot,dm-pre-reloc;
+                               bootph-all;
                                reg = <0 0x20>;
                                bank-name = "A";
                                use-lvl-write-cache;
@@ -218,7 +221,7 @@
 
                        gpiob {
                                compatible = "intel,ich6-gpio";
-                               u-boot,dm-pre-reloc;
+                               bootph-all;
                                reg = <0x20 0x20>;
                                bank-name = "B";
                                use-lvl-write-cache;
@@ -226,7 +229,7 @@
 
                        gpioc {
                                compatible = "intel,ich6-gpio";
-                               u-boot,dm-pre-reloc;
+                               bootph-all;
                                reg = <0x40 0x20>;
                                bank-name = "C";
                                use-lvl-write-cache;
@@ -234,7 +237,7 @@
 
                        gpiod {
                                compatible = "intel,ich6-gpio";
-                               u-boot,dm-pre-reloc;
+                               bootph-all;
                                reg = <0x60 0x20>;
                                bank-name = "D";
                                use-lvl-write-cache;
@@ -242,7 +245,7 @@
 
                        gpioe {
                                compatible = "intel,ich6-gpio";
-                               u-boot,dm-pre-reloc;
+                               bootph-all;
                                reg = <0x80 0x20>;
                                bank-name = "E";
                                use-lvl-write-cache;
@@ -250,7 +253,7 @@
 
                        gpiof {
                                compatible = "intel,ich6-gpio";
-                               u-boot,dm-pre-reloc;
+                               bootph-all;
                                reg = <0xA0 0x20>;
                                bank-name = "F";
                                use-lvl-write-cache;