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
index 3e354c4093785b16f26d19d4d3220947986f18b7..f492c35875b65c39a43e155b0b449da8ecd54a4e 100644 (file)
@@ -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/;
 
 /include/ "skeleton.dtsi"
 /include/ "serial.dtsi"
+/include/ "keyboard.dtsi"
+/include/ "pcspkr.dtsi"
+/include/ "reset.dtsi"
 /include/ "rtc.dtsi"
+/include/ "tsc_timer.dtsi"
 
 / {
        model = "Intel Crown Bay";
        compatible = "intel,crownbay", "intel,queensbay";
 
        aliases {
-               spi0 = "/spi";
+               spi0 = &spi;
        };
 
        config {
 
        };
 
-       gpioa {
-               compatible = "intel,ich6-gpio";
-               u-boot,dm-pre-reloc;
-               reg = <0 0x20>;
-               bank-name = "A";
-       };
-
-       gpiob {
-               compatible = "intel,ich6-gpio";
-               u-boot,dm-pre-reloc;
-               reg = <0x20 0x20>;
-               bank-name = "B";
-       };
-
        chosen {
                /*
                 * By default the legacy superio serial port is used as the
                stdout-path = "/serial";
        };
 
-       spi {
-               #address-cells = <1>;
-               #size-cells = <0>;
-               compatible = "intel,ich-spi";
-               spi-flash@0 {
-                       reg = <0>;
-                       compatible = "sst,25vf016b", "spi-flash";
-                       memory-map = <0xffe00000 0x00200000>;
-               };
-       };
-
        microcode {
                update@0 {
 #include "microcode/m0220661105_cv.dtsi"
                                                        "pci8086,8811",
                                                        "pciclass,070002",
                                                        "pciclass,0700",
-                                                       "x86-uart";
+                                                       "ns16550";
                                        u-boot,dm-pre-reloc;
                                        reg = <0x00025100 0x0 0x0 0x0 0x0
                                               0x01025110 0x0 0x0 0x0 0x0>;
                                                        "pci8086,8812",
                                                        "pciclass,070002",
                                                        "pciclass,0700",
-                                                       "x86-uart";
+                                                       "ns16550";
                                        u-boot,dm-pre-reloc;
                                        reg = <0x00025200 0x0 0x0 0x0 0x0
                                               0x01025210 0x0 0x0 0x0 0x0>;
                                                        "pci8086,8813",
                                                        "pciclass,070002",
                                                        "pciclass,0700",
-                                                       "x86-uart";
+                                                       "ns16550";
                                        u-boot,dm-pre-reloc;
                                        reg = <0x00025300 0x0 0x0 0x0 0x0
                                               0x01025310 0x0 0x0 0x0 0x0>;
                                                        "pci8086,8814",
                                                        "pciclass,070002",
                                                        "pciclass,0700",
-                                                       "x86-uart";
+                                                       "ns16550";
                                        u-boot,dm-pre-reloc;
                                        reg = <0x00025400 0x0 0x0 0x0 0x0
                                               0x01025410 0x0 0x0 0x0 0x0>;
                        };
                };
 
-               irq-router@1f,0 {
+               pch@1f,0 {
                        reg = <0x0000f800 0 0 0 0>;
-                       compatible = "intel,irq-router";
-                       intel,pirq-config = "pci";
-                       intel,pirq-link = <0x60 8>;
-                       intel,pirq-mask = <0xcee0>;
-                       intel,pirq-routing = <
-                               /* TunnelCreek PCI devices */
-                               PCI_BDF(0, 2, 0) INTA PIRQE
-                               PCI_BDF(0, 3, 0) INTA PIRQF
-                               PCI_BDF(0, 23, 0) INTA PIRQA
-                               PCI_BDF(0, 23, 0) INTB PIRQB
-                               PCI_BDF(0, 23, 0) INTC PIRQC
-                               PCI_BDF(0, 23, 0) INTD PIRQD
-                               PCI_BDF(0, 24, 0) INTA PIRQB
-                               PCI_BDF(0, 24, 0) INTB PIRQC
-                               PCI_BDF(0, 24, 0) INTC PIRQD
-                               PCI_BDF(0, 24, 0) INTD PIRQA
-                               PCI_BDF(0, 25, 0) INTA PIRQC
-                               PCI_BDF(0, 25, 0) INTB PIRQD
-                               PCI_BDF(0, 25, 0) INTC PIRQA
-                               PCI_BDF(0, 25, 0) INTD PIRQB
-                               PCI_BDF(0, 26, 0) INTA PIRQD
-                               PCI_BDF(0, 26, 0) INTB PIRQA
-                               PCI_BDF(0, 26, 0) INTC PIRQB
-                               PCI_BDF(0, 26, 0) INTD PIRQC
-                               PCI_BDF(0, 27, 0) INTA PIRQG
-                               /*
-                                * Topcliff PCI devices
-                                *
-                                * Note on the Crown Bay board, Topcliff chipset
-                                * is connected to TunnelCreek PCIe port 0, so
-                                * its bus number is 1 for its PCIe port and 2
-                                * for its PCI devices per U-Boot current PCI
-                                * bus enumeration algorithm.
-                                */
-                               PCI_BDF(1, 0, 0) INTA PIRQA
-                               PCI_BDF(2, 0, 1) INTA PIRQA
-                               PCI_BDF(2, 0, 2) INTA PIRQA
-                               PCI_BDF(2, 2, 0) INTB PIRQD
-                               PCI_BDF(2, 2, 1) INTB PIRQD
-                               PCI_BDF(2, 2, 2) INTB PIRQD
-                               PCI_BDF(2, 2, 3) INTB PIRQD
-                               PCI_BDF(2, 2, 4) INTB PIRQD
-                               PCI_BDF(2, 4, 0) INTC PIRQC
-                               PCI_BDF(2, 4, 1) INTC PIRQC
-                               PCI_BDF(2, 6, 0) INTD PIRQB
-                               PCI_BDF(2, 8, 0) INTA PIRQA
-                               PCI_BDF(2, 8, 1) INTA PIRQA
-                               PCI_BDF(2, 8, 2) INTA PIRQA
-                               PCI_BDF(2, 8, 3) INTA PIRQA
-                               PCI_BDF(2, 10, 0) INTB PIRQD
-                               PCI_BDF(2, 10, 1) INTB PIRQD
-                               PCI_BDF(2, 10, 2) INTB PIRQD
-                               PCI_BDF(2, 10, 3) INTB PIRQD
-                               PCI_BDF(2, 10, 4) INTB PIRQD
-                               PCI_BDF(2, 12, 0) INTC PIRQC
-                               PCI_BDF(2, 12, 1) INTC PIRQC
-                               PCI_BDF(2, 12, 2) INTC PIRQC
-                               PCI_BDF(2, 12, 3) INTC PIRQC
-                               PCI_BDF(2, 12, 4) INTC PIRQC
-                       >;
+                       compatible = "intel,pch7";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       irq-router {
+                               compatible = "intel,irq-router";
+                               intel,pirq-config = "pci";
+                               intel,actl-addr = <0x58>;
+                               intel,pirq-link = <0x60 8>;
+                               intel,pirq-mask = <0xcee0>;
+                               intel,pirq-routing = <
+                                       /* TunnelCreek PCI devices */
+                                       PCI_BDF(0, 2, 0) INTA PIRQE
+                                       PCI_BDF(0, 3, 0) INTA PIRQF
+                                       PCI_BDF(0, 23, 0) INTA PIRQA
+                                       PCI_BDF(0, 23, 0) INTB PIRQB
+                                       PCI_BDF(0, 23, 0) INTC PIRQC
+                                       PCI_BDF(0, 23, 0) INTD PIRQD
+                                       PCI_BDF(0, 24, 0) INTA PIRQB
+                                       PCI_BDF(0, 24, 0) INTB PIRQC
+                                       PCI_BDF(0, 24, 0) INTC PIRQD
+                                       PCI_BDF(0, 24, 0) INTD PIRQA
+                                       PCI_BDF(0, 25, 0) INTA PIRQC
+                                       PCI_BDF(0, 25, 0) INTB PIRQD
+                                       PCI_BDF(0, 25, 0) INTC PIRQA
+                                       PCI_BDF(0, 25, 0) INTD PIRQB
+                                       PCI_BDF(0, 26, 0) INTA PIRQD
+                                       PCI_BDF(0, 26, 0) INTB PIRQA
+                                       PCI_BDF(0, 26, 0) INTC PIRQB
+                                       PCI_BDF(0, 26, 0) INTD PIRQC
+                                       PCI_BDF(0, 27, 0) INTA PIRQG
+                                       /*
+                                       * Topcliff PCI devices
+                                       *
+                                       * Note on the Crown Bay board, Topcliff
+                                       * chipset is connected to TunnelCreek
+                                       * PCIe port 0, so its bus number is 1
+                                       * for its PCIe port and 2 for its PCI
+                                       * devices per U-Boot current PCI bus
+                                       * enumeration algorithm.
+                                       */
+                                       PCI_BDF(1, 0, 0) INTA PIRQA
+                                       PCI_BDF(2, 0, 1) INTA PIRQA
+                                       PCI_BDF(2, 0, 2) INTA PIRQA
+                                       PCI_BDF(2, 2, 0) INTB PIRQD
+                                       PCI_BDF(2, 2, 1) INTB PIRQD
+                                       PCI_BDF(2, 2, 2) INTB PIRQD
+                                       PCI_BDF(2, 2, 3) INTB PIRQD
+                                       PCI_BDF(2, 2, 4) INTB PIRQD
+                                       PCI_BDF(2, 4, 0) INTC PIRQC
+                                       PCI_BDF(2, 4, 1) INTC PIRQC
+                                       PCI_BDF(2, 6, 0) INTD PIRQB
+                                       PCI_BDF(2, 8, 0) INTA PIRQA
+                                       PCI_BDF(2, 8, 1) INTA PIRQA
+                                       PCI_BDF(2, 8, 2) INTA PIRQA
+                                       PCI_BDF(2, 8, 3) INTA PIRQA
+                                       PCI_BDF(2, 10, 0) INTB PIRQD
+                                       PCI_BDF(2, 10, 1) INTB PIRQD
+                                       PCI_BDF(2, 10, 2) INTB PIRQD
+                                       PCI_BDF(2, 10, 3) INTB PIRQD
+                                       PCI_BDF(2, 10, 4) INTB PIRQD
+                                       PCI_BDF(2, 12, 0) INTC PIRQC
+                                       PCI_BDF(2, 12, 1) INTC PIRQC
+                                       PCI_BDF(2, 12, 2) INTC PIRQC
+                                       PCI_BDF(2, 12, 3) INTC PIRQC
+                                       PCI_BDF(2, 12, 4) INTC PIRQC
+                               >;
+                       };
+
+                       spi: spi {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "intel,ich7-spi";
+                               spi-flash@0 {
+                                       reg = <0>;
+                                       compatible = "sst,25vf016b",
+                                               "jedec,spi-nor";
+                                       memory-map = <0xffe00000 0x00200000>;
+                               };
+                       };
+
+                       gpioa {
+                               compatible = "intel,ich6-gpio";
+                               u-boot,dm-pre-reloc;
+                               reg = <0 0x20>;
+                               bank-name = "A";
+                       };
+
+                       gpiob {
+                               compatible = "intel,ich6-gpio";
+                               u-boot,dm-pre-reloc;
+                               reg = <0x20 0x20>;
+                               bank-name = "B";
+                       };
                };
        };