Merge tag 'edac_for_5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[thirdparty/kernel/stable.git] / arch / arm / boot / dts / aspeed-g5.dtsi

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index b4e479ab5a2d0892dec09863566fdd77185ab7a6..85ed9dbec19629582770515a8323b5f60e7bd66d 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -257,6 +257,7 @@
                                gpio-ranges = <&pinctrl 0 0 220>;
                                clocks = <&syscon ASPEED_CLK_APB>;
                                interrupt-controller;
+                               #interrupt-cells = <2>;
                        };
 
                        timer: timer@1e782000 {
@@ -337,8 +338,32 @@
                                ranges = <0x0 0x1e789000 0x1000>;
 
                                lpc_bmc: lpc-bmc@0 {
-                                       compatible = "aspeed,ast2500-lpc-bmc";
+                                       compatible = "aspeed,ast2500-lpc-bmc", "simple-mfd", "syscon";
                                        reg = <0x0 0x80>;
+                                       reg-io-width = <4>;
+
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       ranges = <0x0 0x0 0x80>;
+
+                                       kcs1: kcs1@0 {
+                                               compatible = "aspeed,ast2500-kcs-bmc";
+                                               interrupts = <8>;
+                                               kcs_chan = <1>;
+                                               status = "disabled";
+                                       };
+                                       kcs2: kcs2@0 {
+                                               compatible = "aspeed,ast2500-kcs-bmc";
+                                               interrupts = <8>;
+                                               kcs_chan = <2>;
+                                               status = "disabled";
+                                       };
+                                       kcs3: kcs3@0 {
+                                               compatible = "aspeed,ast2500-kcs-bmc";
+                                               interrupts = <8>;
+                                               kcs_chan = <3>;
+                                               status = "disabled";
+                                       };
                                };
 
                                lpc_host: lpc-host@80 {
@@ -350,6 +375,13 @@
                                        #size-cells = <1>;
                                        ranges = <0x0 0x80 0x1e0>;
 
+                                       kcs4: kcs4@0 {
+                                               compatible = "aspeed,ast2500-kcs-bmc";
+                                               interrupts = <8>;
+                                               kcs_chan = <4>;
+                                               status = "disabled";
+                                       };
+
                                        lpc_ctrl: lpc-ctrl@0 {
                                                compatible = "aspeed,ast2500-lpc-ctrl";
                                                reg = <0x0 0x80>;