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

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

diff --git a/arch/x86/dts/crownbay.dts b/arch/x86/dts/crownbay.dts
index 78a1ef415ca2417ed6907addb854781738c180ba..f492c35875b65c39a43e155b0b449da8ecd54a4e 100644 (file)
--- a/arch/x86/dts/crownbay.dts
+++ b/arch/x86/dts/crownbay.dts
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /dts-v1/;
@@ -11,6 +10,8 @@
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
 /include/ "keyboard.dtsi"
+/include/ "pcspkr.dtsi"
+/include/ "reset.dtsi"
 /include/ "rtc.dtsi"
 /include/ "tsc_timer.dtsi"
 
@@ -152,7 +153,7 @@
                        #size-cells = <1>;
 
                        irq-router {
-                               compatible = "intel,queensbay-irq-router";
+                               compatible = "intel,irq-router";
                                intel,pirq-config = "pci";
                                intel,actl-addr = <0x58>;
                                intel,pirq-link = <0x60 8>;
@@ -223,7 +224,7 @@
                                spi-flash@0 {
                                        reg = <0>;
                                        compatible = "sst,25vf016b",
-                                               "spi-flash";
+                                               "jedec,spi-nor";
                                        memory-map = <0xffe00000 0x00200000>;
                                };
                        };