Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/arch/x86/dts/cougarcanyon2.dts b/arch/x86/dts/cougarcanyon2.dts
index c1cda73d963a3987a6fedc26c9c2246270af526f..c6ba811e059e58b5a1594174db83c7e912035f17 100644 (file)
--- a/arch/x86/dts/cougarcanyon2.dts
+++ b/arch/x86/dts/cougarcanyon2.dts
@@ -10,6 +10,7 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "keyboard.dtsi"
+/include/ "reset.dtsi"
 /include/ "rtc.dtsi"
 /include/ "tsc_timer.dtsi"
 
@@ -153,7 +154,7 @@
 
                                spi-flash@0 {
                                        reg = <0>;
-                                       compatible = "winbond,w25q64bv", "spi-flash";
+                                       compatible = "winbond,w25q64bv", "jedec,spi-nor";
                                        memory-map = <0xff800000 0x00800000>;
                                };
                        };