Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / rk3036.dtsi

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index e24230d..ffa9bc7 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -6,6 +6,7 @@
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/clock/rk3036-cru.h>
 #include <dt-bindings/soc/rockchip,boot-mode.h>
+#include <dt-bindings/power/rk3036-power.h>
 
 / {
        #address-cells = <1>;
@@ -111,10 +112,32 @@
                assigned-clock-rates = <100000000>;
                clocks = <&cru SCLK_GPU>, <&cru SCLK_GPU>;
                clock-names = "bus", "core";
+               power-domains = <&power RK3036_PD_GPU>;
                resets = <&cru SRST_GPU>;
                status = "disabled";
        };
 
+       vpu: video-codec@10108000 {
+               compatible = "rockchip,rk3036-vpu";
+               reg = <0x10108000 0x800>;
+               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "vdpu";
+               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+               clock-names = "aclk", "hclk";
+               iommus = <&vpu_mmu>;
+               power-domains = <&power RK3036_PD_VPU>;
+       };
+
+       vpu_mmu: iommu@10108800 {
+               compatible = "rockchip,iommu";
+               reg = <0x10108800 0x100>;
+               interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
+               clock-names = "aclk", "iface";
+               power-domains = <&power RK3036_PD_VPU>;
+               #iommu-cells = <0>;
+       };
+
        vop: vop@10118000 {
                compatible = "rockchip,rk3036-vop";
                reg = <0x10118000 0x19c>;
@@ -124,6 +147,7 @@
                resets = <&cru SRST_LCDC1_A>, <&cru SRST_LCDC1_H>, <&cru SRST_LCDC1_D>;
                reset-names = "axi", "ahb", "dclk";
                iommus = <&vop_mmu>;
+               power-domains = <&power RK3036_PD_VIO>;
                status = "disabled";
 
                vop_out: port {
@@ -140,13 +164,28 @@
                compatible = "rockchip,iommu";
                reg = <0x10118300 0x100>;
                interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "vop_mmu";
                clocks = <&cru ACLK_LCDC>, <&cru HCLK_LCDC>;
                clock-names = "aclk", "iface";
+               power-domains = <&power RK3036_PD_VIO>;
                #iommu-cells = <0>;
                status = "disabled";
        };
 
+       qos_gpu: qos@1012d000 {
+               compatible = "rockchip,rk3036-qos", "syscon";
+               reg = <0x1012d000 0x20>;
+       };
+
+       qos_vpu: qos@1012e000 {
+               compatible = "rockchip,rk3036-qos", "syscon";
+               reg = <0x1012e000 0x20>;
+       };
+
+       qos_vio: qos@1012f000 {
+               compatible = "rockchip,rk3036-qos", "syscon";
+               reg = <0x1012f000 0x20>;
+       };
+
        gic: interrupt-controller@10139000 {
                compatible = "arm,gic-400";
                interrupt-controller;
@@ -302,6 +341,37 @@
                compatible = "rockchip,rk3036-grf", "syscon", "simple-mfd";
                reg = <0x20008000 0x1000>;
 
+               power: power-controller {
+                       compatible = "rockchip,rk3036-power-controller";
+                       #power-domain-cells = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       power-domain@RK3036_PD_VIO {
+                               reg = <RK3036_PD_VIO>;
+                               clocks = <&cru ACLK_LCDC>,
+                                        <&cru HCLK_LCDC>,
+                                        <&cru SCLK_LCDC>;
+                               pm_qos = <&qos_vio>;
+                               #power-domain-cells = <0>;
+                       };
+
+                       power-domain@RK3036_PD_VPU {
+                               reg = <RK3036_PD_VPU>;
+                               clocks = <&cru ACLK_VCODEC>,
+                                        <&cru HCLK_VCODEC>;
+                               pm_qos = <&qos_vpu>;
+                               #power-domain-cells = <0>;
+                       };
+
+                       power-domain@RK3036_PD_GPU {
+                               reg = <RK3036_PD_GPU>;
+                               clocks = <&cru SCLK_GPU>;
+                               pm_qos = <&qos_gpu>;
+                               #power-domain-cells = <0>;
+                       };
+               };
+
                reboot-mode {
                        compatible = "syscon-reboot-mode";
                        offset = <0x1d8>;