Commit 9d6c6d97 authored by Sascha Hauer's avatar Sascha Hauer Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: rk356x: Add VOP2 nodes 



The VOP2 is the display output controller on the RK3568. Add the node
for it to the dtsi file along with the required display-subsystem node
and the iommu node.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20220422072841.2206452-17-s.hauer@pengutronix.de


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent b65155c7

arch/arm64/boot/dts/rockchip/rk3566.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -29,3 +29,7 @@ &usb_host0_xhci { 
	extcon = <&usb2phy0>;

	maximum-speed = "high-speed";

};



&vop {

	compatible = "rockchip,rk3566-vop";

};

arch/arm64/boot/dts/rockchip/rk3568.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -137,3 +137,7 @@ &usb_host0_xhci { 
	phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>;

	phy-names = "usb2-phy", "usb3-phy";

};



&vop {

	compatible = "rockchip,rk3568-vop";

};

arch/arm64/boot/dts/rockchip/rk356x.dtsi

+51 −0
Original line number Diff line number Diff line
@@ -129,6 +129,11 @@ opp-1800000000 { 
		};

	};



	display_subsystem: display-subsystem {

		compatible = "rockchip,display-subsystem";

		ports = <&vop_out>;

	};



	firmware {

		scmi: scmi {

			compatible = "arm,scmi-smc";
@@ -632,6 +637,52 @@ gmac1_mtl_tx_setup: tx-queues-config { 
		};

	};



	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>;