97 lines
2.5 KiB
Diff
97 lines
2.5 KiB
Diff
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi
|
||
|
|
index 0b957068ff899..6c4b17d27bdc5 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi
|
||
|
|
@@ -29,3 +29,7 @@
|
||
|
|
extcon = <&usb2phy0>;
|
||
|
|
maximum-speed = "high-speed";
|
||
|
|
};
|
||
|
|
+
|
||
|
|
+&vop {
|
||
|
|
+ compatible = "rockchip,rk3566-vop";
|
||
|
|
+};
|
||
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
||
|
|
index 5eafddf62edc7..2bdf8c7e9765b 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
|
||
|
|
@@ -137,3 +137,7 @@
|
||
|
|
phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;
|
||
|
|
phy-names = "usb2-phy", "usb3-phy";
|
||
|
|
};
|
||
|
|
+
|
||
|
|
+&vop {
|
||
|
|
+ compatible = "rockchip,rk3568-vop";
|
||
|
|
+};
|
||
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
index f66db7d44060c..fb946bde0ae5f 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
|
||
|
|
@@ -129,6 +129,11 @@
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
+ display_subsystem: display-subsystem {
|
||
|
|
+ compatible = "rockchip,display-subsystem";
|
||
|
|
+ ports = <&vop_out>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
firmware {
|
||
|
|
scmi: scmi {
|
||
|
|
compatible = "arm,scmi-smc";
|
||
|
|
@@ -632,6 +637,52 @@
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
+ vop: vop@fe040000 {
|
||
|
|
+ reg = <0x0 0xfe040000 0x0 0x3000>, <0x0 0xfe044000 0x0 0x1000>;
|
||
|
|
+ reg-names = "vop", "gamma-lut";
|
||
|
|
+ interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
|
||
|
|
+ clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>, <&cru DCLK_VOP0>,
|
||
|
|
+ <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
|
||
|
|
+ clock-names = "aclk", "hclk", "dclk_vp0", "dclk_vp1", "dclk_vp2";
|
||
|
|
+ iommus = <&vop_mmu>;
|
||
|
|
+ power-domains = <&power RK3568_PD_VO>;
|
||
|
|
+ rockchip,grf = <&grf>;
|
||
|
|
+ status = "disabled";
|
||
|
|
+
|
||
|
|
+ vop_out: ports {
|
||
|
|
+ #address-cells = <1>;
|
||
|
|
+ #size-cells = <0>;
|
||
|
|
+
|
||
|
|
+ vp0: port@0 {
|
||
|
|
+ reg = <0>;
|
||
|
|
+ #address-cells = <1>;
|
||
|
|
+ #size-cells = <0>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ vp1: port@1 {
|
||
|
|
+ reg = <1>;
|
||
|
|
+ #address-cells = <1>;
|
||
|
|
+ #size-cells = <0>;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ vp2: port@2 {
|
||
|
|
+ reg = <2>;
|
||
|
|
+ #address-cells = <1>;
|
||
|
|
+ #size-cells = <0>;
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ vop_mmu: iommu@fe043e00 {
|
||
|
|
+ compatible = "rockchip,rk3568-iommu";
|
||
|
|
+ reg = <0x0 0xfe043e00 0x0 0x100>, <0x0 0xfe043f00 0x0 0x100>;
|
||
|
|
+ interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
|
||
|
|
+ clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;
|
||
|
|
+ clock-names = "aclk", "iface";
|
||
|
|
+ #iommu-cells = <0>;
|
||
|
|
+ status = "disabled";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
qos_gpu: qos@fe128000 {
|
||
|
|
compatible = "rockchip,rk3568-qos", "syscon";
|
||
|
|
reg = <0x0 0xfe128000 0x0 0x20>;
|
||
|
|
--
|
||
|
|
cgit 1.2.3-1.el7
|
||
|
|
|