1 files changed, 117 insertions, 39 deletions

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index b6596633036c..a0bea4a6ec77 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -24,6 +24,69 @@
                 #size-cells = <1>;
                 ranges;
 
+                fmc: flash-controller@1e620000 {
+                        reg = < 0x1e620000 0xc4
+                                0x20000000 0x10000000 >;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "aspeed,ast2500-fmc";
+                        status = "disabled";
+                        interrupts = <19>;
+                        flash@0 {
+                                reg = < 0 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                        flash@1 {
+                                reg = < 1 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                        flash@2 {
+                                reg = < 2 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                };
+
+                spi1: flash-controller@1e630000 {
+                        reg = < 0x1e630000 0xc4
+                                0x30000000 0x08000000 >;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "aspeed,ast2500-spi";
+                        status = "disabled";
+                        flash@0 {
+                                reg = < 0 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                        flash@1 {
+                                reg = < 1 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                };
+
+                spi2: flash-controller@1e631000 {
+                        reg = < 0x1e631000 0xc4
+                                0x38000000 0x08000000 >;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "aspeed,ast2500-spi";
+                        status = "disabled";
+                        flash@0 {
+                                reg = < 0 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                        flash@1 {
+                                reg = < 1 >;
+                                compatible = "jedec,spi-nor";
+                                status = "disabled";
+                        };
+                };
+
                 vic: interrupt-controller@1e6c0080 {
                         compatible = "aspeed,ast2400-vic";
                         interrupt-controller;
@@ -52,15 +115,49 @@
                         #size-cells = <1>;
                         ranges;
 
-                        clk_clkin: clk_clkin@1e6e2070 {
-                                #clock-cells = <0>;
-                                compatible = "aspeed,g5-clkin-clock";
-                                reg = <0x1e6e2070 0x04>;
-                        };
-
                         syscon: syscon@1e6e2000 {
                                 compatible = "aspeed,g5-scu", "syscon", "simple-mfd";
                                 reg = <0x1e6e2000 0x1a8>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                clk_clkin: clk_clkin@70 {
+                                        #clock-cells = <0>;
+                                        compatible = "aspeed,g5-clkin-clock", "fixed-clock";
+                                        reg = <0x70>;
+                                        clock-frequency = <24000000>;
+                                };
+
+                                clk_hpll: clk_hpll@24 {
+                                        #clock-cells = <0>;
+                                        compatible = "aspeed,g5-hpll-clock", "fixed-clock";
+                                        reg = <0x24>;
+                                        clocks = <&clk_clkin>;
+                                        clock-frequency = <792000000>;
+                                };
+
+                                clk_ahb: clk_ahb@70 {
+                                        #clock-cells = <0>;
+                                        compatible = "aspeed,g5-ahb-clock", "fixed-clock";
+                                        reg = <0x70>;
+                                        clocks = <&clk_hpll>;
+                                        clock-frequency = <198000000>;
+                                };
+
+                                clk_apb: clk_apb@08 {
+                                        #clock-cells = <0>;
+                                        compatible = "aspeed,g5-apb-clock", "fixed-clock";
+                                        reg = <0x08>;
+                                        clocks = <&clk_hpll>;
+                                        clock-frequency = <24750000>;
+                                };
+
+                                clk_uart: clk_uart@2c {
+                                        #clock-cells = <0>;
+                                        compatible = "aspeed,uart-clock", "fixed-clock";
+                                        reg = <0x2c>;
+                                        clock-frequency = <24000000>;
+                                };
 
                                 pinctrl: pinctrl {
                                         compatible = "aspeed,g5-pinctrl";
@@ -285,7 +382,6 @@
                                                 function = "LAD0";
                                                 groups = "LAD0";
                                         };
-
                                         pinctrl_lad1_default: lad1_default {
                                                 function = "LAD1";
                                                 groups = "LAD1";
@@ -872,33 +968,7 @@
                                         };
 
                                 };
-                        };
-
-                        clk_hpll: clk_hpll@1e6e2024 {
-                                #clock-cells = <0>;
-                                compatible = "aspeed,g5-hpll-clock";
-                                reg = <0x1e6e2024 0x4>;
-                                clocks = <&clk_clkin>;
-                        };
-
-                        clk_ahb: clk_ahb@1e6e2070 {
-                                #clock-cells = <0>;
-                                compatible = "aspeed,g5-ahb-clock";
-                                reg = <0x1e6e2070 0x4>;
-                                clocks = <&clk_hpll>;
-                        };
 
-                        clk_apb: clk_apb@1e6e2008 {
-                                #clock-cells = <0>;
-                                compatible = "aspeed,g5-apb-clock";
-                                reg = <0x1e6e2008 0x4>;
-                                clocks = <&clk_hpll>;
-                        };
-
-                        clk_uart: clk_uart@1e6e2008 {
-                                #clock-cells = <0>;
-                                compatible = "aspeed,uart-clock";
-                                reg = <0x1e6e202c 0x4>;
                         };
 
                         gfx: display@1e6e6000 {
@@ -934,21 +1004,21 @@
 
 
                         wdt1: wdt@1e785000 {
-                                compatible = "aspeed,wdt";
-                                reg = <0x1e785000 0x1c>;
+                                compatible = "aspeed,ast2500-wdt";
+                                reg = <0x1e785000 0x20>;
                                 interrupts = <27>;
                         };
 
                         wdt2: wdt@1e785020 {
-                                compatible = "aspeed,wdt";
-                                reg = <0x1e785020 0x1c>;
+                                compatible = "aspeed,ast2500-wdt";
+                                reg = <0x1e785020 0x20>;
                                 interrupts = <27>;
                                 status = "disabled";
                         };
 
                         wdt3: wdt@1e785040 {
-                                compatible = "aspeed,wdt";
-                                reg = <0x1e785074 0x1c>;
+                                compatible = "aspeed,ast2500-wdt";
+                                reg = <0x1e785040 0x20>;
                                 status = "disabled";
                         };
 
@@ -1042,6 +1112,14 @@
                                 no-loopback-test;
                                 status = "disabled";
                         };
+
+                        adc: adc@1e6e9000 {
+                                compatible = "aspeed,ast2500-adc";
+                                reg = <0x1e6e9000 0xb0>;
+                                clocks = <&clk_apb>;
+                                #io-channel-cells = <1>;
+                                status = "disabled";
+                        };
                 };
         };
 };