Merge tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun8i-a83t.dtsi

diff --git a/arch/arm/boot/dts/sun8i-a83t.dtsi b/arch/arm/boot/dts/sun8i-a83t.dtsi
index 568307639be84905835a9caf44a9873970fdd99d..2be23d600957ce4ed8a99fbf82c84667502a6e2b 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a83t.dtsi
+++ b/arch/arm/boot/dts/sun8i-a83t.dtsi
@@ -66,6 +66,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu0_opp_table>;
+                       cci-control-port = <&cci_control0>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <0>;
                };
 
@@ -73,6 +75,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu0_opp_table>;
+                       cci-control-port = <&cci_control0>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <1>;
                };
 
@@ -80,6 +84,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu0_opp_table>;
+                       cci-control-port = <&cci_control0>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <2>;
                };
 
@@ -87,6 +93,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu0_opp_table>;
+                       cci-control-port = <&cci_control0>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <3>;
                };
 
@@ -96,6 +104,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu1_opp_table>;
+                       cci-control-port = <&cci_control1>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <0x100>;
                };
 
@@ -103,6 +113,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu1_opp_table>;
+                       cci-control-port = <&cci_control1>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <0x101>;
                };
 
@@ -110,6 +122,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu1_opp_table>;
+                       cci-control-port = <&cci_control1>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <0x102>;
                };
 
@@ -117,6 +131,8 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        operating-points-v2 = <&cpu1_opp_table>;
+                       cci-control-port = <&cci_control1>;
+                       enable-method = "allwinner,sun8i-a83t-smp";
                        reg = <0x103>;
                };
        };
@@ -349,6 +365,44 @@
                        };
                };
 
+               cpucfg@1700000 {
+                       compatible = "allwinner,sun8i-a83t-cpucfg";
+                       reg = <0x01700000 0x400>;
+               };
+
+               cci@1790000 {
+                       compatible = "arm,cci-400";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       reg = <0x01790000 0x10000>;
+                       ranges = <0x0 0x01790000 0x10000>;
+
+                       cci_control0: slave-if@4000 {
+                               compatible = "arm,cci-400-ctrl-if";
+                               interface-type = "ace";
+                               reg = <0x4000 0x1000>;
+                       };
+
+                       cci_control1: slave-if@5000 {
+                               compatible = "arm,cci-400-ctrl-if";
+                               interface-type = "ace";
+                               reg = <0x5000 0x1000>;
+                       };
+
+                       pmu@9000 {
+                               compatible = "arm,cci-400-pmu,r1";
+                               reg = <0x9000 0x5000>;
+                               interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+               };
+
                syscon: syscon@1c00000 {
                        compatible = "allwinner,sun8i-a83t-system-controller",
                                "syscon";
@@ -492,6 +546,11 @@
                        #size-cells = <0>;
                };
 
+               sid: eeprom@1c14000 {
+                       compatible = "allwinner,sun8i-a83t-sid";
+                       reg = <0x1c14000 0x400>;
+               };
+
                usb_otg: usb@1c19000 {
                        compatible = "allwinner,sun8i-a83t-musb",
                                     "allwinner,sun8i-a33-musb";
@@ -928,6 +987,11 @@
                        #reset-cells = <1>;
                };
 
+               r_cpucfg@1f01c00 {
+                       compatible = "allwinner,sun8i-a83t-r-cpucfg";
+                       reg = <0x1f01c00 0x400>;
+               };
+
                r_pio: pinctrl@1f02c00 {
                        compatible = "allwinner,sun8i-a83t-r-pinctrl";
                        reg = <0x01f02c00 0x400>;